Skip to content

Commit 9e780fd

Browse files
iscai-msftiscai-msft
authored
Merge branch 'master' into restapi_auto_netapp/resource-manager
2 parents 63a54ff + 26eb888 commit 9e780fd

File tree

159 files changed

+6573
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+6573
-232
lines changed

‎.azure-pipelines/client.yml

+35-32
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Variables:
1+
# Variables:
22
# 'build_targeting_string' comma separated glob strings selecting the packages that should be built. EG: "azure-keyvault,azure-mgmt-batch" or "azure-*"
33
# 'codecov-python-repository-token' Is the codecov.io repository token.
4-
# 'long_running_tests' Is a boolean indicating that the long-running tests should be executed.
4+
# 'long_running_tests' Is a boolean indicating that the long-running tests should be executed.
55

66
trigger:
77
- master
@@ -22,7 +22,7 @@ jobs:
2222
versionSpec: $(PythonVersion)
2323

2424
- script: |
25-
pip install wheel setuptools pathlib twine readme-renderer[md]
25+
pip install wheel setuptools pathlib twine readme-renderer[md]
2626
displayName: 'Prep Environment'
2727
2828
- task: PythonScript@0
@@ -36,8 +36,10 @@ jobs:
3636
displayName: 'Verify Readme'
3737
3838
- task: PublishBuildArtifacts@1
39-
displayName: 'Publish Artifacts'
4039
condition: succeededOrFailed()
40+
displayName: 'Publish Artifacts'
41+
inputs:
42+
artifactName: packages
4143

4244
- job: 'Analyze'
4345

@@ -61,7 +63,7 @@ jobs:
6163
versionSpec: '$(PythonVersion)'
6264

6365
- script: |
64-
pip install wheel Jinja2
66+
pip install wheel Jinja2
6567
displayName: 'Prep Environment'
6668
6769
- task: PythonScript@0
@@ -77,9 +79,10 @@ jobs:
7779
displayName: 'Component Detection'
7880

7981
- task: PublishBuildArtifacts@1
80-
# To Publish artifacts generated by the 'Analyze dependencies' task under 'Analyze' job
81-
displayName: 'Publish Artifacts'
8282
condition: succeededOrFailed()
83+
displayName: 'Publish Report Artifacts'
84+
inputs:
85+
artifactName: reports
8386

8487
- job: 'Generic_Tests'
8588

@@ -127,28 +130,28 @@ jobs:
127130
versionSpec: '$(PythonVersion)'
128131

129132
- script: |
130-
pip install pathlib twine codecov beautifulsoup4
133+
pip install pathlib twine codecov beautifulsoup4
131134
displayName: 'Prep Environment'
132135
133136
- task: PythonScript@0
134137
displayName: 'Setup and Run Tests'
135138
inputs:
136139
scriptPath: 'scripts/devops_tasks/setup_execute_tests.py'
137140
arguments: '"$(build_targeting_string)" --junitxml="junit/test-results.xml"'
138-
141+
139142
- task: PublishTestResults@2
140143
condition: succeededOrFailed()
141144
inputs:
142145
testResultsFiles: 'junit/test-results.xml'
143146
testRunTitle: '$(OSName) Python $(PythonVersion)'
144147

145148
- script: |
146-
coverage xml
147-
coverage html
149+
coverage xml
150+
coverage html
148151
displayName: 'Generate Coverage XML'
149152
150153
- script: |
151-
codecov -t $(codecov-python-repository-token)
154+
codecov -t $(codecov-python-repository-token)
152155
displayName: 'Publish Code Cov'
153156
condition: ne(variables['codecov-python-repository-token'], '')
154157
@@ -181,18 +184,18 @@ jobs:
181184
versionSpec: '3.7'
182185

