Skip to content

Commit 716f92a

Browse files
committed
Update template
1 parent 09ce45f commit 716f92a

File tree

6 files changed

+159
-34
lines changed

6 files changed

+159
-34
lines changed

.cruft.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
3-
"commit": "0eda714719b5141d8e570e2c751572b41fefc2d7",
3+
"commit": "9627920059b31038e1bb8a978921806cb835fde7",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/workflows/on-push.yml

+17-18
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ jobs:
4848
path: ci/combined-environment-*.yml
4949

5050
unit-tests:
51-
name: unit-tests (3.10)
51+
name: unit-tests
5252
needs: combine-environments
5353
runs-on: ubuntu-latest
54+
strategy:
55+
matrix:
56+
python-version: ['3.10', '3.11']
5457

5558
steps:
5659
- uses: actions/checkout@v3
@@ -60,14 +63,13 @@ jobs:
6063
name: combined-environments
6164
path: ci
6265
- name: Install Conda environment with Micromamba
63-
uses: mamba-org/provision-with-micromamba@v15
66+
uses: mamba-org/setup-micromamba@v1
6467
with:
6568
environment-file: ci/combined-environment-ci.yml
6669
environment-name: DEVELOP
67-
channels: conda-forge
68-
cache-env: true
69-
extra-specs: |
70-
python=3.10
70+
cache-environment: true
71+
create-args: >-
72+
python=${{ matrix.python-version }}
7173
- name: Install package
7274
run: |
7375
python -m pip install --no-deps -e .
@@ -87,13 +89,12 @@ jobs:
8789
name: combined-environments
8890
path: ci
8991
- name: Install Conda environment with Micromamba
90-
uses: mamba-org/provision-with-micromamba@v15
92+
uses: mamba-org/setup-micromamba@v1
9193
with:
9294
environment-file: ci/combined-environment-ci.yml
9395
environment-name: DEVELOP
94-
channels: conda-forge
95-
cache-env: true
96-
extra-specs: |
96+
cache-environment: true
97+
create-args: >-
9798
python=3.10
9899
- name: Install package
99100
run: |
@@ -114,13 +115,12 @@ jobs:
114115
name: combined-environments
115116
path: ci
116117
- name: Install Conda environment with Micromamba
117-
uses: mamba-org/provision-with-micromamba@v15
118+
uses: mamba-org/setup-micromamba@v1
118119
with:
119120
environment-file: ci/combined-environment-ci.yml
120121
environment-name: DEVELOP
121-
channels: conda-forge
122-
cache-env: true
123-
extra-specs: |
122+
cache-environment: true
123+
create-args: >-
124124
python=3.10
125125
- name: Install package
126126
run: |
@@ -151,13 +151,12 @@ jobs:
151151
name: combined-environments
152152
path: ci
153153
- name: Install Conda environment with Micromamba
154-
uses: mamba-org/provision-with-micromamba@v15
154+
uses: mamba-org/setup-micromamba@v1
155155
with:
156156
environment-file: ci/combined-environment${{ matrix.extra }}.yml
157157
environment-name: DEVELOP${{ matrix.extra }}
158-
channels: conda-forge
159-
cache-env: true
160-
extra-specs: |
158+
cache-environment: true
159+
create-args: >-
161160
python=${{ matrix.python-version }}
162161
- name: Install package
163162
run: |

.gitignore

+134-9
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,59 @@ version.py
44
# Sphinx automatic generation of API
55
docs/_api/
66

7-
# Created by https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks,vim,visualstudiocode,pycharm
8-
# Edit at https://www.toptal.com/developers/gitignore?templates=python,jupyternotebooks,vim,visualstudiocode,pycharm
7+
# Created by https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks,vim,visualstudiocode,pycharm,emacs,linux,macos,windows
8+
# Edit at https://www.toptal.com/developers/gitignore?templates=python,jupyternotebooks,vim,visualstudiocode,pycharm,emacs,linux,macos,windows
9+
10+
### Emacs ###
11+
# -*- mode: gitignore; -*-
12+
*~
13+
\#*\#
14+
/.emacs.desktop
15+
/.emacs.desktop.lock
16+
*.elc
17+
auto-save-list
18+
tramp
19+
.\#*
20+
21+
# Org-mode
22+
.org-id-locations
23+
*_archive
24+
25+
# flymake-mode
26+
*_flymake.*
27+
28+
# eshell files
29+
/eshell/history
30+
/eshell/lastdir
31+
32+
# elpa packages
33+
/elpa/
34+
35+
# reftex files
36+
*.rel
37+
38+
# AUCTeX auto folder
39+
/auto/
40+
41+
# cask packages
42+
.cask/
43+
dist/
44+
45+
# Flycheck
46+
flycheck_*.el
47+
48+
# server auth directory
49+
/server/
50+
51+
# projectiles files
52+
.projectile
53+
54+
# directory configuration
55+
.dir-locals.el
56+
57+
# network security
58+
/network-security.data
59+
960

