Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
packages:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get tags
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
python-version: ["3.8", "3.9", "3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get tags
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
shell: bash

- name: upload wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
with:
name: dist_${{ matrix.os }}_${{ matrix.python-version }}
path: dist
4 changes: 2 additions & 2 deletions .github/workflows/build_win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
python-version: ["3.8", "3.9", "3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get tags
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
shell: bash

- name: upload wheel
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v3
with:
name: dist_${{ matrix.os }}_${{ matrix.python-version }}
path: dist
15 changes: 7 additions & 8 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,26 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-conda: false
conda-channels: conda-forge
environment-file: false

- name: Create environment
shell: bash -l {0}
run: |
conda create --name TEST python=3 python-build numpy --file requirements-dev.txt
source activate TEST
micromamba create --name TEST python=3 python-build numpy --file requirements-dev.txt --channel conda-forge
micromamba activate TEST
pip install -e . --no-deps --force-reinstall
conda info --all
conda list

- name: Build documentation
shell: bash -l {0}
run: |
source activate TEST
micromamba activate TEST
set -e
pushd docs
make clean html linkcheck
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/action@v2.0.0
19 changes: 9 additions & 10 deletions .github/workflows/tarball-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,25 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-conda: false
conda-channels: conda-forge
environment-file: false

- name: Create environment
shell: bash -l {0}
run: |
conda create --name TEST python=3 python-build numpy --file requirements-dev.txt
source activate TEST
conda info --all
conda list
micromamba create --name TEST python=3 python-build numpy --file requirements-dev.txt --channel conda-forge
micromamba activate TEST
micromamba info --all
micromamba list

- name: Tarball
shell: bash -l {0}
run: |
source activate TEST
micromamba activate TEST
python -m build --skip-dependency-check --sdist --wheel .
check-manifest --verbose
twine check dist/*
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@ jobs:
exclude:
- python-version: "3.10"
numpy-version: "1.19"
fail-fast: false

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Conda
uses: s-weigand/setup-conda@v1
- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@main
with:
activate-conda: false
conda-channels: conda-forge
environment-file: false

- name: Python ${{ matrix.python-version }} numpy ${{ matrix.numpy-version }}
shell: bash -l {0}
run: |
conda create --name TEST python=${{ matrix.python-version }} python-build numpy=${{ matrix.numpy-version }} --file requirements-dev.txt
source activate TEST
micromamba create --name TEST python=${{ matrix.python-version }} python-build numpy=${{ matrix.numpy-version }} --file requirements-dev.txt --channel conda-forge
micromamba activate TEST
pip install -e . --no-deps --force-reinstall
conda info --all
conda list
micromamba info --all
micromamba list

- name: Tests
shell: bash -l {0}
run: |
source activate TEST
micromamba activate TEST
python -c "import numpy; print(f'Running numpy {numpy.__version__}')"
pytest -s -rxs -v gsw/tests