Skip to content

Commit e12112e

Browse files
authored
Merge pull request numpy#19576 from charris/update-ci-python-versions
MAINT: Make Python3.8 the default for CI testing.
2 parents 402802d + 96789b0 commit e12112e

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed

.github/workflows/build_test.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defaults:
1616

1717
env:
1818
DOWNLOAD_OPENBLAS: 1
19-
PYTHON_VERSION: 3.7
19+
PYTHON_VERSION: 3.8
2020

2121
jobs:
2222
lint:
@@ -52,11 +52,11 @@ jobs:
5252
- uses: ./.github/actions
5353

5454
basic:
55-
needs: [smoke_test, lint]
55+
needs: [smoke_test]
5656
runs-on: ubuntu-latest
5757
strategy:
5858
matrix:
59-
python-version: [3.8, 3.9, 3.10.0-beta.4]
59+
python-version: [3.7, 3.9, 3.10.0-beta.4]
6060
steps:
6161
- uses: actions/checkout@v2
6262
with:
@@ -68,7 +68,7 @@ jobs:
6868
- uses: ./.github/actions
6969

7070
debug:
71-
needs: [smoke_test, lint]
71+
needs: [smoke_test]
7272
runs-on: ubuntu-20.04
7373
env:
7474
USE_DEBUG: 1
@@ -83,7 +83,7 @@ jobs:
8383
- uses: ./.github/actions
8484

8585
blas64:
86-
needs: [smoke_test, lint]
86+
needs: [smoke_test]
8787
runs-on: ubuntu-latest
8888
env:
8989
NPY_USE_BLAS_ILP64: 1
@@ -98,7 +98,7 @@ jobs:
9898
- uses: ./.github/actions
9999

100100
full:
101-
needs: [smoke_test, lint]
101+
needs: [smoke_test]
102102
runs-on: ubuntu-18.04
103103
env:
104104
USE_WHEEL: 1
@@ -116,7 +116,7 @@ jobs:
116116
- uses: ./.github/actions
117117

118118
benchmark:
119-
needs: [smoke_test, lint]
119+
needs: [smoke_test]
120120
runs-on: ubuntu-latest
121121
env:
122122
PYTHONOPTIMIZE: 2
@@ -137,7 +137,7 @@ jobs:
137137
- uses: ./.github/actions
138138

139139
no_relaxed_strides:
140-
needs: [smoke_test, lint]
140+
needs: [smoke_test]
141141
runs-on: ubuntu-latest
142142
env:
143143
NPY_RELAXED_STRIDES_CHECKING: 0
@@ -154,7 +154,7 @@ jobs:
154154
- uses: ./.github/actions
155155

156156
use_wheel:
157-
needs: [smoke_test, lint]
157+
needs: [smoke_test]
158158
runs-on: ubuntu-latest
159159
env:
160160
USE_WHEEL: 1
@@ -170,7 +170,7 @@ jobs:
170170
- uses: ./.github/actions
171171

172172
no_array_func:
173-
needs: [smoke_test, lint]
173+
needs: [smoke_test]
174174
runs-on: ubuntu-latest
175175
env:
176176
NUMPY_EXPERIMENTAL_ARRAY_FUNCTION: 0
@@ -185,7 +185,7 @@ jobs:
185185
- uses: ./.github/actions
186186

187187
no_openblas:
188-
needs: [smoke_test, lint]
188+
needs: [smoke_test]
189189
runs-on: ubuntu-latest
190190
env:
191191
BLAS: None
@@ -203,7 +203,7 @@ jobs:
203203
- uses: ./.github/actions
204204

205205
pypy37:
206-
needs: [smoke_test, lint]
206+
needs: [smoke_test]
207207
runs-on: ubuntu-latest
208208
steps:
209209
- uses: actions/checkout@v2
@@ -216,7 +216,7 @@ jobs:
216216
- uses: ./.github/actions
217217

218218
sdist:
219-
needs: [smoke_test, lint]
219+
needs: [smoke_test]
220220
runs-on: ubuntu-latest
221221
env:
222222
USE_SDIST: 1

