guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/07: gnu: python-setuptools-for-tensorflow: Patch for Python 3.10 comp


From: guix-commits
Subject: 05/07: gnu: python-setuptools-for-tensorflow: Patch for Python 3.10 compatibility.
Date: Fri, 21 Apr 2023 07:11:33 -0400 (EDT)

rekado pushed a commit to branch core-updates
in repository guix.

commit e9f01bfc976707af45dde0ab022318f74246e164
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Apr 21 09:55:45 2023 +0200

    gnu: python-setuptools-for-tensorflow: Patch for Python 3.10 compatibility.
    
    * gnu/packages/python-xyz.scm (python-setuptools-for-tensorflow)[arguments]:
    Patch collections imports; remove wininst support.
---
 gnu/packages/python-xyz.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d6dba68404..10b28f0888 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2311,8 +2311,20 @@ other machines, such as over the network.")
               (substitute* "setuptools/py33compat.py"
                 (("html_parser.HTMLParser\\(\\).unescape")
                  "html.unescape"))
+              ;; collections classes have moved in Python 3.10
+              (substitute* "pkg_resources/_vendor/pyparsing.py"
+                (("collections.MutableMapping")
+                 "collections.abc.MutableMapping")
+                (("collections.Iterable")
+                 "collections.abc.Iterable"))
               ;; This needs distutils.msvc9compiler
-              (delete-file "setuptools/tests/test_msvc.py"))))))
+              (delete-file "setuptools/tests/test_msvc.py")
+              ;; See https://github.com/pypa/setuptools/issues/2558
+              (delete-file "setuptools/command/bdist_wininst.py")
+              (substitute* "setuptools/command/install_scripts.py"
+                (("bw_cmd =.*") "\n")
+                (("is_wininst =.*")
+                 "is_wininst = False\n")))))))
      (native-inputs
       (list python-pytest python-mock python-six)))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]