update to PROJ 6.2.1 (#471)

pyproj4 · Nov 2, 2019 · ae7d057 · ae7d057
1 parent 81f1012
commit ae7d057
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 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=6.2.0
+    - PROJSOURCE=6.2.1
     # Following generated with
     - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
     # Following generated by
@@ -26,20 +26,23 @@ matrix:
       os: osx
       env:
         - PYTHON=3.6.8
-        - PROJSOURCE=6.2.0
+        - PROJSOURCE=6.2.1
     - python: 3.5
       env:
-        - PROJSOURCE=6.2.0
+        - PROJSOURCE=6.2.1
     - python: 3.6
       env:
         - PROJSOURCE=6.2.0
+    - python: 3.6
+      env:
+        - PROJSOURCE=6.2.1
     - python: 3.7
       env:
-        - PROJSOURCE=6.2.0
+        - PROJSOURCE=6.2.1
         - DOC=true
     - python: 3.8
       env:
-        - PROJSOURCE=6.2.0
+        - PROJSOURCE=6.2.1
     - python: "nightly"
       env:
         - PROJSOURCE=git

diff --git a/appveyor.yml b/appveyor.yml
@@ -21,19 +21,19 @@ environment:
     #   PYTHON_ARCH: "64"
     #   VS_VERSION: Visual Studio 14
     #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #   PROJSOURCE: 6.2.0
+    #   PROJSOURCE: 6.2.1
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       VS_VERSION: Visual Studio 14
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PROJSOURCE: 6.2.0
+      PROJSOURCE: 6.2.1
   # - PYTHON: "C:\\Python37-x64"
     #   PYTHON_VERSION: "3.7"
     #   PYTHON_ARCH: "64"
     #   VS_VERSION: Visual Studio 14
     #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    #   PROJSOURCE: 6.2.0
+    #   PROJSOURCE: 6.2.1
     # - PYTHON: "C:\\Python36-x64"
     #   PYTHON_VERSION: "3.6"
     #   PYTHON_ARCH: "64"

diff --git a/docs/history.rst b/docs/history.rst
@@ -3,6 +3,7 @@ Change Log
 
 2.4.1
 ~~~~~
+* Wheels contain PROJ version is 6.2.1 (issue #456)
 * BUG: Fix setting lat_ts for mercator projection in :meth:`~pyproj.CRS.from_cf` and :meth:`~pyproj.CRS.to_cf` (issue #461)
 * BUG: latlon -> longlat in `CRS.from_cf()` for o_proj so behavior consistent in PROJ 6.2.0 and 6.2.1 (pull #472)
 * ENH: Add repr for `pyproj.crs.CoordinateOperation` and for `pyproj.transformer.TransformerGroup` (pull #464)

diff --git a/test/test_crs.py b/test/test_crs.py
@@ -882,7 +882,7 @@ def test_to_dict_no_proj4():
             "proj": "ob_tran",
         }
     )
-    if LooseVersion(proj_version_str) > LooseVersion("6.2.0"):
+    if LooseVersion(proj_version_str) >= LooseVersion("6.3.0"):
         assert crs.to_proj4() == (
             "+proj=ob_tran +o_proj=longlat +lon_0=-10 +o_lat_p=30 "
             "+o_lon_p=0 +R=6371229 +no_defs +type=crs"

diff --git a/test/test_crs_cf.py b/test/test_crs_cf.py
@@ -151,7 +151,7 @@ def test_cf_rotated_latlon():
     )
     cf_dict = crs.to_cf()
     assert cf_dict.pop("crs_wkt").startswith("GEOGCRS[")
-    if LooseVersion(proj_version_str) > LooseVersion("6.2.0"):
+    if LooseVersion(proj_version_str) >= LooseVersion("6.3.0"):
         assert crs.to_dict() == {
             "proj": "ob_tran",
             "o_proj": "longlat",
@@ -181,7 +181,7 @@ def test_cf_rotated_latlon__grid():
             north_pole_grid_longitude=0,
         )
     )
-    if LooseVersion(proj_version_str) > LooseVersion("6.2.0"):
+    if LooseVersion(proj_version_str) >= LooseVersion("6.3.0"):
         assert crs.to_dict() == {
             "proj": "ob_tran",
             "o_proj": "longlat",

diff --git a/test/test_transformer.py b/test/test_transformer.py
@@ -261,7 +261,7 @@ def test_transform_no_exception():
 def test_transform__out_of_bounds():
     with pytest.warns(DeprecationWarning):
         transformer = Transformer.from_proj("+init=epsg:4326", "+init=epsg:27700")
-    if LooseVersion(proj_version_str) > LooseVersion("6.2.0"):
+    if LooseVersion(proj_version_str) >= LooseVersion("6.3.0"):
         with pytest.raises(ProjError):
             transformer.transform(100000, 100000, errcheck=True)
     else: