gnu: vdirsyncer: Update to 0.19.0.

* gnu/packages/dav.scm (vdirsyncer): Update to 0.19.0.
[arguments]: Remove trailing #t in phases. Remove phase generating the
manpage.
[native-inputs]: Add python-aioresponses, python-click, python-trustme,
python-pytest-asyncio, python-pytest-cov, python-pytest-httpserver.
Remove python-pytest-localserver, python-pytest-subtesthack,
python-urllib3, python-wsgi-interpreter.
[inputs]: Remove field.
[propagated-inputs]: Add python-aiohttp, python-aiostream. Remove
python-click-threading.
* gnu/packages/python-xyz.scm (python-click-5): Remove variable.
This commit is contained in:
Efraim Flashner 2022-12-06 11:12:15 +02:00
parent ed18b697c4
commit f635f72577
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 15 additions and 36 deletions

View file

@ -122,14 +122,13 @@ (define-public xandikos
(define-public vdirsyncer
(package
(name "vdirsyncer")
;; When updating, check whether python-click-5 can be removed entirely.
(version "0.18.0")
(version "0.19.0")
(source (origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
"00f2bw1a2jbbd1sbci0swnd67kylr341aa9rpbxkajbp3zakxg17"))))
"0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ; The test suite is very flakey.
@ -141,38 +140,30 @@ (define-public vdirsyncer
(setenv "DAV_SERVER" "radicale")
(setenv "REMOTESTORAGE_SERVER" "skip")
(if tests?
(invoke "make" "test")
#t)))
(invoke "make" "test"))))
(add-after 'unpack 'patch-version-call
(lambda _
(substitute* "docs/conf.py"
(("^release.*") (string-append "release = '" ,version "'\n")))
#t))
(add-after 'install 'manpage
(lambda* (#:key inputs outputs #:allow-other-keys)
(invoke "make" "--directory=docs/" "man")
(install-file
"docs/_build/man/vdirsyncer.1"
(string-append
(assoc-ref outputs "out")
"/share/man/man1"))
#t)))))
(("^release.*") (string-append "release = '" ,version "'\n"))))))))
(native-inputs
(list python-setuptools-scm
python-sphinx
;; Required for testing
python-aioresponses
python-hypothesis
python-trustme
python-pytest
python-pytest-localserver
python-pytest-subtesthack
python-urllib3
python-wsgi-intercept
python-pytest-asyncio
python-pytest-cov
python-pytest-httpserver
radicale))
(inputs
(list ;; XXX https://github.com/mitsuhiko/click/issues/200
python-click-5))
(propagated-inputs
(list python-atomicwrites python-click-log python-click-threading
(list python-aiohttp
python-aiostream
python-atomicwrites
python-click
python-click-log
python-requests
python-requests-toolbelt))
(synopsis "Synchronize calendars and contacts")
(description "Vdirsyncer synchronizes your calendars and addressbooks

View file

@ -3671,18 +3671,6 @@ (define-public python-click-7
(base32 "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"))))
(arguments `())))
(define-public python-click-5
(package (inherit python-click)
(name "python-click")
(version "5.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "click" version))
(sha256
(base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337"))))
(arguments `())))
(define-public python-cligj
(package
(name "python-cligj")