fast-forward cookiecutter

hydrologie · Jun 11, 2024 · e0a6a79 · e0a6a79
1 parent 7488d42
commit e0a6a79
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 154 deletions.
diff --git a/.cruft.json b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
-  "commit": "d7c3bf0291f0d7eb2051e0228702580ea5a14da4",
+  "commit": "f9e0b049711af2023e9a3f5df594f4dbc25b07c1",
   "checkout": null,
   "context": {
     "cookiecutter": {

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -46,7 +46,8 @@ jobs:
             tuf-repo-cdn.sigstore.dev:443
             www.bestpractices.dev:443
 
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - name: Checkout Repository
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           persist-credentials: false
 

diff --git a/CODE_OF_CONDUCT.rst b/CODE_OF_CONDUCT.rst
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -188,5 +188,5 @@ To get ``black``, ``isort``, ``blackdoc``, ``ruff``, and ``flake8`` (with plugin
 Code of Conduct
 ---------------
 
-Please note that this project is released with a `Contributor Code of Conduct <https://github.com/hydrologie/xhydro-lstm/blob/main/CODE_OF_CONDUCT.rst>`_.
+Please note that this project is released with a `Contributor Code of Conduct <https://github.com/hydrologie/xhydro-lstm/blob/main/CODE_OF_CONDUCT.md>`_.
 By participating in this project you agree to abide by its terms.
diff --git a/Makefile b/Makefile
@@ -55,13 +55,13 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr .pytest_cache
 
 lint/flake8: ## check style with flake8
-	ruff check src/xhydro_lstm tests
-	flake8 --config=.flake8 src/xhydro_lstm tests
+	python -m ruff check src/xhydro_lstm tests
+	python -m flake8 --config=.flake8 src/xhydro_lstm tests
 
 lint/black: ## check style with black
-	black --check src/xhydro_lstm tests
-	blackdoc --check src/xhydro_lstm docs
-	isort --check src/xhydro_lstm tests
+	python -m black --check src/xhydro_lstm tests
+	python -m blackdoc --check src/xhydro_lstm docs
+	python -m isort --check src/xhydro_lstm tests
 
 lint: lint/flake8 lint/black ## check style
 
@@ -72,9 +72,9 @@ test-all: ## run tests on every Python version with tox
 	tox
 
 coverage: ## check code coverage quickly with the default Python
-	coverage run --source src/xhydro_lstm -m pytest
-	coverage report -m
-	coverage html
+	python -m coverage run --source src/xhydro_lstm -m pytest
+	python -m coverage report -m
+	python -m coverage html
 	$(BROWSER) htmlcov/index.html
 initialize-translations: clean-docs ## initialize translations, ignoring autodoc-generated files
 	${MAKE} -C docs gettext

diff --git a/docs/conf.py b/docs/conf.py
@@ -123,6 +123,8 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
+if not os.path.exists("_static"):
+    os.makedirs("_static")
 html_static_path = ['_static']
 
 

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -9,9 +9,9 @@ dependencies:
   - watchdog >=3.0.0
   - flake8 >=6.1.0
   - flake8-rst-docstrings >=0.3.0
-  - flit
+  - flit >=3.9.0
   - tox >=4.5.1
-  - coverage >=6.2.0,<7.0.0
+  - coverage >=7.0.0
   - coveralls >=3.3.1
   - pytest >=7.3.1
   - pytest-cov >=4.0.0

diff --git a/environment-docs.yml b/environment-docs.yml
@@ -4,7 +4,7 @@ channels:
   - defaults
 dependencies:
   - python >=3.12,<3.13
-  - sphinx
+  - sphinx >=7.0.0
   - pandoc
   - sphinx-rtd-theme >=1.0
   - sphinx-autoapi

diff --git a/pyproject.toml b/pyproject.toml
@@ -58,7 +58,7 @@ dev = [
 ]
 docs = [
   # Documentation and examples
-  "sphinx",
+  "sphinx >=7.0.0",
   "sphinx-codeautolink",
   "sphinx-copybutton",
   "sphinx-intl",