* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
@ 2021-03-01 13:43 Lars-Dominik Braun
2021-05-15 9:31 ` Lars-Dominik Braun
2022-01-23 5:29 ` Maxim Cournoyer
0 siblings, 2 replies; 16+ messages in thread
From: Lars-Dominik Braun @ 2021-03-01 13:43 UTC (permalink / raw)
To: 46848
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
Hi everyone,
the attached patches switch python-build-system to a PEP 517-based build
system using python-pypa-build.
As discussed previously Python is currently in the process of opening up
for build systems other than setuptools using the API specified in PEP
517. python-pypa-build is a simple tool for building packages using that
new API. It supports setup.py-based builds as a fallback, if no
pyproject.toml is present.
One downside is that this tool is not self-contained and has a few
dependencies. Thus first I bootstrap setuptools using itself (possible
because it bundles all of its own dependencies), then build
python-pypa-build’s dependencies using setuptools (which is fortunately
still possible) and then combine everything into a
python-toolchain(-for-build), which is then used by the build-process.
I can successfully build packages like python-pypa-build and
python-pytest and python-pep517-bootstrap. The latter is using flit as
its build backend. But other packages currently fail because I removed
some arguments.
Cheers,
Lars
[-- Attachment #2: 0001-build-python-Handle-missing-setuptools-in-sanity-che.patch --]
[-- Type: text/x-diff, Size: 1103 bytes --]
From 7ace01faef72f3a48b18fe241fe0524445a154fb Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 19 Feb 2021 17:22:35 +0100
Subject: [PATCH 01/12] build/python: Handle missing setuptools in
sanity-check.py
Just skip testing if required dependencies (setuptools) are not
available.
* gnu/packages/aux-files/python/sanity-check.py: Handle ImportError.
---
gnu/packages/aux-files/python/sanity-check.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/aux-files/python/sanity-check.py b/gnu/packages/aux-files/python/sanity-check.py
index 83b6d583ca..240155cecc 100644
--- a/gnu/packages/aux-files/python/sanity-check.py
+++ b/gnu/packages/aux-files/python/sanity-check.py
@@ -19,9 +19,13 @@
from __future__ import print_function # Python 2 support.
import importlib
-import pkg_resources
import sys
import traceback
+try:
+ import pkg_resources
+except ImportError:
+ print('Warning: Skipping, because python-setuptools are not available.')
+ sys.exit(0)
try:
from importlib.machinery import PathFinder
--
2.26.2
[-- Attachment #3: 0002-gnu-python-pypa-build-Update-to-0.3.0.patch --]
[-- Type: text/x-diff, Size: 1187 bytes --]
From 66033f14455456d465a3c9f5a2d1f4961cd3b989 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 12:50:42 +0100
Subject: [PATCH 02/12] gnu: python-pypa-build: Update to 0.3.0.
* gnu/packages/python-build.scm (python-pypa-build): Update to 0.3.0.
---
gnu/packages/python-build.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 140629ca43..92dbda314f 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -118,13 +118,13 @@ Language (TOML) configuration files.")
(define-public python-pypa-build
(package
(name "python-pypa-build")
- (version "0.1.0")
+ (version "0.3.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "build" version))
(sha256
(base32
- "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8"))))
+ "1pazq66c35whrqd5b0zcydjvy2rmghi8riljkd67q3bpiln5pf8f"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ;to tests in the PyPI release
--
2.26.2
[-- Attachment #4: 0003-gnu-python-wheel-Install-entrypoint-scripts.patch --]
[-- Type: text/x-diff, Size: 1651 bytes --]
From 00ef998413dc0fe6605653ae16f65d6377c2ec77 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:02:15 +0100
Subject: [PATCH 03/12] gnu: python-wheel: Install entrypoint scripts
* gnu/packages/python-build.scm (pythont-wheel) [arguments]: Add phase
'patch-enable-entrypoints.
---
gnu/packages/python-build.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 92dbda314f..232e24f470 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -47,10 +47,17 @@
"0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h"))))
(build-system python-build-system)
(arguments
- ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn
- ;; fails to find the newly-built bdist_wheel library, even though it is
- ;; available on PYTHONPATH. What search path is consulted by setup.py?
- '(#:tests? #f))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-enable-entrypoints
+ (lambda _
+ ;; python-wheel tells setuptools to not install entry point scripts
+ ;; by default. Stop doing that, so wheels built contain all data
+ ;; required.
+ (substitute* "wheel/bdist_wheel.py"
+ (("(install_scripts\\.no_ep = )True" all assignment)
+ (string-append assignment "False")))
+ #t)))))
(home-page "https://bitbucket.org/pypa/wheel/")
(synopsis "Format for built Python packages")
(description
--
2.26.2
[-- Attachment #5: 0004-gnu-python-setuptools-Bootstrap-using-itself.patch --]
[-- Type: text/x-diff, Size: 1610 bytes --]
From 61313d8ddba30772e2587e3e16ca30d1565d3c7e Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:05:51 +0100
Subject: [PATCH 04/12] gnu: python-setuptools: Bootstrap using itself
* gnu/packages/python-xyz.scm (python-setuptools) [arguments]: Add phase
setting GUIX_PYTHONPATH to source directory.
---
gnu/packages/python-xyz.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f8afa13f33..79d01f700a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1144,7 +1144,18 @@ other machines, such as over the network.")
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments
- `(#:tests? #f))
+ `(#:tests? #f
+ #:python ,python-wrapper
+ #:phases (modify-phases %standard-phases
+ ;; Use this setuptools’ sources to bootstrap themselves.
+ (add-before 'build 'set-PYTHONPATH
+ (lambda _
+ (format #t "current working dir ~s~%" (getcwd))
+ (setenv "GUIX_PYTHONPATH"
+ (string-append ".:" (getenv "GUIX_PYTHONPATH")))
+ #t)))))
+ ;; Not required when not building a wheel
+ ;(propagated-inputs `(("python-wheel" ,python-wheel)))
(home-page "https://pypi.org/project/setuptools/")
(synopsis
"Library designed to facilitate packaging Python projects")
--
2.26.2
[-- Attachment #6: 0005-python-build-Switch-to-PEP-517-based-build.patch --]
[-- Type: text/x-diff, Size: 24575 bytes --]
From 7a99aaa40e65fde58ee2e78ad7d3e0ccd6d169ae Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:08:58 +0100
Subject: [PATCH 05/12] python-build: Switch to PEP 517-based build
* gnu/packages/python-commencement.scm: New file, containing
python-toolchain.
* gnu/local.mk: Add it.
* gnu/packages/python.scm (python): Disable installing bundled
pip/setuptools.
* guix/build/python-build-system.scm: Rewrite using python-pypa-build.
* guix/build-system/python.scm (default-python): Switch to
python-toolchain
(lower): Remove unused parameter.
XXX: rationale
---
gnu/local.mk | 1 +
gnu/packages/python-commencement.scm | 175 +++++++++++++++++++
gnu/packages/python.scm | 2 +-
guix/build-system/python.scm | 8 +-
guix/build/python-build-system.scm | 249 ++++++++++++++++++---------
5 files changed, 342 insertions(+), 93 deletions(-)
create mode 100644 gnu/packages/python-commencement.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 202677fed1..ef2532cb5d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -463,6 +463,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/python.scm \
%D%/packages/python-build.scm \
%D%/packages/python-check.scm \
+ %D%/packages/python-commencement.scm \
%D%/packages/python-compression.scm \
%D%/packages/python-crypto.scm \
%D%/packages/python-science.scm \
diff --git a/gnu/packages/python-commencement.scm b/gnu/packages/python-commencement.scm
new file mode 100644
index 0000000000..2ced3079bc
--- /dev/null
+++ b/gnu/packages/python-commencement.scm
@@ -0,0 +1,175 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
+;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages python-commencement)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix download)
+ #:use-module (guix packages)
+ #:use-module (guix build-system trivial)
+ #:use-module (guix build-system python)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26))
+
+;; Python toolchain and all packages required to bootstrap it.
+
+(define-public python-toolchain
+ (package
+ (name "python-toolchain")
+ (version (package-version python))
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build union))
+ #:builder (begin
+ (use-modules (ice-9 match)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build union))
+
+ (let ((out (assoc-ref %outputs "out")))
+ (union-build out (filter-map (match-lambda
+ ((_ . directory) directory))
+ %build-inputs))
+ #t))))
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)
+ ("python-pip" ,python-pip))) ; XXX Maybe virtualenv/venv too? It kind of
+ ; defeats the purpose of guix, but is used
+ ; alot in local development.
+ (native-search-paths
+ (package-native-search-paths python))
+ (search-paths
+ (package-search-paths python))
+ (license (package-license python)) ; XXX
+ (synopsis "Python toolchain")
+ (description
+ "Python toolchain including Python itself, setuptools and pip. Use this
+package if you need a fully-fledged Python toolchain instead of just the
+interpreter.")
+ (home-page (package-home-page python))))
+
+;; Python 3 toolchain for python-build-system. We cannot use python-toolchain
+;; here, since we’d need to bootstrap python-pip somehow.
+(define-public python-toolchain-for-build
+ (package
+ (inherit python-toolchain)
+ (name "python-toolchain-for-build")
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)
+ ("python-pypa-build" ,python-pypa-build-from-setuptools)))))
+
+;; Python 3 toolchain to bootstrap python-pypa-build
+(define-public python-toolchain-only-setuptools
+ (package
+ (inherit python-toolchain)
+ (name "python-toolchain-only-setuptools")
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)))))
+
+(define-public python-pypa-build-from-setuptools
+ (package
+ (inherit python-pypa-build)
+ (name "python-pypa-build-from-setuptools")
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools))
+ (propagated-inputs
+ `(("python-pep517" ,python-pep517-from-setuptools)
+ ("python-packaging" ,python-packaging-from-setuptools)))))
+
+(define-public python-pep517-from-setuptools
+ (package
+ (inherit python-pep517-bootstrap)
+ (name "python-pep517-from-setuptools")
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* "setup.py"
+ (("distutils\\.core") "setuptools"))
+ #t)))))
+ (propagated-inputs
+ `(("python-toml" ,python-toml-from-setuptools)
+ ("python-wheel" ,python-wheel-from-setuptools)))
+ ;; Drop cyclic dependency.
+ (native-inputs '())))
+
+(define-public python-toml-from-setuptools
+ (package
+ (inherit python-toml)
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-toml)))))
+
+(define-public python-packaging-from-setuptools
+ (package
+ (inherit python-packaging-bootstrap)
+ (name "python-packaging-from-setuptools")
+ (arguments
+ `(#:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-packaging-bootstrap)))
+ (propagated-inputs
+ `(("python-pyparsing" ,python-pyparsing-from-setuptools)
+ ("python-six" ,python-six-from-setuptools)))))
+
+(define-public python-pyparsing-from-setuptools
+ (package
+ (inherit python-pyparsing)
+ (name "python-pyparsing-from-setuptools")
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-pyparsing)))))
+
+(define-public python-six-from-setuptools
+ (package
+ (inherit python-six-bootstrap)
+ (name "python-six-from-setuptools")
+ (arguments
+ `(#:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-six-bootstrap)))))
+
+(define-public python-wheel-from-setuptools
+ (package
+ (inherit python-wheel)
+ (name "python-wheel-from-setuptools")
+ (arguments
+ `(#:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-wheel)))))
+
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8e8f46467b..ca5ce667ef 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -182,7 +182,7 @@
(list "--enable-shared" ;allow embedding
"--with-system-expat" ;for XML support
"--with-system-ffi" ;build ctypes
- "--with-ensurepip=install" ;install pip and setuptools
+ "--with-ensurepip=no" ;do not install pip and setuptools
"--enable-unicode=ucs4"
;; Prevent the installed _sysconfigdata.py from retaining a reference
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index 2bb6fa87ca..998ea9323d 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -65,8 +65,8 @@ extension, such as '.tar.gz'."
(define (default-python)
"Return the default Python package."
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((python (resolve-interface '(gnu packages python))))
- (module-ref python 'python-wrapper)))
+ (let ((python (resolve-interface '(gnu packages python-commencement))))
+ (module-ref python 'python-toolchain-for-build)))
(define (default-python2)
"Return the default Python 2 package."
@@ -172,8 +172,6 @@ pre-defined variants."
(define* (python-build store name inputs
#:key
(tests? #t)
- (test-target "test")
- (use-setuptools? #t)
(configure-flags ''())
(phases '(@ (guix build python-build-system)
%standard-phases))
@@ -199,9 +197,7 @@ provides a 'setup.py' file as its build system."
source))
#:configure-flags ,configure-flags
#:system ,system
- #:test-target ,test-target
#:tests? ,tests?
- #:use-setuptools? ,use-setuptools?
#:phases ,phases
#:outputs %outputs
#:search-paths ',(map search-path-specification->sexp
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 8ade1d5911..a5731511a9 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -34,6 +34,7 @@
#:use-module (ice-9 format)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-35)
#:export (%standard-phases
add-installed-pythonpath
site-packages
@@ -108,30 +109,17 @@
;; "--single-version-externally-managed" is set, thus the .egg-info directory
;; and the scripts defined in entry-points will always be created.
+;; Base error type.
+(define-condition-type &python-build-error &error
+ python-build-error?)
-(define setuptools-shim
- ;; Run setup.py with "setuptools" being imported, which will patch
- ;; "distutils". This is needed for packages using "distutils" instead of
- ;; "setuptools" since the former does not understand the
- ;; "--single-version-externally-managed" flag.
- ;; Python code taken from pip 9.0.1 pip/utils/setuptools_build.py
- (string-append
- "import setuptools, tokenize;__file__='setup.py';"
- "f=getattr(tokenize, 'open', open)(__file__);"
- "code=f.read().replace('\\r\\n', '\\n');"
- "f.close();"
- "exec(compile(code, __file__, 'exec'))"))
-
-(define (call-setuppy command params use-setuptools?)
- (if (file-exists? "setup.py")
- (begin
- (format #t "running \"python setup.py\" with command ~s and parameters ~s~%"
- command params)
- (if use-setuptools?
- (apply invoke "python" "-c" setuptools-shim
- command params)
- (apply invoke "python" "./setup.py" command params)))
- (error "no setup.py found")))
+;; Raised when 'check cannot find a valid test system in the inputs.
+(define-condition-type &test-system-not-found &python-build-error
+ test-system-not-found?)
+
+;; Raised when multiple wheels are created by 'build.
+(define-condition-type &cannot-extract-multiple-wheels &python-build-error
+ cannot-extract-multiple-wheels?)
(define* (sanity-check #:key tests? inputs outputs #:allow-other-keys)
"Ensure packages depending on this package via setuptools work properly,
@@ -142,23 +130,51 @@ without errors."
(with-directory-excursion "/tmp"
(invoke "python" sanity-check.py (site-packages inputs outputs)))))
-(define* (build #:key use-setuptools? #:allow-other-keys)
+(define* (build #:key outputs #:allow-other-keys)
"Build a given Python package."
- (call-setuppy "build" '() use-setuptools?)
+
+ (define pyproject-build (which "pyproject-build"))
+
+ (define (build-pep517)
+ ;; XXX: should probably use a different path, outside of source directory,
+ ;; maybe secondary output “wheel”?
+ (mkdir-p "dist")
+ (invoke pyproject-build "--outdir" "dist" "--no-isolation" "--wheel" "."))
+
+ ;; XXX Would be nice, if we could use bdist_wheel here to remove extra
+ ;; code path in 'install, but that depends on python-wheel.
+ (define (build-setuptools)
+ (invoke "python" "setup.py" "build"))
+
+ (if pyproject-build
+ (build-pep517)
+ (build-setuptools))
#t)
-(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
+(define* (check #:key inputs outputs tests? #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
- ;; Running `setup.py test` creates an additional .egg-info directory in
- ;; build/lib in some cases, e.g. if the source is in a sub-directory
- ;; (given with `package_dir`). This will by copied to the output, too,
- ;; so we need to remove.
- (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
- (call-setuppy test-target '() use-setuptools?)
- (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
- (inter (lset-difference string=? after before)))
- (for-each delete-file-recursively inter)))
+ ;; Unfortunately with PEP 517 there is no common method to specify test
+ ;; systems. Guess test system based on inputs instead.
+ (let ((pytest (which "pytest"))
+ (have-setup-py (file-exists? "setup.py")))
+ ;; Prefer pytest
+ ;; XXX: support nose
+ (cond
+ (pytest
+ (begin
+ (format #t "using pytest~%")
+ (invoke pytest "-vv"))) ; XXX: support skipping tests based on name/extra arguments?
+ ;; But fall back to setup.py, which should work for most
+ ;; packages. XXX: would be nice not to depend on setup.py here? fails
+ ;; more often than not to find any tests at all. Maybe we can run
+ ;; `python -m unittest`?
+ (have-setup-py
+ (begin
+ (format #t "using setup.py~%")
+ (invoke "python" "setup.py" "test" "-v")))
+ ;; The developer should explicitly disable tests in this case.
+ (#t (raise (condition (&test-system-not-found))))))
(format #t "test suite not run~%"))
#t)
@@ -195,31 +211,109 @@ running checks after installing the package."
"/bin:"
(getenv "PATH"))))
-(define* (install #:key inputs outputs (configure-flags '()) use-setuptools?
- #:allow-other-keys)
- "Install a given Python package."
- (let* ((out (python-output outputs))
- (python (assoc-ref inputs "python"))
- (major-minor (map string->number
- (take (string-split (python-version python) #\.) 2)))
- (<3.7? (match major-minor
- ((major minor)
- (or (< major 3) (and (= major 3) (< minor 7))))))
- (params (append (list (string-append "--prefix=" out)
- "--no-compile")
- (if use-setuptools?
- ;; distutils does not accept these flags
- (list "--single-version-externally-managed"
- "--root=/")
- '())
- configure-flags)))
- (call-setuppy "install" params use-setuptools?)
- ;; Rather than produce potentially non-reproducible .pyc files on Pythons
- ;; older than 3.7, whose 'compileall' module lacks the
- ;; '--invalidation-mode' option, do not generate any.
- (unless <3.7?
- (invoke "python" "-m" "compileall" "--invalidation-mode=unchecked-hash"
- out))))
+(define* (install #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Install a wheel file according to PEP 427"
+ ;; See https://www.python.org/dev/peps/pep-0427/#installing-a-wheel-distribution-1-0-py32-none-any-whl
+ (let* ((site-dir (site-packages inputs outputs))
+ (out (assoc-ref outputs "out")))
+ (define (extract file)
+ "Extract wheel (ZIP file) into site-packages directory"
+ ;; Use Python’s zipfile to avoid extra dependency
+ (invoke "python" "-m" "zipfile" "-e" file site-dir))
+
+ (define python-hashbang
+ (string-append "#!" (assoc-ref inputs "python") "/bin/python"))
+
+ (define (move-data source destination)
+ (mkdir-p (dirname destination))
+ (rename-file source destination))
+
+ (define (move-script source destination)
+ "Move executable script file from .data/scripts to out/bin and replace
+temporary hashbang"
+ (move-data source destination)
+ ;; ZIP does not save/restore permissions, make executable
+ ;; XXX: might not be a file, but directory with subdirectories
+ (chmod destination #o755)
+ (substitute* destination (("#!python") python-hashbang)))
+
+ ;; Python’s distutils.command.install defines this mapping from source to
+ ;; destination mapping.
+ (define install-schemes
+ `(("scripts" "bin" ,move-script)
+ ;; XXX: Why does Python not use share/ here?
+ ("data" "share" ,move-data)))
+
+ (define (expand-data-directory directory)
+ "Move files from all .data subdirectories to their respective
+destinations."
+ (for-each
+ (match-lambda ((source destination function)
+ (let ((source-path (string-append directory "/" source))
+ (destination-path (string-append out "/" destination)))
+ (when (file-exists? source-path)
+ (begin
+ ;; This assumes only files exist in the scripts/ directory.
+ (for-each
+ (lambda (file)
+ (apply
+ function
+ (list
+ (string-append source-path "/" file)
+ (string-append destination-path "/" file))))
+ (scandir source-path (negate (cut member <> '("." "..")))))
+ (rmdir source-path))))))
+ install-schemes))
+
+ (define pyproject-build (which "pyproject-build"))
+
+ (define (list-directories base predicate)
+ ;; Cannot use find-files here, because it’s recursive.
+ (scandir
+ base
+ (lambda (name)
+ (let ((stat (lstat (string-append base "/" name))))
+ (and
+ (not (member name '("." "..")))
+ (eq? (stat:type stat) 'directory)
+ (predicate name stat))))))
+
+ (define (install-pep517)
+ "Install a wheel generated by a PEP 517-compatible builder."
+ (let ((wheels (find-files "dist" "\\.whl$"))) ; XXX: do not recurse
+ (when (> (length wheels) 1) ; This code does not support multiple wheels
+ ; yet, because their outputs would have to be
+ ; merged properly.
+ (raise (condition (&cannot-extract-multiple-wheels))))
+ (for-each extract wheels))
+ (let ((datadirs (map
+ (cut string-append site-dir "/" <>)
+ (list-directories site-dir (file-name-predicate "\\.data$")))))
+ (for-each (lambda (directory)
+ (expand-data-directory directory)
+ (rmdir directory))
+ datadirs)))
+
+ (define (install-setuptools)
+ "Install using setuptools."
+ (let ((out (assoc-ref outputs "out")))
+ (invoke "python" "setup.py"
+ "install"
+ "--prefix" out
+ "--single-version-externally-managed"
+ "--root=/")))
+
+ (if pyproject-build
+ (install-pep517)
+ (install-setuptools))
+ #t))
+
+(define* (compile-bytecode #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Compile installed byte-code in site-packages."
+ (let ((site-dir (site-packages inputs outputs)))
+ (invoke "python" "-m" "compileall" site-dir)
+ ;; XXX: We could compile with -O and -OO too here, at the cost of more space.
+ #t))
(define* (wrap #:key inputs outputs #:allow-other-keys)
(define (list-of-files dir)
@@ -243,29 +337,12 @@ running checks after installing the package."
files)))
bindirs)))
-(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
- "Rename easy-install.pth to NAME.pth to avoid conflicts between packages
-installed with setuptools."
- ;; Even if the "easy-install.pth" is not longer created, we kept this phase.
- ;; There still may be packages creating an "easy-install.pth" manually for
- ;; some good reason.
- (let* ((site-packages (site-packages inputs outputs))
- (easy-install-pth (string-append site-packages "/easy-install.pth"))
- (new-pth (string-append site-packages "/" name ".pth")))
- (when (file-exists? easy-install-pth)
- (rename-file easy-install-pth new-pth))))
-
-(define* (ensure-no-mtimes-pre-1980 #:rest _)
- "Ensure that there are no mtimes before 1980-01-02 in the source tree."
- ;; Rationale: patch-and-repack creates tarballs with timestamps at the POSIX
- ;; epoch, 1970-01-01 UTC. This causes problems with Python packages,
- ;; because Python eggs are ZIP files, and the ZIP format does not support
- ;; timestamps before 1980.
- (let ((early-1980 315619200)) ; 1980-01-02 UTC
- (ftw "." (lambda (file stat flag)
- (unless (<= early-1980 (stat:mtime stat))
- (utime file early-1980 early-1980))
- #t))))
+(define* (set-SOURCE-DATE-EPOCH #:rest _)
+ "Set the 'SOURCE_DATE_EPOCH' environment variable. This is used by tools
+that incorporate timestamps as a way to tell them to use a fixed timestamp.
+See https://reproducible-builds.org/specs/source-date-epoch/."
+ (setenv "SOURCE_DATE_EPOCH" "315619200") ;; python-wheel respects this variable and sets pre-1980 times on files in zip files, which is unsupported
+ #t)
(define* (enable-bytecode-determinism #:rest _)
"Improve determinism of pyc files."
@@ -292,11 +369,11 @@ by Cython."
;; prefix directory. The check phase is moved after the installation phase
;; to ease testing the built package.
(modify-phases gnu:%standard-phases
- (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980)
- (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (add-after 'unpack 'enable-bytecode-determinism
enable-bytecode-determinism)
(add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
ensure-no-cythonized-files)
+ (replace 'set-SOURCE-DATE-EPOCH set-SOURCE-DATE-EPOCH)
(delete 'bootstrap)
(delete 'configure) ;not needed
(replace 'build build)
@@ -308,7 +385,7 @@ by Cython."
(add-after 'add-install-to-path 'wrap wrap)
(add-after 'wrap 'check check)
(add-after 'check 'sanity-check sanity-check)
- (add-before 'strip 'rename-pth-file rename-pth-file)))
+ (add-before 'check 'compile-bytecode compile-bytecode)))
(define* (python-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args)
--
2.26.2
[-- Attachment #7: 0006-gnu-Add-python-pytoml.patch --]
[-- Type: text/x-diff, Size: 1325 bytes --]
From 14b70dea3d21684e7fdb66dd072031cef3214b07 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:17:10 +0100
Subject: [PATCH 06/12] gnu: Add python-pytoml.
* gnu/packages/python-build.scm (python-pytoml): Add new variable.
---
gnu/packages/python-build.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 232e24f470..a6a310177c 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -173,3 +173,20 @@ implementation developed for Poetry. This project is intended to be
a light weight, fully compliant, self-contained package allowing PEP 517
compatible build front-ends to build Poetry managed projects.")
(license license:expat)))
+
+(define-public python-pytoml
+ (package
+ (name "python-pytoml")
+ (version "0.1.21")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytoml" version))
+ (sha256
+ (base32
+ "1rv1byiw82k7mj6aprcrqi2vdabs801y97xhfnrz7kxds34ggv4f"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/avakar/pytoml")
+ (synopsis "A parser for TOML-0.4.0")
+ (description "A parser for TOML-0.4.0")
+ (license license:expat)))
--
2.26.2
[-- Attachment #8: 0007-gnu-Add-python-flit-core.patch --]
[-- Type: text/x-diff, Size: 1643 bytes --]
From e8b1f40157b3d884bb2fc3e3d10bbfbd469c67b9 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:18:17 +0100
Subject: [PATCH 07/12] gnu: Add python-flit-core.
* gnu/packages/python-build.scm (python-flit-core): New variable.
---
gnu/packages/python-build.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index a6a310177c..f767704a78 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -190,3 +190,30 @@ compatible build front-ends to build Poetry managed projects.")
(synopsis "A parser for TOML-0.4.0")
(description "A parser for TOML-0.4.0")
(license license:expat)))
+
+(define-public python-flit-core
+ (package
+ (name "python-flit-core")
+ (version "3.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "flit_core" version))
+ (sha256
+ (base32
+ "0bbw84r33gwi0xyp7m8dzp2dzpjs4harj3l5wrbxkmp2awh0ard4"))))
+ (build-system python-build-system)
+ (arguments
+ `(;; No tests.
+ #:tests? #f))
+ (propagated-inputs
+ `(("python-pytoml" ,python-pytoml)))
+ (home-page "https://github.com/takluyver/flit")
+ (synopsis
+ "Simplified packaging of Python modules, distribution-building parts")
+ (description
+ "Flit is a simple way to put Python packages and modules on PyPI. It
+tries to require less thought about packaging and help you avoid common
+mistakes. Distribution-building parts of Flit.")
+ (license license:bsd-3)))
+
--
2.26.2
[-- Attachment #9: 0008-gnu-python-pep517-bootstrap-Build-using-flit-core.patch --]
[-- Type: text/x-diff, Size: 1596 bytes --]
From 316c25f310cad4dd8f0cb73a914a4776b1b1375c Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:20:48 +0100
Subject: [PATCH 08/12] gnu: python-pep517-bootstrap: Build using flit-core.
* gnu/packages/python-build.scm (python-pep517-bootstrap) [arguments]:
Relax dependency on flit-core version.
[native-inputs]: Add flit-core.
---
gnu/packages/python-build.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index f767704a78..f74a3ee49e 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -110,10 +110,21 @@ Language (TOML) configuration files.")
"0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"))))
(build-system python-build-system)
(arguments
- `(#:tests? #f)) ;to avoid circular dependencies
+ `(#:tests? #f ; To avoid circular dependencies.
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'relax-dependency
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("flit_core >=2,<3")
+ "flit_core >=2,<4"))
+ #t)))))
(propagated-inputs
`(("python-toml" ,python-toml)
("python-wheel" ,python-wheel)))
+ (native-inputs
+ `(;; Build system.
+ ("python-flit-core" ,python-flit-core)))
(home-page "https://github.com/pypa/pep517")
(synopsis "Wrappers to build Python packages using PEP 517 hooks")
(description
--
2.26.2
[-- Attachment #10: 0009-gnu-python-iniconfig-Add-missing-build-input.patch --]
[-- Type: text/x-diff, Size: 992 bytes --]
From c8898a6a282daaa2cceabfac96e417f7b09e8d5f Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:23:53 +0100
Subject: [PATCH 09/12] gnu: python-iniconfig: Add missing build input.
* gnu/packages/python-xyz.scm (python-iniconfig) [native-inputs] Add
setuptools-scm.
---
gnu/packages/python-xyz.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 79d01f700a..d598a380a9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15704,6 +15704,7 @@ in other versions.")
(base32
"0ckzngs3scaa1mcfmsi1w40a1l8cxxnncscrxzjjwjyisx8z0fmw"))))
(build-system python-build-system)
+ (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/RonnyPfannschmidt/iniconfig")
(synopsis "Simple INI-file parser")
(description "The @code{iniconfig} package provides a small and simple
--
2.26.2
[-- Attachment #11: 0010-gnu-Add-python-u-msgpack.patch --]
[-- Type: text/x-diff, Size: 1739 bytes --]
From 8f5c9398ac1a6ac1871d5cf8a1efbe6a70ed4a1b Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 14:16:07 +0100
Subject: [PATCH 10/12] gnu: Add python-u-msgpack.
* gnu/packages/python-xyz.scm (python-u-msgpack): New variable.
The redundant -python postfix from the original package name has been
removed.
---
gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d598a380a9..ab3c6d301e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23659,3 +23659,27 @@ Application Programming Interface based on the Open Inventor 2.1 API.")
Crayons automatically wraps a given string in the foreground color and
restores the original state after the string is printed.")
(license license:expat)))
+
+(define-public python-u-msgpack
+ (package
+ (name "python-u-msgpack")
+ (version "2.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "u-msgpack-python" version))
+ (sha256
+ (base32
+ "0lcmlr7gc4dydpxn6l5bdcq40c3ghf8mv1sjqyj72wdpr8rx9rxp"))))
+ (build-system python-build-system)
+ (home-page
+ "https://github.com/vsergeev/u-msgpack-python")
+ (synopsis
+ "Portable, lightweight MessagePack serializer and deserializer")
+ (description
+ "A portable, lightweight MessagePack serializer and deserializer written
+in pure Python. u-msgpack-python is fully compliant with the latest MessagePack
+specification. In particular, it supports the new binary, UTF-8 string,
+application-defined ext, and timestamp types.")
+ (license license:expat)))
+
--
2.26.2
[-- Attachment #12: 0011-gnu-Add-python-pytest-expect.patch --]
[-- Type: text/x-diff, Size: 1831 bytes --]
From 39eef77658f400ccfceb65b6fcd3f4996ae90807 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 14:20:03 +0100
Subject: [PATCH 11/12] gnu: Add python-pytest-expect.
* gnu/packages/python-check.scm (python-pytest-expect): New variable.
---
gnu/packages/python-check.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 9849b16685..4139f3cdde 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1251,3 +1251,31 @@ help in debugging failures and optimizing the scheduler to improve speed.")
(description "A pytest plugin for Sanic. It helps you to test your
code asynchronously.")
(license license:expat)))
+
+(define-public python-pytest-expect
+ (package
+ (name "python-pytest-expect")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest-expect" version))
+ (sha256
+ (base32
+ "0iyq3zd1g5ffaz2wv6mskjfn84sfbyh0j209glcrh1s50hkldd1n"))))
+ (build-system python-build-system)
+ (arguments `(#:tests? #f)) ; no tests via pypi
+ (propagated-inputs
+ `(("python-pytest" ,python-pytest) ; package declares this dependency
+ ("python-u-msgpack" ,python-u-msgpack)))
+ (home-page
+ "https://github.com/gsnedders/pytest-expect")
+ (synopsis
+ "Py.test plugin to store test expectations and mark tests based on them")
+ (description
+ "A py.test plugin that stores test expectations by saving the set of
+failing tests, allowing them to be marked as xfail when running them in future.
+The tests expectations are stored such that they can be distributed alongside
+the tests.")
+ (license license:expat)))
+
--
2.26.2
[-- Attachment #13: 0012-gnu-python-html5lib-Fix-tests-with-pytest-6.patch --]
[-- Type: text/x-diff, Size: 1880 bytes --]
From 4ed7eba12c80dd33f20626ddb81abc34dd667ab3 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 14:23:07 +0100
Subject: [PATCH 12/12] gnu: python-html5lib: Fix tests with pytest 6.
* gnu/packages/python-web.scm (python-html5lib) [source]: Add upstream
patch.
[native-inputs]: Add test dependencies.
[arguments]: Remove unsupported #:test-target.
---
gnu/packages/python-web.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 947c200253..c484d7ba36 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1020,13 +1020,27 @@ storage.")
(uri (pypi-uri "html5lib" version))
(sha256
(base32
- "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))))
+ "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))
+ (patches
+ (list
+ ;; Adds Pytest 6 support.
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/html5lib/"
+ "html5lib-python/commit/"
+ "2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch"))
+ (file-name "python-html5lib-support-pytest6.patch")
+ (sha256
+ (base32
+ "0jg2ry0439q8n7j1mf4p2hdq54i704pq9scv4wwa2pp3cwvb6dvg")))))))
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)
("python-webencodings" ,python-webencodings)))
- (arguments
- `(#:test-target "check"))
+ (native-inputs
+ `(("python-pytest" ,python-pytest)
+ ("python-pytest-expect" ,python-pytest-expect)))
(home-page
"https://github.com/html5lib/html5lib-python")
(synopsis
--
2.26.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2021-03-01 13:43 [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system Lars-Dominik Braun
@ 2021-05-15 9:31 ` Lars-Dominik Braun
2021-12-13 20:10 ` Lars-Dominik Braun
2022-01-23 5:29 ` Maxim Cournoyer
1 sibling, 1 reply; 16+ messages in thread
From: Lars-Dominik Braun @ 2021-05-15 9:31 UTC (permalink / raw)
To: 46848
[-- Attachment #1: Type: text/plain, Size: 82 bytes --]
Hi,
I rebased my changes on top of the current core-updates HEAD.
Cheers,
Lars
[-- Attachment #2: 0001-build-python-Handle-missing-setuptools-in-sanity-che.patch --]
[-- Type: text/x-diff, Size: 1103 bytes --]
From 9d9c417fba869913366a12c89b7309ecc402777d Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 19 Feb 2021 17:22:35 +0100
Subject: [PATCH 01/14] build/python: Handle missing setuptools in
sanity-check.py
Just skip testing if required dependencies (setuptools) are not
available.
* gnu/packages/aux-files/python/sanity-check.py: Handle ImportError.
---
gnu/packages/aux-files/python/sanity-check.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/aux-files/python/sanity-check.py b/gnu/packages/aux-files/python/sanity-check.py
index 83b6d583ca..240155cecc 100644
--- a/gnu/packages/aux-files/python/sanity-check.py
+++ b/gnu/packages/aux-files/python/sanity-check.py
@@ -19,9 +19,13 @@
from __future__ import print_function # Python 2 support.
import importlib
-import pkg_resources
import sys
import traceback
+try:
+ import pkg_resources
+except ImportError:
+ print('Warning: Skipping, because python-setuptools are not available.')
+ sys.exit(0)
try:
from importlib.machinery import PathFinder
--
2.26.3
[-- Attachment #3: 0002-gnu-python-pypa-build-Update-to-0.3.0.patch --]
[-- Type: text/x-diff, Size: 1187 bytes --]
From 5cdfe3f6de27be54eeaa5c507a62319c3783ff1a Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 12:50:42 +0100
Subject: [PATCH 02/14] gnu: python-pypa-build: Update to 0.3.0.
* gnu/packages/python-build.scm (python-pypa-build): Update to 0.3.0.
---
gnu/packages/python-build.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 59ee91aa9c..25e2f1e60f 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -136,13 +136,13 @@ Language (TOML) configuration files.")
(define-public python-pypa-build
(package
(name "python-pypa-build")
- (version "0.1.0")
+ (version "0.3.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "build" version))
(sha256
(base32
- "1d6m21lijwm04g50nwgsgj7x3vhblzw7jv05ah8psqgzk20bbch8"))))
+ "1pazq66c35whrqd5b0zcydjvy2rmghi8riljkd67q3bpiln5pf8f"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ;to tests in the PyPI release
--
2.26.3
[-- Attachment #4: 0003-gnu-python-wheel-Install-entrypoint-scripts.patch --]
[-- Type: text/x-diff, Size: 1651 bytes --]
From 9516a9e734009f7e38acb37a51f704de9e6198ef Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:02:15 +0100
Subject: [PATCH 03/14] gnu: python-wheel: Install entrypoint scripts
* gnu/packages/python-build.scm (pythont-wheel) [arguments]: Add phase
'patch-enable-entrypoints.
---
gnu/packages/python-build.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 25e2f1e60f..bbd273e5de 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -49,10 +49,17 @@
"0ii6f34rvpjg3nmw4bc2h7fhdsy38y1h93hghncfs5akfrldmj8h"))))
(build-system python-build-system)
(arguments
- ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn
- ;; fails to find the newly-built bdist_wheel library, even though it is
- ;; available on PYTHONPATH. What search path is consulted by setup.py?
- '(#:tests? #f))
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-enable-entrypoints
+ (lambda _
+ ;; python-wheel tells setuptools to not install entry point scripts
+ ;; by default. Stop doing that, so wheels built contain all data
+ ;; required.
+ (substitute* "wheel/bdist_wheel.py"
+ (("(install_scripts\\.no_ep = )True" all assignment)
+ (string-append assignment "False")))
+ #t)))))
(home-page "https://bitbucket.org/pypa/wheel/")
(synopsis "Format for built Python packages")
(description
--
2.26.3
[-- Attachment #5: 0004-gnu-python-setuptools-Bootstrap-using-itself.patch --]
[-- Type: text/x-diff, Size: 1610 bytes --]
From 19349bf56a88feb5ebc0d24c4f3324e776b2f5ff Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:05:51 +0100
Subject: [PATCH 04/14] gnu: python-setuptools: Bootstrap using itself
* gnu/packages/python-xyz.scm (python-setuptools) [arguments]: Add phase
setting GUIX_PYTHONPATH to source directory.
---
gnu/packages/python-xyz.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index eebb44b9dc..8f472dea42 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1390,7 +1390,18 @@ other machines, such as over the network.")
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments
- `(#:tests? #f))
+ `(#:tests? #f
+ #:python ,python-wrapper
+ #:phases (modify-phases %standard-phases
+ ;; Use this setuptools’ sources to bootstrap themselves.
+ (add-before 'build 'set-PYTHONPATH
+ (lambda _
+ (format #t "current working dir ~s~%" (getcwd))
+ (setenv "GUIX_PYTHONPATH"
+ (string-append ".:" (getenv "GUIX_PYTHONPATH")))
+ #t)))))
+ ;; Not required when not building a wheel
+ ;(propagated-inputs `(("python-wheel" ,python-wheel)))
(home-page "https://pypi.org/project/setuptools/")
(synopsis
"Library designed to facilitate packaging Python projects")
--
2.26.3
[-- Attachment #6: 0005-python-build-Switch-to-PEP-517-based-build.patch --]
[-- Type: text/x-diff, Size: 24126 bytes --]
From 0e023d986fe6a093d5f13923b84c54a674fd2278 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:08:58 +0100
Subject: [PATCH 05/14] python-build: Switch to PEP 517-based build
* gnu/packages/python-commencement.scm: New file, containing
python-toolchain.
* gnu/local.mk: Add it.
* gnu/packages/python.scm (python): Disable installing bundled
pip/setuptools.
* guix/build/python-build-system.scm: Rewrite using python-pypa-build.
* guix/build-system/python.scm (default-python): Switch to
python-toolchain
(lower): Remove unused parameter.
XXX: rationale
---
gnu/local.mk | 1 +
gnu/packages/python-commencement.scm | 175 +++++++++++++++++++
gnu/packages/python.scm | 2 +-
guix/build-system/python.scm | 6 +-
guix/build/python-build-system.scm | 249 ++++++++++++++++++---------
5 files changed, 343 insertions(+), 90 deletions(-)
create mode 100644 gnu/packages/python-commencement.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 0e1e83b3d5..e1e41adff7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -465,6 +465,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/python.scm \
%D%/packages/python-build.scm \
%D%/packages/python-check.scm \
+ %D%/packages/python-commencement.scm \
%D%/packages/python-compression.scm \
%D%/packages/python-crypto.scm \
%D%/packages/python-science.scm \
diff --git a/gnu/packages/python-commencement.scm b/gnu/packages/python-commencement.scm
new file mode 100644
index 0000000000..2ced3079bc
--- /dev/null
+++ b/gnu/packages/python-commencement.scm
@@ -0,0 +1,175 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
+;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages python-commencement)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix download)
+ #:use-module (guix packages)
+ #:use-module (guix build-system trivial)
+ #:use-module (guix build-system python)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26))
+
+;; Python toolchain and all packages required to bootstrap it.
+
+(define-public python-toolchain
+ (package
+ (name "python-toolchain")
+ (version (package-version python))
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build union))
+ #:builder (begin
+ (use-modules (ice-9 match)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build union))
+
+ (let ((out (assoc-ref %outputs "out")))
+ (union-build out (filter-map (match-lambda
+ ((_ . directory) directory))
+ %build-inputs))
+ #t))))
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)
+ ("python-pip" ,python-pip))) ; XXX Maybe virtualenv/venv too? It kind of
+ ; defeats the purpose of guix, but is used
+ ; alot in local development.
+ (native-search-paths
+ (package-native-search-paths python))
+ (search-paths
+ (package-search-paths python))
+ (license (package-license python)) ; XXX
+ (synopsis "Python toolchain")
+ (description
+ "Python toolchain including Python itself, setuptools and pip. Use this
+package if you need a fully-fledged Python toolchain instead of just the
+interpreter.")
+ (home-page (package-home-page python))))
+
+;; Python 3 toolchain for python-build-system. We cannot use python-toolchain
+;; here, since we’d need to bootstrap python-pip somehow.
+(define-public python-toolchain-for-build
+ (package
+ (inherit python-toolchain)
+ (name "python-toolchain-for-build")
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)
+ ("python-pypa-build" ,python-pypa-build-from-setuptools)))))
+
+;; Python 3 toolchain to bootstrap python-pypa-build
+(define-public python-toolchain-only-setuptools
+ (package
+ (inherit python-toolchain)
+ (name "python-toolchain-only-setuptools")
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)))))
+
+(define-public python-pypa-build-from-setuptools
+ (package
+ (inherit python-pypa-build)
+ (name "python-pypa-build-from-setuptools")
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools))
+ (propagated-inputs
+ `(("python-pep517" ,python-pep517-from-setuptools)
+ ("python-packaging" ,python-packaging-from-setuptools)))))
+
+(define-public python-pep517-from-setuptools
+ (package
+ (inherit python-pep517-bootstrap)
+ (name "python-pep517-from-setuptools")
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* "setup.py"
+ (("distutils\\.core") "setuptools"))
+ #t)))))
+ (propagated-inputs
+ `(("python-toml" ,python-toml-from-setuptools)
+ ("python-wheel" ,python-wheel-from-setuptools)))
+ ;; Drop cyclic dependency.
+ (native-inputs '())))
+
+(define-public python-toml-from-setuptools
+ (package
+ (inherit python-toml)
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-toml)))))
+
+(define-public python-packaging-from-setuptools
+ (package
+ (inherit python-packaging-bootstrap)
+ (name "python-packaging-from-setuptools")
+ (arguments
+ `(#:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-packaging-bootstrap)))
+ (propagated-inputs
+ `(("python-pyparsing" ,python-pyparsing-from-setuptools)
+ ("python-six" ,python-six-from-setuptools)))))
+
+(define-public python-pyparsing-from-setuptools
+ (package
+ (inherit python-pyparsing)
+ (name "python-pyparsing-from-setuptools")
+ (arguments
+ `(#:tests? #f
+ #:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-pyparsing)))))
+
+(define-public python-six-from-setuptools
+ (package
+ (inherit python-six-bootstrap)
+ (name "python-six-from-setuptools")
+ (arguments
+ `(#:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-six-bootstrap)))))
+
+(define-public python-wheel-from-setuptools
+ (package
+ (inherit python-wheel)
+ (name "python-wheel-from-setuptools")
+ (arguments
+ `(#:python ,python-toolchain-only-setuptools
+ ,@(package-arguments python-wheel)))))
+
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index b2ec486d7a..38a1ebe49f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -183,7 +183,7 @@
(list "--enable-shared" ;allow embedding
"--with-system-expat" ;for XML support
"--with-system-ffi" ;build ctypes
- "--with-ensurepip=install" ;install pip and setuptools
+ "--with-ensurepip=no" ;do not install pip and setuptools
"--enable-unicode=ucs4"
;; Prevent the installed _sysconfigdata.py from retaining a reference
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index efade6f74b..4a23b42628 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -67,8 +67,8 @@ extension, such as '.tar.gz'."
(define (default-python)
"Return the default Python package."
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((python (resolve-interface '(gnu packages python))))
- (module-ref python 'python-wrapper)))
+ (let ((python (resolve-interface '(gnu packages python-commencement))))
+ (module-ref python 'python-toolchain-for-build)))
(define (default-python2)
"Return the default Python 2 package."
@@ -172,9 +172,9 @@ pre-defined variants."
(define* (python-build name inputs
#:key source
(tests? #t)
+ (configure-flags ''())
(test-target "test")
(use-setuptools? #t)
- (configure-flags ''())
(phases '%standard-phases)
(outputs '("out"))
(search-paths '())
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 5b1339d14c..fbc90d3655 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -34,6 +34,7 @@
#:use-module (ice-9 format)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-35)
#:export (%standard-phases
add-installed-pythonpath
site-packages
@@ -108,30 +109,17 @@
;; "--single-version-externally-managed" is set, thus the .egg-info directory
;; and the scripts defined in entry-points will always be created.
+;; Base error type.
+(define-condition-type &python-build-error &error
+ python-build-error?)
-(define setuptools-shim
- ;; Run setup.py with "setuptools" being imported, which will patch
- ;; "distutils". This is needed for packages using "distutils" instead of
- ;; "setuptools" since the former does not understand the
- ;; "--single-version-externally-managed" flag.
- ;; Python code taken from pip 9.0.1 pip/utils/setuptools_build.py
- (string-append
- "import setuptools, tokenize;__file__='setup.py';"
- "f=getattr(tokenize, 'open', open)(__file__);"
- "code=f.read().replace('\\r\\n', '\\n');"
- "f.close();"
- "exec(compile(code, __file__, 'exec'))"))
-
-(define (call-setuppy command params use-setuptools?)
- (if (file-exists? "setup.py")
- (begin
- (format #t "running \"python setup.py\" with command ~s and parameters ~s~%"
- command params)
- (if use-setuptools?
- (apply invoke "python" "-c" setuptools-shim
- command params)
- (apply invoke "python" "./setup.py" command params)))
- (error "no setup.py found")))
+;; Raised when 'check cannot find a valid test system in the inputs.
+(define-condition-type &test-system-not-found &python-build-error
+ test-system-not-found?)
+
+;; Raised when multiple wheels are created by 'build.
+(define-condition-type &cannot-extract-multiple-wheels &python-build-error
+ cannot-extract-multiple-wheels?)
(define* (sanity-check #:key tests? inputs outputs #:allow-other-keys)
"Ensure packages depending on this package via setuptools work properly,
@@ -142,23 +130,51 @@ without errors."
(with-directory-excursion "/tmp"
(invoke "python" sanity-check.py (site-packages inputs outputs)))))
-(define* (build #:key use-setuptools? #:allow-other-keys)
+(define* (build #:key outputs #:allow-other-keys)
"Build a given Python package."
- (call-setuppy "build" '() use-setuptools?)
+
+ (define pyproject-build (which "pyproject-build"))
+
+ (define (build-pep517)
+ ;; XXX: should probably use a different path, outside of source directory,
+ ;; maybe secondary output “wheel”?
+ (mkdir-p "dist")
+ (invoke pyproject-build "--outdir" "dist" "--no-isolation" "--wheel" "."))
+
+ ;; XXX Would be nice, if we could use bdist_wheel here to remove extra
+ ;; code path in 'install, but that depends on python-wheel.
+ (define (build-setuptools)
+ (invoke "python" "setup.py" "build"))
+
+ (if pyproject-build
+ (build-pep517)
+ (build-setuptools))
#t)
-(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
+(define* (check #:key inputs outputs tests? #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
- ;; Running `setup.py test` creates an additional .egg-info directory in
- ;; build/lib in some cases, e.g. if the source is in a sub-directory
- ;; (given with `package_dir`). This will by copied to the output, too,
- ;; so we need to remove.
- (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
- (call-setuppy test-target '() use-setuptools?)
- (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
- (inter (lset-difference string=? after before)))
- (for-each delete-file-recursively inter)))
+ ;; Unfortunately with PEP 517 there is no common method to specify test
+ ;; systems. Guess test system based on inputs instead.
+ (let ((pytest (which "pytest"))
+ (have-setup-py (file-exists? "setup.py")))
+ ;; Prefer pytest
+ ;; XXX: support nose
+ (cond
+ (pytest
+ (begin
+ (format #t "using pytest~%")
+ (invoke pytest "-vv"))) ; XXX: support skipping tests based on name/extra arguments?
+ ;; But fall back to setup.py, which should work for most
+ ;; packages. XXX: would be nice not to depend on setup.py here? fails
+ ;; more often than not to find any tests at all. Maybe we can run
+ ;; `python -m unittest`?
+ (have-setup-py
+ (begin
+ (format #t "using setup.py~%")
+ (invoke "python" "setup.py" "test" "-v")))
+ ;; The developer should explicitly disable tests in this case.
+ (#t (raise (condition (&test-system-not-found))))))
(format #t "test suite not run~%"))
#t)
@@ -195,31 +211,109 @@ running checks after installing the package."
"/bin:"
(getenv "PATH"))))
-(define* (install #:key inputs outputs (configure-flags '()) use-setuptools?
- #:allow-other-keys)
- "Install a given Python package."
- (let* ((out (python-output outputs))
- (python (assoc-ref inputs "python"))
- (major-minor (map string->number
- (take (string-split (python-version python) #\.) 2)))
- (<3.7? (match major-minor
- ((major minor)
- (or (< major 3) (and (= major 3) (< minor 7))))))
- (params (append (list (string-append "--prefix=" out)
- "--no-compile")
- (if use-setuptools?
- ;; distutils does not accept these flags
- (list "--single-version-externally-managed"
- "--root=/")
- '())
- configure-flags)))
- (call-setuppy "install" params use-setuptools?)
- ;; Rather than produce potentially non-reproducible .pyc files on Pythons
- ;; older than 3.7, whose 'compileall' module lacks the
- ;; '--invalidation-mode' option, do not generate any.
- (unless <3.7?
- (invoke "python" "-m" "compileall" "--invalidation-mode=unchecked-hash"
- out))))
+(define* (install #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Install a wheel file according to PEP 427"
+ ;; See https://www.python.org/dev/peps/pep-0427/#installing-a-wheel-distribution-1-0-py32-none-any-whl
+ (let* ((site-dir (site-packages inputs outputs))
+ (out (assoc-ref outputs "out")))
+ (define (extract file)
+ "Extract wheel (ZIP file) into site-packages directory"
+ ;; Use Python’s zipfile to avoid extra dependency
+ (invoke "python" "-m" "zipfile" "-e" file site-dir))
+
+ (define python-hashbang
+ (string-append "#!" (assoc-ref inputs "python") "/bin/python"))
+
+ (define (move-data source destination)
+ (mkdir-p (dirname destination))
+ (rename-file source destination))
+
+ (define (move-script source destination)
+ "Move executable script file from .data/scripts to out/bin and replace
+temporary hashbang"
+ (move-data source destination)
+ ;; ZIP does not save/restore permissions, make executable
+ ;; XXX: might not be a file, but directory with subdirectories
+ (chmod destination #o755)
+ (substitute* destination (("#!python") python-hashbang)))
+
+ ;; Python’s distutils.command.install defines this mapping from source to
+ ;; destination mapping.
+ (define install-schemes
+ `(("scripts" "bin" ,move-script)
+ ;; XXX: Why does Python not use share/ here?
+ ("data" "share" ,move-data)))
+
+ (define (expand-data-directory directory)
+ "Move files from all .data subdirectories to their respective
+destinations."
+ (for-each
+ (match-lambda ((source destination function)
+ (let ((source-path (string-append directory "/" source))
+ (destination-path (string-append out "/" destination)))
+ (when (file-exists? source-path)
+ (begin
+ ;; This assumes only files exist in the scripts/ directory.
+ (for-each
+ (lambda (file)
+ (apply
+ function
+ (list
+ (string-append source-path "/" file)
+ (string-append destination-path "/" file))))
+ (scandir source-path (negate (cut member <> '("." "..")))))
+ (rmdir source-path))))))
+ install-schemes))
+
+ (define pyproject-build (which "pyproject-build"))
+
+ (define (list-directories base predicate)
+ ;; Cannot use find-files here, because it’s recursive.
+ (scandir
+ base
+ (lambda (name)
+ (let ((stat (lstat (string-append base "/" name))))
+ (and
+ (not (member name '("." "..")))
+ (eq? (stat:type stat) 'directory)
+ (predicate name stat))))))
+
+ (define (install-pep517)
+ "Install a wheel generated by a PEP 517-compatible builder."
+ (let ((wheels (find-files "dist" "\\.whl$"))) ; XXX: do not recurse
+ (when (> (length wheels) 1) ; This code does not support multiple wheels
+ ; yet, because their outputs would have to be
+ ; merged properly.
+ (raise (condition (&cannot-extract-multiple-wheels))))
+ (for-each extract wheels))
+ (let ((datadirs (map
+ (cut string-append site-dir "/" <>)
+ (list-directories site-dir (file-name-predicate "\\.data$")))))
+ (for-each (lambda (directory)
+ (expand-data-directory directory)
+ (rmdir directory))
+ datadirs)))
+
+ (define (install-setuptools)
+ "Install using setuptools."
+ (let ((out (assoc-ref outputs "out")))
+ (invoke "python" "setup.py"
+ "install"
+ "--prefix" out
+ "--single-version-externally-managed"
+ "--root=/")))
+
+ (if pyproject-build
+ (install-pep517)
+ (install-setuptools))
+ #t))
+
+(define* (compile-bytecode #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Compile installed byte-code in site-packages."
+ (let ((site-dir (site-packages inputs outputs)))
+ (invoke "python" "-m" "compileall" site-dir)
+ ;; XXX: We could compile with -O and -OO too here, at the cost of more space.
+ #t))
(define* (wrap #:key inputs outputs #:allow-other-keys)
(define (list-of-files dir)
@@ -243,29 +337,12 @@ running checks after installing the package."
files)))
bindirs)))
-(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
- "Rename easy-install.pth to NAME.pth to avoid conflicts between packages
-installed with setuptools."
- ;; Even if the "easy-install.pth" is not longer created, we kept this phase.
- ;; There still may be packages creating an "easy-install.pth" manually for
- ;; some good reason.
- (let* ((site-packages (site-packages inputs outputs))
- (easy-install-pth (string-append site-packages "/easy-install.pth"))
- (new-pth (string-append site-packages "/" name ".pth")))
- (when (file-exists? easy-install-pth)
- (rename-file easy-install-pth new-pth))))
-
-(define* (ensure-no-mtimes-pre-1980 #:rest _)
- "Ensure that there are no mtimes before 1980-01-02 in the source tree."
- ;; Rationale: patch-and-repack creates tarballs with timestamps at the POSIX
- ;; epoch, 1970-01-01 UTC. This causes problems with Python packages,
- ;; because Python eggs are ZIP files, and the ZIP format does not support
- ;; timestamps before 1980.
- (let ((early-1980 315619200)) ; 1980-01-02 UTC
- (ftw "." (lambda (file stat flag)
- (unless (<= early-1980 (stat:mtime stat))
- (utime file early-1980 early-1980))
- #t))))
+(define* (set-SOURCE-DATE-EPOCH #:rest _)
+ "Set the 'SOURCE_DATE_EPOCH' environment variable. This is used by tools
+that incorporate timestamps as a way to tell them to use a fixed timestamp.
+See https://reproducible-builds.org/specs/source-date-epoch/."
+ (setenv "SOURCE_DATE_EPOCH" "315619200") ;; python-wheel respects this variable and sets pre-1980 times on files in zip files, which is unsupported
+ #t)
(define* (enable-bytecode-determinism #:rest _)
"Improve determinism of pyc files."
@@ -292,11 +369,11 @@ by Cython."
;; prefix directory. The check phase is moved after the installation phase
;; to ease testing the built package.
(modify-phases gnu:%standard-phases
- (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980)
- (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (add-after 'unpack 'enable-bytecode-determinism
enable-bytecode-determinism)
(add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
ensure-no-cythonized-files)
+ (replace 'set-SOURCE-DATE-EPOCH set-SOURCE-DATE-EPOCH)
(delete 'bootstrap)
(delete 'configure) ;not needed
(replace 'build build)
@@ -308,7 +385,7 @@ by Cython."
(add-after 'add-install-to-path 'wrap wrap)
(add-after 'wrap 'check check)
(add-after 'check 'sanity-check sanity-check)
- (add-before 'strip 'rename-pth-file rename-pth-file)))
+ (add-before 'check 'compile-bytecode compile-bytecode)))
(define* (python-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args)
--
2.26.3
[-- Attachment #7: 0006-gnu-Add-python-pytoml.patch --]
[-- Type: text/x-diff, Size: 1325 bytes --]
From 881a8e817a1fe21a39bcfdc3e5be2d2ac7760cb9 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:17:10 +0100
Subject: [PATCH 06/14] gnu: Add python-pytoml.
* gnu/packages/python-build.scm (python-pytoml): Add new variable.
---
gnu/packages/python-build.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index bbd273e5de..238fc8b3a5 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -191,3 +191,20 @@ implementation developed for Poetry. This project is intended to be
a light weight, fully compliant, self-contained package allowing PEP 517
compatible build front-ends to build Poetry managed projects.")
(license license:expat)))
+
+(define-public python-pytoml
+ (package
+ (name "python-pytoml")
+ (version "0.1.21")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytoml" version))
+ (sha256
+ (base32
+ "1rv1byiw82k7mj6aprcrqi2vdabs801y97xhfnrz7kxds34ggv4f"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/avakar/pytoml")
+ (synopsis "A parser for TOML-0.4.0")
+ (description "A parser for TOML-0.4.0")
+ (license license:expat)))
--
2.26.3
[-- Attachment #8: 0007-gnu-Add-python-flit-core.patch --]
[-- Type: text/x-diff, Size: 1643 bytes --]
From 545fa78c3a42f5cc22ccc9ea70e0ff1f9bcebe5c Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:18:17 +0100
Subject: [PATCH 07/14] gnu: Add python-flit-core.
* gnu/packages/python-build.scm (python-flit-core): New variable.
---
gnu/packages/python-build.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 238fc8b3a5..8940e6490b 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -208,3 +208,30 @@ compatible build front-ends to build Poetry managed projects.")
(synopsis "A parser for TOML-0.4.0")
(description "A parser for TOML-0.4.0")
(license license:expat)))
+
+(define-public python-flit-core
+ (package
+ (name "python-flit-core")
+ (version "3.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "flit_core" version))
+ (sha256
+ (base32
+ "0bbw84r33gwi0xyp7m8dzp2dzpjs4harj3l5wrbxkmp2awh0ard4"))))
+ (build-system python-build-system)
+ (arguments
+ `(;; No tests.
+ #:tests? #f))
+ (propagated-inputs
+ `(("python-pytoml" ,python-pytoml)))
+ (home-page "https://github.com/takluyver/flit")
+ (synopsis
+ "Simplified packaging of Python modules, distribution-building parts")
+ (description
+ "Flit is a simple way to put Python packages and modules on PyPI. It
+tries to require less thought about packaging and help you avoid common
+mistakes. Distribution-building parts of Flit.")
+ (license license:bsd-3)))
+
--
2.26.3
[-- Attachment #9: 0008-gnu-python-pep517-bootstrap-Build-using-flit-core.patch --]
[-- Type: text/x-diff, Size: 1596 bytes --]
From 4ffe19ccc9b6d077c811cfbdd715d10a79730e8f Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:20:48 +0100
Subject: [PATCH 08/14] gnu: python-pep517-bootstrap: Build using flit-core.
* gnu/packages/python-build.scm (python-pep517-bootstrap) [arguments]:
Relax dependency on flit-core version.
[native-inputs]: Add flit-core.
---
gnu/packages/python-build.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 8940e6490b..c53d49c287 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -128,10 +128,21 @@ Language (TOML) configuration files.")
"0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"))))
(build-system python-build-system)
(arguments
- `(#:tests? #f)) ;to avoid circular dependencies
+ `(#:tests? #f ; To avoid circular dependencies.
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'relax-dependency
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("flit_core >=2,<3")
+ "flit_core >=2,<4"))
+ #t)))))
(propagated-inputs
`(("python-toml" ,python-toml)
("python-wheel" ,python-wheel)))
+ (native-inputs
+ `(;; Build system.
+ ("python-flit-core" ,python-flit-core)))
(home-page "https://github.com/pypa/pep517")
(synopsis "Wrappers to build Python packages using PEP 517 hooks")
(description
--
2.26.3
[-- Attachment #10: 0009-gnu-python-iniconfig-Add-missing-build-input.patch --]
[-- Type: text/x-diff, Size: 992 bytes --]
From f1eea04f204dc0fef64675ac2605f42535aa0815 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 28 Feb 2021 13:23:53 +0100
Subject: [PATCH 09/14] gnu: python-iniconfig: Add missing build input.
* gnu/packages/python-xyz.scm (python-iniconfig) [native-inputs] Add
setuptools-scm.
---
gnu/packages/python-xyz.scm | 1 +
1 file changed, 1 insertion(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8f472dea42..47466d31f0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17110,6 +17110,7 @@ in other versions.")
(base32
"0ckzngs3scaa1mcfmsi1w40a1l8cxxnncscrxzjjwjyisx8z0fmw"))))
(build-system python-build-system)
+ (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm)))
(home-page "https://github.com/RonnyPfannschmidt/iniconfig")
(synopsis "Simple INI-file parser")
(description "The @code{iniconfig} package provides a small and simple
--
2.26.3
[-- Attachment #11: 0010-gnu-Add-python-u-msgpack.patch --]
[-- Type: text/x-diff, Size: 1705 bytes --]
From 271997517b2b03aec44e8b158c911412caccf7bf Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 14:16:07 +0100
Subject: [PATCH 10/14] gnu: Add python-u-msgpack.
* gnu/packages/python-xyz.scm (python-u-msgpack): New variable.
The redundant -python postfix from the original package name has been
removed.
---
gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 47466d31f0..fdc9bd85b7 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25575,3 +25575,27 @@ is the cythonized version of @code{fractions.Fraction}.")
"@code{pathvalidate} is a Python library to sanitize/validate strings
representing paths or filenames.")
(license license:expat)))
+
+(define-public python-u-msgpack
+ (package
+ (name "python-u-msgpack")
+ (version "2.7.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "u-msgpack-python" version))
+ (sha256
+ (base32
+ "0lcmlr7gc4dydpxn6l5bdcq40c3ghf8mv1sjqyj72wdpr8rx9rxp"))))
+ (build-system python-build-system)
+ (home-page
+ "https://github.com/vsergeev/u-msgpack-python")
+ (synopsis
+ "Portable, lightweight MessagePack serializer and deserializer")
+ (description
+ "A portable, lightweight MessagePack serializer and deserializer written
+in pure Python. u-msgpack-python is fully compliant with the latest MessagePack
+specification. In particular, it supports the new binary, UTF-8 string,
+application-defined ext, and timestamp types.")
+ (license license:expat)))
+
--
2.26.3
[-- Attachment #12: 0011-gnu-Add-python-pytest-expect.patch --]
[-- Type: text/x-diff, Size: 1835 bytes --]
From 77f5e2e445e01c3ce7b1c9484ca27ba86b9d5def Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 14:20:03 +0100
Subject: [PATCH 11/14] gnu: Add python-pytest-expect.
* gnu/packages/python-check.scm (python-pytest-expect): New variable.
---
gnu/packages/python-check.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index ff29f5d7ce..80fb5f704a 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1515,3 +1515,31 @@ allows one to create a set of tests using @emph{pairwise combinations} method,
reducing a number of combinations of variables into a lesser set that covers
most situations.")
(license license:expat)))
+
+(define-public python-pytest-expect
+ (package
+ (name "python-pytest-expect")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest-expect" version))
+ (sha256
+ (base32
+ "0iyq3zd1g5ffaz2wv6mskjfn84sfbyh0j209glcrh1s50hkldd1n"))))
+ (build-system python-build-system)
+ (arguments `(#:tests? #f)) ; no tests via pypi
+ (propagated-inputs
+ `(("python-pytest" ,python-pytest) ; package declares this dependency
+ ("python-u-msgpack" ,python-u-msgpack)))
+ (home-page
+ "https://github.com/gsnedders/pytest-expect")
+ (synopsis
+ "Py.test plugin to store test expectations and mark tests based on them")
+ (description
+ "A py.test plugin that stores test expectations by saving the set of
+failing tests, allowing them to be marked as xfail when running them in future.
+The tests expectations are stored such that they can be distributed alongside
+the tests.")
+ (license license:expat)))
+
--
2.26.3
[-- Attachment #13: 0012-gnu-python-html5lib-Fix-tests-with-pytest-6.patch --]
[-- Type: text/x-diff, Size: 1899 bytes --]
From 2e2eb3c05f285f3bfc4c990309584eb98503cd91 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 14:23:07 +0100
Subject: [PATCH 12/14] gnu: python-html5lib: Fix tests with pytest 6.
* gnu/packages/python-web.scm (python-html5lib) [source]: Add upstream
patch.
[native-inputs]: Add test dependencies.
[arguments]: Remove unsupported #:test-target.
---
gnu/packages/python-web.scm | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8b31368424..8ab783bbb3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1079,7 +1079,20 @@ storage.")
(uri (pypi-uri "html5lib" version))
(sha256
(base32
- "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))))
+ "0vqlhk0hgbsfkh7ybmby93xhlx8dq6pr5blf356ka3z2c41b9rdj"))
+ (patches
+ (list
+ ;; Adds Pytest 6 support.
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/html5lib/"
+ "html5lib-python/commit/"
+ "2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch"))
+ (file-name "python-html5lib-support-pytest6.patch")
+ (sha256
+ (base32
+ "0jg2ry0439q8n7j1mf4p2hdq54i704pq9scv4wwa2pp3cwvb6dvg")))))))
(build-system python-build-system)
(propagated-inputs
`(("python-six" ,python-six)
@@ -1088,6 +1101,9 @@ storage.")
("python-chardet" ,python-chardet)))
(arguments
`(#:test-target "check"))
+ (native-inputs
+ `(("python-pytest" ,python-pytest)
+ ("python-pytest-expect" ,python-pytest-expect)))
(home-page
"https://github.com/html5lib/html5lib-python")
(synopsis
--
2.26.3
[-- Attachment #14: 0013-gnu-python-libxml2-Fix-build.patch --]
[-- Type: text/x-diff, Size: 1145 bytes --]
From 312ee407e5d878da99098753ba24641c2c468451 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 17:18:50 +0100
Subject: [PATCH 13/14] gnu: python-libxml2: Fix build.
* gnu/packages/xml.scm (python-libxml2) [#:phases]: Replace setuptools
and do not exit at the end of setup.py.
---
gnu/packages/xml.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 9accd08a7e..9d93d21e27 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -370,7 +370,10 @@ It uses libxml2 to access the XML files.")
(format #f "ROOT = r'~a'" libxml2))
;; For 'iconv.h'.
(("/opt/include")
- (string-append glibc "/include"))))
+ (string-append glibc "/include"))
+ (("distutils\\.core") "setuptools")
+ ;; python-pypa-build does not like it if setup.py exits.
+ (("sys\\.exit\\(0\\)") "")))
#t)))))
(inputs `(("libxml2" ,libxml2)))
(synopsis "Python bindings for the libxml2 library")))
--
2.26.3
[-- Attachment #15: 0014-gnu-scons-Remove-obsolete-argument.patch --]
[-- Type: text/x-diff, Size: 1090 bytes --]
From ec72099a90b0fc7f6538f578ab3e28411391dacb Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 1 Mar 2021 17:21:35 +0100
Subject: [PATCH 14/14] gnu: scons: Remove obsolete argument.
* gnu/packages/python-xyz.scm (scons) [arguments]: Remove #:use-setuptools?
argument.
---
gnu/packages/python-xyz.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fdc9bd85b7..a61451f8ea 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2641,8 +2641,7 @@ and is not compatible with JSON.")
"1xy8jrwz87y589ihcld4hv7wn122sjbz914xn8h50ww77wbhk8hn"))))
(build-system python-build-system)
(arguments
- `(#:use-setuptools? #f ; still relies on distutils
- #:tests? #f ; no 'python setup.py test' command
+ `(#:tests? #f ; no 'python setup.py test' command
#:phases
(modify-phases %standard-phases
(add-before 'build 'bootstrap
--
2.26.3
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2021-05-15 9:31 ` Lars-Dominik Braun
@ 2021-12-13 20:10 ` Lars-Dominik Braun
2022-01-05 14:51 ` Lars-Dominik Braun
0 siblings, 1 reply; 16+ messages in thread
From: Lars-Dominik Braun @ 2021-12-13 20:10 UTC (permalink / raw)
To: 46848
Hi,
I’m working on version 3 of this patchset, removing the dependency
on python-pypa-build, which simplifies bootstrapping. A rough version
is available at
https://github.com/PromyLOPh/guix/commits/work-python-build-pep517
Cheers,
Lars
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2021-12-13 20:10 ` Lars-Dominik Braun
@ 2022-01-05 14:51 ` Lars-Dominik Braun
2022-01-20 15:41 ` Marius Bakke
0 siblings, 1 reply; 16+ messages in thread
From: Lars-Dominik Braun @ 2022-01-05 14:51 UTC (permalink / raw)
To: 46848; +Cc: Maxim Cournoyer
Hi everyone,
I pushed the 3rd version of my new PEP 517-based python-build-system
into wip-python-pep517. I removed the dependency on python-pypa-build
for building packages and instead implemented building with a single
python invokation. This simplifies bootstrapping Python. The 'install
phase also learned how to create scripts in bin/ from an entry points
specification.
Currently 600 of 2212 packages using python-build-system are failing to
build. That’s alot, but most failures so far were related to testsuites,
which were not enabled correctly previously because 'check was not
replaced manually. And some fail because upstream does not separate
sources and tests and a name clash occurs. This also happens when C
extensions are build and there does not seem to be a workaround.
This number does not include Python 2 packages, which will probably
break with this new build system. Since Python 2 is EOL anyway I suggest
to entirely remove Python 2 support before merging this changeset. After
merging we should upgrade the entire Python ecosystem, because alot of
packages are already years old.
Cheers,
Lars
PS: Maxim: This is your ping for a review (via #52269). Thanks :)
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-01-05 14:51 ` Lars-Dominik Braun
@ 2022-01-20 15:41 ` Marius Bakke
2022-01-20 18:43 ` Lars-Dominik Braun
0 siblings, 1 reply; 16+ messages in thread
From: Marius Bakke @ 2022-01-20 15:41 UTC (permalink / raw)
To: Lars-Dominik Braun, 46848; +Cc: Maxim Cournoyer
[-- Attachment #1: Type: text/plain, Size: 2421 bytes --]
Lars-Dominik Braun <lars@6xq.net> skriver:
> I pushed the 3rd version of my new PEP 517-based python-build-system
> into wip-python-pep517. I removed the dependency on python-pypa-build
> for building packages and instead implemented building with a single
> python invokation. This simplifies bootstrapping Python. The 'install
> phase also learned how to create scripts in bin/ from an entry points
> specification.
This is great, thank you.
> Currently 600 of 2212 packages using python-build-system are failing to
> build. That’s alot, but most failures so far were related to testsuites,
> which were not enabled correctly previously because 'check was not
> replaced manually. And some fail because upstream does not separate
> sources and tests and a name clash occurs. This also happens when C
> extensions are build and there does not seem to be a workaround.
Can you elaborate on the name clash issue?
> This number does not include Python 2 packages, which will probably
> break with this new build system. Since Python 2 is EOL anyway I suggest
> to entirely remove Python 2 support before merging this changeset. After
> merging we should upgrade the entire Python ecosystem, because alot of
> packages are already years old.
Unfortunately we need Python 2 for some time still. It is used to
bootstrap old versions of GHC, Node, and probably other things.
Do you think it is feasible to provide this as a new build system, say
pep517-build-system, during a transitional period? Then we can a) start
using it right away for the increasing amount of packages that lack a
setup.py; and b) flesh out most bugs before eventually merging it back
(possibly piecemeal) into python-build-system.
I've had a cursory look and it looks good overall. A few comments:
* Zipping a wheel just to unpack it afterwards is weird, but there seems
to be no way around it.
* I also think trying "python setup.py test" is unnecessary.
* It would be nice to support the "no tests" case without having to add
explicit #:tests? everywhere. Perhaps along the lines of...
(match use-test-backend
('pytest (apply invoke ...))
[...]
(_ (match (find-files "." "^test_.*\\.py$")
(() (format #t "no tests found~%"))
(_ (apply invoke `("python" "-m" "unittest" ,@test-flags))))))
WDYT?
Great work, and apologies for not chiming in earlier!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-01-20 15:41 ` Marius Bakke
@ 2022-01-20 18:43 ` Lars-Dominik Braun
2022-01-20 20:43 ` Marius Bakke
2022-02-26 14:10 ` [bug#46848] " Maxim Cournoyer
0 siblings, 2 replies; 16+ messages in thread
From: Lars-Dominik Braun @ 2022-01-20 18:43 UTC (permalink / raw)
To: Marius Bakke; +Cc: 46848, Maxim Cournoyer
Hi Marius,
> Can you elaborate on the name clash issue?
the problem seems to be that most packages do not put the source code
into a subdirectory in the sdist. I.e. package foobar will have a foobar/
directory, instead of src/foobar. Thus Python tries to load the module
foobar.barbaz from that directory, instead of the store. Thus it’ll
also look there for C extensions and fail. I don’t know why it does
that, even when *not* using `python -m` – according to the documentation
it should not. If anyone has any pointers I’d like to have a look again.
> Unfortunately we need Python 2 for some time still. It is used to
> bootstrap old versions of GHC, Node, and probably other things.
But as far as I see these specific examples do not use
python-build-system. Only if some package using `#:python python-2` is
required during bootstrapping, then we’d need a way to support Python
2, right?
> Do you think it is feasible to provide this as a new build system, say
> pep517-build-system, during a transitional period? Then we can a) start
> using it right away for the increasing amount of packages that lack a
> setup.py; and b) flesh out most bugs before eventually merging it back
> (possibly piecemeal) into python-build-system.
Actually, I think that’s a good idea. I tried, but I cannot fix all
packages broken by this change on my own, so smoothing the transition
could help and – as you said – we could catch bugs early on.
I could prepare a patch, if there is interest in this path.
> * Zipping a wheel just to unpack it afterwards is weird, but there seems
> to be no way around it.
Indeed, that’s how PEP 517 works, which always builds a wheel
(i.e. ZIP file).
> * I also think trying "python setup.py test" is unnecessary.
It still works quite often, although its usefulness will decrease in
the future I guess. Another problem I see is that this command will not
fail if there are no tests.
> * It would be nice to support the "no tests" case without having to add
> explicit #:tests? everywhere. Perhaps along the lines of...
My idea was to force packagers to make and explain this decision
explicitly. If you don’t run tests, you have to add `#:tests? #f`
and leave a comment why they are disabled. I do see this could become
a hassle with packages that simply don’t have any tests. But my hope
is that it increases package quality.
> (_ (apply invoke `("python" "-m" "unittest" ,@test-flags))))))
If I remember correctly I tried this and it did not work for some
reason. I’ll have a look again.
Cheers,
Lars
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-01-20 18:43 ` Lars-Dominik Braun
@ 2022-01-20 20:43 ` Marius Bakke
2023-01-11 15:41 ` Maxim Cournoyer
2022-02-26 14:10 ` [bug#46848] " Maxim Cournoyer
1 sibling, 1 reply; 16+ messages in thread
From: Marius Bakke @ 2022-01-20 20:43 UTC (permalink / raw)
To: Lars-Dominik Braun; +Cc: 46848, Maxim Cournoyer
[-- Attachment #1: Type: text/plain, Size: 3506 bytes --]
Lars-Dominik Braun <lars@6xq.net> skriver:
> Hi Marius,
>
>> Can you elaborate on the name clash issue?
> the problem seems to be that most packages do not put the source code
> into a subdirectory in the sdist. I.e. package foobar will have a foobar/
> directory, instead of src/foobar. Thus Python tries to load the module
> foobar.barbaz from that directory, instead of the store. Thus it’ll
> also look there for C extensions and fail. I don’t know why it does
> that, even when *not* using `python -m` – according to the documentation
> it should not. If anyone has any pointers I’d like to have a look again.
Perhaps it could be worked around by building in a separate directory,
i.e. ./build/lib, like setuptools does? And ensure that the original
source directory does not end up on {,GUIX_}PYTHONPATH.
(I don't really understand the problem, just throwing ideas around.)
>> Unfortunately we need Python 2 for some time still. It is used to
>> bootstrap old versions of GHC, Node, and probably other things.
> But as far as I see these specific examples do not use
> python-build-system. Only if some package using `#:python python-2` is
> required during bootstrapping, then we’d need a way to support Python
> 2, right?
Right. If we don't need any Python 2 modules it should be fine to
remove support from the build system.
>> Do you think it is feasible to provide this as a new build system, say
>> pep517-build-system, during a transitional period? Then we can a) start
>> using it right away for the increasing amount of packages that lack a
>> setup.py; and b) flesh out most bugs before eventually merging it back
>> (possibly piecemeal) into python-build-system.
> Actually, I think that’s a good idea. I tried, but I cannot fix all
> packages broken by this change on my own, so smoothing the transition
> could help and – as you said – we could catch bugs early on.
>
> I could prepare a patch, if there is interest in this path.
It would lower the bar significantly for testing and contributing, so I
would appreciate it. :-)
>> * I also think trying "python setup.py test" is unnecessary.
> It still works quite often, although its usefulness will decrease in
> the future I guess. Another problem I see is that this command will not
> fail if there are no tests.
>
>> * It would be nice to support the "no tests" case without having to add
>> explicit #:tests? everywhere. Perhaps along the lines of...
> My idea was to force packagers to make and explain this decision
> explicitly. If you don’t run tests, you have to add `#:tests? #f`
> and leave a comment why they are disabled. I do see this could become
> a hassle with packages that simply don’t have any tests. But my hope
> is that it increases package quality.
My main concern is end-user experience when they just want to get some
random library working on their local channel. But it's arguably
something that can be solved on the importer level and not a strong
opinion.
Thinking about importers, perhaps they could start emitting git origins
when possible, as there is a trend to strip tests before uploading to
PyPI.
>> (_ (apply invoke `("python" "-m" "unittest" ,@test-flags))))))
> If I remember correctly I tried this and it did not work for some
> reason. I’ll have a look again.
Eh, it should be (apply invoke "python" "-m" "unittest" test-flags), but
you probably got that. :-P
Thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2021-03-01 13:43 [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system Lars-Dominik Braun
2021-05-15 9:31 ` Lars-Dominik Braun
@ 2022-01-23 5:29 ` Maxim Cournoyer
2022-01-23 10:21 ` Lars-Dominik Braun
1 sibling, 1 reply; 16+ messages in thread
From: Maxim Cournoyer @ 2022-01-23 5:29 UTC (permalink / raw)
To: Lars-Dominik Braun; +Cc: 46848
Hi Lars,
Here's a review of patches 1 to 6.
Lars-Dominik Braun <lars@6xq.net> writes:
> the attached patches switch python-build-system to a PEP 517-based build
> system using python-pypa-build.
Neat! Thank you for working on this!
> One downside is that this tool is not self-contained and has a few
> dependencies. Thus first I bootstrap setuptools using itself (possible
> because it bundles all of its own dependencies), then build
> python-pypa-build’s dependencies using setuptools (which is fortunately
> still possible) and then combine everything into a
> python-toolchain(-for-build), which is then used by the build-process.
>
> I can successfully build packages like python-pypa-build and
> python-pytest and python-pep517-bootstrap. The latter is using flit as
> its build backend. But other packages currently fail because I removed
> some arguments.
> Lars
>
>
>
>
>>From 61313d8ddba30772e2587e3e16ca30d1565d3c7e Mon Sep 17 00:00:00 2001
> From: Lars-Dominik Braun <lars@6xq.net>
> Date: Sun, 28 Feb 2021 13:05:51 +0100
> Subject: [PATCH 04/12] gnu: python-setuptools: Bootstrap using itself
>
> * gnu/packages/python-xyz.scm (python-setuptools) [arguments]: Add phase
> setting GUIX_PYTHONPATH to source directory.
> ---
> gnu/packages/python-xyz.scm | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index f8afa13f33..79d01f700a 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -1144,7 +1144,18 @@ other machines, such as over the network.")
> ;; FIXME: Tests require pytest, which itself relies on setuptools.
> ;; One could bootstrap with an internal untested setuptools.
> (arguments
> - `(#:tests? #f))
> + `(#:tests? #f
> + #:python ,python-wrapper
> + #:phases (modify-phases %standard-phases
> + ;; Use this setuptools’ sources to bootstrap themselves.
> + (add-before 'build 'set-PYTHONPATH
^ nitpick: GUIX_PYTHONPATH
> + (lambda _
> + (format #t "current working dir ~s~%" (getcwd))
> + (setenv "GUIX_PYTHONPATH"
> + (string-append ".:" (getenv "GUIX_PYTHONPATH")))
> + #t)))))
> + ;; Not required when not building a wheel
> + ;(propagated-inputs `(("python-wheel" ,python-wheel)))
> (home-page "https://pypi.org/project/setuptools/")
> (synopsis
> "Library designed to facilitate packaging Python projects")
> --
> 2.26.2
>
>
>>From 7a99aaa40e65fde58ee2e78ad7d3e0ccd6d169ae Mon Sep 17 00:00:00 2001
> From: Lars-Dominik Braun <lars@6xq.net>
> Date: Sun, 28 Feb 2021 13:08:58 +0100
> Subject: [PATCH 05/12] python-build: Switch to PEP 517-based build
>
> * gnu/packages/python-commencement.scm: New file, containing
> python-toolchain.
> * gnu/local.mk: Add it.
> * gnu/packages/python.scm (python): Disable installing bundled
> pip/setuptools.
> * guix/build/python-build-system.scm: Rewrite using python-pypa-build.
> * guix/build-system/python.scm (default-python): Switch to
> python-toolchain
> (lower): Remove unused parameter.
>
> XXX: rationale
Forgotten XXX comment (perhaps just drop it).
> ---
> gnu/local.mk | 1 +
> gnu/packages/python-commencement.scm | 175 +++++++++++++++++++
> gnu/packages/python.scm | 2 +-
> guix/build-system/python.scm | 8 +-
> guix/build/python-build-system.scm | 249 ++++++++++++++++++---------
> 5 files changed, 342 insertions(+), 93 deletions(-)
> create mode 100644 gnu/packages/python-commencement.scm
[...]
> + (use-modules (ice-9 match)
> + (srfi srfi-1)
> + (srfi srfi-26)
> + (guix build union))
> +
> + (let ((out (assoc-ref %outputs "out")))
> + (union-build out (filter-map (match-lambda
> + ((_ . directory) directory))
> + %build-inputs))
> + #t))))
Note that returning #t after phases and snippets is obsolete; you can
safely take them all out now.
> + (inputs
> + `(("python" ,python-wrapper)
> + ("python-setuptools" ,python-setuptools)
> + ("python-pip" ,python-pip))) ; XXX Maybe virtualenv/venv too? It kind of
> + ; defeats the purpose of guix, but is used
> + ; alot in local development.
I think it's OK to have people explicitly add virtualenv if they want
it, rather than grow the set of minimal packages here. I'd simply
remove the above XXX comment.
> + (native-search-paths
> + (package-native-search-paths python))
> + (search-paths
> + (package-search-paths python))
> + (license (package-license python)) ; XXX
> + (synopsis "Python toolchain")
> + (description
> + "Python toolchain including Python itself, setuptools and pip. Use this
> +package if you need a fully-fledged Python toolchain instead of just the
> +interpreter.")
> + (home-page (package-home-page python))))
Following my above comment, perhaps s/fully-fledged/minimal/.
[...]
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 8e8f46467b..ca5ce667ef 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -182,7 +182,7 @@
> (list "--enable-shared" ;allow embedding
> "--with-system-expat" ;for XML support
> "--with-system-ffi" ;build ctypes
> - "--with-ensurepip=install" ;install pip and setuptools
> + "--with-ensurepip=no" ;do not install pip and setuptools
> "--enable-unicode=ucs4"
>
> ;; Prevent the installed _sysconfigdata.py from retaining a reference
> diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
> index 2bb6fa87ca..998ea9323d 100644
> --- a/guix/build-system/python.scm
> +++ b/guix/build-system/python.scm
> @@ -65,8 +65,8 @@ extension, such as '.tar.gz'."
> (define (default-python)
> "Return the default Python package."
> ;; Lazily resolve the binding to avoid a circular dependency.
> - (let ((python (resolve-interface '(gnu packages python))))
> - (module-ref python 'python-wrapper)))
> + (let ((python (resolve-interface '(gnu packages python-commencement))))
> + (module-ref python 'python-toolchain-for-build)))
>
> (define (default-python2)
> "Return the default Python 2 package."
> @@ -172,8 +172,6 @@ pre-defined variants."
> (define* (python-build store name inputs
> #:key
> (tests? #t)
> - (test-target "test")
> - (use-setuptools? #t)
> (configure-flags ''())
> (phases '(@ (guix build python-build-system)
> %standard-phases))
> @@ -199,9 +197,7 @@ provides a 'setup.py' file as its build system."
> source))
> #:configure-flags ,configure-flags
> #:system ,system
> - #:test-target ,test-target
> #:tests? ,tests?
> - #:use-setuptools? ,use-setuptools?
> #:phases ,phases
> #:outputs %outputs
> #:search-paths ',(map search-path-specification->sexp
> diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
> index 8ade1d5911..a5731511a9 100644
> --- a/guix/build/python-build-system.scm
> +++ b/guix/build/python-build-system.scm
> @@ -34,6 +34,7 @@
> #:use-module (ice-9 format)
> #:use-module (srfi srfi-1)
> #:use-module (srfi srfi-26)
> + #:use-module (srfi srfi-35)
> #:export (%standard-phases
> add-installed-pythonpath
> site-packages
> @@ -108,30 +109,17 @@
> ;; "--single-version-externally-managed" is set, thus the .egg-info directory
> ;; and the scripts defined in entry-points will always be created.
>
> +;; Base error type.
> +(define-condition-type &python-build-error &error
> + python-build-error?)
>
> -(define setuptools-shim
> - ;; Run setup.py with "setuptools" being imported, which will patch
> - ;; "distutils". This is needed for packages using "distutils" instead of
> - ;; "setuptools" since the former does not understand the
> - ;; "--single-version-externally-managed" flag.
> - ;; Python code taken from pip 9.0.1 pip/utils/setuptools_build.py
> - (string-append
> - "import setuptools, tokenize;__file__='setup.py';"
> - "f=getattr(tokenize, 'open', open)(__file__);"
> - "code=f.read().replace('\\r\\n', '\\n');"
> - "f.close();"
> - "exec(compile(code, __file__, 'exec'))"))
> -
> -(define (call-setuppy command params use-setuptools?)
> - (if (file-exists? "setup.py")
> - (begin
> - (format #t "running \"python setup.py\" with command ~s and parameters ~s~%"
> - command params)
> - (if use-setuptools?
> - (apply invoke "python" "-c" setuptools-shim
> - command params)
> - (apply invoke "python" "./setup.py" command params)))
> - (error "no setup.py found")))
> +;; Raised when 'check cannot find a valid test system in the inputs.
> +(define-condition-type &test-system-not-found &python-build-error
> + test-system-not-found?)
> +
> +;; Raised when multiple wheels are created by 'build.
> +(define-condition-type &cannot-extract-multiple-wheels &python-build-error
> + cannot-extract-multiple-wheels?)
>
> (define* (sanity-check #:key tests? inputs outputs #:allow-other-keys)
> "Ensure packages depending on this package via setuptools work properly,
> @@ -142,23 +130,51 @@ without errors."
> (with-directory-excursion "/tmp"
> (invoke "python" sanity-check.py (site-packages inputs outputs)))))
>
> -(define* (build #:key use-setuptools? #:allow-other-keys)
> +(define* (build #:key outputs #:allow-other-keys)
> "Build a given Python package."
> - (call-setuppy "build" '() use-setuptools?)
> +
> + (define pyproject-build (which "pyproject-build"))
> +
> + (define (build-pep517)
> + ;; XXX: should probably use a different path, outside of source directory,
> + ;; maybe secondary output “wheel”?
> + (mkdir-p "dist")
> + (invoke pyproject-build "--outdir" "dist" "--no-isolation" "--wheel" "."))
> +
> + ;; XXX Would be nice, if we could use bdist_wheel here to remove extra
> + ;; code path in 'install, but that depends on python-wheel.
> + (define (build-setuptools)
> + (invoke "python" "setup.py" "build"))
> +
> + (if pyproject-build
> + (build-pep517)
> + (build-setuptools))
> #t)
>
> -(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
> +(define* (check #:key inputs outputs tests? #:allow-other-keys)
> "Run the test suite of a given Python package."
> (if tests?
> - ;; Running `setup.py test` creates an additional .egg-info directory in
> - ;; build/lib in some cases, e.g. if the source is in a sub-directory
> - ;; (given with `package_dir`). This will by copied to the output, too,
> - ;; so we need to remove.
> - (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
> - (call-setuppy test-target '() use-setuptools?)
> - (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
> - (inter (lset-difference string=? after before)))
> - (for-each delete-file-recursively inter)))
> + ;; Unfortunately with PEP 517 there is no common method to specify test
> + ;; systems. Guess test system based on inputs instead.
> + (let ((pytest (which "pytest"))
> + (have-setup-py (file-exists? "setup.py")))
^ indentation
> + ;; Prefer pytest
> + ;; XXX: support nose
You can remove this; nose is stale/deprecated.
> + (cond
> + (pytest
> + (begin
> + (format #t "using pytest~%")
> + (invoke pytest "-vv"))) ; XXX: support skipping tests based on name/extra arguments?
We could have a #:test-command argument to specify an arbitrary command
as a list of strings, such as used by the emacs-build-system; that'd
allow us to avoid overriding the phase just to add a '-k "not
this-test"' or similar.
> + ;; But fall back to setup.py, which should work for most
> + ;; packages. XXX: would be nice not to depend on setup.py here? fails
> + ;; more often than not to find any tests at all. Maybe we can run
> + ;; `python -m unittest`?
> + (have-setup-py
> + (begin
> + (format #t "using setup.py~%")
> + (invoke "python" "setup.py" "test" "-v")))
As Marius noted, falling back to 'python setup.py test' is not
desirable; it's scheduled to be removed already.
> + ;; The developer should explicitly disable tests in this case.
> + (#t (raise (condition (&test-system-not-found))))))
> (format #t "test suite not run~%"))
> #t)
>
> @@ -195,31 +211,109 @@ running checks after installing the package."
> "/bin:"
> (getenv "PATH"))))
>
> -(define* (install #:key inputs outputs (configure-flags '()) use-setuptools?
> - #:allow-other-keys)
> - "Install a given Python package."
> - (let* ((out (python-output outputs))
> - (python (assoc-ref inputs "python"))
> - (major-minor (map string->number
> - (take (string-split (python-version python) #\.) 2)))
> - (<3.7? (match major-minor
> - ((major minor)
> - (or (< major 3) (and (= major 3) (< minor 7))))))
> - (params (append (list (string-append "--prefix=" out)
> - "--no-compile")
> - (if use-setuptools?
> - ;; distutils does not accept these flags
> - (list "--single-version-externally-managed"
> - "--root=/")
> - '())
> - configure-flags)))
> - (call-setuppy "install" params use-setuptools?)
> - ;; Rather than produce potentially non-reproducible .pyc files on Pythons
> - ;; older than 3.7, whose 'compileall' module lacks the
> - ;; '--invalidation-mode' option, do not generate any.
> - (unless <3.7?
> - (invoke "python" "-m" "compileall" "--invalidation-mode=unchecked-hash"
> - out))))
> +(define* (install #:key inputs outputs (configure-flags '()) #:allow-other-keys)
> + "Install a wheel file according to PEP 427"
> + ;; See https://www.python.org/dev/peps/pep-0427/#installing-a-wheel-distribution-1-0-py32-none-any-whl
> + (let* ((site-dir (site-packages inputs outputs))
> + (out (assoc-ref outputs "out")))
> + (define (extract file)
> + "Extract wheel (ZIP file) into site-packages directory"
> + ;; Use Python’s zipfile to avoid extra dependency
> + (invoke "python" "-m" "zipfile" "-e" file site-dir))
> +
> + (define python-hashbang
> + (string-append "#!" (assoc-ref inputs "python") "/bin/python"))
> +
> + (define (move-data source destination)
> + (mkdir-p (dirname destination))
> + (rename-file source destination))
> +
> + (define (move-script source destination)
> + "Move executable script file from .data/scripts to out/bin and replace
> +temporary hashbang"
> + (move-data source destination)
> + ;; ZIP does not save/restore permissions, make executable
> + ;; XXX: might not be a file, but directory with subdirectories
> + (chmod destination #o755)
> + (substitute* destination (("#!python") python-hashbang)))
It seems the directory case should be handled? Otherwise the
substitute* call would error out upon encountering it.
> + ;; Python’s distutils.command.install defines this mapping from source to
> + ;; destination mapping.
> + (define install-schemes
> + `(("scripts" "bin" ,move-script)
> + ;; XXX: Why does Python not use share/ here?
> + ("data" "share" ,move-data)))
> +
> + (define (expand-data-directory directory)
> + "Move files from all .data subdirectories to their respective
> +destinations."
> + (for-each
> + (match-lambda ((source destination function)
> + (let ((source-path (string-append directory "/" source))
> + (destination-path (string-append out "/" destination)))
> + (when (file-exists? source-path)
> + (begin
> + ;; This assumes only files exist in the scripts/ directory.
> + (for-each
> + (lambda (file)
> + (apply
> + function
> + (list
> + (string-append source-path "/" file)
> + (string-append destination-path "/" file))))
> + (scandir source-path (negate (cut member <> '("." "..")))))
> + (rmdir source-path))))))
> + install-schemes))
> +
> + (define pyproject-build (which "pyproject-build"))
> +
> + (define (list-directories base predicate)
> + ;; Cannot use find-files here, because it’s recursive.
> + (scandir
> + base
> + (lambda (name)
> + (let ((stat (lstat (string-append base "/" name))))
> + (and
> + (not (member name '("." "..")))
> + (eq? (stat:type stat) 'directory)
> + (predicate name stat))))))
> +
> + (define (install-pep517)
> + "Install a wheel generated by a PEP 517-compatible builder."
> + (let ((wheels (find-files "dist" "\\.whl$"))) ; XXX: do not recurse
If we do not want to recurse, we should use scandir?
> + (when (> (length wheels) 1) ; This code does not support multiple wheels
> + ; yet, because their outputs would have to be
> + ; merged properly.
> + (raise (condition (&cannot-extract-multiple-wheels))))
> + (for-each extract wheels))
> + (let ((datadirs (map
> + (cut string-append site-dir "/" <>)
> + (list-directories site-dir (file-name-predicate "\\.data$")))))
> + (for-each (lambda (directory)
> + (expand-data-directory directory)
> + (rmdir directory))
> + datadirs)))
> +
> + (define (install-setuptools)
> + "Install using setuptools."
> + (let ((out (assoc-ref outputs "out")))
> + (invoke "python" "setup.py"
> + "install"
> + "--prefix" out
> + "--single-version-externally-managed"
> + "--root=/")))
> +
> + (if pyproject-build
> + (install-pep517)
> + (install-setuptools))
> + #t))
So, IIUC, this complicated install phase is because we no longer take
'pip' for granted and is only later available, built from this very
build system, right? Otherwise installing a wheel with pip would be
trivial (c.f. python-isort).
> +
> +(define* (compile-bytecode #:key inputs outputs (configure-flags '()) #:allow-other-keys)
> + "Compile installed byte-code in site-packages."
> + (let ((site-dir (site-packages inputs outputs)))
> + (invoke "python" "-m" "compileall" site-dir)
> + ;; XXX: We could compile with -O and -OO too here, at the cost of more space.
> + #t))
I think you can drop that comment; the default sounds reasonable:
-o OPT_LEVELS Optimization levels to run compilation with. Default is -1 which uses the
optimization level of the Python interpreter itself (see -O).
If we ever want to change we could globally change it for our Python.
I think we keep using "--invalidation-mode=unchecked-hash" though, for
performance [0]:
Unchecked hash-based .pyc files are a useful performance optimization
for environments where a system external to Python (e.g., the build
system) is responsible for keeping .pyc files up-to-date.
[0] https://docs.python.org/3.7/whatsnew/3.7.html#pep-552-hash-based-pyc-files
[...]
It looks rather good to me, with the above comments! I'll be looking
forward reviewing the rest of this series shortly.
Thank you!
Maxim
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-01-23 5:29 ` Maxim Cournoyer
@ 2022-01-23 10:21 ` Lars-Dominik Braun
0 siblings, 0 replies; 16+ messages in thread
From: Lars-Dominik Braun @ 2022-01-23 10:21 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 46848
Hi Maxim,
> Here's a review of patches 1 to 6.
thanks for the review. Unfortunately this is not the most recent
proposal and I have no way to retract the previous patches. I pushed v3
to the wip-python-pep517 branch, because of the sheer number of patches
and so the CI could build it (since it requires a rebuild of the entire
rust bootstrap chain).
> > + ;; Prefer pytest
> > + ;; XXX: support nose
>
> You can remove this; nose is stale/deprecated.
So it’s preferred to replace 'check in cases where python-nose is
still in use?
>
> > + (cond
> > + (pytest
> > + (begin
> > + (format #t "using pytest~%")
> > + (invoke pytest "-vv"))) ; XXX: support skipping tests based on name/extra arguments?
>
> We could have a #:test-command argument to specify an arbitrary command
> as a list of strings, such as used by the emacs-build-system; that'd
> allow us to avoid overriding the phase just to add a '-k "not
> this-test"' or similar.
I added #:test-flags in my v3 proposal.
> > + ;; But fall back to setup.py, which should work for most
> > + ;; packages. XXX: would be nice not to depend on setup.py here? fails
> > + ;; more often than not to find any tests at all. Maybe we can run
> > + ;; `python -m unittest`?
> > + (have-setup-py
> > + (begin
> > + (format #t "using setup.py~%")
> > + (invoke "python" "setup.py" "test" "-v")))
>
> As Marius noted, falling back to 'python setup.py test' is not
> desirable; it's scheduled to be removed already.
Sure, but using `python -m unittest` instead requires some investigation.
> > + (define (move-script source destination)
> > + "Move executable script file from .data/scripts to out/bin and replace
> > +temporary hashbang"
> > + (move-data source destination)
> > + ;; ZIP does not save/restore permissions, make executable
> > + ;; XXX: might not be a file, but directory with subdirectories
> > + (chmod destination #o755)
> > + (substitute* destination (("#!python") python-hashbang)))
>
> It seems the directory case should be handled? Otherwise the
> substitute* call would error out upon encountering it.
I have not seen anyone using subdirectories in bin/ yet. Is that
supported anywhere?
> So, IIUC, this complicated install phase is because we no longer take
> 'pip' for granted and is only later available, built from this very
> build system, right? Otherwise installing a wheel with pip would be
> trivial (c.f. python-isort).
If we want to bootstrap these two packages easily (and possibly start
unvendoring their vendored dependencies later), they cannot be part of
this build system and thus we need to implement building/installing
ourselves. I tried using pypa-build in an earlier version, but the
bootstrap chain is unmaintainable.
There also is a project called installer[1], but it does not have a
CLI yet.
Cheers,
Lars
[1] https://github.com/pradyunsg/installer
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-01-20 18:43 ` Lars-Dominik Braun
2022-01-20 20:43 ` Marius Bakke
@ 2022-02-26 14:10 ` Maxim Cournoyer
2022-02-28 19:25 ` Lars-Dominik Braun
2022-04-24 9:13 ` Lars-Dominik Braun
1 sibling, 2 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2022-02-26 14:10 UTC (permalink / raw)
To: Lars-Dominik Braun; +Cc: 46848, Marius Bakke
Hi Lars-Dominik,
Lars-Dominik Braun <lars@6xq.net> writes:
When you judge the branch ready to merge, could you please send a subset
of the patches (at least the ones touching the python-build-system
directly) to this issue (marked as v2 -- git send-email -v2) so that
they can be more easily commented?
Thanks,
Maxim
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-02-26 14:10 ` [bug#46848] " Maxim Cournoyer
@ 2022-02-28 19:25 ` Lars-Dominik Braun
2022-02-28 22:32 ` Maxim Cournoyer
2022-04-24 9:13 ` Lars-Dominik Braun
1 sibling, 1 reply; 16+ messages in thread
From: Lars-Dominik Braun @ 2022-02-28 19:25 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 46848, Marius Bakke
Hi Maxim,
> When you judge the branch ready to merge, could you please send a subset
> of the patches (at least the ones touching the python-build-system
> directly) to this issue (marked as v2 -- git send-email -v2) so that
> they can be more easily commented?
as soon as time permits I can do that. Which route do we want to
take? Replace python-build-system entirely in one big merge or add a
new one and slowly migrate?
Cheers,
Lars
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-02-28 19:25 ` Lars-Dominik Braun
@ 2022-02-28 22:32 ` Maxim Cournoyer
0 siblings, 0 replies; 16+ messages in thread
From: Maxim Cournoyer @ 2022-02-28 22:32 UTC (permalink / raw)
To: Lars-Dominik Braun; +Cc: 46848, Marius Bakke
Hi Lars,
Lars-Dominik Braun <lars@6xq.net> writes:
> Hi Maxim,
>
>> When you judge the branch ready to merge, could you please send a subset
>> of the patches (at least the ones touching the python-build-system
>> directly) to this issue (marked as v2 -- git send-email -v2) so that
>> they can be more easily commented?
>
> as soon as time permits I can do that. Which route do we want to
> take? Replace python-build-system entirely in one big merge or add a
> new one and slowly migrate?
After the Berlin can be rebooted onto its new file system, I expect it
should allow us to keep the build farm much busier than in the past give
us the headroom to experiment with a PEP 517-focused world rebuilding
branch.
I'd aim to have the build system completely replaced; unless your
experience suggests it's going to take multiple weeks to fix iron out
the kinks?
Thanks,
Maxim
^ permalink raw reply [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-02-26 14:10 ` [bug#46848] " Maxim Cournoyer
2022-02-28 19:25 ` Lars-Dominik Braun
@ 2022-04-24 9:13 ` Lars-Dominik Braun
2022-04-24 9:22 ` Lars-Dominik Braun
1 sibling, 1 reply; 16+ messages in thread
From: Lars-Dominik Braun @ 2022-04-24 9:13 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 46848, Marius Bakke
[-- Attachment #1: Type: text/plain, Size: 801 bytes --]
Hi Maxim,
> When you judge the branch ready to merge, could you please send a subset
> of the patches (at least the ones touching the python-build-system
> directly) to this issue (marked as v2 -- git send-email -v2) so that
> they can be more easily commented?
I had some time to finish my work, so I pushed all of my changes to
wip-python-pep517 and attached changes that do not fix individual packages
to this email. Since my last version I added support for building Python
2 packages, although we should really phase out Python 2 asap. I kept
support for nose and setup.py’s test target, because they are still
in use/valuable, but we can also remove them if you prefer.
Please have a look when time permits. If all is good we can move on to
fix failing packages.
Thank you very much,
Lars
[-- Attachment #2: v3-0001-build-python-Handle-missing-setuptools-in-sanity-.patch --]
[-- Type: text/plain, Size: 1108 bytes --]
From 720dbe22d431262938be29dd9a9ddb78c44a99b3 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Fri, 19 Feb 2021 17:22:35 +0100
Subject: [PATCH v3 001/150] build/python: Handle missing setuptools in
sanity-check.py
Just skip testing if required dependencies (setuptools) are not
available.
* gnu/packages/aux-files/python/sanity-check.py: Handle ImportError.
---
gnu/packages/aux-files/python/sanity-check.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/aux-files/python/sanity-check.py b/gnu/packages/aux-files/python/sanity-check.py
index 182133bb3d..1366b68e3d 100644
--- a/gnu/packages/aux-files/python/sanity-check.py
+++ b/gnu/packages/aux-files/python/sanity-check.py
@@ -19,9 +19,13 @@
from __future__ import print_function # Python 2 support.
import importlib
-import pkg_resources
import sys
import traceback
+try:
+ import pkg_resources
+except ImportError:
+ print('Warning: Skipping, because python-setuptools are not available.')
+ sys.exit(0)
try:
from importlib.machinery import PathFinder
--
2.35.1
[-- Attachment #3: v3-0002-gnu-python-2-setuptools-Move-to-python-build.patch --]
[-- Type: text/plain, Size: 8558 bytes --]
From 4539d2994f454ca3528985bb140ec4aba8e919da Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 23 Apr 2022 11:07:58 +0200
Subject: [PATCH v3 002/150] gnu: python{,2}-setuptools: Move to python-build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/python-xyz.scm (python{,2}-setuptools): Move…
* gnu/packages/python-build.scm: …here.
---
gnu/packages/python-build.scm | 90 +++++++++++++++++++++++++++++++++++
gnu/packages/python-xyz.scm | 90 -----------------------------------
2 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 2abb781f76..f167c3953f 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -39,6 +39,96 @@ (define-module (gnu packages python-build)
;;;
;;; Code:
+(define-public python-setuptools
+ (package
+ (name "python-setuptools")
+ (version "52.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "setuptools" version))
+ (sha256
+ (base32
+ "15ibjdjhkwgj6qbmpsxikkqdfsb1550z46fly7dm15ah4bk1wfpv"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove included binaries which are used to build self-extracting
+ ;; installers for Windows.
+ ;; TODO: Find some way to build them ourself so we can include them.
+ (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$"))
+ #t))))
+ (build-system python-build-system)
+ ;; FIXME: Tests require pytest, which itself relies on setuptools.
+ ;; One could bootstrap with an internal untested setuptools.
+ (arguments
+ `(#:tests? #f))
+ (home-page "https://pypi.org/project/setuptools/")
+ (synopsis
+ "Library designed to facilitate packaging Python projects")
+ (description
+ "Setuptools is a fully-featured, stable library designed to facilitate
+packaging Python projects, where packaging includes:
+Python package and module definitions,
+distribution package metadata,
+test hooks,
+project installation,
+platform-specific details,
+Python 3 support.")
+ ;; TODO: setuptools now bundles the following libraries:
+ ;; packaging, pyparsing, six and appdirs. How to unbundle?
+ (license (list license:psfl ; setuptools itself
+ license:expat ; six, appdirs, pyparsing
+ license:asl2.0 ; packaging is dual ASL2/BSD-2
+ license:bsd-2))
+ (properties `((python2-variant . ,(delay python2-setuptools))))))
+
+;; Newer versions of setuptools no longer support Python 2.
+(define-public python2-setuptools
+ (package
+ (name "python2-setuptools")
+ (version "41.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "setuptools" version ".zip"))
+ (sha256
+ (base32
+ "04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove included binaries which are used to build self-extracting
+ ;; installers for Windows.
+ ;; TODO: Find some way to build them ourself so we can include them.
+ (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$"))
+ #t))))
+ (build-system python-build-system)
+ ;; FIXME: Tests require pytest, which itself relies on setuptools.
+ ;; One could bootstrap with an internal untested setuptools.
+ (arguments
+ `(#:tests? #f))
+ (native-inputs
+ (list unzip))
+ (home-page "https://pypi.org/project/setuptools/")
+ (synopsis
+ "Library designed to facilitate packaging Python projects")
+ (description
+ "Setuptools is a fully-featured, stable library designed to facilitate
+packaging Python projects, where packaging includes:
+Python package and module definitions,
+distribution package metadata,
+test hooks,
+project installation,
+platform-specific details,
+Python 3 support.")
+ ;; TODO: setuptools now bundles the following libraries:
+ ;; packaging, pyparsing, six and appdirs. How to unbundle?
+ (license (list license:psfl ; setuptools itself
+ license:expat ; six, appdirs, pyparsing
+ license:asl2.0 ; packaging is dual ASL2/BSD-2
+ license:bsd-2))))
+
(define-public python-wheel
(package
(name "python-wheel")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 219a0d9213..f2532abc52 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1792,96 +1792,6 @@ (define-public python2-serpent
`(("python-enum34" ,python2-enum34)
,@(package-propagated-inputs base))))))
-(define-public python-setuptools
- (package
- (name "python-setuptools")
- (version "52.0.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "setuptools" version))
- (sha256
- (base32
- "15ibjdjhkwgj6qbmpsxikkqdfsb1550z46fly7dm15ah4bk1wfpv"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove included binaries which are used to build self-extracting
- ;; installers for Windows.
- ;; TODO: Find some way to build them ourself so we can include them.
- (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$"))
- #t))))
- (build-system python-build-system)
- ;; FIXME: Tests require pytest, which itself relies on setuptools.
- ;; One could bootstrap with an internal untested setuptools.
- (arguments
- `(#:tests? #f))
- (home-page "https://pypi.org/project/setuptools/")
- (synopsis
- "Library designed to facilitate packaging Python projects")
- (description
- "Setuptools is a fully-featured, stable library designed to facilitate
-packaging Python projects, where packaging includes:
-Python package and module definitions,
-distribution package metadata,
-test hooks,
-project installation,
-platform-specific details,
-Python 3 support.")
- ;; TODO: setuptools now bundles the following libraries:
- ;; packaging, pyparsing, six and appdirs. How to unbundle?
- (license (list license:psfl ; setuptools itself
- license:expat ; six, appdirs, pyparsing
- license:asl2.0 ; packaging is dual ASL2/BSD-2
- license:bsd-2))
- (properties `((python2-variant . ,(delay python2-setuptools))))))
-
-;; Newer versions of setuptools no longer support Python 2.
-(define-public python2-setuptools
- (package
- (name "python2-setuptools")
- (version "41.0.1")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "setuptools" version ".zip"))
- (sha256
- (base32
- "04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove included binaries which are used to build self-extracting
- ;; installers for Windows.
- ;; TODO: Find some way to build them ourself so we can include them.
- (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$"))
- #t))))
- (build-system python-build-system)
- ;; FIXME: Tests require pytest, which itself relies on setuptools.
- ;; One could bootstrap with an internal untested setuptools.
- (arguments
- `(#:tests? #f))
- (native-inputs
- (list unzip))
- (home-page "https://pypi.org/project/setuptools/")
- (synopsis
- "Library designed to facilitate packaging Python projects")
- (description
- "Setuptools is a fully-featured, stable library designed to facilitate
-packaging Python projects, where packaging includes:
-Python package and module definitions,
-distribution package metadata,
-test hooks,
-project installation,
-platform-specific details,
-Python 3 support.")
- ;; TODO: setuptools now bundles the following libraries:
- ;; packaging, pyparsing, six and appdirs. How to unbundle?
- (license (list license:psfl ; setuptools itself
- license:expat ; six, appdirs, pyparsing
- license:asl2.0 ; packaging is dual ASL2/BSD-2
- license:bsd-2))))
-
(define-public python-setuptools-declarative-requirements
(package
(name "python-setuptools-declarative-requirements")
--
2.35.1
[-- Attachment #4: v3-0003-python-build-system-Use-PEP-517-compatible-builds.patch --]
[-- Type: text/plain, Size: 38405 bytes --]
From 9a120ae0f1791410e41951982ea3f44ad602dfec Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 23 Apr 2022 11:36:55 +0200
Subject: [PATCH v3 003/150] python-build-system: Use PEP 517-compatible
builds.
This is effectively an entire rewrite of python-build-system. It supports
all PEP 517-compatible build backends.
* gnu/packages/python-commencement.scm: New file containing new Python
toolchain package(s).
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* gnu/packages/python-build.scm (python-setuptools-bootstrap): New variable.
(python2-setuptools-bootstrap): New variable.
(python-wheel): Break bootstrap cycle.
(python-wheel-bootstrap): New variable.
(python2-wheel-bootstrap): New variable.
* gnu/packages/python.scm (python-2.7): Do not install setuptools and pip.
* guix/build-system/python.scm (%python-build-system-modules): Use
(guix build json).
(default-python): Default to python-toolchain-for-build.
(lower): Add default wheel output, remove test-target and
use-setuptools? flags, add build-backend, test-backend and test-flags.
* guix/build/python-build-system.scm: Rewrite build system.
---
gnu/local.mk | 1 +
gnu/packages/python-build.scm | 104 ++++++-
gnu/packages/python.scm | 2 +-
guix/build-system/python.scm | 26 +-
guix/build/python-build-system.scm | 436 +++++++++++++++++++----------
5 files changed, 397 insertions(+), 172 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 0e721236d9..4298a2621b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -495,6 +495,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/python.scm \
%D%/packages/python-build.scm \
%D%/packages/python-check.scm \
+ %D%/packages/python-commencement.scm \
%D%/packages/python-compression.scm \
%D%/packages/python-crypto.scm \
%D%/packages/python-science.scm \
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index f167c3953f..e23382972c 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -29,7 +29,9 @@ (define-module (gnu packages python-build)
#:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix git-download)
- #:use-module (guix packages))
+ #:use-module (guix packages)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages python))
;;; Commentary:
;;;
@@ -58,11 +60,23 @@ (define-public python-setuptools
;; TODO: Find some way to build them ourself so we can include them.
(for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$"))
#t))))
+ (outputs '("out" "wheel"))
(build-system python-build-system)
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments
- `(#:tests? #f))
+ `(#:tests? #f
+ #:python ,python-wrapper ; Break cycle with default build system’s setuptools dependency.
+ #:phases (modify-phases %standard-phases
+ ;; Use this setuptools’ sources to bootstrap themselves.
+ (add-before 'build 'set-PYTHONPATH
+ (lambda _
+ (format #t "current working dir ~s~%" (getcwd))
+ (setenv "GUIX_PYTHONPATH"
+ (string-append ".:" (getenv "GUIX_PYTHONPATH")))
+ #t)))))
+ ;; Required to build wheels.
+ (propagated-inputs `(("python-wheel" ,python-wheel)))
(home-page "https://pypi.org/project/setuptools/")
(synopsis
"Library designed to facilitate packaging Python projects")
@@ -83,6 +97,14 @@ (define-public python-setuptools
license:bsd-2))
(properties `((python2-variant . ,(delay python2-setuptools))))))
+;; Break loop between python-setuptools and python-wheel.
+(define-public python-setuptools-bootstrap
+ (package
+ (inherit python-setuptools)
+ (name "python-setuptools-bootstrap")
+ (propagated-inputs `(("python-wheel" ,python-wheel-bootstrap)))
+ (properties `((python2-variant . ,(delay python2-setuptools-bootstrap))))))
+
;; Newer versions of setuptools no longer support Python 2.
(define-public python2-setuptools
(package
@@ -107,9 +129,10 @@ (define-public python2-setuptools
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments
- `(#:tests? #f))
- (native-inputs
- (list unzip))
+ `(#:tests? #f
+ #:python ,python-2 ; Break loop to python2-toolchain-for-build
+ ))
+ (propagated-inputs `(("python2-wheel" ,python2-wheel)))
(home-page "https://pypi.org/project/setuptools/")
(synopsis
"Library designed to facilitate packaging Python projects")
@@ -129,6 +152,12 @@ (define-public python2-setuptools
license:asl2.0 ; packaging is dual ASL2/BSD-2
license:bsd-2))))
+(define-public python2-setuptools-bootstrap
+ (package
+ (inherit python2-setuptools)
+ (name "python2-setuptools-bootstrap")
+ (propagated-inputs `(("python2-wheel" ,python2-wheel-bootstrap)))))
+
(define-public python-wheel
(package
(name "python-wheel")
@@ -142,10 +171,8 @@ (define-public python-wheel
"1bbga5i49rj1cwi4sjpkvfhl1f8vl9lfky2lblsy768nk4wp5vz2"))))
(build-system python-build-system)
(arguments
- ;; FIXME: The test suite runs "python setup.py bdist_wheel", which in turn
- ;; fails to find the newly-built bdist_wheel library, even though it is
- ;; available on PYTHONPATH. What search path is consulted by setup.py?
- '(#:tests? #f))
+ `(#:python ,python-wrapper)) ; Break cycle with python-toolchain-for-build.
+ (native-inputs `(("python-setuptools" ,python-setuptools-bootstrap)))
(home-page "https://bitbucket.org/pypa/wheel/")
(synopsis "Format for built Python packages")
(description
@@ -158,8 +185,65 @@ (define-public python-wheel
installed with a newer @code{pip} or with wheel's own command line utility.")
(license license:expat)))
+(define-public python-wheel-bootstrap
+ (package
+ (inherit python-wheel)
+ (name "python-wheel-bootstrap")
+ (build-system copy-build-system)
+ (native-inputs '()) ; Break cycle to setuptools.
+ (arguments
+ `(#:install-plan
+ ;; XXX: Do not hard-code Python version.
+ '(("src/wheel" "lib/python3.9/site-packages/wheel"))
+ #:phases
+ (modify-phases %standard-phases
+ ;; Add metadata for setuptools, so it will find the wheel-building code.
+ (add-after 'install 'install-metadata
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (site-dir (string-append out "/lib/python3.9/site-packages"))
+ (metadata-dir (string-append site-dir "/wheel.egg-info")))
+ (mkdir-p metadata-dir)
+ (call-with-output-file (string-append metadata-dir "/entry_points.txt")
+ (lambda (port)
+ (format port "~
+ [distutils.commands]~@
+ bdist_wheel = wheel.bdist_wheel:bdist_wheel~%")))))))))
+ (properties `((python2-variant . ,(delay python2-wheel-bootstrap))))))
+
(define-public python2-wheel
- (package-with-python2 python-wheel))
+ (package
+ (inherit (package-with-python2 python-wheel))
+ (arguments `(#:python ,python-2))))
+
+(define-public python2-wheel-bootstrap
+ (package
+ (inherit python2-wheel)
+ (name "python2-wheel-bootstrap")
+ (build-system copy-build-system)
+ (native-inputs '()) ; Break cycle to setuptools.
+ (arguments
+ `(#:install-plan
+ ;; XXX: Do not hard-code Python version.
+ '(("src/wheel" "lib/python2.7/site-packages/wheel"))
+ #:phases
+ (modify-phases %standard-phases
+ ;; Add metadata for setuptools, so it will find the wheel-building code.
+ (add-after 'install 'install-metadata
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (site-dir (string-append out "/lib/python2.7/site-packages"))
+ (metadata-dir (string-append site-dir "/wheel.egg-info")))
+ (mkdir-p metadata-dir)
+ (call-with-output-file (string-append metadata-dir "/entry_points.txt")
+ (lambda (port)
+ (format port "~
+ [distutils.commands]~@
+ bdist_wheel = wheel.bdist_wheel:bdist_wheel~%")))
+ (call-with-output-file (string-append metadata-dir "/PKG-INFO")
+ (lambda (port)
+ (format port "~
+ Version: ~a" (version))))))))))))
;;; XXX: Not really at home, but this seems the best place to prevent circular
;;; module dependencies.
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3bc3346c21..4399d30aad 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -183,7 +183,7 @@ (define-public python-2.7
(list "--enable-shared" ;allow embedding
"--with-system-expat" ;for XML support
"--with-system-ffi" ;build ctypes
- "--with-ensurepip=install" ;install pip and setuptools
+ "--with-ensurepip=no" ;do not install pip and setuptools
"--with-computed-gotos" ;main interpreter loop optimization
"--enable-unicode=ucs4"
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index efade6f74b..aad861d278 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -62,18 +62,19 @@ (define* (pypi-uri name version #:optional (extension ".tar.gz"))
(define %python-build-system-modules
;; Build-side modules imported by default.
`((guix build python-build-system)
+ (guix build json)
,@%gnu-build-system-modules))
(define (default-python)
"Return the default Python package."
;; Lazily resolve the binding to avoid a circular dependency.
- (let ((python (resolve-interface '(gnu packages python))))
- (module-ref python 'python-wrapper)))
+ (let ((python (resolve-interface '(gnu packages python-commencement))))
+ (module-ref python 'python-toolchain-for-build)))
(define (default-python2)
"Return the default Python 2 package."
- (let ((python (resolve-interface '(gnu packages python))))
- (module-ref python 'python-2)))
+ (let ((python (resolve-interface '(gnu packages python-commencement))))
+ (module-ref python 'python2-toolchain-for-build)))
(define sanity-check.py
;; The script used to validate the installation of a Python package.
@@ -165,26 +166,26 @@ (define private-keywords
(build-inputs `(("python" ,python)
("sanity-check.py" ,(local-file sanity-check.py))
,@native-inputs))
- (outputs outputs)
+ (outputs (append outputs '(wheel)))
(build python-build)
(arguments (strip-keyword-arguments private-keywords arguments)))))
(define* (python-build name inputs
#:key source
(tests? #t)
- (test-target "test")
- (use-setuptools? #t)
(configure-flags ''())
+ (build-backend #f)
+ (test-backend #f)
+ (test-flags #f)
(phases '%standard-phases)
- (outputs '("out"))
+ (outputs '("out" "wheel"))
(search-paths '())
(system (%current-system))
(guile #f)
(imported-modules %python-build-system-modules)
(modules '((guix build python-build-system)
(guix build utils))))
- "Build SOURCE using PYTHON, and with INPUTS. This assumes that SOURCE
-provides a 'setup.py' file as its build system."
+ "Build SOURCE using PYTHON, and with INPUTS."
(define build
(with-imported-modules imported-modules
#~(begin
@@ -194,9 +195,10 @@ (define build
#~(python-build #:name #$name
#:source #+source
#:configure-flags #$configure-flags
- #:use-setuptools? #$use-setuptools?
#:system #$system
- #:test-target #$test-target
+ #:build-backend #$build-backend
+ #:test-backend #$test-backend
+ #:test-flags #$test-flags
#:tests? #$tests?
#:phases #$(if (pair? phases)
(sexp->gexp phases)
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 08871f60cd..15cbdd4e7c 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -30,11 +30,16 @@
(define-module (guix build python-build-system)
#:use-module ((guix build gnu-build-system) #:prefix gnu:)
#:use-module (guix build utils)
+ #:use-module (guix build json)
#:use-module (ice-9 match)
#:use-module (ice-9 ftw)
#:use-module (ice-9 format)
+ #:use-module (ice-9 rdelim)
+ #:use-module (ice-9 regex)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-35)
#:export (%standard-phases
add-installed-pythonpath
site-packages
@@ -43,96 +48,45 @@ (define-module (guix build python-build-system)
;; Commentary:
;;
-;; Builder-side code of the standard Python package build procedure.
+;; PEP 517-compatible build system for Python packages.
;;
+;; PEP 517 mandates the use of a TOML file called pyproject.toml at the
+;; project root, describing build and runtime dependencies, as well as the
+;; build system, which can be different from setuptools. This module uses
+;; that file to extract the build system used and call its wheel-building
+;; entry point build_wheel (see 'build). setuptools’ wheel builder is
+;; used as a fallback if either no pyproject.toml exists or it does not
+;; declare a build-system. It supports config_settings through the
+;; standard #:configure-flags argument.
;;
-;; Backgound about the Python installation methods
+;; This wheel, which is just a ZIP file with a file structure defined
+;; by PEP 427 (https://www.python.org/dev/peps/pep-0427/), is then unpacked
+;; and its contents are moved to the appropriate locations in 'install.
;;
-;; In Python there are different ways to install packages: distutils,
-;; setuptools, easy_install and pip. All of these are sharing the file
-;; setup.py, introduced with distutils in Python 2.0. The setup.py file can be
-;; considered as a kind of Makefile accepting targets (or commands) like
-;; "build" and "install". As of autumn 2016 the recommended way to install
-;; Python packages is using pip.
+;; Then entry points, as defined by the PyPa Entry Point Specification
+;; (https://packaging.python.org/specifications/entry-points/) are read
+;; from a file called entry_points.txt in the package’s site-packages
+;; subdirectory and scripts are written to bin/. These are not part of a
+;; wheel and expected to be created by the installing utility.
;;
-;; For both distutils and setuptools, running "python setup.py install" is the
-;; way to install Python packages. With distutils the "install" command
-;; basically copies all packages into <prefix>/lib/pythonX.Y/site-packages.
-;;
-;; Some time later "setuptools" was established to enhance distutils. To use
-;; setuptools, the developer imports setuptools in setup.py. When importing
-;; setuptools, the original "install" command gets overwritten by setuptools'
-;; "install" command.
-;;
-;; The command-line tools easy_install and pip are both capable of finding and
-;; downloading the package source from PyPI (the Python Package Index). Both
-;; of them import setuptools and execute the "setup.py" file under their
-;; control. Thus the "setup.py" behaves as if the developer had imported
-;; setuptools within setup.py - even is still using only distutils.
-;;
-;; Setuptools' "install" command (to be more precise: the "easy_install"
-;; command which is called by "install") will put the path of the currently
-;; installed version of each package and it's dependencies (as declared in
-;; setup.py) into an "easy-install.pth" file. In Guix each packages gets its
-;; own "site-packages" directory and thus an "easy-install.pth" of its own.
-;; To avoid conflicts, the python build system renames the file to
-;; <packagename>.pth in the phase rename-pth-file. To ensure that Python will
-;; process the .pth file, easy_install also creates a basic "site.py" in each
-;; "site-packages" directory. The file is the same for all packages, thus
-;; there is no need to rename it. For more information about .pth files and
-;; the site module, please refere to
-;; https://docs.python.org/3/library/site.html.
-;;
-;; The .pth files contain the file-system paths (pointing to the store) of all
-;; dependencies. So the dependency is hidden in the .pth file but is not
-;; visible in the file-system. Now if packages A and B both required packages
-;; P, but in different versions, Guix will not detect this when installing
-;; both A and B to a profile. (For details and example see
-;; https://lists.gnu.org/archive/html/guix-devel/2016-10/msg01233.html.)
-;;
-;; Pip behaves a bit different then easy_install: it always executes
-;; "setup.py" with the option "--single-version-externally-managed" set. This
-;; makes setuptools' "install" command run the original "install" command
-;; instead of the "easy_install" command, so no .pth file (and no site.py)
-;; will be created. The "site-packages" directory only contains the package
-;; and the related .egg-info directory.
-;;
-;; This is exactly what we need for Guix and this is what we mimic in the
-;; install phase below.
-;;
-;; As a draw back, the magic of the .pth file of linking to the other required
-;; packages is gone and these packages have now to be declared as
-;; "propagated-inputs".
-;;
-;; Note: Importing setuptools also adds two sub-commands: "install_egg_info"
-;; and "install_scripts". These sub-commands are executed even if
-;; "--single-version-externally-managed" is set, thus the .egg-info directory
-;; and the scripts defined in entry-points will always be created.
-
-
-(define setuptools-shim
- ;; Run setup.py with "setuptools" being imported, which will patch
- ;; "distutils". This is needed for packages using "distutils" instead of
- ;; "setuptools" since the former does not understand the
- ;; "--single-version-externally-managed" flag.
- ;; Python code taken from pip 9.0.1 pip/utils/setuptools_build.py
- (string-append
- "import setuptools, tokenize;__file__='setup.py';"
- "f=getattr(tokenize, 'open', open)(__file__);"
- "code=f.read().replace('\\r\\n', '\\n');"
- "f.close();"
- "exec(compile(code, __file__, 'exec'))"))
-
-(define (call-setuppy command params use-setuptools?)
- (if (file-exists? "setup.py")
- (begin
- (format #t "running \"python setup.py\" with command ~s and parameters ~s~%"
- command params)
- (if use-setuptools?
- (apply invoke "python" "-c" setuptools-shim
- command params)
- (apply invoke "python" "./setup.py" command params)))
- (error "no setup.py found")))
+;; Caveats:
+;; - There is no support for in-tree build backends.
+
+;; Base error type.
+(define-condition-type &python-build-error &error
+ python-build-error?)
+
+;; Raised when 'check cannot find a valid test system in the inputs.
+(define-condition-type &test-system-not-found &python-build-error
+ test-system-not-found?)
+
+;; Raised when multiple wheels are created by 'build.
+(define-condition-type &cannot-extract-multiple-wheels &python-build-error
+ cannot-extract-multiple-wheels?)
+
+;; Raised, when no wheel has been built by the build system.
+(define-condition-type &no-wheels-built &python-build-error
+ no-wheels-built?)
(define* (sanity-check #:key tests? inputs outputs #:allow-other-keys)
"Ensure packages depending on this package via setuptools work properly,
@@ -143,25 +97,83 @@ (define* (sanity-check #:key tests? inputs outputs #:allow-other-keys)
(with-directory-excursion "/tmp"
(invoke "python" sanity-check.py (site-packages inputs outputs)))))
-(define* (build #:key use-setuptools? #:allow-other-keys)
+(define* (build #:key outputs build-backend configure-flags #:allow-other-keys)
"Build a given Python package."
- (call-setuppy "build" '() use-setuptools?)
- #t)
-(define* (check #:key tests? test-target use-setuptools? #:allow-other-keys)
+ (define (pyproject.toml->build-backend file)
+ "Look up the build backend in a pyproject.toml file."
+ (call-with-input-file file
+ (lambda (in)
+ (let loop ((line (read-line in 'concat)))
+ (if (eof-object? line)
+ #f
+ (let ((m (string-match "build-backend = [\"'](.+)[\"']" line)))
+ (if m (match:substring m 1)
+ (loop (read-line in 'concat)))))))))
+
+ (let* ((wheel-output (assoc-ref outputs "wheel"))
+ (wheel-dir (if wheel-output wheel-output "dist"))
+ ;; There is no easy way to get data from Guile into Python via
+ ;; s-expressions, but we have JSON serialization already, which Python
+ ;; also supports out-of-the-box.
+ (config-settings (call-with-output-string (cut write-json configure-flags <>)))
+ ;; python-setuptools’ default backend supports setup.py *and*
+ ;; pyproject.toml. Allow overriding this automatic detection via
+ ;; build-backend.
+ (auto-build-backend (if (file-exists? "pyproject.toml")
+ (pyproject.toml->build-backend "pyproject.toml")
+ #f))
+ ;; Use build system detection here and not in importer, because a) we
+ ;; have alot of legacy packages and b) the importer cannot update arbitrary
+ ;; fields in case a package switches its build system.
+ (use-build-backend (or
+ build-backend
+ auto-build-backend
+ "setuptools.build_meta")))
+ (format #t "Using '~a' to build wheels, auto-detected '~a', override '~a'.~%"
+ use-build-backend auto-build-backend build-backend)
+ (mkdir-p wheel-dir)
+ ;; Call the PEP 517 build function, which drops a .whl into wheel-dir.
+ (invoke "python" "-c" "import sys, importlib, json
+config_settings = json.loads (sys.argv[3])
+builder = importlib.import_module(sys.argv[1])
+builder.build_wheel(sys.argv[2], config_settings=config_settings)"
+ use-build-backend wheel-dir config-settings)))
+
+(define* (check #:key inputs outputs tests? test-backend test-flags #:allow-other-keys)
"Run the test suite of a given Python package."
(if tests?
- ;; Running `setup.py test` creates an additional .egg-info directory in
- ;; build/lib in some cases, e.g. if the source is in a sub-directory
- ;; (given with `package_dir`). This will by copied to the output, too,
- ;; so we need to remove.
- (let ((before (find-files "build" "\\.egg-info$" #:directories? #t)))
- (call-setuppy test-target '() use-setuptools?)
- (let* ((after (find-files "build" "\\.egg-info$" #:directories? #t))
- (inter (lset-difference string=? after before)))
- (for-each delete-file-recursively inter)))
- (format #t "test suite not run~%"))
- #t)
+ ;; Unfortunately with PEP 517 there is no common method to specify test
+ ;; systems. Guess test system based on inputs instead.
+ (let* ((pytest (which "pytest"))
+ (nosetests (which "nosetests"))
+ (nose2 (which "nose2"))
+ (have-setup-py (file-exists? "setup.py"))
+ (use-test-backend
+ (or
+ test-backend
+ ;; Prefer pytest
+ (if pytest 'pytest #f)
+ (if nosetests 'nose #f)
+ (if nose2 'nose2 #f)
+ ;; But fall back to setup.py, which should work for most
+ ;; packages. XXX: would be nice not to depend on setup.py here? fails
+ ;; more often than not to find any tests at all. Maybe we can run
+ ;; `python -m unittest`?
+ (if have-setup-py 'setup.py #f))))
+ (format #t "Using ~a~%" use-test-backend)
+ (match use-test-backend
+ ('pytest
+ (apply invoke (cons pytest (or test-flags '("-vv")))))
+ ('nose
+ (apply invoke (cons nosetests (or test-flags '("-v")))))
+ ('nose2
+ (apply invoke (cons nose2 (or test-flags '("-v" "--pretty-assert")))))
+ ('setup.py
+ (apply invoke (append '("python" "setup.py") (or test-flags '("test" "-v")))))
+ ;; The developer should explicitly disable tests in this case.
+ (else (raise (condition (&test-system-not-found))))))
+ (format #t "test suite not run~%")))
(define (python-version python)
(let* ((version (last (string-split python #\-)))
@@ -196,33 +208,175 @@ (define* (add-install-to-path #:key outputs #:allow-other-keys)
"/bin:"
(getenv "PATH"))))
-(define* (install #:key inputs outputs (configure-flags '()) use-setuptools?
- #:allow-other-keys)
- "Install a given Python package."
- (let* ((out (python-output outputs))
+(define* (install #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Install a wheel file according to PEP 427"
+ ;; See https://www.python.org/dev/peps/pep-0427/#installing-a-wheel-distribution-1-0-py32-none-any-whl
+ (let* ((site-dir (site-packages inputs outputs))
+ (python (assoc-ref inputs "python"))
+ (out (assoc-ref outputs "out")))
+ (define (extract file)
+ "Extract wheel (ZIP file) into site-packages directory"
+ ;; Use Python’s zipfile to avoid extra dependency
+ (invoke "python" "-m" "zipfile" "-e" file site-dir))
+
+ (define python-hashbang
+ (string-append "#!" python "/bin/python"))
+
+ (define* (merge-directories source destination #:optional (post-move #f))
+ "Move all files in SOURCE into DESTINATION, merging the two directories."
+ (format #t "Merging directory ~a into ~a~%" source destination)
+ (for-each
+ (lambda (file)
+ (format #t "~a/~a -> ~a/~a~%" source file destination file)
+ (mkdir-p destination)
+ (rename-file
+ (string-append source "/" file)
+ (string-append destination "/" file))
+ (when post-move
+ (post-move file)))
+ (scandir source (negate (cut member <> '("." "..")))))
+ (rmdir source))
+
+ (define (expand-data-directory directory)
+ "Move files from all .data subdirectories to their respective
+destinations."
+ ;; Python’s distutils.command.install defines this mapping from source to
+ ;; destination mapping.
+ (let ((source (string-append directory "/scripts"))
+ (destination (string-append out "/bin")))
+ (when (file-exists? source)
+ (merge-directories
+ source
+ destination
+ (lambda (f)
+ (let ((dest-path (string-append destination "/" f)))
+ (chmod dest-path #o755)
+ (substitute* dest-path (("#!python") python-hashbang)))))))
+ ;; data can create arbitrary directory structures. Most commonly
+ ;; it is used for share/.
+ (let ((source (string-append directory "/data"))
+ (destination out))
+ (when (file-exists? source)
+ (merge-directories source destination)))
+ (let* ((distribution (car (string-split (basename directory) #\-)))
+ (source (string-append directory "/headers"))
+ (destination (string-append out "/include/python" (python-version python) "/" distribution)))
+ (when (file-exists? source)
+ (merge-directories source destination))))
+
+ (define (list-directories base predicate)
+ ;; Cannot use find-files here, because it’s recursive.
+ (scandir
+ base
+ (lambda (name)
+ (let ((stat (lstat (string-append base "/" name))))
+ (and
+ (not (member name '("." "..")))
+ (eq? (stat:type stat) 'directory)
+ (predicate name stat))))))
+
+ (let* ((wheel-output (assoc-ref outputs "wheel"))
+ (wheel-dir (if wheel-output wheel-output "dist"))
+ (wheels (map (cut string-append wheel-dir "/" <>)
+ (scandir wheel-dir (cut string-suffix? ".whl" <>)))))
+ (cond
+ ((> (length wheels) 1) ; This code does not support multiple wheels
+ ; yet, because their outputs would have to be
+ ; merged properly.
+ (raise (condition (&cannot-extract-multiple-wheels))))
+ ((= (length wheels) 0)
+ (raise (condition (&no-wheels-built)))))
+ (for-each extract wheels))
+ (let ((datadirs (map
+ (cut string-append site-dir "/" <>)
+ (list-directories site-dir (file-name-predicate "\\.data$")))))
+ (for-each (lambda (directory)
+ (expand-data-directory directory)
+ (rmdir directory))
+ datadirs))))
+
+(define* (compile-bytecode #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Compile installed byte-code in site-packages."
+ (let* ((site-dir (site-packages inputs outputs))
(python (assoc-ref inputs "python"))
(major-minor (map string->number
(take (string-split (python-version python) #\.) 2)))
(<3.7? (match major-minor
((major minor)
- (or (< major 3) (and (= major 3) (< minor 7))))))
- (params (append (list (string-append "--prefix=" out)
- "--no-compile")
- (if use-setuptools?
- ;; distutils does not accept these flags
- (list "--single-version-externally-managed"
- "--root=/")
- '())
- configure-flags)))
- (call-setuppy "install" params use-setuptools?)
- ;; Rather than produce potentially non-reproducible .pyc files on Pythons
- ;; older than 3.7, whose 'compileall' module lacks the
- ;; '--invalidation-mode' option, do not generate any.
- (unless <3.7?
- (invoke "python" "-m" "compileall" "--invalidation-mode=unchecked-hash"
- out))))
-
-(define* (wrap #:key inputs outputs #:allow-other-keys)
+ (or (< major 3) (and (= major 3) (< minor 7)))))))
+ (if <3.7?
+ ;; These versions don’t have the hash invalidation modes and do
+ ;; not produce reproducible bytecode files.
+ (format #t "Skipping bytecode compilation for Python version ~a < 3.7~%" (python-version python))
+ (invoke "python" "-m" "compileall" "--invalidation-mode=unchecked-hash" site-dir))))
+
+(define* (create-entrypoints #:key inputs outputs (configure-flags '()) #:allow-other-keys)
+ "Implement Entry Points Specification
+(https://packaging.python.org/specifications/entry-points/) by PyPa,
+which creates runnable scripts in bin/ from entry point specification
+file entry_points.txt. This is necessary, because wheels do not contain
+these binaries and installers are expected to create them."
+
+ (define (entry-points.txt->entry-points file)
+ "Specialized parser for Python configfile-like files, in particular
+entry_points.txt. Returns a list of console_script and gui_scripts
+entry points."
+ (call-with-input-file file
+ (lambda (in)
+ (let loop ((line (read-line in))
+ (inside #f)
+ (result '()))
+ (if (eof-object? line)
+ result
+ (let* ((group-match (string-match "^\\[(.+)\\]$" line))
+ (group-name (if group-match (match:substring group-match 1) #f))
+ (next-inside
+ (if (not group-name)
+ inside
+ (or
+ (string=? group-name "console_scripts")
+ (string=? group-name "gui_scripts"))))
+ (item-match (string-match "^([^ =]+)\\s*=\\s*([^:]+):(.+)$" line)))
+ (if (and inside item-match)
+ (loop (read-line in) next-inside (cons (list
+ (match:substring item-match 1)
+ (match:substring item-match 2)
+ (match:substring item-match 3))
+ result))
+ (loop (read-line in) next-inside result))))))))
+
+ (define (create-script path name module function)
+ "Create a Python script from an entry point’s NAME, MODULE and
+ FUNCTION and return write it to PATH/NAME."
+ (let ((interpreter (which "python"))
+ (file-path (string-append path "/" name)))
+ (format #t "Creating entry point for '~a.~a' at '~a'.~%" module function
+ file-path)
+ (call-with-output-file file-path
+ (lambda (port)
+ ;; Technically the script could also include search-paths,
+ ;; but having a generic 'wrap phases also handles manually
+ ;; written entry point scripts.
+ (format port "#!~a
+# Auto-generated entry point script.
+import sys
+import ~a as mod
+sys.exit (mod.~a ())~%" interpreter module function)))
+ (chmod file-path #o755)))
+
+ (let* ((site-dir (site-packages inputs outputs))
+ (out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin"))
+ (entry-point-files (find-files site-dir "^entry_points.txt$")))
+ (mkdir-p bin-dir)
+ (for-each
+ (lambda (f)
+ (for-each
+ (lambda (ep) (apply create-script (cons bin-dir ep)))
+ (entry-points.txt->entry-points f)))
+ entry-point-files)))
+
+(define* (wrap #:key inputs outputs search-paths #:allow-other-keys)
(define (list-of-files dir)
(find-files dir (lambda (file stat)
(and (eq? 'regular (stat:type stat))
@@ -250,29 +404,11 @@ (define (sh) (force %sh))
files)))
bindirs)))
-(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
- "Rename easy-install.pth to NAME.pth to avoid conflicts between packages
-installed with setuptools."
- ;; Even if the "easy-install.pth" is not longer created, we kept this phase.
- ;; There still may be packages creating an "easy-install.pth" manually for
- ;; some good reason.
- (let* ((site-packages (site-packages inputs outputs))
- (easy-install-pth (string-append site-packages "/easy-install.pth"))
- (new-pth (string-append site-packages "/" name ".pth")))
- (when (file-exists? easy-install-pth)
- (rename-file easy-install-pth new-pth))))
-
-(define* (ensure-no-mtimes-pre-1980 #:rest _)
- "Ensure that there are no mtimes before 1980-01-02 in the source tree."
- ;; Rationale: patch-and-repack creates tarballs with timestamps at the POSIX
- ;; epoch, 1970-01-01 UTC. This causes problems with Python packages,
- ;; because Python eggs are ZIP files, and the ZIP format does not support
- ;; timestamps before 1980.
- (let ((early-1980 315619200)) ; 1980-01-02 UTC
- (ftw "." (lambda (file stat flag)
- (unless (<= early-1980 (stat:mtime stat))
- (utime file early-1980 early-1980))
- #t))))
+(define* (set-SOURCE-DATE-EPOCH #:rest _)
+ "Set the 'SOURCE_DATE_EPOCH' environment variable. This is used by tools
+that incorporate timestamps as a way to tell them to use a fixed timestamp.
+See https://reproducible-builds.org/specs/source-date-epoch/."
+ (setenv "SOURCE_DATE_EPOCH" "315619200")) ;; python-wheel respects this variable and sets pre-1980 times on files in zip files, which is unsupported
(define* (enable-bytecode-determinism #:rest _)
"Improve determinism of pyc files."
@@ -299,11 +435,11 @@ (define %standard-phases
;; prefix directory. The check phase is moved after the installation phase
;; to ease testing the built package.
(modify-phases gnu:%standard-phases
- (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980)
- (add-after 'ensure-no-mtimes-pre-1980 'enable-bytecode-determinism
+ (add-after 'unpack 'enable-bytecode-determinism
enable-bytecode-determinism)
(add-after 'enable-bytecode-determinism 'ensure-no-cythonized-files
ensure-no-cythonized-files)
+ (replace 'set-SOURCE-DATE-EPOCH set-SOURCE-DATE-EPOCH)
(delete 'bootstrap)
(delete 'configure) ;not needed
(replace 'build build)
@@ -313,9 +449,11 @@ (define %standard-phases
(add-after 'add-install-to-pythonpath 'add-install-to-path
add-install-to-path)
(add-after 'add-install-to-path 'wrap wrap)
+ ;; must be before tests, so they can use installed packages’ entry points.
+ (add-before 'wrap 'create-entrypoints create-entrypoints)
(add-after 'wrap 'check check)
(add-after 'check 'sanity-check sanity-check)
- (add-before 'strip 'rename-pth-file rename-pth-file)))
+ (add-before 'check 'compile-bytecode compile-bytecode)))
(define* (python-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args)
--
2.35.1
[-- Attachment #5: v3-0004-gnu-Use-python-build-system-module-inside-importe.patch --]
[-- Type: text/plain, Size: 26819 bytes --]
From 7e9bea152a81cfe69c4641a26469219a147f1d87 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 8 Jan 2022 14:56:04 +0100
Subject: [PATCH v3 004/150] gnu: Use %python-build-system-module inside
#:imported-modules.
It includes (guix build json), which is now required for (guix build
python-build-system).
* gnu/packages/boost.scm (boost): Use %python-build-system-module.
* gnu/packages/cups.scm (hplip): Likewise.
* gnu/packages/djvu.scm (didjvu): Likewise.
* gnu/packages/finance.scm (ledger): Likewise.
* gnu/packages/games.scm (fifengine): Likewise.
* gnu/packages/geo.scm (grass): Likewise.
(qgis): Likewise.
* gnu/packages/gnome.scm (system-config-printer): Likewise.
(gnome-tweaks): Likewise.
(lollypop): Likewise.
(soundconverter): Likewise.
(piper): Likewise.
* gnu/packages/graph.scm (python-graph-tool): Likewise.
* gnu/packages/graphics.scm (lib2geom): Likewise.
* gnu/packages/gstreamer.scm (python-gst): Likewise.
* gnu/packages/julia-xyz.scm (julia-pycall): Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3): Likewise.
* gnu/packages/machine-learning.scm (ghmm): Likewise.
(tensorflow): Likewise.
* gnu/packages/maths.scm (nomad-optimizer): Likewise.
(gmsh): Likewise.
(z3): Likewise.
(ocaml-z3): Likewise.
(fp16): Likewise.
(optizelle): Likewise.
* gnu/packages/mpd.scm (sonata): Likewise.
* gnu/packages/music.scm (jack-select): Likewise.
* gnu/packages/networking.scm (opendht): Likewise.
* gnu/packages/openldap.scm (389-ds-base): Likewise.
* gnu/packages/qt.scm (python-sip-4): Likewise.
(python-pyqt): Likewise.
(python-pyqtwebengine): Likewise.
* gnu/packages/radio.scm (gnuradio): Likewise.
(gr-osmosdr): Likewise.
(gr-satellites): Likewise.
* gnu/packages/rpm.scm (libmodulemd): Likewise.
(createrepo-c): Likewise.
* gnu/packages/textutils.scm (opencc): Likewise.
* gnu/packages/version-control.scm (hg-commitsigs): Likewise.
* gnu/packages/virtualization.scm (ganeti): Likewise.
* gnu/packages/vpn.scm (bitmask): Likewise.
* gnu/packages/xdisorg.scm (redshift): Likewise.
---
gnu/packages/boost.scm | 3 ++-
gnu/packages/cups.scm | 2 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/finance.scm | 2 +-
gnu/packages/geo.scm | 4 ++--
gnu/packages/gnome.scm | 10 +++++-----
gnu/packages/graph.scm | 2 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/gstreamer.scm | 3 ++-
gnu/packages/julia-xyz.scm | 3 ++-
gnu/packages/lisp-xyz.scm | 3 ++-
gnu/packages/machine-learning.scm | 4 ++--
gnu/packages/maths.scm | 12 ++++++------
gnu/packages/mpd.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/openldap.scm | 2 +-
gnu/packages/qt.scm | 6 +++---
gnu/packages/radio.scm | 6 +++---
gnu/packages/rpm.scm | 5 +++--
gnu/packages/textutils.scm | 2 +-
gnu/packages/version-control.scm | 2 +-
gnu/packages/virtualization.scm | 2 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/xdisorg.scm | 2 +-
25 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index b53b1f4257..ff9b6a3167 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -42,6 +42,7 @@ (define-module (gnu packages boost)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
@@ -86,7 +87,7 @@ (define-public boost
`(("python" ,python-minimal-wrapper)))
("tcsh" ,tcsh)))
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules (((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index da113ac168..3a006c3993 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -562,7 +562,7 @@ (define-public hplip
(assoc-ref %outputs "out") "/etc/xdg")
"--enable-qt5" "--disable-qt4")
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules ((guix build gnu-build-system)
(guix build utils)
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 07c77f318e..b5ee1ebe19 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -356,7 +356,7 @@ (define-public didjvu
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:test-target "test"
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 84547639e4..1160fc341b 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -319,7 +319,7 @@ (define-public ledger
`(#:modules (,@%cmake-build-system-modules
((guix build python-build-system) #:select (python-version)))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:configure-flags
`("-DBUILD_DOCS:BOOL=ON"
"-DBUILD_WEB_DOCS:BOOL=ON"
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index c2569c27d4..ec6740ba9a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2182,7 +2182,7 @@ (define-public grass
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -2309,7 +2309,7 @@ (define-public qgis
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system)
+ ,@%python-build-system-modules
(guix build qt-utils))
#:configure-flags
'("-DWITH_QTWEBKIT=NO")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 19adb67423..a55c54e8cb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2941,7 +2941,7 @@ (define-public system-config-printer
(build-system glib-or-gtk-build-system)
(arguments
(list
- #:imported-modules `((guix build python-build-system)
+ #:imported-modules `(,@%python-build-system-modules
,@%glib-or-gtk-build-system-modules)
#:phases
#~(modify-phases %standard-phases
@@ -9935,7 +9935,7 @@ (define-public gnome-tweaks
`(#:glib-or-gtk? #t
#:configure-flags '("-Dlocalstatedir=/tmp"
"-Dsysconfdir=/tmp")
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%meson-build-system-modules)
#:phases
(modify-phases %standard-phases
@@ -10629,7 +10629,7 @@ (define-public lollypop
(arguments
`(#:imported-modules
(,@%meson-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules
((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
@@ -10889,7 +10889,7 @@ (define-public soundconverter
(base32 "1jv8m82hi23ilrgdznlc1jhp2jm8bw1yrw0chh3qw2l0sixvkl11"))))
(build-system glib-or-gtk-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
(guix build glib-or-gtk-build-system)
,@%gnu-build-system-modules)
@@ -12133,7 +12133,7 @@ (define-public piper
python-pycairo
python-pygobject))
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%meson-build-system-modules)
#:modules (((guix build python-build-system) #:prefix python:)
(guix build meson-build-system)
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 981c4d4793..1e5e64de62 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -621,7 +621,7 @@ (define-public python-graph-tool
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules (,@%gnu-build-system-modules
((guix build python-build-system) #:select (site-packages)))
#:configure-flags
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2cc75d57cf..b48b105d68 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -752,7 +752,7 @@ (define-public lib2geom
"03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:configure-flags '("-D2GEOM_BUILD_SHARED=ON"
"-D2GEOM_BOOST_PYTHON=ON"
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 8b01c9b04b..1df699b6fe 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages gstreamer)
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (guix utils)
#:use-module (gnu packages)
@@ -1072,7 +1073,7 @@ (define-public python-gst
(guix build utils)
((guix build python-build-system) #:prefix python:))
#:imported-modules (,@%meson-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:configure-flags
(list (string-append
"-Dpygi-overrides-dir="
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 5d45c07115..ab0b8a37b4 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -28,6 +28,7 @@ (define-module (gnu packages julia-xyz)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system julia)
+ #:use-module (guix build-system python)
#:use-module (gnu packages gcc)
#:use-module (gnu packages julia-jll)
#:use-module (gnu packages python)
@@ -4160,7 +4161,7 @@ (define-public julia-pycall
(build-system julia-build-system)
(arguments
(list
- #:imported-modules `((guix build python-build-system)
+ #:imported-modules `(,@%python-build-system-modules
,@%julia-build-system-modules)
#:modules '((guix build julia-build-system)
(guix build utils)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 9317108f4c..263dd29234 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -64,6 +64,7 @@ (define-module (gnu packages lisp-xyz)
#:use-module (guix utils)
#:use-module (guix build-system asdf)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages base)
#:use-module (gnu packages c)
@@ -5344,7 +5345,7 @@ (define-public sbcl-burgled-batteries3
`(#:tests? #f
#:modules (((guix build python-build-system) #:select (python-version))
,@%asdf-build-system-modules)
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%asdf-build-system-modules)
#:phases
(modify-phases (@ (guix build asdf-build-system) %standard-phases)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 7f082ee677..48e6c1489d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -234,7 +234,7 @@ (define-public ghmm
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build python-build-system)
,@%gnu-build-system-modules)
#:phases
@@ -1884,7 +1884,7 @@ (define-public tensorflow
((guix build python-build-system)
#:select (python-version)))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-source-file-times-to-1980
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f9767d2430..d02d1c2303 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1953,7 +1953,7 @@ (define-public nomad-optimizer
`(("python" ,python-wrapper)
("python-cython" ,python-cython)))
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:modules (((guix build python-build-system)
#:select (python-version site-packages))
@@ -2853,7 +2853,7 @@ (define-public gmsh
"-DENABLE_BUILD_SHARED:BOOL=ON"
"-DENABLE_BUILD_DYNAMIC:BOOL=ON")
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build cmake-build-system)
(guix build utils))
@@ -5710,7 +5710,7 @@ (define-public z3
"1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"))))
(build-system gnu-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build gnu-build-system)
@@ -5765,7 +5765,7 @@ (define-public ocaml-z3
(inherit z3)
(name "ocaml-z3")
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build gnu-build-system)
@@ -7333,7 +7333,7 @@ (define-public fp16
(patches (search-patches "fp16-system-libraries.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:modules (((guix build python-build-system)
#:select (site-packages))
@@ -7405,7 +7405,7 @@ (define-public optizelle
#t))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:modules (((guix build python-build-system) #:select
(python-version))
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 1ee6806735..e5795a724c 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -328,7 +328,7 @@ (define-public sonata
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system)
+ ,@%python-build-system-modules
(guix build glib-or-gtk-build-system))
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 89d64957c8..2e4a08c283 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3226,7 +3226,7 @@ (define-public jack-select
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; there are none
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b45f2f79f2..35cee1877a 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3412,7 +3412,7 @@ (define-public opendht
(build-system gnu-build-system)
(arguments
(list
- #:imported-modules `((guix build python-build-system) ;for site-packages
+ #:imported-modules `(,@%python-build-system-modules ;for site-packages
,@%gnu-build-system-modules)
#:modules '(((guix build python-build-system) #:prefix python:)
(guix build gnu-build-system)
diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index c8a47e45d5..ee3c2de367 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -259,7 +259,7 @@ (define-public 389-ds-base
((guix build python-build-system)
#:select (add-installed-pythonpath python-version))
(guix build utils))
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:configure-flags
(list (string-append "--with-db="
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0163d02bc0..f98920373d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2017,7 +2017,7 @@ (define-public python-sip-4
(propagated-inputs `())
(arguments
`(#:tests? #f ; no check target
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
@@ -2082,7 +2082,7 @@ (define-public python-pyqt
`(#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules)
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
@@ -2183,7 +2183,7 @@ (define-public python-pyqtwebengine
`(#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules)
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index dfc274a1de..d49ae0f591 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -545,7 +545,7 @@ (define-public gnuradio
(ice-9 match))
#:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system)
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:configure-flags
(list (string-append "-DMATHJAX2_ROOT="
(assoc-ref %build-inputs "js-mathjax")
@@ -675,7 +675,7 @@ (define-public gr-osmosdr
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-python
@@ -807,7 +807,7 @@ (define-public gr-satellites
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-before 'check 'set-test-environment
diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm
index 96c6776d1a..4583f1afc1 100644
--- a/gnu/packages/rpm.scm
+++ b/gnu/packages/rpm.scm
@@ -23,6 +23,7 @@ (define-module (gnu packages rpm)
#:use-module (guix packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system python)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -90,7 +91,7 @@ (define-public libmodulemd
(list (string-append "-Dgobject_overrides_dir_py3="
(python:site-packages %build-inputs %outputs)))
#:imported-modules (,@%meson-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
@@ -160,7 +161,7 @@ (define-public createrepo-c
(build-system cmake-build-system)
(arguments
`(#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build cmake-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index cbc657172d..faba62673f 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1198,7 +1198,7 @@ (define-public opencc
#:parallel-build? #f ;occasionally failed.
#:imported-modules
(,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build cmake-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index d77c2e51f6..5fb7de5f15 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1835,7 +1835,7 @@ (define-public hg-commitsigs
"059gm66q06m6ayl4brsc517zkw3ahmz249b6xm1m32ac5y24wb9x"))))
(build-system copy-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%copy-build-system-modules)
#:modules ((srfi srfi-1)
(guix build python-build-system)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f3396e7c94..127306eb28 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -565,7 +565,7 @@ (define-public ganeti
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
(guix build haskell-build-system)
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules (,@%gnu-build-system-modules
((guix build haskell-build-system) #:prefix haskell:)
((guix build python-build-system) #:select (site-packages))
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 5bf5a62481..9e83f06551 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -114,7 +114,7 @@ (define-public bitmask
`(#:imported-modules
((guix build cmake-build-system)
(guix build copy-build-system)
- (guix build python-build-system)
+ ,@%python-build-system-modules
(guix build qt-build-system)
(guix build qt-utils)
,@%go-build-system-modules)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d2caee85ec..ae610b0bea 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1356,7 +1356,7 @@ (define-public redshift
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'install 'split-outputs
--
2.35.1
[-- Attachment #6: v3-0005-gnu-Use-python2-toolchain-for-build-instead-of-py.patch --]
[-- Type: text/plain, Size: 22471 bytes --]
From dc9e54629f9f68060db6597686d30d4c44948062 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 23 Apr 2022 10:56:01 +0200
Subject: [PATCH v3 005/150] gnu: Use python2-toolchain-for-build instead of
python-2.
* gnu/packages/check.scm (module-variable-resolver): New variable.
(python-commencement-packager): Likewise.
(python2-pytest): Use python2-toolchain-for-build.
(python2-pytest-mock): Likewise.
(python2-pyfakefs-bootstrap): Likewise.
* gnu/packages/python-xyz.scm (module-variable-resolver): Likewise.
(python-commencement-package): Likewise.
(python2-twodict): Likewise.
(python2-backport-ssl-match-hostname): Likewise.
(python2-openpyxl): Likewise.
(python2-element-tree): Likewise.
(python2-pybugz): Likewise.
(python2-enum): Likewise.
(python2-funcsigs): Likewise.
(python2-pystache): Likewise.
(python2-cython): Likewise.
(python2-matplotlib): Likewise.
(python2-elib.intl): Likewise.
(python2-importlib-resources): Likewise.
(python-dbus): Likewise.
(python2-beautifulsoup4): Likewise.
(python2-networkx): Likewise.
(python2-backports-shutil-get-terminal-size): Likewise.
(python2-pyroute2): Likewise.
(python2-ipaddr): Likewise.
(python-tlsh): Likewise.
(python2-functools32): Likewise.
(python2-subprocess32): Likewise.
(python2-futures): Likewise.
(python2-pathlib2): Likewise.
(python2-unicodecsv): Likewise.
(python2-s3cmd): Likewise.
(python2-shedskin): Likewise.
(python2-jsonrpclib): Likewise.
(python2-ruamel.ordereddict): Likewise.
(python2-tracing): Likewise.
(python2-backports-functools-lru-cache): Likewise.
(python2-argparse): Likewise.
(python2-stemming): Likewise.
(python2-couleur): Likewise.
(python2-steadymark): Likewise.
(python2-booleanoperations): Likewise.
(python2-pyro): Likewise.
(python2-scientific): Likewise.
(python2-mmtk): Likewise.
(python2-typing): Likewise.
(python2-quex-0.67.3): Likewise.
(python2-more-itertools): Likewise.
(python2-zeroconf): Likewise.
(python2-gamera): Likewise.
---
gnu/packages/check.scm | 13 +++--
gnu/packages/python-xyz.scm | 97 ++++++++++++++++++++-----------------
2 files changed, 63 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 335ab7ab11..c0eadbad4b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -91,6 +91,13 @@ (define-module (gnu packages check)
#:use-module (guix build-system trivial)
#:use-module (srfi srfi-1))
+(define (module-variable-resolver module)
+ (lambda (variable)
+ (module-ref (resolve-interface module) variable)))
+
+(define python-commencement-package
+ (module-variable-resolver '(gnu packages python-commencement)))
+
(define-public pict
(package
(name "pict")
@@ -1062,7 +1069,7 @@ (define-public python2-pytest
"0ls3pqr86xgif6bphsb6wrww9r2vc7p7a2naq8zcq8115wwq5yjh"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
,@(package-arguments python-pytest)))
(propagated-inputs
`(("python-atomicwrites" ,python2-atomicwrites)
@@ -1380,7 +1387,7 @@ (define-public python2-pytest-mock
(base32
"1i5mg3ff1qk0wqfcxfz60hwy3q5dskdp36i10ckigkzffg8hc3ad"))))
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(native-inputs
`(("python2-setuptools-scm" ,python2-setuptools-scm)))
(propagated-inputs
@@ -3024,7 +3031,7 @@ (define-public python2-pyfakefs-bootstrap
(name "python2-pyfakefs-bootstrap")
(native-inputs '())
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f)))))
(define-public python-aiounittest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f2532abc52..c300e973c5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -196,6 +196,8 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
+ ;; Importing this module results in a cycle, see below.
+ ;#:use-module (gnu packages python-commencement)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
@@ -243,6 +245,13 @@ (define-module (gnu packages python-xyz)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26))
+(define (module-variable-resolver module)
+ (lambda (variable)
+ (module-ref (resolve-interface module) variable)))
+
+(define python-commencement-package
+ (module-variable-resolver '(gnu packages python-commencement)))
+
(define-public python-xmldiff
(package
(name "python-xmldiff")
@@ -463,7 +472,7 @@ (define-public python2-twodict
(base32 "0ifv7dv18jn2lg0a3l6zdlvmmlda2ivixfjbsda58a2ay6kxznr0"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))))
(define-public python-argopt
(package
@@ -1210,7 +1219,7 @@ (define-public python2-backport-ssl-match-hostname
"1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f)) ; no test target
(home-page "https://bitbucket.org/brandon/backports.ssl_match_hostname")
(synopsis "Backport of ssl.match_hostname() function from Python 3.5")
@@ -2400,7 +2409,7 @@ (define-public python2-openpyxl
(base32
"1qzjj8nwj4dn0mhq1j64f136afiqqb81lvqiikipz3g1g0b80lqx"))))
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f))))) ; No test suite.
(define-public python-eventlet
@@ -2734,7 +2743,7 @@ (define-public python2-element-tree
"016bphqnlg0l4vslahhw4r0aanw95bpypy65r1i1acyb2wj5z7dj"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2 ; seems to be part of Python 3
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build) ; seems to be part of Python 3
#:tests? #f)) ; no 'test' sub-command
(synopsis "Toolkit for XML processing in Python")
(description
@@ -2760,7 +2769,7 @@ (define-public python2-pybugz
"pybugz-encode-error.patch"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2 ; SyntaxError with Python 3
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build) ; SyntaxError with Python 3
#:tests? #f)) ; no 'test' sub-command
(propagated-inputs
`(("element-tree" ,python2-element-tree)))
@@ -2784,7 +2793,7 @@ (define-public python2-enum
"13lk3yrwj42vl30kw3c194f739nrfrdg64s6i0v2p636n4k8brsl"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://pypi.org/project/enum/")
(synopsis "Robust enumerated type support in Python")
(description
@@ -3153,7 +3162,7 @@ (define-public python2-funcsigs
"0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(native-inputs
(list python2-unittest2))
(home-page "http://funcsigs.readthedocs.org")
@@ -4051,7 +4060,7 @@ (define-public python2-pystache
(strip-python2-variant python-pystache))))
(package/inherit base
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(replace 'check
@@ -5541,7 +5550,7 @@ (define-public python2-cython
(package/inherit base
(name "python2-cython")
(inputs
- `(("python-2" ,python-2))) ;this is not automatically changed
+ `(("python-2" ,(python-commencement-package 'python2-toolchain-for-build)))) ;this is not automatically changed
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
@@ -6606,7 +6615,7 @@ (define-public python2-matplotlib
("python2-pytz" ,python2-pytz)
("python2-six" ,python2-six)
("python2-subprocess32" ,python2-subprocess32)
- ("python2-tkinter" ,python-2 "tk"))))))
+ ("python2-tkinter" ,(python-commencement-package 'python2-toolchain-for-build) "tk"))))))
(define-public python-matplotlib-documentation
(package
@@ -7084,7 +7093,7 @@ (define-public python2-elib.intl
(build-system python-build-system)
(arguments
;; incompatible with Python 3 (exception syntax)
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f))
(home-page "https://github.com/dieterv/elib.intl")
(synopsis "Enhanced internationalization for Python")
@@ -8236,7 +8245,7 @@ (define-public python2-importlib-resources
"0y3hg12iby1qyaspnbisz4s4vxax7syikk3skznwqizqyv89y9yk"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases (modify-phases %standard-phases
;; The build system tests for python-wheel, but it is
;; not required for Guix nor the test suite. Just drop
@@ -9303,7 +9312,7 @@ (define-public python-dbus
(define-public python2-dbus
(package/inherit python-dbus
(name "python2-dbus")
- (inputs `(("python" ,python-2)
+ (inputs `(("python" ,(python-commencement-package 'python2-toolchain-for-build))
,@(alist-delete "python"
(package-inputs python-dbus))))
(arguments
@@ -9402,7 +9411,7 @@ (define-public python2-beautifulsoup4
(sha256
(base32
"09gbd49mwz86k572r1231x2rdp82p42zlnw0bz9b9mfi58r9wwl4"))))
- (arguments `(#:python ,python-2)))))
+ (arguments `(#:python ,(python-commencement-package 'python2-toolchain-for-build))))))
(define-public python-soupsieve
(package
@@ -9521,7 +9530,7 @@ (define-public python2-networkx
(base32
"12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5"))))
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(native-inputs
(list python2-nose unzip)))))
@@ -10089,7 +10098,7 @@ (define-public python2-backports-shutil-get-terminal-size
"107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(replace 'check
@@ -11442,7 +11451,7 @@ (define-public python2-pyroute2
"1gmz4r1w0yzj6fjjypnalmfyy0lnfznydyn62gi3wk50j5hhxbny"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2)) ;Python 3.x is not supported
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build))) ;Python 3.x is not supported
(home-page "https://github.com/svinota/pyroute2")
(synopsis "Python netlink library")
(description
@@ -12225,7 +12234,7 @@ (define-public python2-ipaddr
(base32 "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2 ;version 2 only
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build) ;version 2 only
#:phases
(modify-phases %standard-phases
(replace 'check
@@ -12430,7 +12439,7 @@ (define-public python-tlsh
(define-public python2-tlsh
(package/inherit python-tlsh
(name "python2-tlsh")
- (inputs `(("python" ,python-2)))))
+ (inputs `(("python" ,(python-commencement-package 'python2-toolchain-for-build))))))
(define-public python-termcolor
(package
@@ -13985,7 +13994,7 @@ (define-public python2-functools32
"0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f)) ; no test target
(home-page "https://github.com/MiCHiLU/python-functools32")
(synopsis
@@ -14009,7 +14018,7 @@ (define-public python2-subprocess32
(search-patches "python2-subprocess32-disable-input-test.patch"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
;; The test suite fails with Python > 2.7.13:
;; import test.support
;; ImportError: No module named support
@@ -14045,7 +14054,7 @@ (define-public python2-futures
"0rdjmmsab550kxsssdq49jcniz77zlkpw4pvi9hvib3lsskjmh4y"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(replace 'check
@@ -15406,7 +15415,7 @@ (define-public python2-pathlib2
;; version is 3.4 which already includes this package as part of the
;; standard library.
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(propagated-inputs
(list python2-scandir python2-six))
(home-page "https://pypi.org/project/pathlib2/")
@@ -15484,7 +15493,7 @@ (define-public python2-unicodecsv
(build-system python-build-system)
(arguments
`(;; It supports Python 3, but Python 3 can already do Unicode CSV.
- #:python ,python-2))
+ #:python ,(python-commencement-package 'python2-toolchain-for-build)))
(native-inputs
(list python2-unittest2))
(home-page "https://github.com/jdunck/python-unicodecsv")
@@ -15687,7 +15696,7 @@ (define-public python2-s3cmd
(build-system python-build-system)
(arguments
;; s3cmd is written for python2 only and contains no tests.
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f))
(propagated-inputs
(list python2-dateutil
@@ -15876,7 +15885,7 @@ (define-public python2-shedskin
"0nzwrzgw1ga8rw6f0ryq7zr9kkiavd1cqz5hzxkcbicl1dk7kz41"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases (modify-phases %standard-phases
(add-after 'unpack 'fix-resulting-include-libs
(lambda* (#:key inputs #:allow-other-keys)
@@ -16406,7 +16415,7 @@ (define-public python2-jsonrpclib
(build-system python-build-system)
(arguments
`(#:tests? #f
- #:python ,python-2))
+ #:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://github.com/joshmarshall/jsonrpclib/")
(synopsis "Implementation of JSON-RPC specification for Python")
(description
@@ -18635,7 +18644,7 @@ (define-public python2-ruamel.ordereddict
"1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(delete 'check)
@@ -18957,7 +18966,7 @@ (define-public python2-tracing
"06cw4zg42fsvqy372vi2whj26w56vzg5axhzwdjc2bgwf03garbw"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://liw.fi/tracing/")
(synopsis "Python debug logging helper")
(description "@code{python2-tracing} is a python library for
@@ -19136,7 +19145,7 @@ (define-public python2-backports-functools-lru-cache
(native-inputs
(list python2-setuptools-scm))
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://github.com/jaraco/backports.functools_lru_cache")
(synopsis "Backport of functools.lru_cache from Python 3.3")
(description "@code{python2-backports-functools-lru-cache} is a backport
@@ -19252,7 +19261,7 @@ (define-public python2-argparse
"1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://github.com/ThomasWaldmann/argparse/")
(synopsis "Python command-line parsing library")
(description
@@ -19429,7 +19438,7 @@ (define-public python2-stemming
(base32 "0ldwa24gnnxhniv0fhygkpc2mwgd93q10ag8rvzayv6hw418frsr"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://bitbucket.org/mchaput/stemming/overview")
(synopsis "Python implementations of various stemming algorithms")
(description
@@ -19679,7 +19688,7 @@ (define-public python2-couleur
"1qqaxyqz74wvid0cr119dhcwz0h0if5b5by44zl49pd5z65v58k1"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://github.com/gabrielfalcao/couleur")
(synopsis
"ANSI terminal tool for python, colored shell and other handy fancy features")
@@ -19740,7 +19749,7 @@ (define-public python2-steadymark
(native-inputs
(list python2-couleur python2-sure python2-misaka))
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-setup-py
@@ -20909,7 +20918,7 @@ (define-public python2-booleanoperations
"1hw42fazdpvsn77glx96hwsj9l17mvx37sc5707s08y5w6fx16mn"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(native-inputs
(list unzip python2-pytest python2-pytest-runner))
(propagated-inputs
@@ -21085,7 +21094,7 @@ (define-public python2-pyro
(build-system python-build-system)
(arguments
;; Pyro is not compatible with Python 3
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
;; Pyro has no test cases for automatic execution
#:tests? #f))
(home-page "https://pythonhosted.org/Pyro/")
@@ -21120,7 +21129,7 @@ (define-public python2-scientific
(list python2-numpy-1.8 python2-pyro))
(arguments
;; ScientificPython is not compatible with Python 3
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f ; No test suite
#:phases
(modify-phases %standard-phases
@@ -21157,9 +21166,9 @@ (define-public python2-mmtk
(list netcdf))
(propagated-inputs
`(("python-scientific" ,python2-scientific)
- ("python-tkinter" ,python-2 "tk")))
+ ("python-tkinter" ,(python-commencement-package 'python2-toolchain-for-build) "tk")))
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -21754,7 +21763,7 @@ (define-public python2-typing
(sha256
(base32 "0c5il4d68fd4qrm5k3dps70j0xz0n5krj6lhwn9vzpal3whsvd0k"))))
(build-system python-build-system)
- (arguments (list #:python python-2))
+ (arguments (list #:python (python-commencement-package 'python2-toolchain-for-build)))
(home-page "https://docs.python.org/3/library/typing.html")
(synopsis "Type hints for Python")
(description "This is a backport of the standard library @code{typing}
@@ -21926,7 +21935,7 @@ (define-public python2-quex-0.67.3
(native-inputs
(list unzip))
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:tests? #f
#:phases
(modify-phases %standard-phases
@@ -21998,7 +22007,7 @@ (define-public python2-more-itertools
(base32
"1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q"))))
(arguments
- `(#:python ,python-2))
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)))
(propagated-inputs
`(("python2-six" ,python2-six-bootstrap)))))
@@ -24203,7 +24212,7 @@ (define-public python2-zeroconf
"0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-requires
@@ -27189,7 +27198,7 @@ (define-public python2-gamera
(inputs
(list libpng libtiff zlib))
(arguments
- `(#:python ,python-2
+ `(#:python ,(python-commencement-package 'python2-toolchain-for-build)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-wx-support
--
2.35.1
[-- Attachment #7: v3-0146-gnu-meson-Match-shebang-instead-of-setuptools-spe.patch --]
[-- Type: text/plain, Size: 1448 bytes --]
From 84c3af5cf41d402847adb33b11897d34f5a14179 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Wed, 19 Jan 2022 09:48:44 +0100
Subject: [PATCH v3 146/150] gnu: meson: Match shebang instead of
setuptools-specific line.
* gnu/packages/build-tools.scm (meson)[arguments]: Replace substitute*
pattern.
---
gnu/packages/build-tools.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 437b0d3550..b343467699 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -289,12 +289,12 @@ (define-public meson
(python-version (assoc-ref inputs "python")))
(output (assoc-ref outputs "out")))
(substitute* (string-append output "/bin/meson")
- (("# EASY-INSTALL-ENTRY-SCRIPT")
- (format #f "\
+ (("#!/(.+)" all)
+ (format #f "~a\
import sys
sys.path.insert(0, '~a/lib/python~a/site-packages')
-# EASY-INSTALL-ENTRY-SCRIPT"
- output python-version)))))))))
+"
+ all output python-version)))))))))
(inputs (list python-wrapper ninja))
(home-page "https://mesonbuild.com/")
(synopsis "Build system designed to be fast and user-friendly")
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-04-24 9:13 ` Lars-Dominik Braun
@ 2022-04-24 9:22 ` Lars-Dominik Braun
0 siblings, 0 replies; 16+ messages in thread
From: Lars-Dominik Braun @ 2022-04-24 9:22 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 46848, Marius Bakke
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
Hey again,
sorry for the noise. During one of my many rebases I missed to add a
file that should have been included in patch 3. See attached patch.
Cheers,
Lars
[-- Attachment #2: v3-0151-dirty-squash-Add-missing-file.patch --]
[-- Type: text/plain, Size: 5861 bytes --]
From 6bb5578a47f795f54456d2f7e3c6949f5e0b3e13 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 24 Apr 2022 11:18:37 +0200
Subject: [PATCH v3 151/151] dirty: squash: Add missing file.
---
gnu/packages/python-commencement.scm | 129 +++++++++++++++++++++++++++
1 file changed, 129 insertions(+)
create mode 100644 gnu/packages/python-commencement.scm
diff --git a/gnu/packages/python-commencement.scm b/gnu/packages/python-commencement.scm
new file mode 100644
index 0000000000..e0959c6e79
--- /dev/null
+++ b/gnu/packages/python-commencement.scm
@@ -0,0 +1,129 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
+;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages python-commencement)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix download)
+ #:use-module (guix packages)
+ #:use-module (guix build-system trivial)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
+ #:use-module (gnu packages python-xyz)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-26))
+
+(define-public python-toolchain
+ (package
+ (name "python-toolchain")
+ (version (package-version python))
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build union))
+ #:builder (begin
+ (use-modules (ice-9 match)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build union))
+
+ (let ((out (assoc-ref %outputs "out")))
+ (union-build out (filter-map (match-lambda
+ ((_ . directory) directory))
+ %build-inputs))
+ #t))))
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)
+ ("python-pip" ,python-pip)))
+ (native-search-paths
+ (package-native-search-paths python))
+ (search-paths
+ (package-search-paths python))
+ (license (package-license python))
+ (synopsis "Python toolchain")
+ (description
+ "Python toolchain including Python itself, setuptools and pip. Use this
+package if you need a minimal Python toolchain instead of just the
+interpreter.")
+ (home-page (package-home-page python))))
+
+(define-public python2-toolchain
+ (package
+ (name "python2-toolchain")
+ (version (package-version python-2))
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build union))
+ #:builder (begin
+ (use-modules (ice-9 match)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build union))
+
+ (let ((out (assoc-ref %outputs "out")))
+ (union-build out (filter-map (match-lambda
+ ((_ . directory) directory))
+ %build-inputs))
+ #t))))
+ (inputs
+ `(("python" ,python-2)
+ ("python2-setuptools" ,python2-setuptools)
+ ("python2-pip" ,python2-pip)))
+ (native-search-paths
+ (package-native-search-paths python-2))
+ (search-paths
+ (package-search-paths python-2))
+ (license (package-license python-2))
+ (synopsis "Python toolchain")
+ (description
+ "Python toolchain including Python itself, setuptools and pip. Use this
+package if you need a minimal Python toolchain instead of just the
+interpreter.")
+ (home-page (package-home-page python-2))))
+
+;; Python 3 toolchain for python-build-system. We cannot use python-toolchain
+;; here, since we’d need to bootstrap python-pip somehow.
+(define-public python-toolchain-for-build
+ (package
+ (inherit python-toolchain)
+ (name "python-toolchain-for-build")
+ (inputs
+ `(("python" ,python-wrapper)
+ ("python-setuptools" ,python-setuptools)))))
+
+(define-public python2-toolchain-for-build
+ (package
+ (inherit python2-toolchain)
+ (name "python2-toolchain-for-build")
+ (inputs
+ `(("python" ,python-2)
+ ("python2-setuptools" ,python2-setuptools)))))
+
--
2.35.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system
2022-01-20 20:43 ` Marius Bakke
@ 2023-01-11 15:41 ` Maxim Cournoyer
2023-02-10 10:13 ` bug#46848: " Lars-Dominik Braun
0 siblings, 1 reply; 16+ messages in thread
From: Maxim Cournoyer @ 2023-01-11 15:41 UTC (permalink / raw)
To: Marius Bakke; +Cc: Lars-Dominik Braun, 46848
Hello!
With the pyproject build system now in master, can we close this issue?
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 16+ messages in thread
* bug#46848: [PATCHES] [core-updates] PEP 517 python-build-system
2023-01-11 15:41 ` Maxim Cournoyer
@ 2023-02-10 10:13 ` Lars-Dominik Braun
0 siblings, 0 replies; 16+ messages in thread
From: Lars-Dominik Braun @ 2023-02-10 10:13 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: 46848-done, Marius Bakke
Hi,
> With the pyproject build system now in master, can we close this issue?
yes, I think so.
Cheers,
Lars
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2023-02-10 10:14 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-01 13:43 [bug#46848] [PATCHES] [core-updates] PEP 517 python-build-system Lars-Dominik Braun
2021-05-15 9:31 ` Lars-Dominik Braun
2021-12-13 20:10 ` Lars-Dominik Braun
2022-01-05 14:51 ` Lars-Dominik Braun
2022-01-20 15:41 ` Marius Bakke
2022-01-20 18:43 ` Lars-Dominik Braun
2022-01-20 20:43 ` Marius Bakke
2023-01-11 15:41 ` Maxim Cournoyer
2023-02-10 10:13 ` bug#46848: " Lars-Dominik Braun
2022-02-26 14:10 ` [bug#46848] " Maxim Cournoyer
2022-02-28 19:25 ` Lars-Dominik Braun
2022-02-28 22:32 ` Maxim Cournoyer
2022-04-24 9:13 ` Lars-Dominik Braun
2022-04-24 9:22 ` Lars-Dominik Braun
2022-01-23 5:29 ` Maxim Cournoyer
2022-01-23 10:21 ` Lars-Dominik Braun
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.