diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-06-24 21:30:59 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-06-26 22:10:38 -0400 |
commit | ed210c1b8ff95003645499a4b48279a68c4685cf (patch) | |
tree | 3af8cd84ad6187394723cc383619ace80aa9ba13 | |
parent | gnu: Add python-sendgrid. (diff) | |
download | guix-ed210c1b8ff95003645499a4b48279a68c4685cf.tar.gz guix-ed210c1b8ff95003645499a4b48279a68c4685cf.tar.bz2 guix-ed210c1b8ff95003645499a4b48279a68c4685cf.tar.xz |
gnu: python-setuptools-scm: Move to (gnu packages python-build).
* gnu/packages/python-xyz.scm (python-setuptools-scm): Move from here...
* gnu/packages/python-build.scm (python-setuptools-scm): ... to here.
-rw-r--r-- | gnu/packages/astronomy.scm | 1 | ||||
-rw-r--r-- | gnu/packages/backup.scm | 1 | ||||
-rw-r--r-- | gnu/packages/benchmark.scm | 1 | ||||
-rw-r--r-- | gnu/packages/calendar.scm | 1 | ||||
-rw-r--r-- | gnu/packages/databases.scm | 1 | ||||
-rw-r--r-- | gnu/packages/dav.scm | 1 | ||||
-rw-r--r-- | gnu/packages/license.scm | 1 | ||||
-rw-r--r-- | gnu/packages/mail.scm | 1 | ||||
-rw-r--r-- | gnu/packages/pep.scm | 1 | ||||
-rw-r--r-- | gnu/packages/python-build.scm | 22 | ||||
-rw-r--r-- | gnu/packages/python-xyz.scm | 21 | ||||
-rw-r--r-- | gnu/packages/task-management.scm | 1 | ||||
-rw-r--r-- | gnu/packages/time.scm | 1 | ||||
-rw-r--r-- | gnu/packages/wm.scm | 1 |
14 files changed, 34 insertions, 21 deletions
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 61c10c985f..82a67ce5ef 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm | |||
@@ -52,6 +52,7 @@ | |||
52 | #:use-module (gnu packages pkg-config) | 52 | #:use-module (gnu packages pkg-config) |
53 | #:use-module (gnu packages pretty-print) | 53 | #:use-module (gnu packages pretty-print) |
54 | #:use-module (gnu packages python) | 54 | #:use-module (gnu packages python) |
55 | #:use-module (gnu packages python-build) | ||
55 | #:use-module (gnu packages python-check) | 56 | #:use-module (gnu packages python-check) |
56 | #:use-module (gnu packages python-crypto) | 57 | #:use-module (gnu packages python-crypto) |
57 | #:use-module (gnu packages python-science) | 58 | #:use-module (gnu packages python-science) |
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 5646d909e5..f4a251dd47 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm | |||
@@ -86,6 +86,7 @@ | |||
86 | #:use-module (gnu packages pkg-config) | 86 | #:use-module (gnu packages pkg-config) |
87 | #:use-module (gnu packages protobuf) | 87 | #:use-module (gnu packages protobuf) |
88 | #:use-module (gnu packages python) | 88 | #:use-module (gnu packages python) |
89 | #:use-module (gnu packages python-build) | ||
89 | #:use-module (gnu packages python-check) | 90 | #:use-module (gnu packages python-check) |
90 | #:use-module (gnu packages python-crypto) | 91 | #:use-module (gnu packages python-crypto) |
91 | #:use-module (gnu packages python-web) | 92 | #:use-module (gnu packages python-web) |
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index b718a65f7c..f0e05483f0 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm | |||
@@ -55,6 +55,7 @@ | |||
55 | #:use-module (gnu packages php) | 55 | #:use-module (gnu packages php) |
56 | #:use-module (gnu packages pkg-config) | 56 | #:use-module (gnu packages pkg-config) |
57 | #:use-module (gnu packages python) | 57 | #:use-module (gnu packages python) |
58 | #:use-module (gnu packages python-build) | ||
58 | #:use-module (gnu packages python-science) | 59 | #:use-module (gnu packages python-science) |
59 | #:use-module (gnu packages python-web) | 60 | #:use-module (gnu packages python-web) |
60 | #:use-module (gnu packages python-xyz) | 61 | #:use-module (gnu packages python-xyz) |
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 129eb58aa0..fa55822762 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm | |||
@@ -50,6 +50,7 @@ | |||
50 | #:use-module (gnu packages perl) | 50 | #:use-module (gnu packages perl) |
51 | #:use-module (gnu packages pkg-config) | 51 | #:use-module (gnu packages pkg-config) |
52 | #:use-module (gnu packages python) | 52 | #:use-module (gnu packages python) |
53 | #:use-module (gnu packages python-build) | ||
53 | #:use-module (gnu packages python-xyz) | 54 | #:use-module (gnu packages python-xyz) |
54 | #:use-module (gnu packages qt) | 55 | #:use-module (gnu packages qt) |
55 | #:use-module (gnu packages sphinx) | 56 | #:use-module (gnu packages sphinx) |
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 72200fce92..9e9b584f7a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm | |||
@@ -131,6 +131,7 @@ | |||
131 | #:use-module (gnu packages popt) | 131 | #:use-module (gnu packages popt) |
132 | #:use-module (gnu packages protobuf) | 132 | #:use-module (gnu packages protobuf) |
133 | #:use-module (gnu packages python) | 133 | #:use-module (gnu packages python) |
134 | #:use-module (gnu packages python-build) | ||
134 | #:use-module (gnu packages python-check) | 135 | #:use-module (gnu packages python-check) |
135 | #:use-module (gnu packages python-crypto) | 136 | #:use-module (gnu packages python-crypto) |
136 | #:use-module (gnu packages python-science) | 137 | #:use-module (gnu packages python-science) |
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 59015baa40..995a7b50d5 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm | |||
@@ -30,6 +30,7 @@ | |||
30 | #:use-module (gnu packages) | 30 | #:use-module (gnu packages) |
31 | #:use-module (gnu packages check) | 31 | #:use-module (gnu packages check) |
32 | #:use-module (gnu packages python) | 32 | #:use-module (gnu packages python) |
33 | #:use-module (gnu packages python-build) | ||
33 | #:use-module (gnu packages python-check) | 34 | #:use-module (gnu packages python-check) |
34 | #:use-module (gnu packages python-crypto) | 35 | #:use-module (gnu packages python-crypto) |
35 | #:use-module (gnu packages python-web) | 36 | #:use-module (gnu packages python-web) |
diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index df8efe8423..3146f38c1c 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm | |||
@@ -25,6 +25,7 @@ | |||
25 | #:use-module (gnu packages check) | 25 | #:use-module (gnu packages check) |
26 | #:use-module (gnu packages perl) | 26 | #:use-module (gnu packages perl) |
27 | #:use-module (gnu packages perl-check) | 27 | #:use-module (gnu packages perl-check) |
28 | #:use-module (gnu packages python-build) | ||
28 | #:use-module (gnu packages python-web) | 29 | #:use-module (gnu packages python-web) |
29 | #:use-module (gnu packages python-xyz) | 30 | #:use-module (gnu packages python-xyz) |
30 | #:use-module (guix build-system perl) | 31 | #:use-module (guix build-system perl) |
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 3606efa4fe..a03bf2fa05 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm | |||
@@ -138,6 +138,7 @@ | |||
138 | #:use-module (gnu packages pkg-config) | 138 | #:use-module (gnu packages pkg-config) |
139 | #:use-module (gnu packages protobuf) | 139 | #:use-module (gnu packages protobuf) |
140 | #:use-module (gnu packages python) | 140 | #:use-module (gnu packages python) |
141 | #:use-module (gnu packages python-build) | ||
141 | #:use-module (gnu packages python-check) | 142 | #:use-module (gnu packages python-check) |
142 | #:use-module (gnu packages python-crypto) | 143 | #:use-module (gnu packages python-crypto) |
143 | #:use-module (gnu packages python-web) | 144 | #:use-module (gnu packages python-web) |
diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index d245ac74a3..f443170aa5 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm | |||
@@ -33,6 +33,7 @@ | |||
33 | #:use-module (gnu packages mail) ; for libetpan | 33 | #:use-module (gnu packages mail) ; for libetpan |
34 | #:use-module (gnu packages nettle) | 34 | #:use-module (gnu packages nettle) |
35 | #:use-module (gnu packages pkg-config) | 35 | #:use-module (gnu packages pkg-config) |
36 | #:use-module (gnu packages python-build) | ||
36 | #:use-module (gnu packages python-xyz) | 37 | #:use-module (gnu packages python-xyz) |
37 | #:use-module (gnu packages sequoia) | 38 | #:use-module (gnu packages sequoia) |
38 | #:use-module (gnu packages sqlite) | 39 | #:use-module (gnu packages sqlite) |
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index d85463ebab..afccfabb2c 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm | |||
@@ -1,4 +1,5 @@ | |||
1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
2 | ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> | ||
2 | ;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il> | 3 | ;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il> |
3 | ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> | 4 | ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> |
4 | ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> | 5 | ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> |
@@ -403,3 +404,24 @@ specified by PEP 517, @code{flit_core.buildapi}.") | |||
403 | (propagated-inputs | 404 | (propagated-inputs |
404 | (modify-inputs (package-propagated-inputs python-flit-core-bootstrap) | 405 | (modify-inputs (package-propagated-inputs python-flit-core-bootstrap) |
405 | (replace "python-toml" python-tomli))))) | 406 | (replace "python-toml" python-tomli))))) |
407 | |||
408 | (define-public python-setuptools-scm | ||
409 | (package | ||
410 | (name "python-setuptools-scm") | ||
411 | (version "6.3.2") | ||
412 | (source (origin | ||
413 | (method url-fetch) | ||
414 | (uri (pypi-uri "setuptools_scm" version)) | ||
415 | (sha256 | ||
416 | (base32 "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4")))) | ||
417 | (build-system python-build-system) | ||
418 | (propagated-inputs | ||
419 | `(("python-packaging",python-packaging-bootstrap) | ||
420 | ("python-tomli" ,python-tomli))) | ||
421 | (home-page "https://github.com/pypa/setuptools_scm/") | ||
422 | (synopsis "Manage Python package versions in SCM metadata") | ||
423 | (description | ||
424 | "Setuptools_scm handles managing your Python package versions in | ||
425 | @dfn{software configuration management} (SCM) metadata instead of declaring | ||
426 | them as the version argument or in a SCM managed file.") | ||
427 | (license license:expat))) | ||
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0bc951442f..b9d57bc6bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm | |||
@@ -7813,27 +7813,6 @@ Pexpect works like Don Libes’ Expect. Pexpect allows your script to spawn a | |||
7813 | child application and control it as if a human were typing commands.") | 7813 | child application and control it as if a human were typing commands.") |
7814 | (license license:isc))) | 7814 | (license license:isc))) |
7815 | 7815 | ||
7816 | (define-public python-setuptools-scm | ||
7817 | (package | ||
7818 | (name "python-setuptools-scm") | ||
7819 | (version "6.3.2") | ||
7820 | (source (origin | ||
7821 | (method url-fetch) | ||
7822 | (uri (pypi-uri "setuptools_scm" version)) | ||
7823 | (sha256 | ||
7824 | (base32 "1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4")))) | ||
7825 | (build-system python-build-system) | ||
7826 | (propagated-inputs | ||
7827 | `(("python-packaging",python-packaging-bootstrap) | ||
7828 | ("python-tomli" ,python-tomli))) | ||
7829 | (home-page "https://github.com/pypa/setuptools_scm/") | ||
7830 | (synopsis "Manage Python package versions in SCM metadata") | ||
7831 | (description | ||
7832 | "Setuptools_scm handles managing your Python package versions in | ||
7833 | @dfn{software configuration management} (SCM) metadata instead of declaring | ||
7834 | them as the version argument or in a SCM managed file.") | ||
7835 | (license license:expat))) | ||
7836 | |||
7837 | (define-public python-sexpdata | 7816 | (define-public python-sexpdata |
7838 | (package | 7817 | (package |
7839 | (name "python-sexpdata") | 7818 | (name "python-sexpdata") |
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index aeedbfbe6a..f8f52a8ccd 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm | |||
@@ -37,6 +37,7 @@ | |||
37 | #:use-module (gnu packages ncurses) | 37 | #:use-module (gnu packages ncurses) |
38 | #:use-module (gnu packages pkg-config) | 38 | #:use-module (gnu packages pkg-config) |
39 | #:use-module (gnu packages python) | 39 | #:use-module (gnu packages python) |
40 | #:use-module (gnu packages python-build) | ||
40 | #:use-module (gnu packages python-xyz) | 41 | #:use-module (gnu packages python-xyz) |
41 | #:use-module (gnu packages time) | 42 | #:use-module (gnu packages time) |
42 | #:use-module (gnu packages tls) | 43 | #:use-module (gnu packages tls) |
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index eede7b9bd7..fea9ff25f7 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm | |||
@@ -43,6 +43,7 @@ | |||
43 | #:use-module (gnu packages golang) | 43 | #:use-module (gnu packages golang) |
44 | #:use-module (gnu packages perl) | 44 | #:use-module (gnu packages perl) |
45 | #:use-module (gnu packages python) | 45 | #:use-module (gnu packages python) |
46 | #:use-module (gnu packages python-build) | ||
46 | #:use-module (gnu packages python-xyz) | 47 | #:use-module (gnu packages python-xyz) |
47 | #:use-module (gnu packages terminals) | 48 | #:use-module (gnu packages terminals) |
48 | #:use-module (gnu packages textutils) | 49 | #:use-module (gnu packages textutils) |
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 6933b1730a..f0032cd4c7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm | |||
@@ -130,6 +130,7 @@ | |||
130 | #:use-module (gnu packages pretty-print) | 130 | #:use-module (gnu packages pretty-print) |
131 | #:use-module (gnu packages pulseaudio) | 131 | #:use-module (gnu packages pulseaudio) |
132 | #:use-module (gnu packages python) | 132 | #:use-module (gnu packages python) |
133 | #:use-module (gnu packages python-build) | ||
133 | #:use-module (gnu packages python-crypto) | 134 | #:use-module (gnu packages python-crypto) |
134 | #:use-module (gnu packages python-xyz) | 135 | #:use-module (gnu packages python-xyz) |
135 | #:use-module (gnu packages readline) | 136 | #:use-module (gnu packages readline) |