[Git][debian-gis-team/mipp][master] 2 commits: Fix build warnings

[Antonio Valentino]

Antonio Valentino pushed to branch master at Debian GIS Project / mipp


Commits:
3022d304 by Antonio Valentino at 2018-07-21T07:40:04+00:00
Fix build warnings

- - - - -
6c2f836a by Antonio Valentino at 2018-07-21T08:04:42+00:00
Do not use mocks in sphinx build

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/0005-no-mock.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mipp (1.1.0-2) UNRELEASED; urgency=medium
+
+  * debian/rules
+    - use the Python 2 version of sphinx-build (fix build warnings).
+  * debian/patches
+    - new 0005-no-mock.patch: avoid warnings during sphinx build.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 21 Jul 2018 07:27:18 +0000
+
 mipp (1.1.0-1) unstable; urgency=medium
 
   [ Antonio Valentino ]


=====================================
debian/patches/0005-no-mock.patch
=====================================
--- /dev/null
+++ b/debian/patches/0005-no-mock.patch
@@ -0,0 +1,23 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 21 Jul 2018 08:00:06 +0000
+Subject: no mock
+
+---
+ doc/source/conf.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index ecbae68..cd3c3b1 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -46,8 +46,8 @@ class Mock(object):
+ MOCK_MODULES = ['numpy', 'numpy.core', 'numpy.core.multiarray',
+                 'pyresample', 'pyresample.utils','pyresample.geometry',
+                 'osgeo', 'osgeo.gdal', 'osgeo.osr', 'logging']
+-for mod_name in MOCK_MODULES:
+-    sys.modules[mod_name] = Mock()
++#for mod_name in MOCK_MODULES:
++#    sys.modules[mod_name] = Mock()
+ 
+ 
+ # -- General configuration -----------------------------------------------------


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-configuration-loading.patch
 0003-fix-None-checking.patch
 0004-Relax-tests-on-metadata.patch
+0005-no-mock.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -7,17 +7,13 @@
 
 export PYBUILD_NAME=mipp
 export PYBUILD_TEST_ARGS=tests
+export PYBUILD_AFTER_BUILD_python2=env PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' $(MAKE) SPHINXBUILD=/usr/share/sphinx/scripts/python2/sphinx-build -C doc html
 
 
 %:
 	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
 
-override_dh_auto_build:
-	dh_auto_build
-	$(MAKE) -C doc html
-
-
 override_dh_auto_clean:
 	dh_auto_clean
 	$(RM) -r mipp.egg-info



View it on GitLab: https://salsa.debian.org/debian-gis-team/mipp/compare/3604b912a44a1ed145e89524c7c5d7569fcddbd3...6c2f836a1bbc062ee5bac84ead24052fc5de74f8

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mipp/compare/3604b912a44a1ed145e89524c7c5d7569fcddbd3...6c2f836a1bbc062ee5bac84ead24052fc5de74f8
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180721/85ba2ae7/attachment-0001.html>