TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: Adjust merge resolution.

Browse source 
Commit 276f40fdc3 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.
This commit is contained in:
Marius Bakke 2022-01-18 17:11:38 +01:00
parent 1bd250783d
commit 93006e5507
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/openstack.scm
View file

@ -269,9 +269,9 @@ (define-public python-os-testr
;; 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

21
gnu/packages/python-xyz.scm
View file

@ -28050,21 +28050,14 @@ (define-public python-platformdirs
(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