Skip to content

Commit f10e9ee

Browse files
committed
remove python ext-libs that should meanwhile available everywhere
1 parent fc92e2a commit f10e9ee

File tree

1,446 files changed

+2
-247282
lines changed

Some content is hidden

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

1,446 files changed

+2
-247282
lines changed

debian/control.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ Depends:
329329
python3-yaml,
330330
python3-future,
331331
python3-plotly,
332+
python3-pyproj,
333+
python3-owslib,
332334
libqgispython{QGIS_ABI},
333335
${shlibs:Depends},
334336
${python:Depends},

debian/copyright

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -125,83 +125,10 @@ License: public-domain
125125
is used when saving/restoring a QGIS project.
126126
This file is in the public domain
127127

128-
Files: python/ext-libs/dateutil/*
129-
Copyright: 2003-2010, Gustavo Niemeyer <gustavo@niemeyer.net>
130-
License: BSD-3-Clause
131-
132-
Files: python/ext-libs/httplib2/*
133-
Copyright: 2006, 2012, Joe Gregorio <joe@bitworking.org>
134-
License: GPL-2+
135-
136-
Files: python/ext-libs/httplib2/socks.py
137-
Copyright: 2006, Dan-Haim
138-
License: BSD-2-Clause
139-
140-
Files: python/ext-libs/jinja2/*
141-
Copyright: 2006-2010, the Jinja Team
142-
License: BSD-3-Clause
143-
144-
Files: python/ext-libs/markupsafe/*
145-
Copyright: 2010, 2013, Armin Ronacher
146-
License: BSD-3-Clause
147-
148-
Files: python/ext-libs/nose2/*
149-
Copyright: Jason Pellerin <jpellerin+nose@gmail.com>
150-
License: BSD-2-Clause
151-
152-
Files: python/ext-libs/nose2/events.py
153-
python/ext-libs/nose2/exceptions.py
154-
python/ext-libs/nose2/loader.py
155-
python/ext-libs/nose2/runner.py
156-
python/ext-libs/nose2/tools/params.py
157-
python/ext-libs/nose2/util.py
158-
Copyright: 2001-2010, Python Software Foundation
159-
License: Python-2.0
160-
161-
Files: python/ext-libs/nose2/backports/ordereddict.py
162-
Copyright: Python Software Foundation
163-
License: MIT
164-
165-
Files: python/ext-libs/owslib/*
166-
Copyright: 2006, Ancient World Mapping Center
167-
2008-2013, Tom Kralidis
168-
2013, Christian Ledermann <christian.ledermann@gmail.com>
169-
2012, Brad Hards <bradh@frogmouth.net>
170-
2012, Jachym Cepicky
171-
2007-2009, STFC <http://www.stfc.ac.uk>
172-
2004-2006, Sean C. Gillies
173-
2005, Nuxeo SARL <http://nuxeo.com>
174-
License: BSD-3-Clause
175-
176-
Files: python/ext-libs/pygments/*
177-
Copyright: 2006-2013, the Pygments team
178-
License: BSD-2-Clause
179-
180-
Files: python/ext-libs/pygments/lexers/_robotframeworklexer.py
181-
Copyright: 2006-2013, the Pygments team
182-
2012, Nokia Siemens Networks Oyj
183-
License: BSD-2-Clause and Apache-2.0
184-
185128
Files: python/ext-libs/pyspatialite/*
186129
Copyright: 2004-2010, Gerhard Häring <gh@ghaering.de>
187130
License: Zlib
188131

189-
Files: python/ext-libs/pytz/*
190-
Copyright: 2003-2009, Stuart Bishop <stuart@stuartbishop.net>
191-
License: MIT
192-
193-
Files: python/ext-libs/six.py
194-
Copyright: 2010-2015, Benjamin Peterson
195-
License: MIT
196-
197-
Files: python/ext-libs/yaml/*
198-
Copyright: 2006, Kirill Simonov <xi@resolvent.net>
199-
License: MIT
200-
201-
Files: python/plugins/GdalTools/*
202-
Copyright: 2009, Faunalia
203-
License: MIT
204-
205132
Files: python/plugins/processing/modeler/ModelerArrowItem.py
206133
src/app/qgssettingstree.cpp
207134
src/app/qgssettingstree.h

debian/rules

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,6 @@ CMAKE_OPTS := \
6767
-DWITH_APIDOC=TRUE \
6868
-DGENERATE_QHP=TRUE \
6969
-DWITH_CUSTOM_WIDGETS=TRUE \
70-
-DWITH_INTERNAL_HTTPLIB2=FALSE \
71-
-DWITH_INTERNAL_JINJA2=FALSE \
72-
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
73-
-DWITH_INTERNAL_PYGMENTS=FALSE \
74-
-DWITH_INTERNAL_REQUESTS=FALSE \
75-
-DWITH_INTERNAL_DATEUTIL=FALSE \
76-
-DWITH_INTERNAL_PYTZ=FALSE \
77-
-DWITH_INTERNAL_YAML=FALSE \
78-
-DWITH_INTERNAL_NOSE2=FALSE \
79-
-DWITH_INTERNAL_SIX=FALSE \
8070
-DWITH_GLOBE=FALSE \
8171
-DWITH_SERVER=TRUE \
8272
-DWITH_SERVER_PLUGINS=TRUE \

ms-windows/osgeo4w/package-nightly.cmd

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -185,17 +185,6 @@ cmake -G Ninja ^
185185
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
186186
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
187187
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
188-
-D WITH_INTERNAL_JINJA2=FALSE ^
189-
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
190-
-D WITH_INTERNAL_PYGMENTS=FALSE ^
191-
-D WITH_INTERNAL_REQUESTS=FALSE ^
192-
-D WITH_INTERNAL_DATEUTIL=FALSE ^
193-
-D WITH_INTERNAL_PYTZ=FALSE ^
194-
-D WITH_INTERNAL_SIX=FALSE ^
195-
-D WITH_INTERNAL_NOSE2=FALSE ^
196-
-D WITH_INTERNAL_MOCK=FALSE ^
197-
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
198-
-D WITH_INTERNAL_FUTURE=FALSE ^
199188
-D WITH_PYSPATIALITE=TRUE ^
200189
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
201190
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^

ms-windows/osgeo4w/package.cmd

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,6 @@ cmake -G Ninja ^
177177
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
178178
-D FCGI_INCLUDE_DIR=%O4W_ROOT%/include ^
179179
-D FCGI_LIBRARY=%O4W_ROOT%/lib/libfcgi.lib ^
180-
-D WITH_INTERNAL_JINJA2=FALSE ^
181-
-D WITH_INTERNAL_MARKUPSAFE=FALSE ^
182-
-D WITH_INTERNAL_PYGMENTS=FALSE ^
183-
-D WITH_INTERNAL_REQUESTS=FALSE ^
184-
-D WITH_INTERNAL_DATEUTIL=FALSE ^
185-
-D WITH_INTERNAL_PYTZ=FALSE ^
186-
-D WITH_INTERNAL_SIX=FALSE ^
187-
-D WITH_INTERNAL_NOSE2=FALSE ^
188-
-D WITH_INTERNAL_MOCK=FALSE ^
189-
-D WITH_INTERNAL_HTTPLIB2=FALSE ^
190-
-D WITH_INTERNAL_FUTURE=FALSE ^
191180
-D WITH_PYSPATIALITE=TRUE ^
192181
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
193182
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^

python/ext-libs/CMakeLists.txt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -32,32 +32,3 @@ MACRO(EXT_PYLIB lib enable_by_default)
3232

3333
ENDIF(WITH_INTERNAL_${ulib})
3434
ENDMACRO(EXT_PYLIB lib)
35-
36-
# Our yaml package is not compatible with python 3
37-
# Fallback to system package by default
38-
EXT_PYLIB(yaml FALSE)
39-
40-
FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz nose2 requests pyproj)
41-
EXT_PYLIB(${pkg} TRUE)
42-
ENDFOREACH(pkg)
43-
44-
SET (WITH_INTERNAL_SIX TRUE CACHE BOOL "Determines whether python six should be included")
45-
IF(WITH_INTERNAL_SIX)
46-
INSTALL(FILES six.py DESTINATION "${QGIS_PYTHON_DIR}")
47-
48-
ADD_CUSTOM_TARGET(pysix)
49-
50-
ADD_CUSTOM_COMMAND(TARGET pysix
51-
POST_BUILD
52-
COMMAND ${CMAKE_COMMAND} -E copy six.py "${PYTHON_OUTPUT_DIRECTORY}"
53-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
54-
DEPENDS six.py
55-
)
56-
PY_COMPILE(pysix "${PYTHON_OUTPUT_DIRECTORY}/six.py")
57-
58-
ADD_DEPENDENCIES(staged-plugins pysix)
59-
ADD_CUSTOM_COMMAND(TARGET clean-staged-plugins
60-
COMMAND ${CMAKE_COMMAND} -E remove "${PYTHON_OUTPUT_DIRECTORY}/six.py"
61-
)
62-
63-
ENDIF(WITH_INTERNAL_SIX)

python/ext-libs/Jinja2-2.7.2-py2.7.egg-info/PKG-INFO

Lines changed: 0 additions & 55 deletions
This file was deleted.

python/ext-libs/Jinja2-2.7.2-py2.7.egg-info/SOURCES.txt

Lines changed: 0 additions & 126 deletions
This file was deleted.

python/ext-libs/Jinja2-2.7.2-py2.7.egg-info/dependency_links.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

python/ext-libs/Jinja2-2.7.2-py2.7.egg-info/entry_points.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)