From b06798a0c8344b4f3b872e6321d3a331b06dd707 Mon Sep 17 00:00:00 2001 From: Jeff Jarry Date: Wed, 22 May 2024 15:52:24 -0400 Subject: [PATCH] package for release with requests update --- requirements.txt | 2 +- src/README.rst | 5 +++++ src/setup.py | 10 +++++----- src/sfctl/custom_cluster.py | 2 +- src/sfctl/tests/help_text_test.py | 2 +- src/sfctl/tests/version_test.py | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 029d937..689d62d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ vcrpy contextlib2 mock astroid==2.5.6 -requests==2.31.0 \ No newline at end of file +requests==2.32.0 \ No newline at end of file diff --git a/src/README.rst b/src/README.rst index ebdbed0..305de69 100644 --- a/src/README.rst +++ b/src/README.rst @@ -16,6 +16,11 @@ To get started, after installation run the following: Change Log ========== +11.2.1 +---------- +- Updated versions of dependency libraries + + 11.2.0 ---------- - Updated to use 8.2 Service fabric SDK diff --git a/src/setup.py b/src/setup.py index 23083a8..367a804 100644 --- a/src/setup.py +++ b/src/setup.py @@ -17,7 +17,7 @@ def read(fname): setup( name='sfctl', - version='11.2.0', + version='11.2.1', description='Azure Service Fabric command line', long_description=read('README.rst'), url='https://github.com/Azure/service-fabric-cli', @@ -31,12 +31,12 @@ setup( 'Environment :: Console', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8' + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10' ], keywords='servicefabric azure', - python_requires='>3.5, <4', + python_requires='>3.8, <4', packages=[ 'sfctl', 'sfctl.helps', diff --git a/src/sfctl/custom_cluster.py b/src/sfctl/custom_cluster.py index bc89004..1942dd9 100644 --- a/src/sfctl/custom_cluster.py +++ b/src/sfctl/custom_cluster.py @@ -272,7 +272,7 @@ def sfctl_cluster_version_matches(cluster_version, sfctl_version): :return: True if they are a match. False otherwise. """ - if sfctl_version in ['11.2.0']: + if sfctl_version in ['11.2.1']: return cluster_version.startswith('8') or cluster_version.startswith('9') diff --git a/src/sfctl/tests/help_text_test.py b/src/sfctl/tests/help_text_test.py index b1f33dc..b67d2c2 100644 --- a/src/sfctl/tests/help_text_test.py +++ b/src/sfctl/tests/help_text_test.py @@ -185,7 +185,7 @@ class HelpTextTests(unittest.TestCase): # Do not split the help_command, as that breaks behavior: # Linux ignores the splits and takes only the first. - pipe = Popen(help_command, shell=True, stdout=PIPE, stderr=PIPE) + pipe = Popen(help_command, shell=False, stdout=PIPE, stderr=PIPE) # returned_string and err are returned as bytes (returned_string, err) = pipe.communicate() diff --git a/src/sfctl/tests/version_test.py b/src/sfctl/tests/version_test.py index 4ccf92d..54449fe 100644 --- a/src/sfctl/tests/version_test.py +++ b/src/sfctl/tests/version_test.py @@ -16,9 +16,9 @@ class VersionTests(unittest.TestCase): note: this will require changing the sfctl_version on releases """ - sfctl_version = '11.2.0' + sfctl_version = '11.2.1' - pipe = Popen('sfctl --version', shell=True, stdout=PIPE, stderr=PIPE) + pipe = Popen('sfctl --version', shell=False, stdout=PIPE, stderr=PIPE) # returned_string and err are returned as bytes (returned_string, err) = pipe.communicate()