diff --git a/.github/workflows/hsp2-pip-install-test.yml b/.github/workflows/hsp2-pip-install-test.yml index 92eda6d9..4ef1b62a 100644 --- a/.github/workflows/hsp2-pip-install-test.yml +++ b/.github/workflows/hsp2-pip-install-test.yml @@ -39,11 +39,11 @@ jobs: continue-on-error: true strategy: matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] pandas-version: [''] include: - python-version: '3.11' - pandas-version: pandas>2.0 + pandas-version: pandas>2.0,<3.0 coverage: true - python-version: '3.11' pandas-version: pandas>1.5,<2.0 @@ -63,8 +63,7 @@ jobs: - if: ${{ matrix.coverage }} run: | # python coverage - NUMBA_DISABLE_JIT=1 pytest --cov --cov-branch --cov-report \ - term-missing + NUMBA_DISABLE_JIT=1 pytest --cov --cov-branch --cov-report term-missing - if: ${{ ! matrix.coverage }} run: pytest diff --git a/environment.yml b/environment.yml index 343e179d..d7ea70c3 100644 --- a/environment.yml +++ b/environment.yml @@ -10,7 +10,7 @@ dependencies: # Running HSP2 - scipy # Scipy also installs numpy # Pandas installs most scientific Python modules, such as Numpy, etc. - - pandas + - pandas <3.0 - numba - numpy - hdf5 diff --git a/environment_dev.yml b/environment_dev.yml index 78bfc5a9..78dbb137 100644 --- a/environment_dev.yml +++ b/environment_dev.yml @@ -12,7 +12,7 @@ dependencies: # Running HSP2 - scipy # Scipy also installs numpy # Pandas installs most scientific Python modules, such as Numpy, etc. - - pandas >=2.0 + - pandas >=2.0,<3.0 - numba - numpy - hdf5 diff --git a/pyproject.toml b/pyproject.toml index ea38e3cd..d3272da7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,8 +13,8 @@ description = "Hydrological Simulation Program - Python" dependencies = [ "cltoolbox", "numba", - "numpy<2.0", - "pandas", + "numpy", + "pandas<3.0", "tables", "pyparsing" ]