Skip to content

Commit fa89a58

Browse files
tomkralidistomkralidis
committedMar 9, 2017
add pyproj to Python deps (http://hub.qgis.org/issues/16266)
·
ltr-3_40final-3_0_0
1 parent bbc849d commit fa89a58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+24552
-2
lines changed
 

‎python/ext-libs/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ENDMACRO(EXT_PYLIB lib)
3737
# Fallback to system package by default
3838
EXT_PYLIB(yaml FALSE)
3939

40-
FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz nose2 requests)
40+
FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz nose2 requests pyproj)
4141
EXT_PYLIB(${pkg} TRUE)
4242
ENDFOREACH(pkg)
4343

@@ -61,4 +61,3 @@ IF(WITH_INTERNAL_SIX)
6161
)
6262

6363
ENDIF(WITH_INTERNAL_SIX)
64-

‎python/ext-libs/pyproj-1.9.5.1-py2.7.egg-info/PKG-INFO

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Metadata-Version: 1.1
2+
Name: pyproj
3+
Version: 1.9.5.1
4+
Summary: Python interface to PROJ.4 library
5+
Home-page: https://github.com/jswhit/pyproj
6+
Author: Jeff Whitaker
7+
Author-email: jeffrey.s.whitaker@noaa.gov
8+
License: OSI Approved
9+
Download-URL: http://python.org/pypi/pyproj
10+
Description:
11+
Performs cartographic transformations between geographic (lat/lon)
12+
and map projection (x/y) coordinates. Can also transform directly
13+
from one map projection coordinate system to another.
14+
Coordinates can be given as numpy arrays, python arrays, lists or scalars.
15+
Optimized for numpy arrays.
16+
Keywords: python,map projections,GIS,mapping,maps
17+
Platform: any
18+
Classifier: Development Status :: 4 - Beta
19+
Classifier: Intended Audience :: Science/Research
20+
Classifier: License :: OSI Approved
21+
Classifier: Topic :: Software Development :: Libraries :: Python Modules
22+
Classifier: Topic :: Scientific/Engineering :: GIS
23+
Classifier: Topic :: Scientific/Engineering :: Mathematics
24+
Classifier: Operating System :: OS Independent

4 commit comments

Comments
 (4)

nyalldawson commented on Mar 9, 2017

@nyalldawson
nyalldawson
on Mar 9, 2017
Collaborator

@tomkralidis

Any chance we could use git submodules here instead of pulling in a while copy of the library?

tomkralidis commented on Mar 9, 2017

@tomkralidis
tomkralidis
on Mar 9, 2017
ContributorAuthor

@nyalldawson good point. Not sure. cc'ing @jef-n here given this is something we should consider for all of /python/ext-libs/ in general.

jef-n commented on Mar 10, 2017

@jef-n
jef-n
on Mar 10, 2017
Member

ext-libs dependencies should only be added when necessary for some (older) platforms/distributions, we build for. QGIS3 targets newer ones, that already come with up-to-date versions, so a lot could go in f10e9ee. 2.18 supports more - still sorting out, what is still necessary...

elpaso commented on May 13, 2017

@elpaso
elpaso
on May 13, 2017
Contributor

@nyalldawson @tomkralidis not sure if it can be applied in this case, but CMake submodules are also an option for including sources from other repos, like @dakcarto did with https://github.com/qgis/QGIS/pull/4437/files#diff-eeb0306cea1c0903cfe42d408190b6f5R1 . Some more info: https://github.com/psi4/psi4/wiki/External-subprojects-using-Git-and-CMake

Please sign in to comment.