File tree Expand file tree Collapse file tree 7 files changed +19
-13
lines changed Expand file tree Collapse file tree 7 files changed +19
-13
lines changed Original file line number Diff line number Diff line change 11
11
global :
12
12
- PROJ_BASE_DIR=$HOME/proj_install
13
13
- CYTHON_COVERAGE=True
14
- - PROJSOURCE=7.1.0
14
+ - PROJSOURCE=git
15
15
# Following generated with
16
16
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
17
17
# Following generated by
@@ -40,9 +40,9 @@ matrix:
40
40
env :
41
41
- DOC=true
42
42
- python : 3.8
43
- - python : 3.8
44
- env :
45
- - PROJSOURCE=git
43
+ # - python: 3.8
44
+ # env:
45
+ # - PROJSOURCE=git
46
46
# - python: "nightly"
47
47
# env:
48
48
# - PROJSOURCE=git
@@ -51,9 +51,9 @@ matrix:
51
51
# - python: "nightly"
52
52
# env:
53
53
# - PROJSOURCE=git
54
- - python : 3.8
55
- env :
56
- - PROJSOURCE=git
54
+ # - python: 3.8
55
+ # env:
56
+ # - PROJSOURCE=git
57
57
58
58
59
59
before_install :
Original file line number Diff line number Diff line change @@ -78,6 +78,12 @@ environments. Our recommended setup for contributing is:
78
78
* Connect your repository to the upstream (main project).
79
79
`` git remote add upstream https://github.com/pyproj4/pyproj.git ``
80
80
* 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
+ ```
81
87
* Activate our new development environment ` ` conda activate devel` ` on Mac/Linux or
82
88
` ` activate devel` ` on Windows.
83
89
* Install development requirements ` ` pip install -r requirements-dev.txt` `
Original file line number Diff line number Diff line change @@ -22,14 +22,14 @@ environment:
22
22
PYTHON_ARCH : " 64"
23
23
VS_VERSION : Visual Studio 14
24
24
APPVEYOR_BUILD_WORKER_IMAGE : Visual Studio 2015
25
- PROJSOURCE : 7.1.0
25
+ PROJSOURCE : git
26
26
BUILD_SHARED_LIBS : ON
27
27
# - PYTHON: "C:\\Python37-x64"
28
28
# PYTHON_VERSION: "3.7"
29
29
# PYTHON_ARCH: "64"
30
30
# VS_VERSION: Visual Studio 14
31
31
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
32
- # PROJSOURCE: 7.1 .0
32
+ # PROJSOURCE: 7.2 .0
33
33
# BUILD_SHARED_LIBS: ON
34
34
# - PYTHON: "C:\\Python36-x64"
35
35
# PYTHON_VERSION: "3.6"
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ Change Log
4
4
3.0.0
5
5
-----
6
6
* 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 )
8
8
* WHL: Removed datumgrids from wheels because not needed with RFC 4 (pull #628)
9
9
* Refactor Proj to inherit from Transformer (issue #624)
10
10
* ENH: Support obects with '__array__' method (pandas.Series, xarray.DataArray, dask.array.Array) (issue #573)
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ pyproj Documentation
3
3
4
4
Python interface to `PROJ <https://proj.org/ >`_ (cartographic projections and coordinate transformations library).
5
5
6
- .. note :: Minimum supported PROJ version is 7.1 .0
6
+ .. note :: Minimum supported PROJ version is 7.2 .0
7
7
8
8
.. note :: Minimum supported Python version is 3.6
9
9
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ pyproj PROJ
51
51
2.0-2.1 6.0+
52
52
2.2-2.3 6.1-7
53
53
2.4-2.6 6.2-7
54
- 3+ 7.1 +
54
+ 3+ 7.2 +
55
55
============ ============
56
56
57
57
PROJ is required when building from source.
Original file line number Diff line number Diff line change 7
7
from pkg_resources import parse_version
8
8
from setuptools import Extension , setup
9
9
10
- PROJ_MIN_VERSION = parse_version ("7.1 .0" )
10
+ PROJ_MIN_VERSION = parse_version ("7.2 .0" )
11
11
CURRENT_FILE_PATH = os .path .dirname (os .path .abspath (__file__ ))
12
12
BASE_INTERNAL_PROJ_DIR = "proj_dir"
13
13
INTERNAL_PROJ_DIR = os .path .join (CURRENT_FILE_PATH , "pyproj" , BASE_INTERNAL_PROJ_DIR )
You can’t perform that action at this time.
0 commit comments