.github/workflows/cygwin.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
platform: x64
2121
install-dir: 'C:\tools\cygwin'
2222
packages: >
23-
python37-devel python37-zipp python37-importlib-metadata
24-
python37-cython python37-pip python37-wheel python37-cffi
25-
python37-pytz python37-setuptools python37-pytest
26-
python37-hypothesis liblapack-devel libopenblas
23+
python38-devel python38-zipp python38-importlib-metadata
24+
python38-cython python38-pip python38-wheel python38-cffi
25+
python38-pytz python38-setuptools python38-pytest
26+
python38-hypothesis liblapack-devel libopenblas
2727
gcc-fortran git dash
2828
- name: Set Windows PATH
2929
uses: egor-tensin/cleanup-path@v1
@@ -40,28 +40,28 @@ jobs:
4040
- name: Verify python version
4141
# Make sure it's the Cygwin one, not a Windows one
4242
run: |
43-
dash -c "which python3.7; /usr/bin/python3.7 --version -V"
43+
dash -c "which python3.8; /usr/bin/python3.8 --version -V"
4444
- name: Build NumPy wheel
4545
run: |
46-
dash -c "/usr/bin/python3.7 -m pip install 'setuptools<49.2.0' pytest pytz cffi pickle5 importlib_metadata typing_extensions"
47-
dash -c "/usr/bin/python3.7 -m pip install -r test_requirements.txt"
48-
dash -c "/usr/bin/python3.7 setup.py bdist_wheel"
46+
dash -c "/usr/bin/python3.8 -m pip install 'setuptools<49.2.0' pytest pytz cffi pickle5 importlib_metadata typing_extensions"
47+
dash -c "/usr/bin/python3.8 -m pip install -r test_requirements.txt"
48+
dash -c "/usr/bin/python3.8 setup.py bdist_wheel"
4949
- name: Install new NumPy
5050
run: |
51-
bash -c "/usr/bin/python3.7 -m pip install dist/numpy-*cp37*.whl"
51+
bash -c "/usr/bin/python3.8 -m pip install dist/numpy-*cp38*.whl"
5252
- name: Run NumPy test suite
5353
run: >-
54-
dash -c "/usr/bin/python3.7 runtests.py -n -vv"
54+
dash -c "/usr/bin/python3.8 runtests.py -n -vv"
5555
- name: Upload wheel if tests fail
5656
uses: actions/upload-artifact@v2
5757
if: failure()
5858
with:
5959
name: numpy-cygwin-wheel
60-
path: dist/numpy-*cp37*.whl
60+
path: dist/numpy-*cp38*.whl
6161
- name: On failure check the extension modules
6262
if: failure()
6363
run: |
64-
dash -c "/usr/bin/python3.7 -m pip show numpy"
65-
dash -c "/usr/bin/python3.7 -m pip show -f numpy | grep .dll"
64+
dash -c "/usr/bin/python3.8 -m pip show numpy"
65+
dash -c "/usr/bin/python3.8 -m pip show -f numpy | grep .dll"
6666
dash -c "/bin/tr -d '\r' <tools/list_installed_dll_dependencies_cygwin.sh >list_dlls_unix.sh"
6767
dash "list_dlls_unix.sh"

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cache:
2626

2727
jobs:
2828
include:
29-
- python: 3.7
29+
- python: 3.8
3030
os: linux
3131
arch: ppc64le
3232
env:
@@ -35,7 +35,7 @@ jobs:
3535
- NPY_USE_BLAS_ILP64=1
3636
- ATLAS=None
3737

38-
- python: 3.7
38+
- python: 3.8
3939
os: linux
4040
arch: s390x
4141
env:
@@ -44,7 +44,7 @@ jobs:
4444
- NPY_USE_BLAS_ILP64=1
4545
- ATLAS=None
4646

47-
- python: 3.7
47+
- python: 3.8
4848
os: linux
4949
arch: arm64
5050
virt: vm

azure-pipelines.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,6 @@ stages:
1818
- stage: InitialTests
1919
jobs:
2020

21-
- job: Lint
22-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
23-
pool:
24-
vmImage: 'ubuntu-18.04'
25-
steps:
26-
- task: UsePythonVersion@0
27-
inputs:
28-
versionSpec: '3.8'
29-
addToPath: true
30-
architecture: 'x64'
31-
- script: >-
32-
python -m pip install -r linter_requirements.txt
33-
displayName: 'Install tools'
34-
# pip 21.1 emits a pile of garbage messages to annoy users :)
35-
# failOnStderr: true
36-
- script: |
37-
python tools/linter.py --branch origin/$(System.PullRequest.TargetBranch)
38-
displayName: 'Run Lint Checks'
39-
failOnStderr: true
4021
# Native build is based on gcc flag `-march=native`
4122
- job: Linux_baseline_native
4223
pool:
@@ -66,14 +47,33 @@ stages:
6647
- stage: ComprehensiveTests
6748
jobs:
6849

50+
- job: Lint
51+
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
52+
pool:
53+
vmImage: 'ubuntu-18.04'
54+
steps:
55+
- task: UsePythonVersion@0
56+
inputs:
57+
versionSpec: '3.8'
58+
addToPath: true
59+
architecture: 'x64'
60+
- script: >-
61+
python -m pip install -r linter_requirements.txt
62+
displayName: 'Install tools'
63+
# pip 21.1 emits a pile of garbage messages to annoy users :)
64+
# failOnStderr: true
65+
- script: |
66+
python tools/linter.py --branch origin/$(System.PullRequest.TargetBranch)
67+
displayName: 'Run Lint Checks'
68+
failOnStderr: true
6969
7070
- job: WindowsFast
7171
pool:
7272
vmImage: 'VS2017-Win2016'
7373
strategy:
7474
matrix:
7575
Python37-32bit-fast:
76-
PYTHON_VERSION: '3.7'
76+
PYTHON_VERSION: '3.8'
7777
PYTHON_ARCH: 'x86'
7878
TEST_MODE: fast
7979
BITS: 32
@@ -120,11 +120,11 @@ stages:
120120
strategy:
121121
maxParallel: 3
122122
matrix:
123-
Python37:
124-
PYTHON_VERSION: '3.7'
123+
Python38:
124+
PYTHON_VERSION: '3.8'
125125
USE_OPENBLAS: '1'
126-
Python37-ILP64:
127-
PYTHON_VERSION: '3.7'
126+
Python38-ILP64:
127+
PYTHON_VERSION: '3.8'
128128
NPY_USE_BLAS_ILP64: '1'
129129
USE_OPENBLAS: '1'
130130
steps:
@@ -232,7 +232,7 @@ stages:
232232
inputs:
233233
testResultsFiles: '**/test-*.xml'
234234
failTaskOnFailedTests: true
235-
testRunTitle: 'Publish test results for Python 3.7 64-bit full Mac OS'
235+
testRunTitle: 'Publish test results for Python 3.8 64-bit full Mac OS'
236236

237237

238238
- job: Windows

0 commit comments

Comments
 (0)