From eedd648374f38f017cb713c8785b0f72967dd120 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 27 Apr 2021 15:12:31 -0400 Subject: [PATCH 1/3] making all packages uppercase to prevent issue with PyJWT and pyjwt --- eng/tox/verify_installed_packages.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/tox/verify_installed_packages.py b/eng/tox/verify_installed_packages.py index 234b18bb323b..b39d93504146 100644 --- a/eng/tox/verify_installed_packages.py +++ b/eng/tox/verify_installed_packages.py @@ -34,8 +34,15 @@ def verify_packages(package_file_path): sys.exit(1) # find installed and expected packages - installed = dict(p.split('==') for p in get_installed_packages() if "==" in p) - expected = dict(p.split('==') for p in packages) + installed = {} + for p in get_installed_packages(): + if "==" in p: + [package, version] = p.split("==") + installed[package.upper()] = version + expected = {} + for p in packages: + [package, version] = p.split("==") + expected[package.upper()] = version missing_packages = [pkg for pkg in expected.keys() if installed.get(pkg) != expected.get(pkg)] From 818da09c4c8ecdb32dc202b904113c93981cbcd9 Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 27 Apr 2021 15:55:16 -0400 Subject: [PATCH 2/3] trying my fix for webpubsub --- .../azure-messaging-webpubsubservice/sdk_packaging.toml | 9 +++++++++ sdk/webpubsub/azure-messaging-webpubsubservice/setup.py | 2 +- shared_requirements.txt | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 sdk/webpubsub/azure-messaging-webpubsubservice/sdk_packaging.toml diff --git a/sdk/webpubsub/azure-messaging-webpubsubservice/sdk_packaging.toml b/sdk/webpubsub/azure-messaging-webpubsubservice/sdk_packaging.toml new file mode 100644 index 000000000000..f2b3fc1cf82b --- /dev/null +++ b/sdk/webpubsub/azure-messaging-webpubsubservice/sdk_packaging.toml @@ -0,0 +1,9 @@ +[packaging] +package_name = "azure-messaging-webpubsubservice" +package_nspkg = "azure-messaging-nspkg" +package_pprint_name = "Azure Web PubSub Service" +package_doc_id = "" +is_stable = false +is_arm = false +need_msrestazure = false +auto_update = false \ No newline at end of file diff --git a/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py b/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py index 7b4cee515a8a..b16c0301db18 100644 --- a/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py +++ b/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py @@ -64,7 +64,7 @@ "azure-core<2.0.0,>=1.10.0", "msrest>=0.6.18", "cryptography>=2.1.4", - "pyjwt>=1.7.1", + "PyJWT>=1.7.1", "six>=1.12.0", ], extras_require={ diff --git a/shared_requirements.txt b/shared_requirements.txt index 8e27a5f82f1b..7d4cf7cca366 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -123,7 +123,7 @@ python-dateutil>=2.8.0 six>=1.11.0 isodate>=0.6.0 avro<2.0.0,>=1.10.0 -pyjwt>=1.7.1 +PyJWT>=1.7.1 #override azure azure-keyvault~=1.0 #override azure-mgmt-core azure-core<2.0.0,>=1.13.0 #override azure-containerregistry azure-core>=1.4.0,<2.0.0 @@ -205,7 +205,7 @@ opentelemetry-sdk<2.0.0,>=1.0.0 #override azure-keyvault-keys six>=1.12.0 #override azure-messaging-webpubsubservice azure-core<2.0.0,>=1.10.0 #override azure-messaging-webpubsubservice msrest>=0.6.18 -#override azure-messaging-webpubsubservice pyjwt>=1.7.1 +#override azure-messaging-webpubsubservice PyJWT>=1.7.1 #override azure-messaging-webpubsubservice six>=1.12.0 #override azure-mixedreality-authentication azure-core<2.0.0,>=1.4.0 #override azure-iot-deviceupdate azure-core<2.0.0,>=1.6.0 From a96b96d046f42f927ce34746568f8139f295422e Mon Sep 17 00:00:00 2001 From: seankane-msft Date: Tue, 27 Apr 2021 16:10:35 -0400 Subject: [PATCH 3/3] lowercase pyjwt --- sdk/webpubsub/azure-messaging-webpubsubservice/setup.py | 2 +- shared_requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py b/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py index b16c0301db18..7b4cee515a8a 100644 --- a/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py +++ b/sdk/webpubsub/azure-messaging-webpubsubservice/setup.py @@ -64,7 +64,7 @@ "azure-core<2.0.0,>=1.10.0", "msrest>=0.6.18", "cryptography>=2.1.4", - "PyJWT>=1.7.1", + "pyjwt>=1.7.1", "six>=1.12.0", ], extras_require={ diff --git a/shared_requirements.txt b/shared_requirements.txt index 7d4cf7cca366..8e27a5f82f1b 100644 --- a/shared_requirements.txt +++ b/shared_requirements.txt @@ -123,7 +123,7 @@ python-dateutil>=2.8.0 six>=1.11.0 isodate>=0.6.0 avro<2.0.0,>=1.10.0 -PyJWT>=1.7.1 +pyjwt>=1.7.1 #override azure azure-keyvault~=1.0 #override azure-mgmt-core azure-core<2.0.0,>=1.13.0 #override azure-containerregistry azure-core>=1.4.0,<2.0.0 @@ -205,7 +205,7 @@ opentelemetry-sdk<2.0.0,>=1.0.0 #override azure-keyvault-keys six>=1.12.0 #override azure-messaging-webpubsubservice azure-core<2.0.0,>=1.10.0 #override azure-messaging-webpubsubservice msrest>=0.6.18 -#override azure-messaging-webpubsubservice PyJWT>=1.7.1 +#override azure-messaging-webpubsubservice pyjwt>=1.7.1 #override azure-messaging-webpubsubservice six>=1.12.0 #override azure-mixedreality-authentication azure-core<2.0.0,>=1.4.0 #override azure-iot-deviceupdate azure-core<2.0.0,>=1.6.0