Skip to content

Commit

Permalink
updated to 6.1.0 PROJ release pins
Browse files Browse the repository at this point in the history
  • Loading branch information
snowman2 committed May 16, 2019
1 parent 1826660 commit bca63d0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache: pip
env:
global:
- CYTHON_COVERAGE=True
- PROJSOURCE=6.0.0
- PROJSOURCE=6.1.0
# Following generated with
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
# Following generated by
Expand All @@ -21,20 +21,20 @@ matrix:
os: osx
env:
- PYTHON=3.6.8
- PROJSOURCE=6.1.0RC2
- PROJSOURCE=6.1.0
- python: 2.7
env:
- PROJSOURCE=6.1.0RC2
- PROJSOURCE=6.1.0
- python: 3.5
env:
- PROJSOURCE=6.1.0RC2
- PROJSOURCE=6.1.0
- python: 3.6
env:
- PROJSOURCE=6.1.0RC2
- PROJSOURCE=6.1.0
- python: 3.7
dist: xenial
env:
- PROJSOURCE=6.1.0RC2
- PROJSOURCE=6.1.0
- DOC=true
- python: "nightly"
env:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ environment:
PYTHON_ARCH: "64"
VS_VERSION: Visual Studio 14
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
PROJSOURCE: 6.1.0RC2
PROJSOURCE: 6.1.0
# - PYTHON: "C:\\Python37-x64"
# PYTHON_VERSION: "3.7"
# PYTHON_ARCH: "64"
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.4 <https://proj4.org/>`_.

.. info:: Minimum supported PROJ version is 6.1.0
.. note:: Minimum supported PROJ version is 6.1.0

GitHub Repository: https://github.com/pyproj4/pyproj

Expand Down
4 changes: 2 additions & 2 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Installing from source
Setup PROJ.4
------------

PROJ.4 6.0.0 is required when building from source.
PROJ.4 6.1.0 is required when building from source.
You can download PROJ.4 from https://download.osgeo.org/proj
or from https://github.com/OSGeo/proj.4.
Installation instructions can be fount at https://proj4.org/.
Expand All @@ -54,7 +54,7 @@ Linux::
export PROJ_DIR=/usr/local

If you have a previous version of PROJ.4 installed alongside the current
version of PROJ.4 (6.0.0), the best way to avoid conflicts is to:
version of PROJ.4 (6.1.0), the best way to avoid conflicts is to:

1. Remove the previous PROJ.4 from PATH & unset old PROJ_LIB environment variable (temporarily)
2. Install PROJ.4 to the internal PROJ.4 directory (pyproj/proj_dir)
Expand Down

0 comments on commit bca63d0

Please sign in to comment.