Skip to content

Commit

Permalink
Resolve Remaining Issues w/ upgrade to pip==20.3 (Azure#19837)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
scbedd authored Jul 16, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent ec74e12 commit 9033064
Showing 13 changed files with 23 additions and 13 deletions.
3 changes: 2 additions & 1 deletion eng/tox/install_depend_packages.py
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
import logging
from packaging.specifiers import SpecifierSet
from pkg_resources import Requirement, parse_version

from pypi_tools.pypi import PyPIClient

setup_parser_path = os.path.abspath(
@@ -30,9 +31,9 @@
MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
'azure-common': '1.1.10',
'msrest': '0.6.10',
'six': '1.9',
'typing-extensions': '3.6.5',
'opentelemetry-api': '1.3.0',
'opentelemetry-sdk': '1.3.0',
'azure-core': '1.11.0',
'requests': '2.19.0',
'six': '1.12.0'
4 changes: 2 additions & 2 deletions sdk/batch/azure-mgmt-batch/dev_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-e ../../../tools/azure-sdk-tools
-e ../../keyvault/azure-mgmt-keyvault
-e ../../network/azure-mgmt-network
azure-mgmt-keyvault<9.0.0
azure-mgmt-network<19.0.0
-e ../../../tools/azure-devtools
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-devtools
azure-core
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
-e ../../../tools/azure-sdk-tools
-e ../azure-mgmt-cognitiveservices
-e ../../../tools/azure-devtools
azure-mgmt-cognitiveservices<12.0.0
-e ../../../tools/azure-devtools
azure-core
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-devtools
azure-core
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-devtools
azure-core
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-devtools
azure-core
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
-e ../../../tools/azure-devtools
../../core/azure-core
-e ../../identity/azure-identity
../../storage/azure-storage-blob
azure-storage-blob<=12.7.0
2 changes: 2 additions & 0 deletions sdk/eventgrid/azure-eventgrid/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@

## 4.3.1 (Unreleased)

- Bumped `msrest` dependency to `0.6.21` to align with mgmt package.

### Features Added

### Breaking Changes
2 changes: 1 addition & 1 deletion sdk/eventgrid/azure-eventgrid/setup.py
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@
'azure',
]),
install_requires=[
'msrest>=0.6.19',
'msrest>=0.6.21',
'azure-core<2.0.0,>=1.12.0',
],
extras_require={
1 change: 1 addition & 0 deletions sdk/nspkg/ci.yml
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ extends:
template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
parameters:
ServiceDirectory: nspkg
TestTimeoutInMinutes: 90
BuildDocs: False
Artifacts:
- name: azure-agrifood-nspkg
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
-e ../../../tools/azure-sdk-tools
-e ../../../tools/azure-devtools
-e ../../../tools/azure-devtools
azure-core
2 changes: 1 addition & 1 deletion shared_requirements.txt
Original file line number Diff line number Diff line change
@@ -191,7 +191,7 @@ opentelemetry-sdk<2.0.0,>=1.0.0
#override azure-synapse-managedprivateendpoints azure-core>=1.6.0,<2.0.0
#override azure-data-tables msrest>=0.6.10
#override azure-ai-anomalydetector azure-core>=1.6.0,<2.0.0
#override azure-eventgrid msrest>=0.6.19
#override azure-eventgrid msrest>=0.6.21
#override azure-eventgrid azure-core<2.0.0,>=1.12.0
#override azure-monitor-query msrest>=0.6.19
#override azure-monitor-query azure-core<2.0.0,>=1.12.0

0 comments on commit 9033064

Please sign in to comment.