[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: gnu: python-setuptools-scm: Move to (gnu packages python-build).
|
From: |
guix-commits |
|
Subject: |
01/08: gnu: python-setuptools-scm: Move to (gnu packages python-build). |
|
Date: |
Sun, 26 Jun 2022 22:35:24 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit ed210c1b8ff95003645499a4b48279a68c4685cf
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jun 24 21:30:59 2022 -0400
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.
---
gnu/packages/astronomy.scm | 1 +
gnu/packages/backup.scm | 1 +
gnu/packages/benchmark.scm | 1 +
gnu/packages/calendar.scm | 1 +
gnu/packages/databases.scm | 1 +
gnu/packages/dav.scm | 1 +
gnu/packages/license.scm | 1 +
gnu/packages/mail.scm | 1 +
gnu/packages/pep.scm | 1 +
gnu/packages/python-build.scm | 22 ++++++++++++++++++++++
gnu/packages/python-xyz.scm | 21 ---------------------
gnu/packages/task-management.scm | 1 +
gnu/packages/time.scm | 1 +
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 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pretty-print)
#: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-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 @@
#: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)
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 @@
#:use-module (gnu packages php)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#: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 @@
#: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 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 @@
#: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-check)
#:use-module (gnu packages python-crypto)
#: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 @@
#:use-module (gnu packages)
#:use-module (gnu packages check)
#: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)
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 @@
#:use-module (gnu packages check)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#: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 @@
#: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)
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 @@
#:use-module (gnu packages mail) ; for libetpan
#:use-module (gnu packages nettle)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sequoia)
#: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 @@
;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
@@ -403,3 +404,24 @@ specified by PEP 517, @code{flit_core.buildapi}.")
(propagated-inputs
(modify-inputs (package-propagated-inputs python-flit-core-bootstrap)
(replace "python-toml" python-tomli)))))
+
+(define-public python-setuptools-scm
+ (package
+ (name "python-setuptools-scm")
+ (version "6.3.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "setuptools_scm" version))
+ (sha256
+ (base32
"1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-packaging",python-packaging-bootstrap)
+ ("python-tomli" ,python-tomli)))
+ (home-page "https://github.com/pypa/setuptools_scm/";)
+ (synopsis "Manage Python package versions in SCM metadata")
+ (description
+ "Setuptools_scm handles managing your Python package versions in
+@dfn{software configuration management} (SCM) metadata instead of declaring
+them as the version argument or in a SCM managed file.")
+ (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
child application and control it as if a human were typing commands.")
(license license:isc)))
-(define-public python-setuptools-scm
- (package
- (name "python-setuptools-scm")
- (version "6.3.2")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "setuptools_scm" version))
- (sha256
- (base32
"1wm0i27siyy1yqr9rv7lqvb65agay9051yi8jzmi8dgb3q4ai6m4"))))
- (build-system python-build-system)
- (propagated-inputs
- `(("python-packaging",python-packaging-bootstrap)
- ("python-tomli" ,python-tomli)))
- (home-page "https://github.com/pypa/setuptools_scm/";)
- (synopsis "Manage Python package versions in SCM metadata")
- (description
- "Setuptools_scm handles managing your Python package versions in
-@dfn{software configuration management} (SCM) metadata instead of declaring
-them as the version argument or in a SCM managed file.")
- (license license:expat)))
-
(define-public python-sexpdata
(package
(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 @@
#: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-xyz)
#:use-module (gnu packages time)
#: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 @@
#:use-module (gnu packages golang)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages terminals)
#: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 @@
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages readline)
- branch master updated (8d0e696243 -> 97766323bc), guix-commits, 2022/06/26
- 01/08: gnu: python-setuptools-scm: Move to (gnu packages python-build).,
guix-commits <=
- 02/08: gnu: Add python-flit-scm., guix-commits, 2022/06/26
- 04/08: gnu: python-pymongo: Update to 4.1.1., guix-commits, 2022/06/26
- 03/08: gnu: Add python-exceptiongroup., guix-commits, 2022/06/26
- 05/08: gnu: python-immutables: Update to 0.18., guix-commits, 2022/06/26
- 07/08: gnu: Add python-statmake., guix-commits, 2022/06/26
- 06/08: gnu: Add python-cattrs., guix-commits, 2022/06/26
- 08/08: gnu: font-abattis-cantarell: Build from source., guix-commits, 2022/06/26