commit e91e7c80db45b7d973749bbfaae699ffdea5a5c2 Author: CentOS Sources Date: Tue May 7 08:10:34 2019 -0400 import python3-azure-sdk-4.0.0-8.el8 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a771ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +SOURCES/SecretStorage-2.3.1.tar.gz +SOURCES/adal-1.2.0.tar.gz +SOURCES/azure-sdk-4.0.0.tar.gz +SOURCES/certifi-2018.10.15.tar.gz +SOURCES/isodate-0.5.4.tar.gz +SOURCES/keyring-13.2.1.tar.gz +SOURCES/msrest-0.6.2.tar.gz +SOURCES/msrestazure-0.5.1.tar.gz diff --git a/.python3-azure-sdk.metadata b/.python3-azure-sdk.metadata new file mode 100644 index 0000000..4fce3cf --- /dev/null +++ b/.python3-azure-sdk.metadata @@ -0,0 +1,8 @@ +e255c82842e7c50cd9ff9942bafd647e59eb5459 SOURCES/SecretStorage-2.3.1.tar.gz +1601d78ad0edf639c0716e8dc80bd8e9e67932ac SOURCES/adal-1.2.0.tar.gz +8be4111f72e723c02176a55b2912ccf39cb91c53 SOURCES/azure-sdk-4.0.0.tar.gz +73eb43fcb367b3d2bd346d99df89e911da7fee05 SOURCES/certifi-2018.10.15.tar.gz +40ccf07a8e46284a79cfc4d41e151f71ae63f535 SOURCES/isodate-0.5.4.tar.gz +0e35ea34961f9762de35bf62fcdfef65d44cfbe1 SOURCES/keyring-13.2.1.tar.gz +d5fb55c3c6f7b61d166c530d7694bdb51503e644 SOURCES/msrest-0.6.2.tar.gz +ab7f31d5c3c7264539660bab88778795de7b90ea SOURCES/msrestazure-0.5.1.tar.gz diff --git a/SOURCES/certifi-2018.10.15-use-system-cert.patch b/SOURCES/certifi-2018.10.15-use-system-cert.patch new file mode 100644 index 0000000..68328ff --- /dev/null +++ b/SOURCES/certifi-2018.10.15-use-system-cert.patch @@ -0,0 +1,15 @@ +diff -r -u certifi-2018.10.15.orig/certifi/core.py certifi-2018.10.15/certifi/core.py +--- certifi-2018.10.15.orig/certifi/core.py 2018-01-18 15:27:24.000000000 -0500 ++++ certifi-2018.10.15/certifi/core.py 2018-12-13 11:08:30.834151536 -0500 +@@ -19,9 +19,7 @@ + + + def where(): +- f = os.path.dirname(__file__) +- +- return os.path.join(f, 'cacert.pem') ++ return '/etc/pki/tls/certs/ca-bundle.crt' + + + def old_where(): +Only in certifi-2018.10.15/certifi: core.py~ diff --git a/SOURCES/python-adal-1.2.0-tests.patch b/SOURCES/python-adal-1.2.0-tests.patch new file mode 100644 index 0000000..29e86ba --- /dev/null +++ b/SOURCES/python-adal-1.2.0-tests.patch @@ -0,0 +1,23 @@ +diff -up ./tests/test_mex.py.orig ./tests/test_mex.py +--- ./tests/test_mex.py.orig 2018-10-19 00:29:42.000000000 +0200 ++++ ./tests/test_mex.py 2018-11-02 01:34:24.851553069 +0100 +@@ -25,6 +25,7 @@ + # + #------------------------------------------------------------------------------ + import os ++from distutils.version import LooseVersion + import unittest + import httpretty + from tests import util +@@ -52,7 +53,10 @@ class Test_Mex(unittest.TestCase): + mex.discover() + self.fail('No exception was thrown caused by failed request') + except Exception as exp: +- self.assertEqual(exp.args[0], 'Mex Get request returned http error: 500 and server response: HTTPretty :)') ++ if LooseVersion(httpretty.__version__) >= LooseVersion("0.9.0"): ++ self.assertEqual(exp.args[0], 'Mex Get request returned http error: 500 and server response: {"message": "HTTPretty :)"}') ++ else: ++ self.assertEqual(exp.args[0], 'Mex Get request returned http error: 500 and server response: HTTPretty :)') + + @httpretty.activate + def _happyPathTest(self, file_name, expectedUrl): diff --git a/SOURCES/python-azure-sdk-4.0.0-nspkgs.patch b/SOURCES/python-azure-sdk-4.0.0-nspkgs.patch new file mode 100644 index 0000000..a27a78d --- /dev/null +++ b/SOURCES/python-azure-sdk-4.0.0-nspkgs.patch @@ -0,0 +1,12 @@ +diff -up ./setup.py.orig ./setup.py +--- ./setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./setup.py 2018-08-06 11:25:14.496926373 +0200 +@@ -27,7 +27,7 @@ nspkg_packages.sort(key = lambda x: len( + meta_package = ['azure-mgmt', 'azure'] + + # So content packages are: +-content_package = [p for p in packages if p not in meta_package+nspkg_packages] ++content_package = [p for p in packages if p not in meta_package+['azure-sdk-tools']] + # Move azure-common at the beginning + content_package.remove("azure-common") + content_package.insert(0, "azure-common") diff --git a/SOURCES/python-azure-sdk-4.0.0-setup.patch b/SOURCES/python-azure-sdk-4.0.0-setup.patch new file mode 100644 index 0000000..41bf042 --- /dev/null +++ b/SOURCES/python-azure-sdk-4.0.0-setup.patch @@ -0,0 +1,1190 @@ +diff -up ./azure-applicationinsights/setup.py.orig ./azure-applicationinsights/setup.py +--- ./azure-applicationinsights/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-applicationinsights/setup.py 2018-08-06 13:47:14.781468315 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.5.4,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-batch/setup.py.orig ./azure-batch/setup.py +--- ./azure-batch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-batch/setup.py 2018-08-06 13:47:14.781468315 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-language-spellcheck/setup.py.orig ./azure-cognitiveservices-language-spellcheck/setup.py +--- ./azure-cognitiveservices-language-spellcheck/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-language-spellcheck/setup.py 2018-08-06 13:47:14.782468291 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-language-textanalytics/setup.py.orig ./azure-cognitiveservices-language-textanalytics/setup.py +--- ./azure-cognitiveservices-language-textanalytics/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-language-textanalytics/setup.py 2018-08-06 13:47:14.782468291 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.24,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-autosuggest/setup.py.orig ./azure-cognitiveservices-search-autosuggest/setup.py +--- ./azure-cognitiveservices-search-autosuggest/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-autosuggest/setup.py 2018-08-06 13:47:14.783468265 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-customsearch/setup.py.orig ./azure-cognitiveservices-search-customsearch/setup.py +--- ./azure-cognitiveservices-search-customsearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-customsearch/setup.py 2018-08-06 13:47:14.783468265 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.24,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-entitysearch/setup.py.orig ./azure-cognitiveservices-search-entitysearch/setup.py +--- ./azure-cognitiveservices-search-entitysearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-entitysearch/setup.py 2018-08-06 13:47:14.784468240 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-imagesearch/setup.py.orig ./azure-cognitiveservices-search-imagesearch/setup.py +--- ./azure-cognitiveservices-search-imagesearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-imagesearch/setup.py 2018-08-06 13:47:14.784468240 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-newssearch/setup.py.orig ./azure-cognitiveservices-search-newssearch/setup.py +--- ./azure-cognitiveservices-search-newssearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-newssearch/setup.py 2018-08-06 13:47:14.785468215 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-videosearch/setup.py.orig ./azure-cognitiveservices-search-videosearch/setup.py +--- ./azure-cognitiveservices-search-videosearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-videosearch/setup.py 2018-08-06 13:47:14.785468215 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-visualsearch/setup.py.orig ./azure-cognitiveservices-search-visualsearch/setup.py +--- ./azure-cognitiveservices-search-visualsearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-visualsearch/setup.py 2018-08-06 13:47:14.786468190 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-search-websearch/setup.py.orig ./azure-cognitiveservices-search-websearch/setup.py +--- ./azure-cognitiveservices-search-websearch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-search-websearch/setup.py 2018-08-06 13:47:14.786468190 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-vision-computervision/setup.py.orig ./azure-cognitiveservices-vision-computervision/setup.py +--- ./azure-cognitiveservices-vision-computervision/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-vision-computervision/setup.py 2018-08-06 13:47:14.787468165 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.29,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-vision-contentmoderator/setup.py.orig ./azure-cognitiveservices-vision-contentmoderator/setup.py +--- ./azure-cognitiveservices-vision-contentmoderator/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-vision-contentmoderator/setup.py 2018-08-06 13:47:14.787468165 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.24,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-vision-customvision/setup.py.orig ./azure-cognitiveservices-vision-customvision/setup.py +--- ./azure-cognitiveservices-vision-customvision/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-vision-customvision/setup.py 2018-08-06 13:47:14.787468165 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.28,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-cognitiveservices-vision-face/setup.py.orig ./azure-cognitiveservices-vision-face/setup.py +--- ./azure-cognitiveservices-vision-face/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-cognitiveservices-vision-face/setup.py 2018-08-06 13:47:14.788468140 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.24,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-eventgrid/setup.py.orig ./azure-eventgrid/setup.py +--- ./azure-eventgrid/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-eventgrid/setup.py 2018-08-06 13:47:14.788468140 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-graphrbac/setup.py.orig ./azure-graphrbac/setup.py +--- ./azure-graphrbac/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-graphrbac/setup.py 2018-08-06 13:47:14.788468140 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-keyvault/setup.py.orig ./azure-keyvault/setup.py +--- ./azure-keyvault/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-keyvault/setup.py 2018-08-06 13:47:14.788468140 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + 'cryptography>=2.1.4', + 'requests>=2.18.4' + ], +diff -up ./azure-loganalytics/setup.py.orig ./azure-loganalytics/setup.py +--- ./azure-loganalytics/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-loganalytics/setup.py 2018-08-06 13:47:14.789468115 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.29,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-advisor/setup.py.orig ./azure-mgmt-advisor/setup.py +--- ./azure-mgmt-advisor/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-advisor/setup.py 2018-08-06 13:47:14.789468115 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-applicationinsights/setup.py.orig ./azure-mgmt-applicationinsights/setup.py +--- ./azure-mgmt-applicationinsights/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-applicationinsights/setup.py 2018-08-06 13:47:14.789468115 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-authorization/setup.py.orig ./azure-mgmt-authorization/setup.py +--- ./azure-mgmt-authorization/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-authorization/setup.py 2018-08-06 13:47:14.789468115 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1,>=1.1.12', ++ 'azure-common>=1.1,<2,>=1.1.12', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-batchai/setup.py.orig ./azure-mgmt-batchai/setup.py +--- ./azure-mgmt-batchai/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-batchai/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-batch/setup.py.orig ./azure-mgmt-batch/setup.py +--- ./azure-mgmt-batch/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-batch/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-billing/setup.py.orig ./azure-mgmt-billing/setup.py +--- ./azure-mgmt-billing/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-billing/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-botservice/setup.py.orig ./azure-mgmt-botservice/setup.py +--- ./azure-mgmt-botservice/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-botservice/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-cdn/setup.py.orig ./azure-mgmt-cdn/setup.py +--- ./azure-mgmt-cdn/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-cdn/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-cognitiveservices/setup.py.orig ./azure-mgmt-cognitiveservices/setup.py +--- ./azure-mgmt-cognitiveservices/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-cognitiveservices/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-commerce/setup.py.orig ./azure-mgmt-commerce/setup.py +--- ./azure-mgmt-commerce/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-commerce/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-compute/setup.py.orig ./azure-mgmt-compute/setup.py +--- ./azure-mgmt-compute/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-compute/setup.py 2018-08-06 13:47:14.790468090 +0200 +@@ -79,7 +79,7 @@ setup( + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1,>=1.1.9', ++ 'azure-common>=1.1,<2,>=1.1.9', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-consumption/setup.py.orig ./azure-mgmt-consumption/setup.py +--- ./azure-mgmt-consumption/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-consumption/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-containerinstance/setup.py.orig ./azure-mgmt-containerinstance/setup.py +--- ./azure-mgmt-containerinstance/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-containerinstance/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-containerregistry/setup.py.orig ./azure-mgmt-containerregistry/setup.py +--- ./azure-mgmt-containerregistry/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-containerregistry/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -80,7 +80,7 @@ setup( + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1,>=1.1.10', ++ 'azure-common>=1.1,<2,>=1.1.10', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-containerservice/setup.py.orig ./azure-mgmt-containerservice/setup.py +--- ./azure-mgmt-containerservice/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-containerservice/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-cosmosdb/setup.py.orig ./azure-mgmt-cosmosdb/setup.py +--- ./azure-mgmt-cosmosdb/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-cosmosdb/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-datafactory/setup.py.orig ./azure-mgmt-datafactory/setup.py +--- ./azure-mgmt-datafactory/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-datafactory/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-datalake-analytics/setup.py.orig ./azure-mgmt-datalake-analytics/setup.py +--- ./azure-mgmt-datalake-analytics/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-datalake-analytics/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-datalake-store/setup.py.orig ./azure-mgmt-datalake-store/setup.py +--- ./azure-mgmt-datalake-store/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-datalake-store/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-datamigration/setup.py.orig ./azure-mgmt-datamigration/setup.py +--- ./azure-mgmt-datamigration/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-datamigration/setup.py 2018-08-06 13:47:14.791468065 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-devspaces/setup.py.orig ./azure-mgmt-devspaces/setup.py +--- ./azure-mgmt-devspaces/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-devspaces/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-devtestlabs/setup.py.orig ./azure-mgmt-devtestlabs/setup.py +--- ./azure-mgmt-devtestlabs/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-devtestlabs/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-dns/setup.py.orig ./azure-mgmt-dns/setup.py +--- ./azure-mgmt-dns/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-dns/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -80,7 +80,7 @@ setup( + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-documentdb/setup.py.orig ./azure-mgmt-documentdb/setup.py +--- ./azure-mgmt-documentdb/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-documentdb/setup.py 2018-08-06 13:47:29.022111043 +0200 +@@ -78,8 +78,8 @@ setup( + zip_safe=False, + packages=find_packages(), + install_requires=[ +- 'msrestazure~=0.4.7', +- 'azure-common~=1.1.5', ++ 'msrestazure>=0.4.7,<2.0.0', ++ 'azure-common>=1.1.5,<1.2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-eventgrid/setup.py.orig ./azure-mgmt-eventgrid/setup.py +--- ./azure-mgmt-eventgrid/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-eventgrid/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-eventhub/setup.py.orig ./azure-mgmt-eventhub/setup.py +--- ./azure-mgmt-eventhub/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-eventhub/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -80,7 +80,7 @@ setup( + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-hanaonazure/setup.py.orig ./azure-mgmt-hanaonazure/setup.py +--- ./azure-mgmt-hanaonazure/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-hanaonazure/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-iotcentral/setup.py.orig ./azure-mgmt-iotcentral/setup.py +--- ./azure-mgmt-iotcentral/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-iotcentral/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-iothubprovisioningservices/setup.py.orig ./azure-mgmt-iothubprovisioningservices/setup.py +--- ./azure-mgmt-iothubprovisioningservices/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-iothubprovisioningservices/setup.py 2018-08-06 13:47:14.792468040 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-iothub/setup.py.orig ./azure-mgmt-iothub/setup.py +--- ./azure-mgmt-iothub/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-iothub/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-keyvault/setup.py.orig ./azure-mgmt-keyvault/setup.py +--- ./azure-mgmt-keyvault/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-keyvault/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-loganalytics/setup.py.orig ./azure-mgmt-loganalytics/setup.py +--- ./azure-mgmt-loganalytics/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-loganalytics/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-logic/setup.py.orig ./azure-mgmt-logic/setup.py +--- ./azure-mgmt-logic/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-logic/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-machinelearningcompute/setup.py.orig ./azure-mgmt-machinelearningcompute/setup.py +--- ./azure-mgmt-machinelearningcompute/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-machinelearningcompute/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-managementgroups/setup.py.orig ./azure-mgmt-managementgroups/setup.py +--- ./azure-mgmt-managementgroups/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-managementgroups/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-managementpartner/setup.py.orig ./azure-mgmt-managementpartner/setup.py +--- ./azure-mgmt-managementpartner/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-managementpartner/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-maps/setup.py.orig ./azure-mgmt-maps/setup.py +--- ./azure-mgmt-maps/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-maps/setup.py 2018-08-06 13:47:14.793468015 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-marketplaceordering/setup.py.orig ./azure-mgmt-marketplaceordering/setup.py +--- ./azure-mgmt-marketplaceordering/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-marketplaceordering/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-media/setup.py.orig ./azure-mgmt-media/setup.py +--- ./azure-mgmt-media/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-media/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-monitor/setup.py.orig ./azure-mgmt-monitor/setup.py +--- ./azure-mgmt-monitor/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-monitor/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-msi/setup.py.orig ./azure-mgmt-msi/setup.py +--- ./azure-mgmt-msi/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-msi/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-network/setup.py.orig ./azure-mgmt-network/setup.py +--- ./azure-mgmt-network/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-network/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1,>=1.1.9', ++ 'azure-common>=1.1,<2,>=1.1.9', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-notificationhubs/setup.py.orig ./azure-mgmt-notificationhubs/setup.py +--- ./azure-mgmt-notificationhubs/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-notificationhubs/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-policyinsights/setup.py.orig ./azure-mgmt-policyinsights/setup.py +--- ./azure-mgmt-policyinsights/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-policyinsights/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-powerbiembedded/setup.py.orig ./azure-mgmt-powerbiembedded/setup.py +--- ./azure-mgmt-powerbiembedded/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-powerbiembedded/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-rdbms/setup.py.orig ./azure-mgmt-rdbms/setup.py +--- ./azure-mgmt-rdbms/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-rdbms/setup.py 2018-08-06 13:47:14.794467989 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-recoveryservicesbackup/setup.py.orig ./azure-mgmt-recoveryservicesbackup/setup.py +--- ./azure-mgmt-recoveryservicesbackup/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-recoveryservicesbackup/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-recoveryservices/setup.py.orig ./azure-mgmt-recoveryservices/setup.py +--- ./azure-mgmt-recoveryservices/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-recoveryservices/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-redis/setup.py.orig ./azure-mgmt-redis/setup.py +--- ./azure-mgmt-redis/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-redis/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-relay/setup.py.orig ./azure-mgmt-relay/setup.py +--- ./azure-mgmt-relay/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-relay/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-reservations/setup.py.orig ./azure-mgmt-reservations/setup.py +--- ./azure-mgmt-reservations/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-reservations/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-resource/setup.py.orig ./azure-mgmt-resource/setup.py +--- ./azure-mgmt-resource/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-resource/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1,>=1.1.9', ++ 'azure-common>=1.1,<2,>=1.1.9', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-scheduler/setup.py.orig ./azure-mgmt-scheduler/setup.py +--- ./azure-mgmt-scheduler/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-scheduler/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-search/setup.py.orig ./azure-mgmt-search/setup.py +--- ./azure-mgmt-search/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-search/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-servermanager/setup.py.orig ./azure-mgmt-servermanager/setup.py +--- ./azure-mgmt-servermanager/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-servermanager/setup.py 2018-08-06 13:47:14.795467964 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-servicebus/setup.py.orig ./azure-mgmt-servicebus/setup.py +--- ./azure-mgmt-servicebus/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-servicebus/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-servicefabric/setup.py.orig ./azure-mgmt-servicefabric/setup.py +--- ./azure-mgmt-servicefabric/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-servicefabric/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -80,7 +80,7 @@ setup( + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt/setup.py.orig ./azure-mgmt/setup.py +--- ./azure-mgmt/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -31,65 +31,65 @@ setup( + ], + zip_safe=False, + install_requires=[ +- 'azure-mgmt-advisor~=1.0', +- 'azure-mgmt-applicationinsights~=0.1.1', +- 'azure-mgmt-authorization~=0.50.0', +- 'azure-mgmt-batch~=5.0', +- 'azure-mgmt-batchai~=2.0', +- 'azure-mgmt-billing~=0.2.0', +- 'azure-mgmt-cdn~=3.0', +- 'azure-mgmt-cognitiveservices~=3.0', +- 'azure-mgmt-commerce~=1.0', +- 'azure-mgmt-compute~=4.0', +- 'azure-mgmt-consumption~=2.0', +- 'azure-mgmt-containerinstance~=1.0', +- 'azure-mgmt-containerregistry~=2.1', +- 'azure-mgmt-containerservice~=4.2', +- 'azure-mgmt-cosmosdb~=0.4.1', +- 'azure-mgmt-datafactory~=0.6.0', +- 'azure-mgmt-datalake-analytics~=0.6.0', +- 'azure-mgmt-datalake-store~=0.5.0', +- 'azure-mgmt-datamigration~=1.0', +- 'azure-mgmt-devspaces~=0.1.0', +- 'azure-mgmt-devtestlabs~=2.2', +- 'azure-mgmt-dns~=2.0', +- 'azure-mgmt-eventgrid~=1.0', +- 'azure-mgmt-eventhub~=2.1', +- 'azure-mgmt-hanaonazure~=0.1.1', +- 'azure-mgmt-iotcentral~=0.1.0', +- 'azure-mgmt-iothub~=0.5.0', +- 'azure-mgmt-iothubprovisioningservices~=0.2.0', +- 'azure-mgmt-keyvault~=1.0', +- 'azure-mgmt-loganalytics~=0.2.0', +- 'azure-mgmt-logic~=3.0', +- 'azure-mgmt-machinelearningcompute~=0.4.1', +- 'azure-mgmt-managementgroups~=0.1.0', +- 'azure-mgmt-managementpartner~=0.1.0', +- 'azure-mgmt-maps~=0.1.0', +- 'azure-mgmt-marketplaceordering~=0.1.0', +- 'azure-mgmt-media~=1.0.0rc2', +- 'azure-mgmt-monitor~=0.5.2', +- 'azure-mgmt-msi~=0.2.0', +- 'azure-mgmt-network~=2.0', +- 'azure-mgmt-notificationhubs~=2.0', +- 'azure-mgmt-policyinsights~=0.1.0', +- 'azure-mgmt-powerbiembedded~=2.0', +- 'azure-mgmt-rdbms~=1.2', +- 'azure-mgmt-recoveryservices~=0.3.0', +- 'azure-mgmt-recoveryservicesbackup~=0.3.0', +- 'azure-mgmt-redis~=5.0', +- 'azure-mgmt-relay~=0.1.0', +- 'azure-mgmt-reservations~=0.2.1', +- 'azure-mgmt-resource~=2.0', +- 'azure-mgmt-scheduler~=2.0', +- 'azure-mgmt-search~=2.0', +- 'azure-mgmt-servicebus~=0.5.1', +- 'azure-mgmt-servicefabric~=0.2.0', +- 'azure-mgmt-signalr~=0.1.0', +- 'azure-mgmt-sql~=0.9.1', +- 'azure-mgmt-storage~=2.0', +- 'azure-mgmt-subscription~=0.2.0', +- 'azure-mgmt-trafficmanager~=0.50.0', +- 'azure-mgmt-web~=0.35.0', ++ 'azure-mgmt-advisor>=1.0,<2', ++ 'azure-mgmt-applicationinsights>=0.1.1,<0.2', ++ 'azure-mgmt-authorization>=0.50.0,<0.51', ++ 'azure-mgmt-batch>=5.0,<6', ++ 'azure-mgmt-batchai>=2.0,<3', ++ 'azure-mgmt-billing>=0.2.0,<0.3', ++ 'azure-mgmt-cdn>=3.0,<4', ++ 'azure-mgmt-cognitiveservices>=3.0,<4', ++ 'azure-mgmt-commerce>=1.0,<2', ++ 'azure-mgmt-compute>=4.0,<5', ++ 'azure-mgmt-consumption>=2.0,<3', ++ 'azure-mgmt-containerinstance>=1.0,<2', ++ 'azure-mgmt-containerregistry>=2.1,<3', ++ 'azure-mgmt-containerservice>=4.2,<5', ++ 'azure-mgmt-cosmosdb>=0.4.1,<0.5', ++ 'azure-mgmt-datafactory>=0.6.0,<0.7', ++ 'azure-mgmt-datalake-analytics>=0.6.0,<0.7', ++ 'azure-mgmt-datalake-store>=0.5.0,<0.6', ++ 'azure-mgmt-datamigration>=1.0,<2', ++ 'azure-mgmt-devspaces>=0.1.0,<0.2', ++ 'azure-mgmt-devtestlabs>=2.2,<3', ++ 'azure-mgmt-dns>=2.0,<3', ++ 'azure-mgmt-eventgrid>=1.0,<2', ++ 'azure-mgmt-eventhub>=2.1,<3', ++ 'azure-mgmt-hanaonazure>=0.1.1,<0.2', ++ 'azure-mgmt-iotcentral>=0.1.0,<0.2', ++ 'azure-mgmt-iothub>=0.5.0,<0.6', ++ 'azure-mgmt-iothubprovisioningservices>=0.2.0,<0.3', ++ 'azure-mgmt-keyvault>=1.0,<2', ++ 'azure-mgmt-loganalytics>=0.2.0,<0.3', ++ 'azure-mgmt-logic>=3.0,<4', ++ 'azure-mgmt-machinelearningcompute>=0.4.1,<0.5', ++ 'azure-mgmt-managementgroups>=0.1.0,<0.2', ++ 'azure-mgmt-managementpartner>=0.1.0,<0.2', ++ 'azure-mgmt-maps>=0.1.0,<0.2', ++ 'azure-mgmt-marketplaceordering>=0.1.0,<0.2', ++ 'azure-mgmt-media>=1.0.0rc2,<1.1', ++ 'azure-mgmt-monitor>=0.5.2,<0.6', ++ 'azure-mgmt-msi>=0.2.0,<0.3', ++ 'azure-mgmt-network>=2.0,<3', ++ 'azure-mgmt-notificationhubs>=2.0,<3', ++ 'azure-mgmt-policyinsights>=0.1.0,<0.2', ++ 'azure-mgmt-powerbiembedded>=2.0,<3', ++ 'azure-mgmt-rdbms>=1.2,<2', ++ 'azure-mgmt-recoveryservices>=0.3.0,<0.4', ++ 'azure-mgmt-recoveryservicesbackup>=0.3.0,<0.4', ++ 'azure-mgmt-redis>=5.0,<6', ++ 'azure-mgmt-relay>=0.1.0,<0.2', ++ 'azure-mgmt-reservations>=0.2.1,<0.3', ++ 'azure-mgmt-resource>=2.0,<3', ++ 'azure-mgmt-scheduler>=2.0,<3', ++ 'azure-mgmt-search>=2.0,<3', ++ 'azure-mgmt-servicebus>=0.5.1,<0.6', ++ 'azure-mgmt-servicefabric>=0.2.0,<0.3', ++ 'azure-mgmt-signalr>=0.1.0,<0.2', ++ 'azure-mgmt-sql>=0.9.1,<0.10', ++ 'azure-mgmt-storage>=2.0,<3', ++ 'azure-mgmt-subscription>=0.2.0,<0.3', ++ 'azure-mgmt-trafficmanager>=0.50.0,<0.51', ++ 'azure-mgmt-web>=0.35.0,<0.36', + ], + ) +diff -up ./azure-mgmt-signalr/setup.py.orig ./azure-mgmt-signalr/setup.py +--- ./azure-mgmt-signalr/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-signalr/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-sql/setup.py.orig ./azure-mgmt-sql/setup.py +--- ./azure-mgmt-sql/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-sql/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-storage/setup.py.orig ./azure-mgmt-storage/setup.py +--- ./azure-mgmt-storage/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-storage/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1,>=1.1.10', ++ 'azure-common>=1.1,<2,>=1.1.10', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-subscription/setup.py.orig ./azure-mgmt-subscription/setup.py +--- ./azure-mgmt-subscription/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-subscription/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-trafficmanager/setup.py.orig ./azure-mgmt-trafficmanager/setup.py +--- ./azure-mgmt-trafficmanager/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-trafficmanager/setup.py 2018-08-06 13:47:14.796467939 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.27,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-mgmt-web/setup.py.orig ./azure-mgmt-web/setup.py +--- ./azure-mgmt-web/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-mgmt-web/setup.py 2018-08-06 13:47:14.797467914 +0200 +@@ -78,7 +78,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrestazure>=0.4.20,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-sdk-tools/packaging_tools/templates/setup.py.orig ./azure-sdk-tools/packaging_tools/templates/setup.py +--- ./azure-sdk-tools/packaging_tools/templates/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-sdk-tools/packaging_tools/templates/setup.py 2018-08-06 13:47:14.797467914 +0200 +@@ -80,7 +80,7 @@ setup( + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure-servicefabric/setup.py.orig ./azure-servicefabric/setup.py +--- ./azure-servicefabric/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure-servicefabric/setup.py 2018-08-06 13:47:14.797467914 +0200 +@@ -79,7 +79,7 @@ setup( + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.4.26,<2.0.0', +- 'azure-common~=1.1', ++ 'azure-common>=1.1,<2', + ], + cmdclass=cmdclass + ) +diff -up ./azure/setup.py.orig ./azure/setup.py +--- ./azure/setup.py.orig 2018-08-02 18:37:34.000000000 +0200 ++++ ./azure/setup.py 2018-08-06 13:47:14.797467914 +0200 +@@ -32,20 +32,20 @@ setup( + ], + zip_safe=False, + install_requires=[ +- 'azure-mgmt~=4.0', +- 'azure-applicationinsights~=0.1.0', +- 'azure-batch~=4.1', +- 'azure-cosmosdb-table~=1.0', +- 'azure-datalake-store~=0.0.18', +- 'azure-eventgrid~=1.1', +- 'azure-graphrbac~=0.40.0', +- 'azure-keyvault~=1.0', +- 'azure-loganalytics~=0.1.0', +- 'azure-servicebus~=0.21.1', +- 'azure-servicefabric~=6.3.0.0', +- 'azure-servicemanagement-legacy~=0.20.6', +- 'azure-storage-blob~=1.3', +- 'azure-storage-queue~=1.3', +- 'azure-storage-file~=1.3', ++ 'azure-mgmt>=4.0,<5', ++ 'azure-applicationinsights>=0.1.0,<0.2', ++ 'azure-batch>=4.1,<5', ++ 'azure-cosmosdb-table>=1.0,<2', ++ 'azure-datalake-store>=0.0.18,<0.1', ++ 'azure-eventgrid>=1.1,<2', ++ 'azure-graphrbac>=0.40.0,<0.41', ++ 'azure-keyvault>=1.0,<2', ++ 'azure-loganalytics>=0.1.0,<0.2', ++ 'azure-servicebus>=0.21.1,<0.22', ++ 'azure-servicefabric>=6.3.0.0,<6.3.1', ++ 'azure-servicemanagement-legacy>=0.20.6,<0.21', ++ 'azure-storage-blob>=1.3,<2', ++ 'azure-storage-queue>=1.3,<2', ++ 'azure-storage-file>=1.3,<2', + ], + ) diff --git a/SOURCES/python-msrest-0.6.1-isodate.patch b/SOURCES/python-msrest-0.6.1-isodate.patch new file mode 100644 index 0000000..035ce1f --- /dev/null +++ b/SOURCES/python-msrest-0.6.1-isodate.patch @@ -0,0 +1,41 @@ +diff -up ./msrest/serialization.py.orig ./msrest/serialization.py +--- ./msrest/serialization.py.orig 2018-10-15 18:43:34.000000000 +0000 ++++ ./msrest/serialization.py 2018-11-02 00:23:20.092139671 +0000 +@@ -27,6 +27,7 @@ + from base64 import b64decode, b64encode + import calendar + import datetime ++from distutils.version import LooseVersion, StrictVersion + import decimal + from enum import Enum + import json +@@ -37,6 +38,7 @@ try: + from urllib import quote # type: ignore + except ImportError: + from urllib.parse import quote # type: ignore ++import pkg_resources + import xml.etree.ElementTree as ET + + import isodate +@@ -57,6 +59,7 @@ except NameError: + basestring = str # type: ignore + + _LOGGER = logging.getLogger(__name__) ++_ISODATE_VERSION = pkg_resources.get_distribution("isodate").version + + try: + _long_type = long # type: ignore +@@ -1712,8 +1715,11 @@ class Deserializer(object): + attr = attr.text + if re.search(r"[^\W\d_]", attr, re.I + re.U): + raise DeserializationError("Date must have only digits and -. Received: %s" % attr) +- # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. +- return isodate.parse_date(attr, defaultmonth=None, defaultday=None) ++ if LooseVersion(_ISODATE_VERSION) >= LooseVersion("0.6.0"): ++ # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception. ++ return isodate.parse_date(attr, defaultmonth=None, defaultday=None) ++ else: ++ return isodate.parse_date(attr) + + @staticmethod + def deserialize_rfc(attr): diff --git a/SOURCES/python-msrest-0.6.1-setup.patch b/SOURCES/python-msrest-0.6.1-setup.patch new file mode 100644 index 0000000..506b6e0 --- /dev/null +++ b/SOURCES/python-msrest-0.6.1-setup.patch @@ -0,0 +1,44 @@ +diff -up ./setup.py.orig ./setup.py +--- ./setup.py.orig 2018-10-15 20:43:34.000000000 +0200 ++++ ./setup.py 2018-11-01 15:56:18.995147704 +0100 +@@ -25,6 +25,20 @@ + # -------------------------------------------------------------------------- + + from setuptools import setup, find_packages ++import sys ++ ++install_requires = [ ++ "requests>=2.16,<2.17", ++ "requests_oauthlib>=0.5.0", ++ "isodate>=0.6.0", ++ "certifi>=2017.4.17" ++] ++if sys.version_info < (3, 4): ++ install_requires.append("enum34>=1.0.4") ++if sys.version_info < (3, 5): ++ install_requires.append("typing") ++else: ++ install_requires += ["aiohttp>=3.0", "aiodns"] + + setup( + name='msrest', +@@ -47,18 +61,5 @@ setup( + 'Programming Language :: Python :: 3.7', + 'License :: OSI Approved :: MIT License', + 'Topic :: Software Development'], +- install_requires=[ +- "requests~=2.16", +- "requests_oauthlib>=0.5.0", +- "isodate>=0.6.0", +- "certifi>=2017.4.17", +- ], +- extras_require={ +- ":python_version<'3.4'": ['enum34>=1.0.4'], +- ":python_version<'3.5'": ['typing'], +- "async:python_version>='3.5'": [ +- 'aiohttp>=3.0', +- 'aiodns' +- ], +- } ++ install_requires=install_requires + ) diff --git a/SOURCES/python-msrest-0.6.1-tests.patch b/SOURCES/python-msrest-0.6.1-tests.patch new file mode 100644 index 0000000..949f8a0 --- /dev/null +++ b/SOURCES/python-msrest-0.6.1-tests.patch @@ -0,0 +1,191 @@ +diff -up ./tests/asynctests/test_pipeline.py.orig ./tests/asynctests/test_pipeline.py +--- ./tests/asynctests/test_pipeline.py.orig 2018-10-15 20:43:34.000000000 +0200 ++++ ./tests/asynctests/test_pipeline.py 2018-11-02 11:50:16.085392737 +0100 +@@ -75,54 +75,54 @@ async def test_sans_io_exception(): + await pipeline.run(req) + + +-@pytest.mark.asyncio +-async def test_basic_aiohttp(): ++# @pytest.mark.asyncio ++# async def test_basic_aiohttp(): + +- request = ClientRequest("GET", "http://bing.com") +- policies = [ +- UserAgentPolicy("myusergant") +- ] +- async with AsyncPipeline(policies) as pipeline: +- response = await pipeline.run(request) +- +- assert pipeline._sender.driver._session.closed +- assert response.http_response.status_code == 200 +- +-@pytest.mark.asyncio +-async def test_basic_async_requests(): +- +- request = ClientRequest("GET", "http://bing.com") +- policies = [ +- UserAgentPolicy("myusergant") +- ] +- async with AsyncPipeline(policies, AsyncPipelineRequestsHTTPSender()) as pipeline: +- response = await pipeline.run(request) +- +- assert response.http_response.status_code == 200 +- +-@pytest.mark.asyncio +-async def test_conf_async_requests(): +- +- conf = Configuration("http://bing.com/") +- request = ClientRequest("GET", "http://bing.com/") +- policies = [ +- UserAgentPolicy("myusergant") +- ] +- async with AsyncPipeline(policies, AsyncPipelineRequestsHTTPSender(AsyncRequestsHTTPSender(conf))) as pipeline: +- response = await pipeline.run(request) +- +- assert response.http_response.status_code == 200 +- +-def test_conf_async_trio_requests(): +- +- async def do(): +- conf = Configuration("http://bing.com/") +- request = ClientRequest("GET", "http://bing.com/") +- policies = [ +- UserAgentPolicy("myusergant") +- ] +- async with AsyncPipeline(policies, AsyncPipelineRequestsHTTPSender(AsyncTrioRequestsHTTPSender(conf))) as pipeline: +- return await pipeline.run(request) ++# request = ClientRequest("GET", "http://bing.com") ++# policies = [ ++# UserAgentPolicy("myusergant") ++# ] ++# async with AsyncPipeline(policies) as pipeline: ++# response = await pipeline.run(request) ++ ++# assert pipeline._sender.driver._session.closed ++# assert response.http_response.status_code == 200 ++ ++# @pytest.mark.asyncio ++# async def test_basic_async_requests(): ++ ++# request = ClientRequest("GET", "http://bing.com") ++# policies = [ ++# UserAgentPolicy("myusergant") ++# ] ++# async with AsyncPipeline(policies, AsyncPipelineRequestsHTTPSender()) as pipeline: ++# response = await pipeline.run(request) ++ ++# assert response.http_response.status_code == 200 ++ ++# @pytest.mark.asyncio ++# async def test_conf_async_requests(): ++ ++# conf = Configuration("http://bing.com/") ++# request = ClientRequest("GET", "http://bing.com/") ++# policies = [ ++# UserAgentPolicy("myusergant") ++# ] ++# async with AsyncPipeline(policies, AsyncPipelineRequestsHTTPSender(AsyncRequestsHTTPSender(conf))) as pipeline: ++# response = await pipeline.run(request) ++ ++# assert response.http_response.status_code == 200 ++ ++# def test_conf_async_trio_requests(): ++ ++# async def do(): ++# conf = Configuration("http://bing.com/") ++# request = ClientRequest("GET", "http://bing.com/") ++# policies = [ ++# UserAgentPolicy("myusergant") ++# ] ++# async with AsyncPipeline(policies, AsyncPipelineRequestsHTTPSender(AsyncTrioRequestsHTTPSender(conf))) as pipeline: ++# return await pipeline.run(request) + +- response = trio.run(do) +- assert response.http_response.status_code == 200 +\ No newline at end of file ++# response = trio.run(do) ++# assert response.http_response.status_code == 200 +diff -up ./tests/asynctests/test_universal_http.py.orig ./tests/asynctests/test_universal_http.py +--- ./tests/asynctests/test_universal_http.py.orig 2018-10-15 20:43:34.000000000 +0200 ++++ ./tests/asynctests/test_universal_http.py 2018-11-02 11:48:24.360298265 +0100 +@@ -43,46 +43,46 @@ import trio + import pytest + + +-@pytest.mark.asyncio +-async def test_basic_aiohttp(): ++# @pytest.mark.asyncio ++# async def test_basic_aiohttp(): + +- request = ClientRequest("GET", "http://bing.com") +- async with AioHTTPSender() as sender: +- response = await sender.send(request) +- assert response.body() is not None ++# request = ClientRequest("GET", "http://bing.com") ++# async with AioHTTPSender() as sender: ++# response = await sender.send(request) ++# assert response.body() is not None + +- assert sender._session.closed +- assert response.status_code == 200 ++# assert sender._session.closed ++# assert response.status_code == 200 + +-@pytest.mark.asyncio +-async def test_basic_async_requests(): ++# @pytest.mark.asyncio ++# async def test_basic_async_requests(): + +- request = ClientRequest("GET", "http://bing.com") +- async with AsyncBasicRequestsHTTPSender() as sender: +- response = await sender.send(request) +- assert response.body() is not None ++# request = ClientRequest("GET", "http://bing.com") ++# async with AsyncBasicRequestsHTTPSender() as sender: ++# response = await sender.send(request) ++# assert response.body() is not None + +- assert response.status_code == 200 ++# assert response.status_code == 200 + +-@pytest.mark.asyncio +-async def test_conf_async_requests(): ++# @pytest.mark.asyncio ++# async def test_conf_async_requests(): + +- conf = Configuration("http://bing.com/") +- request = ClientRequest("GET", "http://bing.com/") +- async with AsyncRequestsHTTPSender(conf) as sender: +- response = await sender.send(request) +- assert response.body() is not None ++# conf = Configuration("http://bing.com/") ++# request = ClientRequest("GET", "http://bing.com/") ++# async with AsyncRequestsHTTPSender(conf) as sender: ++# response = await sender.send(request) ++# assert response.body() is not None + +- assert response.status_code == 200 ++# assert response.status_code == 200 + +-def test_conf_async_trio_requests(): ++# def test_conf_async_trio_requests(): + +- async def do(): +- conf = Configuration("http://bing.com/") +- request = ClientRequest("GET", "http://bing.com/") +- async with AsyncTrioRequestsHTTPSender(conf) as sender: +- return await sender.send(request) +- assert response.body() is not None ++# async def do(): ++# conf = Configuration("http://bing.com/") ++# request = ClientRequest("GET", "http://bing.com/") ++# async with AsyncTrioRequestsHTTPSender(conf) as sender: ++# return await sender.send(request) ++# assert response.body() is not None + +- response = trio.run(do) +- assert response.status_code == 200 +\ No newline at end of file ++# response = trio.run(do) ++# assert response.status_code == 200 diff --git a/SPECS/python-azure-sdk.spec b/SPECS/python-azure-sdk.spec new file mode 100644 index 0000000..dd0b7ed --- /dev/null +++ b/SPECS/python-azure-sdk.spec @@ -0,0 +1,322 @@ +%global srcname azure-sdk +%global common_description This project provides a set of Python packages that make it easy to access\ +Management (Virtual Machines, ...) or Runtime (ServiceBus using HTTP, Batch,\ +Monitor) components of Microsoft Azure Complete feature list of this repo and\ +where to find Python packages not in this repo can be found on our Azure SDK for\ +Python documentation. + +# EL is missing recommonmark library to build documentation +%global _with_doc 0%{?fedora} +%global pydoc_prefix %{?rhel:python}%{?fedora:python%{python3_pkgversion}} +%global sphinxbuild sphinx-build%{?fedora:-%{python3_version}} + +%global azure_storage_min_version 1.0.0 +%global msrest_min_version 0.4.26 +%global msrestazure_min_version 0.5.0 + +# bundles +%global bundled_lib_dir bundled +# python3-certifi bundle +%global certifi certifi +%global certifi_version 2018.10.15 +%global certifi_dir %{bundled_lib_dir}/azure/%{certifi} +# python3-isodate bundle +%global isodate isodate +%global isodate_version 0.5.4 +%global isodate_dir %{bundled_lib_dir}/azure/%{isodate} +# python3-msrest bundle +%global msrest msrest +%global msrest_version 0.6.2 +%global msrest_dir %{bundled_lib_dir}/azure/%{msrest} +# python3-adal bundle +%global adal adal +%global adal_version 1.2.0 +%global adal_dir %{bundled_lib_dir}/azure/%{adal} +# python3-SecretStorage bundle +%global secretstorage SecretStorage +%global secretstorage_version 2.3.1 +%global secretstorage_dir %{bundled_lib_dir}/azure/%{secretstorage} +# python3-keyring bundle +%global keyring keyring +%global keyring_version 13.2.1 +%global keyring_dir %{bundled_lib_dir}/azure/%{keyring} +# python3-msrestazure bundle +%global msrestazure msrestazure +%global msrestazure_version 0.5.1 +%global msrestazure_dir %{bundled_lib_dir}/azure/%{msrestazure} + +Name: python3-%{srcname} +Version: 4.0.0 +Release: 8%{?dist} +Summary: Microsoft Azure SDK for Python + +# All packages are licensed under the MIT license, except: +# - azure-servicebus +# - azure-servicemanagement-legacy +License: MIT and ASL 2.0 and MPLv2.0 and BSD and Python +URL: https://github.com/Azure/azure-sdk-for-python +Source0: %{url}/archive/azure_%{version}/%{srcname}-%{version}.tar.gz +Source1: %{certifi}-%{certifi_version}.tar.gz +Source2: %{isodate}-%{isodate_version}.tar.gz +Source3: %{msrest}-%{msrest_version}.tar.gz +Source4: %{adal}-%{adal_version}.tar.gz +Source5: %{secretstorage}-%{secretstorage_version}.tar.gz +Source6: %{keyring}-%{keyring_version}.tar.gz +Source7: %{msrestazure}-%{msrestazure_version}.tar.gz +# Fix build with old versions of setuptools library +Patch0: python-azure-sdk-4.0.0-setup.patch +# Install namespace package modules (disabled by default, may be required by +# modules depending on Azure SDK for development) +Patch1: python-azure-sdk-4.0.0-nspkgs.patch +# bundles +Patch1000: certifi-2018.10.15-use-system-cert.patch +Patch1001: python-msrest-0.6.1-setup.patch +Patch1002: python-msrest-0.6.1-isodate.patch +Patch1003: python-msrest-0.6.1-tests.patch +Patch1004: python-adal-1.2.0-tests.patch + +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +# bundles +# python3-certifi bundle +BuildRequires: ca-certificates +# python3-keyring bundle +BuildRequires: python3-setuptools_scm +%if 0%{?_with_doc} +BuildRequires: %{pydoc_prefix}-recommonmark +BuildRequires: %{pydoc_prefix}-sphinx +BuildRequires: %{pydoc_prefix}-sphinx_rtd_theme +%endif +Requires: python%{python3_pkgversion}-pyOpenSSL +Requires: python%{python3_pkgversion}-requests +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} +# bundles +# python3-certifi bundle +Provides: bundled(python3-%{certifi}) = %{certifi_version} +# python3-isodate bundle +Provides: bundled(python3-%{isodate}) = %{isodate_version} +# python3-msrest bundle +Provides: bundled(python3-%{msrest}) = %{msrest_version} +# python3-adal bundle +Provides: bundled(python3-%{adal}) = %{adal_version} +# python3-SecretStorage bundle +Provides: bundled(python3-%{secretstorage}) = %{secretstorage_version} +# python3-keyring bundle +Provides: bundled(python3-%{keyring}) = %{keyring_version} +# python3-msrestazure bundle +Provides: bundled(python3-%{msrestazure}) = %{msrestazure_version} +# python3-certifi bundle +Requires: ca-certificates +# python3-msrest bundle +Requires: python3-requests-oauthlib +# python3-adal bundle +Requires: python3-cryptography +Requires: python3-dateutil +Requires: python3-jwt +BuildArch: noarch + +%description +%{common_description} + + +%if 0%{?_with_doc} +%package doc +Summary: Documentation for %{name} + +%description doc +This package provides documentation for %{name}. +%endif + + +%prep +%setup -q -n %{srcname}-for-python-azure_%{version}%{?prerelease} +%patch0 +%patch1 + +# bundles +mkdir -p %{bundled_lib_dir}/azure + +# python3-certifi bundle +tar -xzf %SOURCE1 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/%{certifi}-%{certifi_version} %{certifi_dir} +# Remove bundled egg-info +rm -rf %{certifi_dir}/*.egg-info +rm -rf %{certifi_dir}/certifi/*.pem +cp %{certifi_dir}/README.rst %{certifi}_README.rst +cp %{certifi_dir}/LICENSE %{certifi}_LICENSE +pushd %{certifi_dir} +%patch1000 -p1 +popd + +# python3-isodate bundle +tar -xzf %SOURCE2 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/%{isodate}-%{isodate_version} %{isodate_dir} +cp %{isodate_dir}/README.rst %{isodate}_README.rst + +# python3-msrest +tar -xzf %SOURCE3 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/%{msrest}-for-python-%{msrest_version} %{msrest_dir} +cp %{msrest_dir}/README.rst %{msrest}_README.rst +cp %{msrest_dir}/LICENSE.md %{msrest}_LICENSE.md +pushd %{msrest_dir} +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 +popd + +# python3-adal +tar -xzf %SOURCE4 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/azure-activedirectory-library-for-python-%{adal_version} %{adal_dir} +cp %{adal_dir}/README.md %{adal}_README.md +cp %{adal_dir}/LICENSE %{adal}_LICENSE +pushd %{adal_dir} +%patch1004 -p1 +popd + +# python3-SecretStorage bundle +tar -xzf %SOURCE5 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/%{secretstorage}-%{secretstorage_version} %{secretstorage_dir} +cp %{secretstorage_dir}/README.rst %{secretstorage}_README.rst +cp %{secretstorage_dir}/LICENSE %{secretstorage}_LICENSE + +# python3-keyring bundle +tar -xzf %SOURCE6 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/%{keyring}-%{keyring_version} %{keyring_dir} +cp %{keyring_dir}/README.rst %{keyring}_README.rst +cp %{keyring_dir}/LICENSE %{keyring}_LICENSE + +# python3-msrestazure bundle +tar -xzf %SOURCE7 -C %{bundled_lib_dir} +mv %{bundled_lib_dir}/%{msrestazure}-for-python-%{msrestazure_version} %{msrestazure_dir} +cp %{msrestazure_dir}/README.rst %{msrestazure}_README.rst +cp %{msrestazure_dir}/LICENSE.md %{msrestazure}_LICENSE.md + +# append bundled-directory to search path +sed -i "/^import keyring/iimport sys\nsys.path.insert(0, '%{_libdir}/fence-agents/bundled')" azure-batch/azure/batch/batch_auth.py + +%build +%py3_build + +%if 0%{?_with_doc} +%make_build -C doc/ html SPHINXBUILD=%{sphinxbuild} +rm doc/_build/html/.buildinfo +%endif + +# bundles +# python3-certifi bundle +pushd %{certifi_dir} +%{__python3} setup.py build +popd + +# python3-isodate bundle +pushd %{isodate_dir} +%{__python3} setup.py build +popd + +# python3-msrest bundle +pushd %{msrest_dir} +%{__python3} setup.py build +popd + +# python3-adal bundle +pushd %{adal_dir} +%{__python3} setup.py build +popd + +# python3-SecretStorage bundle +pushd %{secretstorage_dir} +%{__python3} setup.py build +popd + +# python3-keyring bundle +pushd %{keyring_dir} +%{__python3} setup.py build +popd + +# python3-msrestazure bundle +pushd %{msrestazure_dir} +%{__python3} setup.py build +popd + + +%install +%py3_install + +# bundles +# python3-certifi bundle +pushd %{certifi_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + +# python3-isodate bundle +pushd %{isodate_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + +# python3-msrest bundle +pushd %{msrest_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + +# python3-adal bundle +pushd %{adal_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + +# python3-SecretStorage bundle +pushd %{secretstorage_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + +# python3-keyring bundle +pushd %{keyring_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + +# python3-msrestazure bundle +pushd %{msrestazure_dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --install-lib /usr/lib/fence-agents/%{bundled_lib_dir}/azure +popd + + +%files +%doc CONTRIBUTING.md README.rst +%license LICENSE.txt +# bundled libraries +%doc %{certifi}_README.rst %{isodate}_README.rst %{msrest}_README.rst %{adal}_README.md %{secretstorage}_README.rst %{keyring}_README.rst %{msrestazure}_README.rst +%license %{certifi}_LICENSE %{msrest}_LICENSE.md %{adal}_LICENSE %{secretstorage}_LICENSE %{keyring}_LICENSE %{msrestazure}_LICENSE.md +%{python3_sitelib}/azure/ +%{python3_sitelib}/azure_*.egg-info/ +# bundled libraries +%dir /usr/lib/fence-agents +%dir /usr/lib/fence-agents/%{bundled_lib_dir} +/usr/lib/fence-agents/%{bundled_lib_dir}/azure +%exclude /usr/bin/keyring + + +%if 0%{?_with_doc} +%files doc +%doc doc/_build/html/ +%license LICENSE.txt +%endif + + +%changelog +* Wed Jan 30 2019 Oyvind Albrigtsen - 4.0.0-8 +- Bundled libraries + Resolves: rhbz#1630844 + +* Fri Jan 25 2019 Oyvind Albrigtsen - 4.0.0-4 +- Initial import + Resolves: rhbz#1630844 + +* Thu Nov 22 2018 Mohamed El Morabity - 4.0.0-3 +- Build documentation with Python 3 on Fedora +- Fix Python 3-only file deployment +- Don't glob everything under the Python sitelib directory + +* Mon Aug 06 2018 Mohamed El Morabity - 4.0.0-2 +- Delete all Python 3-only files from the python2 subpackage + +* Mon Aug 06 2018 Mohamed El Morabity - 4.0.0-1 +- Update to 4.0.0