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.3.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 Nov 18, 2021

  1. Copy the full SHA
    75b5d04 View commit details

Commits on Dec 3, 2021

  1. minor fix to crs docs

    bjlittle committed Dec 3, 2021
    Copy the full SHA
    835f08b View commit details

Commits on Dec 6, 2021

  1. Merge pull request #1004 from bjlittle/minor-docs

    minor fix to crs doc-strings
    snowman2 authored Dec 6, 2021
    Copy the full SHA
    2d3cc7e View commit details
  2. REF: master -> main

    snowman2 committed Dec 6, 2021
    Copy the full SHA
    76c3836 View commit details

Commits on Jan 11, 2022

  1. Copy the full SHA
    cb7d77a View commit details
  2. Merge pull request #1013 from Kirill888/fix-1012

    Correct type annotation for AreaofUse.bounds
    snowman2 authored Jan 11, 2022
    Copy the full SHA
    3dfc2f3 View commit details

Commits on Jan 12, 2022

  1. Add @Kirill888 as a contributor

    snowman2 committed Jan 12, 2022
    Copy the full SHA
    24eade7 View commit details

Commits on Jan 24, 2022

  1. crs.py: remove @AbstractMethod decorator

    According to the documentation for the `@abstractmethod` decorator:
    
    > Using this decorator requires that the class's metaclass is
    > ABCMeta or is derived from it.
    
    (source: https://docs.python.org/3/library/abc.html#abc.abstractmethod)
    
    Since `CustomConstructorCRS` and `CRS` are not defined as abstract
    classes, using the `@abstractmethod` decorator does not actually do
    anything and should be removed.
    hemberger committed Jan 24, 2022
    Copy the full SHA
    3be3753 View commit details

Commits on Jan 26, 2022

  1. Merge pull request #1018 from hemberger/fix-abc

    crs.py: remove @AbstractMethod decorator
    snowman2 authored Jan 26, 2022
    Copy the full SHA
    ce9de36 View commit details
  2. Add @hemberger as a contributor

    snowman2 committed Jan 26, 2022
    Copy the full SHA
    eccc32a View commit details
  3. Copy the full SHA
    3b45929 View commit details
  4. Copy the full SHA
    63c22c0 View commit details

Commits on Jan 28, 2022

  1. Copyright year to 2022

    snowman2 committed Jan 28, 2022
    Copy the full SHA
    acaee8e View commit details

Commits on Feb 13, 2022

  1. Copy the full SHA
    8f0e1f7 View commit details

Commits on Mar 6, 2022

  1. Copy the full SHA
    e7c4896 View commit details
  2. Copy the full SHA
    7d00218 View commit details
  3. Merge pull request #1030 from snowman2/conda_windows

    BUG: get_data_dir support for conda Windows enviroments
    snowman2 authored Mar 6, 2022
    Copy the full SHA
    a8d1c0d View commit details

Commits on Mar 25, 2022

  1. Copy the full SHA
    220724a View commit details

Commits on Mar 26, 2022

  1. Copy the full SHA
    5cd3d7f View commit details

Commits on Mar 27, 2022

  1. Add @martinfleis as a contributor

    snowman2 committed Mar 27, 2022
    Copy the full SHA
    64b8dcf View commit details

Commits on Mar 29, 2022

  1. Copy the full SHA
    b8bc61c View commit details

Commits on Mar 31, 2022

  1. Copy the full SHA
    1ca11c2 View commit details
  2. Copy the full SHA
    0891756 View commit details
  3. Merge pull request #1047 from orontee/main

    BUG: Complete database stub file with query_utm_crs_info() signature
    snowman2 authored Mar 31, 2022
    Copy the full SHA
    43e49b7 View commit details
  4. Add @orontee as a contributor

    snowman2 committed Mar 31, 2022
    Copy the full SHA
    aee94f8 View commit details

Commits on Apr 1, 2022

  1. Copy the full SHA
    8cccf70 View commit details
  2. Copy the full SHA
    6cedec8 View commit details
  3. Copy the full SHA
    a463636 View commit details
  4. CI: publish wheels to pypi

    snowman2 committed Apr 1, 2022
    Copy the full SHA
    b0ed4f7 View commit details

Commits on Apr 2, 2022

  1. CI: Make & publish sdist

    snowman2 committed Apr 2, 2022
    Copy the full SHA
    d2d266a View commit details
  2. Copy the full SHA
    9a013e8 View commit details
  3. Add @iboates as a contributor

    snowman2 committed Apr 2, 2022
    Copy the full SHA
    46f8531 View commit details

Commits on Apr 5, 2022

  1. Copy the full SHA
    a5cdc60 View commit details

Commits on Apr 15, 2022

  1. Copy the full SHA
    57ecfc8 View commit details
  2. Copy the full SHA
    5a86caf View commit details

Commits on Apr 21, 2022

  1. version 3.3.1rc0

    snowman2 committed Apr 21, 2022
    Copy the full SHA
    7e734ff View commit details

Commits on Apr 22, 2022

  1. version 3.3.1

    snowman2 committed Apr 22, 2022
    Copy the full SHA
    e097af8 View commit details
  2. Copy the full SHA
    fa625e1 View commit details
  3. Copy the full SHA
    dfb140d View commit details

Commits on Apr 23, 2022

  1. Copy the full SHA
    54ad878 View commit details
  2. Copy the full SHA
    7ffcb2e View commit details

Commits on Apr 24, 2022

  1. Copy the full SHA
    8ff8d50 View commit details
  2. Copy the full SHA
    40e3d6d View commit details

Commits on Apr 28, 2022

  1. CI: Update wheels event name

    snowman2 committed Apr 28, 2022
    Copy the full SHA
    cd229d9 View commit details
  2. Copy the full SHA
    f031f5f View commit details

Commits on May 11, 2022

  1. Copy the full SHA
    659852e View commit details

Commits on May 12, 2022

  1. Copy the full SHA
    e0b7cd0 View commit details

Commits on May 18, 2022

  1. CLN: Remove deprecated 'skip_equivalent' kwarg from transformers and …

    …'errcheck' kwarg from CRS.from_cf (#1077)
    snowman2 authored May 18, 2022
    Copy the full SHA
    9003784 View commit details
  2. TST: handle empty full_name in test_coordinate_operation_grids__alter…

    …native_grid_name with PROJ 9.1+ (#1080)
    snowman2 authored May 18, 2022
    Copy the full SHA
    21ccfc3 View commit details

Commits on Jun 5, 2022

  1. Copy the full SHA
    dd4eddb View commit details
Showing with 1,933 additions and 1,816 deletions.
  1. +123 −1 .all-contributorsrc
  2. +39 −0 .cirrus.yml
  3. +11 −0 .flake8
  4. +8 −0 .github/dependabot.yml
  5. +19 −15 .github/workflows/build_docs.yaml
  6. +172 −0 .github/workflows/release.yaml
  7. +25 −9 .github/workflows/test_proj_latest.yaml
  8. +122 −31 .github/workflows/tests.yaml
  9. +6 −6 .pre-commit-config.yaml
  10. +7 −586 .pylintrc
  11. +14 −14 CONTRIBUTING.md
  12. +8 −6 HOW_TO_RELEASE.md
  13. +1 −1 LICENSE
  14. +2 −2 Makefile
  15. +18 −4 README.md
  16. +7 −11 appveyor.yml
  17. +297 −0 ci/proj-compile-wheels.sh
  18. +11 −0 ci/vcpkg.json
  19. +6 −6 docs/advanced_examples.rst
  20. +11 −113 docs/conf.py
  21. +3 −3 docs/examples.rst
  22. +3 −3 docs/gotchas.rst
  23. +41 −4 docs/history.rst
  24. +3 −4 docs/index.rst
  25. +13 −11 docs/installation.rst
  26. +2 −0 docs/past_versions.rst
  27. +8 −6 docs/transformation_grids.rst
  28. +17 −17 pyproj/__init__.py
  29. +1 −1 pyproj/_crs.pyi
  30. +13 −9 pyproj/_crs.pyx
  31. +2 −15 pyproj/_datadir.pyx
  32. +6 −0 pyproj/_network.pyx
  33. +6 −19 pyproj/_show_versions.py
  34. +7 −2 pyproj/_transformer.pyi
  35. +69 −528 pyproj/_transformer.pyx
  36. +1 −1 pyproj/base.pxi
  37. +1 −1 pyproj/crs/_cf1x8.py
  38. +9 −3 pyproj/crs/coordinate_operation.py
  39. +98 −51 pyproj/crs/crs.py
  40. +5 −1 pyproj/database.pyi
  41. +12 −0 pyproj/database.pyx
  42. +7 −3 pyproj/datadir.py
  43. +4 −0 pyproj/enums.py
  44. +1 −1 pyproj/exceptions.py
  45. +57 −31 pyproj/geod.py
  46. +3 −1 pyproj/network.py
  47. +26 −1 pyproj/proj.pxi
  48. +35 −9 pyproj/proj.py
  49. +2 −2 pyproj/sync.py
  50. +114 −62 pyproj/transformer.py
  51. +9 −2 pyproj/utils.py
  52. +3 −3 pyproject.toml
  53. +2 −2 requirements-docs.txt
  54. +5 −9 setup.cfg
  55. +13 −16 setup.py
  56. +5 −4 test/conftest.py
  57. +108 −35 test/crs/test_crs.py
  58. +56 −15 test/crs/test_crs_cf.py
  59. +21 −35 test/crs/test_crs_coordinate_operation.py
  60. +5 −2 test/crs/test_crs_maker.py
  61. +26 −4 test/test_datadir.py
  62. +1 −1 test/test_datum.py
  63. +4 −4 test/test_datum_shift.py
  64. +3 −3 test/test_doctest_wrapper.py
  65. +2 −2 test/test_geod.py
  66. +3 −3 test/test_proj.py
  67. +16 −2 test/test_sync.py
  68. +2 −8 test/test_transform.py
  69. +166 −72 test/test_transformer.py
  70. +7 −0 test/test_utils.py
124 changes: 123 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"
]
},
{
@@ -470,6 +471,127 @@
"contributions": [
"doc"
]
},
{
"login": "Kirill888",
"name": "Kirill Kouzoubov",
"avatar_url": "https://avatars.githubusercontent.com/u/1428024?v=4",
"profile": "https://github.com/Kirill888",
"contributions": [
"code"
]
},
{
"login": "hemberger",
"name": "Dan Hemberger",
"avatar_url": "https://avatars.githubusercontent.com/u/846186?v=4",
"profile": "https://github.com/hemberger",
"contributions": [
"bug",
"code"
]
},
{
"login": "martinfleis",
"name": "Martin Fleischmann",
"avatar_url": "https://avatars.githubusercontent.com/u/36797143?v=4",
"profile": "https://github.com/martinfleis",
"contributions": [
"bug",
"code",
"test"
]
},
{
"login": "orontee",
"name": "Matthias Meulien",
"avatar_url": "https://avatars.githubusercontent.com/u/2065954?v=4",
"profile": "https://github.com/orontee",
"contributions": [
"code",
"bug"
]
},
{
"login": "iboates",
"name": "Isaac Boates",
"avatar_url": "https://avatars.githubusercontent.com/u/13814358?v=4",
"profile": "https://github.com/iboates",
"contributions": [
"code",
"bug",
"test"
]
},
{
"login": "kdpenner",
"name": "Kyle Penner",
"avatar_url": "https://avatars.githubusercontent.com/u/9297904?v=4",
"profile": "https://github.com/kdpenner",
"contributions": [
"code",
"bug",
"doc"
]
},
{
"login": "paulcochrane",
"name": "paulcochrane",
"avatar_url": "https://avatars.githubusercontent.com/u/18310598?v=4",
"profile": "https://github.com/paulcochrane",
"contributions": [
"code",
"doc",
"test",
"bug"
]
},
{
"login": "vot4anto",
"name": "Antonio Ettorre",
"avatar_url": "https://avatars.githubusercontent.com/u/56338190?v=4",
"profile": "https://github.com/vot4anto",
"contributions": [
"platform"
]
},
{
"login": "DWesl",
"name": "DWesl",
"avatar_url": "https://avatars.githubusercontent.com/u/22566757?v=4",
"profile": "https://github.com/DWesl",
"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
11 changes: 11 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[flake8]
max-line-length = 88
ignore =
# 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"
34 changes: 19 additions & 15 deletions .github/workflows/build_docs.yaml
Original file line number Diff line number Diff line change
@@ -2,17 +2,21 @@ name: Publish Docs

on:
push:
branches: [ master ]
branches: [ main ]
release:
types: [ created ]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true

jobs:
docs:
name: Publish Docs
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
persist-credentials: false

@@ -29,26 +33,26 @@ jobs:
conda config --set channel_priority strict
conda create -n docs python=3.9 cython proj
source activate docs
python -m pip install -e . --no-use-pep517 || python -m pip install -e .
python -m pip install -e .
python -m pip install -r requirements-docs.txt
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
Loading