guix_mirror_bot pushed a commit to branch master
in repository guix.
commit a99b3b8c209833e84f1f3e76a439e2373a9a3daf
Author: Nicolas Graves <[email protected]>
AuthorDate: Sat Sep 27 18:18:46 2025 +0200
gnu: python-pycountry: Move to (gnu packages iso-codes).
This package makes a lot more sense there, and is actually needed to
run tests of other python packages in this module.
* gnu/packages/python-xyz.scm (python-pycountry)
([email protected]): Move them...
* gnu/packages/iso-codes.scm (python-pycountry)
(python-pycountry-20.7.3): ... to this module.
* gnu/packages/music.scm: Import (gnu packages iso-codes).
* gnu/packages/tryton.scm: Import (gnu packages iso-codes).
(trytond-country): Correct [email protected] to
python-pycountry-20.7.3.
Change-Id: I7aa424663fb2edc73bca3fcac38de3226cc57a9b
Signed-off-by: Sharlatan Hellseher <[email protected]>
---
gnu/packages/iso-codes.scm | 40 ++++++++++++++++++++++++++++++++++++++++
gnu/packages/music.scm | 1 +
gnu/packages/python-xyz.scm | 41 +----------------------------------------
gnu/packages/tryton.scm | 3 ++-
4 files changed, 44 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index ad9b90a564..6de45208d4 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -181,3 +181,43 @@ groups.")
(synopsis "Self-contained ISO 3166-1 country definitions")
(description "This package provides the ISO 3166-1 country definitions.")
(license license:expat)))
+
+(define-public python-pycountry
+ (package
+ (name "python-pycountry")
+ (version "22.3.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pycountry" version))
+ (sha256
+ (base32
+ "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj"))))
+ (build-system python-build-system)
+ (home-page "https://bitbucket.org/flyingcircus/pycountry";)
+ (synopsis "ISO databases for languages, countries, currencies, etc.")
+ (description
+ "@code{pycountry} provides the ISO databases for the standards:
+ @enumerate
+ @item 639-3 (Languages)
+ @item 3166 (Countries)
+ @item 3166-3 (Deleted Countries)
+ @item 3166-2 (Subdivisions of countries)
+ @item 4217 (Currencies)
+ @item 15924 (Scripts)
+ @end enumerate
+ It includes a copy from Debian’s pkg-isocodes and makes the data
accessible
+ through a Python API.")
+ (license license:lgpl2.1+)))
+
+(define-public python-pycountry-20.7.3
+ (package
+ (inherit python-pycountry)
+ (name "python-pycountry")
+ (version "20.7.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "pycountry" version))
+ (sha256
+ (base32 "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"))))))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c789ae54fa..763c21b793 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -154,6 +154,7 @@
#:use-module (gnu packages image)
#:use-module (gnu packages image-viewers)
#:use-module (gnu packages imagemagick)
+ #:use-module (gnu packages iso-codes)
#:use-module (gnu packages java)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages libevent)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ae5e5c270e..ef95f3a05d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -237,6 +237,7 @@
#:use-module (gnu packages image-processing)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages inkscape)
+ #:use-module (gnu packages iso-codes)
#:use-module (gnu packages java)
#:use-module (gnu packages jupyter)
#:use-module (gnu packages kerberos)
@@ -26034,46 +26035,6 @@ converting text with ANSI color codes to HTML or
LaTeX.")
can even create animations with the cursor controls.")
(license license:expat)))
-(define-public python-pycountry
- (package
- (name "python-pycountry")
- (version "22.3.5")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pycountry" version))
- (sha256
- (base32
- "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj"))))
- (build-system python-build-system)
- (home-page "https://bitbucket.org/flyingcircus/pycountry";)
- (synopsis "ISO databases for languages, countries, currencies, etc.")
- (description
- "@code{pycountry} provides the ISO databases for the standards:
- @enumerate
- @item 639-3 (Languages)
- @item 3166 (Countries)
- @item 3166-3 (Deleted Countries)
- @item 3166-2 (Subdivisions of countries)
- @item 4217 (Currencies)
- @item 15924 (Scripts)
- @end enumerate
- It includes a copy from Debian’s pkg-isocodes and makes the data
accessible
- through a Python API.")
- (license license:lgpl2.1+)))
-
-(define-public [email protected]
- (package
- (inherit python-pycountry)
- (name "python-pycountry")
- (version "20.7.3")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pycountry" version))
- (sha256
- (base32 "0hnbabsmqimx5hqh0jbd2f64i8fhzhhbrvid57048hs5sd9ll241"))))))
-
(define-public python-pycosat
(package
(name "python-pycosat")
diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm
index ee6cc9b6bf..0261e92e8e 100644
--- a/gnu/packages/tryton.scm
+++ b/gnu/packages/tryton.scm
@@ -33,6 +33,7 @@
#:use-module (gnu packages gnome)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages iso-codes)
#:use-module (gnu packages pdf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
@@ -1739,7 +1740,7 @@ month and a year of work.")
(arguments (tryton-arguments "country" "--no-doctest"))
(native-inputs (%standard-trytond-native-inputs))
(propagated-inputs
- (list [email protected] trytond))
+ (list python-pycountry-20.7.3 trytond))
(home-page "http://www.tryton.org/";)
(synopsis "Tryton module with countries")
(description
