Skip to content

Commit

Permalink
fix: Bump pandas to the latest version
Browse files Browse the repository at this point in the history
Bump pandas and update tests to handle the latest version of pandas. This also allows the use of newer versions of Python during CI.

BREAKING CHANGE: Removes support for Python 3.7
  • Loading branch information
lewisjared committed Apr 3, 2023
1 parent 0e63108 commit fb53339
Show file tree
Hide file tree
Showing 11 changed files with 284 additions and 252 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/ci-cd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: [3.7, 3.8, 3.9]
exclude:
# netCDF4>=1.6.0 doesn't include prebuilt wheels for windows/Python3.7
# Older netCDF4 or self-built versions will likely work
- os: windows-latest
python-version: 3.7
python-version: [3.8, 3.9, '3.10', 3.11]
steps:
- name: Checkout repository
uses: actions/checkout@v3
Expand Down Expand Up @@ -92,7 +87,7 @@ jobs:
run: |
pytest tests -r a --cov=scmdata --cov-report=term-missing --cov-fail-under=$env:MIN_COVERAGE
- name: Upload coverage to Codecov
if: startsWith(runner.os, 'Linux') && matrix.python-version == 3.7
if: startsWith(runner.os, 'Linux') && matrix.python-version == 3.11
uses: codecov/codecov-action@v3
with:
file: ./coverage.xml
Expand All @@ -101,7 +96,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
# Pandas v1.1 doesn't build python v3.9 wheels
python-version: [3.8]
pandas-version: [1.0.5, 1.1]

steps:
Expand Down Expand Up @@ -134,7 +130,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ 3.7 ]
python-version: [ 3.9 ]
xarray-version: [ 0.16.2, 0.17.0, 0.18.2 ]

steps:
Expand Down Expand Up @@ -170,7 +166,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7]
python-version: [3.9]

steps:
- name: Checkout repository
Expand Down Expand Up @@ -201,7 +197,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9, 3.11]

steps:
- name: Checkout repository
Expand All @@ -226,7 +222,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9, '3.10', 3.11]

steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-conda-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9, '3.10', 3.11]

steps:
- name: Setup conda
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pypi-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: [3.7, 3.8, 3.9]
python-version: [3.8, 3.9, '3.10', 3.11]

steps:
- name: Setup python
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
master
------

- (`#223 <https://github.com/openscm/scmdata/pull/223>`_) Loosen the pandas requirement to cover pandas>=1.4.3. Also support officially support Python 3.10 and 3.11
- (`#222 <https://github.com/openscm/scmdata/pull/222>`_) Decrease the minimum number of time points for interpolation to 2
- (`#221 <https://github.com/openscm/scmdata/pull/221>`_) Add option to :func:`scmdata.ScmRun.interpolate` to allow for interpolation which ignores leap-years. This also fixes a bug where :func:`scmdata.ScmRun.interpolate` converts integer values into unix time. This functionality isn't consistent with the behaviour of the TimePoints class where integers are converted into years.
- (`#218 <https://github.com/openscm/scmdata/pull/218>`_) Replaced internal calls to :func:`scmdata.groupby.RunGroupby.map` with :func:`scmdata.groupby.RunGroupby.apply`
Expand Down
Loading

0 comments on commit fb53339

Please sign in to comment.