resetting to base

Author: cvanelteren

.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"

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

packages/basemap/setup.py

@@ -16,6 +16,7 @@
 
 try:
     import Cython
+
     cython_major_version = int(Cython.__version__.split(".", 1)[0])
 except ImportError:
     cython_major_version = 0
@@ -50,8 +51,15 @@ def get_geos_install_prefix():
     if env_candidate is not None:
         candidates = [env_candidate]
     else:
-        candidates = [os.path.expanduser("~/local"), os.path.expanduser("~"),
-                      "/usr/local", "/usr", "/opt/local", "/opt", "/sw"]
+        candidates = [
+            os.path.expanduser("~/local"),
+            os.path.expanduser("~"),
+            "/usr/local",
+            "/usr",
+            "/opt/local",
+            "/opt",
+            "/sw",
+        ]
 
     # Prepare filename pattern to find the GEOS library.
     extensions = {"win32": "dll", "cygwin": "dll", "darwin": "dylib"}
@@ -71,15 +79,20 @@ def get_geos_install_prefix():
     # the user is trying to build the library.
     build_cmds = ("bdist_wheel", "build", "install")
     if any(cmd in sys.argv[1:] for cmd in build_cmds):
-        warnings.warn(" ".join([
-            "Cannot find GEOS library and/or headers in standard locations",
-            "('{0}'). Please install the corresponding packages using your",
-            "software management system or set the environment variable",
-            "GEOS_DIR to point to the location where GEOS is installed",
-            "(for example, if 'geos_c.h' is in '/usr/local/include'",
-            "and 'libgeos_c' is in '/usr/local/lib', then you need to",
-            "set GEOS_DIR to '/usr/local'",
-        ]).format("', '".join(candidates)), RuntimeWarning)
+        warnings.warn(
+            " ".join(
+                [
+                    "Cannot find GEOS library and/or headers in standard locations",
+                    "('{0}'). Please install the corresponding packages using your",
+                    "software management system or set the environment variable",
+                    "GEOS_DIR to point to the location where GEOS is installed",
+                    "(for example, if 'geos_c.h' is in '/usr/local/include'",
+                    "and 'libgeos_c' is in '/usr/local/lib', then you need to",
+                    "set GEOS_DIR to '/usr/local'",
+                ]
+            ).format("', '".join(candidates)),
+            RuntimeWarning,
+        )
     return None
 
 
@@ -91,8 +104,7 @@ def run(self):
 
         # Replace DLL data files and add GEOS build script.
         orig_data_files = self.distribution.data_files
-        self.distribution.data_files = [
-            (".", glob.glob(os.path.join("utils", "*.py")))]
+        self.distribution.data_files = [(".", glob.glob(os.path.join("utils", "*.py")))]
 
         # Run the original `run` method and leave `data_files` as it was found.
         try:
@@ -114,6 +126,7 @@ def run(self):
 else:
     try:
         import numpy
+
         include_dirs.append(numpy.get_include())
     except ImportError as err:
         cmds = ("bdist_wheel", "build", "install")
@@ -142,27 +155,25 @@ def run(self):
 # Define `_geoslib` extension module. It cannot be installed in the
 # `mpl_toolkits.basemap` namespace or `Basemap` objects will not be pickleable.
 ext_modules = [
-    Extension(**{
-        "name":
-            "_geoslib",
-        "sources": [
-            "src/_geoslib.pyx",
-        ],
-        "libraries": [
-            "geos_c",
-        ],
-        "include_dirs":
-            include_dirs,
-        "library_dirs":
-            library_dirs,
-        "runtime_library_dirs":
-            runtime_library_dirs,
-    }),
+    Extension(
+        **{
+            "name": "_geoslib",
+            "sources": [
+                "src/_geoslib.pyx",
+            ],
+            "libraries": [
+                "geos_c",
+            ],
+            "include_dirs": include_dirs,
+            "library_dirs": library_dirs,
+            "runtime_library_dirs": runtime_library_dirs,
+        }
+    ),
 ]
 for ext in ext_modules:
     ext.cython_directives = [
         ("language_level", str(sys.version_info[0])),
-    ][:1 + int(cython_major_version >= 3)]
+    ][: 1 + int(cython_major_version >= 3)]
 
 # Define all the different requirements.
 setup_requires = get_content("requirements-setup.txt", splitlines=True)
@@ -172,95 +183,79 @@ def run(self):
     marker1 = '; python_version == "3.2"'
     marker2 = '; python_version >= "2.7"'
     setup_requires = [
-        item.replace(marker1, "").replace(marker2, "") for item in setup_requires
-        if item.endswith(marker1) or item.endswith(marker2)
-        or "python_version" not in item]
+        item.replace(marker1, "").replace(marker2, "")
+        for item in setup_requires
+        if item.endswith(marker1)
+        or item.endswith(marker2)
+        or "python_version" not in item
+    ]
     install_requires = [
-        item.replace(marker1, "").replace(marker2, "") for item in install_requires
-        if item.endswith(marker1) or item.endswith(marker2)
-        or "python_version" not in item]
+        item.replace(marker1, "").replace(marker2, "")
+        for item in install_requires
+        if item.endswith(marker1)
+        or item.endswith(marker2)
+        or "python_version" not in item
+    ]
 else:
     marker1 = '; python_version == "3.2"'
     setup_requires = [item for item in setup_requires if not item.endswith(marker1)]
     install_requires = [item for item in install_requires if not item.endswith(marker1)]
 
-setup(**{
-    "name":
-        "basemap",
-    "version":
-        get_version("mpl_toolkits.basemap"),
-    "license":
-        "MIT",
-    "description":
-        "Plot data on map projections with matplotlib",
-    "long_description":
-        get_content("README.md"),
-    "long_description_content_type":
-        "text/markdown",
-    "url":
-        "https://matplotlib.org/basemap",
-    "author":
-        "Jeff Whitaker",
-    "author_email":
-        "[email protected]",
-    "maintainer":
-        "Víctor Molina García",
-    "maintainer_email":
-        "[email protected]",
-    "classifiers": [
-        "Development Status :: 5 - Production/Stable",
-        "Intended Audience :: Education",
-        "Intended Audience :: Science/Research",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 3",
-        "Topic :: Scientific/Engineering :: Visualization",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-    "keywords": [
-        "GIS",
-        "maps",
-        "plots",
-    ],
-    "package_dir":
-        {"": "src"},
-    "packages":
-        find_namespace_packages(where="src"),
-    "ext_modules":
-        ext_modules,
-    "data_files":
-        data_files,
-    "python_requires":
-        ", ".join([
-            ">=3.9",
-            "<3.13",
-        ]),
-    "setup_requires":
-        setup_requires,
-    "install_requires":
-        install_requires,
-    "extras_require": {
-        "doc":
-            get_content("requirements-doc.txt", splitlines=True),
-        "lint":
-            get_content("requirements-lint.txt", splitlines=True),
-        "test":
-            get_content("requirements-test.txt", splitlines=True),
-        "owslib":
-            get_content("requirements-owslib.txt", splitlines=True),
-        "pillow":
-            get_content("requirements-pillow.txt", splitlines=True),
-    },
-    "cmdclass": {
-        "sdist": basemap_sdist,
-    },
-    "project_urls": {
-        "Bug Tracker":
-            "https://github.com/matplotlib/basemap/issues",
-        "Documentation":
-            "https://matplotlib.org/basemap/",
-        "Source":
-            "https://github.com/matplotlib/basemap",
-    },
-})
+setup(
+    **{
+        "name": "basemap",
+        "version": get_version("mpl_toolkits.basemap"),
+        "license": "MIT",
+        "description": "Plot data on map projections with matplotlib",
+        "long_description": get_content("README.md"),
+        "long_description_content_type": "text/markdown",
+        "url": "https://matplotlib.org/basemap",
+        "author": "Jeff Whitaker",
+        "author_email": "[email protected]",
+        "maintainer": "Víctor Molina García",
+        "maintainer_email": "[email protected]",
+        "classifiers": [
+            "Development Status :: 5 - Production/Stable",
+            "Intended Audience :: Education",
+            "Intended Audience :: Science/Research",
+            "License :: OSI Approved :: MIT License",
+            "Operating System :: OS Independent",
+            "Programming Language :: Python :: 2",
+            "Programming Language :: Python :: 3",
+            "Topic :: Scientific/Engineering :: Visualization",
+            "Topic :: Software Development :: Libraries :: Python Modules",
+        ],
+        "keywords": [
+            "GIS",
+            "maps",
+            "plots",
+        ],
+        "package_dir": {"": "src"},
+        "packages": find_namespace_packages(where="src"),
+        "ext_modules": ext_modules,
+        "data_files": data_files,
+        "python_requires": ", ".join(
+            [
+                ">=3.9",
+                "<3.13",
+            ]
+        ),
+        "setup_requires": setup_requires,
+        "install_requires": install_requires,
+        "extras_require": {
+            "doc": get_content("requirements-doc.txt", splitlines=True),
+            "lint": get_content("requirements-lint.txt", splitlines=True),
+            "test": get_content("requirements-test.txt", splitlines=True),
+            "owslib": get_content("requirements-owslib.txt", splitlines=True),
+            "pillow": get_content("requirements-pillow.txt", splitlines=True),
+        },
+        "cmdclass": {
+            "sdist": basemap_sdist,
+        },
+        "project_urls": {
+            "Bug Tracker": "https://github.com/matplotlib/basemap/issues",
+            "Documentation": "https://matplotlib.org/basemap/",
+            "Source": "https://github.com/matplotlib/basemap",
+        },
+    }
+)