зеркало из
1
0
Форкнуть 0

Address failing `main` -- trim some deps (#36346)

* trim markupsafe, wrapt, and pyopenssl from azure-sdk-tools install set, add pyopenssl to keyvault certificates dev reqs
* update utilized versions of setuptools and wheel
This commit is contained in:
Scott Beddall 2024-07-04 03:29:21 -07:00 коммит произвёл GitHub
Родитель 550ee55f93
Коммит 8b6e24d0f3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
12 изменённых файлов: 20 добавлений и 33 удалений

Просмотреть файл

@ -1,7 +1,7 @@
# requirements leveraged by ci tools
setuptools==67.6.0; python_version >= '3.5'
setuptools==70.2.0; python_version >= '3.5'
virtualenv==20.24.3
wheel==0.37.0
wheel==0.43.0
packaging==23.1
tox==4.5.0
pathlib2==2.3.5
@ -9,11 +9,10 @@ doc-warden==0.7.2
beautifulsoup4==4.9.1
pkginfo==1.9.6
pip==24.0
wrapt==1.12.1; python_version <= '3.10'
wrapt==1.15.0; python_version >= '3.11'
typing-extensions<=4.6.3
pyproject-api<1.6
cibuildwheel==2.16.5
importlib-metadata==8.0.0
# requirements leveraged for testing
pytest==7.3.1
@ -22,14 +21,11 @@ coverage==7.2.5
# locking packages defined as deps from azure-sdk-tools
Jinja2==3.1.2
MarkupSafe==2.1.3
json-delta==2.0
readme_renderer==42.0;
pyopenssl==24.0.0
python-dotenv==1.0.0; python_version > '3.7'
python-dotenv==1.0.1
pyyaml==6.0.1
urllib3==2.0.7
ConfigArgParse==1.2.3
six==1.16.0
# local dev packages

Просмотреть файл

@ -8,7 +8,7 @@ trio
typing_extensions>=3.7.2
cryptography
adal
setuptools==67.6.0; python_version >= '3.5'
setuptools==70.2.0; python_version >= '3.5'
pytest-asyncio==0.12.0
-e sdk/core/azure-core/tests/testserver_tests/coretestserver
azure-mgmt-storage

Просмотреть файл

@ -40,12 +40,13 @@ steps:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
- pwsh: |
Write-Host (Get-Command python).Source
$ErrorActionPreference = 'Stop'
$PSNativeCommandUseErrorActionPreference = $true
python -m pip freeze
python -m pip install pip==23.2.1
python -m pip install setuptools==67.6.0
python -m pip install wheel==0.37.0
python -m pip install wheel==0.43.0 --force-reinstall
python -m pip install setuptools==70.2.0 --force-reinstall
python -m pip install -r eng/ci_tools.txt
pip --version
pip freeze
@ -152,7 +153,7 @@ steps:
Write-Host "Last exit code: $LASTEXITCODE";
exit $LASTEXITCODE;
- ${{ else }}:
- ${{ else }}:
- task: PythonScript@0
displayName: 'Test Samples'
condition: and(succeeded(), eq(variables['TestSamples'], 'true'))

Просмотреть файл

@ -17,14 +17,11 @@ typing-extensions<=4.6.3
pytoml==0.1.21
readme-renderer[md]==25.0
json-delta==2.0
ConfigArgParse==1.2.3
ConfigArgParse==1.7
six==1.14.0
pyyaml==5.4.1
packaging==23.1
Jinja2==3.1.2
MarkupSafe==2.1.3
wrapt==1.12.1; python_version <= '3.10'
wrapt==1.14.1; python_version >= '3.11'
# Locking pylint and required packages
pylint==1.8.4; python_version < '3.4'

Просмотреть файл

@ -1,7 +1,7 @@
# requirements leveraged by ci tools
setuptools==67.6.0; python_version >= '3.5'
setuptools==70.2.0; python_version >= '3.5'
virtualenv==20.23.0
wheel==0.37.0
wheel==0.43.0
Jinja2==3.1.2
packaging==23.1
tox==4.5.0
@ -10,15 +10,12 @@ doc-warden==0.7.2
beautifulsoup4==4.9.1
pkginfo==1.5.0.1
pip==20.3.3
wrapt==1.12.1; python_version <= '3.10'
wrapt==1.14.1; python_version >= '3.11'
MarkupSafe==2.1.3
typing-extensions<=4.6.3
# locking packages defined as deps from azure-sdk-tools
pytoml==0.1.21
json-delta==2.0
ConfigArgParse==1.2.3
ConfigArgParse==1.7
six==1.14.0
pyyaml==5.4.1
pytest==7.3.1

Просмотреть файл

@ -11,12 +11,9 @@ pyproject-api<1.6
# locking packages defined as deps from azure-sdk-tools
Jinja2==3.1.2
MarkupSafe==2.1.3
json-delta==2.0
readme_renderer==42.0;
pyopenssl==24.0.0
python-dotenv==1.0.0; python_version > '3.7'
python-dotenv==1.0.1
pyyaml==6.0.1
urllib3==2.0.7
ConfigArgParse==1.2.3
six==1.16.0

Просмотреть файл

@ -41,7 +41,7 @@ deps =
[packaging]
pkgs =
wheel==0.40.0
wheel==0.43.0
packaging==23.1
urllib3==1.26.15
tomli==2.0.1

Просмотреть файл

@ -11,6 +11,7 @@
import argparse
import os
import sys
import logging
from tox_harness import prep_and_run_tox
from ci_tools.functions import discover_targeted_packages
@ -135,4 +136,5 @@ In the case of an environment invoking `pytest`, results can be collected in a j
logging.info("No packages collected. Exit 0.")
exit(0)
logging.info(f"Executing prep_and_run_tox with the executable {sys.executable}.")
prep_and_run_tox(targeted_packages, args)

Просмотреть файл

@ -87,7 +87,7 @@ def start_testserver():
if not is_port_available(port):
return child_process
time.sleep(1)
raise ValueError("Didn't start!")
raise ValueError(f"Didn't start!")
def terminate_testserver(process):

Просмотреть файл

@ -4,4 +4,5 @@
../../nspkg/azure-keyvault-nspkg
aiohttp>=3.0
parameterized>=0.7.3
python-dateutil>=2.8.0
python-dateutil>=2.8.0
pyopenssl

Просмотреть файл

@ -67,4 +67,3 @@ uamqp
yarl
azure-identity
openai
wrapt

Просмотреть файл

@ -9,13 +9,10 @@ DEPENDENCIES = [
"packaging",
"wheel",
"Jinja2",
"MarkupSafe",
"json-delta>=2.0",
# Tests
"pytest-cov",
"pytest>=3.5.1",
"readme_renderer",
"pyopenssl",
"python-dotenv",
"PyYAML",
"urllib3",