Skip to content

Commit 780d29e

Browse files
authored
Merge branch 'master' into logscale-minor-refactor
2 parents b7b6790 + 787fefc commit 780d29e

File tree

3 files changed

+99
-3
lines changed

3 files changed

+99
-3
lines changed

.github/workflows/master.yml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,41 @@ jobs:
2020
if: always()
2121
strategy:
2222
matrix:
23-
python-version: [3.7, 3.8]
23+
python-version: [3.7, 3.8, 3.9]
2424
pip-packages:
2525
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
26+
fail-fast: false
27+
28+
steps:
29+
- uses: actions/checkout@v2
30+
- name: Set up Python ${{ matrix.python-version }}
31+
uses: actions/setup-python@v1
32+
with:
33+
python-version: ${{ matrix.python-version }}
34+
- name: Install dependencies
35+
run: |
36+
sudo apt-get install libhdf5-dev libnetcdf-dev
37+
python -m pip install --upgrade pip
38+
pip install --upgrade ${{ matrix.pip-packages }}
39+
pip install -e .
40+
- name: Test with pytest
41+
run: |
42+
pip install pytest
43+
pytest -v --long --cov
44+
- name: Upload coverage to Codecov
45+
uses: codecov/codecov-action@v1
46+
with:
47+
fail_ci_if_error: true
48+
49+
50+
pytest-min-versions:
51+
52+
runs-on: ubuntu-latest
53+
if: always()
54+
strategy:
55+
matrix:
56+
python-version: [3.7, 3.8]
57+
pip-packages:
2658
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.17.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
2759
fail-fast: false
2860

.github/workflows/pythonpackage.yml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,41 @@ jobs:
1616
if: always()
1717
strategy:
1818
matrix:
19-
python-version: [3.7, 3.8]
19+
python-version: [3.7, 3.8, 3.9]
2020
pip-packages:
2121
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
22+
fail-fast: false
23+
24+
steps:
25+
- uses: actions/checkout@v2
26+
- name: Set up Python ${{ matrix.python-version }}
27+
uses: actions/setup-python@v1
28+
with:
29+
python-version: ${{ matrix.python-version }}
30+
- name: Install dependencies
31+
run: |
32+
sudo apt-get install libhdf5-dev libnetcdf-dev
33+
python -m pip install --upgrade pip
34+
pip install --upgrade ${{ matrix.pip-packages }}
35+
pip install -e .
36+
- name: Test with pytest
37+
run: |
38+
pip install pytest
39+
pytest -v --long --cov
40+
- name: Upload coverage to Codecov
41+
uses: codecov/codecov-action@v1
42+
with:
43+
fail_ci_if_error: true
44+
45+
46+
pytest-min-versions:
47+
48+
runs-on: ubuntu-latest
49+
if: always()
50+
strategy:
51+
matrix:
52+
python-version: [3.7, 3.8]
53+
pip-packages:
2254
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.17.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
2355
fail-fast: false
2456

.github/workflows/pythonpublish.yml

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,41 @@ jobs:
1414
if: always()
1515
strategy:
1616
matrix:
17-
python-version: [3.7, 3.8]
17+
python-version: [3.7, 3.8, 3.9]
1818
pip-packages:
1919
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
20+
fail-fast: true
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Set up Python ${{ matrix.python-version }}
25+
uses: actions/setup-python@v1
26+
with:
27+
python-version: ${{ matrix.python-version }}
28+
- name: Install dependencies
29+
run: |
30+
sudo apt-get install libhdf5-dev libnetcdf-dev
31+
python -m pip install --upgrade pip
32+
pip install --upgrade ${{ matrix.pip-packages }}
33+
pip install -e .
34+
- name: Test with pytest
35+
run: |
36+
pip install pytest
37+
pytest -v --long --cov
38+
- name: Upload coverage to Codecov
39+
uses: codecov/codecov-action@v1
40+
with:
41+
fail_ci_if_error: true
42+
43+
44+
pytest-min-versions:
45+
46+
runs-on: ubuntu-latest
47+
if: always()
48+
strategy:
49+
matrix:
50+
python-version: [3.7, 3.8]
51+
pip-packages:
2052
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray==0.17.0 dask==2.10.0 numpy==1.16.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0 fsspec" # test with oldest supported version of packages. Note, using numpy==1.16.0 as a workaround for some weird fails on Travis, in principle we should work with numpy>=1.13.3. We should not need to install fsspec explicitly, but at the moment are getting import errors in the tests due to fsspec not being present - should remove in future, probably when dask version is increased.
2153
fail-fast: true
2254

0 commit comments

Comments
 (0)