From 9e52657b7211ce22682222b2e883d172becdb0b8 Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 15 Jul 2021 23:23:11 +0100 Subject: [PATCH 1/3] Remove deprecated python3 flag --- CHANGELOG.rst | 5 +++++ st2client/st2client/commands/pack.py | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a60570a82e..f7747333ad 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,6 +7,11 @@ in development Changed ~~~~~~~ +* Removed --python3 deprecated flag from st2client + + Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions) + + Contributed by @blag. * Fixed ``__init__.py`` files to use double quotes to better align with black linting #5299 Contributed by @blag. diff --git a/st2client/st2client/commands/pack.py b/st2client/st2client/commands/pack.py index 8d05fc88dc..8c4c958768 100644 --- a/st2client/st2client/commands/pack.py +++ b/st2client/st2client/commands/pack.py @@ -255,12 +255,6 @@ def __init__(self, resource, *args, **kwargs): help="Name of the %s in Exchange, or a git repo URL." % resource.get_plural_display_name().lower(), ) - self.parser.add_argument( - "--python3", - action="store_true", - default=False, - help="Use Python 3 binary for pack virtual environment.", - ) self.parser.add_argument( "--force", action="store_true", @@ -282,12 +276,6 @@ def run(self, args, **kwargs): if not is_structured_output: self._get_content_counts_for_pack(args, **kwargs) - if args.python3: - warnings.warn( - "DEPRECATION WARNING: --python3 flag is ignored and will be removed " - "in v3.5.0 as StackStorm now runs with python3 only" - ) - return self.manager.install( args.packs, force=args.force, From 8513f11ac3cdfd4083343d817092d6a0aad4130f Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 15 Jul 2021 23:24:15 +0100 Subject: [PATCH 2/3] Add PR number to changelog --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f7747333ad..c5421460ef 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -7,7 +7,7 @@ in development Changed ~~~~~~~ -* Removed --python3 deprecated flag from st2client +* Removed --python3 deprecated flag from st2client. #5305 Contributed by Amanda McGuinness (@amanda11 Ammeon Solutions) From d1040b84979044a136c469c15e8f27b7f7208992 Mon Sep 17 00:00:00 2001 From: amanda Date: Thu, 15 Jul 2021 23:30:23 +0100 Subject: [PATCH 3/3] Remove unused import --- st2client/st2client/commands/pack.py | 1 - 1 file changed, 1 deletion(-) diff --git a/st2client/st2client/commands/pack.py b/st2client/st2client/commands/pack.py index 8c4c958768..cab9774215 100644 --- a/st2client/st2client/commands/pack.py +++ b/st2client/st2client/commands/pack.py @@ -19,7 +19,6 @@ import six import editor -import warnings import yaml from st2client.models import Config