Skip to content

Commit

Permalink
Merge pull request #275 from openscm/loosen-requirements
Browse files Browse the repository at this point in the history
Update requirements in pyproject.toml
  • Loading branch information
znicholls authored Oct 18, 2023
2 parents 5cb65a5 + bf80b14 commit 46f7bf2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 27 deletions.
24 changes: 1 addition & 23 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest" ]
python-version: [ "3.8", "3.9", "3.10", "3.11" ]
python-version: [ "3.9", "3.10", "3.11" ]
runs-on: "${{ matrix.os }}"
steps:
- name: Check out repository
Expand All @@ -61,28 +61,6 @@ jobs:
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3

test-pandas-versions:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.8" ]
pandas-version: [ "1.1" ]

steps:
- name: Checkout repository
uses: actions/checkout@v3
- uses: ./.github/actions/setup
with:
python-version: "${{ matrix.python-version }}"
venv-id: "tests-${{ runner.os }}"
poetry-dependency-install-flags: "--all-extras"
- name: Install test dependencies
run: |
pip install pandas==${{ matrix.pandas-version }} numpy==1.20.0
- name: Test with pytest
run: |
poetry run pytest -r a -v src tests
test-xarray-versions:
runs-on: ubuntu-latest
strategy:
Expand Down
8 changes: 8 additions & 0 deletions changelog/275.breaking.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Dropped support for Python 3.8 and relaxed requirements of pint and pyam-iamc

This has led to a number of follow up issues:

- documentation of our supported dependency versions ([#277](https://github.com/openscm/scmdata/issues/277))
- moving to NEP29 ([#276](https://github.com/openscm/scmdata/issues/276))
- a full review of dependencies ([#278](https://github.com/openscm/scmdata/issues/278))
- need to test against development versions of upstream repositories ([#279](https://github.com/openscm/scmdata/issues/279))
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ classifiers = [
]

[tool.poetry.dependencies]
python = "^3.8"
python = "^3.9"
cftime = ">=1.5"
numpy = "*"
openscm-units = "*"
packaging = "*"
pandas = ">=1.1"
pint = "<0.20"
pint = "*"
pint-pandas = "*"
python-dateutil = "*"
tqdm = "*"
six = "*"
xarray = "*"
nc-time-axis = { version = ">=1.2.0", optional = true }
typing-extensions = "<5"
typing-extensions = "*"
matplotlib = { version = "^3.7.1", optional = true }
seaborn = { version = "*", optional = true }
netCDF4 = { version = "*", optional = true }
Expand All @@ -49,7 +49,7 @@ xlrd = { version = "*", optional = true }
scipy = { version = "*", optional = true }
joblib = { version = "*", optional = true }
notebook = { version = ">=7", optional = true }
pyam-iamc = { version = "<2", optional = true }
pyam-iamc = { version = "*", optional = true }

[tool.poetry.extras]
plots = ["matplotlib", "seaborn" , "nc-time-axis"]
Expand Down

0 comments on commit 46f7bf2

Please sign in to comment.