Minimum PROJ version 7.2 (#690)

pyproj4 · Aug 21, 2020 · 6068ef8 · 6068ef8
1 parent 2a6fed9
commit 6068ef8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
@@ -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
@@ -51,9 +51,9 @@ matrix:
     # - python: "nightly"
     #   env:
     #     - PROJSOURCE=git
-    - python: 3.8
-      env:
-        - PROJSOURCE=git
+    # - python: 3.8
+    #   env:
+    #     - PROJSOURCE=git
 
 
 before_install:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -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``

diff --git a/appveyor.yml b/appveyor.yml
@@ -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"

diff --git a/docs/history.rst b/docs/history.rst
@@ -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)

diff --git a/docs/index.rst b/docs/index.rst
@@ -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
 

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -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.

diff --git a/setup.py b/setup.py
@@ -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)