Skip to content
Permalink
Browse files

Merge pull request #3348 from tomkralidis/fix-requests-dep

ensure python-requests is available in the build
  • Loading branch information
tomkralidis committed Aug 1, 2016
2 parents ea0f4da + 4649e52 commit f7a3fd7368bc80334212a3e7889d42bc2045eddc
@@ -382,6 +382,7 @@ Depends:
python-jinja2,
python-markupsafe,
python-pygments,
python-requests,
python-dateutil,
python-tz,
python-six,
@@ -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 \
@@ -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 ^
@@ -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 ^
@@ -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)

@@ -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 \

0 comments on commit f7a3fd7

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