Upstream release 1.1.0

* Update Build-Depends. * Revert example files hotfix for https://phabricator.wikimedia.org/T174008. * Fix tests run with setuptools-scm Change-Id: I6203b6957bfa6d3938f1efdce5bb724204819f6a
wikimedia · Sep 21, 2017 · 0da95a6 · 0da95a6
1 parent 22b58c8
commit 0da95a6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,12 @@
+cumin (1.1.0-1) jessie-wikimedia; urgency=medium
+
+  * 1.1.0 upstream release.
+  * Update Build-Depends.
+  * Revert example files hotfix for https://phabricator.wikimedia.org/T174008.
+  * Fix tests run with setuptools-scm
+
+ -- Riccardo Coccioli <rcoccioli@wikimedia.org>  Thu, 21 Sep 2017 23:02:24 +0200
+
 cumin (1.0.0-1) jessie-wikimedia; urgency=medium
 
   * 1.0.0 upstream release.

diff --git a/debian/control b/debian/control
@@ -10,7 +10,10 @@ Build-Depends:
   python-all (>= 2.7),
   python-colorama,
   python-flake8,
+  python-keystoneauth1,
+  python-keystoneclient,
   python-mock (>= 2.0.0),
+  python-novaclient,
   python-pyparsing,
   python-pytest,
   python-pytest-cov,

diff --git a/debian/cumin.examples b/debian/cumin.examples
diff --git a/debian/rules b/debian/rules
@@ -7,9 +7,5 @@ export PYBUILD_TEST_PYTEST = 1
 	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_auto_test:
+	SETUPTOOLS_SCM_PRETEND_VERSION="$(shell dpkg-parsechangelog -S version)" python setup.py develop --user
 	py.test --strict --cov-report term-missing --cov=cumin cumin/tests/unit
-
-# Hotfix for https://phabricator.wikimedia.org/T174008
-override_dh_installexamples:
-	dh_installexamples
-	rm -rvf $(CURDIR)/debian/cumin/usr/doc