Skip to content

Commit

Permalink
Bump to py3.12 support
Browse files Browse the repository at this point in the history
  • Loading branch information
brynpickering committed Nov 10, 2023
1 parent 42975f0 commit dd9a839
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/commit-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: mamba-org/setup-micromamba@v1
with:
micromamba-version: latest
environment-name: ${{ github.event.repository.name }}-ubuntu-latest-311-${{ hashFiles('requirements/dev.txt') }}
environment-name: ${{ github.event.repository.name }}-ubuntu-latest-312-${{ hashFiles('requirements/dev.txt') }}
environment-file: requirements/base.txt
create-args: >-
-f requirements/dev.txt
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
py3version: ["9", "10", "11"]
py3version: ["10", "11", "12"]
include:
- os: windows-latest
py3version: "11"
py3version: "12"
- os: macos-latest
py3version: "11"
py3version: "12"
fail-fast: false
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -71,16 +71,16 @@ jobs:
run: python -m ipykernel install --user --name calliope

- name: run tests with coverage
if: matrix.os == 'ubuntu-latest' && matrix.py3version == '11'
if: matrix.os == 'ubuntu-latest' && matrix.py3version == '12'
run: pytest --cov

- name: run tests without coverage
if: matrix.os != 'ubuntu-latest' || matrix.py3version != '11'
if: matrix.os != 'ubuntu-latest' || matrix.py3version != '12'
run: pytest

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
if: matrix.os == 'ubuntu-latest' && matrix.py3version == '11'
if: matrix.os == 'ubuntu-latest' && matrix.py3version == '12'
with:
fail_ci_if_error: true
directory: "./reports/coverage/"
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jsonschema >= 4.17, < 4.19
natsort >= 8, < 9
netcdf4 >= 1.2, < 1.7
numpy >= 1, < 2
pandas >= 2, < 2.1
pandas >= 2.1.2, < 2.2
pyomo >= 6.5, < 7
pyparsing >= 3.0, < 3.1
ruamel.yaml >= 0.17, < 0.18
xarray >= 2023.9, < 2024.2
xarray >= 2023.10, < 2024.3

0 comments on commit dd9a839

Please sign in to comment.