[bug#52857] [PATCH 0/3] Fix build of python-funcparserlib and python-hy.

[bug#52857] [PATCH 0/3] Fix build of python-funcparserlib and python-hy.

[Vinicius Monego]

This patchset updates python-funcparserlib to an alpha version to fix its build and that of python-hy which is also updated to latest stable.

Vinicius Monego (3):
  gnu: python-funcparserlib: Update to 1.0.0a0.
  gnu: python-hy: Update to 0.20.0.
  gnu: python-hy: Honor #:tests? flag.

 gnu/packages/python-xyz.scm | 55 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 30 deletions(-)


base-commit: 28b477cb2e5d9185da16f305caff15809dfa06f3
-- 
2.30.2

[bug#52857] [PATCH 1/3] gnu: python-funcparserlib: Update to 1.0.0a0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-funcparserlib): Update to 1.0.0a0.
[source]: Make some cosmetic changes.
[native-inputs]: Remove python-tox.
[arguments]: Add #:tests?.
<#:phases>: Don't override the 'check phase.
[home-page]: Don't break line.
---
 gnu/packages/python-xyz.scm | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 7ca0b1668d..d7b6ad76b4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -24005,25 +24005,17 @@ scripts to load entry points more quickly.")
 (define-public python-funcparserlib
   (package
     (name "python-funcparserlib")
-    (version "0.3.6")
+    (version "1.0.0a0")                 ; last stable release was in 2013
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "funcparserlib" version))
        (sha256
-        (base32
-         "07f9cgjr3h4j2m67fhwapn8fja87vazl58zsj4yppf9y3an2x6dp"))))
-    (native-inputs
-     (list python-tox))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda _
-             (invoke "tox"))))))
+        (base32 "0ama5w5lswxlp3l4qfqq3zlg7i6qkw45jfl1f7p8w1vnj8m47yz6"))))
     (build-system python-build-system)
-    (home-page
-     "https://github.com/vlasovskikh/funcparserlib")
+    (arguments
+     `(#:tests? #f))              ; no tests in PyPI and no setup.py in GitHub
+    (home-page "https://github.com/vlasovskikh/funcparserlib")
     (synopsis
      "Recursive descent parsing library based on functional combinators")
     (description
-- 
2.30.2

[bug#52857] [PATCH 2/3] gnu: python-hy: Update to 0.20.0.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-hy): Update to 0.20.0.
[source]: Fetch from GitHub.
[arguments]<#:phases>: Remove 'set-HOME phase. Replace nosetests command with
pytest in the custom 'check phase and skip failed tests.
[native-inputs]: Remove python-coverage, python-nose. Add python-pytest.
[propagated-inputs]: Order alphabetically.
[home-page]: Follow redirection.
---
 gnu/packages/python-xyz.scm | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d7b6ad76b4..9b651d2108 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13007,30 +13007,32 @@ with a new public API, and RPython support.")
 (define-public python-hy
   (package
     (name "python-hy")
-    (version "0.18.0")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "hy" version))
-              (sha256
-               (base32
-                "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2"))))
+    (version "0.20.0")
+    (source
+     (origin
+       (method git-fetch)               ; no tests in PyPI release
+       (uri (git-reference
+             (url "https://github.com/hylang/hy")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1g7djra9z7b0wyqyfrk2n4z3zamp2xkahv00jwdv35xmwwn09hq4"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
        (modify-phases %standard-phases
-         (add-before 'install 'set-HOME
-           (lambda _
-             (setenv "HOME" "/tmp") #t))
          (replace 'check
            (lambda _
-             ;; Tests require write access to HOME.
-             (setenv "HOME" "/tmp")
-             (invoke "nosetests"))))))
+             (invoke "python" "-m" "pytest" "-k"
+                     (string-append     ; skip some failed tests
+                      "not test_bin_hy_sys_executable"
+                      " and not test_bin_hy_circular_macro_require"
+                      " and not test_macro_from_module")))))))
     (native-inputs
-     (list python-coverage python-nose))
+     (list python-pytest))
     (propagated-inputs
-     (list python-astor python-colorama python-rply python-funcparserlib))
-    (home-page "http://hylang.org/")
+     (list python-astor python-colorama python-funcparserlib python-rply))
+    (home-page "https://docs.hylang.org/en/stable/")
     (synopsis "Lisp frontend to Python")
     (description
      "Hy is a dialect of Lisp that's embedded in Python.  Since Hy transforms
-- 
2.30.2

[bug#52857] [PATCH 3/3] gnu: python-hy: Honor #:tests? flag.

[Vinicius Monego]

* gnu/packages/python-xyz.scm (python-hy)[arguments]: Adjust custom 'check
phase to honor the #:tests? flag.
---
 gnu/packages/python-xyz.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9b651d2108..316549ecf1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13022,12 +13022,13 @@ with a new public API, and RPython support.")
      '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda _
-             (invoke "python" "-m" "pytest" "-k"
-                     (string-append     ; skip some failed tests
-                      "not test_bin_hy_sys_executable"
-                      " and not test_bin_hy_circular_macro_require"
-                      " and not test_macro_from_module")))))))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "python" "-m" "pytest" "-k"
+                       (string-append   ; skip some failed tests
+                        "not test_bin_hy_sys_executable"
+                        " and not test_bin_hy_circular_macro_require"
+                        " and not test_macro_from_module"))))))))
     (native-inputs
      (list python-pytest))
     (propagated-inputs
-- 
2.30.2

bug#52857: [PATCH 0/3] Fix build of python-funcparserlib and python-hy.

[Nicolas Goaziou]

Hello,

Vinicius Monego <monego@posteo.net> writes:

> This patchset updates python-funcparserlib to an alpha version to fix
> its build and that of python-hy which is also updated to latest
> stable.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou