From de71fdcff9bb8b24af4b10832f1ce109d5c4eea6 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Fri, 31 Oct 2025 00:57:45 +0100 Subject: [PATCH] gnu: python-pygments: Move to (gnu packages python-build). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pygments, python-pygments-boostrap): Move from here… * gnu/packages/python-build.scm (python-pygments, python-pygments-boostrap): …to here. * gnu/packages/books.scm: Adapt modules. * gnu/packages/lisp-xyz.scm: Adapt modules. * gnu/packages/ruby-xyz.scm: Adapt modules. Change-Id: Id73c1d536c48c490bb7444f87cc6b89d6a79cb38 Signed-off-by: Sharlatan Hellseher --- gnu/packages/books.scm | 2 +- gnu/packages/lisp-xyz.scm | 1 + gnu/packages/python-build.scm | 34 ++++++++++++++++++++++--- gnu/packages/python-xyz.scm | 47 ----------------------------------- gnu/packages/ruby-xyz.scm | 1 + 5 files changed, 33 insertions(+), 52 deletions(-) diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm index cff31da6933..31490605f08 100644 --- a/gnu/packages/books.scm +++ b/gnu/packages/books.scm @@ -61,7 +61,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-build) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 712b9d16afb..9ed69a6bd25 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -122,6 +122,7 @@ #:use-module (gnu packages package-management) #: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 readline) #:use-module (gnu packages rsync) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index ce242a332d2..86e48d34a37 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -147,9 +147,9 @@ Language (TOML) configuration files.") write-only counterpart to Tomli, which is a read-only TOML parser.") (license license:expat))) -(define-public python-pygments-bootstrap +(define-public python-pygments (package - (name "python-pygments-bootstrap") + (name "python-pygments") (version "2.19.1") (source (origin @@ -159,15 +159,41 @@ write-only counterpart to Tomli, which is a read-only TOML parser.") (base32 "07qm8mx3y5r8ri6zpn0hp9zx5g02bydhi7pkv54hdp3nhlm6vhb1")))) (build-system pyproject-build-system) - (arguments (list #:tests? #f)) + (arguments + (list + #:test-flags + ;; 4568 passed, 16 skipped, 597 deselected + ;; + ;; Ignore tests requiring "wcag_contrast_ratio" + #~(list "--ignore=tests/contrast/test_contrasts.py" + ;; Tests fail with not matched diff. + "--ignore=tests/examplefiles/awk/test.awk" + "--ignore=tests/examplefiles/bash/example.sh" + "--ignore=tests/examplefiles/make/Makefile" + "--ignore=tests/examplefiles/phix/example.exw" + "--ignore=tests/examplefiles/sed/all_sorts_of_syntax.sed" + "--ignore=tests/examplefiles/sed/count_words.sed" + "--ignore=tests/examplefiles/sed/increment_number.sed" + "--ignore=tests/examplefiles/sed/reverse.sed" + "--ignore=tests/examplefiles/slurm/example.sl" + ;; Assertion error to find example file by following symlink: + ;; assert p.is_file(), f"Example file {p} not found" + "--deselect=tests/test_basic_api.py::test_lexer_classes"))) (native-inputs - (list python-hatchling)) + (list python-hatchling python-pytest-bootstrap)) (home-page "https://pygments.org/") (synopsis "Syntax highlighting") (description "Pygments is a syntax highlighting package written in Python.") (license license:bsd-2))) +(define-public python-pygments-bootstrap + (package/inherit python-pygments + (name "python-pygments-bootstrap") + (native-inputs + (list python-hatchling)) + (arguments `(#:tests? #f)))) + (define-public python-pytest-bootstrap (package (name "python-pytest-bootstrap") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7ee412c7479..fea7cd588dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9496,53 +9496,6 @@ decorator for retrying on exceptions.") with Python.") (license license:expat))) -(define-public python-pygments - (package - (name "python-pygments") - (version "2.19.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pygments" version)) - (sha256 - (base32 - "07qm8mx3y5r8ri6zpn0hp9zx5g02bydhi7pkv54hdp3nhlm6vhb1")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - ;; 4568 passed, 16 skipped, 597 deselected - ;; - ;; Ignore tests requiring "wcag_contrast_ratio" - #~(list "--ignore=tests/contrast/test_contrasts.py" - ;; Tests fail with not matched diff. - "--ignore=tests/examplefiles/awk/test.awk" - "--ignore=tests/examplefiles/bash/example.sh" - "--ignore=tests/examplefiles/make/Makefile" - "--ignore=tests/examplefiles/phix/example.exw" - "--ignore=tests/examplefiles/sed/all_sorts_of_syntax.sed" - "--ignore=tests/examplefiles/sed/count_words.sed" - "--ignore=tests/examplefiles/sed/increment_number.sed" - "--ignore=tests/examplefiles/sed/reverse.sed" - "--ignore=tests/examplefiles/slurm/example.sl" - ;; Assertion error to find example file by following symlink: - ;; assert p.is_file(), f"Example file {p} not found" - "--deselect=tests/test_basic_api.py::test_lexer_classes"))) - (native-inputs - (list python-hatchling python-pytest-bootstrap)) - (home-page "https://pygments.org/") - (synopsis "Syntax highlighting") - (description - "Pygments is a syntax highlighting package written in Python.") - (license license:bsd-2))) - -(define-public python-pygments-bootstrap - (package/inherit python-pygments - (name "python-pygments-bootstrap") - (native-inputs - (list python-hatchling)) - (arguments `(#:tests? #f)))) - (define-public python-pygtrie (package (name "python-pygtrie") diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index 85c927dc4c5..49edb6e7612 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -95,6 +95,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-xyz) #:use-module (gnu packages ragel) #:use-module (gnu packages rsync)