Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: pyproj4/pyproj
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.4.0
Choose a base ref
...
head repository: pyproj4/pyproj
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.4.1
Choose a head ref

Commits on Sep 11, 2022

  1. Copy the full SHA
    8aca8da View commit details
  2. Copy the full SHA
    f202662 View commit details

Commits on Sep 17, 2022

  1. Copy the full SHA
    8312094 View commit details
  2. Copy the full SHA
    2c0abe3 View commit details

Commits on Sep 22, 2022

  1. Copy the full SHA
    e88393c View commit details

Commits on Sep 27, 2022

  1. fix a few typos (#1153)

    ocefpaf authored Sep 27, 2022
    Copy the full SHA
    117d1da View commit details
  2. Update @ocefpaf as a contributor

    snowman2 committed Sep 27, 2022
    Copy the full SHA
    bc7805c View commit details

Commits on Oct 3, 2022

  1. Fix/20221203/fixed dist info requirement for deploy (#1156)

    * fix(setup.cfg): Fixed dependency that would require dist-info folder to be present in the project to load __version__ variable with current version of the code
    
    * chore: Update history.rst to reflect bug fix, changed version to 3.4.1.dev1
    Scoppio authored Oct 3, 2022
    Copy the full SHA
    5723f37 View commit details

Commits on Oct 7, 2022

  1. Copy the full SHA
    3009c5c View commit details

Commits on Oct 11, 2022

  1. Copy the full SHA
    837d965 View commit details

Commits on Oct 14, 2022

  1. Copy the full SHA
    b5166bc View commit details

Commits on Oct 28, 2022

  1. Copy the full SHA
    2a62e36 View commit details

Commits on Nov 1, 2022

  1. Copy the full SHA
    7e5993b View commit details
  2. Add @molinav as a contributor

    snowman2 committed Nov 1, 2022
    Copy the full SHA
    1365341 View commit details
  3. Copy the full SHA
    205c5a5 View commit details
  4. Copy the full SHA
    7fb7433 View commit details

Commits on Nov 2, 2022

  1. Copy the full SHA
    8cfb95b View commit details

Commits on Nov 12, 2022

  1. Copy the full SHA
    07bf470 View commit details

Commits on Nov 13, 2022

  1. Fix memory leak in CRS.to_authority/CRS.list_authority (#1178)

    List elements were not properly disposed of when iterating the results of proj_identify. This fixes this and simplifies the cleanup logic.
    skogler authored Nov 13, 2022
    Copy the full SHA
    74cd9e7 View commit details
  2. Add @skogler as a contributor

    snowman2 committed Nov 13, 2022
    Copy the full SHA
    528ebca View commit details
  3. Copy the full SHA
    329f201 View commit details

Commits on Nov 14, 2022

  1. Copy the full SHA
    55415b3 View commit details

Commits on Nov 27, 2022

  1. Copy the full SHA
    f0172f8 View commit details
  2. Copy the full SHA
    d0fc958 View commit details
  3. Bump actions/upload-artifact from 2 to 3 (#1185)

    Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
    - [Release notes](https://github.com/actions/upload-artifact/releases)
    - [Commits](actions/upload-artifact@v2...v3)
    
    ---
    updated-dependencies:
    - dependency-name: actions/upload-artifact
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Nov 27, 2022
    Copy the full SHA
    878c838 View commit details
  4. Bump pypa/cibuildwheel from 2.9.0 to 2.11.2 (#1186)

    Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.9.0 to 2.11.2.
    - [Release notes](https://github.com/pypa/cibuildwheel/releases)
    - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md)
    - [Commits](pypa/cibuildwheel@v2.9.0...v2.11.2)
    
    ---
    updated-dependencies:
    - dependency-name: pypa/cibuildwheel
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Nov 27, 2022
    Copy the full SHA
    1e94248 View commit details

Commits on Nov 28, 2022

  1. Fix length options (#1187)

    shadchin authored Nov 28, 2022
    Copy the full SHA
    7fcd1b3 View commit details
  2. Add @shadchin as a contributor

    snowman2 committed Nov 28, 2022
    Copy the full SHA
    ff82248 View commit details

Commits on Dec 6, 2022

  1. Copy the full SHA
    1834213 View commit details

Commits on Dec 10, 2022

  1. Copy the full SHA
    5424b97 View commit details
  2. Copy the full SHA
    615a546 View commit details
  3. MNT: version 3.4.1rc0

    snowman2 committed Dec 10, 2022
    Copy the full SHA
    e972e19 View commit details

Commits on Dec 13, 2022

  1. MNT: version 3.4.1

    snowman2 committed Dec 13, 2022
    Copy the full SHA
    2910db5 View commit details
  2. DOC: update changelog

    snowman2 committed Dec 13, 2022
    Copy the full SHA
    4faef17 View commit details
32 changes: 31 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -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
39 changes: 39 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 8 additions & 4 deletions .flake8
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
26 changes: 13 additions & 13 deletions .github/workflows/build_docs.yaml
Original file line number Diff line number Diff line change
@@ -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
23 changes: 14 additions & 9 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
20 changes: 14 additions & 6 deletions .github/workflows/test_proj_latest.yaml
Original file line number Diff line number Diff line change
@@ -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
41 changes: 32 additions & 9 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -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
Loading