From 93006e55073dbe26f26fedbf63ec397cb01a4575 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 18 Jan 2022 17:11:38 +0100 Subject: gnu: Adjust merge resolution. Commit 276f40fdc349d2ad62582b23ea55e061b689cfc0 added unnecessary changes to these variables. * gnu/packages/openstack.scm (python-os-testr)[propagated-inputs]: Remove everything except PYTHON-STESTR. [native-inputs]: Add PYTHON-BABEL, PYTHON-TESTREPOSITORY and PYTHON-TESTTOOLS. * gnu/packages/python-xyz.scm (python-platformdirs)[arguments]: Remove obsolete phase. Run pytest verbosely. [native-inputs]: Remove PYTHON-PYTEST-COV. --- gnu/packages/openstack.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 1b0f2786057..4c28bb92837 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-babel python-stestr python-testrepository python-testtools)) + (list python-stestr)) (native-inputs - (list python-pbr)) + (list python-babel python-pbr python-testrepository python-testtools)) (home-page "https://www.openstack.org/") (synopsis "Testr wrapper to provide functionality for OpenStack projects") (description -- cgit v1.3