Merge branch 'issue-project-structure' into develop

Author: molinav

.github/workflows/build.yml

@@ -1,16 +1,10 @@
 on:
   push:
     paths:
-      - ".github/workflows/**"
-      - "packages/basemap/**"
-      - "packages/basemap_data/**"
-      - "packages/basemap_data_hires/**"
+      - "**"
   pull_request:
     paths:
-      - ".github/workflows/**"
-      - "packages/basemap/**"
-      - "packages/basemap_data/**"
-      - "packages/basemap_data_hires/**"
+      - "**"
   workflow_dispatch:
 
 jobs:
@@ -30,16 +24,16 @@ jobs:
 
       - name: Build data sdist and wheel
         run: |
-          cd packages/${{ matrix.package }}
+          cd data/${{ matrix.package }}
           python -m pip install build wheel
           python -m build
 
       - name: Upload data sdist and wheel
         uses: actions/upload-artifact@v4
         with:
           path: |
-            packages/${{ matrix.package }}/dist/*.tar.gz
-            packages/${{ matrix.package }}/dist/*.whl
+            data/${{ matrix.package }}/dist/*.tar.gz
+            data/${{ matrix.package }}/dist/*.whl
           name: dist-${{ matrix.package }}
 
   build_sdist:
@@ -55,19 +49,18 @@ jobs:
 
       - name: Build basemap sdist
         run: |
-          cd packages/basemap
           python -m pip install build
           python -m build --sdist
 
       - name: Upload basemap sdist
         uses: actions/upload-artifact@v4
         with:
-          path: packages/basemap/dist/*.tar.gz
+          path: dist/*.tar.gz
           name: dist-basemap-sdist
 
   build_wheels:
     name: Build wheels
-    needs: [build_data, build_sdist]
+    needs: [build_sdist]
     strategy:
       matrix:
         os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
@@ -133,8 +126,9 @@ jobs:
           CIBW_BUILD_VERBOSITY: 1
           CIBW_SKIP: "*-musllinux_*"
           CIBW_BEFORE_ALL: "python {project}/.github/workflows/run_before_all.py"
+          CIBW_BEFORE_TEST: "python -m pip install {project}/data/basemap_data {project}/data/basemap_data_hires"
           CIBW_TEST_EXTRAS: "test"
-          CIBW_TEST_COMMAND: "python -m pytest {project}/packages/basemap"
+          CIBW_TEST_COMMAND: "python -m pytest {project}/test"
           CIBW_ENVIRONMENT: >-
             GEOS_VERSION="3.6.5"
             GEOS_DIR="$(pwd)/extern"
@@ -213,6 +207,9 @@ jobs:
           # Get Python version.
           IMPL=cp$(python -c "import sys; print('{0}{1}'.format(*sys.version_info[:2]))")
 
+          # Install data packages.
+          python -m pip install ./data_packages/*.whl
+
           # Install basemap wheel matching current Python version.
           WHEEL=$(find ./wheels -name "*-${IMPL}-${IMPL}*.whl" | head -1)
           if [ -n "${WHEEL}" ]; then
@@ -222,30 +219,25 @@ jobs:
             exit 1
           fi
 
-          # Install basemap data packages.
-          python -m pip install ./data_packages/*.whl
-
       - name: Install docs requirements
         run: |
-          cd packages/basemap
           python -m pip install -r dep/requirements-doc.txt
 
       - name: Run sphinx
         run: |
-          cd packages/basemap
-          python -m sphinx doc/source public
+          python -m sphinx -j auto doc/source public
 
       - name: Upload docs artifacts
         uses: actions/upload-artifact@v4
         with:
           name: docs
-          path: packages/basemap/public
+          path: public
 
       - name: Upload github-pages artifact
         uses: actions/upload-pages-artifact@v3
         with:
           name: github-pages
-          path: packages/basemap/public
+          path: public
 
   pages:
     name: Deploy docs
@@ -265,7 +257,7 @@ jobs:
 
   upload:
     name: Upload packages
-    needs: [build_data, build_sdist, build_wheels, check]
+    needs: [check]
     runs-on: ubuntu-22.04
     environment: PyPI
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')

.github/workflows/run_before_all.py

@@ -6,7 +6,7 @@
 
 HERE = os.path.abspath(__file__)
 ROOT = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
-sys.path.insert(0, os.path.join(ROOT, "packages", "basemap"))
+sys.path.insert(0, os.path.join(ROOT))
 import utils  # noqa: E402  # pylint: disable=imports
 
 

.gitignore

@@ -2,8 +2,8 @@
 build
 dist
 *.egg-info
-*.pyc
-*.pyd
+*.py[cod]
+*.dll
 *.so
 
 htmlcov
@@ -33,8 +33,7 @@ Thumbs.db
 
 # Things specific to this project.
 *.pickle
-examples/*.png
-packages/basemap/doc/examples
-packages/basemap/doc/users/installing.rst
-packages/basemap/doc/_static/matplotlibrc
-packages/basemap/doc/_templates/gallery.html
+doc/build
+doc/examples/*.png
+doc/source/_static/matplotlibrc
+doc/source/_templates/gallery.html

packages/basemap/.pylintrc renamed to .pylintrc

@@ -1,3 +1,7 @@
+include CHANGELOG.md
+include LICENSE
+include LICENSE.geos
+include README.md
 include .pylintrc
 include pyproject.toml
 include dep/requirements*.txt
@@ -6,7 +10,9 @@ global-exclude *.py[cod]
 global-exclude *.dll
 global-exclude *.so
 
+recursive-exclude data *
 recursive-include doc *
 recursive-exclude doc/build *
+recursive-exclude doc/examples *
 recursive-include test *
 recursive-include utils *.py