Merge branch 'version-1.4.0'

With resolved conflicts in:
	gnu/packages/gnome.scm
	gnu/packages/openstack.scm
	gnu/packages/python-xyz.scm

1 files changed, 2 insertions, 2 deletions

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e1ffc0ff23c..1b0f2786057 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -269,9 +269,9 @@ to docs.openstack.org and developer.openstack.org.")
      ;; when building the package. Skip the tests for now.
      `(#:tests? #f))
     (propagated-inputs
-     (list python-stestr))
+     (list python-babel python-stestr python-testrepository python-testtools))
     (native-inputs
-     (list python-pbr python-testtools python-babel python-testrepository))
+     (list python-pbr))
     (home-page "https://www.openstack.org/")
     (synopsis "Testr wrapper to provide functionality for OpenStack projects")
     (description