gnu: poetry: Update to 1.1.12.

* gnu/packages/python-xyz.scm (poetry): Update to 1.1.12.
[phases]{patch-setup-py}: Relax packaging version requirement.
[propagated-inputs]{python-msgpack-transitional}: Replace with...
{python-msgpack}: ... this.
{python-requests-toolbelt-0.9.1}: Replace with...
{python-requests-toolbelt}: ... this.
{python-msgpack-transitional}: Delete variable.
This commit is contained in:
Maxim Cournoyer 2021-12-17 12:10:02 -05:00
parent 08769d0bce
commit 01a01c88f8
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -10788,32 +10788,6 @@ (define-public python-msgpack
(home-page "https://pypi.org/project/msgpack/") (home-page "https://pypi.org/project/msgpack/")
(license license:asl2.0))) (license license:asl2.0)))
;; This msgpack library's name changed from "python-msgpack" to "msgpack" with
;; release 0.5. Some packages like borg still call it by the old name for now.
;; <https://bugs.gnu.org/30662>
(define-public python-msgpack-transitional
(package
(inherit python-msgpack)
(name "python-msgpack-transitional")
(version "0.5.6")
(source (origin
(method url-fetch)
(uri (pypi-uri "msgpack" version))
(sha256
(base32
"1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f"))))
(arguments
(substitute-keyword-arguments (package-arguments python-msgpack)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'configure-transitional
(lambda _
;; Keep using the old name.
(substitute* "setup.py"
(("TRANSITIONAL = False")
"TRANSITIONAL = 1"))
#t))))))))
(define-public python-netaddr (define-public python-netaddr
(package (package
(name "python-netaddr") (name "python-netaddr")
@ -15918,29 +15892,25 @@ (define-public python-cachy
(define-public poetry (define-public poetry
(package (package
(name "poetry") (name "poetry")
(version "1.1.11") (version "1.1.12")
;; Poetry can only be built from source with Poetry.
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "poetry" version)) (uri (pypi-uri "poetry" version))
(sha256 (sha256
(base32 (base32
"17pnf2j4adlm9fhyg5jkkvs8bzcigb6nj72vr0687fxybzsj4zbx")))) "0rr54mvcfcv9cv6vw2122y28xvd2pwqpv2x8c8j5ayz3gwsy4rjw"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ;; Pypi does not have tests. `(#:tests? #f ;PyPI does not have tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'patch-setup-py (add-before 'build 'patch-setup-py
(lambda _ (lambda _
(substitute* "setup.py" (substitute* "setup.py"
;; Allow newer versions of python-keyring. ;; Relax some of the requirements.
(("(keyring>=21.2.0),<22.0.0" _ keyring) keyring) (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring)
;; TODO: remove after the next release cycle, (("(packaging>=20.4),<21.0" _ packaging) packaging)))))))
;; when packaging has been updated.
(("packaging>=20.4,<21.0") "packaging>=20.0,<21.0"))
#t)))))
(propagated-inputs (propagated-inputs
(list python-cachecontrol (list python-cachecontrol
python-cachy python-cachy
@ -15948,14 +15918,14 @@ (define-public poetry
python-clikit python-clikit
python-html5lib python-html5lib
python-keyring python-keyring
python-msgpack-transitional python-msgpack
python-packaging python-packaging
python-pexpect python-pexpect
python-pip python-pip
python-pkginfo python-pkginfo
python-poetry-core python-poetry-core
python-requests python-requests
python-requests-toolbelt-0.9.1 python-requests-toolbelt
python-shellingham python-shellingham
python-tomlkit python-tomlkit
python-virtualenv)) python-virtualenv))