Skip to content

Commit a0bf6da

Browse files
author
jbbjarnason
committed
.github/workflow/ports_unix: Update virtual env. to CPython 3.9.
ports/windows/.appveyor: Update Windows virtual env. to 3.9. New Python features depend on more recent Python.
1 parent 26f32fb commit a0bf6da

File tree

4 files changed

+53
-10
lines changed

4 files changed

+53
-10
lines changed

.github/workflows/ports_qemu-arm.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v2
21+
- uses: actions/setup-python@v2
22+
with:
23+
python-version: '3.9'
2124
- name: Install packages
2225
run: source tools/ci.sh && ci_qemu_arm_setup
2326
- name: Build and run test suite

.github/workflows/ports_unix.yml

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- uses: actions/checkout@v2
44+
- uses: actions/setup-python@v2
45+
with:
46+
python-version: '3.9'
4447
- name: Build
4548
run: source tools/ci.sh && ci_unix_standard_build
4649
- name: Run main test suite
@@ -53,6 +56,9 @@ jobs:
5356
runs-on: ubuntu-latest
5457
steps:
5558
- uses: actions/checkout@v2
59+
- uses: actions/setup-python@v2
60+
with:
61+
python-version: '3.9'
5662
- name: Build
5763
run: source tools/ci.sh && ci_unix_dev_build
5864
- name: Run main test suite
@@ -65,8 +71,15 @@ jobs:
6571
runs-on: ubuntu-latest
6672
steps:
6773
- uses: actions/checkout@v2
68-
- name: Install packages
69-
run: source tools/ci.sh && ci_unix_coverage_setup
74+
- uses: actions/setup-python@v2
75+
with:
76+
python-version: '3.9'
77+
- name: Install python dependencies
78+
run: |
79+
python -m pip install --upgrade pip
80+
pip install setuptools pyelftools
81+
- name: Print environment version
82+
run: source tools/ci.sh && ci_unix_coverage_print_env
7083
- name: Build
7184
run: source tools/ci.sh && ci_unix_coverage_build
7285
- name: Run main test suite
@@ -92,6 +105,13 @@ jobs:
92105
runs-on: ubuntu-latest
93106
steps:
94107
- uses: actions/checkout@v2
108+
- uses: actions/setup-python@v2
109+
with:
110+
python-version: '3.9'
111+
- name: Install python dependencies
112+
run: |
113+
python -m pip install --upgrade pip
114+
pip install setuptools pyelftools
95115
- name: Install packages
96116
run: source tools/ci.sh && ci_unix_32bit_setup
97117
- name: Build
@@ -110,6 +130,9 @@ jobs:
110130
runs-on: ubuntu-latest
111131
steps:
112132
- uses: actions/checkout@v2
133+
- uses: actions/setup-python@v2
134+
with:
135+
python-version: '3.9'
113136
- name: Install packages
114137
run: source tools/ci.sh && ci_unix_32bit_setup
115138
- name: Build
@@ -124,6 +147,9 @@ jobs:
124147
runs-on: ubuntu-latest
125148
steps:
126149
- uses: actions/checkout@v2
150+
- uses: actions/setup-python@v2
151+
with:
152+
python-version: '3.9'
127153
- name: Build
128154
run: source tools/ci.sh && ci_unix_float_build
129155
- name: Run main test suite
@@ -136,6 +162,9 @@ jobs:
136162
runs-on: ubuntu-20.04
137163
steps:
138164
- uses: actions/checkout@v2
165+
- uses: actions/setup-python@v2
166+
with:
167+
python-version: '3.9'
139168
- name: Install packages
140169
run: source tools/ci.sh && ci_unix_clang_setup
141170
- name: Build
@@ -150,6 +179,9 @@ jobs:
150179
runs-on: ubuntu-20.04
151180
steps:
152181
- uses: actions/checkout@v2
182+
- uses: actions/setup-python@v2
183+
with:
184+
python-version: '3.9'
153185
- name: Install packages
154186
run: source tools/ci.sh && ci_unix_clang_setup
155187
- name: Build
@@ -164,6 +196,9 @@ jobs:
164196
runs-on: ubuntu-latest
165197
steps:
166198
- uses: actions/checkout@v2
199+
- uses: actions/setup-python@v2
200+
with:
201+
python-version: '3.9'
167202
- name: Build
168203
run: source tools/ci.sh && ci_unix_settrace_build
169204
- name: Run main test suite
@@ -176,6 +211,9 @@ jobs:
176211
runs-on: ubuntu-latest
177212
steps:
178213
- uses: actions/checkout@v2
214+
- uses: actions/setup-python@v2
215+
with:
216+
python-version: '3.9'
179217
- name: Build
180218
run: source tools/ci.sh && ci_unix_settrace_stackless_build
181219
- name: Run main test suite
@@ -190,7 +228,7 @@ jobs:
190228
- uses: actions/checkout@v2
191229
- uses: actions/setup-python@v2
192230
with:
193-
python-version: '3.8'
231+
python-version: '3.9'
194232
- name: Build
195233
run: source tools/ci.sh && ci_unix_macos_build
196234
- name: Run tests
@@ -203,6 +241,9 @@ jobs:
203241
runs-on: ubuntu-latest
204242
steps:
205243
- uses: actions/checkout@v2
244+
- uses: actions/setup-python@v2
245+
with:
246+
python-version: '3.9'
206247
- name: Install packages
207248
run: source tools/ci.sh && ci_unix_qemu_mips_setup
208249
- name: Build
@@ -217,6 +258,9 @@ jobs:
217258
runs-on: ubuntu-latest
218259
steps:
219260
- uses: actions/checkout@v2
261+
- uses: actions/setup-python@v2
262+
with:
263+
python-version: '3.9'
220264
- name: Install packages
221265
run: source tools/ci.sh && ci_unix_qemu_arm_setup
222266
- name: Build

ports/windows/.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
image: Visual Studio 2017
1+
image: Visual Studio 2019
22
clone_depth: 1
33
skip_tags: true
44

55
environment:
66
# Python version used
7-
MICROPY_CPYTHON3: c:/python38/python.exe
7+
MICROPY_CPYTHON3: c:/python39/python.exe
88
# The variants.
99
matrix:
1010
- PyVariant: dev

tools/ci.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,7 @@ function ci_unix_dev_run_tests {
434434
ci_unix_run_tests_helper VARIANT=dev
435435
}
436436

437-
function ci_unix_coverage_setup {
438-
sudo pip3 install setuptools
439-
sudo pip3 install pyelftools
437+
function ci_unix_coverage_print_env {
440438
gcc --version
441439
python3 --version
442440
}
@@ -459,8 +457,6 @@ function ci_unix_32bit_setup {
459457
sudo dpkg --add-architecture i386
460458
sudo apt-get update
461459
sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386
462-
sudo pip3 install setuptools
463-
sudo pip3 install pyelftools
464460
gcc --version
465461
python2 --version
466462
python3 --version

0 commit comments

Comments
 (0)