Skip to content

Commit

Permalink
Merge pull request #122 from ecmwf-projects/py3.11
Browse files Browse the repository at this point in the history
bump to py3.11
  • Loading branch information
malmans2 authored Dec 6, 2023
2 parents 6b3d4f8 + 49c9916 commit c666530
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
environment-name: DEVELOP
cache-environment: true
create-args: >-
python=3.10
python=3.11
- name: Test my-package
run: |
cd ../my-package || exit
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Alpha stage:
- version with setuptools-scm-git
- copyright + Apache v2.0 license
- GitHub Actions
- unit-tests (py3.10, py3.11)
- unit-tests (py3.11)
- pre-commit
- integration-tests
- build documentation
Expand All @@ -33,11 +33,11 @@ Planned:

## Usage

For best experience create a new conda environment (e.g. DEVELOP) with Python 3.10,
For best experience create a new conda environment (e.g. DEVELOP) with Python 3.11,
cruft and make, then create the package:

```
conda create -n DEVELOP -c conda-forge python=3.10 cruft make
conda create -n DEVELOP -c conda-forge python=3.11 cruft make
conda activate DEVELOP
cruft create https://github.com/ecmwf-projects/cookiecutter-conda-package
```
Expand Down
10 changes: 5 additions & 5 deletions {{cookiecutter.project_name}}/.github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.10', '3.11']
python-version: ['3.11']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
cache-environment-key: environment-${{ '{{ steps.date.outputs.date }}' }}
cache-downloads-key: downloads-${{ '{{ steps.date.outputs.date }}' }}
create-args: >-
python=3.10
python=3.11
- name: Install package
run: |
python -m pip install --no-deps -e .
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
cache-environment-key: environment-${{ '{{ steps.date.outputs.date }}' }}
cache-downloads-key: downloads-${{ '{{ steps.date.outputs.date }}' }}
create-args: >-
python=3.10
python=3.11
- name: Install package
run: |
python -m pip install --no-deps -e .
Expand All @@ -149,7 +149,7 @@ jobs:
strategy:
matrix:
include:
- python-version: '3.10'
- python-version: '3.11'
extra: -integration

steps:
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.11'
- name: Install package
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_name}}/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ WORKDIR /src/{{ cookiecutter.project_name }}

COPY environment.yml /src/{{ cookiecutter.project_name }}/

RUN conda install -c conda-forge gcc python=3.10 \
RUN conda install -c conda-forge gcc python=3.11 \
&& conda env update -n base -f environment.yml

COPY . /src/{{ cookiecutter.project_name }}
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.project_name}}/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

## Workflow for developers/contributors

For best experience create a new conda environment (e.g. DEVELOP) with Python 3.10:
For best experience create a new conda environment (e.g. DEVELOP) with Python 3.11:

```
conda create -n DEVELOP -c conda-forge python=3.10
conda create -n DEVELOP -c conda-forge python=3.11
conda activate DEVELOP
```

Expand Down
1 change: 0 additions & 1 deletion {{cookiecutter.project_name}}/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ classifiers = [
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Topic :: Scientific/Engineering"
]
Expand Down

0 comments on commit c666530

Please sign in to comment.