diff --git a/debian/control.in b/debian/control.in index fb396d22260..2d3ab046370 100644 --- a/debian/control.in +++ b/debian/control.in @@ -382,6 +382,7 @@ Depends: python-jinja2, python-markupsafe, python-pygments, + python-requests, python-dateutil, python-tz, python-six, diff --git a/debian/rules b/debian/rules index 84997b788a4..921a29c4871 100755 --- a/debian/rules +++ b/debian/rules @@ -73,6 +73,7 @@ CMAKE_OPTS := \ -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 \ diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index a9302f1f2ab..df96c18e673 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -187,6 +187,7 @@ cmake %CMAKE_OPT% ^ -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 ^ diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index 2d1d70eb64b..67bac59be67 100644 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -184,6 +184,7 @@ cmake %CMAKE_OPT% ^ -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 ^ diff --git a/python/ext-libs/CMakeLists.txt b/python/ext-libs/CMakeLists.txt index 6e609a927a6..e1816bb2bfa 100644 --- a/python/ext-libs/CMakeLists.txt +++ b/python/ext-libs/CMakeLists.txt @@ -33,7 +33,7 @@ MACRO(EXT_PYLIB lib) ENDIF(WITH_INTERNAL_${ulib}) ENDMACRO(EXT_PYLIB lib) -FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz yaml nose2) +FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz yaml nose2 requests) EXT_PYLIB(${pkg}) ENDFOREACH(pkg) diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template index 07a9f7d6241..5bb7bfa5c31 100644 --- a/rpm/qgis.spec.template +++ b/rpm/qgis.spec.template @@ -150,6 +150,7 @@ Requires: python-matplotlib Requires: python-OWSLib Requires: python-psycopg2 Requires: python-pygments +Requires: python-requests Requires: python-six Requires: qscintilla-python %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} @@ -219,6 +220,7 @@ gzip ChangeLog -D WITH_INTERNAL_MARKUPSAFE:BOOL=FALSE \ -D WITH_INTERNAL_OWSLIB:BOOL=FALSE \ -D WITH_INTERNAL_PYGMENTS:BOOL=FALSE \ + -D WITH_INTERNAL_REQUESTS:BOOL=FALSE \ -D WITH_INTERNAL_PYTZ:BOOL=FALSE \ -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \ -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \