template update

Author: malmans2

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
-  "commit": "77c7df5dde1ef90c38d872967939881aa2d7be71",
+  "commit": "c6665306749b5dd3b4ec0fdcf1cb31d18fe23511",
   "checkout": null,
   "context": {
     "cookiecutter": {

.github/workflows/on-push.yml

@@ -33,6 +33,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
     - name: Install conda-merge
       run: |
         python -m pip install conda-merge
@@ -52,19 +55,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.10', '3.11']
+        python-version: ['3.11']
 
     steps:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v3
       with:
         name: combined-environments
         path: ci
+    - name: Get current date
+      id: date
+      run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
     - uses: mamba-org/setup-micromamba@v1
       with:
         environment-file: ci/combined-environment-ci.yml
         environment-name: DEVELOP
         cache-environment: true
+        cache-environment-key: environment-${{ steps.date.outputs.date }}
+        cache-downloads-key: downloads-${{ steps.date.outputs.date }}
         create-args: >-
           python=${{ matrix.python-version }}
     - name: Install package
@@ -84,13 +92,18 @@ jobs:
       with:
         name: combined-environments
         path: ci
+    - name: Get current date
+      id: date
+      run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
     - uses: mamba-org/setup-micromamba@v1
       with:
         environment-file: ci/combined-environment-ci.yml
         environment-name: DEVELOP
         cache-environment: true
+        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 .
@@ -108,13 +121,18 @@ jobs:
       with:
         name: combined-environments
         path: ci
+    - name: Get current date
+      id: date
+      run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
     - uses: mamba-org/setup-micromamba@v1
       with:
         environment-file: ci/combined-environment-ci.yml
         environment-name: DEVELOP
         cache-environment: true
+        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 .
@@ -131,7 +149,7 @@ jobs:
     strategy:
       matrix:
         include:
-        - python-version: '3.10'
+        - python-version: '3.11'
           extra: -integration
 
     steps:
@@ -140,11 +158,16 @@ jobs:
       with:
         name: combined-environments
         path: ci
+    - name: Get current date
+      id: date
+      run: echo "date=$(date +%Y-%m-%d)" >> "${GITHUB_OUTPUT}"
     - uses: mamba-org/setup-micromamba@v1
       with:
         environment-file: ci/combined-environment${{ matrix.extra }}.yml
         environment-name: DEVELOP${{ matrix.extra }}
         cache-environment: true
+        cache-environment-key: environment-${{ steps.date.outputs.date }}
+        cache-downloads-key: downloads-${{ steps.date.outputs.date }}
         create-args: >-
           python=${{ matrix.python-version }}
     - name: Install package
@@ -166,6 +189,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
     - name: Install package
       run: |
         python -m pip install --upgrade pip
@@ -204,6 +230,6 @@ jobs:
       with:
         name: distribution
         path: dist
-    - uses: pypa/[email protected].10
+    - uses: pypa/[email protected].11
       with:
         verbose: true

.pre-commit-config.yaml

@@ -8,15 +8,16 @@ repos:
   - id: check-yaml
   - id: check-toml
   - id: check-added-large-files
+  - id: check-merge-conflict
   - id: debug-statements
   - id: mixed-line-ending
 - repo: https://github.com/keewis/blackdoc
   rev: v0.3.9
   hooks:
   - id: blackdoc
-    additional_dependencies: [black==22.3.0]
+    additional_dependencies: [black==23.11.0]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.5
+  rev: v0.1.6
   hooks:
   - id: ruff
     args: [--fix, --show-fixes]
@@ -33,6 +34,6 @@ repos:
   - id: pretty-format-toml
     args: [--autofix]
 - repo: https://github.com/gitleaks/gitleaks
-  rev: v8.18.0
+  rev: v8.18.1
   hooks:
   - id: gitleaks

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /src/c3s-eqc-automatic-quality-control
 
 COPY environment.yml /src/c3s-eqc-automatic-quality-control/
 
-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/c3s-eqc-automatic-quality-control

README.md

@@ -11,10 +11,10 @@ C3S EQC Automatic Quality Control
 
 ## 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
 ```
 

pyproject.toml

@@ -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"
 ]