From 95c7f6dd679b8f71ace794da1743937366b9cca4 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 5 Jan 2022 15:53:59 -0800 Subject: [PATCH 1/3] update setuptools in created venv --- streamparse/cli/update_virtualenv.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/streamparse/cli/update_virtualenv.py b/streamparse/cli/update_virtualenv.py index e05bb5c..966770a 100644 --- a/streamparse/cli/update_virtualenv.py +++ b/streamparse/cli/update_virtualenv.py @@ -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 " @@ -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__ ) @@ -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, From 6cffab66eb4aab86fcdd33e824c3f0dbff171a04 Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Wed, 5 Jan 2022 19:19:24 -0800 Subject: [PATCH 2/3] depend on fabric39 --- requirements.txt | 2 +- streamparse/cli/submit.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 62e2c4f..8c4167d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cython jinja2 -fabric3 +fabric39 pystorm>=3.1.1 requests ruamel.yaml diff --git a/streamparse/cli/submit.py b/streamparse/cli/submit.py index 0ed81db..996706f 100644 --- a/streamparse/cli/submit.py +++ b/streamparse/cli/submit.py @@ -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) @@ -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) @@ -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, From 06ab33f1f0c2fc5805ae700e410bbf30aeccf05f Mon Sep 17 00:00:00 2001 From: abelsonlive Date: Thu, 6 Jan 2022 17:00:20 -0500 Subject: [PATCH 3/3] bump version --- streamparse/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streamparse/version.py b/streamparse/version.py index 3477d8b..7b5d947 100644 --- a/streamparse/version.py +++ b/streamparse/version.py @@ -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("."))