Skip to content

Commit e32f80a

Browse files
author
Release Manager
committed
gh-39164: Update conda to use Python 3.12, drop 3.9 and 3.10 <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> In line with Spec 0, we drop Python 3.9 and 3.10 support (in this PR only for conda). Instead Python 3.11 and 3.12 is used for the CI. (Python 3.13 still needs a few package updates in the conda universe #39163) ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #39164 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
2 parents c2e5752 + 29a4862 commit e32f80a

19 files changed

+1047
-2289
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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ distclean: build-clean
173173
bootstrap-clean:
174174
rm -rf config/install-sh config/compile config/config.guess config/config.sub config/missing configure build/make/Makefile-auto.in
175175
rm -f src/doc/en/installation/*.txt
176-
find src/doc/en/reference/spkg -name index.rst -prune -o -maxdepth 1 -name "*.rst" -exec rm -f {} \+
176+
find src/doc/en/reference/spkg -maxdepth 1 -name index.rst -prune -o -name "*.rst" -exec rm -f {} \+
177177
for a in environment environment-optional src/environment src/environment-optional; do rm -f $$a.yml $$a-3.[89].yml $$a-3.1[0-9].yml; done
178178
rm -f src/requirements.txt
179179
rm -f src/setup.cfg

bootstrap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ save () {
224224
config/install-sh config/compile config/config.guess config/config.sub config/missing \
225225
build/make/Makefile-auto.in \
226226
src/doc/en/installation/*.txt \
227-
$(find src/doc/en/reference/spkg -name index.rst -prune -o -maxdepth 1 -name "*.rst" -print) \
228-
environment-3.[89]-*.yml environment-3.1[0-9]-*.yml \
227+
$(find src/doc/en/reference/spkg -maxdepth 1 -name index.rst -prune -o -name "*.rst" -print) \
228+
environment-3.1[0-9]-*.yml \
229229
src/pyproject.toml \
230230
src/requirements.txt \
231231
src/setup.cfg \

0 commit comments

Comments
 (0)