.all-contributorsrc

@@ -175,7 +175,8 @@
       "contributions": [
         "infra",
         "code",
-        "platform"
+        "platform",
+        "doc"
       ]
     },
     {
@@ -562,6 +563,35 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "molinav",
+      "name": "Víctor Molina García",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9979942?v=4",
+      "profile": "https://github.com/molinav",
+      "contributions": [
+        "platform"
+      ]
+    },
+    {
+      "login": "skogler",
+      "name": "Samuel Kogler",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1032405?v=4",
+      "profile": "https://github.com/skogler",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "shadchin",
+      "name": "Alexander Shadchin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61256?v=4",
+      "profile": "https://github.com/shadchin",
+      "contributions": [
+        "bug",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7

.cirrus.yml

@@ -0,0 +1,39 @@
+build_and_store_wheels: &BUILD_AND_STORE_WHEELS
+  install_cibuildwheel_script:
+    - python -m pip install cibuildwheel==2.11.2
+  run_cibuildwheel_script:
+    - cibuildwheel
+  wheels_artifacts:
+    path: "wheelhouse/*"
+
+
+macos_task:
+  skip: $CIRRUS_BRANCH =~ 'pull/.*'
+  name: Build macOS arm64 wheels.
+  macos_instance:
+    image: ghcr.io/cirruslabs/macos-monterey-xcode
+  env:
+    PATH: /opt/homebrew/opt/python@3.10/bin:$PATH
+    CIBW_SKIP: "*musllinux*"
+    CIBW_ARCHS_MACOS: arm64
+    CIBW_ENVIRONMENT_MACOS:
+      PROJ_WHEEL=true
+      PROJ_NETWORK=ON
+      PROJ_VERSION=9.1.0
+      PROJ_DIR=${CIRRUS_WORKING_DIR}/pyproj/proj_dir
+      BUILD_PREFIX=${CIRRUS_WORKING_DIR}/build/
+      MACOSX_DEPLOYMENT_TARGET=10.9
+      CMAKE_OSX_ARCHITECTURES='arm64'
+      LDFLAGS="${LDFLAGS} -Wl,-rpath,${CIRRUS_WORKING_DIR}/pyproj/proj_dir/lib"
+    CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
+    CIBW_TEST_REQUIRES: cython pytest oldest-supported-numpy pandas xarray
+    CIBW_BEFORE_TEST: python -m pip install shapely || echo "Shapely install failed"
+    CIBW_TEST_COMMAND: >
+      pyproj -v &&
+      python -c "import pyproj; pyproj.Proj(init='epsg:4269')"  &&
+      cp -r {package}/test . &&
+      python -m pytest test -v -s
+  install_pre_requirements_script:
+    - brew install python@3.10
+    - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python
+  <<: *BUILD_AND_STORE_WHEELS

.flake8

@@ -1,7 +1,11 @@
 [flake8]
 max-line-length = 88
 ignore =
-    C408 # Unnecessary dict/list/tuple call - rewrite as a literal
-    E203 # whitespace before ':' - doesn't work well with black
-    E225 # missing whitespace around operator - let black worry about that
-    W503 # line break occurred before a binary operator - let black worry about that
+    # Unnecessary dict/list/tuple call - rewrite as a literal
+    C408
+    # whitespace before ':' - doesn't work well with black
+    E203
+    # missing whitespace around operator - let black worry about that
+    E225
+    # line break occurred before a binary operator - let black worry about that
+    W503

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/build_docs.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
 
@@ -38,21 +38,21 @@ jobs:
           sphinx-build -b html docs/ docs/_build/
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@v4
         if: ${{ github.event_name == 'release' }}
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: docs/_build/
-          CLEAN: false
-          TARGET_FOLDER: ${{ github.ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          folder: docs/_build/
+          clean: false
+          target-folder: ${{ github.ref }}
 
       - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@v4
         if: ${{ github.event_name == 'push' }}
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: docs/_build/
-          CLEAN: false
-          TARGET_FOLDER: latest
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          folder: docs/_build/
+          clean: false
+          target-folder: latest

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
     name: Make sdist
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup Conda
         uses: s-weigand/setup-conda@v1
@@ -45,7 +45,7 @@ jobs:
           twine check --strict dist/*
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: ./dist/*.tar.gz
           retention-days: 5
@@ -75,11 +75,16 @@ jobs:
           triplet: "x64-windows"
           vcpkg_cache: "c:\\vcpkg\\installed"
           vcpkg_logs: "c:\\vcpkg\\buildtrees\\**\\*.log"
+        - os: "windows-2019"
+          arch: "auto32"
+          triplet: "x86-windows"
+          vcpkg_cache: "c:\\vcpkg\\installed"
+          vcpkg_logs: "c:\\vcpkg\\buildtrees\\**\\*.log"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
 
 
       - name: Cache vcpkg
@@ -106,7 +111,7 @@ jobs:
           cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.9.0
+        uses: pypa/cibuildwheel@v2.11.2
         env:
           CIBW_SKIP: "*musllinux* pp*-win*"
           CIBW_ARCHS: ${{ matrix.arch }}
@@ -133,15 +138,15 @@ jobs:
           CIBW_BEFORE_ALL_LINUX: bash ./ci/proj-compile-wheels.sh
           CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
           CIBW_TEST_REQUIRES: cython pytest oldest-supported-numpy pandas xarray
-          CIBW_BEFORE_TEST: python -m pip install shapely~=1.7.1 || echo "Shapely install failed"
+          CIBW_BEFORE_TEST: python -m pip install shapely || echo "Shapely install failed"
           CIBW_TEST_COMMAND: >
             pyproj -v &&
             python -c "import pyproj; pyproj.Proj(init='epsg:4269')"  &&
             cp -r {package}/test . &&
             python -m pytest test -v -s
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
           retention-days: 5
@@ -153,13 +158,13 @@ jobs:
     # release on every tag
     if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: artifact
           path: dist
 
       - name: Upload Wheels to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.4.2
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

.github/workflows/test_proj_latest.yaml

@@ -23,8 +23,8 @@ jobs:
       PROJ_DIR: ${{ github.workspace }}/proj_install
       PROJ_DATA: ${{ github.workspace }}/proj_install/share/proj
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
             python-version: 3.9
       - name: Install PROJ
@@ -46,24 +46,32 @@ jobs:
       - name: Test
         shell: bash
         run: |
-          py.test --cov-report term-missing --cov=pyproj --cov-report xml
+          python -m pytest --cov-report term-missing --cov=pyproj --cov-report xml
 
       - name: Test Network
         shell: bash
         env:
           PROJ_NETWORK: ON
         run: |
-          py.test
+          python -m pytest
 
       - name: Test Global Context
         shell: bash
         env:
           PYPROJ_GLOBAL_CONTEXT: ON
         run: |
-          py.test
+          python -m pytest
+
+      - name: Test Network & Global Context
+        shell: bash
+        env:
+          PROJ_NETWORK: ON
+          PYPROJ_GLOBAL_CONTEXT: ON
+        run: |
+          python -m pytest
 
       - name: Test Grids
         shell: bash
         run: |
           $PROJ_DIR/bin/projsync --quiet --bbox -175,0,-50,85
-          py.test
+          python -m pytest

.github/workflows/tests.yaml

@@ -19,11 +19,11 @@ jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
             python-version: 3.9
-      - uses: pre-commit/action@v2.0.0
+      - uses: pre-commit/action@v3.0.0
       - name: Install mypy
         run: |
           python -m pip install mypy types-certifi
@@ -47,7 +47,7 @@ jobs:
           - python-version: '3.9'
             proj-version: '9.0.1'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update
         run: |
@@ -96,6 +96,15 @@ jobs:
           . testenv/bin/activate
           python -m pytest
 
+      - name: Test Network & Global Context
+        shell: bash
+        env:
+          PROJ_NETWORK: ON
+          PYPROJ_GLOBAL_CONTEXT: ON
+        run: |
+          . testenv/bin/activate
+          python -m pytest
+
       - name: Test Grids
         shell: bash
         run: |
@@ -111,16 +120,16 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         python-implementation: [python]
-        proj-version: ['*']
+        proj-version: ['9.1.0']
         include:
           - os: ubuntu-latest
             python-version: '*'
             python-implementation: pypy
-            proj-version: '*'
+            proj-version: '9.1.0'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup Conda
         uses: s-weigand/setup-conda@v1
@@ -175,6 +184,8 @@ jobs:
       - name: Test
         shell: bash
         if: matrix.python-implementation == 'pypy'
+        env:
+          PROJ_NETWORK: OFF
         run: |
           source activate test
           python -m pytest
@@ -190,13 +201,25 @@ jobs:
       - name: Test Global Context
         shell: bash
         env:
+          PROJ_NETWORK: OFF
+          PYPROJ_GLOBAL_CONTEXT: ON
+        run: |
+          source activate test
+          python -m pytest
+
+      - name: Test Network & Global Context
+        shell: bash
+        env:
+          PROJ_NETWORK: ON
           PYPROJ_GLOBAL_CONTEXT: ON
         run: |
           source activate test
           python -m pytest
 
       - name: Test Grids
         shell: bash
+        env:
+          PROJ_NETWORK: OFF
         run: |
           source activate test
           projsync --quiet --bbox -175,0,-50,85
@@ -211,4 +234,4 @@ jobs:
           sphinx-build -b html docs/ docs/_build/
           sphinx-build -b man docs/ docs/_build/
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3