ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-28 07:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove python-distutils/next.

Browse source 
* gnu/packages/python-xyz.scm (python-distutils/next): Remove variable.
(python-virtualenv)[propagated-inputs]: Switch from
python-distutils/next to python-distutils.
* gnu/packages/version-control.scm (pre-commit)[inputs]: Same.
This commit is contained in:
Efraim Flashner 2021-08-09 17:42:14 +03:00
parent 5b6ac91ee4
commit 1d5d115e76
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 5 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3702,7 +3702,7 @@ (define-public python-virtualenv
("python-setuptools-scm" ,python-setuptools-scm))) ("python-setuptools-scm" ,python-setuptools-scm)))
(propagated-inputs (propagated-inputs
`(("python-appdirs" ,python-appdirs) `(("python-appdirs" ,python-appdirs)
("python-distlib" ,python-distlib/next) ("python-distlib" ,python-distlib)
("python-filelock" ,python-filelock) ("python-filelock" ,python-filelock)
("python-six" ,python-six))) ("python-six" ,python-six)))
(home-page "https://virtualenv.pypa.io/") (home-page "https://virtualenv.pypa.io/")
@ -6231,19 +6231,6 @@ (define-public python-distlib
used as the basis for third-party packaging tools.") used as the basis for third-party packaging tools.")
(license license:psfl))) (license license:psfl)))
;; TODO: Merge with 'python-distlib' on the next rebuild cycle.
(define-public python-distlib/next
(package
(inherit python-distlib)
(version "0.3.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "distlib" version ".zip"))
(sha256
(base32
"1wdzv7fsjhrkhh1wfkarlhcwa8m00mgcpdsvknmf2qy8f9l13xpd"))))))
(define-public python-distutils-extra (define-public python-distutils-extra
(package (package
(name "python-distutils-extra") (name "python-distutils-extra")

10
gnu/packages/version-control.scm
View file

@ -1560,16 +1560,14 @@ (define-public pre-commit
;; Ruby and Node tests require node and gem. ;; Ruby and Node tests require node and gem.
"--ignore=tests/languages/node_test.py" "--ignore=tests/languages/node_test.py"
"--ignore=tests/languages/ruby_test.py" "--ignore=tests/languages/ruby_test.py"
;; FIXME: Python tests fail because of distlib version "-k"
;; mismatch. Even with python-distlib/next it is
;; pulling version 0.3.0, while 0.3.1 is required.
"--ignore=tests/languages/python_test.py" "-k"
(string-append (string-append
;; TODO: these tests fail with AssertionError. It may ;; TODO: these tests fail with AssertionError. It may
;; be possible to fix them. ;; be possible to fix them.
"not test_install_existing_hooks_no_overwrite" "not test_install_existing_hooks_no_overwrite"
" and not test_uninstall_restores_legacy_hooks" " and not test_uninstall_restores_legacy_hooks"
" and not test_installed_from_venv"))))) " and not test_installed_from_venv"
" and not test_healthy_venv_creator")))))
(add-before 'reset-gzip-timestamps 'make-gz-writable (add-before 'reset-gzip-timestamps 'make-gz-writable
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Make sure .gz files are writable so that the ;; Make sure .gz files are writable so that the
@ -1581,7 +1579,7 @@ (define-public pre-commit
`(("git" ,git-minimal) `(("git" ,git-minimal)
("python-covdefaults" ,python-covdefaults) ("python-covdefaults" ,python-covdefaults)
("python-coverage" ,python-coverage) ("python-coverage" ,python-coverage)
("python-distlib" ,python-distlib/next) ("python-distlib" ,python-distlib)
("python-pytest" ,python-pytest) ("python-pytest" ,python-pytest)
("python-pytest-env" ,python-pytest-env) ("python-pytest-env" ,python-pytest-env)
("python-re-assert" ,python-re-assert) ("python-re-assert" ,python-re-assert)