Skip to content

Commit 9033064

Browse files
authored
Resolve Remaining Issues w/ upgrade to pip==20.3 (Azure#19837)
* resolve issue with mindependency of azure-monitor-telemetry-exporter * resolve eventgrid mindependency failure. device-update mindependency failure * adjust dev_reqs for azure-mgmt-batch * extend nspkg test timeout. * resolve 'core.credential not found' in cogservices and servermanager
1 parent ec74e12 commit 9033064

File tree

13 files changed

+23
-13
lines changed

13 files changed

+23
-13
lines changed

eng/tox/install_depend_packages.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import logging
1414
from packaging.specifiers import SpecifierSet
1515
from pkg_resources import Requirement, parse_version
16+
1617
from pypi_tools.pypi import PyPIClient
1718

1819
setup_parser_path = os.path.abspath(
@@ -30,9 +31,9 @@
3031
MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
3132
'azure-common': '1.1.10',
3233
'msrest': '0.6.10',
33-
'six': '1.9',
3434
'typing-extensions': '3.6.5',
3535
'opentelemetry-api': '1.3.0',
36+
'opentelemetry-sdk': '1.3.0',
3637
'azure-core': '1.11.0',
3738
'requests': '2.19.0',
3839
'six': '1.12.0'
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../keyvault/azure-mgmt-keyvault
3-
-e ../../network/azure-mgmt-network
2+
azure-mgmt-keyvault<9.0.0
3+
azure-mgmt-network<19.0.0
44
-e ../../../tools/azure-devtools
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
2+
-e ../../../tools/azure-devtools
3+
azure-core
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../azure-mgmt-cognitiveservices
3-
-e ../../../tools/azure-devtools
2+
azure-mgmt-cognitiveservices<12.0.0
3+
-e ../../../tools/azure-devtools
4+
azure-core
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
2+
-e ../../../tools/azure-devtools
3+
azure-core
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
2+
-e ../../../tools/azure-devtools
3+
azure-core
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-e ../../../tools/azure-sdk-tools
2-
-e ../../../tools/azure-devtools
2+
-e ../../../tools/azure-devtools
3+
azure-core

sdk/deviceupdate/azure-iot-deviceupdate/dev_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
-e ../../../tools/azure-devtools
33
../../core/azure-core
44
-e ../../identity/azure-identity
5-
../../storage/azure-storage-blob
5+
azure-storage-blob<=12.7.0

sdk/eventgrid/azure-eventgrid/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## 4.3.1 (Unreleased)
44

5+
- Bumped `msrest` dependency to `0.6.21` to align with mgmt package.
6+
57
### Features Added
68

79
### Breaking Changes

sdk/eventgrid/azure-eventgrid/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
'azure',
8282
]),
8383
install_requires=[
84-
'msrest>=0.6.19',
84+
'msrest>=0.6.21',
8585
'azure-core<2.0.0,>=1.12.0',
8686
],
8787
extras_require={

0 commit comments

Comments
 (0)