From 2b00aa4a80eb61e05fca8f1d25450b3d3030ee29 Mon Sep 17 00:00:00 2001
From: cvanelteren <caspervanelteren@gmail.com>
Date: Mon, 24 Feb 2025 13:29:25 +0100
Subject: [PATCH 1/4] rm changes to setup
---
.github/workflows/build.yml | 2 ++
packages/basemap/requirements-test.txt | 1 +
2 files changed, 3 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23a7a299b..3b5e6ec7c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,6 +85,8 @@ jobs:
CIBW_BUILD: "cp39* cp310* cp311* cp312*"
CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
CIBW_BEFORE_ALL: ${{ matrix.before_all }}
+ CIBW_TEST_REQUIRES: pytest
+ CIBW_TEST_COMMAND: "pytest {project}/packages/basemap"
CIBW_ENVIRONMENT: >-
GEOS_VERSION="3.6.5"
GEOS_DIR="$(pwd)/extern"
diff --git a/packages/basemap/requirements-test.txt b/packages/basemap/requirements-test.txt
index 7491b2686..f2a52ffeb 100644
--- a/packages/basemap/requirements-test.txt
+++ b/packages/basemap/requirements-test.txt
@@ -21,3 +21,4 @@ pytest-cov >= 2.5, < 2.6; python_version == "3.2"
pytest-cov >= 2.5, < 2.6; python_version == "3.3"
pytest-cov >= 2.5, < 2.9; python_version == "3.4"
pytest-cov >= 2.9, < 4.2; python_version >= "3.5"
+pytest
From b13c6a46bbb13b66ef3cfebdc604a5f5f4e8f560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
<molinav@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:52:53 +0100
Subject: [PATCH 2/4] Invoke pytest in workflow with python -m syntax
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3b5e6ec7c..2a83ea8a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,7 +86,7 @@ jobs:
CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
CIBW_BEFORE_ALL: ${{ matrix.before_all }}
CIBW_TEST_REQUIRES: pytest
- CIBW_TEST_COMMAND: "pytest {project}/packages/basemap"
+ CIBW_TEST_COMMAND: "python -m pytest {project}/packages/basemap"
CIBW_ENVIRONMENT: >-
GEOS_VERSION="3.6.5"
GEOS_DIR="$(pwd)/extern"
From beab20689fc4aba669c2b22d43ac2fb9758f564c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
<molinav@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:54:14 +0100
Subject: [PATCH 3/4] Remove duplicate pytest requirement in
requirements-test.txt
---
packages/basemap/requirements-test.txt | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/basemap/requirements-test.txt b/packages/basemap/requirements-test.txt
index f2a52ffeb..7491b2686 100644
--- a/packages/basemap/requirements-test.txt
+++ b/packages/basemap/requirements-test.txt
@@ -21,4 +21,3 @@ pytest-cov >= 2.5, < 2.6; python_version == "3.2"
pytest-cov >= 2.5, < 2.6; python_version == "3.3"
pytest-cov >= 2.5, < 2.9; python_version == "3.4"
pytest-cov >= 2.9, < 4.2; python_version >= "3.5"
-pytest
From 5c6f0724cfe1d52af97099229563972bbcc733e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?=
<molinav@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:54:37 +0100
Subject: [PATCH 4/4] Replace CIBW_TEST_REQUIRES with CIBW_TEST_EXTRAS
---
.github/workflows/build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2a83ea8a6..ed065d625 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,7 +85,7 @@ jobs:
CIBW_BUILD: "cp39* cp310* cp311* cp312*"
CIBW_SKIP: "pp* *-musllinux_* *-win32 *-manylinux_i686 *-musllinux_i686 *-aarch64 *-armv7l"
CIBW_BEFORE_ALL: ${{ matrix.before_all }}
- CIBW_TEST_REQUIRES: pytest
+ CIBW_TEST_EXTRAS: "test"
CIBW_TEST_COMMAND: "python -m pytest {project}/packages/basemap"
CIBW_ENVIRONMENT: >-
GEOS_VERSION="3.6.5"