Skip to content

Commit dd36acd

Browse files
johnomotanijohnomotani
committed
Merge branch 'master' into new-grid-interpolation
2 parents 7beece4 + 9c634a4 commit dd36acd

49 files changed

Lines changed: 2448 additions & 1503 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/black.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: black
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '**.py'
7+
8+
defaults:
9+
run:
10+
shell: bash
11+
12+
jobs:
13+
black:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
with:
18+
ref: ${{ github.head_ref }}
19+
- name: Setup Python
20+
uses: actions/setup-python@v4
21+
with:
22+
python-version: 3.x
23+
- name: Install black
24+
run: |
25+
python -m pip install --upgrade pip
26+
pip install black
27+
- name: Version
28+
run: |
29+
python --version
30+
black --version
31+
- name: Run black
32+
run: |
33+
black xbout
34+
black docs
35+
- uses: stefanzweifel/git-auto-commit-action@v4
36+
with:
37+
commit_message: "Apply black formatting"

‎.github/workflows/master.yml‎

Lines changed: 21 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -20,94 +20,53 @@ jobs:
2020
if: always()
2121
strategy:
2222
matrix:
23-
python-version: [3.8, 3.9, '3.10', 3.x]
24-
pip-packages:
25-
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
23+
python-version: ["3.12", "3.13", "3.14", "3.x"]
2624
fail-fast: false
2725

2826
steps:
29-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
3028
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@v1
29+
uses: actions/setup-python@v4
3230
with:
3331
python-version: ${{ matrix.python-version }}
3432
- name: Install dependencies
3533
run: |
36-
sudo apt-get update && sudo apt-get install libhdf5-dev libnetcdf-dev
3734
python -m pip install --upgrade pip
38-
pip install --upgrade ${{ matrix.pip-packages }}
39-
pip install -e .
35+
sudo apt-get -y install libhdf5-dev
36+
- name: Install package
37+
run: |
38+
pip install -e .[calc,tests] --no-binary h5netcdf --no-binary h5py
39+
pip install git+https://github.com/dschwoerer/xarray@netcdf4-locking-closing
4040
- name: Test with pytest
4141
run: |
42-
pip install pytest
43-
pytest -v --long --cov
44-
- name: Upload coverage to Codecov
45-
uses: codecov/codecov-action@v1
42+
pytest -vv --long --cov
4643
4744
48-
pytest-min-versions:
45+
# test with oldest supported version of packages
46+
pytest-oldest-xarray:
4947

5048
runs-on: ubuntu-latest
5149
if: always()
5250
strategy:
5351
matrix:
54-
python-version: [3.8]
55-
pip-packages:
56-
- "setuptools pip pytest pytest-cov coverage codecov boutdata==0.1.4 xarray==0.18.0 dask==2.10.0 numpy==1.18.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==6.1.0" # test with oldest supported version of packages. Note, using numpy==1.18.0 as a workaround because numpy==1.17.0 is not supported on Python-3.7, even though we should currently support numpy==1.17.0.
52+
python-version: ["3.12"]
5753
fail-fast: false
5854

5955
steps:
60-
- uses: actions/checkout@v2
56+
- uses: actions/checkout@v3
6157
- name: Set up Python ${{ matrix.python-version }}
62-
uses: actions/setup-python@v1
58+
uses: actions/setup-python@v4
6359
with:
6460
python-version: ${{ matrix.python-version }}
6561
- name: Install dependencies
6662
run: |
67-
sudo apt-get update && sudo apt-get install libhdf5-dev libnetcdf-dev
6863
python -m pip install --upgrade pip
69-
pip install --upgrade ${{ matrix.pip-packages }}
70-
pip install -e .
71-
- name: Test with pytest
64+
sudo apt-get -y install libhdf5-dev
65+
pip install xarray~=2023.12.0 pandas~=2.2.0
66+
- name: Install package
7267
run: |
73-
pip install pytest
74-
pytest -v --long --cov
75-
- name: Upload coverage to Codecov
76-
uses: codecov/codecov-action@v1
77-
78-
79-
# Need to tidy up the things that flake8 finds before we activate this
80-
#flake8:
81-
82-
# runs-on: ubuntu-latest
83-
# if: always()
84-
85-
# steps:
86-
# - uses: actions/checkout@v2
87-
# - name: Set up Python
88-
# uses: actions/setup-python@v1
89-
# - name: Install dependencies
90-
# run: |
91-
# python -m pip install --upgrade pip
92-
# - name: Lint with flake8
93-
# run: |
94-
# pip install flake8
95-
# flake8
96-
97-
98-
black:
99-
100-
runs-on: ubuntu-latest
101-
if: always()
102-
103-
steps:
104-
- uses: actions/checkout@v2
105-
- name: Set up Python
106-
uses: actions/setup-python@v1
107-
- name: Install dependencies
108-
run: |
109-
python -m pip install --upgrade pip
110-
- name: Check formatting with black
68+
pip install -e .[tests] --no-binary h5netcdf --no-binary h5py
69+
pip install git+https://github.com/dschwoerer/xarray@netcdf4-locking-closing
70+
- name: Test with pytest
11171
run: |
112-
pip install black
113-
black --check .
72+
pytest -vv --long --cov

