Merge branch 'master' into upstream-changes

# Conflicts:
#	.github/workflows/main.yml
#	setup.cfg
#	setup.py
#	tox.ini
#	{{cookiecutter.project_slug}}/setup.py

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/main.yml

@@ -25,7 +25,9 @@ jobs:
             python-version: "3.11"
           - tox-env: py312
             python-version: "3.12"
-          - tox-env: pypy310
+          - tox-env: pypy39-nogdal
+            python-version: "pypy-3.9"
+          - tox-env: pypy310-nogdal
             python-version: "pypy-3.10"
     steps:
       - name: Checkout repository and submodules

tox.ini

@@ -2,18 +2,20 @@
 min_version = 4.18.0
 envlist =
     py{39,310,311,312},
-    pypy310,
+    pypy{39,310,311,312},
     docs
 requires = pip >= 24.2.0
-opts = -v
+opts = --verbose
 
 [testenv:docs]
 basepython = python
 changedir = docs/source
-commands=
+commands =
     sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
+allowlist_externals =
+    sphinx-build
 
-[testenv:pypy310]
+[testenv:pypy{39,310,311,312}]
 commands =
     pytest -m "not requires_gdal"
 
@@ -22,7 +24,6 @@ setenv =
     CRYPTOGRAPHY_DONT_BUILD_RUST = 1
     PYTHONPATH = {toxinidir}
     PYTEST_ADDOPTS = "--color=yes"
-    nogdal: PYTEST_ADDOPTS = "--color=yes -m 'not requires_gdal'"
 deps =
 extras =
     dev

{{cookiecutter.project_slug}}/Makefile

@@ -130,7 +130,11 @@ test-tox: ## run tests on every available Python version with tox
 
 test-notebooks: notebook-sanitizer  ## run notebook-based tests
 	@echo "Running notebook-based tests"
-	@bash -c "env WPS_URL=$(WPS_URL) pytest --nbval --verbose $(CURDIR)/docs/source/notebooks/ --sanitize-with $(CURDIR)/docs/source/output-sanitize.cfg --ignore $(CURDIR)/docs/source/notebooks/.ipynb_checkpoints"
+	@bash -c "env WPS_URL=$(WPS_URL) pytest --nbval --rootdir tests/ --verbose $(CURDIR)/docs/source/notebooks/ --sanitize-with $(CURDIR)/docs/source/output-sanitize.cfg --ignore $(CURDIR)/docs/source/notebooks/.ipynb_checkpoints"
+
+test-notebooks-lax: notebook-sanitizer  ## run tests on notebooks but don't be so strict about outputs
+	@echo "Running notebook-based tests"
+	@bash -c "env WPS_URL=$(WPS_URL) pytest --nbval-lax --rootdir tests/ --verbose $(CURDIR)/docs/source/notebooks/ --ignore $(CURDIR)/docs/source/notebooks/.ipynb_checkpoints"
 
 coverage: ## check code coverage quickly with the default Python
 {%- if cookiecutter.use_pytest == 'y' %}