Skip to content

Commit f089faa

Browse files
authored
Update supported version (#60)
1 parent a53ceb9 commit f089faa

File tree

7 files changed

+28
-12
lines changed

7 files changed

+28
-12
lines changed

azure/batch_extensions/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
55

6-
VERSION = "1.1.0"
6+
VERSION = "1.1.1"

batch-cli-extensions/azext_batch/commands.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414

1515
logger = get_logger(__name__)
16-
SUPPORTED_BATCH_VERSION = "4.1"
16+
SUPPORTED_BATCH_VERSION = "4.2"
1717
SUPPORTED_BMGMT_VERSION = "4.2"
18-
SUPPORTED_BATCH_EXT_VERSION = "1.1"
18+
SUPPORTED_BATCH_EXT_VERSION = "1.2"
1919

2020

2121
def confirm_version(current, supported, package):

batch-cli-extensions/azext_batch/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Licensed under the MIT License. See License.txt in the project root for license information.
44
# --------------------------------------------------------------------------------------------
55

6-
VERSION = "2.1.0"
6+
VERSION = "2.2.2"

batch-cli-extensions/setup.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
# --------------------------------------------------------------------------------------------
77

88
import os
9+
import re
910
from codecs import open
1011
from setuptools import setup, find_packages
1112

12-
VERSION = '2.2.1'
13-
1413
# The full list of classifiers is available at
1514
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
1615
CLASSIFIERS = [
@@ -29,14 +28,22 @@
2928

3029
DEPENDENCIES = []
3130

31+
# Version extraction inspired from 'requests'
32+
with open(os.path.join('azext_batch', 'version.py'), 'r') as fd:
33+
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
34+
fd.read(), re.MULTILINE).group(1)
35+
36+
if not version:
37+
raise RuntimeError('Cannot find version information')
38+
3239
with open('README.rst', 'r', encoding='utf-8') as f:
3340
README = f.read()
3441
with open('HISTORY.rst', 'r', encoding='utf-8') as f:
3542
HISTORY = f.read()
3643

3744
setup(
3845
name='azure-batch-cli-extensions',
39-
version=VERSION,
46+
version=version,
4047
description='Additional commands for working with Azure Batch service',
4148
long_description=README + '\n\n' + HISTORY,
4249
license='MIT',

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ setuptools==30.4.0
1717
six==1.10.0
1818
tabulate==0.7.5
1919
vcrpy==1.10.3
20-
azure-cli==2.0.31
20+
azure-cli==2.0.32
2121
azure-storage-blob==1.1.0

scripts/dev_setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ def exec_command(command):
3030
# install general requirements and azure-cli
3131
exec_command('pip install -r requirements.txt')
3232

33+
# upgrade to latest azure-batch
34+
exec_command('pip install --upgrade azure-batch')
35+
3336
# install automation package
3437
exec_command('pip install -e ./scripts')
3538

setup.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
# Licensed under the MIT License. See License.txt in the project root for license information.
66
# --------------------------------------------------------------------------------------------
77

8-
8+
import os
9+
import re
910
from codecs import open
1011
from setuptools import setup
1112

12-
VERSION = '1.1.1'
13-
1413
# The full list of classifiers is available at
1514
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
1615
CLASSIFIERS = [
@@ -38,6 +37,13 @@
3837
":python_version<'3.4'": ['pathlib>=1.0.1']
3938
}
4039

40+
# Version extraction inspired from 'requests'
41+
with open(os.path.join('azure/batch_extensions', 'version.py'), 'r') as fd:
42+
version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
43+
fd.read(), re.MULTILINE).group(1)
44+
45+
if not version:
46+
raise RuntimeError('Cannot find version information')
4147

4248
with open('README.rst', 'r', encoding='utf-8') as f:
4349
README = f.read()
@@ -46,7 +52,7 @@
4652

4753
setup(
4854
name='azure-batch-extensions',
49-
version=VERSION,
55+
version=version,
5056
description='Microsoft Azure Batch Extended Features',
5157
long_description=README + '\n\n' + HISTORY,
5258
license='MIT',

0 commit comments

Comments
 (0)