From 88ebfa74b58b368ea101f3aa91de608b4b11808c Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Mon, 21 Apr 2025 09:49:23 -0700 Subject: [PATCH 1/2] chore: update dependencies --- .../jedilsp_requirements/requirements.in | 2 +- requirements.in | 2 +- requirements.txt | Bin 8096 -> 3999 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python_files/jedilsp_requirements/requirements.in b/python_files/jedilsp_requirements/requirements.in index 8bafda64375e..74cfb91585eb 100644 --- a/python_files/jedilsp_requirements/requirements.in +++ b/python_files/jedilsp_requirements/requirements.in @@ -2,7 +2,7 @@ # To update requirements.txt, run the following commands. # Use Python 3.8 when creating the environment or using pip-tools # 1) Install `uv` https://docs.astral.sh/uv/getting-started/installation/ -# 2) uv pip compile --generate-hashes --upgrade python_files\jedilsp_requirements\requirements.in > python_files\jedilsp_requirements\requirements.txt +# 2) uv pip compile --generate-hashes --upgrade python_files\jedilsp_requirements\requirements.in -o python_files\jedilsp_requirements\requirements.txt jedi-language-server>=0.34.3 pygls>=0.10.3 diff --git a/requirements.in b/requirements.in index 566b012c27d9..a1e2243c553e 100644 --- a/requirements.in +++ b/requirements.in @@ -1,7 +1,7 @@ # This file is used to generate requirements.txt. # To update requirements.txt, run the following commands. # 1) Install `uv` https://docs.astral.sh/uv/getting-started/installation/ -# 2) uv pip compile --generate-hashes --upgrade requirements.in > requirements.txt +# 2) uv pip compile --generate-hashes --upgrade requirements.in -o requirements.txt # Unittest test adapter typing-extensions==4.13.2 diff --git a/requirements.txt b/requirements.txt index 464d3abb13155bac6622e863977b56b33bdf55b1..3983d5414c5446d530896bb884ec1701fd492c9d 100644 GIT binary patch literal 3999 zcmai%%Wfq%4uF28k2AE*Vi5G^CU1o{o zf76%CKc221mwo-_m*4c`qTg??U;V}3_2%m`|G0erartr8%k9Z8`}Nzm*Wa!$UoZCh z{H!nQm%A?)zIf#A`gZ*C?I?49|K9@lPx|rXAD4Ik_51bRpZ(?b@o;^)+`s<$SGV79 zch~2)*Z14E>%4#Vn=ZZS<70oQ58?99yW=JIKZ`wnJZUWT7m3kuAEbE(MDgjwYe+P(y-(17Hrap_wB9573Ur+9Y82$ z49+rTTi$=&*6sEA+m)6c;-^SVsv+dHdd#|9f&jecGp4|pqwXZbixytWeCq_9tAeA% zctz`JPyE~T81wR~pxMIMGU%%>%^uqfqD*n57}84BcFtZsSkbw7bgk2(vDeLLAq@qzNjqp#pzNM79L9+ z)&=NI>-E@GP#rt7rI|*qq0Mo~m%40-x?4LxX=Oa(f>dRS1%_Ko7&eCFomzw!NpjgN zhtZB^zK?A#51VoCbM|NLyLtvvY`1u|TAHC|JC`9{-NpU=5HQzs%pgTDyptmb-t zQcqbz2KP-7;*@N5?qTz6GoEIHPgfc^;X;D*U4IQD`y995FhDTP_+nzO7 zn2-XR)Ke2dbp6~g+BV5PqK8!>f7Y6;)!f)L3g1hsBga*lNfC`8ct}?!hB0|+)!4{EAc^^XtAKkZ9YG#rmo;x03wZxCu656XFjdH zYaRy|$1H(BGQvWA`VmZQpl&>Sj#C9qoP+?9n|E*$HM9i)NF`0tx1s~M;W3@yZp|3e0K@WYS`T-o2U29@HDJ}FtbReZU6^%$_iF0jj80NW|10qMG zts9uGI}(VTO_wStdruXE&pqt4ELAZdnqmXM1qI8oe-gov@O&Uq*gfECh{+-WDbBHb zh>EhAtr+|%oY@!)6_70BORe}8BuLxiS6W2jLBi6C;~K4bjBMAq))s6 zd59eV_hRS9XDg#b%NmNGASJN_sN+sOfN(}5b)`N72}(o8d68*oh3DlW6M1xq{$gP3M6EQhwhy-4#;gIh#P=L*M#Rblbf;Fhf zwrcO5Fh6Bq=zi+Hj@ST!GJ3lD+5+SosEBl@2tWI#fRB_p1K}4OpPqDQNdq`eV+ft>8!8�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 Date: Mon, 21 Apr 2025 09:57:58 -0700 Subject: [PATCH 2/2] fix: update min version to 3.9 --- .config/CredScanSuppressions.json | 12 ------------ .github/actions/build-vsix/action.yml | 4 ++-- .github/workflows/build.yml | 2 +- .github/workflows/pr-check.yml | 2 +- build/azure-pipeline.pre-release.yml | 2 +- build/azure-pipeline.stable.yml | 2 +- build/ci/conda_env_1.yml | 2 +- build/ci/conda_env_2.yml | 2 +- 8 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 .config/CredScanSuppressions.json diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json deleted file mode 100644 index cc237f71d86c..000000000000 --- a/.config/CredScanSuppressions.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "tool": "Credential Scanner", - "suppressions": [ - { - "file": [ - "file:///mnt/vss/_work/1/a/extension/extension/.nox/install_python_libs/lib/python3.8/site-packages/setuptools/_distutils/command%5Cregister.py", - "file:///mnt/vss/_work/1/b/extension/extension/.nox/install_python_libs/lib/python3.8/site-packages/setuptools/_distutils/command%5Cregister.py" - ], - "_justification": "These are not real passwords. For documentation purposes only." - } - ] - } diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml index 929ecb31a6d3..c2515247de97 100644 --- a/.github/actions/build-vsix/action.yml +++ b/.github/actions/build-vsix/action.yml @@ -31,10 +31,10 @@ runs: uses: dtolnay/rust-toolchain@stable # Jedi LS depends on dataclasses which is not in the stdlib in Python 3.7. - - name: Use Python 3.8 for JediLSP + - name: Use Python 3.9 for JediLSP uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: 3.9 cache: 'pip' cache-dependency-path: | requirements.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53ee0f003668..4b65b91a2cdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,7 +165,7 @@ jobs: # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. os: [ubuntu-latest, windows-latest] # Run the tests on the oldest and most recent versions of Python. - python: ['3.8', '3.x', '3.13-dev'] + python: ['3.9', '3.x', '3.13'] steps: - name: Checkout diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index b6bdaa8e250b..4b1ea54618b8 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -147,7 +147,7 @@ jobs: # macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case. os: [ubuntu-latest, windows-latest] # Run the tests on the oldest and most recent versions of Python. - python: ['3.8', '3.x', '3.13-dev'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release + python: ['3.9', '3.x', '3.13'] # run for 3 pytest versions, most recent stable, oldest version supported and pre-release pytest-version: ['pytest', 'pytest@pre-release', 'pytest==6.2.0'] steps: diff --git a/build/azure-pipeline.pre-release.yml b/build/azure-pipeline.pre-release.yml index 3236b43d0098..6c6600365529 100644 --- a/build/azure-pipeline.pre-release.yml +++ b/build/azure-pipeline.pre-release.yml @@ -71,7 +71,7 @@ extends: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' displayName: Select Python version diff --git a/build/azure-pipeline.stable.yml b/build/azure-pipeline.stable.yml index f9a37c5a9ec5..cae56854118e 100644 --- a/build/azure-pipeline.stable.yml +++ b/build/azure-pipeline.stable.yml @@ -65,7 +65,7 @@ extends: - task: UsePythonVersion@0 inputs: - versionSpec: '3.8' + versionSpec: '3.9' addToPath: true architecture: 'x64' displayName: Select Python version diff --git a/build/ci/conda_env_1.yml b/build/ci/conda_env_1.yml index e9d08d0820a4..4f9ceefd27fb 100644 --- a/build/ci/conda_env_1.yml +++ b/build/ci/conda_env_1.yml @@ -1,4 +1,4 @@ name: conda_env_1 dependencies: - - python=3.8 + - python=3.9 - pip diff --git a/build/ci/conda_env_2.yml b/build/ci/conda_env_2.yml index 80b946c3cc14..af9d7a46ba3e 100644 --- a/build/ci/conda_env_2.yml +++ b/build/ci/conda_env_2.yml @@ -1,4 +1,4 @@ name: conda_env_2 dependencies: - - python=3.8 + - python=3.9 - pip