From 94b5c050828550fdedd83b7b785066fb0ea41247 Mon Sep 17 00:00:00 2001 From: jeffj6123 Date: Thu, 10 Dec 2020 14:09:22 -0800 Subject: [PATCH] adding 10.1 specific changes --- src/README.rst | 5 +++++ src/setup.py | 6 ++++-- src/sfctl/custom_cluster.py | 2 +- src/sfctl/tests/version_test.py | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/README.rst b/src/README.rst index b7e6969..68fced6 100644 --- a/src/README.rst +++ b/src/README.rst @@ -24,6 +24,11 @@ Unreleased ---------- - Update imports for Service fabric runtime version 7.2 (#225) +10.1.0 +---------- +(back port of 11.0.0 for Linux 7.2) + + 10.0.0 ---------- - Update imports for Service fabric runtime version 7.1 (#218) diff --git a/src/setup.py b/src/setup.py index 3191435..f788d52 100644 --- a/src/setup.py +++ b/src/setup.py @@ -17,7 +17,7 @@ def read(fname): setup( name='sfctl', - version='11.0.0', + version='10.1.0', description='Azure Service Fabric command line', long_description=read('README.rst'), url='https://github.com/Azure/service-fabric-cli', @@ -54,7 +54,9 @@ setup( 'sfmergeutility==0.1.6', 'psutil', 'portalocker', - 'six' + 'six', + 'joblib', + 'tqdm' ], extras_require={ 'test': [ diff --git a/src/sfctl/custom_cluster.py b/src/sfctl/custom_cluster.py index e2f8742..2b54016 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.0.0']: + if sfctl_version in ['10.1.0']: return cluster_version.startswith('7.2') diff --git a/src/sfctl/tests/version_test.py b/src/sfctl/tests/version_test.py index 49eb96d..82dceb0 100644 --- a/src/sfctl/tests/version_test.py +++ b/src/sfctl/tests/version_test.py @@ -16,7 +16,7 @@ class VersionTests(unittest.TestCase): note: this will require changing the sfctl_version on releases """ - sfctl_version = '11.0.0' + sfctl_version = '10.1.0' pipe = Popen('sfctl --version', shell=True, stdout=PIPE, stderr=PIPE) # returned_string and err are returned as bytes