Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimum PROJ version 7.2 #690

Merged
merged 1 commit into from
Aug 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
global:
- PROJ_BASE_DIR=$HOME/proj_install
- CYTHON_COVERAGE=True
- PROJSOURCE=7.1.0
- PROJSOURCE=git
# Following generated with
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
# Following generated by
Expand Down Expand Up @@ -40,9 +40,9 @@ matrix:
env:
- DOC=true
- python: 3.8
- python: 3.8
env:
- PROJSOURCE=git
# - python: 3.8
# env:
# - PROJSOURCE=git
# - python: "nightly"
# env:
# - PROJSOURCE=git
Expand All @@ -51,9 +51,9 @@ matrix:
# - python: "nightly"
# env:
# - PROJSOURCE=git
- python: 3.8
env:
- PROJSOURCE=git
# - python: 3.8
# env:
# - PROJSOURCE=git


before_install:
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ environments. Our recommended setup for contributing is:
* Connect your repository to the upstream (main project).
``git remote add upstream https://github.com/pyproj4/pyproj.git``
* Create the development environment by running ``conda create -n devel -c conda-forge cython proj numpy shapely``.
* If the minimum PROJ version is not yet available, you can build PROJ from source using:
```bash
export PROJ_DIR=$PWD/pyproj/proj_dir
mkdir $PROJ_DIR
bash ci/travis/proj-dl-and-compile git
```
* Activate our new development environment ``conda activate devel`` on Mac/Linux or
``activate devel`` on Windows.
* Install development requirements ``pip install -r requirements-dev.txt``
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ environment:
PYTHON_ARCH: "64"
VS_VERSION: Visual Studio 14
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
PROJSOURCE: 7.1.0
PROJSOURCE: git
BUILD_SHARED_LIBS: ON
# - PYTHON: "C:\\Python37-x64"
# PYTHON_VERSION: "3.7"
# PYTHON_ARCH: "64"
# VS_VERSION: Visual Studio 14
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# PROJSOURCE: 7.1.0
# PROJSOURCE: 7.2.0
# BUILD_SHARED_LIBS: ON
# - PYTHON: "C:\\Python36-x64"
# PYTHON_VERSION: "3.6"
Expand Down
2 changes: 1 addition & 1 deletion docs/history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Change Log
3.0.0
-----
* Minimum supported Python version 3.6 (issue #499)
* Minimum PROJ version 7.1 (issue #599)
* Minimum PROJ version 7.2 (issues #599 & #689)
* WHL: Removed datumgrids from wheels because not needed with RFC 4 (pull #628)
* Refactor Proj to inherit from Transformer (issue #624)
* ENH: Support obects with '__array__' method (pandas.Series, xarray.DataArray, dask.array.Array) (issue #573)
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pyproj Documentation

Python interface to `PROJ <https://proj.org/>`_ (cartographic projections and coordinate transformations library).

.. note:: Minimum supported PROJ version is 7.1.0
.. note:: Minimum supported PROJ version is 7.2.0

.. note:: Minimum supported Python version is 3.6

Expand Down
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pyproj PROJ
2.0-2.1 6.0+
2.2-2.3 6.1-7
2.4-2.6 6.2-7
3+ 7.1+
3+ 7.2+
============ ============

PROJ is required when building from source.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pkg_resources import parse_version
from setuptools import Extension, setup

PROJ_MIN_VERSION = parse_version("7.1.0")
PROJ_MIN_VERSION = parse_version("7.2.0")
CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
BASE_INTERNAL_PROJ_DIR = "proj_dir"
INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR)
Expand Down