Mindep test all dependencies except nspkg (#16331)
* Remove filter on mindependency testing. we now test all requirements, not just ones starting with azure. * Update `six` requirement for azure-identity, azure-ai-formrecognizer, azure-ai-metricsadvisor. * Remove msrest from existing **/dev_requirements.txt. * Rpdate azure-devtools storage_testcase.py to allow import failure from azure-core. This package is used properly without that package. Need to be able to import * from the namespace without hitting issues.
This commit is contained in:
Родитель
1b8ddc7fd4
Коммит
7d1aa3e67c
|
@ -7,7 +7,6 @@ stages:
|
|||
- template: ./templates/jobs/archetype-sdk-client.yml
|
||||
parameters:
|
||||
ToxEnvParallel: '--tenvparallel'
|
||||
InjectedPackages: $(InjectedPackages)
|
||||
BuildTargetingString: $(BuildTargetingString)
|
||||
BuildDocs: false
|
||||
TestTimeoutInMinutes: 300
|
||||
|
|
|
@ -28,7 +28,9 @@ PKGS_TXT_FILE = "packages.txt"
|
|||
logging.getLogger().setLevel(logging.INFO)
|
||||
|
||||
MINIMUM_VERSION_SUPPORTED_OVERRIDE = {
|
||||
'azure-common': '1.1.10'
|
||||
'azure-common': '1.1.10',
|
||||
'msrest': '0.6.10',
|
||||
'six': '1.9'
|
||||
}
|
||||
|
||||
def install_dependent_packages(setup_py_file_path, dependency_type, temp_dir):
|
||||
|
@ -60,7 +62,7 @@ def find_released_packages(setup_py_path, dependency_type):
|
|||
# this method returns list of required available package on PyPI in format <package-name>==<version>
|
||||
|
||||
# parse setup.py and find install requires
|
||||
requires = [r for r in get_install_requires(setup_py_path) if r.startswith('azure') and '-nspkg' not in r]
|
||||
requires = [r for r in get_install_requires(setup_py_path) if '-nspkg' not in r]
|
||||
|
||||
# Get available version on PyPI for each required package
|
||||
avlble_packages = [x for x in map(lambda x: process_requirement(x, dependency_type), requires) if x]
|
||||
|
|
|
@ -34,7 +34,7 @@ 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 p.startswith('azure') and "==" in p)
|
||||
installed = dict(p.split('==') for p in get_installed_packages() if "==" in p)
|
||||
expected = dict(p.split('==') for p in packages)
|
||||
|
||||
missing_packages = [pkg for pkg in expected.keys() if installed.get(pkg) != expected.get(pkg)]
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
../../core/azure-core
|
||||
-e ../../identity/azure-identity
|
||||
aiohttp>=3.0; python_version >= '3.5'
|
||||
msrest>=0.6.10
|
||||
-e ../../../tools/azure-sdk-tools
|
||||
-e ../../../tools/azure-devtools
|
|
@ -1,2 +1,3 @@
|
|||
-e ../../../tools/azure-sdk-tools
|
||||
msrestazure
|
||||
../../core/azure-core
|
|
@ -1,3 +1,3 @@
|
|||
-e ../../../tools/azure-sdk-tools
|
||||
-e ../azure-core
|
||||
msrestazure
|
||||
msrestazure
|
|
@ -1,4 +1,3 @@
|
|||
msrest
|
||||
trio; python_version >= '3.5'
|
||||
aiohttp>=3.0; python_version >= '3.5'
|
||||
typing_extensions>=3.7.2
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
msrest
|
||||
trio; python_version >= '3.5'
|
||||
aiohttp>=3.0; python_version >= '3.5'
|
||||
typing_extensions>=3.7.2
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
- `Style` is renamed to `TextStyle`
|
||||
- Client property `api_version` is no longer exposed. Pass keyword argument `api_version` into the client to select the
|
||||
API version
|
||||
- Bumped `six` requirement from `1.6` to `1.11.0`.
|
||||
|
||||
## 3.1.0b2 (2021-01-12)
|
||||
|
||||
|
|
|
@ -4,4 +4,3 @@
|
|||
../../core/azure-core
|
||||
-e ../../identity/azure-identity
|
||||
aiohttp>=3.0; python_version >= '3.5'
|
||||
msrest>=0.6.12
|
||||
|
|
|
@ -81,7 +81,7 @@ setup(
|
|||
install_requires=[
|
||||
"azure-core<2.0.0,>=1.8.2",
|
||||
"msrest>=0.6.12",
|
||||
'six>=1.6',
|
||||
'six>=1.11.0',
|
||||
'azure-common~=1.1',
|
||||
],
|
||||
extras_require={
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Release History
|
||||
|
||||
## 1.5.1 (Unreleased)
|
||||
|
||||
- Bumped `six` requirement from `1.6` to `1.12.0`.
|
||||
|
||||
## 1.5.0 (2020-11-11)
|
||||
### Breaking Changes
|
||||
|
|
|
@ -76,7 +76,7 @@ setup(
|
|||
"cryptography>=2.1.4",
|
||||
"msal<2.0.0,>=1.6.0",
|
||||
"msal-extensions~=0.3.0",
|
||||
"six>=1.6",
|
||||
"six>=1.12.0",
|
||||
],
|
||||
extras_require={
|
||||
":python_version<'3.0'": ["azure-nspkg"],
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
-e ../../../tools/azure-sdk-tools
|
||||
../../core/azure-core
|
||||
msrestazure
|
||||
msrestazure
|
|
@ -0,0 +1 @@
|
|||
-e ../../../tools/azure-sdk-tools
|
|
@ -4,6 +4,5 @@
|
|||
-e ../../identity/azure-identity
|
||||
aiohttp>=3.0; python_version >= '3.5'
|
||||
aiodns>=2.0; python_version >= '3.5'
|
||||
msrest>=0.6.10
|
||||
tox>=3.20.0
|
||||
tox-monorepo>=0.1.2
|
||||
|
|
|
@ -11,6 +11,9 @@
|
|||
|
||||
- `list_dimension_values` has been renamed to `list_anomaly_dimension_values`
|
||||
|
||||
**Hotfixes**
|
||||
|
||||
- Bump `six` requirement from `1.6` to 1.11.0`
|
||||
## 1.0.0b2 (2020-11-10)
|
||||
|
||||
**Breaking Changes**
|
||||
|
|
|
@ -3,4 +3,3 @@
|
|||
-e ../../identity/azure-identity
|
||||
../../core/azure-core
|
||||
aiohttp>=3.0; python_version >= '3.5'
|
||||
msrest>=0.6.12
|
||||
|
|
|
@ -81,7 +81,7 @@ setup(
|
|||
install_requires=[
|
||||
"azure-core<2.0.0,>=1.6.0",
|
||||
"msrest>=0.6.12",
|
||||
'six>=1.6',
|
||||
'six>=1.11.0',
|
||||
],
|
||||
extras_require={
|
||||
":python_version<'3.0'": ['azure-ai-nspkg'],
|
||||
|
|
|
@ -187,3 +187,6 @@ opentelemetry-sdk==0.16b1
|
|||
#override azure-opentelemetry-exporter-azuremonitor azure-core<2.0.0,>=1.6.0
|
||||
#override azure-opentelemetry-exporter-azuremonitor msrest>=0.6.10
|
||||
#override azure-core-tracing-opentelemetry opentelemetry-api==0.13b0
|
||||
#override azure-identity six>=1.12.0
|
||||
#override azure-ai-formrecognizer six>=1.11.0
|
||||
#override azure-ai-metricsadvisor six>=1.11.0
|
||||
|
|
|
@ -8,7 +8,12 @@ import logging
|
|||
import os
|
||||
from time import sleep
|
||||
|
||||
from azure.core.exceptions import ResourceExistsError
|
||||
# let this import fail, this package is used intentionally without the presence of azure-core
|
||||
try:
|
||||
from azure.core.exceptions import ResourceExistsError
|
||||
except:
|
||||
pass
|
||||
|
||||
from azure.mgmt.storage import StorageManagementClient
|
||||
from azure.mgmt.storage.models import StorageAccount, Endpoints
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче