Fix custom sdist command

Author: molinav

.github/workflows/basemap-for-windows.yml

@@ -147,7 +147,7 @@ jobs:
           $env:GEOS_DIR = "extern"
           $env:NUMPY_INCLUDE_PATH = "extern/include"
           pip install -r requirements-setup.txt
-          python setup.py bdist_wheel
+          python setup.py sdist bdist_wheel
       -
         name: Upload build artifacts
         uses: actions/upload-artifact@v1
@@ -205,6 +205,7 @@ jobs:
           TWINE_REPOSITORY_URL: "${{ secrets.PYPI_REPOSITORY_URL }}"
         run: |
           python -m twine check                                               `
+              ${{ env.PKGDIR }}/dist/*.zip                                    `
               ${{ env.PKGDIR }}/dist/*-win*.whl
           python -m twine upload --skip-existing                              `
               ${{ env.PKGDIR }}/dist/*-win*.whl

packages/basemap/setup.py

@@ -64,15 +64,28 @@ def get_geos_install_prefix():
 class basemap_sdist(sdist):
     """Custom `sdist` so that it will not pack DLLs on Windows if present."""
 
-    def finalize_options(self):
-        """Call `finalize_options` after cleaning `data_files` and reset."""
-
-        self.formats = ["zip"]
+    def run(self):
+        """Custom `run` command."""
 
+        # Replace DLL data files and add GEOS build script.
         orig_data_files = self.distribution.data_files
-        self.distribution.data_files = []
-        sdist.finalize_options(self)
-        self.distribution.data_files = orig_data_files
+        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:
+            sdist.run(self)
+        finally:
+            self.distribution.data_files = orig_data_files
+
+    def initialize_options(self):
+        """Call `initialize_options` and then set zip as default format."""
+
+        sdist.initialize_options(self)
+        self._default_to_zip()
+
+    def _default_to_zip(self):
+        self.formats = ["zip"]
 
 
 # Initialise include and library dirs.

packages/basemap_data/setup.py

@@ -26,11 +26,14 @@ def get_content(name, splitlines=False):
 class basemap_data_sdist(sdist):
     """Custom `sdist` so that it will force to save in zip format."""
 
-    def finalize_options(self):
-        """Enforce zip format before calling `finalize_options`."""
+    def initialize_options(self):
+        """Call `initialize_options` and then set zip as default format."""
 
+        sdist.initialize_options(self)
+        self._default_to_zip()
+
+    def _default_to_zip(self):
         self.formats = ["zip"]
-        sdist.finalize_options(self)
 
 
 # Define some helper lists.

packages/basemap_data_hires/setup.py

@@ -26,11 +26,14 @@ def get_content(name, splitlines=False):
 class basemap_data_hires_sdist(sdist):
     """Custom `sdist` so that it will force to save in zip format."""
 
-    def finalize_options(self):
-        """Enforce zip format before calling `finalize_options`."""
+    def initialize_options(self):
+        """Call `initialize_options` and then set zip as default format."""
 
+        sdist.initialize_options(self)
+        self._default_to_zip()
+
+    def _default_to_zip(self):
         self.formats = ["zip"]
-        sdist.finalize_options(self)
 
 
 # Define some helper lists.