From c485a9d8af210425a0435280fff8588563e49684 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 23 Apr 2022 11:07:58 +0200 Subject: gnu: python-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-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 --- gnu/packages/python-build.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/python-build.scm') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 9d9b07f7691..7572bc5ce3f 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -41,6 +41,45 @@ ;;; ;;; 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") -- cgit v1.3 From b4e2effb30bdcbab00dbe1af3e2b9d4ad446897e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 Oct 2022 21:31:24 +0200 Subject: gnu: python-pip: Move to (gnu packages python-build). * gnu/packages/python-xyz.scm (python-pip): Move from here ... * gnu/packages/python-build.scm (python-pip): ... to here. --- gnu/packages/python-build.scm | 21 +++++++++++++++++++++ gnu/packages/python-xyz.scm | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'gnu/packages/python-build.scm') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 7572bc5ce3f..716108df2b0 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -41,6 +41,27 @@ ;;; ;;; Code: +(define-public python-pip + (package + (name "python-pip") + (version "22.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pip" version)) + (sha256 + (base32 + "0jwac0bhfp48w4fqibf1ysrs2grksdv92hwqm7bmdw2jn2fr5l9z")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; there are no tests in the pypi archive. + (home-page "https://pip.pypa.io/") + (synopsis "Package manager for Python software") + (description + "Pip is a package manager for Python software, that finds packages on the +Python Package Index (PyPI).") + (license license:expat))) + (define-public python-setuptools (package (name "python-setuptools") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 27dbbd831d6..75b99086d02 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12835,27 +12835,6 @@ fakes, or doubles. Basically, a stub is an object that returns pre-canned responses, rather than doing any computation.") (license license:bsd-3))) -(define-public python-pip - (package - (name "python-pip") - (version "22.2.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pip" version)) - (sha256 - (base32 - "0jwac0bhfp48w4fqibf1ysrs2grksdv92hwqm7bmdw2jn2fr5l9z")))) - (build-system python-build-system) - (arguments - '(#:tests? #f)) ; there are no tests in the pypi archive. - (home-page "https://pip.pypa.io/") - (synopsis "Package manager for Python software") - (description - "Pip is a package manager for Python software, that finds packages on the -Python Package Index (PyPI).") - (license license:expat))) - ;;; Variant used to break a dependency cycle with ;;; python-pytest-perf-bootstrap. (define-public python-pip-run-bootstrap -- cgit v1.3 From a47c475678c3647be918ebc97cced1e8a2306993 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 7 Jan 2023 14:04:08 +0100 Subject: gnu: python-setuptools: Add 57.5.0. * gnu/packages/python-build.scm (python-setuptools-57): New variable. --- gnu/packages/python-build.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-build.scm') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 716108df2b0..17f8892c056 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2020 Efraim Flashner ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2020, 2023 Marius Bakke ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2018, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Tobias Geerinckx-Rice @@ -101,6 +101,18 @@ facilitate packaging Python projects, where packaging includes: license:asl2.0 ;packaging is dual ASL2/BSD-2 license:bsd-2)))) +;; This is the last version with use_2to3 support. +(define-public python-setuptools-57 + (package + (inherit python-setuptools) + (version "57.5.0") + (source (origin + (inherit (package-source python-setuptools)) + (uri (pypi-uri "setuptools" version)) + (sha256 + (base32 + "091sp8lrin7qllrhhx7y0iiv5gdb1d3l8a1ip5knk77ma1njdlyr")))))) + (define-public python-wheel (package (name "python-wheel") -- cgit v1.3