183186
- script: |
184-
sudo apt-get install build-essential libsqlite3-dev sqlite3 bzip2 libbz2-dev zlib1g-dev libssl-dev openssl libgdbm-dev liblzma-dev libreadline-dev libncursesw5-dev libffi-dev uuid-dev
185-
cd ~/
186-
git clone https://github.com/python/cpython.git
187-
cd cpython
188-
mkdir debug
189-
cd debug
190-
../configure --enable-optimizations --prefix=$HOME
191-
make install
192-
cd $(Build.SourcesDirectory)
193-
PATH=/home/vsts/bin:$PATH
194-
python3 -m ensurepip
195-
python ./scripts/devops_tasks/setup_execute_tests.py -p python3 "$(build_targeting_string)"
187+
sudo apt-get install build-essential libsqlite3-dev sqlite3 bzip2 libbz2-dev zlib1g-dev libssl-dev openssl libgdbm-dev liblzma-dev libreadline-dev libncursesw5-dev libffi-dev uuid-dev
188+
cd ~/
189+
git clone https://github.com/python/cpython.git
190+
cd cpython
191+
mkdir debug
192+
cd debug
193+
../configure --enable-optimizations --prefix=$HOME
194+
make install
195+
cd $(Build.SourcesDirectory)
196+
PATH=/home/vsts/bin:$PATH
197+
python3 -m ensurepip
198+
python ./scripts/devops_tasks/setup_execute_tests.py -p python3 "$(build_targeting_string)"
196199
displayName: 'Setup - Run Filtered Tests "Nightly" Python'
197200
continueOnError: true
198201
@@ -213,16 +216,16 @@ jobs:
213216
versionSpec: '3.7'
214217

215218
- script: |
216-
pip install pathlib twine
219+
pip install pathlib twine
217220
displayName: 'Prep Environment'
218221
219222
- script: |
220-
cd ~/
221-
wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
222-
tar xf pypy3-v6.0.0-linux64.tar.bz2
223-
cd $(Build.SourcesDirectory)
224-
PATH=/home/vsts/pypy3-v6.0.0-linux64/bin/:$PATH
225-
pypy3 -m ensurepip
226-
python ./scripts/devops_tasks/setup_execute_tests.py -p pypy3 "$(build_targeting_string)"
223+
cd ~/
224+
wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v6.0.0-linux64.tar.bz2
225+
tar xf pypy3-v6.0.0-linux64.tar.bz2
226+
cd $(Build.SourcesDirectory)
227+
PATH=/home/vsts/pypy3-v6.0.0-linux64/bin/:$PATH
228+
pypy3 -m ensurepip
229+
python ./scripts/devops_tasks/setup_execute_tests.py -p pypy3 "$(build_targeting_string)"
227230
displayName: 'Setup and Run Filtered Tests PyPy3'
228231
continueOnError: true

‎.github/CODEOWNERS

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
/azure-applicationinsights/ @alexeldeib
66
/azure-batch/ @annatisch @matthchr
7+
/azure-cognitiveservices-vision-customvision/ @areddish
78
/azure-keyvault/ @schaabs
89
/azure-loganalytics/ @alexeldeib
910
/azure-mgmt-batch/ @annatisch @matthchr
@@ -12,6 +13,7 @@
1213
/azure-mgmt-consumption/ @sandeepnl
1314
/azure-mgmt-containerinstance/ @samkreter @xizhamsft
1415
/azure-mgmt-containerregistry/ @djyou
16+
/azure-mgmt-containerservice/ @mboersma
1517
/azure-mgmt-cosmosdb/ @dmakwana
1618
/azure-mgmt-datafactory/ @hvermis
1719
/azure-mgmt-datalake-analytics/ @ro-joowan

‎azure-cognitiveservices-knowledge-nspkg/README.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ This is the Microsoft Azure Cognitive Services Knowledge namespace package.
55

66
This package is not intended to be installed directly by the end user.
77

8-
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy. To avoid issues with package servers that does not support python_requires, a Python 3 package is installed but is empty.
8+
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
9+
To avoid issues with package servers that does not support python_requires, a Python 3 package is installed but is empty.
910

1011
It provides the necessary files for other packages to extend the azure.cognitiveservices.knowledge namespace.
1112

