diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml index 1bb08637099..d9940e8a35c 100644 --- a/.github/workflows/ci-conda.yml +++ b/.github/workflows/ci-conda.yml @@ -27,17 +27,11 @@ jobs: ${{ github.event_name == 'pull_request' && fromJson('["ubuntu"]') || fromJson('["ubuntu", "macos"]') }} - python: >- - ${{ github.event_name == 'pull_request' - && fromJson('["3.9"]') - || fromJson('["3.9", "3.10", "3.11"]') }} + python: ['3.10', '3.11', '3.12'] # Optional environment is disabled for now as its not yet working # environment: [environment, environment-optional] conda-env: [environment] - # On pull requests, only test two jobs: - # Ubuntu with Python 3.9, macOS with Python 3.10. - # Build & Test currently uses Python 3.11 (on ubuntu-focal). - # Together, they cover the supported minor Python versions. + # On pull requests, only test one job on macos include: >- ${{ github.event_name == 'pull_request' && fromJson('[{"os": "macos", "python": "3.10", "conda-env": "environment"}]') diff --git a/bootstrap-conda b/bootstrap-conda index 97a21fad567..db6239cff2f 100755 --- a/bootstrap-conda +++ b/bootstrap-conda @@ -155,7 +155,7 @@ echo >&2 $0:$LINENO: generate conda environment files ) 4>> /dev/null 5>> src/environment-optional-template.yml for f in environment environment-optional src/environment src/environment-optional src/environment-dev; do - for python_version in 3.9 3.10 3.11; do + for python_version in 3.10 3.11 3.12; do sed -E 's/^( *- *)python *$/\1python='$python_version'/' $f-template.yml > $f-$python_version.yml done rm -f $f-template.yml