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

gnu: python-xyz: Move a few modules to (gnu packages python-build).

Browse source 
* gnu/packages/python-xyz.scm (python-pep517): Inherit from
python-pep517-bootstrap.  Remove the inherited common fields.
(python-poetry-core, python-wheel)
(python-toml): Move to ...
* gnu/packages/python-build.scm: ... here, a new module.
(python-pep517-bootstrap): New package.
* gnu/local.mk (GNU_SYSTEM_MODULES): Register the new module.
This commit is contained in:
Maxim Cournoyer 2021-01-14 16:27:39 -05:00
parent 9621809ce8
commit 13bb41f814
No known key found for this signature in database
GPG key ID: 1260E46482E63562
12 changed files with 147 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -460,6 +460,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/purescript.scm \
%D%/packages/pv.scm \
%D%/packages/python.scm \
%D%/packages/python-build.scm \
%D%/packages/python-check.scm \
%D%/packages/python-compression.scm \
%D%/packages/python-crypto.scm \

1
gnu/packages/bittorrent.scm
View file

@ -55,6 +55,7 @@ (define-module (gnu packages bittorrent)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

1
gnu/packages/finance.scm
View file

@ -92,6 +92,7 @@ (define-module (gnu packages finance)
#:use-module (gnu packages popt)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

1
gnu/packages/machine-learning.scm
View file

@ -74,6 +74,7 @@ (define-module (gnu packages machine-learning)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)

1
gnu/packages/protobuf.scm
View file

@ -40,6 +40,7 @@ (define-module (gnu packages protobuf)
#:use-module (gnu packages libevent)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ruby))

134
gnu/packages/python-build.scm Normal file
View file

@ -0,0 +1,134 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; 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-build)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix packages))
;;; Commentary:
;;;
;;; Python packages to build... Python packages. Since they are bound to be
;;; relied on by many, their dependencies should be kept minimal, and this
;;; module should not depend on other modules containing Python packages.
;;;
;;; Code:
(define-public python-wheel
(package
(name "python-wheel")
(version "0.33.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "wheel" version))
(sha256
(base32
"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))
(home-page "https://bitbucket.org/pypa/wheel/")
(synopsis "Format for built Python packages")
(description
"A wheel is a ZIP-format archive with a specially formatted filename and
the @code{.whl} extension. It is designed to contain all the files for a PEP
376 compatible install in a way that is very close to the on-disk format. Many
packages will be properly installed with only the @code{Unpack} step and the
unpacked archive preserves enough information to @code{Spread} (copy data and
scripts to their final locations) at any later time. Wheel files can be
installed with a newer @code{pip} or with wheel's own command line utility.")
(license license:expat)))
(define-public python2-wheel
(package-with-python2 python-wheel))
;;; XXX: Not really at home, but this seems the best place to prevent circular
;;; module dependencies.
(define-public python-toml
(package
(name "python-toml")
(version "0.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "toml" version))
(sha256
(base32
"03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;no tests suite in release
(home-page "https://github.com/uiri/toml")
(synopsis "Library for TOML")
(description
"@code{toml} is a library for parsing and creating Tom's Obvious, Minimal
Language (TOML) configuration files.")
(license license:expat)))
(define-public python-pep517-bootstrap
(hidden-package
(package
(name "python-pep517-bootstrap")
(version "0.9.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pep517" version))
(sha256
(base32
"0zqidxah03qpnp6zkg3zd1kmd5f79hhdsfmlc0cldaniy80qddxf"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;to avoid circular dependencies
(propagated-inputs
`(("python-toml" ,python-toml)
("python-wheel" ,python-wheel)))
(home-page "https://github.com/pypa/pep517")
(synopsis "Wrappers to build Python packages using PEP 517 hooks")
(description
"Wrappers to build Python packages using PEP 517 hooks.")
(license license:expat))))
(define-public python-poetry-core
(package
(name "python-poetry-core")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "poetry-core" version))
(sha256
(base32 "1mgv276h1iphn5fqhp2sgkgd5d0c39hs33vgaf157x5ri7rlyrka"))))
(build-system python-build-system)
(home-page "https://github.com/python-poetry/poetry-core")
(synopsis "Poetry PEP 517 build back-end")
(description
"The @code{poetry-core} module provides a PEP 517 build back-end
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)))

1
gnu/packages/python-crypto.scm
View file

@ -54,6 +54,7 @@ (define-module (gnu packages python-crypto)
#:use-module (gnu packages password-utils)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-web)

1
gnu/packages/python-web.scm
View file

@ -75,6 +75,7 @@ (define-module (gnu packages python-web)
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)

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

@ -164,6 +164,7 @@ (define-module (gnu packages python-xyz)
#:use-module (gnu packages photo)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
@ -2702,38 +2703,6 @@ (define-public python-click-5
(base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"))))
(arguments `())))
(define-public python-wheel
(package
(name "python-wheel")
(version "0.33.6")
(source
(origin
(method url-fetch)
(uri (pypi-uri "wheel" version))
(sha256
(base32
"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))
(home-page "https://bitbucket.org/pypa/wheel/")
(synopsis "Format for built Python packages")
(description
"A wheel is a ZIP-format archive with a specially formatted filename and
the @code{.whl} extension. It is designed to contain all the files for a PEP
376 compatible install in a way that is very close to the on-disk format. Many
packages will be properly installed with only the @code{Unpack} step and the
unpacked archive preserves enough information to @code{Spread} (copy data and
scripts to their final locations) at any later time. Wheel files can be
installed with a newer @code{pip} or with wheel's own command line utility.")
(license license:expat)))
(define-public python2-wheel
(package-with-python2 python-wheel))
(define-public python-vcversioner
(package
(name "python-vcversioner")
@ -4044,27 +4013,6 @@ (define-public python-feedgenerator
(define-public python2-feedgenerator
(package-with-python2 python-feedgenerator))
(define-public python-toml
(package
(name "python-toml")
(version "0.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "toml" version))
(sha256
(base32
"03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;no tests suite in release
(home-page "https://github.com/uiri/toml")
(synopsis "Library for TOML")
(description
"@code{toml} is a library for parsing and creating Tom's Obvious, Minimal
Language (TOML) configuration files.")
(license license:expat)))
(define-public python-jsonrpc-server
(package
(name "python-jsonrpc-server")
@ -8247,16 +8195,8 @@ (define-public python2-pep8
(define-public python-pep517
(package
(inherit python-pep517-bootstrap)
(name "python-pep517")
(version "0.8.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pep517" version))
(sha256
(base32
"17m2bcabx3sr5wjalgzppfx5xahqrwm12zq58h68mm482b7rjqcf"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
@ -8272,15 +8212,7 @@ (define-public python-pep517
`(("python-mock" ,python-mock)
("python-pytest" ,python-pytest)
("python-testpath" ,python-testpath)))
(propagated-inputs
`(("python-toml" ,python-toml)
("python-wheel" ,python-wheel)))
(home-page "https://github.com/pypa/pep517")
(synopsis "Wrappers to build Python packages using PEP 517 hooks")
(description
"Wrappers to build Python packages using PEP 517 hooks.")
(properties `((python2-variant . ,(delay python2-pep517))))
(license license:expat)))
(properties `((python2-variant . ,(delay python2-pep517))))))
;; Skip the tests so we don't create a cyclical dependency with pytest.
(define-public python2-pep517
@ -13162,26 +13094,6 @@ (define-public python-cachy
database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.")
(license license:expat)))
(define-public python-poetry-core
(package
(name "python-poetry-core")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "poetry-core" version))
(sha256
(base32 "1mgv276h1iphn5fqhp2sgkgd5d0c39hs33vgaf157x5ri7rlyrka"))))
(build-system python-build-system)
(home-page "https://github.com/python-poetry/poetry-core")
(synopsis "Poetry PEP 517 build back-end")
(description
"The @code{poetry-core} module provides a PEP 517 build back-end
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 poetry
(package
(name "poetry")

1
gnu/packages/sphinx.scm
View file

@ -42,6 +42,7 @@ (define-module (gnu packages sphinx)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages time))

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

@ -97,6 +97,7 @@ (define-module (gnu packages version-control)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

1
gnu/packages/virtualization.scm
View file

@ -87,6 +87,7 @@ (define-module (gnu packages virtualization)
#:use-module (gnu packages polkit)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)