Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge in develop changes for 5.1.1 release preparation #1061

Merged
merged 73 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
3e27d85
minor fixes, left over from #1026
ocefpaf May 18, 2023
b902a7b
fix more broken links
ocefpaf May 18, 2023
bc95877
Merge pull request #1028 from ocefpaf/minor_fix
benjwadams May 19, 2023
786e9ab
workaround latest urllib3
ocefpaf May 23, 2023
071e791
Merge pull request #1031 from ocefpaf/pin_urllib3
benjwadams May 23, 2023
76581fb
Bump mamba-org/provision-with-micromamba from 15 to 16
dependabot[bot] May 23, 2023
8cc47d7
Merge pull request #1030 from ioos/dependabot/github_actions/mamba-or…
ocefpaf May 23, 2023
dbe95ad
redundant
ocefpaf May 25, 2023
620cbb8
provision-with-micromamba is deprecated
ocefpaf May 25, 2023
dee46d1
Pin isodate >= 0.6.1 in requirements.txt
benjwadams May 25, 2023
9b66c19
Merge pull request #1034 from benjwadams/pin_isodate
ocefpaf May 25, 2023
e76d122
Merge pull request #1033 from ocefpaf/update_umamba_GHA
benjwadams May 26, 2023
445c86a
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jun 6, 2023
b75a1a9
Merge pull request #1035 from ioos/pre-commit-ci-update-config
ocefpaf Jun 6, 2023
e8246f9
remove MemoizedDataset
ocefpaf May 18, 2023
29378c4
restrict to the upstream feat ver
ocefpaf Jun 6, 2023
4d66c02
update min python
ocefpaf Jun 6, 2023
1f4532f
Merge pull request #1029 from ocefpaf/remove_MemoizedDataset
benjwadams Jun 6, 2023
f6a01dc
update pre-commits
ocefpaf Jul 7, 2023
29d67a5
remove dups in sets
ocefpaf Jul 7, 2023
6370ff6
add a skip for dups we want to keep
ocefpaf Jul 7, 2023
e456821
Merge pull request #1037 from ocefpaf/update_precommit_and_fix
ocefpaf Aug 1, 2023
dd9808c
let's skip this one for now
ocefpaf Sep 5, 2023
5e19fbb
Merge pull request #1042 from ocefpaf/fix_docs
ocefpaf Sep 5, 2023
b7df6bd
update
ocefpaf Aug 1, 2023
606110a
fix .format calls
ocefpaf Aug 1, 2023
38e9c18
use a server that won't kick us out
ocefpaf Aug 1, 2023
d3c7976
update pre-commits
ocefpaf Sep 5, 2023
ac2f83b
run ruff fix
ocefpaf Sep 5, 2023
e7f8647
fix E721
ocefpaf Sep 5, 2023
63c6a9e
Merge pull request #1038 from ocefpaf/fix_pre-commits
ocefpaf Sep 5, 2023
ae75c2b
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 5, 2023
15db9ef
Merge pull request #1040 from ioos/dependabot/github_actions/actions/…
ocefpaf Sep 5, 2023
2b68fb6
Bump codecov/codecov-action from 3 to 4
dependabot[bot] Sep 15, 2023
cb491c9
Merge pull request #1043 from ioos/dependabot/github_actions/codecov/…
ocefpaf Sep 15, 2023
a71829e
fix typos
ocefpaf Oct 4, 2023
8b115dd
Merge pull request #1045 from ocefpaf/typos
ocefpaf Oct 4, 2023
7ad29a7
v4 is beta and was probably mistankely release as stable
ocefpaf Oct 4, 2023
8e5687c
Merge pull request #1046 from ocefpaf/codecov
ocefpaf Oct 4, 2023
95ef64d
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Oct 3, 2023
d336e42
Merge pull request #1044 from ioos/pre-commit-ci-update-config
ocefpaf Oct 4, 2023
b95631b
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Nov 6, 2023
743f9d3
Merge pull request #1047 from ioos/pre-commit-ci-update-config
ocefpaf Nov 6, 2023
dc1d502
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 4, 2023
c43a174
Merge pull request #1048 from ioos/pre-commit-ci-update-config
ocefpaf Dec 4, 2023
be23f22
Bump actions/setup-python from 4 to 5
dependabot[bot] Dec 7, 2023
db0d8a7
Merge pull request #1049 from ioos/dependabot/github_actions/actions/…
ocefpaf Dec 7, 2023
0d2981f
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jan 1, 2024
c137e28
Merge pull request #1050 from ioos/pre-commit-ci-update-config
ocefpaf Jan 1, 2024
4e6e3d1
Bump codecov/codecov-action from 3 to 4
dependabot[bot] Feb 1, 2024
77d3c97
Merge pull request #1051 from ioos/dependabot/github_actions/codecov/…
ocefpaf Feb 1, 2024
ead0a4a
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Feb 5, 2024
0b02690
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 5, 2024
303d136
Merge pull request #1052 from ioos/pre-commit-ci-update-config
ocefpaf Feb 5, 2024
eeeb23d
Bump peaceiris/actions-gh-pages from 3 to 4
dependabot[bot] Apr 9, 2024
dada5a2
Merge pull request #1058 from ioos/dependabot/github_actions/peaceiri…
ocefpaf Apr 9, 2024
74b13c0
remove all but 1 pkg_resources imports
ocefpaf Aug 1, 2023
2917520
remove distutils
ocefpaf Aug 9, 2023
02884b4
add packaging
ocefpaf Oct 17, 2023
96e0049
update pre-commits
ocefpaf Apr 11, 2024
3ddd88b
fix deprecation warnings
ocefpaf Apr 11, 2024
d3ee89b
fix some lints
ocefpaf Apr 11, 2024
ee4f7b6
Merge pull request #1039 from ocefpaf/remove_pkg_resources
ocefpaf Apr 11, 2024
2a5b851
move to pyproject.toml
ocefpaf Apr 17, 2023
da5c97d
add top 3 committers as maintainers
ocefpaf May 29, 2023
5bc0978
lint
ocefpaf Oct 4, 2023
3f892d5
add py312
ocefpaf Apr 11, 2024
a7e4cc7
drop 3.7 and add 3.12 in the tests
ocefpaf Apr 11, 2024
96dd622
no need to use minor version here
ocefpaf Apr 11, 2024
77ac3ae
revert to 3.11 b/c cf_units is broken on 3.12
ocefpaf Apr 11, 2024
d53d227
missing }
ocefpaf Apr 11, 2024
e44eda1
py38 compat
ocefpaf Apr 11, 2024
7c7fa9d
Merge pull request #1024 from ocefpaf/pyproject_toml
ocefpaf Apr 11, 2024
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
34 changes: 0 additions & 34 deletions .github/workflows/cc-checker-ugrid-test.yml

