[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: gnu: Remove python-distutils/next.
From: |
guix-commits |
Subject: |
02/05: gnu: Remove python-distutils/next. |
Date: |
Mon, 9 Aug 2021 13:21:19 -0400 (EDT) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit 1d5d115e76b39065acc9406a23d44adfb8f7d7e1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Aug 9 17:42:14 2021 +0300
gnu: Remove python-distutils/next.
* 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.
---
gnu/packages/python-xyz.scm | 15 +--------------
gnu/packages/version-control.scm | 10 ++++------
2 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2da0471..4ceb1c4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3702,7 +3702,7 @@ e.g. filters, callbacks and errbacks can all be
promises.")
("python-setuptools-scm" ,python-setuptools-scm)))
(propagated-inputs
`(("python-appdirs" ,python-appdirs)
- ("python-distlib" ,python-distlib/next)
+ ("python-distlib" ,python-distlib)
("python-filelock" ,python-filelock)
("python-six" ,python-six)))
(home-page "https://virtualenv.pypa.io/")
@@ -6231,19 +6231,6 @@ relate to packaging and distribution of Python software.
It is intended to be
used as the basis for third-party packaging tools.")
(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
(package
(name "python-distutils-extra")
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8bdac8d..709ddad 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1560,16 +1560,14 @@ control to Git repositories.")
;; Ruby and Node tests require node and gem.
"--ignore=tests/languages/node_test.py"
"--ignore=tests/languages/ruby_test.py"
- ;; FIXME: Python tests fail because of distlib version
- ;; 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"
+ "-k"
(string-append
;; TODO: these tests fail with AssertionError. It may
;; be possible to fix them.
"not test_install_existing_hooks_no_overwrite"
" 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
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure .gz files are writable so that the
@@ -1581,7 +1579,7 @@ control to Git repositories.")
`(("git" ,git-minimal)
("python-covdefaults" ,python-covdefaults)
("python-coverage" ,python-coverage)
- ("python-distlib" ,python-distlib/next)
+ ("python-distlib" ,python-distlib)
("python-pytest" ,python-pytest)
("python-pytest-env" ,python-pytest-env)
("python-re-assert" ,python-re-assert)