1061
### JupyterNotebooks ###
1162
# gitignore template for Jupyter Notebooks
@@ -21,6 +72,52 @@ ipython_config.py
2172
# Remove previous ipynb_checkpoints
2273
# git rm -r .ipynb_checkpoints/
2374

75+
### Linux ###
76+
77+
# temporary files which can be created if a process still has a handle open of a deleted file
78+
.fuse_hidden*
79+
80+
# KDE directory preferences
81+
.directory
82+
83+
# Linux trash folder which might appear on any partition or disk
84+
.Trash-*
85+
86+
# .nfs files are created when an open file is removed but is still being accessed
87+
.nfs*
88+
89+
### macOS ###
90+
# General
91+
.DS_Store
92+
.AppleDouble
93+
.LSOverride
94+
95+
# Icon must end with two \r
96+
Icon
97+
98+
# Thumbnails
99+
._*
100+
101+
# Files that might appear in the root of a volume
102+
.DocumentRevisions-V100
103+
.fseventsd
104+
.Spotlight-V100
105+
.TemporaryItems
106+
.Trashes
107+
.VolumeIcon.icns
108+
.com.apple.timemachine.donotpresent
109+
110+
# Directories potentially created on remote AFP share
111+
.AppleDB
112+
.AppleDesktop
113+
Network Trash Folder
114+
Temporary Items
115+
.apdisk
116+
117+
### macOS Patch ###
118+
# iCloud generated files
119+
*.icloud
120+
24121
### PyCharm ###
25122
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
26123
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
@@ -147,7 +244,6 @@ __pycache__/
147244
.Python
148245
build/
149246
develop-eggs/
150-
dist/
151247
downloads/
152248
eggs/
153249
.eggs/
@@ -293,6 +389,16 @@ cython_debug/
293389
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
294390
#.idea/
295391

392+
### Python Patch ###
393+
# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
394+
poetry.toml
395+
396+
# ruff
397+
.ruff_cache/
398+
399+
# LSP config files
400+
pyrightconfig.json
401+
296402
### Vim ###
297403
# Swap
298404
[._]*.s[a-v][a-z]
@@ -308,7 +414,6 @@ Sessionx.vim
308414

309415
# Temporary
310416
.netrwhist
311-
*~
312417
# Auto-generated tag files
313418
tags
314419
# Persistent undo
@@ -334,10 +439,30 @@ tags
334439
.history
335440
.ionide
336441

337-
# Support for Project snippet scope
338-
.vscode/*.code-snippets
442+
### Windows ###
443+
# Windows thumbnail cache files
444+
Thumbs.db
445+
Thumbs.db:encryptable
446+
ehthumbs.db
447+
ehthumbs_vista.db
448+
449+
# Dump file
450+
*.stackdump
451+
452+
# Folder config file
453+
[Dd]esktop.ini
454+
455+
# Recycle Bin used on file shares
456+
$RECYCLE.BIN/
457+
458+
# Windows Installer files
459+
*.cab
460+
*.msi
461+
*.msix
462+
*.msm
463+
*.msp
339464

340-
# Ignore code-workspaces
341-
*.code-workspace
465+
# Windows shortcuts
466+
*.lnk
342467

343-
# End of https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks,vim,visualstudiocode,pycharm
468+
# End of https://www.toptal.com/developers/gitignore/api/python,jupyternotebooks,vim,visualstudiocode,pycharm,emacs,linux,macos,windows

.pre-commit-config-cruft.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/cruft/cruft
3-
rev: 2.12.0
3+
rev: 2.15.0
44
hooks:
55
- id: cruft
66
entry: cruft update -y

.pre-commit-config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@ repos:
1111
- id: debug-statements
1212
- id: mixed-line-ending
1313
- repo: https://github.com/psf/black
14-
rev: 23.1.0
14+
rev: 23.3.0
1515
hooks:
1616
- id: black
1717
- repo: https://github.com/keewis/blackdoc
1818
rev: v0.3.8
1919
hooks:
2020
- id: blackdoc
2121
additional_dependencies: [black==22.3.0]
22-
- repo: https://github.com/charliermarsh/ruff-pre-commit
23-
rev: v0.0.254
22+
- repo: https://github.com/astral-sh/ruff-pre-commit
23+
rev: v0.0.277
2424
hooks:
2525
- id: ruff
26-
args: [--fix]
26+
args: [--fix, --show-fixes]
2727
- repo: https://github.com/executablebooks/mdformat
2828
rev: 0.7.16
2929
hooks:
3030
- id: mdformat
3131
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
32-
rev: v2.7.0
32+
rev: v2.9.0
3333
hooks:
3434
- id: pretty-format-yaml
3535
args: [--autofix, --preserve-quotes]

pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ classifiers = [
1010
"Programming Language :: Python",
1111
"Programming Language :: Python :: 3",
1212
"Programming Language :: Python :: 3.10",
13+
"Programming Language :: Python :: 3.11",
1314
"Topic :: Scientific/Engineering"
1415
]
1516
dependencies = [

0 commit comments

Comments
 (0)