Merge pull request #537 from matplotlib/issue-536

Reformat basemap.cm and avoid six as requirement

Author: molinav

.gitattributes

@@ -0,0 +1,18 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto eol=lf
+
+# Explicitly declare text files you want to always be normalised and
+# converted to native line endings on checkout.
+*.py text
+*.pyx text
+
+# Denote all files that are truly binary and should not be modified.
+*.bin binary
+*.dat binary
+*.dbf binary
+*.dem binary
+*.gz binary
+*.jpg binary
+*.nc binary
+*.shp binary
+*.shx binary

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

@@ -29,14 +29,56 @@ jobs:
           name: checkout
           path: .
 
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version:
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
+      max-parallel: 3
+      fail-fast: false
+    needs: checkout
+    container: "pylegacy/python:${{ matrix.python-version }}-debian-8"
+    steps:
+      -
+        name: Download checkout
+        uses: actions/download-artifact@v1
+        with:
+          name: checkout
+          path: .
+      -
+        name: Install lint requirements
+        run: |
+          cd ${{ env.PKGDIR }}
+          pip install -r requirements-lint.txt
+      -
+        name: Install library requirements
+        run: |
+          cd ${{ env.PKGDIR }}
+          pip install --prefer-binary -r requirements.txt
+      -
+        name: Run Flake8
+        run: |
+          cd ${{ env.PKGDIR }}
+          if [ -x "$(command -v flake8)" ]; then
+              flake8 src/mpl_toolkits/basemap/cm.py;
+          fi
+      -
+        name: Run PyLint
+        run: |
+          cd ${{ env.PKGDIR }}
+          if [ -x "$(command -v pylint)" ]; then
+              pylint src/mpl_toolkits/basemap/cm.py;
+          fi
+
   build-geos:
     strategy:
       matrix:
         arch:
           ["x64", "x86"]
       max-parallel: 2
       fail-fast: false
-    needs: checkout
+    needs: lint
     runs-on: ubuntu-latest
     container: "pylegacy/${{ matrix.arch }}-python:3.6-debian-4"
     steps:
@@ -232,6 +274,7 @@ jobs:
         name: Test package
         run: |
           python -c "from mpl_toolkits.basemap import Basemap"
+          python -c "from mpl_toolkits.basemap import cm"
 
   upload:
     strategy:

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

@@ -29,6 +29,59 @@ jobs:
           name: checkout
           path: .
 
+  lint:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version:
+          ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
+      max-parallel: 3
+      fail-fast: false
+    needs: checkout
+    steps:
+      -
+        name: Download checkout
+        uses: actions/download-artifact@v1
+        with:
+          name: checkout
+          path: .
+      -
+        name: Set Python
+        uses: actions/setup-python@v2
+        with:
+          architecture: ${{ matrix.arch }}
+          python-version: ${{ matrix.python-version }}
+      -
+        name: Set Python base packages
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+      -
+        name: Install lint requirements
+        run: |
+          cd ${{ env.PKGDIR }}
+          python -m pip install -r requirements-lint.txt
+      -
+        name: Install library requirements
+        run: |
+          cd ${{ env.PKGDIR }}
+          pip install --prefer-binary -r requirements.txt
+      -
+        name: Run Flake8
+        run: |
+          cd ${{ env.PKGDIR }}
+          if (Get-Command flake8 -errorAction SilentlyContinue)
+          {
+              flake8 src/mpl_toolkits/basemap/cm.py;
+          }
+      -
+        name: Run PyLint
+        run: |
+          cd ${{ env.PKGDIR }}
+          if (Get-Command pylint -errorAction SilentlyContinue)
+          {
+              pylint src/mpl_toolkits/basemap/cm.py;
+          }
+
   build-geos:
     strategy:
       matrix:
@@ -51,7 +104,7 @@ jobs:
             cmake-version: "3.13.2"
       max-parallel: 4
       fail-fast: false
-    needs: checkout
+    needs: lint
     runs-on: windows-latest
     steps:
       -
@@ -194,6 +247,7 @@ jobs:
         name: Test package
         run: |
           python -c "from mpl_toolkits.basemap import Basemap"
+          python -c "from mpl_toolkits.basemap import cm"
 
   upload:
     strategy:

CHANGELOG.md

@@ -12,6 +12,9 @@ https://semver.org/spec/v2.0.0.html
 
 ## [Unreleased]
 
+### Removed
+- Remove dependency on `six` (solves issue [#536]).
+
 ## [1.3.2] - 2022-02-10
 
 ### Added
@@ -889,6 +892,8 @@ https://semver.org/spec/v2.0.0.html
 - Fix glitches in drawing of parallels and meridians.
 
 
+[#536]:
+https://github.com/matplotlib/basemap/issues/536
 [#533]:
 https://github.com/matplotlib/basemap/issues/533
 [#532]:

README.md

@@ -12,7 +12,6 @@ Basic requirements are the following:
 * [numpy](https://github.com/numpy/numpy)
 * [pyproj](https://github.com/pyproj4/pyproj)
 * [pyshp](https://github.com/GeospatialPython/pyshp)
-* [six](https://github.com/benjaminp/six)
 
 Optional requirements include:
 

packages/basemap/.pylintrc

@@ -413,8 +413,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,
-                            past.builtins,
+redefining-builtins-modules=past.builtins,
                             future.builtins,
                             builtins,
                             io

packages/basemap/requirements-doc.txt

@@ -1,2 +1 @@
-six >= 1.10, < 1.16; python_version >= "3.5"
 sphinx >= 3.0, < 3.4; python_version >= "3.5"

packages/basemap/requirements.txt

@@ -1,7 +1,5 @@
 basemap_data >= 1.3, < 1.4
 
-six >= 1.10, < 1.16
-
 numpy >= 1.11, < 1.12; python_version == "2.6"
 numpy >= 1.16, < 1.17; python_version == "2.7"
 numpy >= 1.11, < 1.12; python_version == "3.2"