diff options
| author | Marius Bakke <marius@gnu.org> | 2022-01-18 17:11:38 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-01-18 19:35:54 +0100 |
| commit | 93006e55073dbe26f26fedbf63ec397cb01a4575 (patch) | |
| tree | ae83351316a8a1874e0ebcf381557d43bb051b19 /gnu/packages/openstack.scm | |
| parent | 1bd250783d7118c3101dd2a6e090f3d6904b24a0 (diff) | |
| download | guix-patches-93006e55073dbe26f26fedbf63ec397cb01a4575.tar guix-patches-93006e55073dbe26f26fedbf63ec397cb01a4575.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/openstack.scm')
| -rw-r--r-- | gnu/packages/openstack.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 1b0f278605..4c28bb9283 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 |