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

gnu: python-setuptools: Move to python-build.

Browse source 
* gnu/packages/python-xyz.scm (python-setuptools): Move…
* gnu/packages/python-build.scm: …here.
* gnu/packages/chemistry.scm,
gnu/packages/messaging.scm,
gnu/packages/sequoia.scm,
tests/lint.scm: Adjust module imports accordingly.

Co-authored-by: Marius Bakke <marius@gnu.org>
This commit is contained in:
Lars-Dominik Braun 2022-04-23 11:07:58 +02:00 committed by Marius Bakke
parent cae327a3b0
commit c485a9d8af
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
6 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/packages/chemistry.scm
View file

@ -56,6 +56,7 @@ (define-module (gnu packages chemistry)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages serialization)

1
gnu/packages/messaging.scm
View file

@ -116,6 +116,7 @@ (define-module (gnu packages messaging)
#: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-crypto)
#:use-module (gnu packages python-web)

39
gnu/packages/python-build.scm
View file

@ -41,6 +41,45 @@ (define-module (gnu packages python-build)
;;;
;;; Code:
(define-public python-setuptools
(package
(name "python-setuptools")
(version "64.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "setuptools" version))
(sha256
(base32
"1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv"))
(modules '((guix build utils)))
(snippet
;; TODO: setuptools now bundles the following libraries:
;; packaging, pyparsing, six and appdirs. How to unbundle?
;; Remove included binaries which are used to build self-extracting
;; installers for Windows.
'(for-each delete-file (find-files "setuptools"
"^(cli|gui).*\\.exe$")))))
(build-system python-build-system)
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments (list #: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:
@itemize
@item Python package and module definitions
@item distribution package metadata
@item test hooks
@item project installation
@item platform-specific details.
@end itemize")
(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")

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

@ -2178,46 +2178,6 @@ (define-public python-serpent
other machines, such as over the network.")
(license license:expat)))
(define-public python-setuptools
(package
(name "python-setuptools")
(version "64.0.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "setuptools" version))
(sha256
(base32
"1sllqf0bhsl2yilf1w0xnlz0r4yaksmwaj0ap91zdc6kgbigdjiv"))
(modules '((guix build utils)))
(snippet
;; 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$")))))
(build-system python-build-system)
;; FIXME: Tests require pytest, which itself relies on setuptools.
;; One could bootstrap with an internal untested setuptools.
(arguments (list #: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:
@itemize
@item Python package and module definitions
@item distribution package metadata
@item test hooks
@item project installation
@item platform-specific details.
@end itemize")
;; 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
gnu/packages/sequoia.scm
View file

@ -36,7 +36,7 @@ (define-module (gnu packages sequoia)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) ;; python-setuptools
#:use-module (gnu packages python-build) ;python-setuptools
#:use-module (gnu packages rust)
#:use-module (gnu packages tls))

2
tests/lint.scm
View file

@ -50,7 +50,7 @@ (define-module (test-lint)
#:use-module (gnu packages)
#:use-module (gnu packages glib)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-build)
#:use-module ((gnu packages bash) #:select (bash bash-minimal))
#:use-module (web uri)
#:use-module (web server)