chore: bump version and change some dependencies.

.github/workflows/python-package-conda.yml

@@ -2,9 +2,9 @@ name: Build and Test
 
 on:
   push:
-    branches: ["main", "1.*"]
+    branches: ["main"]
   pull_request:
-    branches: ["main", "1.*"]
+    branches: ["main"]
 
 jobs:
   build-linux:
@@ -14,10 +14,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v3
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Add conda to system path
         run: |
           # $CONDA is an environment variable pointing to the root of the miniconda directory
@@ -37,7 +37,7 @@ jobs:
           python setup.py develop
       - name: Run tests and collect benchmark
         run: |
-          pytest --verbose -p no:warnings --memray --benchmark-json output.json ./tests/test_perf.py 
+          pytest --verbose -p no:warnings --memray --benchmark-json output.json ./tests/test_perf.py
       - name: Continuous Benchmark
         uses: benchmark-action/[email protected]
         with:
@@ -60,4 +60,3 @@ jobs:
           curl -Os https://uploader.codecov.io/latest/linux/codecov
           chmod +x codecov
           ./codecov -t ${{ secrets.CODECOV_TOKEN }}
-

.github/workflows/python-package.yml

@@ -0,0 +1,45 @@
+# 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: ["macos-latest", "ubuntu-latest", "windows-latest"]
+        python-version: ["3.9", "3.10", "3.11"]
+
+    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: 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

cnmaps/__init__.py

@@ -10,11 +10,11 @@
 from .maps import *  # noqa: F403, F401
 from .drawing import *  # noqa: F403, F401
 
-__version__ = "1.1.4"
+__version__ = "1.1.5"
 
 CARTOPY_DIGIT_VERSION = re.match(r"(\d*\.\d*\.\d*)", cartopy.__version__).group(1)
-if CARTOPY_DIGIT_VERSION < "0.20.0":
-    warnings.warn(("由于Cartopy的版本低于0.20.0, 请将Cartopy的版本升级到0.20.0及以上."))
+if CARTOPY_DIGIT_VERSION < "0.22.0":
+    warnings.warn(("由于Cartopy的版本低于0.22.0, 请将Cartopy的版本升级到0.22.0及以上."))
 
 warnings.filterwarnings("ignore", category=ShapelyDeprecationWarning)