Package: guix-patches;
Reported by: Nicolas Graves <ngraves <at> ngraves.fr>
Date: Fri, 18 Apr 2025 09:55:06 UTC
Severity: normal
Tags: patch
Done: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To reply to this bug, email your comments to 77895 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 09:55:08 GMT) Full text and rfc822 format available.Nicolas Graves <ngraves <at> ngraves.fr>:guix-patches <at> gnu.org.
(Fri, 18 Apr 2025 09:55:08 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: guix-patches <at> gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH python-team 0/7] Some fixes. Date: Fri, 18 Apr 2025 11:51:39 +0200
Some fixes, in particular for chirp. Cura is expected to be broken. I'm not removing python-sip <at> 4 yet, it will be done in c++-team branch soon. Nicolas Graves (7): gnu: Add python-lark. gnu: python-suds: Fix dist-info. gnu: chirp: Update to 0.4.0-4.bc27f66. gnu: Remove python-mox3. gnu: python-skranger: Improve phase 'build-extensions. gnu: python-bed-reader: Improve phases' style. gnu: gitless: Fix build and disable failing tests. gnu/local.mk | 1 - gnu/packages/bioinformatics.scm | 22 ++++------ gnu/packages/openstack.scm | 26 ----------- .../python-mox3-python3.6-compat.patch | 43 ------------------ gnu/packages/python-web.scm | 16 +++++++ gnu/packages/python-xyz.scm | 41 ++++++++++------- gnu/packages/radio.scm | 44 ++++++++++++------- gnu/packages/version-control.scm | 35 ++++++++++----- 8 files changed, 101 insertions(+), 127 deletions(-) delete mode 100644 gnu/packages/patches/python-mox3-python3.6-compat.patch -- 2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:48:04 GMT) Full text and rfc822 format available.Message #8 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 3/7] gnu: chirp: Update to 0.4.0-4.bc27f66. Date: Fri, 18 Apr 2025 13:46:21 +0200
* gnu/packages/radio.scm (chirp): Update to 0.4.0-4.bc27f66.
[build-system]: Switch to pyproject.
[native-inputs]: Remove python-mox3, python-tox. Add
python-setuptools, python-wheel.
[inputs]: Replace python-lark-parser by python-lark. Remove
python-six.
[arguments]{test-flags}: Ignore failing tests.
---
gnu/packages/radio.scm | 44 ++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 2752380a3a..6d7274ef0a 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3254,8 +3254,8 @@ (define-public satdump
(license license:gpl3)))
(define-public chirp
- (let ((commit "1219bee0d39ca3778acdf5d7f0a92c1e8208bae9")
- (revision "3"))
+ (let ((commit "bc27f6653aa804a5c55a3a1b2244ee43a174854b")
+ (revision "4"))
(package
(name "chirp")
(version (git-version "0.4.0" revision commit))
@@ -3267,35 +3267,45 @@ (define-public chirp
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "19z3f05zppg8w4z4sdich8d173sd87501l0p8l1vn1awgky2q0r8"))))
- (build-system python-build-system)
+ (base32 "15nly5j0f3h67pv6li6vrd56wmdnplanls867kf60r9vz0k4k0yd"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-mock
- python-mox3
python-pytest
python-pytest-mock
python-pyyaml
- python-tox))
+ python-setuptools
+ python-wheel))
(inputs
(list python-future
python-importlib-resources
- python-lark-parser
+ python-lark
python-pyserial
python-requests
- python-six
python-suds
python-wxpython
python-yattag))
(arguments
- (list ;; FIXME: How to run the tests? The default way crashes.
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; FIXME: Why does sanity-check phase fail to find lark?
- (delete 'sanity-check)
- (add-after 'build 'set-home-for-tests
- (lambda _
- (setenv "HOME" "/tmp"))))))
+ (list
+ #:test-flags
+ #~(list ;; FIXME: These files error during collection.
+ "--ignore=tests/unit/test_csv.py"
+ "--ignore=tests/unit/test_wxui_radiothread.py"
+ ;; These tests are long and expensive.
+ "--ignore=tests/test_drivers.py"
+ ;; Ignore tests requiring network.
+ "-m" "not network"
+ "-k" (string-append
+ ;; XXX: Tests likewise prefixed all have a RADIO_CLASS=None
+ "not TestCase"
+ " and not test_bitwise_errors"
+ ;; XXX: Requires settings TLS certificates.
+ " and not test_marc_works"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'set-home-for-tests
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
(synopsis "Cross-radio programming tool")
(description "Chirp is a cross-radio programming tool. It supports a
growing list of radios across several manufacturers and allows transferring of
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:48:07 GMT) Full text and rfc822 format available.Message #11 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 2/7] gnu: python-suds: Fix dist-info. Date: Fri, 18 Apr 2025 13:46:20 +0200
* gnu/packages/python-web.scm (python-suds)
[arguments]{phases}: Add phase 'add-custom-dist-info.
---
gnu/packages/python-web.scm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e05ac25563..722568fee6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -10592,6 +10592,22 @@ (define-public python-suds
(sha256
(base32 "1byyg7b2ixpr8hc849a6dd0qn5daxqawz6lb3php8lrmsb1n5cc3"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: chirp expects suds instead of suds_community
+ (add-after 'install 'add-custom-dist-info
+ (lambda _
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion (dirname dir)
+ (symlink
+ (basename dir)
+ (string-append "suds-" #$version ".dist-info"))))
+ (find-files #$output
+ (lambda (file stat)
+ (string-suffix? ".dist-info" file))
+ #:directories? #t)))))))
(native-inputs
(list python-pytest
python-setuptools
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:48:10 GMT) Full text and rfc822 format available.Message #14 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 6/7] gnu: python-bed-reader: Improve phases' style. Date: Fri, 18 Apr 2025 13:46:24 +0200
* gnu/packages/bioinformatics.scm (python-bed-reader)
[arguments]{phases}: Improve phases 'install-python-library and
'check-python with site-packages procedure.
---
gnu/packages/bioinformatics.scm | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index e1cac1f149..d4fa482851 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2333,26 +2333,20 @@ (define-public python-bed-reader
(add-after 'build-python-module 'install-python-module
(assoc-ref py:%standard-phases 'install))
(add-after 'install-python-module 'install-python-library
- (lambda _
- (let ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages/")))
- (mkdir-p (string-append site "bed_reader"))
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((site (py:site-packages inputs outputs)))
+ (mkdir-p (string-append site "/bed_reader"))
(copy-file "target/release/libbed_reader.so"
- (string-append site "bed_reader/bed_reader.so")))))
+ (string-append site "/bed_reader/bed_reader.so")))))
(add-after 'install-python-library 'add-install-to-pythonpath
(assoc-ref py:%standard-phases 'add-install-to-pythonpath))
(add-after 'add-install-to-pythonpath 'check-python
- (lambda* (#:key tests? #:allow-other-keys)
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
- (let ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages/"))
+ (let ((site (py:site-packages inputs outputs))
(data-dir "bed_reader/tests/data"))
(symlink (canonicalize-path data-dir)
- (string-append site data-dir))
+ (string-append site "/" data-dir))
(invoke "pytest" "-v" #$output
;; These test require a 84 GB file.
"-k" (string-join
@@ -2363,7 +2357,7 @@ (define-public python-bed-reader
"test_optional_dependencies")
" and not "))
(delete-file-recursively
- (string-append site "bed_reader/tests"))
+ (string-append site "/bed_reader/tests"))
(delete-file-recursively
(string-append #$output "/.pytest_cache")))))))))
(native-inputs (list python-pytest
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:48:12 GMT) Full text and rfc822 format available.Message #17 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 7/7] gnu: gitless: Fix build and disable failing tests. Date: Fri, 18 Apr 2025 13:46:25 +0200
* gnu/packages/version-control.scm (gitless)
[build-system]: Switch to pyproject-build-system.
[arguments]{test-flags}: Disable failing tests.
{phases}: Improve git configuration in phase 'prepare-for-tests.
Improve style of 'wrap phase.
[native-inputs]: Add python-pytest, python-setuptools, python-wheel.
---
gnu/packages/version-control.scm | 35 ++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8d6709f7f6..d9e7dd249f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -940,9 +940,21 @@ (define-public gitless
(sha256
(base32 "048kl27zjr68hgs70g3l98ci9765wxva6azzrhcdys7nsdd493n6"))
(file-name (git-file-name name version))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
(list
+ ;; XXX: Unclear why these tests fail.
+ #:test-flags
+ #~(list "-k"
+ (string-append "not test_exclude_one"
+ " and not test_exclude_some"
+ " and not test_ip_commit"
+ " and not test_only_one"
+ " and not test_only_some"
+ " and not test_basic_functionality"
+ " and not test_conflicts"
+ " and not test_conflicts_switch"
+ " and not test_nothing_to_fuse"))
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'loosen-requirements
@@ -959,20 +971,21 @@ (define-public gitless
;; The tests try to run git as if it were already set up.
(setenv "HOME" (getcwd))
(invoke "git" "config" "--global" "user.email" "git <at> example.com")
- (invoke "git" "config" "--global" "user.name" "Guix")))
+ (invoke "git" "config" "--global" "user.name" "Guix")
+ (invoke "git" "config" "--global" "color.ui" "true")))
(replace 'wrap
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((out #$output)
- (git (search-input-file inputs "bin/git")))
- (wrap-program (string-append out "/bin/gl")
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((git (search-input-file inputs "bin/git")))
+ (wrap-program (string-append #$output "/bin/gl")
`("PATH" ":" prefix (,(dirname git)))
`("GUIX_PYTHONPATH" ":" =
- (,(string-append out "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages:")
+ (,(string-append (site-packages inputs outputs) ":")
,(getenv "GUIX_PYTHONPATH"))))))))))
- (native-inputs (list git-minimal))
+ (native-inputs
+ (list git-minimal
+ python-pytest
+ python-setuptools
+ python-wheel))
(inputs
(list bash-minimal
git-minimal
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:48:12 GMT) Full text and rfc822 format available.Message #20 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 5/7] gnu: python-skranger: Improve phase 'build-extensions. Date: Fri, 18 Apr 2025 13:46:23 +0200
* gnu/packages/python-xyz.scm (python-skranger)
[arguments]{phases}: Improve phase 'build-extensions with
site-packages procedure.
---
gnu/packages/python-xyz.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f9b98d7dd5..14a95de25d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -2605,14 +2605,12 @@ (define-public python-skranger
(("from sklearn.datasets import load_boston") "")
(("^_boston_X.*") "_boston_X, _boston_Y = (True, True)\n"))))
(add-before 'check 'build-extensions
- (lambda _
+ (lambda* (#:key inputs outputs #:allow-other-keys)
;; Cython extensions have to be built before running the tests.
(invoke "python" "buildpre.py")
(invoke "python" "build.py" "build_ext" "--inplace")
- (let ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages/skranger"))
+ (let ((site (string-append (site-packages inputs outputs)
+ "/skranger"))
(lib (match (find-files "build" "\\.so")
((the-lib) the-lib)
(_ (error "could not find .so")))))
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:48:14 GMT) Full text and rfc822 format available.Message #23 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 4/7] gnu: Remove python-mox3. Date: Fri, 18 Apr 2025 13:46:22 +0200
This python library is now a leaf package undevelopped for 5 years and
not failing on the latest python version.
* gnu/packages/openstack.scm (python-mox3): Remove variable.
* gnu/packages/patches/python-mox3-python3.6-compat.patch: Remove
patch.
* gnu/local.mk: Deregister patch.
---
gnu/local.mk | 1 -
gnu/packages/openstack.scm | 26 -----------
.../python-mox3-python3.6-compat.patch | 43 -------------------
3 files changed, 70 deletions(-)
delete mode 100644 gnu/packages/patches/python-mox3-python3.6-compat.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d4b2d4ad51..7bdc9baa3e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2127,7 +2127,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-libxml2-utf8.patch \
%D%/packages/patches/python-memcached-syntax-warnings.patch \
- %D%/packages/patches/python-mox3-python3.6-compat.patch \
%D%/packages/patches/python-packaging-test-arch.patch \
%D%/packages/patches/python-property-cached-asyncio-3_11.patch \
%D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e78a1f614f..eab255464d 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -181,32 +181,6 @@ (define-public python-hacking
guidelines}.")
(license asl2.0)))
-(define-public python-mox3
- (package
- (name "python-mox3")
- (version "0.24.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "mox3" version))
- (patches (search-patches "python-mox3-python3.6-compat.patch"))
- (sha256
- (base32
- "0w58adwv7q9wzvmq9mlrk2asfk73myq9fpwy7mjkzsz3baa95zf5"))))
- (build-system python-build-system)
- (propagated-inputs
- (list python-fixtures python-pbr))
- (native-inputs
- (list python-openstackdocstheme python-sphinx python-subunit
- python-testrepository python-testtools))
- (home-page "https://www.openstack.org/")
- (synopsis "Mock object framework for Python")
- (description
- "Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/,
-Google mox framework} to Python 3. It was meant to be as compatible
-with mox as possible, but small enhancements have been made.")
- (license asl2.0)))
-
(define-public python-openstackdocstheme
(package
(name "python-openstackdocstheme")
diff --git a/gnu/packages/patches/python-mox3-python3.6-compat.patch b/gnu/packages/patches/python-mox3-python3.6-compat.patch
deleted file mode 100644
index 0426d07cf9..0000000000
--- a/gnu/packages/patches/python-mox3-python3.6-compat.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix regex so that it works with Python 3.6.
-
-See <https://docs.python.org/3/library/re.html#re.LOCALE>.
-
-Copied from upstream bug report:
-https://bugs.launchpad.net/python-mox3/+bug/1665266
-
-From 05064cdb6ea7a16450c6beae2b6f7c6074212a69 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico <at> gentoo.org>
-Date: Thu, 16 Feb 2017 00:24:10 -0800
-Subject: [PATCH] RegexTest: python3.6 compatibility
-
-These fixes are backward-compatible with older python versions:
-
-* raw strings fix invalid escape sequences
-* flags=8 fixes ValueError: cannot use LOCALE flag with a str pattern
----
- mox3/tests/test_mox.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py
-index 15ac565..3a1af17 100644
---- a/mox3/tests/test_mox.py
-+++ b/mox3/tests/test_mox.py
-@@ -312,12 +312,12 @@ class RegexTest(testtools.TestCase):
- def testReprWithoutFlags(self):
- """repr should return the regular expression pattern."""
- self.assertTrue(
-- repr(mox.Regex(r"a\s+b")) == "<regular expression 'a\s+b'>")
-+ repr(mox.Regex(r"a\s+b")) == r"<regular expression 'a\s+b'>")
-
- def testReprWithFlags(self):
- """repr should return the regular expression pattern and flags."""
-- self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) ==
-- "<regular expression 'a\s+b', flags=4>")
-+ self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) ==
-+ r"<regular expression 'a\s+b', flags=8>")
-
-
- class IsTest(testtools.TestCase):
---
-2.10.2
-
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Fri, 18 Apr 2025 11:57:03 GMT) Full text and rfc822 format available.Message #26 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH 1/7] gnu: Add python-lark. Date: Fri, 18 Apr 2025 13:46:19 +0200
* gnu/packages/python-xyz.scm (python-lark): New variable.
(python-lark-parser): Inherit from python-lark and update to 0.12.0.
---
gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fd797ff2c0..f9b98d7dd5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23655,17 +23655,18 @@ (define-public python-pyproject-hooks
write tooling that generates distribution files from Python projects.")
(license license:expat)))
-(define-public python-lark-parser
+(define-public python-lark
(package
- (name "python-lark-parser")
- (version "0.9.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "lark-parser" version))
- (sha256
- (base32
- "1kd61asrb3h9spgsj4bslfbgp8q4271sw3hblk6f2vbbblv8jxcy"))))
- (build-system python-build-system)
+ (name "python-lark")
+ (version "1.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "lark" version))
+ (sha256
+ (base32 "107d1w24b3ln4zwsw4yvkfhff6bk5n3cpvlgbbqww5ndc80pv06a"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/lark-parser/lark")
(synopsis "Multi-language parser for Python")
(description
@@ -23675,6 +23676,18 @@ (define-public python-lark-parser
some degree most natural languages too.")
(license license:expat)))
+;; XXX: lark was renamed from lark_parser with major release 1
+(define-public python-lark-parser
+ (package/inherit python-lark
+ (name "python-lark-parser")
+ (version "0.12.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "lark-parser" version))
+ (sha256
+ (base32
+ "0f51jr7dvnd3rm7j5nkkgm2vxfa7a1s804avlvf16h11y6qpv5hm"))))))
+
(define-public python-find-libpython
(package
(name "python-find-libpython")
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Mon, 21 Apr 2025 15:37:06 GMT) Full text and rfc822 format available.Message #29 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Sharlatan Hellseher <sharlatanus <at> gmail.com> To: 77895 <at> debbugs.gnu.org Subject: [PATCH python-team 0/7] Some fixes. Date: Mon, 21 Apr 2025 16:36:35 +0100
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi, Thanks for the patches, After a quick check: - - python-mox3: Still in use by python-omero-py, but it does not support Pyton 3.11 (!), see #77960. - - python-skranger: All tests fail. - - python-lark-parser: Fails to collect tests. May you check it please? - -- Oleg -----BEGIN PGP SIGNATURE----- iQJKBAEBCgA0FiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmgGZgMWHHNoYXJsYXRh bnVzQGdtYWlsLmNvbQAKCRB21ye/9izStTFDD/0UZAIKmCuV8Qy+rk9A2jwQn5yY FdIUK6eLMLBDLco1NA4irwMldjaSnmCeKQUqIYJwAN5zCGMbIUDXyzC0UdaihtCx fDE8qeOdp7+IfdVcvuyNSsIrLlCClvP8Is/dVot4asGAtfYiTJUTgcEPcAi498+a XjKkxClM2c1GR75Ax87cTSk87yf2Unz8TaLeuwGJ8s8dsACr5PZkM5il+TBQQr0w pOgvEWNoRRLyS0VlTeBVNsGHPJeCAUBSis1bYxnlLjuD6rTpLFYHwr3VG5njOoJ1 RU92E+KM5KwZfVZUMjJRi9T+GsDUNeWRo4y6Z4L1lmTHvWF+5izkxACGZa7O7COa BdPApWLNdgbDBLyVupp9PLQke51nJTUUnPQiRvbqZPpzWXxZiIYZJ6K2wWpSZ1ru CHHIA33HJ0hUjbSQhRuzdMJdTnjvoEoEiEczISaw+5rwZY5QKEJidgMImwFChSeG +ih8d7ek3AIyiatLOnfwFtepOEXVu4krVaPDnm9hZt1p66vy65C3609lmj+gmhz4 LiimV4gPJKJLbTqY/9onqMUecoQRCg+He6dp2+nKw3Bj1831fZde1kUrk4yUiXJZ 5qrUs/paKWwVJe++C2r23gXOP5a3v8RKn3Hdw3ZOWlTUKGF4yklJr8k+Ekde61ma bRnNNmYNMvsizo6v4A== =kNN8 -----END PGP SIGNATURE-----
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:01 GMT) Full text and rfc822 format available.Message #32 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 02/10] gnu: python-suds: Fix dist-info. Date: Tue, 22 Apr 2025 16:00:29 +0200
* gnu/packages/python-web.scm (python-suds)
[arguments]{phases}: Add phase 'add-custom-dist-info.
---
gnu/packages/python-web.scm | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8fe9f58978..d86567fd2e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -10605,6 +10605,22 @@ (define-public python-suds
(sha256
(base32 "1byyg7b2ixpr8hc849a6dd0qn5daxqawz6lb3php8lrmsb1n5cc3"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX: chirp expects suds instead of suds_community
+ (add-after 'install 'add-custom-dist-info
+ (lambda _
+ (for-each
+ (lambda (dir)
+ (with-directory-excursion (dirname dir)
+ (symlink
+ (basename dir)
+ (string-append "suds-" #$version ".dist-info"))))
+ (find-files #$output
+ (lambda (file stat)
+ (string-suffix? ".dist-info" file))
+ #:directories? #t)))))))
(native-inputs
(list python-pytest
python-setuptools
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:02 GMT) Full text and rfc822 format available.Message #35 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 01/10] gnu: Add python-lark. Date: Tue, 22 Apr 2025 16:00:28 +0200
* gnu/packages/python-xyz.scm (python-lark): New variable.
(python-lark-parser): Inherit from python-lark and update to 0.12.0.
---
gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7f539634d1..53647516e3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23652,17 +23652,18 @@ (define-public python-pyproject-hooks
write tooling that generates distribution files from Python projects.")
(license license:expat)))
-(define-public python-lark-parser
+(define-public python-lark
(package
- (name "python-lark-parser")
- (version "0.9.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "lark-parser" version))
- (sha256
- (base32
- "1kd61asrb3h9spgsj4bslfbgp8q4271sw3hblk6f2vbbblv8jxcy"))))
- (build-system python-build-system)
+ (name "python-lark")
+ (version "1.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "lark" version))
+ (sha256
+ (base32 "107d1w24b3ln4zwsw4yvkfhff6bk5n3cpvlgbbqww5ndc80pv06a"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/lark-parser/lark")
(synopsis "Multi-language parser for Python")
(description
@@ -23672,6 +23673,18 @@ (define-public python-lark-parser
some degree most natural languages too.")
(license license:expat)))
+;; XXX: lark was renamed from lark_parser with major release 1
+(define-public python-lark-parser
+ (package/inherit python-lark
+ (name "python-lark-parser")
+ (version "0.12.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "lark-parser" version))
+ (sha256
+ (base32
+ "0f51jr7dvnd3rm7j5nkkgm2vxfa7a1s804avlvf16h11y6qpv5hm"))))))
+
(define-public python-find-libpython
(package
(name "python-find-libpython")
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:02 GMT) Full text and rfc822 format available.Message #38 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 03/10] gnu: chirp: Update to 0.4.0-4.bc27f66. Date: Tue, 22 Apr 2025 16:00:30 +0200
* gnu/packages/radio.scm (chirp): Update to 0.4.0-4.bc27f66.
[build-system]: Switch to pyproject.
[native-inputs]: Remove python-mox3, python-tox. Add
python-setuptools, python-wheel.
[inputs]: Replace python-lark-parser by python-lark. Remove
python-six.
[arguments]{test-flags}: Ignore failing tests.
---
gnu/packages/radio.scm | 44 ++++++++++++++++++++++++++----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 2752380a3a..6d7274ef0a 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3254,8 +3254,8 @@ (define-public satdump
(license license:gpl3)))
(define-public chirp
- (let ((commit "1219bee0d39ca3778acdf5d7f0a92c1e8208bae9")
- (revision "3"))
+ (let ((commit "bc27f6653aa804a5c55a3a1b2244ee43a174854b")
+ (revision "4"))
(package
(name "chirp")
(version (git-version "0.4.0" revision commit))
@@ -3267,35 +3267,45 @@ (define-public chirp
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "19z3f05zppg8w4z4sdich8d173sd87501l0p8l1vn1awgky2q0r8"))))
- (build-system python-build-system)
+ (base32 "15nly5j0f3h67pv6li6vrd56wmdnplanls867kf60r9vz0k4k0yd"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-mock
- python-mox3
python-pytest
python-pytest-mock
python-pyyaml
- python-tox))
+ python-setuptools
+ python-wheel))
(inputs
(list python-future
python-importlib-resources
- python-lark-parser
+ python-lark
python-pyserial
python-requests
- python-six
python-suds
python-wxpython
python-yattag))
(arguments
- (list ;; FIXME: How to run the tests? The default way crashes.
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; FIXME: Why does sanity-check phase fail to find lark?
- (delete 'sanity-check)
- (add-after 'build 'set-home-for-tests
- (lambda _
- (setenv "HOME" "/tmp"))))))
+ (list
+ #:test-flags
+ #~(list ;; FIXME: These files error during collection.
+ "--ignore=tests/unit/test_csv.py"
+ "--ignore=tests/unit/test_wxui_radiothread.py"
+ ;; These tests are long and expensive.
+ "--ignore=tests/test_drivers.py"
+ ;; Ignore tests requiring network.
+ "-m" "not network"
+ "-k" (string-append
+ ;; XXX: Tests likewise prefixed all have a RADIO_CLASS=None
+ "not TestCase"
+ " and not test_bitwise_errors"
+ ;; XXX: Requires settings TLS certificates.
+ " and not test_marc_works"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'build 'set-home-for-tests
+ (lambda _
+ (setenv "HOME" "/tmp"))))))
(synopsis "Cross-radio programming tool")
(description "Chirp is a cross-radio programming tool. It supports a
growing list of radios across several manufacturers and allows transferring of
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:03 GMT) Full text and rfc822 format available.Message #41 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 05/10] gnu: gitless: Fix build and disable failing tests. Date: Tue, 22 Apr 2025 16:00:32 +0200
* gnu/packages/version-control.scm (gitless)
[build-system]: Switch to pyproject-build-system.
[arguments]{test-flags}: Disable failing tests.
{phases}: Improve git configuration in phase 'prepare-for-tests.
Improve style of 'wrap phase.
[native-inputs]: Add python-pytest, python-setuptools, python-wheel.
---
gnu/packages/version-control.scm | 35 ++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8d6709f7f6..d9e7dd249f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -940,9 +940,21 @@ (define-public gitless
(sha256
(base32 "048kl27zjr68hgs70g3l98ci9765wxva6azzrhcdys7nsdd493n6"))
(file-name (git-file-name name version))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
(list
+ ;; XXX: Unclear why these tests fail.
+ #:test-flags
+ #~(list "-k"
+ (string-append "not test_exclude_one"
+ " and not test_exclude_some"
+ " and not test_ip_commit"
+ " and not test_only_one"
+ " and not test_only_some"
+ " and not test_basic_functionality"
+ " and not test_conflicts"
+ " and not test_conflicts_switch"
+ " and not test_nothing_to_fuse"))
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'loosen-requirements
@@ -959,20 +971,21 @@ (define-public gitless
;; The tests try to run git as if it were already set up.
(setenv "HOME" (getcwd))
(invoke "git" "config" "--global" "user.email" "git <at> example.com")
- (invoke "git" "config" "--global" "user.name" "Guix")))
+ (invoke "git" "config" "--global" "user.name" "Guix")
+ (invoke "git" "config" "--global" "color.ui" "true")))
(replace 'wrap
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((out #$output)
- (git (search-input-file inputs "bin/git")))
- (wrap-program (string-append out "/bin/gl")
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((git (search-input-file inputs "bin/git")))
+ (wrap-program (string-append #$output "/bin/gl")
`("PATH" ":" prefix (,(dirname git)))
`("GUIX_PYTHONPATH" ":" =
- (,(string-append out "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages:")
+ (,(string-append (site-packages inputs outputs) ":")
,(getenv "GUIX_PYTHONPATH"))))))))))
- (native-inputs (list git-minimal))
+ (native-inputs
+ (list git-minimal
+ python-pytest
+ python-setuptools
+ python-wheel))
(inputs
(list bash-minimal
git-minimal
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:03 GMT) Full text and rfc822 format available.Message #44 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 04/10] gnu: python-bed-reader: Improve phases' style. Date: Tue, 22 Apr 2025 16:00:31 +0200
* gnu/packages/bioinformatics.scm (python-bed-reader)
[arguments]{phases}: Improve phases 'install-python-library and
'check-python with site-packages procedure.
---
gnu/packages/bioinformatics.scm | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index e1cac1f149..d4fa482851 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2333,26 +2333,20 @@ (define-public python-bed-reader
(add-after 'build-python-module 'install-python-module
(assoc-ref py:%standard-phases 'install))
(add-after 'install-python-module 'install-python-library
- (lambda _
- (let ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages/")))
- (mkdir-p (string-append site "bed_reader"))
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((site (py:site-packages inputs outputs)))
+ (mkdir-p (string-append site "/bed_reader"))
(copy-file "target/release/libbed_reader.so"
- (string-append site "bed_reader/bed_reader.so")))))
+ (string-append site "/bed_reader/bed_reader.so")))))
(add-after 'install-python-library 'add-install-to-pythonpath
(assoc-ref py:%standard-phases 'add-install-to-pythonpath))
(add-after 'add-install-to-pythonpath 'check-python
- (lambda* (#:key tests? #:allow-other-keys)
+ (lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
- (let ((site (string-append #$output "/lib/python"
- #$(version-major+minor
- (package-version python))
- "/site-packages/"))
+ (let ((site (py:site-packages inputs outputs))
(data-dir "bed_reader/tests/data"))
(symlink (canonicalize-path data-dir)
- (string-append site data-dir))
+ (string-append site "/" data-dir))
(invoke "pytest" "-v" #$output
;; These test require a 84 GB file.
"-k" (string-join
@@ -2363,7 +2357,7 @@ (define-public python-bed-reader
"test_optional_dependencies")
" and not "))
(delete-file-recursively
- (string-append site "bed_reader/tests"))
+ (string-append site "/bed_reader/tests"))
(delete-file-recursively
(string-append #$output "/.pytest_cache")))))))))
(native-inputs (list python-pytest
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:04 GMT) Full text and rfc822 format available.Message #47 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 07/10] gnu: python-transient: Update to 0.25. Date: Tue, 22 Apr 2025 16:00:34 +0200
* gnu/packages/virtualization.scm (python-transient): Update to 0.25.
[source]: Switch to git-fetch to enable tests.
[arguments]{phases}: Refresh phase 'fix-dependencies.
[native-inputs]: Remove python-black, python-mypy, python-twine. Add
python-pytest.
[propagated-inputs]: Replace python-lark by python-lark-parser.
---
gnu/packages/virtualization.scm | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b5a0ec9d88..28dd3202df 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2999,34 +2999,35 @@ (define-public osinfo-db
(define-public python-transient
(package
(name "python-transient")
- (version "0.12")
+ (version "0.25")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "transient" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ALSchwalm/transient")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
- (base32 "148yiqrmcscsi6787y0f27i1y9cf0gcw3mqfv5frhpmsmv62mv5z"))))
+ (base32 "1c2v0z1amgfx747sqn8airq71bnp58syvsaqlazirahyn2yjg04d"))))
(build-system pyproject-build-system)
(arguments
- `(#:tests? #f ; Requires behave
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'fix-dependencies
- (lambda _
- (substitute* "setup.py"
- (("==")
- ">=")))))))
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-dependencies
+ (lambda _
+ (substitute* "setup.py"
+ (("(~|=)=") ">=")
+ (("lark-parser>=[0-9.]*") "lark")))))))
(native-inputs
- (list python-black
- python-mypy
- python-pyhamcrest
+ (list python-pyhamcrest
+ python-pytest
python-setuptools
- python-twine
python-wheel))
(propagated-inputs
(list python-beautifultable
python-click
python-importlib-resources
- python-lark-parser
+ python-lark
python-marshmallow
python-progressbar2
python-requests
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:05 GMT) Full text and rfc822 format available.Message #50 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 08/10] gnu: python-commentjson: Switch to python-lark. Date: Tue, 22 Apr 2025 16:00:35 +0200
* gnu/packages/python-xyz.scm (python-commentjson):
[arguments]{phases}: Refresh phase 'relax-requirements.
[propagated-inputs]: Replace python-lark-parser by python-lark.
---
gnu/packages/python-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 53647516e3..2743a94203 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17582,7 +17582,7 @@ (define-public python-commentjson
(lambda _
(substitute* "setup.py"
(("lark-parser>=0.7.1,<0.8.0")
- "lark-parser>=0.7.1"))))
+ "lark"))))
(add-after 'unpack 'delete-unspported-tests
;; Some tests rely on the 'test' module of Python itself,
;; which is not available with the Python package in Guix;
@@ -17600,7 +17600,7 @@ (define (grep string file-name)
(filter (lambda (f) (grep "from test." f))
test-files)))))))))
(propagated-inputs
- (list python-lark-parser))
+ (list python-lark))
(native-inputs
(list python-six))
(home-page "https://github.com/vaidik/commentjson")
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:05 GMT) Full text and rfc822 format available.Message #53 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 09/10] gnu: python-hypothesmith: Update to 0.2.0. Date: Tue, 22 Apr 2025 16:00:36 +0200
* gnu/packages/check.scm (python-hypothesmith): Update to 0.2.0.
[build-system]: Switch to pyproject-build-system.
[arguments]<test-flags>: Ignore failing tests.
<phases>: Add 'patch-lark-dependency test.
[propagated-inputs]: Replace python-lark-parser by python-lark.
[native-inputs]: Add python-black, python-parso, python-pytest,
python-pytest-cov, python-setuptools, python-wheel.
---
gnu/packages/check.scm | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 3580841047..30dc256a84 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2898,17 +2898,38 @@ (define-deprecated python-hypothesis-next python-hypothesis)
(define-public python-hypothesmith
(package
(name "python-hypothesmith")
- (version "0.1.8")
+ (version "0.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "hypothesmith" version))
(sha256
- (base32
- "02j101m5grjrbvrgjap17jsxd1hgawkylmyswcn33vf42mxh9zzr"))))
- (build-system python-build-system)
+ (base32 "08kr9p6hjm3ys87k1k3l79cmf936qbhn21ab8zadsvnp0gyv7dqg"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "-k"
+ (string-append
+ ;; XXX: hypothesis.errors.Unsatisfiable
+ "not test_source_code_from_libcst_node_type[MatchSingleton]"
+ ;; XXX: Python/Black versions not as expected.
+ " and not test_black_autoformatter_from_grammar"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-lark-dependency
+ (lambda _
+ (substitute* "setup.py"
+ (("lark-parser>=[0-9.]*") "lark")))))))
(propagated-inputs
- (list python-hypothesis python-lark-parser python-libcst-minimal))
+ (list python-hypothesis python-lark python-libcst-minimal))
+ (native-inputs
+ (list python-black
+ python-parso
+ python-pytest
+ python-pytest-cov
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/Zac-HD/hypothesmith")
(synopsis "Strategies for generating Python programs")
(description
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:06 GMT) Full text and rfc822 format available.Message #56 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 06/10] gnu: gnome-plots: Switch to python-lark. Date: Tue, 22 Apr 2025 16:00:33 +0200
* gnu/packages/gnome-xyz.scm (gnome-plots)[inputs]: Replace
python-lark-parser by python-lark.
[arguments]{phases}: Remove phase 'adjust-lark-requirement.
---
gnu/packages/gnome-xyz.scm | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index d2483468ab..d7d6610dd1 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -434,7 +434,7 @@ (define-public gnome-plots
pango
python-freetype-py
python-jinja2
- python-lark-parser
+ python-lark
python-numpy
python-pycairo
python-pyglm
@@ -452,10 +452,6 @@ (define-public gnome-plots
(ice-9 match))
#:phases
#~(modify-phases %standard-phases
- (add-before 'build 'adjust-lark-requirement
- (lambda _
- (substitute* "setup.py"
- (("lark") "lark-parser"))))
(add-after 'install 'install-more
(lambda _
(let* ((datadir (string-append #$output "/share"))
--
2.49.0
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Tue, 22 Apr 2025 14:02:06 GMT) Full text and rfc822 format available.Message #59 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77895 <at> debbugs.gnu.org Cc: Nicolas Graves <ngraves <at> ngraves.fr> Subject: [PATCH v2 10/10] gnu: Remove python-lark-parser. Date: Tue, 22 Apr 2025 16:00:37 +0200
* gnu/packages/python-xyz.scm (python-lark-parser): Delete variable.
---
gnu/packages/python-xyz.scm | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2743a94203..15bfad66ae 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23673,18 +23673,6 @@ (define-public python-lark
some degree most natural languages too.")
(license license:expat)))
-;; XXX: lark was renamed from lark_parser with major release 1
-(define-public python-lark-parser
- (package/inherit python-lark
- (name "python-lark-parser")
- (version "0.12.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "lark-parser" version))
- (sha256
- (base32
- "0f51jr7dvnd3rm7j5nkkgm2vxfa7a1s804avlvf16h11y6qpv5hm"))))))
-
(define-public python-find-libpython
(package
(name "python-find-libpython")
--
2.49.0
Sharlatan Hellseher <sharlatanus <at> gmail.com>:Nicolas Graves <ngraves <at> ngraves.fr>:Message #64 received at 77895-done <at> debbugs.gnu.org (full text, mbox):
From: Sharlatan Hellseher <sharlatanus <at> gmail.com> To: 77895-done <at> debbugs.gnu.org Subject: [PATCH python-team 0/7] Some fixes. Date: Thu, 24 Apr 2025 04:51:51 +0100
[Message part 1 (text/plain, inline)]
Hi, Pushed to master as: 7f025ae648 * gnu: Remove python-lark-parser. a3b585bd2c * gnu: python-hypothesmith: Update to 0.2.0. a4eece05bd * gnu: python-commentjson: Switch to python-lark. 8c1320d708 * gnu: python-transient: Update to 0.25. 7cbfb104e2 * gnu: gnome-plots: Switch to python-lark. ffae3037ff * gnu: gitless: Fix build and disable failing tests. 631f445988 * gnu: python-bed-reader: Improve phases' style. 4a75bcf197 * gnu: chirp: Update to 0.4.0-4.bc27f66. 1c931a410e * gnu: python-suds: Fix dist-info. ae43656c94 * gnu: Add python-lark. Side note, we need a fresh python-hypothesis to update python-hypothesmith and symplify package, for the next python-team iteration. -- Thanks, Oleg
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#77895; Package guix-patches.
(Thu, 24 Apr 2025 03:56:01 GMT) Full text and rfc822 format available.Message #67 received at 77895 <at> debbugs.gnu.org (full text, mbox):
From: Sharlatan Hellseher <sharlatanus <at> gmail.com> To: 77895 <at> debbugs.gnu.org Subject: [PATCH python-team 0/7] Some fixes. Date: Thu, 24 Apr 2025 04:54:53 +0100
[Message part 1 (text/plain, inline)]
Corrects commits 6104249936 * gnu: Remove python-lark-parser. 8a28bb5a98 * gnu: python-hypothesmith: Update to 0.2.0. 5d81b890db * gnu: python-commentjson: Switch to python-lark. 3df0c87530 * gnu: python-transient: Update to 0.25. 5ee9ffa195 * gnu: gnome-plots: Switch to python-lark. 1e02ed403c * gnu: gitless: Fix build and disable failing tests. bfdf6a85b8 * gnu: python-bed-reader: Improve phases' style. 7118f9fecc * gnu: chirp: Update to 0.4.0-4.bc27f66. 6c134ae279 * gnu: python-suds: Fix dist-info. dbc331397e * gnu: Add python-lark. -- Oleg
[signature.asc (application/pgp-signature, inline)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.