[bug#57092] repairing tox

[bug#57092] repairing tox

[Nicolas Graves via Guix-patches via]

Small patch series for python-tox.

-- 
Best regards,
Nicolas Graves

[bug#57092] [PATCH 1/2] gnu: python-tox: Move from python-xyz.scm to python-check.scm.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-tox): Add variable.
* gnu/packages/python-xyz.scm (python-tox): Delete variable.
---
 gnu/packages/python-check.scm | 37 +++++++++++++++++++++++++++++++++++
 gnu/packages/python-xyz.scm   | 37 -----------------------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 20ab26facf..5d6cf49c50 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2424,3 +2424,40 @@ (define-public python-pycotap
 attachments).
 @end itemize")
     (license license:expat)))
+
+(define-public python-tox
+  (package
+    (name "python-tox")
+    (version "3.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tox" version))
+       (sha256
+        (base32
+         "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
+    (build-system python-build-system)
+    (arguments
+     ;; FIXME: Tests require pytest-timeout, which itself requires
+     ;; pytest>=2.8.0 for installation.
+     '(#:tests? #f))
+    (propagated-inputs
+     (list python-filelock
+           python-packaging
+           python-pluggy
+           python-py
+           python-six
+           python-toml
+           python-virtualenv))
+    (native-inputs
+     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
+      python-pytest ; >= 2.3.5
+      python-setuptools-scm))
+    (home-page "https://tox.readthedocs.io")
+    (synopsis "Virtualenv-based automation of test activities")
+    (description "Tox is a generic virtualenv management and test command line
+tool.  It can be used to check that a package installs correctly with
+different Python versions and interpreters, or run tests in each type of
+supported environment, or act as a frontend to continuous integration
+servers.")
+    (license license:expat)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f6b986d4e8..b049cded13 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14739,43 +14739,6 @@ (define-public python-deprecation
 that deprecated code is eventually removed.")
     (license license:asl2.0)))
 
-(define-public python-tox
-  (package
-    (name "python-tox")
-    (version "3.20.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "tox" version))
-       (sha256
-        (base32
-         "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
-    (build-system python-build-system)
-    (arguments
-     ;; FIXME: Tests require pytest-timeout, which itself requires
-     ;; pytest>=2.8.0 for installation.
-     '(#:tests? #f))
-    (propagated-inputs
-     (list python-filelock
-           python-packaging
-           python-pluggy
-           python-py
-           python-six
-           python-toml
-           python-virtualenv))
-    (native-inputs
-     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
-           python-pytest ; >= 2.3.5
-           python-setuptools-scm))
-    (home-page "https://tox.readthedocs.io")
-    (synopsis "Virtualenv-based automation of test activities")
-    (description "Tox is a generic virtualenv management and test command line
-tool.  It can be used to check that a package installs correctly with
-different Python versions and interpreters, or run tests in each type of
-supported environment, or act as a frontend to continuous integration
-servers.")
-    (license license:expat)))
-
 (define-public python-jmespath
   (package
    (name "python-jmespath")
-- 
2.37.1

[bug#57092] [PATCH 2/2] gnu: python-tox: Add native-inputs and enable tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-tox): Add native-inputs and enable
tests.
---
 gnu/packages/python-check.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5d6cf49c50..2a54fabd99 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2437,10 +2437,6 @@ (define-public python-tox
         (base32
          "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
     (build-system python-build-system)
-    (arguments
-     ;; FIXME: Tests require pytest-timeout, which itself requires
-     ;; pytest>=2.8.0 for installation.
-     '(#:tests? #f))
     (propagated-inputs
      (list python-filelock
            python-packaging
@@ -2450,9 +2446,11 @@ (define-public python-tox
            python-toml
            python-virtualenv))
     (native-inputs
-     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
-      python-pytest ; >= 2.3.5
-      python-setuptools-scm))
+     (list python-flaky
+           python-pathlib2
+           python-pytest-timeout
+           python-pytest
+           python-setuptools-scm))
     (home-page "https://tox.readthedocs.io")
     (synopsis "Virtualenv-based automation of test activities")
     (description "Tox is a generic virtualenv management and test command line
-- 
2.37.1

[bug#57092] [PATCH 2/2] gnu: python-tox: Add native-inputs and enable tests.

[Liliana Marie Prikler]

Am Mittwoch, dem 10.08.2022 um 00:07 +0200 schrieb Nicolas Graves:
> * gnu/packages/python-check.scm (python-tox): Add native-inputs and
> enable tests.
Haven't built it yet, but enabled tests SGTM.

[bug#57092] [PATCH 1/2] gnu: python-tox: Move from python-xyz.scm to python-check.scm.

[Liliana Marie Prikler]

Am Mittwoch, dem 10.08.2022 um 00:07 +0200 schrieb Nicolas Graves:
> * gnu/packages/python-check.scm (python-tox): Add variable.
> * gnu/packages/python-xyz.scm (python-tox): Delete variable.
The preferred ChangeLog IIRC is "Move from here..." "... to here."
Otherwise LGTM.

[bug#57092] [PATCH v2 1/2] gnu: python-tox: Move from python-xyz.scm to python-check.scm.

[Nicolas Graves via Guix-patches via]

* (python-tox): Move from gnu/packages/python-xyz.scm to gnu/packages/python-check.scm.
---
 gnu/packages/python-check.scm | 37 +++++++++++++++++++++++++++++++++++
 gnu/packages/python-xyz.scm   | 37 -----------------------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 20ab26facf..5d6cf49c50 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2424,3 +2424,40 @@ (define-public python-pycotap
 attachments).
 @end itemize")
     (license license:expat)))
+
+(define-public python-tox
+  (package
+    (name "python-tox")
+    (version "3.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tox" version))
+       (sha256
+        (base32
+         "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
+    (build-system python-build-system)
+    (arguments
+     ;; FIXME: Tests require pytest-timeout, which itself requires
+     ;; pytest>=2.8.0 for installation.
+     '(#:tests? #f))
+    (propagated-inputs
+     (list python-filelock
+           python-packaging
+           python-pluggy
+           python-py
+           python-six
+           python-toml
+           python-virtualenv))
+    (native-inputs
+     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
+      python-pytest ; >= 2.3.5
+      python-setuptools-scm))
+    (home-page "https://tox.readthedocs.io")
+    (synopsis "Virtualenv-based automation of test activities")
+    (description "Tox is a generic virtualenv management and test command line
+tool.  It can be used to check that a package installs correctly with
+different Python versions and interpreters, or run tests in each type of
+supported environment, or act as a frontend to continuous integration
+servers.")
+    (license license:expat)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f6b986d4e8..b049cded13 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14739,43 +14739,6 @@ (define-public python-deprecation
 that deprecated code is eventually removed.")
     (license license:asl2.0)))
 
-(define-public python-tox
-  (package
-    (name "python-tox")
-    (version "3.20.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "tox" version))
-       (sha256
-        (base32
-         "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
-    (build-system python-build-system)
-    (arguments
-     ;; FIXME: Tests require pytest-timeout, which itself requires
-     ;; pytest>=2.8.0 for installation.
-     '(#:tests? #f))
-    (propagated-inputs
-     (list python-filelock
-           python-packaging
-           python-pluggy
-           python-py
-           python-six
-           python-toml
-           python-virtualenv))
-    (native-inputs
-     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
-           python-pytest ; >= 2.3.5
-           python-setuptools-scm))
-    (home-page "https://tox.readthedocs.io")
-    (synopsis "Virtualenv-based automation of test activities")
-    (description "Tox is a generic virtualenv management and test command line
-tool.  It can be used to check that a package installs correctly with
-different Python versions and interpreters, or run tests in each type of
-supported environment, or act as a frontend to continuous integration
-servers.")
-    (license license:expat)))
-
 (define-public python-jmespath
   (package
    (name "python-jmespath")
-- 
2.37.1

[bug#57092] [PATCH v2 2/2] gnu: python-tox: Add native-inputs and enable tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-tox): Add native-inputs and enable
tests.
---
 gnu/packages/python-check.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5d6cf49c50..2a54fabd99 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2437,10 +2437,6 @@ (define-public python-tox
         (base32
          "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
     (build-system python-build-system)
-    (arguments
-     ;; FIXME: Tests require pytest-timeout, which itself requires
-     ;; pytest>=2.8.0 for installation.
-     '(#:tests? #f))
     (propagated-inputs
      (list python-filelock
            python-packaging
@@ -2450,9 +2446,11 @@ (define-public python-tox
            python-toml
            python-virtualenv))
     (native-inputs
-     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
-      python-pytest ; >= 2.3.5
-      python-setuptools-scm))
+     (list python-flaky
+           python-pathlib2
+           python-pytest-timeout
+           python-pytest
+           python-setuptools-scm))
     (home-page "https://tox.readthedocs.io")
     (synopsis "Virtualenv-based automation of test activities")
     (description "Tox is a generic virtualenv management and test command line
-- 
2.37.1

[bug#57092] repairing tox

[Mathieu Othacehe]

Hello,

> -     '(#:tests? #f))

Nice! It seems that no tests are run though, any idea why?

--8<---------------cut here---------------start------------->8---
adding license file 'LICENSE'
writing manifest file 'src/tox.egg-info/SOURCES.txt'
running build_ext

----------------------------------------------------------------------
Ran 0 tests in 0.000s

OK
--8<---------------cut here---------------end--------------->8---

Thanks,

Mathieu

[bug#57092] [PATCH v3 1/2] gnu: python-tox: Move from python-xyz.scm to python-check.scm.

[Nicolas Graves via Guix-patches via]

* (python-tox): Move from gnu/packages/python-xyz.scm to gnu/packages/python-check.scm.
---
 gnu/packages/python-check.scm | 37 +++++++++++++++++++++++++++++++++++
 gnu/packages/python-xyz.scm   | 37 -----------------------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 20ab26facf..5d6cf49c50 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2424,3 +2424,40 @@ (define-public python-pycotap
 attachments).
 @end itemize")
     (license license:expat)))
+
+(define-public python-tox
+  (package
+    (name "python-tox")
+    (version "3.20.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tox" version))
+       (sha256
+        (base32
+         "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
+    (build-system python-build-system)
+    (arguments
+     ;; FIXME: Tests require pytest-timeout, which itself requires
+     ;; pytest>=2.8.0 for installation.
+     '(#:tests? #f))
+    (propagated-inputs
+     (list python-filelock
+           python-packaging
+           python-pluggy
+           python-py
+           python-six
+           python-toml
+           python-virtualenv))
+    (native-inputs
+     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
+      python-pytest ; >= 2.3.5
+      python-setuptools-scm))
+    (home-page "https://tox.readthedocs.io")
+    (synopsis "Virtualenv-based automation of test activities")
+    (description "Tox is a generic virtualenv management and test command line
+tool.  It can be used to check that a package installs correctly with
+different Python versions and interpreters, or run tests in each type of
+supported environment, or act as a frontend to continuous integration
+servers.")
+    (license license:expat)))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f6b986d4e8..b049cded13 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -14739,43 +14739,6 @@ (define-public python-deprecation
 that deprecated code is eventually removed.")
     (license license:asl2.0)))
 
-(define-public python-tox
-  (package
-    (name "python-tox")
-    (version "3.20.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "tox" version))
-       (sha256
-        (base32
-         "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
-    (build-system python-build-system)
-    (arguments
-     ;; FIXME: Tests require pytest-timeout, which itself requires
-     ;; pytest>=2.8.0 for installation.
-     '(#:tests? #f))
-    (propagated-inputs
-     (list python-filelock
-           python-packaging
-           python-pluggy
-           python-py
-           python-six
-           python-toml
-           python-virtualenv))
-    (native-inputs
-     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
-           python-pytest ; >= 2.3.5
-           python-setuptools-scm))
-    (home-page "https://tox.readthedocs.io")
-    (synopsis "Virtualenv-based automation of test activities")
-    (description "Tox is a generic virtualenv management and test command line
-tool.  It can be used to check that a package installs correctly with
-different Python versions and interpreters, or run tests in each type of
-supported environment, or act as a frontend to continuous integration
-servers.")
-    (license license:expat)))
-
 (define-public python-jmespath
   (package
    (name "python-jmespath")
-- 
2.37.2

[bug#57092] [PATCH v3 2/2] gnu: python-tox: Add native-inputs and enable tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/python-check.scm (python-tox): Add native-inputs and enable
tests.
---
 gnu/packages/python-check.scm | 45 ++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5d6cf49c50..a5eb06f249 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2438,9 +2438,40 @@ (define-public python-tox
          "0nk0nyzhzamcrvn0qqzzy54isxxqwdi28swml7a2ym78c3f9sqpb"))))
     (build-system python-build-system)
     (arguments
-     ;; FIXME: Tests require pytest-timeout, which itself requires
-     ;; pytest>=2.8.0 for installation.
-     '(#:tests? #f))
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (if tests?
+                 (invoke
+                  "pytest" "-vv"
+                  "-k"
+                  (string-append
+                   "not test_invocation_error "
+                   "and not test_create_KeyboadInterrupt "
+                   "and not test_exit_code "
+                   "and not test_tox_get_python_executable "
+                   "and not test_find_alias_on_path "
+                   "and not test_get_executable "
+                   "and not test_get_executable_no_exist "
+                   "and not test_get_sitepackagesdir_error "
+                   "and not test_spinner_stdout_not_unicode "
+                   "and not test_provision_non_canonical_dep "
+                   "and not test_package_setuptools "
+                   "and not test_package_poetry "
+                   "and not test_parallel_interrupt "
+                   "and not test_provision_missing "
+                   "and not test_provision_from_pyvenv "
+                   "and not test_provision_interrupt_child "
+                   "and not test_create "
+                   "and not test_run_custom_install_command "
+                   "and not test_toxuone_env "
+                   "and not test_different_config_cwd "
+                   "and not test_test_usedevelop "
+                   "and not test_build_backend_without_submodule "
+                   "and not test_parallel "
+                   "and not test_parallel_live "
+                   "and not test_tox_env_var_flags_inserted_isolated "))))))))
     (propagated-inputs
      (list python-filelock
            python-packaging
@@ -2450,9 +2481,11 @@ (define-public python-tox
            python-toml
            python-virtualenv))
     (native-inputs
-     (list ; FIXME: Missing: ("python-pytest-timeout" ,python-pytest-timeout)
-      python-pytest ; >= 2.3.5
-      python-setuptools-scm))
+     (list python-flaky
+           python-pathlib2
+           python-pytest-timeout
+           python-pytest
+           python-setuptools-scm))
     (home-page "https://tox.readthedocs.io")
     (synopsis "Virtualenv-based automation of test activities")
     (description "Tox is a generic virtualenv management and test command line
-- 
2.37.2

[bug#57092] [PATCH v3 2/2] gnu: python-tox: Add native-inputs and enable tests.

[Nicolas Graves via Guix-patches via]

Hi!

A quick note on this patch: you were right, tests were not managed
through setup.py.

Using pytest, I've found quite some failing tests. I haven't tried to
fix them (don't have time for this right now), but they are listed
here. That may seem a lot, but failing tests are a minority (~12%) of
all tests, and most of them are failing with similar error messages.

-- 
Best regards,
Nicolas Graves

[bug#57092] repairing tox

[Ludovic Courtès]

Hi,

Mathieu & Liliana: should these patches be applied?

Thanks in advance,
Ludo’.

Nicolas Graves <ngraves@ngraves.fr> skribis:

> Hi!
>
> A quick note on this patch: you were right, tests were not managed
> through setup.py.
>
> Using pytest, I've found quite some failing tests. I haven't tried to
> fix them (don't have time for this right now), but they are listed
> here. That may seem a lot, but failing tests are a minority (~12%) of
> all tests, and most of them are failing with similar error messages.

[bug#57092] repairing tox

[Liliana Marie Prikler]

Am Mittwoch, dem 31.08.2022 um 23:27 +0200 schrieb Ludovic Courtès:
> Hi,
> 
> Mathieu & Liliana: should these patches be applied?
The ChangeLog of the first patch needs to be rewritten to:

* gnu/packages/python-xyz.scm (python-tox): Move from here...
* gnu/packages/python-check.scm (python-tox): ... to here.

Other than that, if python-tox builds after applying the second patch,
I'd say it's good to go.

Cheers

[bug#57092] repairing tox

[Ludovic Courtès]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> The ChangeLog of the first patch needs to be rewritten to:
>
> * gnu/packages/python-xyz.scm (python-tox): Move from here...
> * gnu/packages/python-check.scm (python-tox): ... to here.
>
> Other than that, if python-tox builds after applying the second patch,
> I'd say it's good to go.

OK.  Could you apply it and adjust the commit log accordingly then?

I think we shouldn’t block contributions for small commit log edits.

Thanks,
Ludo’.

bug#57092: repairing tox

[Liliana Marie Prikler]

Am Donnerstag, dem 01.09.2022 um 10:54 +0200 schrieb Ludovic Courtès:
> OK.  Could you apply it and adjust the commit log accordingly then?
> 
> I think we shouldn’t block contributions for small commit log edits.
My intention was to have someone else push it, as I'm currently doing a
pretty large c-u build, but I managed to build python-tox in parallel
without issue.

Besides the ChangeLog, I also converted tox' arguments to G-
Expressions, used when rather than if, and simplified the test filter.

Cheers