all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: 63139@debbugs.gnu.org
Cc: John Kehayias <john.kehayias@protonmail.com>
Subject: [bug#63139] [PATCH python 15/20] gnu: poetry: Fix build.
Date: Fri, 28 Apr 2023 05:51:33 +0000	[thread overview]
Message-ID: <a7bf6fc566e492e93b4b01c78bbf7e5f2d9e3a32.1682660105.git.john.kehayias@protonmail.com> (raw)
In-Reply-To: <cover.1682660104.git.john.kehayias@protonmail.com>

* gnu/packages/python-xyz.scm (poetry)[build-system]: Switch to
pyproject-build-system.
[arguments]{phases}: New phase 'loosen-requirements' to fix build and avoid
circular dependency.
{test-flags}: Disable failing tests.
[propagated-inputs]: Remove python-pip.  Add python-dulwich, python-installer,
python-jsonschema, python-platfromdirs, python-pypa-build,
python-pyproject-hooks, python-tomli, and python-trove-classifiers.
[native-inputs]: Add python-deepdiff, python-httpretty, python-pytest,
python-pytest-mock, and python-pytest-xdist.
---
 gnu/packages/python-xyz.scm | 62 ++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8b61cba8ae..cbe3bb1094 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18144,37 +18144,75 @@ (define-public poetry
        (sha256
         (base32
          "0g0vczn6qa4b2bdkq4k7fm1g739vyxp2iiblwwsrcmw24jj81m8b"))))
-    (build-system python-build-system)
+    (build-system pyproject-build-system)
     (arguments
-     `(#:tests? #f                      ;PyPI does not have tests
-       ;; #:phases
-       ;; (modify-phases %standard-phases
-       ;;   (add-before 'build 'patch-setup-py
-       ;;     (lambda _
-       ;;       (substitute* "setup.py"
-       ;;         ;; Relax some of the requirements.
-       ;;         (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring)
-       ;;         (("(packaging>=20.4),<21.0" _ packaging) packaging)))))
-       ))
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'loosen-requirements
+                 (lambda _
+                   (substitute* "pyproject.toml"
+                     ;; Permit newer versions of platformdirs.
+                     (("platformdirs =.*") "platformdirs = \"^3.0.0\"\n")
+                     ;; Our python-trove-classifiers reports the wrong version.
+                     (("trove-classifiers =.*") "trove-classifiers = \"*\"\n")
+                     ;; Avoid circular dependency by not including the export
+                     ;; plugin requirement.  See
+                     ;; <https://github.com/python-poetry/poetry/pull/5980>
+                     ;; and
+                     ;; <https://github.com/python-poetry/poetry/issues/6441>
+                     ;; for upstream status in resolving this cycle.
+                     (("poetry-plugin-export.*") "")))))
+           #:test-flags
+           '(let ((disabled-tests
+                   ;; The following tests currently fail, requiring network
+                   ;; connectivity and/or trying to write in the build
+                   ;; environment.
+                   ;; TODO: Some of these might be worked around.
+                   (list "test_shell"
+                         (string-append "test_build_backend_errors_are_"
+                                        "reported_correctly_if_caused_by_subprocess")
+                         "test_prepare_sdist"
+                         (string-append "test_executor_should_write_"
+                                        "pep610_url_references_for_non_wheel_files")
+                         "test_uninstall_git_package_nspkg_pth_cleanup"
+                         "test_builder_setup_generation_runs_with_pip_editable"
+                         "test_prepare_directory"
+                         "test_prepare_directory_with_extensions"
+                         "test_prepare_directory_editable")))
+              (list "-k" (string-append "not "
+                                        (string-join disabled-tests
+                                                     " and not "))))))
     (propagated-inputs
      (list python-cachecontrol
            python-cachy
            python-cleo
            python-crashtest
+           python-dulwich
            python-entrypoints
            python-html5lib
+           python-installer
+           python-jsonschema
            python-keyring
            python-msgpack
            python-packaging
            python-pexpect
-           python-pip
            python-pkginfo
+           python-platformdirs
+           python-pypa-build
            python-poetry-core
+           python-pyproject-hooks
            python-requests
            python-requests-toolbelt
            python-shellingham
+           python-tomli
            python-tomlkit
+           python-trove-classifiers
            python-virtualenv))
+    (native-inputs (list python-deepdiff
+                         python-httpretty
+                         python-pytest
+                         python-pytest-mock
+                         python-pytest-xdist))
     (home-page "https://python-poetry.org")
     (synopsis "Python dependency management and packaging made easy")
     (description "Poetry is a tool for dependency management and packaging
--
2.39.2






  parent reply	other threads:[~2023-04-28  6:09 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-28  5:44 [bug#63139] [PATCH python 00/20] Updates for pyproject-build-system, poetry, python-yubikey-manager John Kehayias via Guix-patches via
2023-04-28  5:49 ` [bug#63139] [PATCH python 01/20] gnu: Add python-installer John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 02/20] gnu: Add python-pyproject-hooks John Kehayias via Guix-patches via
2023-05-01  6:58   ` Lars-Dominik Braun
2023-05-04 22:04     ` John Kehayias via Guix-patches via
2023-05-08  8:44       ` Lars-Dominik Braun
2023-05-25  3:23         ` John Kehayias via Guix-patches via
2023-05-25 17:53           ` Lars-Dominik Braun
2023-04-28  5:50 ` [bug#63139] [PATCH python 03/20] gnu: Add python-rapidfuzz John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 04/20] gnu: python-crashtest: Update to 0.4.1 John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 05/20] gnu: python-cleo: Update to 2.0.1 John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 06/20] gnu: Add python-deepdiff John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 07/20] gnu: python-platformdirs: Update to 3.2.0 John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 08/20] gnu: python-filelock: Update to 3.12.0 John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 09/20] gnu: python-distlib: Update to 0.3.6 John Kehayias via Guix-patches via
2023-04-28  5:50 ` [bug#63139] [PATCH python 10/20] gnu: python-virtualenv: Update to 20.22.0 John Kehayias via Guix-patches via
2023-04-28  5:51 ` [bug#63139] [PATCH python 11/20] gnu: python-pkginfo: Update to 1.9.6 John Kehayias via Guix-patches via
2023-04-28  5:51 ` [bug#63139] [PATCH python 12/20] gnu: python-jsonschema: Update to 4.17.3 John Kehayias via Guix-patches via
2023-04-28  5:51 ` [bug#63139] [PATCH python 13/20] gnu: python-dulwich: Update to 0.21.3 John Kehayias via Guix-patches via
2023-04-28  5:51 ` [bug#63139] [PATCH python 14/20] gnu: Update python-pypa-build to 1.0.0 John Kehayias via Guix-patches via
2023-04-28  5:51 ` John Kehayias via Guix-patches via [this message]
2023-04-28  5:51 ` [bug#63139] [PATCH python 16/20] gnu: Add python-poetry-plugin-export John Kehayias via Guix-patches via
2023-04-28  5:51 ` [bug#63139] [PATCH python 17/20] gnu: python-pyscard: Update to 2.0.7 John Kehayias via Guix-patches via
2023-04-28  5:51 ` [bug#63139] [PATCH python 18/20] gnu: python-fido2: Update to 1.1.1 and enable tests John Kehayias via Guix-patches via
2023-04-28  5:52 ` [bug#63139] [PATCH python 19/20] gnu: Add python-makefun John Kehayias via Guix-patches via
2023-04-28  5:52 ` [bug#63139] [PATCH python 20/20] gnu: python-yubikey-manager: Update to 5.1.0 and enable tests John Kehayias via Guix-patches via
2024-02-02 20:43 ` [bug#63139] [PATCH python 00/20] Updates for pyproject-build-system, poetry, python-yubikey-manager Sharlatan Hellseher
2024-02-14 18:41 ` John Kehayias via Guix-patches via
2024-02-16 12:44   ` Lars-Dominik Braun
  -- strict thread matches above, loose matches on Subject: below --
2023-06-22  7:06 poetry not building Reza Housseini
2023-06-22  7:06 ` [bug#63139] " Reza Housseini
2023-06-22 20:28 ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-06-22 20:52   ` Reza Housseini
2023-06-23  6:49 ` Lars-Dominik Braun
2023-07-31 16:02   ` John Kehayias

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a7bf6fc566e492e93b4b01c78bbf7e5f2d9e3a32.1682660105.git.john.kehayias@protonmail.com \
    --to=guix-patches@gnu.org \
    --cc=63139@debbugs.gnu.org \
    --cc=john.kehayias@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.