fix: #114 (#115)

* fix: #114

* chore: bump version

* chore: limit python version.

* chore: deprecated python-package-conda.yml

* chore: exclude win for memray

.github/workflows/perf-test.yml

@@ -0,0 +1,67 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python package
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    name: Build test on (${{ matrix.python-version }}, ${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-latest"]
+        python-version: ["3.9"]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Set Python default encoding to utf-8 on Windows
+        run: |
+          echo "import sys; sys.stdout.reconfigure(encoding='utf-8')" > sitecustomize.py
+        if: matrix.os == 'windows-latest'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install poetry
+          poetry install
+      - name: Lint with flake8
+        run: |
+          # stop the build if there are Python syntax errors or undefined names
+          poetry run flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+          poetry run flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+      - name: Run tests and collect benchmark
+        run: |
+          poetry run pytest --verbose -p no:warnings --memray --benchmark-json output.json ./tests/test_perf.py
+      - name: Continuous Benchmark
+        uses: benchmark-action/[email protected]
+        with:
+          name: cnmaps Benchmark
+          tool: "pytest"
+          output-file-path: output.json
+          github-token: ${{ secrets.CI_TOKEN }}
+          gh-repository: "github.com/cnmetlab/cnmaps"
+          auto-push: true
+          alert-threshold: "150%"
+          comment-on-alert: true
+          fail-on-alert: false
+          benchmark-data-dir-path: "performance/"
+          alert-comment-cc-users: "@clarmy"
+      - name: Test with pytest
+        run: |
+          poetry run pytest --verbose -p no:warnings --cov ./tests/test_drawing.py ./tests/test_geo.py ./tests/test_map.py ./tests/test_issues.py
+      - name: Upload coverage reports to Codecov
+        run: |
+          curl -Os https://uploader.codecov.io/latest/linux/codecov
+          chmod +x codecov
+          ./codecov -t ${{ secrets.CODECOV_TOKEN }}

cnmaps/__init__.py

@@ -10,7 +10,7 @@
 from .maps import *  # noqa: F403, F401
 from .drawing import *  # noqa: F403, F401
 
-__version__ = "1.1.7"
+__version__ = "1.1.8"
 
 CARTOPY_DIGIT_VERSION = re.match(r"(\d*\.\d*\.\d*)", cartopy.__version__).group(1)
 if CARTOPY_DIGIT_VERSION < "0.22.0":

cnmaps/drawing.py

@@ -309,7 +309,11 @@ def draw_maps(maps: Union[list, GeoDataFrame], ax=None, **kwargs):
         2  中华人民共和国   北京市  北京市  朝阳区  区县  高德  陆地  MULTIPOLYGON (((116.55172 40.05812, 116.55132 ...
     """
     if isinstance(maps, list):
-        geometries = [m["geometry"] for m in maps]
+        try:
+            geometries = [m["geometry"] for m in maps]
+        except TypeError:
+            geometries = maps
+
     elif isinstance(maps, GeoDataFrame):
         geometries = [m["geometry"] for _, m in maps.iterrows()]
 

environment.yml

@@ -1,6 +1,7 @@
 channels:
   - conda-forge
 dependencies:
+  - python<3.12
   - matplotlib>=3.4.2
   - Cartopy>=0.21.0
   - Shapely>=1.8.0,<2.0.0