This file was deleted.

27 changes: 15 additions & 12 deletions .github/workflows/cc-plugin-glider-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,29 @@ jobs:
runs-on: ubuntu-latest

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

- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@v15
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false
environment-name: TEST
init-shell: bash
create-args: >-
python=3 pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Setup Env
- name: Install compliance-checker
shell: bash -l {0}
run: >
micromamba create --name TEST python=3 pip --file requirements.txt --file test_requirements.txt --channel conda-forge
&& micromamba activate TEST
&& pip install -e . --no-deps --force-reinstall
run: |
python -m pip install -v -e . --no-deps --force-reinstall

- name: cc-plugin-glider tests
shell: bash -l {0}
run: >
micromamba activate TEST
&& git clone https://github.com/ioos/cc-plugin-glider.git
git clone https://github.com/ioos/cc-plugin-glider.git
&& cd cc-plugin-glider
&& micromamba install --file requirements.txt --file requirements-dev.txt --channel conda-forge
&& pip install -e . --no-deps --force-reinstall
&& pytest -s -rxs -v cc_plugin_glider
&& python -m pip install -e . --no-deps --force-reinstall
&& python -m pytest -s -rxs -v cc_plugin_glider
29 changes: 16 additions & 13 deletions .github/workflows/cc-plugin-sgrid-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,28 @@ jobs:
runs-on: ubuntu-latest

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

- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@v15
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false
environment-name: TEST
init-shell: bash
create-args: >-
python=3 pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Setup Env
- name: Install compliance-checker
shell: bash -l {0}
run: >
micromamba create --name TEST python=3 pip --file requirements.txt --file test_requirements.txt --channel conda-forge
&& micromamba activate TEST
&& pip install -e . --no-deps --force-reinstall
run: |
python -m pip install -e . --no-deps --force-reinstall

- name: cc-plugin-glider tests
- name: cc-plugin-sgrid tests
shell: bash -l {0}
run: >
micromamba activate TEST
&& git clone https://github.com/ioos/cc-plugin-sgrid.git
git clone https://github.com/ioos/cc-plugin-sgrid.git
&& cd cc-plugin-sgrid
&& pip install -e . --no-deps --force-reinstall
&& pytest -s -rxs -v cc_plugin_sgrid
&& python -m pip install -e . --no-deps --force-reinstall
&& python -m pytest -s -rxs -v cc_plugin_sgrid
29 changes: 16 additions & 13 deletions .github/workflows/cc-plugin-ugrid-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,29 @@ jobs:
runs-on: ubuntu-latest

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

- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@v15
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false
environment-name: TEST
init-shell: bash
create-args: >-
python=3 pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Setup Env
- name: Install compliance-checker
shell: bash -l {0}
run: >
micromamba create --name TEST python=3 pip --file requirements.txt --file test_requirements.txt --channel conda-forge
&& micromamba activate TEST
&& pip install -e . --no-deps --force-reinstall
run: |
python -m pip install -e . --no-deps --force-reinstall

