Skip to content

Commit

Permalink
Merge pull request #489 from Parsely/feature/upgrade-setuptools
Browse files Browse the repository at this point in the history
update setuptools in created venv
  • Loading branch information
abelsonlive committed Jan 6, 2022
2 parents 7efa754 + 06ab33f commit fb8ce9c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
8 changes: 3 additions & 5 deletions streamparse/cli/submit.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,7 @@ def submit_topology(
env_config, host=host, port=port, timeout=timeout
)
if remote_jar_path:
print(
f"Reusing remote JAR on Nimbus server at path: {remote_jar_path}"
)
print(f"Reusing remote JAR on Nimbus server at path: {remote_jar_path}")
else:
remote_jar_path = _upload_jar(nimbus_client, local_jar_path)
_kill_existing_topology(override_name, force, wait, nimbus_client)
Expand All @@ -303,7 +301,7 @@ def submit_topology(


def subparser_hook(subparsers):
""" Hook to add subparser for this command. """
"""Hook to add subparser for this command."""
subparser = subparsers.add_parser("submit", description=__doc__, help=main.__doc__)
subparser.set_defaults(func=main)
add_ackers(subparser)
Expand Down Expand Up @@ -367,7 +365,7 @@ def subparser_hook(subparsers):


def main(args):
""" Submit a Storm topology to Nimbus. """
"""Submit a Storm topology to Nimbus."""
env.pool_size = args.pool_size
submit_topology(
name=args.name,
Expand Down
6 changes: 3 additions & 3 deletions streamparse/cli/update_virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _create_or_update_virtualenv(
puts(f"Updating virtualenv: {virtualenv_name}")
pip_path = "/".join((virtualenv_path, "bin", "pip"))
# Make sure we're using latest pip so options work as expected
run_cmd(f"{pip_path} install --upgrade 'pip>=9.0,!=19.0'", user)
run_cmd(f"{pip_path} install --upgrade 'pip>=9.0,!=19.0' setuptools", user)
run_cmd(
(
"{} install -r {} --exists-action w --upgrade "
Expand Down Expand Up @@ -155,7 +155,7 @@ def create_or_update_virtualenvs(


def subparser_hook(subparsers):
""" Hook to add subparser for this command. """
"""Hook to add subparser for this command."""
subparser = subparsers.add_parser(
"update_virtualenv", description=__doc__, help=main.__doc__
)
Expand All @@ -172,7 +172,7 @@ def subparser_hook(subparsers):


def main(args):
""" Create or update a virtualenv on Storm workers. """
"""Create or update a virtualenv on Storm workers."""
env.pool_size = args.pool_size
create_or_update_virtualenvs(
args.environment,
Expand Down
2 changes: 1 addition & 1 deletion streamparse/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ def _safe_int(string):
return string


__version__ = "4.1.0"
__version__ = "4.1.1"
VERSION = tuple(_safe_int(x) for x in __version__.split("."))

0 comments on commit fb8ce9c

Please sign in to comment.