Skip to content

Update runner packages to read version from runner package local __init__.py file #4239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kami merged 2 commits into from
Jul 17, 2018
Merged

Update runner packages to read version from runner package local __init__.py file #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee044ed
Update runner packages to read version from runner package local
Kami Jul 12, 2018
83b798d
Merge branch 'master' into runner_versions_v2
Kami Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contrib/runners/action_chain_runner/action_chain_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/action_chain_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from action_chain_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')
Copy link
Member

@arm4b arm4b Jul 13, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since import doesn't work, can the version be read from the ../../../../../st2common/__init__.py via similar "file" approach?
How worse or more hacky that could be, comparing to hardcoding same version number in all the runners?

To me, ideally to change the version in one single place.

Copy link
Member Author

@Kami Kami Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would kinda break the whole package approach - it would rely on st2common to be in a specific path and always available with a runner package.

And it's not really hard coding - it's being updated via release workflows. It's exactly the same approach we follow for st2common and st2client.

And this also allows us to separately version and release runner packages in the future (if we ever need to do that).

Copy link
Member

@arm4b arm4b Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understand the purpose of st2common and st2client being versioned separately, but don't get the reason (yet) for runners which are part of the core and are in st2 repo code.

Any future plans to do extract these runners from the core and distribute separately?

Copy link
Member Author

@Kami Kami Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No plans for that right, but with package approach we do get more flexibility which allows us to do things like that in the future.

I believe @bigmstone did talk something about moving runners to standalone repos, but I personally don't want to do that any time soon yet (too much overhead).

Copy link
Member Author

@Kami Kami Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And also, with those changes they are not really versioned separately / interdependently - as mentioned above, it follows the same approach as other components and we bump / set the version during the release process.

Copy link
Member

@arm4b arm4b Jul 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just feel it's a bit of mess to change the version in 10 files with the same number without having plans to extract these parts from the core repo.
If there are no other options to brainstorm, - let it be 👍

Would just like @bigmstone or @m4dcoder to jump in and review the PR, as someone more familiar with st2 core and plans in context of runners.


Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-action-chain',
version='2.5.0',
version=__version__,
description=('Action-Chain workflow action runner for StackStorm event-driven '
'automation platform'),
author='StackStorm',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/announcement_runner/announcement_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/announcement_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from announcement_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-announcement',
version='2.5.0',
version=__version__,
description=('Announcement action runner for StackStorm event-driven automation platform'),
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/cloudslang_runner/cloudslang_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/cloudslang_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from cloudslang_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-cloudslang',
version='2.5.0',
version=__version__,
description=('CloudSlang action runner for StackStorm event-driven automation platform'),
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/http_runner/http_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/http_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from http_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-http',
version='2.5.0',
version=__version__,
description=('HTTP(s) action runner for StackStorm event-driven automation platform'),
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/inquirer_runner/inquirer_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/inquirer_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from inquirer_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-inquirer',
version='2.5.0',
version=__version__,
description=('Inquirer action runner for StackStorm event-driven automation platform'),
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/local_runner/local_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/local_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from local_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-local',
version='2.5.0',
version=__version__,
description=('Local Shell Command and Script action runner for StackStorm event-driven '
'automation platform'),
author='StackStorm',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/mistral_v2/mistral_v2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/mistral_v2/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from mistral_v2 import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-mistral-v2',
version='2.5.0',
version=__version__,
description=('Mistral v2 workflow action runner for StackStorm event-driven '
'automation platform'),
author='StackStorm',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/noop_runner/noop_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/noop_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from noop_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-noop',
version='2.5.0',
version=__version__,
description=('No-Op action runner for StackStorm event-driven automation platform'),
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/orchestra_runner/orchestra_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/orchestra_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from orchestra_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-orchestra',
version='2.5.0',
version=__version__,
description='Orchestra workflow runner for StackStorm event-driven automation platform',
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/python_runner/python_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/python_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from python_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-python',
version='2.5.0',
version=__version__,
description='Python action runner for StackStorm event-driven automation platform',
author='StackStorm',
author_email='info@stackstorm.com',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/remote_runner/remote_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/remote_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from remote_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-remote',
version='2.5.0',
version=__version__,
description=('Remote SSH shell command and script action runner for StackStorm event-driven '
'automation platform'),
author='StackStorm',
Expand Down
4 changes: 3 additions & 1 deletion contrib/runners/windows_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from windows_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-windows',
version='2.5.0',
version=__version__,
description=('Windows command and script action runner for StackStorm event-driven '
'automation platform'),
author='StackStorm',
Expand Down
3 changes: 2 additions & 1 deletion contrib/runners/windows_runner/windows_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
Expand All @@ -13,3 +12,5 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'
4 changes: 3 additions & 1 deletion contrib/runners/winrm_runner/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround

from winrm_runner import __version__

BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

Expand All @@ -31,7 +33,7 @@
apply_vagrant_workaround()
setup(
name='stackstorm-runner-winrm',
version='2.8.0',
version=__version__,
description=('WinRM shell command and PowerShell script action runner for'
' the StackStorm event-driven automation platform'),
author='StackStorm',
Expand Down
16 changes: 16 additions & 0 deletions contrib/runners/winrm_runner/winrm_runner/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Licensed to the StackStorm, Inc ('StackStorm') under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

__version__ = '2.9dev'