Skip to content

Commit 649d114

Browse files
authored
Merge pull request SciTools#1463 from ocefpaf/fix_proj_lib_name
Fix proj lib name
2 parents 48ee029 + 77fa9a7 commit 649d114

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ environment:
22
matrix:
33
- PYTHON_VERSION: "3.6"
44
CONDA_INSTALL_LOCN: "C:\\Miniconda36-x64"
5-
PACKAGES: "cython numpy matplotlib-base proj4 pykdtree scipy"
5+
PACKAGES: "cython numpy matplotlib-base proj pykdtree scipy"
66
- PYTHON_VERSION: "2.7"
77
CONDA_INSTALL_LOCN: "C:\\Miniconda-x64"
88
PACKAGES: "cython=0.28 numpy=1.10.0 matplotlib=1.5.1 nose proj4=4.9.1 scipy=0.16.0 mock msinttypes futures"

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def get_proj_libraries():
242242
This function gets the PROJ libraries to cythonize with
243243
"""
244244
proj_libraries = ["proj"]
245-
if os.name == "nt" and proj_version >= (6, 0, 0):
245+
if os.name == "nt" and (6, 0, 0) <= proj_version < (6, 3, 0):
246246
proj_libraries = [
247247
"proj_{}_{}".format(proj_version[0], proj_version[1])
248248
]

0 commit comments

Comments
 (0)