From d0ac3e715aac09d7b4576e2134cc3b4d228137e1 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 18 Oct 2023 11:52:30 +0200 Subject: [PATCH 1/6] Update requirements in pyproject.toml --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e2216c89..c0829342 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,14 +27,14 @@ classifiers = [ ] [tool.poetry.dependencies] -python = "^3.8" +python = "^3.9" cftime = ">=1.5" numpy = "*" openscm-units = "*" packaging = "*" pandas = ">=1.1" -pint = "<0.20" -pint-pandas = "*" +pint = "*" +pint-pandas = ">=0.5" python-dateutil = "*" tqdm = "*" six = "*" @@ -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"] From 4fc8d4e8d7e4b40421fb21607a8dbf2ddab16ba2 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 18 Oct 2023 12:03:17 +0200 Subject: [PATCH 2/6] Put Python 3.8 support back in --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index c0829342..75ae28fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] [tool.poetry.dependencies] -python = "^3.9" +python = "^3.8" cftime = ">=1.5" numpy = "*" openscm-units = "*" From 6153b2d4f18b600118d322851c84336776d3fa38 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 18 Oct 2023 12:13:57 +0200 Subject: [PATCH 3/6] Loosen off further --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 75ae28fa..483acc63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,13 +34,13 @@ openscm-units = "*" packaging = "*" pandas = ">=1.1" pint = "*" -pint-pandas = ">=0.5" +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 } From 1912b48478bf91221a749eccc7dd5e11fe2dbbb8 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 18 Oct 2023 12:24:29 +0200 Subject: [PATCH 4/6] Drop Python 3.8 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 483acc63..338a77fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] [tool.poetry.dependencies] -python = "^3.8" +python = "^3.9" cftime = ">=1.5" numpy = "*" openscm-units = "*" From e2c94d1c2916382bb7956fa58793439cbcefd7b2 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 18 Oct 2023 12:34:36 +0200 Subject: [PATCH 5/6] Update CI --- .github/workflows/ci.yaml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a4b7e18..a30fc3b7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 @@ -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: From bf80b1480f4d61ca4c2e9fe571d0bb33da5ea9f7 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Wed, 18 Oct 2023 15:08:11 +0200 Subject: [PATCH 6/6] CHANGELOG --- changelog/275.breaking.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 changelog/275.breaking.md diff --git a/changelog/275.breaking.md b/changelog/275.breaking.md new file mode 100644 index 00000000..64e73ab4 --- /dev/null +++ b/changelog/275.breaking.md @@ -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))