Skip to content

Commit 854dbbd

Browse files
tobiasdiezdimpase
authored andcommitted
Update conda to use Python 3.12, drop 3.9 and 3.10
1 parent 1be0a58 commit 854dbbd

17 files changed

+1044
-2286
lines changed

.github/workflows/ci-conda.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,12 @@ jobs:
2626
# On pushes to tags or branches, test the whole matrix.
2727
os: >-
2828
${{ github.event_name == 'pull_request'
29-
&& fromJson('["ubuntu-latest"]')
29+
&& fromJson('["ubuntu-latest", "macos-latest"]')
3030
|| fromJson('["ubuntu-latest", "macos-latest", "macos-13"]') }}
31-
python: >-
32-
${{ github.event_name == 'pull_request'
33-
&& fromJson('["3.9"]')
34-
|| fromJson('["3.9", "3.10", "3.11"]') }}
31+
python: ['3.11', '3.12']
3532
# Optional environment is disabled for now as its not yet working
3633
# environment: [environment, environment-optional]
3734
conda-env: [environment]
38-
# On pull requests, only test two jobs:
39-
# Ubuntu with Python 3.9, macOS (arm64) with Python 3.11.
40-
# Build & Test currently uses Python 3.10 (on ubuntu-jammy).
41-
# Together, they cover the supported minor Python versions.
42-
include: >-
43-
${{ github.event_name == 'pull_request'
44-
&& fromJson('[{"os": "macos-latest", "python": "3.11", "conda-env": "environment"}]')
45-
|| fromJson('[]') }}
4635

4736
steps:
4837
- uses: actions/checkout@v4

.github/workflows/ci-meson.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
os: [ubuntu]
26-
python: ['3.9', '3.10', '3.11']
26+
python: ['3.11', '3.12']
2727

2828
steps:
2929
- uses: actions/checkout@v4

.gitignore

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@
2626
# no longer generated, but may still be in user worktrees
2727
/src/lib/pkgconfig
2828

29-
# Conda environment files
30-
# The files without Python version, with -dev or in src are no longer generated
31-
# but may still be in users' directories.
29+
# Conda environment files (auto-generated)
30+
/environment-3.[0-9].yml
31+
/environment-3.[0-9][0-9].yml
32+
# The following files are no longer generated but may still be in users' directories
3233
/environment.yml
33-
/environment-3.9.yml
34-
/environment-3.10.yml
35-
/environment-3.11.yml
3634
/environment-dev-3.9.yml
3735
/environment-dev-3.10.yml
3836
/environment-dev-3.11.yml

0 commit comments

Comments
 (0)