‎azure-cognitiveservices-language-nspkg/MANIFEST.in

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
include *.rst
2+
include azure/cognitiveservices/__init__.py
3+
include azure/cognitiveservices/language/__init__.py

‎azure-cognitiveservices-language-nspkg/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Language namespace package.
66
This package is not intended to be installed directly by the end user.
77

88
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
9-
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
9+
To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty.
1010

1111
It provides the necessary files for other packages to extend the azure.cognitiveservices.language namespace.
1212

‎azure-cognitiveservices-language-nspkg/setup.py

+15-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Licensed under the MIT License. See License.txt in the project root for
66
# license information.
77
#--------------------------------------------------------------------------
8-
8+
import sys
99
from setuptools import setup
1010

1111
# azure v0.x is not compatible with this package
@@ -23,9 +23,16 @@
2323
except ImportError:
2424
pass
2525

26+
PACKAGES = []
27+
# Do an empty package on Python 3 and not python_requires, since not everybody is ready
28+
# https://github.com/Azure/azure-sdk-for-python/issues/3447
29+
# https://github.com/Azure/azure-sdk-for-python/issues/3481
30+
if sys.version_info[0] < 3:
31+
PACKAGES = ['azure.cognitiveservices.language']
32+
2633
setup(
2734
name='azure-cognitiveservices-language-nspkg',
28-
version='3.0.0',
35+
version='3.0.1',
2936
description='Microsoft Azure Cognitive Services Language Namespace Package [Internal]',
3037
long_description=open('README.rst', 'r').read(),
3138
license='MIT License',
@@ -37,13 +44,15 @@
3744
'Programming Language :: Python',
3845
'Programming Language :: Python :: 2',
3946
'Programming Language :: Python :: 2.7',
47+
'Programming Language :: Python :: 3',
48+
'Programming Language :: Python :: 3.4',
49+
'Programming Language :: Python :: 3.5',
50+
'Programming Language :: Python :: 3.6',
51+
'Programming Language :: Python :: 3.7',
4052
'License :: OSI Approved :: MIT License',
4153
],
4254
zip_safe=False,
43-
packages=[
44-
'azure.cognitiveservices.language',
45-
],
46-
python_requires='<3',
55+
packages=PACKAGES,
4756
install_requires=[
4857
'azure-cognitiveservices-nspkg>=3.0.0',
4958
]

‎azure-cognitiveservices-nspkg/MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
include *.rst
2+
include azure/cognitiveservices/__init__.py

‎azure-cognitiveservices-nspkg/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services namespace package.
66
This package is not intended to be installed directly by the end user.
77

88
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
9-
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
9+
To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty.
1010

1111
It provides the necessary files for other packages to extend the azure.cognitiveservices namespace.
1212

‎azure-cognitiveservices-nspkg/setup.py

+15-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Licensed under the MIT License. See License.txt in the project root for
66
# license information.
77
#--------------------------------------------------------------------------
8-
8+
import sys
99
from setuptools import setup
1010

1111
# azure v0.x is not compatible with this package
@@ -23,9 +23,16 @@
2323
except ImportError:
2424
pass
2525

26+
PACKAGES = []
27+
# Do an empty package on Python 3 and not python_requires, since not everybody is ready
28+
# https://github.com/Azure/azure-sdk-for-python/issues/3447
29+
# https://github.com/Azure/azure-sdk-for-python/issues/3481
30+
if sys.version_info[0] < 3:
31+
PACKAGES = ['azure.cognitiveservices']
32+
2633
setup(
2734
name='azure-cognitiveservices-nspkg',
28-
version='3.0.0',
35+
version='3.0.1',
2936
description='Microsoft Azure Cognitive Services Namespace Package [Internal]',
3037
long_description=open('README.rst', 'r').read(),
3138
license='MIT License',
@@ -37,13 +44,15 @@
3744
'Programming Language :: Python',
3845
'Programming Language :: Python :: 2',
3946
'Programming Language :: Python :: 2.7',
47+
'Programming Language :: Python :: 3',
48+
'Programming Language :: Python :: 3.4',
49+
'Programming Language :: Python :: 3.5',
50+
'Programming Language :: Python :: 3.6',
51+
'Programming Language :: Python :: 3.7',
4052
'License :: OSI Approved :: MIT License',
4153
],
4254
zip_safe=False,
43-
packages=[
44-
'azure.cognitiveservices',
45-
],
46-
python_requires='<3',
55+
packages=PACKAGES,
4756
install_requires=[
4857
'azure-nspkg>=3.0.0',
4958
]

