From c324ce37f622d998d6542817d860f008e6e73c37 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 13:51:32 -0500 Subject: [PATCH 1/5] remove dependabot from running on entire repo --- packages/typespec-python/dev_requirements.txt | 16 +--------------- .../typespec-python/test/azure/requirements.txt | 5 +---- .../typespec-python/test/dev_requirements.txt | 1 + .../test/unbranded/requirements.txt | 5 +---- 4 files changed, 4 insertions(+), 23 deletions(-) create mode 100644 packages/typespec-python/test/dev_requirements.txt diff --git a/packages/typespec-python/dev_requirements.txt b/packages/typespec-python/dev_requirements.txt index 00d24fa73ba..8bf4d8d83f0 100644 --- a/packages/typespec-python/dev_requirements.txt +++ b/packages/typespec-python/dev_requirements.txt @@ -1,15 +1 @@ -# shall keep aligned with dev_requirements.txt of @typspec/http-client-python -pyright==1.1.389 -pylint==3.2.7 -tox==4.23.2 -mypy==1.13.0 -colorama==0.4.6 -debugpy==1.8.12 -pytest==8.3.2 -coverage==7.6.1 -black==24.8.0 -ptvsd==4.3.2 -types-PyYAML==6.0.12.20241230 - -# additional dependency needed for development -setuptools \ No newline at end of file +-r ./node_modules/@typespec/http-client-python/generator/dev_requirements.txt diff --git a/packages/typespec-python/test/azure/requirements.txt b/packages/typespec-python/test/azure/requirements.txt index 5f834f72a91..32add0d9010 100644 --- a/packages/typespec-python/test/azure/requirements.txt +++ b/packages/typespec-python/test/azure/requirements.txt @@ -1,7 +1,4 @@ -aiohttp;python_full_version>="3.5.2" -requests==2.32.2 -pytest -pytest-asyncio==0.14.0;python_full_version>="3.5.2" +-r ../dev_requirements.txt azure-core==1.30.0 azure-mgmt-core==1.3.2 # only for azure diff --git a/packages/typespec-python/test/dev_requirements.txt b/packages/typespec-python/test/dev_requirements.txt new file mode 100644 index 00000000000..803c57fd6e2 --- /dev/null +++ b/packages/typespec-python/test/dev_requirements.txt @@ -0,0 +1 @@ +-r ../node_modules/@typespec/http-client-python/generator/test/dev_requirements.txt diff --git a/packages/typespec-python/test/unbranded/requirements.txt b/packages/typespec-python/test/unbranded/requirements.txt index 8d2fcf35041..2bae300f03e 100644 --- a/packages/typespec-python/test/unbranded/requirements.txt +++ b/packages/typespec-python/test/unbranded/requirements.txt @@ -1,7 +1,4 @@ -aiohttp;python_full_version>="3.5.2" -requests==2.32.2 -pytest -pytest-asyncio==0.14.0;python_full_version>="3.5.2" +-r ../dev_requirements.txt corehttp==1.0.0b3 # common test case From e8955bace4cc4c078c3bd71e98b9ce8660f2b772 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 13:56:34 -0500 Subject: [PATCH 2/5] try depending entirely on reqs from parent package --- .github/dependabot.yml | 30 ++----------------- eng/dev_requirements.txt | 1 - packages/autorest.python/dev_requirements.txt | 2 +- .../autorest.python/test/azure/legacy/tox.ini | 2 +- .../test/azure/version-tolerant/tox.ini | 4 +-- .../test/dpg/version-tolerant/tox.ini | 4 +-- .../autorest.python/test/multiapi/tox.ini | 2 +- .../test/vanilla/legacy/tox.ini | 2 +- .../test/vanilla/version-tolerant/tox.ini | 4 +-- packages/typespec-python/test/azure/tox.ini | 4 +-- .../typespec-python/test/unbranded/tox.ini | 4 +-- 11 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 eng/dev_requirements.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6c8d1587065..04d2921f022 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,22 +1,9 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - version: 2 updates: -# - package-ecosystem: "pip" # See documentation for possible values -# directory: "/packages/autorest.python/" # Location of package manifests -# schedule: -# interval: "weekly" -# # Include a list of updated dependencies -# # with a prefix determined by the dependency group -# commit-message: -# prefix: "pip prod" -# prefix-development: "pip dev" -# include: "scope" - package-ecosystem: "pip" # See documentation for possible values - directory: "/eng/" # Location of package manifests + directories: + - "/packages/typespec-python/test/azure/" + - "/packages/typespec-python/test/unbranded/" schedule: interval: "weekly" # Include a list of updated dependencies @@ -25,14 +12,3 @@ updates: prefix: "pip prod" prefix-development: "pip dev" include: "scope" - -# - package-ecosystem: "pnpm" # https://github.com/dependabot/dependabot-core/issues/1736 -# directory: "/packages/typespec-python/" # Location of package manifests -# schedule: -# interval: "weekly" -# # Include a list of updated dependencies -# # with a prefix determined by the dependency group -# commit-message: -# prefix: "npm prod" -# prefix-development: "npm dev" -# include: "scope" diff --git a/eng/dev_requirements.txt b/eng/dev_requirements.txt deleted file mode 100644 index c29ab357b6d..00000000000 --- a/eng/dev_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --r ../packages/typespec-python/dev_requirements.txt diff --git a/packages/autorest.python/dev_requirements.txt b/packages/autorest.python/dev_requirements.txt index 5451b7847f0..c88ec7a9ae7 100644 --- a/packages/autorest.python/dev_requirements.txt +++ b/packages/autorest.python/dev_requirements.txt @@ -1,4 +1,4 @@ -e . -e ./generator --r ../../eng/dev_requirements.txt +-r ./node_modules/@typespec/http-client-python/generator/dev_requirements.txt invoke==2.2.0 diff --git a/packages/autorest.python/test/azure/legacy/tox.ini b/packages/autorest.python/test/azure/legacy/tox.ini index d2fad1ddb23..504c50977f0 100644 --- a/packages/autorest.python/test/azure/legacy/tox.ini +++ b/packages/autorest.python/test/azure/legacy/tox.ini @@ -6,7 +6,7 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands= pytest --cov=Expected diff --git a/packages/autorest.python/test/azure/version-tolerant/tox.ini b/packages/autorest.python/test/azure/version-tolerant/tox.ini index f18d090064c..b29e7cb80ee 100644 --- a/packages/autorest.python/test/azure/version-tolerant/tox.ini +++ b/packages/autorest.python/test/azure/version-tolerant/tox.ini @@ -6,14 +6,14 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands= pytest --cov=Expected [testenv:lint] deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands = pip install azure-pylint-guidelines-checker==0.5.0 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" python ../../../../../eng/scripts/run_pylint.py -t azure -g version-tolerant {posargs} diff --git a/packages/autorest.python/test/dpg/version-tolerant/tox.ini b/packages/autorest.python/test/dpg/version-tolerant/tox.ini index 5172ceff1ba..8c2106c5811 100644 --- a/packages/autorest.python/test/dpg/version-tolerant/tox.ini +++ b/packages/autorest.python/test/dpg/version-tolerant/tox.ini @@ -6,14 +6,14 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands= pytest --cov=Expected [testenv:lint] deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands = pip install azure-pylint-guidelines-checker==0.5.0 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" python ../../../../../eng/scripts/run_pylint.py -t dpg -g version-tolerant {posargs} diff --git a/packages/autorest.python/test/multiapi/tox.ini b/packages/autorest.python/test/multiapi/tox.ini index eafc575541c..b4adc11713f 100644 --- a/packages/autorest.python/test/multiapi/tox.ini +++ b/packages/autorest.python/test/multiapi/tox.ini @@ -6,7 +6,7 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../eng/dev_requirements.txt + -r ../../dev_requirements.txt commands= pytest --cov=Expected diff --git a/packages/autorest.python/test/vanilla/legacy/tox.ini b/packages/autorest.python/test/vanilla/legacy/tox.ini index b3ed9be208b..3888f0bb681 100644 --- a/packages/autorest.python/test/vanilla/legacy/tox.ini +++ b/packages/autorest.python/test/vanilla/legacy/tox.ini @@ -6,7 +6,7 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands= pytest --cov=Expected diff --git a/packages/autorest.python/test/vanilla/version-tolerant/tox.ini b/packages/autorest.python/test/vanilla/version-tolerant/tox.ini index 292f6327c44..a3645f96093 100644 --- a/packages/autorest.python/test/vanilla/version-tolerant/tox.ini +++ b/packages/autorest.python/test/vanilla/version-tolerant/tox.ini @@ -6,14 +6,14 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands= pytest --cov=Expected [testenv:lint] deps= -r requirements.txt - -r ../../../../../eng/dev_requirements.txt + -r ../../../dev_requirements.txt commands = pip install azure-pylint-guidelines-checker==0.5.0 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" python ../../../../../eng/scripts/run_pylint.py -t vanilla -g version-tolerant {posargs} diff --git a/packages/typespec-python/test/azure/tox.ini b/packages/typespec-python/test/azure/tox.ini index 4ff45f77e7b..f7e6e629bcf 100644 --- a/packages/typespec-python/test/azure/tox.ini +++ b/packages/typespec-python/test/azure/tox.ini @@ -6,7 +6,7 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../eng/dev_requirements.txt + -r ../../dev_requirements.txt commands= pytest @@ -17,7 +17,7 @@ commands = [testenv:lint] deps= -r requirements.txt - -r ../../../../eng/dev_requirements.txt + -r ../../dev_requirements.txt commands = pip install azure-pylint-guidelines-checker==0.5.0 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" python ../../../../eng/scripts/run_pylint.py -p typespec-python -t azure -s "generated" {posargs} diff --git a/packages/typespec-python/test/unbranded/tox.ini b/packages/typespec-python/test/unbranded/tox.ini index ec0926c6238..22b63deb94c 100644 --- a/packages/typespec-python/test/unbranded/tox.ini +++ b/packages/typespec-python/test/unbranded/tox.ini @@ -6,7 +6,7 @@ skipsdist=True passenv=* deps= -r requirements.txt - -r ../../../../eng/dev_requirements.txt + -r ../../dev_requirements.txt commands= pytest @@ -17,7 +17,7 @@ commands = [testenv:lint] deps= -r requirements.txt - -r ../../../../eng/dev_requirements.txt + -r ../../dev_requirements.txt commands = pip install azure-pylint-guidelines-checker==0.5.0 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/" python ../../../../eng/scripts/run_pylint.py -p typespec-python -t unbranded -s "generated" {posargs} From f51b739924b4a936cfeb299830fab8ba9f23d062 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 14:41:20 -0500 Subject: [PATCH 3/5] trying with packed package --- packages/autorest.python/package.json | 2 +- packages/typespec-python/package.json | 2 +- pnpm-lock.yaml | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packages/autorest.python/package.json b/packages/autorest.python/package.json index 2f27c864bea..6bbd8175bff 100644 --- a/packages/autorest.python/package.json +++ b/packages/autorest.python/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md", "dependencies": { - "@typespec/http-client-python": "~0.6.6", + "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz", "@autorest/system-requirements": "~1.0.2", "fs-extra": "~11.2.0", "tsx": "~4.19.1" diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index 00f88e50134..00b51999e11 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -60,7 +60,7 @@ "js-yaml": "~4.1.0", "semver": "~7.6.2", "tsx": "~4.19.1", - "@typespec/http-client-python": "~0.6.6", + "@typespec/http-client-python": "/Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz", "fs-extra": "~11.2.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c687b37dc69..f45c4cdb5f0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: ~1.0.2 version: 1.0.2 '@typespec/http-client-python': - specifier: ~0.6.6 - version: 0.6.6(344dqbupcyrxgrh4b4p3wdm4hy) + specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz + version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz(344dqbupcyrxgrh4b4p3wdm4hy) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -79,8 +79,8 @@ importers: packages/typespec-python: dependencies: '@typespec/http-client-python': - specifier: ~0.6.6 - version: 0.6.6(344dqbupcyrxgrh4b4p3wdm4hy) + specifier: /Users/isabellacai/Desktop/github/typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz + version: file:../typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz(344dqbupcyrxgrh4b4p3wdm4hy) fs-extra: specifier: ~11.2.0 version: 11.2.0 @@ -1387,8 +1387,9 @@ packages: engines: {node: '>=18.0.0'} hasBin: true - '@typespec/http-client-python@0.6.6': - resolution: {integrity: sha512-/TjWtsZv6UkZuJO044Ss837IoT0WBkKSyzBE04n0hlqh0sZdIF7niSuF3PPMO9/Y5lu1uq84x2gIGjCg0vca3g==} + '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz': + resolution: {integrity: sha512-x4RfMxM5CufGMOpaBSH4tT0PYOfNkSoHOlhk/dUkrOPve/eb8wWZ/qqhl1TBAlELCToOvw/qQTFRDzV6s8dbDQ==, tarball: file:../typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz} + version: 0.6.6 engines: {node: '>=18.0.0'} peerDependencies: '@azure-tools/typespec-autorest': '>=0.50.0 <1.0.0' @@ -5436,7 +5437,7 @@ snapshots: yaml: 2.5.1 yargs: 17.7.2 - '@typespec/http-client-python@0.6.6(344dqbupcyrxgrh4b4p3wdm4hy)': + '@typespec/http-client-python@file:../typespec/packages/http-client-python/typespec-http-client-python-0.6.6.tgz(344dqbupcyrxgrh4b4p3wdm4hy)': dependencies: '@azure-tools/typespec-autorest': 0.50.0(wbm4mzo6ukgu4r772ee7kwkave) '@azure-tools/typespec-azure-core': 0.50.0(@typespec/compiler@0.64.0)(@typespec/http@0.64.0(@typespec/compiler@0.64.0))(@typespec/rest@0.64.0(@typespec/compiler@0.64.0)(@typespec/http@0.64.0(@typespec/compiler@0.64.0))) From 0240a17021490525ee676dfda53ecbdce017f195 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 27 Jan 2025 11:10:03 -0500 Subject: [PATCH 4/5] try different rel path for recursive installation --- packages/autorest.python/dev_requirements.txt | 2 +- packages/typespec-python/dev_requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/autorest.python/dev_requirements.txt b/packages/autorest.python/dev_requirements.txt index c88ec7a9ae7..b9168b8607c 100644 --- a/packages/autorest.python/dev_requirements.txt +++ b/packages/autorest.python/dev_requirements.txt @@ -1,4 +1,4 @@ -e . -e ./generator --r ./node_modules/@typespec/http-client-python/generator/dev_requirements.txt +-r ../node_modules/@typespec/http-client-python/generator/dev_requirements.txt invoke==2.2.0 diff --git a/packages/typespec-python/dev_requirements.txt b/packages/typespec-python/dev_requirements.txt index 8bf4d8d83f0..7bbd95e5b0f 100644 --- a/packages/typespec-python/dev_requirements.txt +++ b/packages/typespec-python/dev_requirements.txt @@ -1 +1 @@ --r ./node_modules/@typespec/http-client-python/generator/dev_requirements.txt +-r ../node_modules/@typespec/http-client-python/generator/dev_requirements.txt From 3a8bceea5d9a94c8de2b549fc821f5bc2d1ab569 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Mon, 27 Jan 2025 11:19:13 -0500 Subject: [PATCH 5/5] remove dependabot from autorest.ptyhon --- .github/dependabot.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 04d2921f022..00000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "pip" # See documentation for possible values - directories: - - "/packages/typespec-python/test/azure/" - - "/packages/typespec-python/test/unbranded/" - schedule: - interval: "weekly" - # Include a list of updated dependencies - # with a prefix determined by the dependency group - commit-message: - prefix: "pip prod" - prefix-development: "pip dev" - include: "scope"