Skip to content

Commit 6068ef8

Browse files
authored
Minimum PROJ version 7.2 (#690)
1 parent 2a6fed9 commit 6068ef8

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
global:
1212
- PROJ_BASE_DIR=$HOME/proj_install
1313
- CYTHON_COVERAGE=True
14-
- PROJSOURCE=7.1.0
14+
- PROJSOURCE=git
1515
# Following generated with
1616
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
1717
# Following generated by
@@ -40,9 +40,9 @@ matrix:
4040
env:
4141
- DOC=true
4242
- python: 3.8
43-
- python: 3.8
44-
env:
45-
- PROJSOURCE=git
43+
# - python: 3.8
44+
# env:
45+
# - PROJSOURCE=git
4646
# - python: "nightly"
4747
# env:
4848
# - PROJSOURCE=git
@@ -51,9 +51,9 @@ matrix:
5151
# - python: "nightly"
5252
# env:
5353
# - PROJSOURCE=git
54-
- python: 3.8
55-
env:
56-
- PROJSOURCE=git
54+
# - python: 3.8
55+
# env:
56+
# - PROJSOURCE=git
5757

5858

5959
before_install:

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ environments. Our recommended setup for contributing is:
7878
* Connect your repository to the upstream (main project).
7979
``git remote add upstream https://github.com/pyproj4/pyproj.git``
8080
* Create the development environment by running ``conda create -n devel -c conda-forge cython proj numpy shapely``.
81+
* If the minimum PROJ version is not yet available, you can build PROJ from source using:
82+
```bash
83+
export PROJ_DIR=$PWD/pyproj/proj_dir
84+
mkdir $PROJ_DIR
85+
bash ci/travis/proj-dl-and-compile git
86+
```
8187
* Activate our new development environment ``conda activate devel`` on Mac/Linux or
8288
``activate devel`` on Windows.
8389
* Install development requirements ``pip install -r requirements-dev.txt``

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ environment:
2222
PYTHON_ARCH: "64"
2323
VS_VERSION: Visual Studio 14
2424
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
25-
PROJSOURCE: 7.1.0
25+
PROJSOURCE: git
2626
BUILD_SHARED_LIBS: ON
2727
# - PYTHON: "C:\\Python37-x64"
2828
# PYTHON_VERSION: "3.7"
2929
# PYTHON_ARCH: "64"
3030
# VS_VERSION: Visual Studio 14
3131
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
32-
# PROJSOURCE: 7.1.0
32+
# PROJSOURCE: 7.2.0
3333
# BUILD_SHARED_LIBS: ON
3434
# - PYTHON: "C:\\Python36-x64"
3535
# PYTHON_VERSION: "3.6"

docs/history.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Change Log
44
3.0.0
55
-----
66
* Minimum supported Python version 3.6 (issue #499)
7-
* Minimum PROJ version 7.1 (issue #599)
7+
* Minimum PROJ version 7.2 (issues #599 & #689)
88
* WHL: Removed datumgrids from wheels because not needed with RFC 4 (pull #628)
99
* Refactor Proj to inherit from Transformer (issue #624)
1010
* ENH: Support obects with '__array__' method (pandas.Series, xarray.DataArray, dask.array.Array) (issue #573)

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pyproj Documentation
33

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

6-
.. note:: Minimum supported PROJ version is 7.1.0
6+
.. note:: Minimum supported PROJ version is 7.2.0
77

88
.. note:: Minimum supported Python version is 3.6
99

docs/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pyproj PROJ
5151
2.0-2.1 6.0+
5252
2.2-2.3 6.1-7
5353
2.4-2.6 6.2-7
54-
3+ 7.1+
54+
3+ 7.2+
5555
============ ============
5656

5757
PROJ is required when building from source.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from pkg_resources import parse_version
88
from setuptools import Extension, setup
99

10-
PROJ_MIN_VERSION = parse_version("7.1.0")
10+
PROJ_MIN_VERSION = parse_version("7.2.0")
1111
CURRENT_FILE_PATH = os.path.dirname(os.path.abspath(__file__))
1212
BASE_INTERNAL_PROJ_DIR = "proj_dir"
1313
INTERNAL_PROJ_DIR = os.path.join(CURRENT_FILE_PATH, "pyproj", BASE_INTERNAL_PROJ_DIR)

0 commit comments

Comments
 (0)