Skip to content

Commit bfeb305

Browse files
author
Jeff Whitaker
authored
Merge pull request #14 from MacPython/oldest-supported-numpy
use oldest-supported-numpy instead of pinning numpy version for each …
2 parents 6c92324 + 8165d22 commit bfeb305

File tree

2 files changed

+25
-44
lines changed

2 files changed

+25
-44
lines changed

.github/workflows/build-wheels.yml

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,36 @@ jobs:
2424

2525
fail-fast: false
2626
matrix:
27-
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
27+
python-version: [ "3.6", "3.7", "3.8", "3.9", "3.10" ]
2828
os: [ubuntu-latest, macos-latest]
2929
platform: [x64, x32]
30-
MB_ML_VER: [1,2010,2014]
3130
exclude:
3231
- os: macos-latest
3332
platform: x32
3433
include:
3534
- python-version: "3.6"
3635
os: ubuntu-latest
3736
platform: aarch64
38-
MB_ML_VER: 2014
3937
- python-version: "3.7"
4038
os: ubuntu-latest
4139
platform: aarch64
42-
MB_ML_VER: 2014
4340
- python-version: "3.8"
4441
os: ubuntu-latest
4542
platform: aarch64
46-
MB_ML_VER: 2014
4743
- python-version: "3.9"
4844
os: ubuntu-latest
4945
platform: aarch64
50-
MB_ML_VER: 2014
46+
- python-version: "3.10"
47+
os: ubuntu-latest
48+
platform: aarch64
5149
env:
5250
REPO_DIR: netcdf4-python
5351
PKG_NAME: netcdf4-python
54-
BUILD_COMMIT: v1.5.7rel
52+
MB_ML_VER: 2014
53+
BUILD_COMMIT: v1.5.8rel
5554
UNICODE_WIDTH: 32
5655
MB_PYTHON_VERSION: ${{ matrix.python-version }}
5756
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
58-
MB_ML_VER: ${{ matrix.MB_ML_VER }}
5957
TRAVIS_REPO_SLUG: ${{ github.repository }}
6058
TRAVIS_BRANCH: ${{ github.head_ref }}
6159
TRAVIS_PULL_REQUEST: ${{ github.event.number }}
@@ -75,34 +73,6 @@ jobs:
7573
if: ${{ matrix.platform == 'aarch64' }}
7674
uses: docker/setup-qemu-action@v1
7775

78-
- name: Pin Numpy version
79-
if: ${{ matrix.platform != 'aarch64' }}
80-
run: |
81-
if [ "$MB_PYTHON_VERSION" == '3.6' ]; then
82-
echo "NP_BUILD_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
83-
echo "NP_TEST_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
84-
elif [ "$MB_PYTHON_VERSION" == '3.7' ]; then
85-
echo "NP_BUILD_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
86-
echo "NP_TEST_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
87-
elif [ "$MB_PYTHON_VERSION" == '3.8' ]; then
88-
echo "NP_BUILD_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
89-
echo "NP_TEST_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
90-
elif [ "$MB_PYTHON_VERSION" == '3.9' ]; then
91-
echo "NP_BUILD_DEP=$(echo numpy==1.19.4)" >> $GITHUB_ENV;
92-
echo "NP_TEST_DEP=$(echo numpy==1.19.4)" >> $GITHUB_ENV;
93-
elif [ "$MB_PYTHON_VERSION" == '3.10' ]; then
94-
echo "NP_BUILD_DEP=$(echo numpy==1.21.3)" >> $GITHUB_ENV;
95-
echo "NP_TEST_DEP=$(echo numpy==1.21.3)" >> $GITHUB_ENV;
96-
else
97-
echo "None of the defined python version, use default"
98-
fi
99-
100-
- name: Pin Numpy version for AArch64
101-
if: ${{ matrix.platform == 'aarch64' }}
102-
run: |
103-
echo "NP_BUILD_DEP=$(echo numpy==1.19.4)" >> $GITHUB_ENV;
104-
echo "NP_TEST_DEP=$(echo numpy==1.19.4)" >> $GITHUB_ENV;
105-
10676
- name: Setup Environment variables
10777
run: |
10878
if [ "schedule" == "${{ github.event_name }}" ] || [ "master" == "$BUILD_COMMIT" ]; then echo "TOKEN=$SCIPY_WHEELS_NIGHTLY_ACCESS" >> $GITHUB_ENV; else echo "TOKEN=$MULTIBUILD_WHEELS_STAGING_ACCESS" >> $GITHUB_ENV; fi
@@ -111,16 +81,27 @@ jobs:
11181
if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
11282
if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
11383
114-
- name: Setup Special Environment variables for Linux
115-
if: startsWith(matrix.os,'ubuntu') && matrix.MB_ML_VER == 2010
116-
run: |
117-
echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_$PLAT)" >> $GITHUB_ENV
118-
11984
- name: Setup Special Environment variables for Linux AArch64
12085
if: ${{ matrix.platform == 'aarch64' }}
12186
run: |
12287
echo "DOCKER_TEST_IMAGE=$(echo multibuild/xenial_arm64v8)" >> $GITHUB_ENV
12388
89+
- name: Pin Numpy version
90+
run: |
91+
if [ "$MB_PYTHON_VERSION" == '3.6' ]; then
92+
echo "NP_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
93+
elif [ "$MB_PYTHON_VERSION" == '3.7' ]; then
94+
echo "NP_DEP=$(echo numpy==1.17.3)" >> $GITHUB_ENV;
95+
elif [ "$MB_PYTHON_VERSION" == '3.8' ]; then
96+
echo "NP_DEP=$(echo oldest-supported-numpy)" >> $GITHUB_ENV;
97+
elif [ "$MB_PYTHON_VERSION" == '3.9' ]; then
98+
echo "NP_DEP=$(echo oldest-supported-numpy)" >> $GITHUB_ENV;
99+
elif [ "$MB_PYTHON_VERSION" == '3.10' ]; then
100+
echo "NP_DEP=$(echo oldest-supported-numpy)" >> $GITHUB_ENV;
101+
else
102+
echo "None of the defined python version, use default"
103+
fi
104+
124105
- name: Print some Environment variable
125106
run: |
126107
echo "TRAVIS_BRANCH: ${TRAVIS_BRANCH}"
@@ -137,8 +118,8 @@ jobs:
137118
pip install virtualenv
138119
- name: Build and Install Wheels
139120
run: |
140-
BUILD_DEPENDS="$NP_BUILD_DEP cython setuptools"
141-
TEST_DEPENDS="$NP_TEST_DEP nose cython"
121+
BUILD_DEPENDS="$NP_DEP cython setuptools"
122+
TEST_DEPENDS="$NP_DEP nose cython"
142123
source multibuild/common_utils.sh
143124
source multibuild/travis_steps.sh
144125
echo "------- BEFORE INSTALL --------"

0 commit comments

Comments
 (0)