Skip to content

Commit

Permalink
Merge pull request #309 from seafloor-geodesy/lsetiawan-patch-1
Browse files Browse the repository at this point in the history
ci: Fix failing ci tests due to deprecated disutils
  • Loading branch information
johnbdesanto authored Sep 12, 2024
2 parents 181ed89 + 0c0d5ac commit f398590
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
FORCE_COLOR: 3
run: |
set -o pipefail
nox -s tests -- --cov=${{ env.PROJECT_NAME }} --cov-report=xml --cov-report=term tests/ |& tee unit_test_log${{ matrix.python-version }}.log
nox --verbose -s tests -- --cov=${{ env.PROJECT_NAME }} --cov-report=xml --cov-report=term tests/ |& tee unit_test_log${{ matrix.python-version }}.log
- name: Upload unit test log
if: ${{ success() || failure() }}
uses: actions/upload-artifact@v4
Expand Down
3 changes: 3 additions & 0 deletions noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ def tests(session: nox.Session) -> None:
- git-lfs: https://github.com/git-lfs/git-lfs
- unzip: https://linuxize.com/post/how-to-unzip-files-in-linux/
"""
# Specify the setuptools version
# https://numpy.org/doc/stable/reference/distutils_status_migration.html#distutils-status-migration
session.install("setuptools<60")
session.install(".[test]")
if not (DIR / "tests" / "data" / "2022").exists():
session.run(
Expand Down
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ dependencies = [
"fsspec>=2024.5.0,<2025",
"matplotlib>=3.8.0,<4",
"numba>=0.56.4,<1",
"numpy>=1.23.5,<2",
# numpy/f2py/f2py2e.py:719
# VisibleDeprecationWarning: distutils has been deprecated since NumPy 1.26.x
# Use the Meson backend instead,
# or generate wrapperswithout -c and use a custom build script
"numpy>=1.23.5,<1.26",
"nptyping>=2.5.0,<3",
"cftime>=1.6.2,<2",
"pandas>=2.0.3,<3",
Expand Down

0 comments on commit f398590

Please sign in to comment.