From a8e1c40bc27a7ee1826cf4fbe8f4858a0a15c557 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Wed, 25 Dec 2024 19:59:25 +0800 Subject: [PATCH] optimize install and ci --- eng/dev_requirements.txt | 16 ++++++++++------ eng/requirements.txt | 5 ----- packages/autorest.python/dev_requirements.txt | 3 --- packages/autorest.python/requirements.txt | 7 ------- packages/typespec-python/dev_requirements.txt | 1 - .../generator/dev_requirements.txt | 12 ------------ .../typespec-python/generator/requirements.txt | 12 ------------ packages/typespec-python/package.json | 2 -- 8 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 eng/requirements.txt delete mode 100644 packages/typespec-python/generator/dev_requirements.txt delete mode 100644 packages/typespec-python/generator/requirements.txt diff --git a/eng/dev_requirements.txt b/eng/dev_requirements.txt index 3d91b03ddb4..9cb563ee0a4 100644 --- a/eng/dev_requirements.txt +++ b/eng/dev_requirements.txt @@ -1,8 +1,12 @@ +pyright==1.1.389 +pylint==3.2.7 +tox==4.16.0 +mypy==1.13.0 azure-pylint-guidelines-checker==0.0.8 colorama==0.4.6 -debugpy==1.8.9 -pytest==8.3.4 -tox==4.23.2 -coverage==7.6.9 -black==24.10.0 -setuptools==73.0.1 +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/eng/requirements.txt b/eng/requirements.txt deleted file mode 100644 index 6fa14db97c3..00000000000 --- a/eng/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -# This is for CI requirements or dev only -pyright==1.1.391 -pylint==3.2.7 -tox==4.23.2 -mypy==1.10.1 diff --git a/packages/autorest.python/dev_requirements.txt b/packages/autorest.python/dev_requirements.txt index 7bc8c2809fe..5451b7847f0 100644 --- a/packages/autorest.python/dev_requirements.txt +++ b/packages/autorest.python/dev_requirements.txt @@ -1,7 +1,4 @@ -e . -e ./generator --r ../../eng/requirements.txt -r ../../eng/dev_requirements.txt -ptvsd==4.3.2 -types-PyYAML==6.0.12.8 invoke==2.2.0 diff --git a/packages/autorest.python/requirements.txt b/packages/autorest.python/requirements.txt index 3f977ca26b8..1eb5b2cd7ee 100644 --- a/packages/autorest.python/requirements.txt +++ b/packages/autorest.python/requirements.txt @@ -1,13 +1,6 @@ -black==24.4.0 click==8.1.3 -docutils==0.19 -Jinja2==3.1.4 -m2r2==0.3.3 MarkupSafe==2.1.2 mistune==0.8.4 pathspec==0.11.1 platformdirs==3.2.0 -PyYAML==6.0.1 -tomli==2.0.1 -setuptools==69.2.0 json-rpc==1.14.0 diff --git a/packages/typespec-python/dev_requirements.txt b/packages/typespec-python/dev_requirements.txt index 882bccef2fa..342cc7db736 100644 --- a/packages/typespec-python/dev_requirements.txt +++ b/packages/typespec-python/dev_requirements.txt @@ -1,2 +1 @@ --r ../../eng/requirements.txt -r ../../eng/dev_requirements.txt diff --git a/packages/typespec-python/generator/dev_requirements.txt b/packages/typespec-python/generator/dev_requirements.txt deleted file mode 100644 index 48aa514dc54..00000000000 --- a/packages/typespec-python/generator/dev_requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -pyright==1.1.375 -pylint==3.2.6 -tox==4.16.0 -mypy==1.10.1 -azure-pylint-guidelines-checker==0.0.8 -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/typespec-python/generator/requirements.txt b/packages/typespec-python/generator/requirements.txt deleted file mode 100644 index bebbbb5a645..00000000000 --- a/packages/typespec-python/generator/requirements.txt +++ /dev/null @@ -1,12 +0,0 @@ -black==24.4.0 -click==8.1.3 -docutils==0.19 -Jinja2==3.1.4 -m2r2==0.3.3 -MarkupSafe==2.1.2 -mistune==0.8.4 -pathspec==0.11.1 -platformdirs==3.2.0 -PyYAML==6.0.1 -tomli==2.0.1 -setuptools==69.2.0 diff --git a/packages/typespec-python/package.json b/packages/typespec-python/package.json index b1174b55910..226461a062b 100644 --- a/packages/typespec-python/package.json +++ b/packages/typespec-python/package.json @@ -33,8 +33,6 @@ "lint": "tsx ./scripts/eng/lint.ts", "lint:fix": "eslint . --fix --ext .ts", "format": "npx prettier **/*.ts --write && tsx ./scripts/eng/format.ts", - "install": "tsx ./scripts/run-python3.ts ./scripts/install.py", - "prepare": "tsx ./scripts/run-python3.ts ./scripts/prepare.py", "regenerate": "tsx ./scripts/eng/regenerate.ts", "test": "tsx ./scripts/eng/run-tests.ts" },