- name: cc-plugin-glider tests
- name: cc-plugin-ugrid tests
shell: bash -l {0}
run: >
micromamba activate TEST
&& git clone https://github.com/ioos/cc-checker-ugrid.git
git clone https://github.com/ioos/cc-checker-ugrid.git
&& cd cc-checker-ugrid
&& micromamba install --file requirements.txt --file requirements-dev.txt --channel conda-forge
&& pip install -e . --no-deps --force-reinstall
&& pytest -s -rxs -v cc_plugin_ugrid
&& python -m pip install -e . --no-deps --force-reinstall
&& python -m pytest -s -rxs -v cc_plugin_ugrid
25 changes: 14 additions & 11 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,34 @@ jobs:
runs-on: ubuntu-latest

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

- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@v15
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false
environment-name: TEST
init-shell: bash
create-args: >-
python=3 pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Setup Env
- name: Install compliance-checker
shell: bash -l {0}
run: >
micromamba create --name TEST python=3 pip --file requirements.txt --file test_requirements.txt --channel conda-forge
&& micromamba activate TEST
&& pip install -e . --no-deps --force-reinstall
run: |
python -m pip install -e . --no-deps --force-reinstall

- name: Run tests with coverage
shell: bash -l {0}
run: |
micromamba activate TEST
pytest --cov=compliance_checker --cov-report=xml compliance_checker/tests
python -m pytest --cov=compliance_checker --cov-report=xml compliance_checker/tests
# pass this step even if there are individual test failures, we are
# interested in the overall level of coverage and other checks can
# report on test failures.
continue-on-error: true

- name: Upload to codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: coverage.xml
28 changes: 15 additions & 13 deletions .github/workflows/default-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,29 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
os: [windows-latest, ubuntu-latest, macos-latest]
fail-fast: false

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

- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@v15
- name: Setup Micromamba ${{ matrix.python-version }}
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false
environment-name: TEST
init-shell: bash
create-args: >-
python=${{ matrix.python-version }} pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Setup Env ${{ matrix.python-version }}
- name: Install compliance-checker
shell: bash -l {0}
run: >
micromamba create --name TEST python=${{ matrix.python-version }} pip --file requirements.txt --file test_requirements.txt --channel conda-forge
&& micromamba activate TEST
&& pip install -e . --no-deps --force-reinstall
run: |
python -m pip install -e . --no-deps --force-reinstall

- name: Default Tests
shell: bash -l {0}
run: |
micromamba activate TEST
pytest -s -rxs -v -k "not integration" compliance_checker
run: python -m pytest -s -rxs -v -k "not integration" compliance_checker
23 changes: 13 additions & 10 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,35 +14,38 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Mamba
uses: mamba-org/provision-with-micromamba@v15
- name: Setup Micromamba
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false

- name: Build environment
environment-name: TEST
init-shell: bash
create-args: >-
python=3 pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Install compliance-checker
shell: bash -l {0}
run: |
micromamba create --name TEST python=3 --file requirements.txt --file test_requirements.txt --channel conda-forge
micromamba activate TEST
python -m pip install -e . --no-deps --force-reinstall

- name: Build documentation
shell: bash -l {0}
run: |
set -e
micromamba activate TEST
pushd docs
cp ../README.md source/quickintro.md
make clean html linkcheck
popd

- name: Deploy
if: success() && github.event_name == 'release'
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: docs/build/html
24 changes: 13 additions & 11 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@ jobs:
runs-on: ubuntu-latest

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

- name: Setup Micromamba
uses: mamba-org/provision-with-micromamba@v15
uses: mamba-org/setup-micromamba@v1
with:
environment-file: false
environment-name: TEST
init-shell: bash
create-args: >-
python=3 pip
--file requirements.txt
--file test_requirements.txt
--channel conda-forge

- name: Setup Env
- name: Install compliance-checker
shell: bash -l {0}
run: >
micromamba create --name TEST python=3 pip --file requirements.txt --file test_requirements.txt --channel conda-forge
&& micromamba activate TEST
&& pip install -e . --no-deps --force-reinstall
run: |
python -m pip install -e . --no-deps --force-reinstall

- name: Integration Tests
shell: bash -l {0}
run: |
micromamba activate TEST
pytest -m "integration" -s -rxs -v --vcr-record=none compliance_checker
run: python -m pytest -m "integration" -s -rxs -v --vcr-record=none compliance_checker
4 changes: 2 additions & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
packages:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Should be enough for setuptools-scm
fetch-depth: 100
Expand All @@ -25,7 +25,7 @@ jobs:
run: git fetch origin 'refs/tags/*:refs/tags/*'

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand Down
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
exclude: compliance_checker/tests/data
Expand All @@ -19,29 +19,29 @@ repos:
- test_requirements.txt

- repo: https://github.com/psf/black
rev: 23.3.0
rev: 24.3.0
hooks:
- id: black
language_version: python3

- repo: https://github.com/asottile/add-trailing-comma
rev: v2.4.0
rev: v3.1.0
hooks:
- id: add-trailing-comma


- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.267
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.3.5
hooks:
- id: ruff

- repo: https://github.com/tox-dev/pyproject-fmt
rev: 0.11.2
rev: 1.7.0
hooks:
- id: pyproject-fmt

- repo: https://github.com/codespell-project/codespell
rev: v2.2.4
rev: v2.2.6
hooks:
- id: codespell
args:
Expand Down
Loading
Loading