Skip to content
Permalink
Browse files

remove python ext-libs that should meanwhile available everywhere

  • Loading branch information
jef-n committed Mar 9, 2017
1 parent fc92e2a commit f10e9eee7db8eb00100007955c3b92a27d45bf52
Showing 1,446 changed files with 2 additions and 247,282 deletions.
@@ -329,6 +329,8 @@ Depends:
python3-yaml,
python3-future,
python3-plotly,
python3-pyproj,
python3-owslib,
libqgispython{QGIS_ABI},
${shlibs:Depends},
${python:Depends},
@@ -125,83 +125,10 @@ License: public-domain
is used when saving/restoring a QGIS project.
This file is in the public domain

Files: python/ext-libs/dateutil/*
Copyright: 2003-2010, Gustavo Niemeyer <gustavo@niemeyer.net>
License: BSD-3-Clause

Files: python/ext-libs/httplib2/*
Copyright: 2006, 2012, Joe Gregorio <joe@bitworking.org>
License: GPL-2+

Files: python/ext-libs/httplib2/socks.py
Copyright: 2006, Dan-Haim
License: BSD-2-Clause

Files: python/ext-libs/jinja2/*
Copyright: 2006-2010, the Jinja Team
License: BSD-3-Clause

Files: python/ext-libs/markupsafe/*
Copyright: 2010, 2013, Armin Ronacher
License: BSD-3-Clause

Files: python/ext-libs/nose2/*
Copyright: Jason Pellerin <jpellerin+nose@gmail.com>
License: BSD-2-Clause

Files: python/ext-libs/nose2/events.py
python/ext-libs/nose2/exceptions.py
python/ext-libs/nose2/loader.py
python/ext-libs/nose2/runner.py
python/ext-libs/nose2/tools/params.py
python/ext-libs/nose2/util.py
Copyright: 2001-2010, Python Software Foundation
License: Python-2.0

Files: python/ext-libs/nose2/backports/ordereddict.py
Copyright: Python Software Foundation
License: MIT

Files: python/ext-libs/owslib/*
Copyright: 2006, Ancient World Mapping Center
2008-2013, Tom Kralidis
2013, Christian Ledermann <christian.ledermann@gmail.com>
2012, Brad Hards <bradh@frogmouth.net>
2012, Jachym Cepicky
2007-2009, STFC <http://www.stfc.ac.uk>
2004-2006, Sean C. Gillies
2005, Nuxeo SARL <http://nuxeo.com>
License: BSD-3-Clause

Files: python/ext-libs/pygments/*
Copyright: 2006-2013, the Pygments team
License: BSD-2-Clause

Files: python/ext-libs/pygments/lexers/_robotframeworklexer.py
Copyright: 2006-2013, the Pygments team
2012, Nokia Siemens Networks Oyj
License: BSD-2-Clause and Apache-2.0

Files: python/ext-libs/pyspatialite/*
Copyright: 2004-2010, Gerhard Häring <gh@ghaering.de>
License: Zlib

Files: python/ext-libs/pytz/*
Copyright: 2003-2009, Stuart Bishop <stuart@stuartbishop.net>
License: MIT

Files: python/ext-libs/six.py
Copyright: 2010-2015, Benjamin Peterson
License: MIT

Files: python/ext-libs/yaml/*
Copyright: 2006, Kirill Simonov <xi@resolvent.net>
License: MIT

Files: python/plugins/GdalTools/*
Copyright: 2009, Faunalia
License: MIT

Files: python/plugins/processing/modeler/ModelerArrowItem.py
src/app/qgssettingstree.cpp
src/app/qgssettingstree.h
@@ -67,16 +67,6 @@ CMAKE_OPTS := \
-DWITH_APIDOC=TRUE \
-DGENERATE_QHP=TRUE \
-DWITH_CUSTOM_WIDGETS=TRUE \
-DWITH_INTERNAL_HTTPLIB2=FALSE \
-DWITH_INTERNAL_JINJA2=FALSE \
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_REQUESTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE \
-DWITH_INTERNAL_YAML=FALSE \
-DWITH_INTERNAL_NOSE2=FALSE \
-DWITH_INTERNAL_SIX=FALSE \
-DWITH_GLOBE=FALSE \
-DWITH_SERVER=TRUE \
-DWITH_SERVER_PLUGINS=TRUE \
@@ -185,17 +185,6 @@ cmake -G Ninja ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-D WITH_INTERNAL_JINJA2=FALSE ^
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
-D WITH_INTERNAL_PYGMENTS=FALSE ^
-D WITH_INTERNAL_REQUESTS=FALSE ^
-D WITH_INTERNAL_DATEUTIL=FALSE ^
-D WITH_INTERNAL_PYTZ=FALSE ^
-D WITH_INTERNAL_SIX=FALSE ^
-D WITH_INTERNAL_NOSE2=FALSE ^
-D WITH_INTERNAL_MOCK=FALSE ^
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
-D WITH_INTERNAL_FUTURE=FALSE ^
-D WITH_PYSPATIALITE=TRUE ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
@@ -177,17 +177,6 @@ cmake -G Ninja ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
-D WITH_INTERNAL_JINJA2=FALSE ^
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
-D WITH_INTERNAL_PYGMENTS=FALSE ^
-D WITH_INTERNAL_REQUESTS=FALSE ^
-D WITH_INTERNAL_DATEUTIL=FALSE ^
-D WITH_INTERNAL_PYTZ=FALSE ^
-D WITH_INTERNAL_SIX=FALSE ^
-D WITH_INTERNAL_NOSE2=FALSE ^
-D WITH_INTERNAL_MOCK=FALSE ^
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
-D WITH_INTERNAL_FUTURE=FALSE ^
-D WITH_PYSPATIALITE=TRUE ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
@@ -32,32 +32,3 @@ MACRO(EXT_PYLIB lib enable_by_default)

ENDIF(WITH_INTERNAL_${ulib})
ENDMACRO(EXT_PYLIB lib)

# Our yaml package is not compatible with python 3
# Fallback to system package by default
EXT_PYLIB(yaml FALSE)

FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz nose2 requests pyproj)
EXT_PYLIB(${pkg} TRUE)
ENDFOREACH(pkg)

SET (WITH_INTERNAL_SIX TRUE CACHE BOOL "Determines whether python six should be included")
IF(WITH_INTERNAL_SIX)
INSTALL(FILES six.py DESTINATION "${QGIS_PYTHON_DIR}")

ADD_CUSTOM_TARGET(pysix)

ADD_CUSTOM_COMMAND(TARGET pysix
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy six.py "${PYTHON_OUTPUT_DIRECTORY}"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS six.py
)
PY_COMPILE(pysix "${PYTHON_OUTPUT_DIRECTORY}/six.py")

ADD_DEPENDENCIES(staged-plugins pysix)
ADD_CUSTOM_COMMAND(TARGET clean-staged-plugins
COMMAND ${CMAKE_COMMAND} -E remove "${PYTHON_OUTPUT_DIRECTORY}/six.py"
)

ENDIF(WITH_INTERNAL_SIX)

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 comments on commit f10e9ee

@nyalldawson

This comment has been minimized.

Copy link
Collaborator

@nyalldawson nyalldawson replied Mar 10, 2017

247,282 deletions! Wooooo!

@m-kuhn

This comment has been minimized.

Copy link
Member

@m-kuhn m-kuhn replied Mar 10, 2017

Good move, thanks @jef-n

Please sign in to comment.
You can’t perform that action at this time.