Skip to content

Commit

Permalink
Merge pull request #856 from altheaden/update-supported-python-versions
Browse files Browse the repository at this point in the history
Update supported python versions
  • Loading branch information
xylar authored Sep 4, 2024
2 parents 4203ebc + 6aa959c commit e056690
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.9", "3.10", "3.11", "3.12"]
steps:
- id: skip_check
uses: fkirc/skip-duplicate-actions@master
Expand Down
3 changes: 1 addition & 2 deletions ci/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

from jinja2 import Template


for os in ['linux', 'osx']:
with open(f'template_{os}.yaml') as f:
template_test = f.read()

template = Template(template_test)
for python in ['3.8', '3.9', '3.10', '3.11']:
for python in ['3.9', '3.10', '3.11', '3.12']:
for mpi in ['nompi', 'mpich', 'openmpi']:
script = template.render(python=python, mpi=mpi)
filename = f'{os}_mpi_{mpi}_python{python}.yaml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- fortran_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- fortran_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- fortran_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- fortran_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- fortran_compiler_version
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pin_run_as_build:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
- 3.12.* *_cpython
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- fortran_compiler_version
2 changes: 1 addition & 1 deletion conda/compass_env/spec-file.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# $ conda create --name <env> --file <this file>

# Base
python>=3.8
python>=3.9
cartopy
cartopy_offlinedata
cmocean
Expand Down
2 changes: 1 addition & 1 deletion conda/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ recreate = False
suffix =

# the python version
python = 3.11
python = 3.12

# the MPI version (nompi, mpich or openmpi)
mpi = nompi
Expand Down
2 changes: 1 addition & 1 deletion docs/developers_guide/quick_start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Optional flags
Check to make sure expected commands are present

``--python``
Select a particular python version (the default is currently 3.8)
Select a particular python version (the default is currently 3.12)

``--env_name``
Set the name of the environment (and the prefix for the activation script)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ def package_files(directory, prefixes, extensions):
'Intended Audience :: Science/Research',
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Topic :: Scientific/Engineering',
],
packages=find_packages(include=['compass', 'compass.*']),
Expand Down

0 comments on commit e056690

Please sign in to comment.