From f397f2393be262dde6d18db860f43a4661a084e2 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 13:14:13 -0500 Subject: [PATCH 01/12] add dependabot for python, add requirements.txt --- .github/dependabot.yml | 10 ++++++++++ packages/http-client-python/requirements.txt | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 packages/http-client-python/requirements.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000000..9bfdffead8 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/packages/http-client-python/generator" + schedule: + interval: "weekly" + commit-message: + prefix: "pip prod" + prefix-development: "pip dev" + include: "scope" diff --git a/packages/http-client-python/requirements.txt b/packages/http-client-python/requirements.txt new file mode 100644 index 0000000000..fe3586d2a4 --- /dev/null +++ b/packages/http-client-python/requirements.txt @@ -0,0 +1,13 @@ +black==24.8.0 +click==8.1.8 +docutils==0.21.2 +Jinja2==3.1.3 +m2r2==0.3.3.post2 +MarkupSafe==3.0.2 +mistune==0.8.4 +mypy-extensions==1.0.0 +packaging==24.2 +pathspec==0.12.1 +platformdirs==4.3.6 +PyYAML==6.0.1 +tomli==2.0.1 From cd52d1c584f8d50cc41c98a1485be505339cffba Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 13:20:12 -0500 Subject: [PATCH 02/12] move requirements.txt into generator package --- packages/http-client-python/{ => generator}/requirements.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/http-client-python/{ => generator}/requirements.txt (100%) diff --git a/packages/http-client-python/requirements.txt b/packages/http-client-python/generator/requirements.txt similarity index 100% rename from packages/http-client-python/requirements.txt rename to packages/http-client-python/generator/requirements.txt From 720aa3df226b6a332a4018e4da72f2a809601d5a Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 13:30:04 -0500 Subject: [PATCH 03/12] add dependabots for testing updates too --- .github/dependabot.yml | 24 +++++++++++++++++++ .../generator/test/azure/requirements.txt | 10 +------- .../generator/test/dev_requirements.txt | 4 ++++ .../generator/test/unbranded/requirements.txt | 11 +-------- 4 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 packages/http-client-python/generator/test/dev_requirements.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9bfdffead8..719da4f5e8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,3 +8,27 @@ updates: prefix: "pip prod" prefix-development: "pip dev" include: "scope" + - package-ecosystem: "pip" + directory: "/packages/http-client-python/generator/" + schedule: + interval: "weekly" + commit-message: + prefix: "pip prod" + prefix-development: "pip dev" + include: "scope" + - package-ecosystem: "pip" + directory: "/packages/http-client-python/generator/test" + schedule: + interval: "weekly" + commit-message: + prefix: "pip prod" + prefix-development: "pip dev" + include: "scope" + - package-ecosystem: "pip" + directory: "/packages/http-client-python/generator/test/azure" + schedule: + interval: "weekly" + commit-message: + prefix: "pip prod" + prefix-development: "pip dev" + include: "scope" diff --git a/packages/http-client-python/generator/test/azure/requirements.txt b/packages/http-client-python/generator/test/azure/requirements.txt index cd2fa0481f..c55120f31f 100644 --- a/packages/http-client-python/generator/test/azure/requirements.txt +++ b/packages/http-client-python/generator/test/azure/requirements.txt @@ -1,15 +1,7 @@ -setuptools==69.5.1 +-r ../dev-requirements.txt -e ../../ -aiohttp;python_full_version>="3.5.2" -requests==2.32.2 -pytest -pytest-asyncio==0.14.0;python_full_version>="3.5.2" azure-core==1.30.0 azure-mgmt-core==1.3.2 -pyright==1.1.391 -pylint==3.2.7 -tox==4.18.1 -mypy==1.14.1 # only for azure -e ./generated/azure-client-generator-core-access diff --git a/packages/http-client-python/generator/test/dev_requirements.txt b/packages/http-client-python/generator/test/dev_requirements.txt new file mode 100644 index 0000000000..18472a1521 --- /dev/null +++ b/packages/http-client-python/generator/test/dev_requirements.txt @@ -0,0 +1,4 @@ +aiohttp===3.11.11 +pyright==1.1.391 +pytest-asyncio==0.14.0 +requests==2.32.2 diff --git a/packages/http-client-python/generator/test/unbranded/requirements.txt b/packages/http-client-python/generator/test/unbranded/requirements.txt index 295c6de28e..8feb802d17 100644 --- a/packages/http-client-python/generator/test/unbranded/requirements.txt +++ b/packages/http-client-python/generator/test/unbranded/requirements.txt @@ -1,14 +1,5 @@ -setuptools==69.5.1 +-r ../dev-requirements.txt -e ../../ -aiohttp;python_full_version>="3.5.2" -requests==2.32.2 -pytest -pytest-asyncio==0.14.0;python_full_version>="3.5.2" -pyright==1.1.391 -pylint==3.2.7 -tox==4.18.1 -mypy==1.14.1 - # common test case -e ./generated/authentication-api-key From ebcfc112f19818b16f23314085a40e1e90b8f62a Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 13:38:52 -0500 Subject: [PATCH 04/12] list directories in one --- .github/dependabot.yml | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 719da4f5e8..90df0c1c8b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,23 +9,10 @@ updates: prefix-development: "pip dev" include: "scope" - package-ecosystem: "pip" - directory: "/packages/http-client-python/generator/" - schedule: - interval: "weekly" - commit-message: - prefix: "pip prod" - prefix-development: "pip dev" - include: "scope" - - package-ecosystem: "pip" - directory: "/packages/http-client-python/generator/test" - schedule: - interval: "weekly" - commit-message: - prefix: "pip prod" - prefix-development: "pip dev" - include: "scope" - - package-ecosystem: "pip" - directory: "/packages/http-client-python/generator/test/azure" + directories: + - "/packages/http-client-python/generator/" + - "/packages/http-client-python/generator/test" + - "/packages/http-client-python/generator/test/azure" schedule: interval: "weekly" commit-message: From ce9250c69a1870448ef10b765fe690e405f6a6f3 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 14:01:20 -0500 Subject: [PATCH 05/12] rename to dev_requirements --- .../http-client-python/generator/test/azure/requirements.txt | 2 +- .../generator/test/unbranded/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/http-client-python/generator/test/azure/requirements.txt b/packages/http-client-python/generator/test/azure/requirements.txt index c55120f31f..5c4e0d05a3 100644 --- a/packages/http-client-python/generator/test/azure/requirements.txt +++ b/packages/http-client-python/generator/test/azure/requirements.txt @@ -1,4 +1,4 @@ --r ../dev-requirements.txt +-r ../dev_requirements.txt -e ../../ azure-core==1.30.0 azure-mgmt-core==1.3.2 diff --git a/packages/http-client-python/generator/test/unbranded/requirements.txt b/packages/http-client-python/generator/test/unbranded/requirements.txt index 8feb802d17..1e08545659 100644 --- a/packages/http-client-python/generator/test/unbranded/requirements.txt +++ b/packages/http-client-python/generator/test/unbranded/requirements.txt @@ -1,4 +1,4 @@ --r ../dev-requirements.txt +-r ../dev_requirements.txt -e ../../ # common test case From 4501a0f1ccaf188450279e8aa43a2ea118ab86c4 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 14:30:03 -0500 Subject: [PATCH 06/12] don't pin aiohttp --- packages/http-client-python/generator/test/dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-client-python/generator/test/dev_requirements.txt b/packages/http-client-python/generator/test/dev_requirements.txt index 18472a1521..3c7739c533 100644 --- a/packages/http-client-python/generator/test/dev_requirements.txt +++ b/packages/http-client-python/generator/test/dev_requirements.txt @@ -1,4 +1,4 @@ -aiohttp===3.11.11 +aiohttp pyright==1.1.391 pytest-asyncio==0.14.0 requests==2.32.2 From 4df4654813570ffd9e799023f560bb7640a0f282 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 15:10:54 -0500 Subject: [PATCH 07/12] add installation of root dev reqs to test dev reqs --- packages/http-client-python/generator/test/dev_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/http-client-python/generator/test/dev_requirements.txt b/packages/http-client-python/generator/test/dev_requirements.txt index 3c7739c533..d54f674584 100644 --- a/packages/http-client-python/generator/test/dev_requirements.txt +++ b/packages/http-client-python/generator/test/dev_requirements.txt @@ -1,3 +1,4 @@ +-r ../dev_requirements.txt aiohttp pyright==1.1.391 pytest-asyncio==0.14.0 From b80021c2ecc7b760511416d937cdcb0b7f310655 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 17:24:00 -0500 Subject: [PATCH 08/12] update to use dev_reqs in eng --- .github/dependabot.yml | 4 ++-- .../eng/scripts/ci/dev_requirements.txt | 11 +++++++++++ .../generator/dev_requirements.txt | 12 +----------- .../generator/test/dev_requirements.txt | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 packages/http-client-python/eng/scripts/ci/dev_requirements.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 90df0c1c8b..03e2a57012 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,9 +10,9 @@ updates: include: "scope" - package-ecosystem: "pip" directories: - - "/packages/http-client-python/generator/" - - "/packages/http-client-python/generator/test" + - "/packages/http-client-python/eng/" - "/packages/http-client-python/generator/test/azure" + - "/packages/http-client-python/generator/test/unbranded" schedule: interval: "weekly" commit-message: diff --git a/packages/http-client-python/eng/scripts/ci/dev_requirements.txt b/packages/http-client-python/eng/scripts/ci/dev_requirements.txt new file mode 100644 index 0000000000..38c286da5d --- /dev/null +++ b/packages/http-client-python/eng/scripts/ci/dev_requirements.txt @@ -0,0 +1,11 @@ +pyright==1.1.391 +pylint==3.2.7 +tox==4.16.0 +mypy==1.14.1 +colorama==0.4.6 +debugpy==1.8.2 +pytest==8.3.2 +coverage==7.6.1 +black==24.8.0 +ptvsd==4.3.2 +types-PyYAML==6.0.12.8 diff --git a/packages/http-client-python/generator/dev_requirements.txt b/packages/http-client-python/generator/dev_requirements.txt index 99b5bfa176..5ad915cc9c 100644 --- a/packages/http-client-python/generator/dev_requirements.txt +++ b/packages/http-client-python/generator/dev_requirements.txt @@ -1,12 +1,2 @@ -e ./generator -pyright==1.1.391 -pylint==3.2.7 -tox==4.16.0 -mypy==1.14.1 -colorama==0.4.6 -debugpy==1.8.2 -pytest==8.3.2 -coverage==7.6.1 -black==24.8.0 -ptvsd==4.3.2 -types-PyYAML==6.0.12.8 +-r ../eng/scripts/ci/dev_requirements.txt diff --git a/packages/http-client-python/generator/test/dev_requirements.txt b/packages/http-client-python/generator/test/dev_requirements.txt index d54f674584..d47f8ade00 100644 --- a/packages/http-client-python/generator/test/dev_requirements.txt +++ b/packages/http-client-python/generator/test/dev_requirements.txt @@ -1,4 +1,4 @@ --r ../dev_requirements.txt +-r ../../eng/scripts/ci/dev_requirements.txt aiohttp pyright==1.1.391 pytest-asyncio==0.14.0 From 8432c6f90bc354c6d7b2f17cb7fcc780e47118d0 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Tue, 21 Jan 2025 17:24:26 -0500 Subject: [PATCH 09/12] get rid of duplicate update entry --- .github/dependabot.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 03e2a57012..810ee92c00 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,13 +1,5 @@ version: 2 updates: - - package-ecosystem: "pip" - directory: "/packages/http-client-python/generator" - schedule: - interval: "weekly" - commit-message: - prefix: "pip prod" - prefix-development: "pip dev" - include: "scope" - package-ecosystem: "pip" directories: - "/packages/http-client-python/eng/" From 6d70f36a56b1d3904c7c47079124dd9aab9e26e1 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 22 Jan 2025 14:24:57 -0500 Subject: [PATCH 10/12] remove reqs.txt at root of repo --- .../http-client-python/generator/requirements.txt | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 packages/http-client-python/generator/requirements.txt diff --git a/packages/http-client-python/generator/requirements.txt b/packages/http-client-python/generator/requirements.txt deleted file mode 100644 index fe3586d2a4..0000000000 --- a/packages/http-client-python/generator/requirements.txt +++ /dev/null @@ -1,13 +0,0 @@ -black==24.8.0 -click==8.1.8 -docutils==0.21.2 -Jinja2==3.1.3 -m2r2==0.3.3.post2 -MarkupSafe==3.0.2 -mistune==0.8.4 -mypy-extensions==1.0.0 -packaging==24.2 -pathspec==0.12.1 -platformdirs==4.3.6 -PyYAML==6.0.1 -tomli==2.0.1 From 8d8f4a73dc43eb610dd2ead35fd6f0766d4ee853 Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 22 Jan 2025 14:28:47 -0500 Subject: [PATCH 11/12] unify path --- packages/http-client-python/generator/dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-client-python/generator/dev_requirements.txt b/packages/http-client-python/generator/dev_requirements.txt index 5ad915cc9c..6145e21865 100644 --- a/packages/http-client-python/generator/dev_requirements.txt +++ b/packages/http-client-python/generator/dev_requirements.txt @@ -1,2 +1,2 @@ -e ./generator --r ../eng/scripts/ci/dev_requirements.txt +-r ./eng/scripts/ci/dev_requirements.txt From 46423d15e3b68629b25f6ad03d49f7cc23308a7b Mon Sep 17 00:00:00 2001 From: iscai-msft Date: Wed, 22 Jan 2025 14:53:01 -0500 Subject: [PATCH 12/12] revert relative path change --- packages/http-client-python/generator/dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-client-python/generator/dev_requirements.txt b/packages/http-client-python/generator/dev_requirements.txt index 6145e21865..5ad915cc9c 100644 --- a/packages/http-client-python/generator/dev_requirements.txt +++ b/packages/http-client-python/generator/dev_requirements.txt @@ -1,2 +1,2 @@ -e ./generator --r ./eng/scripts/ci/dev_requirements.txt +-r ../eng/scripts/ci/dev_requirements.txt