‎azure-cognitiveservices-search-nspkg/MANIFEST.in

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
include *.rst
2+
include azure/cognitiveservices/__init__.py
3+
include azure/cognitiveservices/search/__init__.py

‎azure-cognitiveservices-search-nspkg/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Search namespace package.
66
This package is not intended to be installed directly by the end user.
77

88
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
9-
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
9+
To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty.
1010

1111
It provides the necessary files for other packages to extend the azure.cognitiveservices.search namespace.
1212

‎azure-cognitiveservices-search-nspkg/setup.cfg

-2
This file was deleted.

‎azure-cognitiveservices-search-nspkg/setup.py

+15-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Licensed under the MIT License. See License.txt in the project root for
66
# license information.
77
#--------------------------------------------------------------------------
8-
8+
import sys
99
from setuptools import setup
1010

1111
# azure v0.x is not compatible with this package
@@ -23,9 +23,16 @@
2323
except ImportError:
2424
pass
2525

26+
PACKAGES = []
27+
# Do an empty package on Python 3 and not python_requires, since not everybody is ready
28+
# https://github.com/Azure/azure-sdk-for-python/issues/3447
29+
# https://github.com/Azure/azure-sdk-for-python/issues/3481
30+
if sys.version_info[0] < 3:
31+
PACKAGES = ['azure.cognitiveservices.search']
32+
2633
setup(
2734
name='azure-cognitiveservices-search-nspkg',
28-
version='3.0.0',
35+
version='3.0.1',
2936
description='Microsoft Azure Cognitive Services Search Namespace Package [Internal]',
3037
long_description=open('README.rst', 'r').read(),
3138
license='MIT License',
@@ -37,13 +44,15 @@
3744
'Programming Language :: Python',
3845
'Programming Language :: Python :: 2',
3946
'Programming Language :: Python :: 2.7',
47+
'Programming Language :: Python :: 3',
48+
'Programming Language :: Python :: 3.4',
49+
'Programming Language :: Python :: 3.5',
50+
'Programming Language :: Python :: 3.6',
51+
'Programming Language :: Python :: 3.7',
4052
'License :: OSI Approved :: MIT License',
4153
],
4254
zip_safe=False,
43-
packages=[
44-
'azure.cognitiveservices.search',
45-
],
46-
python_requires='<3',
55+
packages=PACKAGES,
4756
install_requires=[
4857
'azure-cognitiveservices-nspkg>=3.0.0',
4958
]

‎azure-cognitiveservices-vision-nspkg/MANIFEST.in

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
include *.rst
2+
include azure/cognitiveservices/__init__.py
3+
include azure/cognitiveservices/vision/__init__.py

‎azure-cognitiveservices-vision-nspkg/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This is the Microsoft Azure Cognitive Services Vision namespace package.
66
This package is not intended to be installed directly by the end user.
77

88
Since version 3.0, this is Python 2 package only, Python 3.x SDKs will use `PEP420 <https://www.python.org/dev/peps/pep-0420/>` as namespace package strategy.
9-
This package will use `python_requires` to enforce Python 2 installation. This implies that you might see this package on Python 3 environment if you have pip < 9.0 or setuptools < 24.2.0.
9+
To avoid issues with package servers that does not support `python_requires`, a Python 3 package is installed but is empty.
1010

1111
It provides the necessary files for other packages to extend the azure.cognitiveservices.vision namespace.
1212

‎azure-cognitiveservices-vision-nspkg/setup.cfg

-2
This file was deleted.

0 commit comments

Comments
 (0)