‎.github/workflows/pythonpackage.yml‎

Lines changed: 21 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -20,94 +20,53 @@ jobs:
2020
if: always()
2121
strategy:
2222
matrix:
23-
python-version: [3.8, 3.9, '3.10', 3.x]
24-
pip-packages:
25-
- "setuptools pip pytest pytest-cov coverage codecov boutdata xarray numpy>=1.16.0"
23+
python-version: ["3.12", "3.13", "3.14", "3.x"]
2624
fail-fast: false
2725

2826
steps:
29-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
3028
- name: Set up Python ${{ matrix.python-version }}
31-
uses: actions/setup-python@v1
29+
uses: actions/setup-python@v4
3230
with:
3331
python-version: ${{ matrix.python-version }}
3432
- name: Install dependencies
3533
run: |
36-
sudo apt-get update && sudo apt-get install libhdf5-dev libnetcdf-dev
3734
python -m pip install --upgrade pip
38-
pip install --upgrade ${{ matrix.pip-packages }}
39-
pip install -e .
35+
sudo apt-get -y install libhdf5-dev
36+
- name: Install package
37+
run: |
38+
pip install -e .[calc,tests] --no-binary h5netcdf --no-binary h5py
39+
pip install git+https://github.com/dschwoerer/xarray@netcdf4-locking-closing
4040
- name: Test with pytest
4141
run: |
42-
pip install pytest
43-
pytest -v --long --cov
44-
- name: Upload coverage to Codecov
45-
uses: codecov/codecov-action@v1
42+
pytest -vv --long --cov
4643
4744
48-
pytest-min-versions:
45+
# test with oldest supported version of packages
46+
pytest-oldest-xarray:
4947

5048
runs-on: ubuntu-latest
5149
if: always()
5250
strategy:
5351
matrix:
54-
python-version: [3.8]
55-
pip-packages:
56-
- "setuptools pip pytest pytest-cov coverage codecov boutdata==0.1.4 xarray==0.18.0 dask==2.10.0 numpy==1.18.0 natsort==5.5.0 matplotlib==3.1.1 animatplot==0.4.2 netcdf4==1.4.2 Pillow==7.2.0" # test with oldest supported version of packages. Note, using numpy==1.18.0 as a workaround because numpy==1.17.0 is not supported on Python-3.7, even though we should currently support numpy==1.17.0.
52+
python-version: ["3.12"]
5753
fail-fast: false
5854

5955
steps:
60-
- uses: actions/checkout@v2
56+
- uses: actions/checkout@v3
6157
- name: Set up Python ${{ matrix.python-version }}
62-
uses: actions/setup-python@v1
58+
uses: actions/setup-python@v4
6359
with:
6460
python-version: ${{ matrix.python-version }}
6561
- name: Install dependencies
6662
run: |
67-
sudo apt-get update && sudo apt-get install libhdf5-dev libnetcdf-dev
6863
python -m pip install --upgrade pip
69-
pip install --upgrade ${{ matrix.pip-packages }}
70-
pip install -e .
71-
- name: Test with pytest
64+
sudo apt-get -y install libhdf5-dev
65+
pip install xarray~=2023.12.0 pandas~=2.2.0
66+
- name: Install package
7267
run: |
73-
pip install pytest
74-
pytest -v --long --cov
75-
- name: Upload coverage to Codecov
76-
uses: codecov/codecov-action@v1
77-
78-
79-
# Need to tidy up the things that flake8 finds before we activate this
80-
#flake8:
81-
82-
# runs-on: ubuntu-latest
83-
# if: always()
84-
85-
# steps:
86-
# - uses: actions/checkout@v2
87-
# - name: Set up Python
88-
# uses: actions/setup-python@v1
89-
# - name: Install dependencies
90-
# run: |
91-
# python -m pip install --upgrade pip
92-
# - name: Lint with flake8
93-
# run: |
94-
# pip install flake8
95-
# flake8
96-
97-
98-
black:
99-
100-
runs-on: ubuntu-latest
101-
if: always()
102-
103-
steps:
104-
- uses: actions/checkout@v2
105-
- name: Set up Python
106-
uses: actions/setup-python@v1
107-
- name: Install dependencies
108-
run: |
109-
python -m pip install --upgrade pip
110-
- name: Check formatting with black
68+
pip install -e .[tests] --no-binary h5netcdf --no-binary h5py
69+
pip install git+https://github.com/dschwoerer/xarray@netcdf4-locking-closing
70+
- name: Test with pytest
11171
run: |
112-
pip install black
113-
black --check .
72+
pytest -vv --long --cov

0 commit comments

Comments
 (0)