[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/21: gnu: Adjust merge resolution.
From: |
guix-commits |
Subject: |
01/21: gnu: Adjust merge resolution. |
Date: |
Tue, 18 Jan 2022 13:38:42 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 93006e55073dbe26f26fedbf63ec397cb01a4575
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Jan 18 17:11:38 2022 +0100
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 ++--
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
- branch master updated (1bd250783d -> 4d7134c372), guix-commits, 2022/01/18
- 04/21: gnu: arm-trusted-firmware: Remove input labels., guix-commits, 2022/01/18
- 07/21: gnu: python-lazr-delegates: Fix test failure., guix-commits, 2022/01/18
- 01/21: gnu: Adjust merge resolution.,
guix-commits <=
- 09/21: gnu: python-rdflib: Update to 6.1.1., guix-commits, 2022/01/18
- 20/21: gnu: python-pyzabbix: Fix test failure., guix-commits, 2022/01/18
- 19/21: gnu: python-peachpy: Fix build., guix-commits, 2022/01/18
- 16/21: gnu: python-dulwich: Update to 0.20.30., guix-commits, 2022/01/18
- 10/21: gnu: python-rdflib-jsonld: Update to 0.6.2., guix-commits, 2022/01/18
- 03/21: gnu: Add arm-trusted-firmware-imx8mq., guix-commits, 2022/01/18
- 05/21: gnu: arm-trusted-firmware-rk3399: Remove input labels., guix-commits, 2022/01/18
- 06/21: gnu: python-gevent: Update to 21.12.0., guix-commits, 2022/01/18
- 02/21: gnu: arm-trusted-firmware: Use the default compiler., guix-commits, 2022/01/18
- 14/21: gnu: python-parse-type: Update to 0.5.2., guix-commits, 2022/01/18