Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e382d86

Browse files
karthiknadigkarthiknadig
authored
Fix testing with python 3.10 (microsoft#18127)
* Fix testing with python 3.10 * Update build workflow to use the latest python * Fix YML problem * Disable tensor board session tests for 3.10
1 parent 74a96fa commit e382d86

File tree

8 files changed

+52
-19
lines changed

8 files changed

+52
-19
lines changed

‎.github/actions/smoke-tests/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
- name: Install Python
2222
uses: actions/setup-python@v2
2323
with:
24-
python-version: '3.9'
24+
python-version: '3.x'
2525
cache: 'pip'
2626
cache-dependency-path: |
2727
build/test-requirements.txt

‎.github/workflows/assign-reviewers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install Python
2525
uses: actions/setup-python@v2
2626
with:
27-
python-version: '3.9'
27+
python-version: '3.x'
2828
cache: 'pip'
2929
cache-dependency-path: '.github/assign-reviewers/requirements.txt'
3030

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
# entry to lower the number of runners used, macOS runners are expensive,
8686
# and we assume that Ubuntu is enough to cover the UNIX case.
8787
os: [ubuntu-latest, windows-latest]
88-
python: ['2.7', '3.9']
88+
python: ['2.7', '3.x']
8989
test-suite: [ts-unit, python-unit, venv, single-workspace, multi-workspace, debugger, functional]
9090
steps:
9191
- name: Checkout

‎.github/workflows/pr-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
NODE_VERSION: 12.15.0
12-
PYTHON_VERSION: 3.9
12+
PYTHON_VERSION: '3.10' # YML treats 3.10 the number as 3.1, so quotes around 3.10
1313
MOCHA_REPORTER_JUNIT: true # Use the mocha-multi-reporters and send output to both console (spec) and JUnit (mocha-junit-reporter). Also enables a reporter which exits the process running the tests if it haven't already.
1414
ARTIFACT_NAME_VSIX: ms-python-insiders-vsix
1515
VSIX_NAME: ms-python-insiders.vsix
@@ -61,7 +61,7 @@ jobs:
6161
# macOS runners are expensive, and we assume that Ubuntu is enough to cover the Unix case.
6262
os: [ubuntu-latest, windows-latest]
6363
# Run the tests on the oldest and most recent versions of Python.
64-
python: ['2.7', '3.9']
64+
python: ['2.7', '3.x']
6565
test-suite: [ts-unit, python-unit, venv, single-workspace, debugger, functional]
6666
exclude:
6767
# For fast PR turn-around, skip 2.7 under Windows.

‎build/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pylint
99
pycodestyle
1010
pydocstyle
1111
prospector ; python_version > '2.7'
12-
pytest<6 ; python_version > '2.7' # Tests currently fail against pytest 6.
12+
pytest ; python_version > '2.7'
1313
flask
1414
fastapi ; python_version > '2.7'
1515
uvicorn ; python_version > '2.7'

‎news/requirements.in

+5
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
# This file is used to generate requirements.txt.
2+
# To update requirements.txt, run the following commands.
3+
# 1) pip install pip-tools
4+
# 2) pip-compile --generate-hashes --upgrade news\requirements.in
5+
16
docopt
27
pytest

‎news/requirements.txt

+38-13
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,49 @@
11
#
2-
# This file is autogenerated by pip-compile
2+
# This file is autogenerated by pip-compile with python 3.10
33
# To update, run:
44
#
5-
# pip-compile
5+
# pip-compile --generate-hashes 'news\requirements.in'
66
#
7-
attrs==19.3.0
7+
atomicwrites==1.4.0 \
8+
--hash=sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197 \
9+
--hash=sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a
810
# via pytest
9-
docopt==0.6.2
10-
# via -r news/requirements.in
11-
iniconfig==1.0.1
11+
attrs==21.2.0 \
12+
--hash=sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1 \
13+
--hash=sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb
1214
# via pytest
13-
packaging==21.3
15+
colorama==0.4.4 \
16+
--hash=sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b \
17+
--hash=sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2
1418
# via pytest
15-
pluggy==0.13.1
19+
docopt==0.6.2 \
20+
--hash=sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491
21+
# via -r news\requirements.in
22+
iniconfig==1.1.1 \
23+
--hash=sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3 \
24+
--hash=sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32
1625
# via pytest
17-
py==1.10.0
26+
packaging==21.3 \
27+
--hash=sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb \
28+
--hash=sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
1829
# via pytest
19-
pyparsing==2.4.5
30+
pluggy==1.0.0 \
31+
--hash=sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159 \
32+
--hash=sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3
33+
# via pytest
34+
py==1.11.0 \
35+
--hash=sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719 \
36+
--hash=sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378
37+
# via pytest
38+
pyparsing==3.0.6 \
39+
--hash=sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4 \
40+
--hash=sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81
2041
# via packaging
21-
pytest==6.1.2
22-
# via -r news/requirements.in
23-
toml==0.10.1
42+
pytest==6.2.5 \
43+
--hash=sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89 \
44+
--hash=sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134
45+
# via -r news\requirements.in
46+
toml==0.10.2 \
47+
--hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \
48+
--hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f
2449
# via pytest

‎src/test/tensorBoard/tensorBoardSession.test.ts

+3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ suite('TensorBoard session creation', async () => {
6464
// TensorBoard 2.4.1 not available for Python 2.7
6565
this.skip();
6666
}
67+
68+
// See: https://github.com/microsoft/vscode-python/issues/18130
69+
this.skip();
6770
});
6871

6972
setup(async () => {

0 commit comments

Comments
 (0)