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 | |
| parent | 1bd250783d7118c3101dd2a6e090f3d6904b24a0 (diff) | |
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.
| -rw-r--r-- | gnu/packages/openstack.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 21 |
2 files changed, 9 insertions, 16 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 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2c93c80138..7d68683f10 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28050,21 +28050,14 @@ compatible with a wide range of versions of the Stripe API.") (base32 "1njz0h4iky8iglrb85cd07hpa3lp1a2dfr934dj65hxwzvfk61j4")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'pretend-version - ;; The version string is usually derived via setuptools-scm, but - ;; without the git metadata available, the version string is set to - ;; '0.0.0'. - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs - (list python-appdirs python-pytest python-pytest-cov - python-pytest-mock python-setuptools-scm)) + (list python-appdirs python-pytest python-pytest-mock + python-setuptools-scm)) (home-page "https://github.com/platformdirs/platformdirs") (synopsis "Determine the appropriate platform-specific directories") (description "When writing applications, finding the right location to |