* [bug#70858] [PATCH python-team v2 17/32] build-system/pyproject: Remove python-tox native-input.
` (4 preceding siblings ...)
2024-06-01 15:36 72% ` [bug#70858] [PATCH python-team v2 11/32] build-system/pyproject: Remove python-coveralls native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 62% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 63% ` [bug#70858] [PATCH python-team v2 18/32] build-system/pyproject: Remove python-mypy native-input Nicolas Graves via Guix-patches via
` (9 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/check.scm (python-pytest-regressions)[native-inputs]:
Remove python-tox.
* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-tox.
* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-tox.
* gnu/packages/logging.scm (tailon)[native-inputs]: Remove python-tox.
* gnu/packages/messaging.scm (python-harmony)[native-inputs]: Remove
python-tox.
* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]: Remove
python-tox.
* gnu/packages/python-web.scm (python-omnipath,
python-sanic)[native-inputs]: Remove python-tox.
* gnu/packages/python-xyz.scm (python-lunr, python-bidict,
python-jsonargparse, python-ddlparse, python-virtualenv-clone,
python-honcho, python-pdfminer-six, python-shshsh,
python-marshmallow-jsonapi, python-apispec-webframeworks, bpython,
python-loguru, python-ansicolors)[native-inputs]: Remove python-tox.
* gnu/packages/radio.scm (chirp)[native-inputs]: Remove python-tox.
* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-tox.
Change-Id: I39dadb40a73ad1c64ba8b9ef9d1b3fe7d1498b5a
---
gnu/packages/check.scm | 1 -
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/logging.scm | 2 +-
gnu/packages/messaging.scm | 2 --
gnu/packages/python-check.scm | 1 -
gnu/packages/python-web.scm | 2 --
gnu/packages/python-xyz.scm | 27 ++++++++-------------------
gnu/packages/radio.scm | 3 +--
gnu/packages/terminals.scm | 5 ++---
10 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b7116b3f0e2..6042f763f15 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3675,7 +3675,6 @@ (define-public python-pytest-regressions
python-pandas
python-pillow
python-restructuredtext-lint
- python-tox
python-setuptools-scm
python-pytest))
(home-page "https://github.com/ESSS/pytest-regressions")
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 67567a6b310..bfe4ce99fdc 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -273,7 +273,6 @@ (define-public reprotest
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
("python-tlsh" ,python-tlsh)
- ("python-tox" ,python-tox)
("unzip" ,unzip)
("xxd" ,xxd)))
(build-system python-build-system)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 298968d37c6..f5b1e0462bb 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -260,7 +260,6 @@ (define-public python-django-extensions
(native-inputs
(list python-mock
python-factory-boy
- python-tox
python-pytest
python-pytest-cov
python-pytest-django
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index a757c22154f..3c593001d00 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -134,7 +134,7 @@ (define-public tailon
"0xkmrivzilsc9wqr8ms67v7399gxnh7pv5687k4rdpdgz4309fwc"))))
(build-system python-build-system)
(native-inputs
- (list python-tox python-wheel))
+ (list python-wheel))
(inputs
(list python-pyyaml-5 python-sockjs-tornado python-tornado-http-auth
python-tornado python-deepmerge))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cb72bfb3e25..35ff807e12c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3504,8 +3504,6 @@ (define-public python-harmony
(base32
"1bm9xcnzpnpj6rlhbrnl2abwclzl7ivgh1vb5644y9mnhcs489js"))))
(build-system python-build-system)
- (native-inputs
- (list python-tox))
(inputs
(list python-librecaptcha python-keyring python-requests))
(synopsis "Discord account management")
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index ed3625421ae..8fd3a8924f1 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -419,7 +419,6 @@ (define-public python-vcrpy
python-pytest
python-pytest-cov
python-pytest-httpbin
- python-tox
python-urllib3))
(home-page "https://github.com/kevin1024/vcrpy")
(synopsis "Automatically mock your HTTP interactions")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8265ef41aff..51753adae77 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2134,7 +2134,6 @@ (define-public python-omnipath
python-pytest-socket
python-requests-mock
python-setuptools-scm
- python-tox
python-setuptools
python-wheel))
(home-page "https://omnipathdb.org/")
@@ -7640,7 +7639,6 @@ (define-public python-sanic
python-setuptools
python-slotscheck
python-towncrier
- python-tox
python-types-ujson
python-uvicorn
python-wheel))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 446326afc74..c83146372bf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1308,8 +1308,7 @@ (define-public python-lunr
(list python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
- python-pytest-timeout
- python-tox))
+ python-pytest-timeout))
(propagated-inputs
(list python-importlib-metadata python-typing-extensions))
(home-page
@@ -2695,8 +2694,7 @@ (define-public python-bidict
python-sortedcollections
python-sortedcontainers
python-sphinx
- python-sphinx-autodoc-typehints
- python-tox))
+ python-sphinx-autodoc-typehints))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'relax-reqs
@@ -4513,7 +4511,6 @@ (define-public python-jsonargparse
python-pytest
python-pytest-subtests
python-responses
- python-tox
python-types-requests
python-setuptools
python-wheel))
@@ -5677,7 +5674,6 @@ (define-public python-ddlparse
(list python-pytest
python-pytest-cov
python-setuptools
- python-tox
python-wheel))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/shinichi-takii/ddlparse")
@@ -6219,7 +6215,6 @@ (define-public python-virtualenv-clone
(delete-file "tox.ini")
(invoke "pytest" "-vvv" "tests")))))))
(native-inputs (list python-pytest
- python-tox
python-virtualenv
python-wheel
python-tomli
@@ -11342,7 +11337,7 @@ (define-public python-honcho
(base32 "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-mock python-tox which)) ;for tests
+ (list python-pytest python-mock which)) ;for tests
(propagated-inputs
(list python-jinja2))
(arguments
@@ -20129,7 +20124,7 @@ (define-public python-pdfminer-six
(propagated-inputs
(list python-chardet python-cryptography python-sortedcontainers))
(native-inputs
- (list python-nose python-tox))
+ (list python-nose))
(home-page "https://github.com/pdfminer/pdfminer.six")
(synopsis "PDF parser and analyzer")
(description "@code{pdfminer.six} is a community maintained fork of
@@ -21276,9 +21271,7 @@ (define-public python-shshsh
"1wzqyj1a6jj6cyv5ymzy834qm2lyq80yy1kfz0q0zayq9gm1cj7f"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-poetry-core
- python-pytest
- python-tox))
+ (list python-poetry-core python-pytest))
(home-page "https://github.com/zqqqqz2000/shshsh")
(synopsis "Write Shell commands simply and safely within Python")
(description "This package provides a way to write Shell commands from
@@ -25144,8 +25137,7 @@ (define-public python-marshmallow-jsonapi
python-flake8-bugbear
python-flask
python-mock
- python-pytest
- python-tox))
+ python-pytest))
(home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
(synopsis "JSON:API 1.0 formatting with Marshmallow")
(description
@@ -25209,7 +25201,6 @@ (define-public python-apispec-webframeworks
python-pytest
python-pyyaml
python-tornado
- python-tox
python-wheel))
(home-page "https://github.com/marshmallow-code/apispec-webframeworks")
(synopsis "Web framework plugins for apispec")
@@ -26667,7 +26658,7 @@ (define-public bpython
python-watchdog
python-jedi))
(native-inputs
- (list python-sphinx python-mock python-tox python-wheel))
+ (list python-sphinx python-mock python-wheel))
(home-page "https://bpython-interpreter.org/")
(synopsis "Fancy interface to the Python interpreter")
(description "Bpython is a fancy interface to the Python
@@ -32933,7 +32924,6 @@ (define-public python-loguru
python-sphinx
python-sphinx-autobuild
python-sphinx-rtd-theme
- python-tox
python-setuptools
python-wheel))
(home-page "https://github.com/Delgan/loguru")
@@ -35290,8 +35280,7 @@ (define-public python-ansicolors
(base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr"))))
(build-system python-build-system)
(native-inputs
- (list python-tox
- python-pytest-cov
+ (list python-pytest-cov
unzip))
(home-page "https://github.com/jonathaneunice/colors/")
(synopsis "ANSI colors for Python")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 56e674a8edc..bfd601564d8 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3171,8 +3171,7 @@ (define-public chirp
python-pep8
python-pytest
python-pytest-mock
- python-pyyaml
- python-tox))
+ python-pyyaml))
(inputs
(list python-future
python-importlib-resources
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index e424e41a222..d61dc6cb3c7 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1199,7 +1199,6 @@ (define-public python-halo
(native-inputs
(list python-nose
python-setuptools
- python-tox
python-twine
python-wheel))
(home-page "https://github.com/manrajgrover/halo")
@@ -1228,7 +1227,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
(description "This package provides a Python library with graphical symbols
@@ -1255,7 +1254,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
(description "Spinners is a Python library that contains graphical spinners
--
2.41.0
^ permalink raw reply related [relevance 62%]
* [bug#70858] [PATCH python-team v2 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input.
` (12 preceding siblings ...)
2024-06-01 15:36 63% ` [bug#70858] [PATCH python-team v2 27/32] build-system/pyproject: Remove python-pytest-black native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:37 67% ` Nicolas Graves via Guix-patches via
2024-06-01 15:37 65% ` [bug#70858] [PATCH python-team v2 29/32] build-system/pyproject: Remove python-pytest-mypy inputs Nicolas Graves via Guix-patches via
2024-06-01 15:37 69% ` [bug#70858] [PATCH python-team v2 30/32] build-system/pyproject: Stop hiding options Nicolas Graves via Guix-patches via
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:37 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/check.scm (python-pytest-enabler, python-pytest-perf):
[native-inputs]: Remove python-pytest-flake8.
* gnu/packages/dav.scm (radicale)[native-inputs]: Remove
python-pytest-flake8.
* gnu/packages/jupyter.scm (python-nbstripout)[native-inputs]:
Remove python-pytest-flake8.
* gnu/packages/python-check.scm (python-pytest-csv):
[arguments]<#:test-flags>: Ignore flake8 test.
[native-inputs]: Remove python-pytest-flake8.
* gnu/packages/python-web.scm (python-mechanicalsoup,
python-tinycss2)[native-inputs]: Remove python-pytest-flake8.
(python-tinycss):
[arguments]<#:test-flags>: Ignore flake8 tests.
[native-inputs]: Remove python-pytest-flake8.
* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-context, python-jaraco-functools,
python-jaraco-packaging, python-jaraco-test, python-path,
python-pip-run, python-inflect, python-tempora, python-cairosvg)
[native-inputs]: Remove python-pytest-flake8.
Change-Id: I60ad04391d1c4b081e3293d50b3ac93c6430c7bf
---
gnu/packages/check.scm | 2 --
gnu/packages/dav.scm | 1 -
gnu/packages/jupyter.scm | 1 -
gnu/packages/python-check.scm | 5 +++--
gnu/packages/python-web.scm | 10 ++++------
gnu/packages/python-xyz.scm | 13 +------------
6 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f8ead8df4e4..e8f121e9fe9 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2492,7 +2492,6 @@ (define-public python-pytest-enabler
python-toml))
(native-inputs (list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -2665,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 99284220846..b5a1ba749d8 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-flake8
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 1745cd1f491..18b9c8db522 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -849,7 +849,6 @@ (define-public python-nbstripout
(native-inputs
(list python-pytest
python-pytest-cram
- python-pytest-flake8
python-pytest-runner
python-setuptools
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 4643ce91e2e..e9903c89166 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -214,9 +214,10 @@ (define-public python-pytest-csv
(base32
"17518f2fn5l98lyk9p8r7215c1whi61imzrh6ahrmcksr8w0zz04"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:test-flags '(list "--ignore=tests/test_flake8.py")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-xdist
+ (list python-pytest-xdist
python-setuptools
python-tabulate
python-wheel))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 98dc11a9e48..93f8394ee98 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1579,8 +1579,7 @@ (define-public python-mechanicalsoup
(propagated-inputs
(list python-beautifulsoup4 python-lxml python-requests python-six))
(native-inputs
- (list python-pytest-flake8
- python-pytest-httpbin
+ (list python-pytest-httpbin
python-pytest-mock
python-pytest-runner
python-requests-mock
@@ -5860,10 +5859,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not ISORT and not test_speedups")))
+ '(list "-k" "not ISORT and not FLAKE8 and not test_speedups")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-runner
+ (list python-pytest-runner
python-setuptools
python-wheel))
(home-page "https://tinycss.readthedocs.io/")
@@ -5906,7 +5904,7 @@ (define-public python-tinycss2
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8dd5bf2e9e3..88bea23d3b3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11533,7 +11533,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
@@ -11661,7 +11660,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11752,7 +11750,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11785,7 +11782,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11815,7 +11811,6 @@ (define-public python-jaraco-packaging
(propagated-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-rst.linker
python-setuptools
python-setuptools-scm
@@ -11845,7 +11840,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
@@ -16514,7 +16508,6 @@ (define-public python-path
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden?
(package-properties
@@ -16618,7 +16611,6 @@ (define-public python-pip-run
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21053,7 +21045,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
;; For the version number
python-setuptools-scm
@@ -25901,7 +25892,6 @@ (define-public python-tempora
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-freezegun
python-pytest-mypy
python-setuptools-scm
@@ -29574,8 +29564,7 @@ (define-public python-cairosvg
(list python-cairocffi python-cssselect2 python-defusedxml
python-pillow python-tinycss2))
(native-inputs
- (list python-pytest-flake8
- python-pytest-isort
+ (list python-pytest-isort
python-pytest-runner
python-setuptools
python-wheel))
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#70858] [PATCH python-team v2 11/32] build-system/pyproject: Remove python-coveralls native-input.
` (3 preceding siblings ...)
2024-06-01 15:36 70% ` [bug#70858] [PATCH python-team v2 10/32] gnu: python-openid: Remove python-coverage native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 72% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 62% ` [bug#70858] [PATCH python-team v2 17/32] build-system/pyproject: Remove python-tox native-input Nicolas Graves via Guix-patches via
` (10 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/geo.scm (python-cartopy)[native-inputs]: Remove
python-coveralls.
* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coveralls.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-py7zr)[native-inputs]: Remove python-coveralls.
* gnu/packages/python-science.scm (python-trimesh)[native-inputs]:
Remove python-coveralls.
* gnu/packages/python-web.scm (python-flask-combo-jsonapi)
[native-inputs]: Remove python-coveralls.
* gnu/packages/python-xyz.scm (python-affine, python-cftime,
python-ddlparse, python-tasklogger, python-minikanren,
python-arpeggio)[native-inputs]: Remove python-coveralls.
* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coveralls.
* gnu/packages/telegram.scm (tgcli)[native-inputs]: Remove
python-coveralls.
Change-Id: I47b3c21f985175876618f1457b242e6841eb6d3b
---
gnu/packages/geo.scm | 3 +--
gnu/packages/graph.scm | 3 +--
gnu/packages/python-compression.scm | 2 --
gnu/packages/python-science.scm | 3 +--
gnu/packages/python-web.scm | 3 +--
gnu/packages/python-xyz.scm | 12 ++++--------
gnu/packages/syndication.scm | 4 +---
gnu/packages/telegram.scm | 3 +--
8 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 806120e939d..be96e6800a3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1479,8 +1479,7 @@ (define-public python-cartopy
(inputs
(list geos))
(native-inputs
- (list python-coveralls
- python-cython
+ (list python-cython
python-pytest
python-pytest-cov
python-pytest-mpl
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index f83a23dd0be..d66a3676fd2 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coveralls
python-nose
python-nose2
python-pandas
@@ -563,7 +562,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coveralls python-pytest))
+ (list python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index b2d789c92d0..5faf7b2a3cb 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coveralls
python-hypothesis
python-pyannotate
python-pytest
@@ -474,7 +473,6 @@ (define-public python-py7zr
(list python-setuptools
python-wheel
python-setuptools-scm
- python-coveralls
python-libarchive-c
python-py-cpuinfo
python-pyannotate
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index f82feab0963..9301e82bb60 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -653,8 +653,7 @@ (define-public python-trimesh
(("\\$MESH_PRE")
"'$MESH_PRE'")))))))
(native-inputs
- (list python-coveralls
- python-pyinstrument
+ (list python-pyinstrument
python-pytest
python-pytest-cov))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5e585d7b60d..8265ef41aff 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8376,8 +8376,7 @@ (define-public python-flask-combo-jsonapi
python-simplejson
python-six))
(native-inputs
- (list python-coveralls
- python-pytest
+ (list python-pytest
python-pytest-runner))
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
(synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f45f375f38e..b2a5d234eab 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1019,7 +1019,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-coveralls python-pydocstyle
+ (propagated-inputs (list python-pydocstyle
python-pytest python-pytest-cov))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
@@ -3070,7 +3070,6 @@ (define-public python-cftime
(list python-numpy))
(native-inputs
(list python-check-manifest
- python-coveralls
python-cython
python-pytest-cov
python-sphinx
@@ -5678,7 +5677,6 @@ (define-public python-ddlparse
(build-system pyproject-build-system)
(native-inputs
(list python-codecov
- python-coveralls
python-pytest
python-pytest-cov
python-setuptools
@@ -16027,7 +16025,7 @@ (define-public python-tasklogger
(base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-deprecated))
- (native-inputs (list python-coveralls python-nose2
+ (native-inputs (list python-nose2
python-numpy python-setuptools python-wheel))
(home-page "https://github.com/scottgigante/tasklogger")
(synopsis "Extension to the core Python logging library")
@@ -34103,8 +34101,7 @@ (define-public python-minikanren
(invoke "python" "-m" "pytest" "-v" "tests/" "kanren/"))
#t)))))
(native-inputs
- (list python-coveralls
- python-pydocstyle
+ (list python-pydocstyle
python-pytest
python-pytest-cov
python-pylint
@@ -35943,8 +35940,7 @@ (define-public python-arpeggio
(base32
"0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n"))))
(build-system python-build-system)
- (native-inputs (list python-coveralls
- python-mike
+ (native-inputs (list python-mike
python-mkdocs
python-pytest
python-pytest-runner
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 397a477972e..d102548bb9c 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -434,7 +434,6 @@ (define-public rtv
python-requests python-six))
(native-inputs
(list ncurses
- python-coveralls
python-mock
python-pytest
python-vcrpy))
@@ -467,8 +466,7 @@ (define-public tuir
(list python-beautifulsoup4 python-decorator python-kitchen
python-requests python-six))
(native-inputs
- (list python-coveralls
- python-mock
+ (list python-mock
python-pytest
python-setuptools
python-vcrpy
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 358374a5bb7..c5930180e6a 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -790,8 +790,7 @@ (define-public tgcli
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "tests")))))))
(native-inputs
- `(("coveralls" ,python-coveralls)
- ("pytest" ,python-pytest)
+ `(("pytest" ,python-pytest)
("pytest-click" ,python-pytest-click)
("pytest-cov" ,python-pytest-cov)
("mkdocs" ,python-mkdocs)
--
2.41.0
^ permalink raw reply related [relevance 72%]
* [bug#70858] [PATCH python-team v2 29/32] build-system/pyproject: Remove python-pytest-mypy inputs.
` (13 preceding siblings ...)
2024-06-01 15:37 67% ` [bug#70858] [PATCH python-team v2 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:37 65% ` Nicolas Graves via Guix-patches via
2024-06-01 15:37 69% ` [bug#70858] [PATCH python-team v2 30/32] build-system/pyproject: Stop hiding options Nicolas Graves via Guix-patches via
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:37 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-czml3, python-poliastro)
[native-inputs]: Remove python-pytest-mypy.
* gnu/packages/check.scm (python-pytest-perf)[native-inputs]: Remove
python-pytest-mypy.
* gnu/packages/python-web.scm (python-portend)[native-inputs]: Remove
python-pytest-mypy.
* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-path, python-pip-run, python-inflect,
python-tempora, python-loguru, python-portalocker)[native-inputs]: Remove
python-pytest-mypy.
* gnu/packages/sphinx.scm (python-sphinx, python-sphinx-5):
[propagated-inputs]: Remove python-mypy.
Change-Id: Ia36ca82e0327a886f9c5317e9ef4ffc35dc8ac9d
---
gnu/packages/astronomy.scm | 4 +---
gnu/packages/check.scm | 1 -
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 17 ++---------------
gnu/packages/sphinx.scm | 2 --
5 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 1510ecab6de..a670f3b12d9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2228,7 +2228,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/poliastro/czml3")
@@ -2606,8 +2605,7 @@ (define-public python-poliastro
python-flit-core
python-pytest
python-pytest-doctestplus
- python-pytest-mpl
- python-pytest-mypy))
+ python-pytest-mpl))
(propagated-inputs
(list python-astropy
python-astroquery
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e8f121e9fe9..8eac2b13563 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2664,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93f8394ee98..f956ad5b0c2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -313,7 +313,6 @@ (define-public python-portend
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/portend")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 88bea23d3b3..1069f6292f8 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4928,7 +4928,6 @@ (define-public python-portalocker
"0lawjm736vs86wlnxc3qqh37l11z0yx81xq3dmrw33m86kaq2bh3"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-mypy
python-pytest-timeout
python-redis
python-setuptools
@@ -11533,7 +11532,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
(propagated-inputs
@@ -11660,7 +11658,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11692,7 +11689,6 @@ (define-public python-jaraco-collections
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.collections")
@@ -11750,7 +11746,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11782,7 +11777,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11840,7 +11834,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.test")
@@ -11871,7 +11864,6 @@ (define-public python-jaraco-text
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.text")
@@ -16507,8 +16499,7 @@ (define-public python-path
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden?
(package-properties
python-path-bootstrap)))))
@@ -16610,8 +16601,7 @@ (define-public python-pip-run
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21045,7 +21035,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
;; For the version number
python-setuptools-scm
python-setuptools
@@ -25893,7 +25882,6 @@ (define-public python-tempora
python-pytest-checkdocs
python-pytest-enabler
python-pytest-freezegun
- python-pytest-mypy
python-setuptools-scm
python-types-freezegun
python-types-pytz
@@ -32835,7 +32823,6 @@ (define-public python-loguru
(propagated-inputs (list python-colorama))
(native-inputs (list python-colorama
python-freezegun
- python-mypy
python-pre-commit
python-pytest
python-pytest-mypy-plugins
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index b977367ee35..3dbcce04b32 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -94,7 +94,6 @@ (define-public python-sphinx
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
@@ -196,7 +195,6 @@ (define-public python-sphinx-5
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
--
2.41.0
^ permalink raw reply related [relevance 65%]
* [bug#70858] [PATCH python-team v2 27/32] build-system/pyproject: Remove python-pytest-black native-input.
` (11 preceding siblings ...)
2024-06-01 15:36 73% ` [bug#70858] [PATCH python-team v2 26/32] build-system/pyproject: Remove python-pytest-isort native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 63% ` Nicolas Graves via Guix-patches via
2024-06-01 15:37 67% ` [bug#70858] [PATCH python-team v2 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/check.scm (python-pytest-perf, python-pytest-enabler)
[native-inputs]: Remove python-pytest-black.
* gnu/packages/python-web.scm (python-portend)[native-inputs]:
Remove python-pytest-black.
* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-legacy-api-wrap, python-path,
python-pip-run, python-inflect, python-isort, python-tempora,
python-sparse)[native-inputs]: Remove python-pytest-black.
Change-Id: Ib46f1c4a3cc33821cda3d7b2172d36158aa812c9
---
gnu/packages/check.scm | 2 --
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 21 ++++-----------------
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6b16ec7711b..f8ead8df4e4 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2491,7 +2491,6 @@ (define-public python-pytest-enabler
python-jaraco-functools
python-toml))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -2664,7 +2663,6 @@ (define-public python-pytest-perf
"and not upstream_url"))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0b794590620..98dc11a9e48 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -311,7 +311,6 @@ (define-public python-portend
(propagated-inputs (list python-tempora))
;; TODO: Add python-pytest-ruff to native-inputs once it has been packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c8766db819b..8dd5bf2e9e3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8691,7 +8691,6 @@ (define-public python-sparse
(list python-dask
python-importlib-metadata
python-pytest
- python-pytest-black
python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
@@ -11532,7 +11531,6 @@ (define-public python-importlib-resources
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11662,7 +11660,6 @@ (define-public python-jaraco-classes
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11695,7 +11692,6 @@ (define-public python-jaraco-collections
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -11755,7 +11751,6 @@ (define-public python-jaraco-context
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11789,7 +11784,6 @@ (define-public python-jaraco-functools
(native-inputs
(list python-jaraco-classes
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11849,7 +11843,6 @@ (define-public python-jaraco-test
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11882,7 +11875,6 @@ (define-public python-jaraco-text
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -16260,8 +16252,7 @@ (define-public python-legacy-api-wrap
"06qhp0g543dy98vpa41hwdalvdbsjfc3ldk474yr9sd75mhl8jh3"))))
(build-system python-build-system)
(propagated-inputs
- (list python-get-version python-pytest python-pytest-black
- python-setuptools))
+ (list python-get-version python-pytest python-setuptools))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
@@ -16521,7 +16512,6 @@ (define-public python-path
python-packaging
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -16626,7 +16616,6 @@ (define-public python-pip-run
(append python-nbformat
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -21062,7 +21051,6 @@ (define-public python-inflect
(propagated-inputs (list python-pydantic))
(native-inputs (list python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -24092,7 +24080,8 @@ (define-public python-isort
(arguments
(list
#:test-flags '(list "tests/unit/" "-k" "not test_gitignore"
- "--ignore=tests/unit/test_deprecated_finders.py")
+ "--ignore=tests/unit/test_deprecated_finders.py"
+ "--ignore=tests/unit/profiles/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-example-plugins
@@ -24110,8 +24099,7 @@ (define-public python-isort
(apply invoke "pip" "--no-cache-dir" "--no-input"
"install" "--user" "--no-deps" example-whls)))))))
(native-inputs
- (list python-black
- python-colorama
+ (list python-colorama
python-hypothesmith
python-libcst-minimal
python-natsort
@@ -25911,7 +25899,6 @@ (define-public python-tempora
(native-inputs
(list python-freezegun
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
--
2.41.0
^ permalink raw reply related [relevance 63%]
* [bug#70858] [PATCH python-team v2 22/32] build-system/pyproject: Remove python-pytest-cov native-input.
` (8 preceding siblings ...)
2024-06-01 15:36 72% ` [bug#70858] [PATCH python-team v2 21/32] build-system/pyproject: Remove python-twine native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 41% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 70% ` [bug#70858] [PATCH python-team v2 23/32] gnu: python-tinycss2: " Nicolas Graves via Guix-patches via
` (5 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-astroml, python-casa-formats-io,
python-cdflib, python-czml3, python-poliastro, python-tweakwcs,
python-wiimatch, python-stcal)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/audio.scm (python-pysox)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/backup.scm (borgmatic)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/bioinformatics.scm (python-biom-format, python-pyfaidx,
python-cooler, python-screed)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/build-tools.scm (meson-python)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/check.scm (python-pytest-nunit, python-pytest-timeout,
python-pytest-enabler, python-pytest-perf,
python-pyhamcrest)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/databases.scm (python-alembic)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/dav.scm (vdirsyncer, radicale)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/embedded.scm (mbed-tools)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/fontutils.scm (psautohint)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/geo.scm (python-fiona, python-cartopy)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/graphviz.scm (python-graphviz, python-uqbar)
[native-inputs]: Remove python-pytest-cov.
* gnu/packages/jupyter.scm (python-jupyter-packaging,
python-jupyter-server, python-jupyterlite-core, python-ipydatawidgets)
[native-inputs]: Remove python-pytest-cov.
* gnu/packages/machine-learning.scm (python-persim,
python-scikit-learn-extra, python-imbalanced-learn,
python-keras-application, python-keras-preprocessing, python-keras,
python-tensorly, python-pytorch-geometric, python-captum,
python-torchmetrics, python-pyro-ppl)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/mastodon.scm (python-mastodon-py)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/messaging.scm (zulip-term)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/package-management.scm (python-conda-package-handling):
[native-inputs]: Remove python-pytest-cov.
* gnu/packages/patchutils.scm (pwclient)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/python-check.scm (python-testfixtures, python-vcrpy,
python-pytest-filter-subpackage, python-atpublic, python-sybil,
python-vulture)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/python-crypto.scm (python-trustme)[native-inputs]:
Remove python-pytest-cov.
(python-certauth)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.
* gnu/packages/python-science.scm (python-scipy, python-trimesh,
python-pandaparallel, python-pyts, python-usetplot, python-pingouin,
python-opt-einsum, python-salib)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/python-web.scm (python-apiron, python-huggingface-hub,
python-portend, python-aiosignal, python-aiostream, python-ovh,
python-cbor2, python-httplib2, python-cheroot, parfive, python-jose,
python-pyscss, python-mechanicalsoup, python-priority, hypercorn,
python-aioftp, python-oauthlib, python-tinycss, python-cssselect2,
python-httpcore, python-wsgiprox, python-venusian, python-cloud-init,
python-siosocks, python-zeep, gunicorn)[native-inputs]: Remove
python-pytest-cov.
(python-warcio)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.
* gnu/packages/python-xyz.scm (python-apprise, python-janus,
python-logbook, python-affine, python-mdit-py-plugins, python-pint,
python-rasterio, python-bidict, python-can, dosage, python-contourpy,
python-portalocker, python-extension-helpers, python-mizani,
python-cligj, python-ddlparse, python-robotframework-pythonlibcore,
python-lsp-server, python-sparse, python-pikepdf, python-imageio,
python-manimpango, python-importlib-resources, python-jaraco-classes,
python-jaraco-collections, python-jaraco-context,
python-jaraco-functools, python-jaraco-test, python-jaraco-text,
python-ipyparallel, python-three-merge, python-seaborn,
python-sentry-sdk, python-sniffio, python-get-version,
python-legacy-api-wrap, python-path, python-pip-run, python-debugpy,
python-notebook, python-ipywidgets, python-qstylizer,
python-cookiecutter, python-pyqtgraph, python-codespell,
python-inflect, python-lazy-loader, python-pymemcache, python-natsort,
python-mwclient, python-flasgger, python-tempora, python-outcome,
python-trio, python-apscheduler, python-iocapture, python-argh,
python-flit, python-watchdog, python-watchgod, python-cmd2,
python-inform, python-qtsass, python-scikit-build, python-minikanren,
python-tablib, nikola, python-ansicolors, python-shtab, python-scooby,
dynaconf, python-pyan3, python-numpydoc, python-loguru,
python-multidict)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/sphinx.scm (python-sphinx-gallery)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/statistics.scm (python-pymc, python-emcee,
python-rpy2)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/task-management.scm (todoman)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/time.scm (python-arrow, python-tzlocal)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/web.scm (anonip, python-tibanna)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/wm.scm (qtile)[native-inputs]: Remove
python-pytest-cov. Add python-coverage.
Change-Id: Ia8c96b18a60b6ceb00b345ef06351eae1a68e070
---
gnu/packages/astronomy.scm | 10 +--
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 9 +--
gnu/packages/build-tools.scm | 1 -
gnu/packages/check.scm | 8 +-
gnu/packages/cpp.scm | 1 -
gnu/packages/databases.scm | 2 +-
gnu/packages/dav.scm | 2 -
gnu/packages/django.scm | 1 -
gnu/packages/embedded.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/fontutils.scm | 1 -
gnu/packages/geo.scm | 3 +-
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 2 -
gnu/packages/jupyter.scm | 7 +-
gnu/packages/machine-learning.scm | 19 ++---
gnu/packages/mastodon.scm | 1 -
gnu/packages/messaging.scm | 4 +-
gnu/packages/package-management.scm | 1 -
gnu/packages/patchutils.scm | 2 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 11 +--
gnu/packages/python-compression.scm | 9 +--
gnu/packages/python-crypto.scm | 3 +-
gnu/packages/python-science.scm | 16 ++--
gnu/packages/python-web.scm | 59 ++++----------
gnu/packages/python-xyz.scm | 121 +++++++---------------------
gnu/packages/sphinx.scm | 1 -
gnu/packages/statistics.scm | 6 +-
gnu/packages/task-management.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/time.scm | 2 -
gnu/packages/vpn.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/wm.scm | 1 -
37 files changed, 84 insertions(+), 234 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 77bf41b68b9..1510ecab6de 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -601,7 +601,7 @@ (define-public python-astroml
(setenv "HOME" "/tmp"))))))
(propagated-inputs (list python-astropy python-matplotlib python-numpy
python-scikit-learn python-scipy))
- (native-inputs (list python-pytest-astropy-header python-pytest-cov
+ (native-inputs (list python-pytest-astropy-header python-pytest
python-pytest-doctestplus python-pytest-remotedata
python-setuptools python-wheel))
(home-page "https://astroml.org")
@@ -2041,7 +2041,6 @@ (define-public python-casa-formats-io
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-openfiles
python-setuptools))
(propagated-inputs
@@ -2113,7 +2112,6 @@ (define-public python-cdflib
(list python-astropy
python-hypothesis
python-pytest
- python-pytest-cov
python-pytest-remotedata
python-setuptools-scm
python-xarray
@@ -2230,7 +2228,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-cov
python-pytest-mypy
python-setuptools
python-wheel))
@@ -2608,7 +2605,6 @@ (define-public python-poliastro
(list python-hypothesis
python-flit-core
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-pytest-mpl
python-pytest-mypy))
@@ -3388,7 +3384,6 @@ (define-public python-stcal
(list python-cython-3
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm
python-setuptools
@@ -4607,7 +4602,6 @@ (define-public python-tweakwcs
python-stsci-stimage))
(native-inputs
(list python-pytest
- python-pytest-cov
python-scipy
python-setuptools
python-setuptools-scm))
@@ -5272,7 +5266,7 @@ (define-public python-wiimatch
"15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy python-setuptools))
- (native-inputs (list python-pytest python-pytest-cov python-wheel
+ (native-inputs (list python-pytest python-wheel
python-pytest-doctestplus python-setuptools-scm))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e6d16211fd4..724430dae36 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -6197,7 +6197,7 @@ (define-public python-pysox
(propagated-inputs
(list python-numpy python-typing-extensions))
(native-inputs
- (list sox python-pytest python-pytest-cov python-soundfile))
+ (list sox python-pytest python-soundfile))
(home-page "https://github.com/rabitt/pysox")
(synopsis "Python wrapper around SoX")
(description "@code{python-pysox} is a wrapper around the @command{sox}
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 663eb2568fe..566ea06338b 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1357,7 +1357,7 @@ (define-public borgmatic
python-jsonschema
python-requests
python-ruamel.yaml))
- (native-inputs (list python-flexmock python-pytest python-pytest-cov))
+ (native-inputs (list python-flexmock python-pytest))
(home-page "https://torsion.org/borgmatic/")
(synopsis "Simple, configuration-driven backup software")
(description
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 366caec31fd..84e03a65e1f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3011,7 +3011,7 @@ (define-public python-biom-format
;;python-scikit-bio ;mutually recursive dependency
python-scipy))
(native-inputs
- (list python-cython python-pytest python-pytest-cov python-nose))
+ (list python-cython python-pytest python-nose))
(home-page "https://www.biom-format.org")
(synopsis "Biological Observation Matrix (BIOM) format utilities")
(description
@@ -10188,7 +10188,7 @@ (define-public python-screed
(base32 "0slva743xn93h4sl5zg2as4ricnnj5pp6nw9dm4qclk4i9xglkvk"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest-cov
+ (list python-pytest
python-pytest-runner
python-setuptools
python-wheel))
@@ -17921,7 +17921,6 @@ (define-public python-pyfaidx
python-mock
python-numpy
python-pytest
- python-pytest-cov
python-wheel))
(propagated-inputs (list python-setuptools))
(home-page "http://mattshirley.com")
@@ -17971,9 +17970,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-hatchling
- python-pytest
- python-pytest-cov))
+ (list python-hatchling python-pytest))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
(home-page "https://github.com/open2c/cooler")
(synopsis "Sparse binary format for genomic interaction matrices")
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 8fec2f8e2f2..29974dfd8b6 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -376,7 +376,6 @@ (define-public meson-python
python-cython
python-gitpython
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/mesonbuild/meson-python")
(synopsis "Meson-based build backend for Python")
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6042f763f15..6b16ec7711b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1530,7 +1530,7 @@ (define-public python-pytest-nunit
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;no tests included
(propagated-inputs (list python-attrs python-pytest))
- (native-inputs (list python-pytest python-pytest-cov python-setuptools
+ (native-inputs (list python-pytest python-setuptools
python-wheel python-xmlschema))
(home-page "https://github.com/pytest-dev/pytest-nunit")
(synopsis "Pytest plugin for generating NUnit3 test result XML output")
@@ -1796,7 +1796,7 @@ (define-public python-pytest-timeout
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(propagated-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(native-inputs
(list python-pexpect))
(home-page "https://github.com/pytest-dev/pytest-timeout")
@@ -2493,7 +2493,6 @@ (define-public python-pytest-enabler
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -2667,7 +2666,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -3242,7 +3240,7 @@ (define-public python-pyhamcrest
(base32
"05kdzlhs2kvj82pfca13qszszcj6dyrk4b9pbr46x06sq2s4qyls"))))
(native-inputs ;all native inputs are for tests
- (list python-pytest-cov python-mock python-pytest python-hypothesis))
+ (list python-mock python-pytest python-hypothesis))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ba2698056da..9c693fb16c3 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1190,7 +1190,6 @@ (define-public cpplint
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-runner
python-testfixtures))
(home-page "https://github.com/cpplint/cpplint")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9ec7855109c..8abea7ec385 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3763,7 +3763,7 @@ (define-public python-alembic
(base32 "0lxi2g2025lz5k7k5dd5fc1lfijqi2yw6qqyjzp073z6laa8cckw"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-mock python-pytest-cov))
+ (list python-mock python-pytest))
(propagated-inputs
(list python-dateutil python-sqlalchemy python-mako python-editor))
(home-page "https://bitbucket.org/zzzeek/alembic")
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index b30b1ef5a59..0612a72c831 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-flake8
python-pytest-isort
python-pytest-runner
@@ -146,7 +145,6 @@ (define-public vdirsyncer
python-trustme
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpserver
radicale))
(inputs
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 48b1b38a97f..3ab2bc139d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -261,7 +261,6 @@ (define-public python-django-extensions
(list python-mock
python-factory-boy
python-pytest
- python-pytest-cov
python-pytest-django
python-shortuuid))
(home-page
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 1da41415194..542895c8779 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1798,7 +1798,6 @@ (define-public mbed-tools
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-factory-boy
python-requests-mock
python-semver))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index af79172e53b..eaff8546dc4 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2681,7 +2681,6 @@ (define-public python-scikit-rf
(native-inputs (list python-nbval
python-networkx
python-pytest
- python-pytest-cov
python-pytest-mock
python-pyvisa))
(home-page "https://scikit-rf.org/")
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 84eb33d19bf..46b06765f0c 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -856,7 +856,6 @@ (define-public psautohint
(native-inputs
(list psautohint-font-data
python-pytest
- python-pytest-cov
python-pytest-xdist
python-setuptools-scm
python-setuptools
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 73644ab2bb4..a33de4bd669 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -935,7 +935,7 @@ (define-public python-fiona
(list gdal ; for gdal-config
python-boto3
python-cython
- python-pytest python-pytest-cov python-pytz))
+ python-pytest python-pytz))
(home-page "https://github.com/Toblerity/Fiona")
(synopsis
"Fiona reads and writes spatial data files")
@@ -1481,7 +1481,6 @@ (define-public python-cartopy
(native-inputs
(list python-cython
python-pytest
- python-pytest-cov
python-pytest-mpl
python-pytest-xdist
python-setuptools
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index b3c807c6774..d239dea20a4 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -217,7 +217,6 @@ (define-public mdpo
python-flake8-implicit-str-concat
python-flake8-print
python-pytest
- python-pytest-cov
python-sphinx
python-sphinx-argparse
python-sphinx-rtd-theme
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index f6a58943ecb..44ff4dc20d4 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -159,7 +159,6 @@ (define-public python-graphviz
graphviz
python-mock
python-pytest
- python-pytest-cov
python-pytest-mock
python-setuptools
python-wheel))
@@ -218,7 +217,6 @@ (define-public python-uqbar
(native-inputs
(list graphviz
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 6600aab6c6b..1745cd1f491 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -512,8 +512,7 @@ (define-public python-jupyter-packaging
(list python-deprecation python-packaging python-setuptools
python-tomlkit python-wheel))
(native-inputs
- (list python-pypa-build python-pytest
- python-pytest-cov python-pytest-mock))
+ (list python-pypa-build python-pytest python-pytest-mock))
(home-page "https://jupyter.org")
(synopsis "Jupyter packaging utilities")
(description "This package provides tools to help build and install
@@ -681,7 +680,6 @@ (define-public python-jupyterlite-core
(native-inputs (list python-ansi2html
python-hatchling
python-pytest-console-scripts
- python-pytest-cov
python-pytest-xdist
python-tornado-6))
(home-page "https://github.com/jupyterlite/jupyterlite")
@@ -1081,8 +1079,7 @@ (define-public python-ipydatawidgets
(native-inputs
(list python-jupyter-packaging
python-nbval
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://github.com/vidartf/ipydatawidgets")
(synopsis "Widgets to help facilitate reuse of large datasets across widgets")
(description
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 27749093ee5..a3c598ba1c8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -926,8 +926,7 @@ (define-public python-persim
python-numpy
python-scikit-learn
python-scipy))
- (native-inputs (list python-pytest python-pytest-cov python-setuptools
- python-wheel))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://persim.scikit-tda.org")
(synopsis "Tools for analyzing persistence diagrams in Python")
(description
@@ -1796,7 +1795,7 @@ (define-public python-scikit-learn-extra
python-scikit-learn
python-scipy
python-packaging))
- (native-inputs (list python-pytest python-pytest-cov python-cython
+ (native-inputs (list python-pytest python-cython
python-setuptools python-wheel))
(home-page "https://github.com/scikit-learn-contrib/scikit-learn-extra")
(synopsis "Set of tools for scikit-learn")
@@ -1921,7 +1920,6 @@ (define-public python-imbalanced-learn
(native-inputs (list python-keras
python-pandas
python-pytest
- python-pytest-cov
python-setuptools
python-wheel
tensorflow))
@@ -3659,8 +3657,7 @@ (define-public python-keras-applications
(propagated-inputs
(list python-h5py python-numpy))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-pep8
- python-pytest-xdist))
+ (list python-pytest python-pytest-pep8 python-pytest-xdist))
(home-page "https://github.com/keras-team/keras-applications")
(synopsis "Reference implementations of popular deep learning models")
(description
@@ -3686,7 +3683,6 @@ (define-public python-keras-preprocessing
(list python-pandas
python-pillow
python-pytest
- python-pytest-cov
python-pytest-xdist
tensorflow))
(home-page "https://github.com/keras-team/keras-preprocessing/")
@@ -3828,7 +3824,6 @@ (define-public python-keras
python-markdown
python-pandas
python-pytest
- python-pytest-cov
python-pytest-pep8
python-pytest-timeout
python-pytest-xdist
@@ -3924,7 +3919,7 @@ (define-public python-tensorly
;; nor is examples/plot_quantum.py
" and not test_file_is_generated"))))
(propagated-inputs (list python-jsmin python-numpy python-scipy))
- (native-inputs (list python-pytest python-pytest-cov python-sphinx
+ (native-inputs (list python-pytest python-sphinx
python-setuptools python-wheel))
(home-page "https://github.com/tensorly/tensorly")
(synopsis "Tensor learning in Python")
@@ -4432,8 +4427,7 @@ (define-public python-pytorch-geometric
python-tqdm))
(native-inputs
(list python-flit-core
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://pyg.org")
(synopsis "Graph Neural Network library for PyTorch")
(description
@@ -4521,7 +4515,6 @@ (define-public python-captum
python-ipywidgets
python-parameterized
python-pytest
- python-pytest-cov
python-scikit-learn
python-setuptools))
(home-page "https://captum.ai")
@@ -4729,7 +4722,6 @@ (define-public python-torchmetrics
python-pandas
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-pytest-rerunfailures
python-pytest-timeout
@@ -5058,7 +5050,6 @@ (define-public python-pyro-ppl
python-pillow
python-pypandoc
python-pytest
- python-pytest-cov
python-pytest-xdist
python-scikit-learn
python-scipy
diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
index b8006292cab..670a47ad821 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/mastodon.scm
@@ -179,7 +179,6 @@ (define-public python-mastodon-py
python-cryptography
python-http-ece
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-runner
python-pytest-vcr
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 35ff807e12c..1fd2ce391cf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3213,7 +3213,6 @@ (define-public zulip-term
(modules '((guix build utils)))
(snippet '(substitute* "setup.py"
(("\\=\\=1\\.7") ">=1.7") ; pytest-mock
- (("\\=\\=2\\.5") ">=2.5") ; pytest-cov
(("4\\.5\\.2") "4.4.2"))))) ; lxml
(build-system pyproject-build-system)
(arguments
@@ -3226,8 +3225,7 @@ (define-public zulip-term
python-urwid-readline
python-zulip))
(native-inputs
- (list python-distro python-pytest python-pytest-cov
- python-pytest-mock))
+ (list python-distro python-pytest python-pytest-mock))
(home-page "https://github.com/zulip/zulip-terminal")
(synopsis "Zulip's official terminal client")
(description "This package contains Zulip's official terminal client.")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 4e7e46bf1b3..2659fc8eff5 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1145,7 +1145,6 @@ (define-public python-conda-package-handling
(list python-cython
python-mock
python-pytest
- python-pytest-cov
python-pytest-mock
python-setuptools
python-wheel))
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index cdefa485836..870d5ae02c3 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -595,7 +595,7 @@ (define-public pwclient
"/share/man/man1"))
#t)))))
(native-inputs
- (list python-pbr python-pytest python-pytest-cov python-mock))
+ (list python-pbr python-pytest python-mock))
(home-page
"https://github.com/getpatchwork/pwclient")
(synopsis "Command-line client for the Patchwork patch tracking tool")
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 9c4d56bd384..91c8731726b 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index d2618807bc7..4643ce91e2e 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -243,7 +243,7 @@ (define-public python-testfixtures
(arguments
`(#:tests? #f)) ; PyTest-Django fails to build in master
(native-inputs
- (list python-pytest python-pytest-cov
+ (list python-pytest
;;("python-pytest-django" ,python-pytest-django)
python-wheel))
(synopsis "Tests components for Python")
@@ -417,7 +417,6 @@ (define-public python-vcrpy
python-ipaddress
python-mock
python-pytest
- python-pytest-cov
python-pytest-httpbin
python-urllib3))
(home-page "https://github.com/kevin1024/vcrpy")
@@ -724,7 +723,6 @@ (define-public python-pytest-filter-subpackage
(build-system pyproject-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm
python-setuptools
@@ -1880,7 +1878,7 @@ (define-public python-atpublic
(build-system pyproject-build-system)
(arguments (list #:build-backend "pdm.backend"))
(native-inputs
- (list python-pytest python-pdm-backend python-sybil python-pytest-cov))
+ (list python-pytest python-pdm-backend python-sybil))
(home-page "https://public.readthedocs.io/")
(synopsis "@code{@@public} decorator for populating @code{__all__}")
(description
@@ -2703,7 +2701,7 @@ (define-public python-sybil
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
- (native-inputs (list python-pytest python-pytest-cov))
+ (native-inputs (list python-pytest))
(home-page "https://github.com/simplistix/sybil")
(synopsis "Automated testing for examples in code and documentation")
(description
@@ -2835,8 +2833,7 @@ (define-public python-vulture
;; skip test that uses python-pint
;; pint has many dependencies
"not test_whitelists_with_python")))))))
- (native-inputs (list python-pytest python-pytest-cov
- python-setuptools python-wheel))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-toml))
(home-page "https://github.com/jendrikseipp/vulture")
(synopsis "Find dead Python code")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 5faf7b2a3cb..fd194571633 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -112,7 +112,6 @@ (define-public python-multivolumefile
python-hypothesis
python-pyannotate
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(home-page "https://github.com/miurahr/multivolume")
@@ -247,7 +246,6 @@ (define-public python-pybcj
(native-inputs
(list python-hypothesis
python-pytest
- python-pytest-cov
python-setuptools-scm
python-setuptools
python-wheel))
@@ -278,7 +276,7 @@ (define-public python-bcj-cffi
(propagated-inputs
(list python-cffi python-toml python-setuptools-scm))
(native-inputs
- (list python-setuptools python-pytest python-pytest-cov))
+ (list python-setuptools python-pytest))
(home-page "https://github.com/miurahr/bcj-cffi")
(synopsis "Branch / Call /Jump CFFI library in Python")
(description "This package provides an implementation of the Branch / Call /
@@ -406,7 +404,6 @@ (define-public python-pyppmd
(list python-hypothesis
python-pytest
python-pytest-benchmark
- python-pytest-cov
python-pytest-timeout
python-setuptools-scm
python-setuptools
@@ -436,8 +433,7 @@ (define-public python-ppmd-cffi
(native-inputs
(list python-hypothesis
python-setuptools-scm
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://github.com/miurahr/ppmd")
(synopsis "Prediction by Partial Matching compression library")
(description "PPMd is a compression algorithm library using the Prediction
@@ -478,7 +474,6 @@ (define-public python-py7zr
python-pyannotate
python-pytest
python-pytest-benchmark
- python-pytest-cov
python-pytest-remotedata
python-pytest-timeout))
(home-page "https://github.com/miurahr/py7zr")
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 7aaa37d7965..6965a330624 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -457,7 +457,7 @@ (define-public python-certauth
(propagated-inputs
(list python-pyopenssl python-tldextract))
(native-inputs
- (list python-pytest-cov))
+ (list python-pytest))
(home-page "https://github.com/ikreymer/certauth")
(synopsis "Certificate authority creation tool")
(description "This package provides a small library, built on top of
@@ -1501,7 +1501,6 @@ (define-public python-trustme
(list python-more-itertools
python-pyopenssl
python-pytest
- python-pytest-cov
python-service-identity
python-setuptools
python-wheel
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 567fa5d1559..4511d9bc7c8 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -297,7 +297,6 @@ (define-public python-scipy
python-pooch
python-pydevtool
python-pytest
- python-pytest-cov
python-pytest-timeout
python-pytest-xdist))
(home-page "https://scipy.org/")
@@ -652,8 +651,7 @@ (define-public python-trimesh
"'$MESH_PRE'")))))))
(native-inputs
(list python-pyinstrument
- python-pytest
- python-pytest-cov))
+ python-pytest))
(propagated-inputs
(list python-chardet
python-colorlog
@@ -1122,7 +1120,6 @@ (define-public python-pandarallel
(list python-mkdocs-material
python-numpy
python-pytest
- python-pytest-cov
python-pytest-xdist
python-setuptools
python-wheel))
@@ -1357,8 +1354,7 @@ (define-public python-pyts
python-scikit-learn
python-scipy))
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools
- python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/johannfaouzi/pyts")
(synopsis "Python package for time series classification")
(description
@@ -1899,7 +1895,7 @@ (define-public python-upsetplot
(propagated-inputs
(list python-matplotlib python-pandas))
(native-inputs
- (list python-pytest-runner python-pytest-cov))
+ (list python-pytest-runner))
(home-page "https://upsetplot.readthedocs.io")
(synopsis "Draw UpSet plots with Pandas and Matplotlib")
(description
@@ -2048,7 +2044,7 @@ (define-public python-pingouin
(("kwargs\\[\"penalty\"\\] = \"none\"")
"kwargs[\"penalty\"] = None")))))))
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(propagated-inputs
(list python-matplotlib
python-mpmath
@@ -3090,7 +3086,7 @@ (define-public python-opt-einsum
(when tests?
(invoke "pytest" "-vv")))))))
(propagated-inputs (list python-numpy))
- (native-inputs (list python-pytest python-pytest-cov python-pytest-pep8))
+ (native-inputs (list python-pytest python-pytest-pep8))
(home-page "https://github.com/dgasmith/opt_einsum")
(synopsis "Optimizing numpys einsum function")
(description
@@ -3179,7 +3175,7 @@ (define-public python-salib
python-numpy
python-pandas
python-scipy))
- (native-inputs (list python-hatchling python-pytest python-pytest-cov))
+ (native-inputs (list python-hatchling python-pytest))
(home-page "https://salib.readthedocs.io/en/latest/")
(synopsis "Tools for global sensitivity analysis")
(description "SALib provides tools for global sensitivity analysis. It
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 08be81ad1c5..c1f803cb131 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -201,7 +201,6 @@ (define-public python-huggingface-hub
python-pydantic
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-env
python-pytest-rerunfailures
python-pytest-vcr
@@ -314,7 +313,6 @@ (define-public python-portend
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-mypy
python-setuptools
@@ -432,7 +430,7 @@ (define-public python-aiosignal
(build-system pyproject-build-system)
(arguments (list #:test-flags #~(list "tests")))
(propagated-inputs (list python-frozenlist))
- (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov
+ (native-inputs (list python-pytest python-pytest-asyncio
python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/aiosignal")
(synopsis "Callback manager for Python @code{asyncio} projects")
@@ -681,12 +679,11 @@ (define-public python-aiostream
(sha256
(base32
"0l2ijb7yk0820wiyf6zrzx8fhzf8925an7r06mcaw3in1mr6rssq"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(native-inputs
(list python-setuptools
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-runner
python-wheel))
(home-page "https://github.com/vxgmichel/aiostream")
@@ -977,7 +974,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-pytest
- python-pytest-cov
python-setuptools
python-sphinx
python-wheel))
@@ -1000,7 +996,6 @@ (define-public python-cbor2
(build-system pyproject-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-setuptools
python-setuptools-scm
python-wheel))
@@ -1271,7 +1266,6 @@ (define-public python-httplib2
python-future
python-mock
python-pytest
- python-pytest-cov
python-pytest-forked
python-pytest-randomly
python-pytest-timeout
@@ -1301,8 +1295,7 @@ (define-public python-cheroot
(arguments
(list
#:test-flags
- #~(list "--cov=cheroot"
- ;; Tests are flaky in parallel invocation.
+ #~(list ;; Tests are flaky in parallel invocation.
;; "--numprocesses=auto"
"--doctest-modules"
"--showlocals"
@@ -1327,7 +1320,6 @@ (define-public python-cheroot
python-pyopenssl
python-pypytools
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-xdist
python-requests
@@ -1403,7 +1395,6 @@ (define-public parfive
python-tqdm))
(native-inputs (list python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-localserver
python-pytest-socket
python-setuptools
@@ -1472,8 +1463,7 @@ (define-public python-jose
#t)))))
(native-inputs
(list ;; All native inputs are for tests.
- python-pyasn1 python-pytest python-pytest-cov
- python-pytest-runner))
+ python-pyasn1 python-pytest python-pytest-runner))
(propagated-inputs
(list python-cryptography python-ecdsa python-rsa python-six))
(synopsis "JOSE implementation in Python")
@@ -1519,7 +1509,7 @@ (define-public python-pyscss
(base32 "1vinddg8sbh3v9n1r1wmvjx6ydk8xp7scbvhb3csl4y9xz7vhk6g"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(inputs
(list pcre))
(home-page "https://github.com/Kronuz/pyScss")
@@ -1586,12 +1576,11 @@ (define-public python-mechanicalsoup
(uri (pypi-uri "MechanicalSoup" version))
(sha256
(base32 "01sddjxy3rznh63hnl5lbv1hhk6xyiviwmkiw4x7v4ap35fb3lrp"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-beautifulsoup4 python-lxml python-requests python-six))
(native-inputs
- (list python-pytest-cov
- python-pytest-flake8
+ (list python-pytest-flake8
python-pytest-httpbin
python-pytest-mock
python-pytest-runner
@@ -2534,8 +2523,7 @@ (define-public python-priority
;; This test exceeded the Hypothesis deadline.
"not test_period_of_repetition"))))))
(native-inputs
- (list python-hypothesis python-pytest python-pytest-cov
- python-pytest-xdist))
+ (list python-hypothesis python-pytest python-pytest-xdist))
(home-page "https://python-hyper.org/projects/priority/en/latest/")
(synopsis "Pure-Python implementation of the HTTP/2 priority tree")
(description
@@ -2592,7 +2580,6 @@ (define-public hypercorn
python-poetry-core
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-trio
python-trio))
(home-page "https://gitlab.com/pgjones/hypercorn/")
@@ -3551,7 +3538,7 @@ (define-public python-apiron
(propagated-inputs
(list python-requests))
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(home-page "https://github.com/ithaka/apiron")
(synopsis "Python wrapper for interacting with RESTful APIs")
(description
@@ -3815,7 +3802,6 @@ (define-public python-aioftp
(list python-async-timeout
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-setuptools
python-trustme
python-wheel))
@@ -3922,7 +3908,7 @@ (define-public python-oauthlib
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-mock))
+ (list python-pytest python-mock))
(propagated-inputs
(list python-cryptography python-pyjwt python-blinker))
(home-page "https://github.com/oauthlib/oauthlib")
@@ -5877,8 +5863,7 @@ (define-public python-tinycss
(list #:test-flags
'(list "-k" "not test_speedups")))
(native-inputs
- (list python-pytest-cov
- python-pytest-flake8
+ (list python-pytest-flake8
python-pytest-isort
python-pytest-runner
python-setuptools
@@ -5953,7 +5938,7 @@ (define-public python-cssselect2
(propagated-inputs
(list python-tinycss2))
(native-inputs
- (list python-pytest-cov python-pytest-runner))
+ (list python-pytest-runner))
(home-page "https://cssselect2.readthedocs.io/")
(synopsis "CSS selectors for Python ElementTree")
(description "@code{cssselect2} is a straightforward implementation of
@@ -6079,7 +6064,6 @@ (define-public gunicorn
python-aiohttp
python-gevent
python-pytest
- python-pytest-cov
python-sphinx
texinfo))
(propagated-inputs (list python-packaging python-setuptools python-wheel))
@@ -6434,7 +6418,6 @@ (define-public python-httpcore
(native-inputs
(list python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpbin
python-pytest-trio
python-uvicorn
@@ -6609,7 +6592,7 @@ (define-public python-wsgiprox
(propagated-inputs
(list python-certauth python-gevent python-websocket-client))
(native-inputs
- (list python-mock python-pytest-cov python-waitress))
+ (list python-mock python-waitress))
(home-page "https://github.com/webrecorder/wsgiprox")
(synopsis "HTTP/S proxy with WebSockets over WSGI")
(description "@code{wsgiprox} is a Python WSGI (Web Server Gateway
@@ -6649,9 +6632,7 @@ (define-public python-warcio
"test_capture_https_proxy_same_session")
" and not ")))))
(native-inputs
- ;; These inputs are required for the test suite.
- (list python-httpbin python-pytest-cov python-requests
- python-wsgiprox))
+ (list python-httpbin python-pytest python-requests python-wsgiprox))
(home-page "https://github.com/webrecorder/warcio")
(synopsis "Streaming web archival archive (WARC) library")
(description "warcio is a Python library to read and write the WARC format
@@ -6765,12 +6746,9 @@ (define-public python-venusian
(uri (pypi-uri "venusian" version))
(sha256
(base32 "0f7f67dkgxxcjfhpdd5frb9pszkf04lyzzpn5069q0xi89r2p17n"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(native-inputs
- `(("python-pytest" ,python-pytest)
- ("python-runner" ,python-pytest-runner)
- ("python-pytest-cov" ,python-pytest-cov)))
- (arguments '(#:test-target "pytest"))
+ (list python-pytest python-pytest-runner))
(home-page "https://docs.pylonsproject.org/projects/venusian")
(synopsis "Library for deferring decorator actions")
(description
@@ -7365,7 +7343,6 @@ (define-public python-cloud-init
(native-inputs
(list procps ;for ps when running tests
python-pytest
- python-pytest-cov
python-pytest-mock
python-passlib))
(home-page "https://github.com/canonical/cloud-init")
@@ -7751,8 +7728,7 @@ (define-public python-siosocks
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vvv")))))))
- (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov
- python-pytest-trio))
+ (native-inputs (list python-pytest python-pytest-asyncio python-pytest-trio))
(propagated-inputs (list python-trio))
(home-page "https://github.com/pohmelie/siosocks")
(synopsis "SOCKSv4 & SOCKSv5 TCP proxy protocol implementation in Python")
@@ -8784,7 +8760,6 @@ (define-public python-zeep
python-pretend
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpx
python-requests-mock))
(home-page "https://docs.python-zeep.org/en/stable/")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9396290401d..c8766db819b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -321,7 +321,6 @@ (define-public python-apprise
python-cryptography
python-paho-mqtt
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-xdist
python-setuptools
@@ -421,7 +420,7 @@ (define-public python-janus
(base32 "04hnrdcf03g1s0x3sr72sh9gnszz6kyfsl9dg8a4n0zvvhn6z5yz"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-asyncio
+ (list python-pytest python-pytest-asyncio
python-setuptools python-wheel))
(propagated-inputs (list python-typing-extensions))
(home-page "https://github.com/aio-libs/janus/")
@@ -586,8 +585,7 @@ (define-public python-logbook
(setenv "CYBUILD" "True")
(invoke "pytest" "--cov=logbook" "-r" "s" "tests")))))))
(native-inputs
- (list python-cython python-mock python-pytest python-pytest-cov
- python-brotli))
+ (list python-cython python-mock python-pytest python-brotli))
(home-page "https://github.com/getlogbook/logbook")
(synopsis "Logbook is a logging replacement for Python")
(description
@@ -1018,8 +1016,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-pydocstyle
- python-pytest python-pytest-cov))
+ (propagated-inputs (list python-pydocstyle python-pytest ))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
(synopsis "Matrices describing affine transformation of the plane")
@@ -1256,7 +1253,6 @@ (define-public python-contourpy
pkg-config
pybind11
python-pytest
- python-pytest-cov
python-wurlitzer))
(home-page "https://contourpy.readthedocs.io/")
(synopsis
@@ -1338,7 +1334,6 @@ (define-public python-mdit-py-plugins
(native-inputs
(list python-flit-core
python-pytest
- python-pytest-cov
python-pytest-regressions))
(home-page "https://github.com/executablebooks/mdit-py-plugins")
(synopsis "Collection of plugins for markdown-it-py")
@@ -1669,7 +1664,7 @@ (define-public python-pint
;; present in registry"
" and not test_load_definitions_stage_2"))))
(native-inputs
- (list python-pytest python-pytest-benchmark python-pytest-cov
+ (list python-pytest python-pytest-benchmark
python-pytest-mpl python-pytest-subtests
python-setuptools python-setuptools-scm python-wheel))
(propagated-inputs
@@ -2527,7 +2522,6 @@ (define-public python-rasterio
python-hypothesis
python-packaging
python-pytest
- python-pytest-cov
python-shapely
python-wheel))
(home-page "https://github.com/rasterio/rasterio")
@@ -2688,7 +2682,6 @@ (define-public python-bidict
python-py
python-pytest
python-pytest-benchmark
- python-pytest-cov
python-setuptools-scm
python-sortedcollections
python-sortedcontainers
@@ -3574,7 +3567,6 @@ (define-public python-can
python-parameterized
python-pyserial
python-pytest
- python-pytest-cov
python-pytest-runner
python-pytest-timeout
python-wheel))
@@ -4070,8 +4062,7 @@ (define-public dosage
python-requests
python-six))
(native-inputs
- (list python-pytest-cov python-pytest-xdist python-responses
- python-setuptools-scm))
+ (list python-pytest-xdist python-responses python-setuptools-scm))
(home-page "https://github.com/webcomics/dosage")
(synopsis "Comic strip downloader and archiver")
(description "Dosage is designed to keep a local copy of specific webcomics and other
@@ -4937,7 +4928,6 @@ (define-public python-portalocker
"0lawjm736vs86wlnxc3qqh37l11z0yx81xq3dmrw33m86kaq2bh3"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-cov
python-pytest-mypy
python-pytest-timeout
python-redis
@@ -5030,7 +5020,6 @@ (define-public python-extension-helpers
(native-inputs
(list python-pytest
python-pytest-astropy
- python-pytest-cov
python-setuptools-scm
python-setuptools
python-wheel))
@@ -5168,7 +5157,7 @@ (define-public python-mizani
(list python-matplotlib python-numpy python-pandas python-scipy))
(native-inputs
(list python-setuptools python-setuptools-scm
- python-pytest python-pytest-cov tzdata))
+ python-pytest tzdata))
(home-page "https://github.com/has2k1/mizani")
(synopsis "Create data visualizations in Python")
(description
@@ -5557,8 +5546,6 @@ (define-public python-cligj
(build-system python-build-system)
(propagated-inputs
(list python-click))
- (native-inputs
- (list python-pytest-cov))
(home-page "https://github.com/mapbox/cligj")
(synopsis "Click params for command line interfaces to GeoJSON")
(description
@@ -5667,10 +5654,7 @@ (define-public python-ddlparse
(base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest
- python-pytest-cov
- python-setuptools
- python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/shinichi-takii/ddlparse")
(synopsis "Parses and converts DDL to BigQuery JSON schema")
@@ -7639,8 +7623,7 @@ (define-public python-robotframework-pythonlibcore
(when tests?
(invoke "utest/run.py")))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-mockito
- python-robotframework))
+ (list python-pytest python-pytest-mockito python-robotframework))
(home-page "https://github.com/robotframework/PythonLibCore")
(synopsis "Robot Framework Python library tools")
(description "PythonLibCore provides tools for creating larger test
@@ -8180,7 +8163,6 @@ (define-public python-lsp-server
python-pandas
python-pylint
python-pytest
- python-pytest-cov
python-rope
python-setuptools
python-wheel))
@@ -8710,7 +8692,6 @@ (define-public python-sparse
python-importlib-metadata
python-pytest
python-pytest-black
- python-pytest-cov
python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
@@ -9169,7 +9150,6 @@ (define-public python-numpydoc
(native-inputs
(list python-matplotlib
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(home-page "https://pypi.org/project/numpydoc/")
@@ -9890,7 +9870,7 @@ (define-public python-multidict
"1kjrxav572j45xvr1iy60zb2g8zqvrinzdkl4ax36js4vczckl8d"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/multidict/")
(synopsis "Multidict implementation")
(description "Multidict is dict-like collection of key-value pairs
@@ -10197,7 +10177,6 @@ (define-public python-pikepdf
python-setuptools-scm
python-psutil
python-pytest
- python-pytest-cov
python-pytest-timeout
python-pytest-xdist
python-dateutil
@@ -10776,8 +10755,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-fsspec python-pytest
- python-pytest-cov python-wheel))
+ (list python-fsspec python-pytest python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
(description
@@ -11064,7 +11042,6 @@ (define-public python-manimpango
(list pkg-config
python-cython
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(inputs
@@ -11557,7 +11534,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -11688,7 +11664,6 @@ (define-public python-jaraco-classes
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -11722,7 +11697,6 @@ (define-public python-jaraco-collections
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-mypy
python-setuptools
@@ -11783,7 +11757,6 @@ (define-public python-jaraco-context
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -11818,7 +11791,6 @@ (define-public python-jaraco-functools
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -11879,7 +11851,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -11913,7 +11884,6 @@ (define-public python-jaraco-text
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-mypy
python-setuptools
@@ -12058,7 +12028,6 @@ (define-public python-ipyparallel
(list python-ipython
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-tornado
python-testpath))
(propagated-inputs
@@ -13356,7 +13325,7 @@ (define-public python-three-merge
(propagated-inputs
(list python-diff-match-patch))
(native-inputs
- (list python-flaky python-pytest python-pytest-cov
+ (list python-flaky python-pytest
python-pytest-runner python-pytest-timeout))
(home-page "https://github.com/spyder-ide/three-merge")
(synopsis "Library for merging two strings with respect to a base one")
@@ -13680,7 +13649,6 @@ (define-public python-seaborn
python-numpydoc
python-mypy
python-pytest
- python-pytest-cov
python-pytest-xdist
python-pyyaml))
(home-page "https://seaborn.pydata.org/")
@@ -14319,7 +14287,6 @@ (define-public python-sentry-sdk
python-mock
python-pyrsistent
python-pytest
- python-pytest-cov
python-pytest-django
python-pytest-forked
python-pytest-localserver
@@ -16046,7 +16013,7 @@ (define-public python-sniffio
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-curio python-pytest python-pytest-cov))
+ (list python-curio python-pytest))
(home-page "https://github.com/python-trio/sniffio")
(synopsis "Detect which async library a program is running under")
(description "This package detects which async library a program is
@@ -16180,7 +16147,6 @@ (define-public python-get-version
(list python-pygments
python-pytest
python-pytest-black
- python-pytest-cov
python-setuptools
python-testpath))
(home-page "https://github.com/flying-sheep/get_version")
@@ -16295,7 +16261,7 @@ (define-public python-legacy-api-wrap
(build-system python-build-system)
(propagated-inputs
(list python-get-version python-pytest python-pytest-black
- python-pytest-cov python-setuptools))
+ python-setuptools))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
@@ -16557,7 +16523,6 @@ (define-public python-path
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy)))
@@ -16663,7 +16628,6 @@ (define-public python-pip-run
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy)))
@@ -17017,7 +16981,6 @@ (define-public python-debugpy
python-flask
python-psutil
python-pytest
- python-pytest-cov
python-pytest-timeout
python-pytest-xdist
python-requests))
@@ -17578,7 +17541,6 @@ (define-public python-notebook
(list python-jupyter-server
python-nbval
python-pytest
- python-pytest-cov
python-requests
python-requests-unixsocket
python-setuptools
@@ -17628,8 +17590,7 @@ (define-public python-ipywidgets
(list python-comm python-ipython python-jupyterlab-widgets
python-traitlets python-widgetsnbextension))
(native-inputs
- (list python-ipykernel python-jsonschema python-pytest python-pytest-cov
- python-pytz))
+ (list python-ipykernel python-jsonschema python-pytest python-pytz))
(home-page "https://ipython.org")
(synopsis "IPython HTML widgets for Jupyter")
(description "Ipywidgets are interactive HTML widgets for Jupyter
@@ -18246,7 +18207,6 @@ (define-public python-qstylizer
(list python-pbr
python-pytest
python-pytest-catchlog
- python-pytest-cov
python-pytest-mock
python-pytest-runner
python-pytest-xdist))
@@ -19434,7 +19394,6 @@ (define-public python-cookiecutter
git
python-freezegun
python-pytest
- python-pytest-cov
python-pytest-mock))
(propagated-inputs (list python-arrow
python-binaryornot
@@ -19828,8 +19787,7 @@ (define-public python-pyqtgraph
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-xdist
- python-setuptools python-wheel))
+ (list python-pytest python-pytest-xdist python-setuptools python-wheel))
(inputs
(list qtbase-5))
(propagated-inputs
@@ -20014,7 +19972,6 @@ (define-public python-codespell
(native-inputs
(list python-pygments
python-pytest
- python-pytest-cov
python-pytest-dependency
python-tomli
python-setuptools
@@ -21107,7 +21064,6 @@ (define-public python-inflect
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -21673,8 +21629,7 @@ (define-public python-lazy-loader
"0dwghffnsjjf4pi4gwbl43rx04jmap375hdamafs5cpm6j78js1v"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest
- python-pytest-cov))
+ (list python-pytest))
(propagated-inputs
(list python-flit-core))
(home-page "https://scientific-python.org/specs/spec-0001/")
@@ -22241,8 +22196,7 @@ (define-public python-pymemcache
#:test-flags
'(list "--ignore=pymemcache/test/test_compression.py")))
(native-inputs
- (list python-faker python-pytest python-pytest-cov python-setuptools
- python-wheel))
+ (list python-faker python-pytest python-setuptools python-wheel))
(home-page "https://github.com/pinterest/pymemcache")
(synopsis "Comprehensive, fast, pure Python memcached client")
(description
@@ -22863,8 +22817,7 @@ (define-public python-natsort
(when tests?
(invoke "pytest" "-v")))))))
(native-inputs
- (list python-hypothesis python-pytest-cov python-pytest-mock
- python-pytest))
+ (list python-hypothesis python-pytest-mock python-pytest))
(propagated-inputs ; TODO: Add python-fastnumbers.
(list python-pyicu))
(home-page "https://github.com/SethMMorton/natsort")
@@ -24291,7 +24244,7 @@ (define-public python-mwclient
(propagated-inputs
(list python-requests-oauthlib python-six))
(native-inputs
- (list python-mock python-pytest python-pytest-cov
+ (list python-mock python-pytest
python-pytest-runner python-responses))
(home-page "https://github.com/btongminh/mwclient")
(synopsis "MediaWiki API client")
@@ -25249,7 +25202,6 @@ (define-public python-flasgger
python-flex
python-marshmallow
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(home-page "https://github.com/rochacbruno/flasgger/")
@@ -25961,7 +25913,6 @@ (define-public python-tempora
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-freezegun
@@ -28949,7 +28900,7 @@ (define-public python-outcome
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-asyncio))
+ (list python-pytest python-pytest-asyncio))
(propagated-inputs
(list python-attrs))
(home-page "https://github.com/python-trio/outcome")
@@ -29022,7 +28973,6 @@ (define-public python-trio
python-pyopenssl
python-pytest
python-pytest-xdist
- python-pytest-cov
python-trustme
python-setuptools
python-wheel))
@@ -29265,7 +29215,6 @@ (define-public python-apscheduler
python-pyside-6
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-tornado5))
(home-page "https://github.com/agronholm/apscheduler")
(synopsis "Task scheduling library for Python")
@@ -29936,7 +29885,7 @@ (define-public python-iocapture
(invoke "py.test" "-v" "tests")
#t)))))
(propagated-inputs
- (list python-flexmock python-pytest python-pytest-cov python-six))
+ (list python-flexmock python-pytest python-six))
(home-page "https://github.com/oinume/iocapture")
(synopsis "Python capturing tool for stdout and stderr")
(description
@@ -30059,8 +30008,7 @@ (define-public python-argh
(when tests?
(invoke "pytest" "-vv")))))))
(propagated-inputs
- (list python-iocapture python-mock python-pytest python-pytest-cov
- python-pytest-xdist))
+ (list python-iocapture python-mock python-pytest python-pytest-xdist))
(home-page "https://github.com/neithere/argh/")
(synopsis "Argparse wrapper with natural syntax")
(description
@@ -30202,7 +30150,6 @@ (define-public python-flit
(list python-responses
python-pygments-github-lexers
python-pytest
- python-pytest-cov
python-sphinx
python-sphinxcontrib-github-alt
python-testpath))
@@ -30518,7 +30465,6 @@ (define-public python-watchdog
(list python-pathtools python-pyyaml))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-timeout
python-setuptools python-wheel))
(home-page "https://github.com/gorakhargosh/watchdog")
@@ -30552,7 +30498,6 @@ (define-public python-watchgod
python-pygments
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-mock
python-pytest-sugar
python-pytest-toolbox
@@ -31676,7 +31621,6 @@ (define-public python-cmd2
(list python-invoke
python-mock
python-pytest
- python-pytest-cov
python-pytest-mock
python-setuptools
python-setuptools-scm
@@ -32372,7 +32316,7 @@ (define-public python-inform
(arguments
`(#:tests? #f)) ; PyPI tarball lacks tests
(native-inputs
- (list python-hypothesis python-pytest-cov python-pytest-runner))
+ (list python-hypothesis python-pytest-runner))
(propagated-inputs
(list python-arrow python-six))
(home-page "https://inform.readthedocs.io")
@@ -32918,7 +32862,6 @@ (define-public python-loguru
python-mypy
python-pre-commit
python-pytest
- python-pytest-cov
python-pytest-mypy-plugins
python-sphinx
python-sphinx-autobuild
@@ -32977,7 +32920,7 @@ (define-public python-qtsass
(for-each make-file-writable (find-files "."))
#t)))))
(native-inputs
- (list python-flaky python-pytest python-pytest-cov python-pytest-runner))
+ (list python-flaky python-pytest python-pytest-runner))
(propagated-inputs
(list python-libsass))
(home-page "https://github.com/spyder-ide/qtsass")
@@ -33367,7 +33310,6 @@ (define-public python-scikit-build
python-packaging
python-path
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-virtualenv
python-pytest-xdist
@@ -33940,7 +33882,7 @@ (define-public python-pyan3
"python-pyan3-fix-absolute-path-bug.patch"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-jinja2))
(home-page "https://github.com/Technologicat/pyan")
@@ -34081,7 +34023,6 @@ (define-public python-minikanren
(native-inputs
(list python-pydocstyle
python-pytest
- python-pytest-cov
python-pylint
python-sympy
python-versioneer))
@@ -34238,7 +34179,7 @@ (define-public python-tablib
(invoke "pytest")))))))
(native-inputs
(list python-pandas ;; required for test-suite
- python-pytest python-pytest-cov python-setuptools-scm))
+ python-pytest python-setuptools-scm))
(propagated-inputs
(list python-markuppy
python-odfpy
@@ -34753,7 +34694,7 @@ (define-public dynaconf
(list python-click python-configobj python-dotenv-0.13.0
python-ruamel.yaml-0.16 python-toml python-tomli))
(native-inputs
- (list python-django python-flask python-pytest python-pytest-cov
+ (list python-django python-flask python-pytest
python-pytest-mock python-setuptools python-wheel))
(home-page "https://www.dynaconf.com/")
(synopsis "The dynamic configurator for your Python project")
@@ -35028,8 +34969,7 @@ (define-public nikola
python-yapsy))
(native-inputs
(list python-freezegun
- python-pytest
- python-pytest-cov))
+ python-pytest))
(arguments
(list
#:phases
@@ -35279,8 +35219,7 @@ (define-public python-ansicolors
(base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest-cov
- unzip))
+ (list unzip))
(home-page "https://github.com/jonathaneunice/colors/")
(synopsis "ANSI colors for Python")
(description
@@ -35527,7 +35466,6 @@ (define-public python-shtab
(native-inputs
(list bash
python-pytest
- python-pytest-cov
python-pytest-timeout
python-setuptools
python-setuptools-scm
@@ -36114,7 +36052,6 @@ (define-public python-scooby
(list python-beautifulsoup4
python-numpy
python-pytest
- python-pytest-cov
python-pyvips-for-python-scooby
python-scipy))
(propagated-inputs
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 26ee93b3aaf..b977367ee35 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -721,7 +721,6 @@ (define-public python-sphinx-gallery
python-numpy
python-pillow
python-pytest
- python-pytest-cov
python-setuptools
python-sphinx
python-wheel))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index de4fb6e3aa7..b8b162b0602 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2268,7 +2268,7 @@ (define-public python-pymc
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "HOME" "/tmp")))))))
- (native-inputs (list python-pytest-cov python-versioneer))
+ (native-inputs (list python-versioneer))
(propagated-inputs (list python-arviz
python-cachetools
python-cloudpickle
@@ -2397,7 +2397,6 @@ (define-public python-emcee
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy))
(native-inputs (list python-pytest
- python-pytest-cov
python-setuptools
python-setuptools-scm
python-wheel))
@@ -6778,8 +6777,7 @@ (define-public python-rpy2
(list python-ipython
python-numpy
python-pandas
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://rpy2.github.io")
(synopsis "Python interface to the R language")
(description "rpy2 is a redesign and rewrite of rpy. It is providing a
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm
index 96df50d7470..4b372cb6148 100644
--- a/gnu/packages/task-management.scm
+++ b/gnu/packages/task-management.scm
@@ -463,7 +463,6 @@ (define-public todoman
(native-inputs
(list python-setuptools-scm
python-pytest
- python-pytest-cov
python-freezegun))
(propagated-inputs
(list python-atomicwrites
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 2c7fd0365ca..f9f0b96f48a 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1676,7 +1676,6 @@ (define-public python-panflute
(native-inputs (list python-configparser
python-pandocfilters
python-pytest
- python-pytest-cov
python-requests))
(home-page "http://scorreia.com/software/panflute/")
(synopsis "Pythonic Pandoc filters")
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 2b5236279b5..6e34f80a79d 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -394,7 +394,6 @@ (define-public python-tzlocal
(native-inputs
(list python-check-manifest
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/regebro/tzlocal")
(synopsis "Local timezone information for Python")
@@ -514,7 +513,6 @@ (define-public python-arrow
(native-inputs
(list python-chai
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytz
python-setuptools
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index d52d872909d..c0a4907b1b6 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -971,7 +971,6 @@ (define-public sshuttle
(list python-setuptools-scm
;; For tests only.
python-mock
- python-pytest-cov
python-pytest-runner))
(home-page "https://github.com/sshuttle/sshuttle")
(synopsis "VPN that transparently forwards connections over SSH")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 736be82c90b..2780672b1ce 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5111,7 +5111,6 @@ (define-public python-tibanna
(native-inputs
(list python-poetry-core
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/4dn-dcic/tibanna")
(synopsis "Tibanna runs portable workflows on the AWS Cloud")
@@ -8736,7 +8735,7 @@ (define-public anonip
(when tests?
(invoke "pytest" "-vv" "tests.py" "anonip.py")))))))
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(home-page "https://github.com/DigitaleGesellschaft/Anonip")
(synopsis "Anonymize IP addresses in log files")
(description
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7da18bc821c..0f0b653ea2e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -656,7 +656,6 @@ (define-public qtile
(list pkg-config
python-pep8-naming
python-pytest
- python-pytest-cov
python-psutil
python-setuptools-scm
xorg-server-for-tests))
--
2.41.0
^ permalink raw reply related [relevance 41%]
* [bug#70858] [PATCH python-team v2 30/32] build-system/pyproject: Stop hiding options.
` (14 preceding siblings ...)
2024-06-01 15:37 65% ` [bug#70858] [PATCH python-team v2 29/32] build-system/pyproject: Remove python-pytest-mypy inputs Nicolas Graves via Guix-patches via
@ 2024-06-01 15:37 69% ` Nicolas Graves via Guix-patches via
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:37 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/pdf.scm (python-pydyf, weasyprint)[arguments]
<#:test-flags>: Remove arguments hiding coverage options.
* gnu/packages/python-crypto.scm (python-keyring)
[arguments]<#:test-flags>: Remove arguments hiding coverage options.
* gnu/packages/python-web.scm (python-asgi-csrf, python-asgi-lifespan,
python-openapi-schema-validator, python-openapi-spec-validator,
python-openapi-core)[arguments]<#:test-flags>: Remove arguments hiding
coverage options.
(python-openapi-schema-validator, python-openapi-spec-validator)
[arguments]<#:phases>: Remove 'remove-coverage-pytest-options phase.
(python-cssselect2, python-tinycss2)[arguments]: Remove uneeded field.
(python-jsonpickle)[arguments]<#:test-flags>: Remove uneeded
test-flags.
* gnu/packages/python-xyz.scm (python-cattrs)
[arguments]<#:phases>: Remove arguments hiding coverage options.
Change-Id: Ibe08ecfebf8a24259c8658918d98fe9e5a8925b7
---
gnu/packages/pdf.scm | 6 +---
gnu/packages/python-crypto.scm | 1 -
gnu/packages/python-web.scm | 51 ++++------------------------------
gnu/packages/python-xyz.scm | 4 +--
4 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4e260d614de..16d4d9336e3 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -816,9 +816,6 @@ (define-public python-pydyf
(sha256
(base32 "18q43g5d9455msipcgd5fvnh8m4a2rz189slzfg80yycjw66rshs"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags #~'("-c" "/dev/null")))
(propagated-inputs (list python-pillow))
(native-inputs
(list ghostscript
@@ -1635,8 +1632,7 @@ (define-public weasyprint
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags #~(list "-c" "/dev/null"
- "-n" (number->string (parallel-job-count)))
+ #:test-flags #~(list "-n" (number->string (parallel-job-count)))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-library-paths
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6965a330624..6139856a906 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -288,7 +288,6 @@ (define-public python-keyring
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags '(list "-c" "/dev/null") ;avoid extra test dependencies
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'workaround-test-failure
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f956ad5b0c2..ef786e59308 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -738,10 +738,7 @@ (define-public python-asgi-csrf
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- ;; Provide a null config to avoid the extraneous dependency on
- ;; python-pytest-coverage.
- #~(list "-c" "/dev/null"
- ;; Disable two failing tests (see:
+ #~(list ;; Disable two failing tests (see:
;; https://github.com/simonw/asgi-csrf/issues/24).
"-k" (string-append
"not (test_multipart "
@@ -780,8 +777,7 @@ (define-public python-asgi-lifespan
(arguments
(list
#:test-flags
- '(list "-c" "/dev/null" ;ignore coverage-related options
- "-k"
+ '(list "-k"
(string-append
;; XXX: Some tests fail because of a 'lifespan.shutdown.failed'
;; extra event, perhaps because our version of trio is older.
@@ -1529,10 +1525,7 @@ (define-public python-jsonpickle
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags
- ;; Prevent running the flake8 and black pytest plugins, which only tests
- ;; style and frequently causes harmless failures.
- '(list "-o" "addopts=''" "tests")
+ #:test-flags '(list "tests")
#:phases
'(modify-phases %standard-phases
(add-before 'check 'pre-check
@@ -2175,13 +2168,7 @@ (define-public python-openapi-schema-validator
(list
#:test-flags
;; This one returns 5 instead of 4 elements
- '(list "-k" "not test_array_prefixitems_invalid")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ '(list "-k" "not test_array_prefixitems_invalid")))
(native-inputs (list python-poetry-core python-pytest))
(propagated-inputs
(list python-isodate
@@ -2219,13 +2206,7 @@ (define-public python-openapi-spec-validator
(list
;; These tests attempt to fetch resources from the Internet
#:test-flags '(list "--ignore-glob=tests/integration/validation/**"
- "-k" "not example")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ "-k" "not example")))
(native-inputs
(list python-poetry-core
python-pytest))
@@ -2264,9 +2245,6 @@ (define-public python-openapi-core
(list
#:test-flags
'(list "tests/unit"
- ;; Ignore Pytest configuration in setup.cfg that adds
- ;; unwanted flake8 and coverage options.
- "-c" "/dev/null"
"-k" (string-append
;; Type mismatches
"not TestFlaskOpenAPIRequest"
@@ -5892,14 +5870,6 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'remove-unwanted-dependencies
- (lambda _
- (substitute* "pyproject.toml"
- (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
@@ -5926,17 +5896,6 @@ (define-public python-cssselect2
(sha256
(base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk"))))
(build-system pyproject-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-linters
- ;; Their check fails; none of our business.
- (lambda _
- (substitute* '("setup.py" "pyproject.toml")
- (("'pytest-flake8',") "")
- (("'pytest-isort',") "")
- (("--flake8") "")
- (("--isort") "")))))))
(propagated-inputs
(list python-tinycss2))
(native-inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1069f6292f8..7bcd4c299c3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21318,9 +21318,7 @@ (define-public python-cattrs
(substitute* "pyproject.toml"
;; Fix version string
(("dynamic = \\[\"version\"\\]")
- (string-append "version = \"" #$version "\""))
- ;; Just run pytest with no frills
- (("addopts = \"-l.*") "")))))))
+ (string-append "version = \"" #$version "\""))))))))
(native-inputs
(list python-hatchling
python-hatch-vcs
--
2.41.0
^ permalink raw reply related [relevance 69%]
* [bug#70858] [PATCH python-team v2 21/32] build-system/pyproject: Remove python-twine native-input.
` (7 preceding siblings ...)
2024-06-01 15:36 62% ` [bug#70858] [PATCH python-team v2 20/32] build-system/pyproject: Remove python-isort native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 72% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 41% ` [bug#70858] [PATCH python-team v2 22/32] build-system/pyproject: Remove python-pytest-cov native-input Nicolas Graves via Guix-patches via
` (6 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-twine.
* gnu/packages/machine-learning.scm (python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-twine.
* gnu/packages/python-check.scm (python-testfixtures)[native-inputs]:
Remove python-twine.
* gnu/packages/python-web.scm (python-translation-finder)
[native-inputs]: Remove python-twine.
* gnu/packages/python-xyz.scm (python-cftime, python-eventlet,
python-eliot, python-arpeggio)[native-inputs]: Remove python-twine.
* gnu/packages/terminals.scm (python-halo)[native-inputs]: Remove
python-twine.
* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-twine.
Change-Id: Ie9ff17126810dc3e2b17ad42a1f765361401eae7
---
gnu/packages/gettext.scm | 1 -
gnu/packages/machine-learning.scm | 6 ++----
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 6 +-----
gnu/packages/terminals.scm | 1 -
gnu/packages/virtualization.scm | 1 -
7 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 39215a0ccb6..b3c807c6774 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -221,7 +221,6 @@ (define-public mdpo
python-sphinx
python-sphinx-argparse
python-sphinx-rtd-theme
- python-twine
python-yamllint))
(propagated-inputs
(list python-polib python-pymd4c))
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index bec948a4bfd..27749093ee5 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5094,8 +5094,7 @@ (define-public python-linear-operator
(native-inputs (list python-flake8-print
python-pytest
python-setuptools
- python-setuptools-scm
- python-twine))
+ python-setuptools-scm))
(home-page "https://github.com/cornellius-gp/linear_operator/")
(synopsis "Linear operator implementation")
(description "LinearOperator is a PyTorch package for abstracting away the
@@ -5124,8 +5123,7 @@ (define-public python-gpytorch
(native-inputs (list python-flake8-print
python-nbval
python-pytest
- python-setuptools
- python-twine))
+ python-setuptools))
(home-page "https://gpytorch.ai")
(synopsis "Implementation of Gaussian Processes in PyTorch")
(description
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 1087f7b9168..d2618807bc7 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -245,7 +245,7 @@ (define-public python-testfixtures
(native-inputs
(list python-pytest python-pytest-cov
;;("python-pytest-django" ,python-pytest-django)
- python-twine python-wheel))
+ python-wheel))
(synopsis "Tests components for Python")
(description "Testfixtures is a collection of helpers and mock objects that
are useful when writing automated tests in Python.")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a040eb81448..08be81ad1c5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6224,7 +6224,7 @@ (define-public python-translation-finder
(list python-chardet python-pathlib2 python-ruamel.yaml python-six))
(native-inputs
(list python-codecov python-codacy-coverage python-pytest-cov
- python-pytest-runner python-twine))
+ python-pytest-runner))
(home-page "https://weblate.org/")
(synopsis "Translation file finder for Weblate")
(description "This package provides a function to find translation file in
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4538dccd84c..9396290401d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3070,7 +3070,6 @@ (define-public python-cftime
python-cython
python-pytest-cov
python-sphinx
- python-twine
python-wheel))
(home-page "https://unidata.github.io/cftime/")
(synopsis "Library for time handling")
@@ -4240,8 +4239,7 @@ (define-public python-eventlet
(list python-black
python-hatchling
python-hatch-vcs
- python-pytest
- python-twine))
+ python-pytest))
(arguments
(list
#:test-flags
@@ -31351,7 +31349,6 @@ (define-public python-eliot
python-sphinx
python-sphinx-rtd-theme
python-testtools
- python-twine
python-twisted))
(home-page "https://github.com/itamarst/eliot/")
(synopsis "Eliot: the logging system that tells you why it happened")
@@ -35924,7 +35921,6 @@ (define-public python-arpeggio
python-mkdocs
python-pytest
python-pytest-runner
- python-twine
python-wheel))
(home-page "https://github.com/textX/Arpeggio")
(synopsis "Packrat parser interpreter for Python")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index d61dc6cb3c7..d39d1347a2c 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1199,7 +1199,6 @@ (define-public python-halo
(native-inputs
(list python-nose
python-setuptools
- python-twine
python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b0b71cceaf5..16919ccee51 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2810,7 +2810,6 @@ (define-public python-transient
(native-inputs
(list python-pyhamcrest
python-setuptools
- python-twine
python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
--
2.41.0
^ permalink raw reply related [relevance 72%]
* [bug#70858] [PATCH python-team v2 10/32] gnu: python-openid: Remove python-coverage native-input.
` (2 preceding siblings ...)
2024-06-01 15:36 50% ` [bug#70858] [PATCH python-team v2 06/32] build-system/pyproject: Remove python-coverage input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 70% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 72% ` [bug#70858] [PATCH python-team v2 11/32] build-system/pyproject: Remove python-coveralls native-input Nicolas Graves via Guix-patches via
` (11 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/python-web.scm (python-openid):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Rewrite check phase.
Change-Id: Id4ea5abc531f5fd84b60ff22407eb608f1e6ac29
---
gnu/packages/python-web.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ffac7968e02..5e585d7b60d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2338,17 +2338,18 @@ (define-public python-openid
"1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "coverage" "run" "-m"
- "unittest" "openid.test.test_suite")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "python" "-m" "unittest" "openid.test.test_suite")
+ (format #t "test suite not run~%")))))))
(propagated-inputs
(list python-defusedxml))
(native-inputs
- (list python-coverage python-psycopg2 python-django))
+ (list python-psycopg2 python-django))
(home-page "https://github.com/necaris/python3-openid")
(synopsis "OpenID support for servers and consumers")
(description "This library provides OpenID authentication for Python, both
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70858] [PATCH python-team v2 18/32] build-system/pyproject: Remove python-mypy native-input.
` (5 preceding siblings ...)
2024-06-01 15:36 62% ` [bug#70858] [PATCH python-team v2 17/32] build-system/pyproject: Remove python-tox native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 63% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 62% ` [bug#70858] [PATCH python-team v2 20/32] build-system/pyproject: Remove python-isort native-input Nicolas Graves via Guix-patches via
` (8 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-poliastro)[native-inputs]: Remove
python-mypy.
* gnu/packages/databases.scm (python-psycopg2)[native-inputs]: Remove
python-mypy.
* gnu/packages/engineering.scm (uranium, cura)[native-inputs]: Remove
python-mypy.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-mypy.
* gnu/packages/machine-learning.scm (python-imbalanced-learn,
python-captum, python-torchmetrics, python-pyro-ppl)[native-inputs]:
Remove python-mypy.
* gnu/packages/python-science.scm (python-scipy)[native-inputs]:
Remove python-mypy.
* gnu/packages/python-web.scm (python-huggingface-hub, python-asgiref,
python-starsessions-for-pytorch-lightning,
python-fastapi)[native-inputs]: Remove python-mypy.
* gnu/packages/python-xyz.scm (python-pyls-black, kalamine,
python-pydantic-cli, python-marshmallow, python-apispec,
python-typeguard, python-trio-typing, python-verspec,
python-catalogue, python-duckdb)[native-inputs]: Remove python-mypy.
* gnu/packages/serialization.scm (python-msgspec)[native-inputs]: Remove
python-mypy.
* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-mypy.
Change-Id: I947656750aa0c7732291d826641736aaefab274e
---
gnu/packages/astronomy.scm | 1 -
gnu/packages/databases.scm | 1 -
gnu/packages/engineering.scm | 2 --
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 ----
gnu/packages/python-science.scm | 1 -
gnu/packages/python-web.scm | 5 +----
gnu/packages/python-xyz.scm | 22 +++++++++-------------
gnu/packages/serialization.scm | 1 -
gnu/packages/virtualization.scm | 3 +--
10 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 32fc07d8d86..77bf41b68b9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2606,7 +2606,6 @@ (define-public python-poliastro
(setenv "HOME" "/tmp"))))))
(native-inputs
(list python-hypothesis
- python-mypy
python-flit-core
python-pytest
python-pytest-cov
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f9202639c53..ad27ec621ca 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -4112,7 +4112,6 @@ (define-public python-psycopg
(delete 'sanity-check))))
(native-inputs
(list python-cython-3
- python-mypy
python-psycopg-pool
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2620d5272b6..af79172e53b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3923,7 +3923,6 @@ (define-public uranium
graphviz
pkg-config
python-pytest
- python-mypy
python-certifi
python-twisted))
(propagated-inputs
@@ -4126,7 +4125,6 @@ (define-public cura
(build-system qt-build-system)
(native-inputs
(list python-certifi
- python-mypy
python-pytest
python-requests))
(inputs
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b396a97c0bc..ecc2dc2bb4c 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -218,7 +218,6 @@ (define-public python-uqbar
(native-inputs
(list graphviz
python-isort
- python-mypy
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 19f73d562e7..686cd726e37 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1920,7 +1920,6 @@ (define-public python-imbalanced-learn
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
(native-inputs (list python-keras
- python-mypy
python-pandas
python-pytest
python-pytest-cov
@@ -4521,7 +4520,6 @@ (define-public python-captum
python-flask-compress
python-ipython
python-ipywidgets
- python-mypy
python-parameterized
python-pytest
python-pytest-cov
@@ -4729,7 +4727,6 @@ (define-public python-torchmetrics
(list python-cloudpickle
python-fire
python-mir-eval
- python-mypy
python-pandas
python-psutil
python-pytest
@@ -5055,7 +5052,6 @@ (define-public python-pyro-ppl
python-isort
python-lap
python-matplotlib
- python-mypy
python-nbformat
python-nbsphinx
python-nbstripout
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index e20cb56db9c..567fa5d1559 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -273,7 +273,6 @@ (define-public python-scipy
'())
(list python-matplotlib
python-mpmath
- python-mypy
python-numpy
python-numpydoc
python-pydata-sphinx-theme
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 51753adae77..db815812299 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -196,7 +196,6 @@ (define-public python-huggingface-hub
python-fastapi
python-jedi
python-jinja2
- python-mypy
python-numpy
python-pillow
python-pydantic
@@ -717,7 +716,7 @@ (define-public python-asgiref
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
- (list python-mypy python-pytest python-pytest-asyncio))
+ (list python-pytest python-pytest-asyncio))
(propagated-inputs
(list python-typing-extensions))
(home-page "https://github.com/django/asgiref/")
@@ -8963,7 +8962,6 @@ (define-public python-starsessions-for-pytorch-lightning
python-starlette-for-fastapi-0.88))
(native-inputs
(list python-httpx
- python-mypy
python-poetry-core
python-pytest
python-pytest-asyncio
@@ -9009,7 +9007,6 @@ (define-public python-fastapi
python-hatchling
python-isort
python-jose
- python-mypy
python-passlib
python-peewee
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c83146372bf..963747bb06a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3020,7 +3020,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-toml python-tomli))
(native-inputs
- (list python-isort python-mypy python-pytest
+ (list python-isort python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -6785,7 +6785,7 @@ (define-public kalamine
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs
- (list python-hatchling python-mypy python-pytest))
+ (list python-hatchling python-pytest))
(home-page "https://github.com/OneDeadKey/kalamine")
(synopsis "Keyboard layout maker")
(description
@@ -8002,8 +8002,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-mypy
- python-pytest))
+ (list python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
(description
@@ -23461,6 +23460,8 @@ (define-public python-duckdb
(list
#:test-flags
'(list "--ignore=tests/slow/test_h2oai_arrow.py"
+ ;; stubs require mypy and don't actually check functionality.
+ "--ignore=tests/stubs/test_stubs.py"
;; Don't install anything, thank you.
"-k" "not test_install_non_existent_extension")
#:phases
@@ -23485,7 +23486,6 @@ (define-public python-duckdb
(list pybind11
python-fsspec
python-google-cloud-storage
- python-mypy
python-numpy
python-pandas
python-psutil
@@ -25107,7 +25107,6 @@ (define-public python-marshmallow
(list python-packaging))
(native-inputs
(list python-flake8-bugbear
- python-mypy
python-pytest
python-pytz
python-simplejson
@@ -25169,7 +25168,6 @@ (define-public python-apispec
(native-inputs
(list python-flake8-bugbear
python-marshmallow
- python-mypy
python-pytest
python-pyyaml
python-setuptools
@@ -26586,8 +26584,7 @@ (define-public python-typeguard
;; XXX: These fail when installed as a library:
;; https://github.com/agronholm/typeguard/issues/176
"not usefixtures and not test_cached_module")))))))
- (native-inputs (list python-mypy
- python-pytest
+ (native-inputs (list python-pytest
python-setuptools-scm
python-typing-extensions))
(home-page "https://github.com/agronholm/typeguard")
@@ -29057,8 +29054,7 @@ (define-public python-trio-typing
(native-inputs (list python-attrs python-pytest python-setuptools
python-wheel))
(propagated-inputs
- (list python-mypy python-mypy-extensions python-trio
- python-typing-extensions))
+ (list python-mypy-extensions python-trio python-typing-extensions))
(home-page "https://github.com/python-trio/trio-typing")
(synopsis "Static type checking support for Trio and related projects")
(description
@@ -35498,7 +35494,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-mypy python-pretend python-pytest))
+ (native-inputs (list python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
@@ -36245,7 +36241,7 @@ (define-public python-catalogue
"0srdxiil2xys8q1gpc1nvzhvis3a33d8a7amk2i1rlpbg6p36pak"))))
(build-system python-build-system)
(native-inputs (list python-pytest))
- (inputs (list python python-zipp python-typing-extensions python-mypy))
+ (inputs (list python python-zipp python-typing-extensions))
(home-page "https://github.com/explosion/catalogue")
(synopsis "Lightweight function registries for your library")
(description
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 728d6404bb9..b39ce176502 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -719,7 +719,6 @@ (define-public python-msgspec
(native-inputs (list python-attrs
python-gcovr
python-msgpack
- python-mypy
python-pytest
python-setuptools-scm
python-versioneer
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 85ad5031059..1a75ae0a09e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,8 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-mypy
- python-pyhamcrest
+ (list python-pyhamcrest
python-setuptools
python-twine
python-wheel))
--
2.41.0
^ permalink raw reply related [relevance 63%]
* [bug#70858] [PATCH python-team v2 06/32] build-system/pyproject: Remove python-coverage input.
2024-06-01 15:36 61% ` [bug#70858] [PATCH python-team v2 03/32] build-system/pyproject: Remove python-black input Nicolas Graves via Guix-patches via
2024-06-01 15:36 42% ` [bug#70858] [PATCH python-team v2 05/32] build-system/pyproject: Remove python-flake8 inputs Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 50% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 70% ` [bug#70858] [PATCH python-team v2 10/32] gnu: python-openid: Remove python-coverage native-input Nicolas Graves via Guix-patches via
` (12 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/android.scm (python-androguard):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Adapt 'check phase replacement.
* gnu/packages/astronomy.scm (python-asdf-astropy, python-astropy,
python-poliastro)[native-inputs]: Remove python-coverage.
* gnu/packages/bioinformatics.scm (python-ega-download-client,
python-scikit-bio, python-cooler)[native-inputs]: Remove
python-coverage.
* gnu/packages/check.scm (python-pytest-randomly,
python-pytest-flakes, python-aiounittest)[native-inputs]: Remove
python-coverage.
* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-coverage.
* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-coverage.
* gnu/packages/django.scm (python-django-haystack)[native-inputs]:
Remove python-coverage.
* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-coverage.
* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-coverage.
* gnu/packages/gpodder.scm (gpodder)[native-inputs]: Remove
python-coverage.
* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coverage.
* gnu/packages/jupyter.scm (python-jupyter-packaging)[native-inputs]:
Remove python-coverage.
* gnu/packages/machine-learning.scm (onnx, onnx-optimizer,
python-lightning-utilities, python-pytorch-lightning,
python-torchmetrics, python-gpytorch)[native-inputs]: Remove
python-coverage.
* gnu/packages/music.scm (python-pylast)[native-inputs]: Remove
python-coverage.
* gnu/packages/package-management.scm (python-anaconda-client,
conda)[native-inputs]: Remove python-coverage.
* gnu/packages/python-check.scm (python-vcrpy,
python-re-assert)[native-inputs]: Remove python-coverage.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-coverage.
* gnu/packages/python-web.scm (python-ovh, python-flask-misaka,
python-zope-interface, python-zope-hookable, python-url,
python-transaction, python-sanic, python-woob,
python-flask-combo-jsonapi)[native-inputs]: Remove python-coverage.
* gnu/packages/python-xyz.scm (python-apprise, python-arpeggio,
python-affine, python-colorful, python-lunr, python-mdit-py-plugins,
python-bidict, python-sh, python-cftime, python-can,
python-jsonargparse, python-extension-helpers, python-pyjwt,
python-virtualenv-clone, python-lsp-server, python-pikepdf,
python-tasklogger, python-notebook, python-structlog, binwalk,
python-argcomplete, python-attrs, python-yq, python-stone,
python-identify, python-nodeenv, python-anyio, python-forbiddenfruit,
python-watchgod, python-eliot, python-pem, python-scikit-build,
python-minikanren, nikola, python-verspec, python-mike)
[native-inputs]: Remove python-coverage.
* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-coverage.
* gnu/packages/statistics.scm (python-emcee,
python-rpy2)[native-inputs]: Remove python-coverage.
* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coverage.
* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-coverage.
* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-coverage.
* gnu/packages/version-control.scm (pre-commit)[native-inputs]: Remove
python-coverage.
* gnu/packages/web.scm (python-httpretty)[native-inputs]: Remove
python-coverage.
* gnu/packages/xml.scm (python-xmltodict)[native-inputs]: Remove
python-coverage.
Change-Id: I66b28e624aac94f1a2f6e4fae5cdb444193cd8d9
---
gnu/packages/android.scm | 6 +--
gnu/packages/astronomy.scm | 7 +--
gnu/packages/bioinformatics.scm | 8 ++--
gnu/packages/check.scm | 7 ++-
gnu/packages/cpp.scm | 3 +-
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/engineering.scm | 3 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gpodder.scm | 3 +-
gnu/packages/graph.scm | 3 +-
gnu/packages/jupyter.scm | 2 +-
gnu/packages/machine-learning.scm | 10 +---
gnu/packages/music.scm | 3 +-
gnu/packages/package-management.scm | 6 +--
gnu/packages/python-check.scm | 5 +-
gnu/packages/python-compression.scm | 12 ++---
gnu/packages/python-web.scm | 20 ++++----
gnu/packages/python-xyz.scm | 72 +++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/statistics.scm | 6 +--
gnu/packages/syndication.scm | 4 +-
gnu/packages/terminals.scm | 9 ++--
gnu/packages/textutils.scm | 1 -
gnu/packages/version-control.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/xml.scm | 2 +-
27 files changed, 63 insertions(+), 137 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index cbfbd6522f4..ab42f2be980 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1072,11 +1072,9 @@ (define-public python-androguard
(replace 'check
;; Adapted from .travis.yml
(lambda _
- (invoke "nosetests" "--with-coverage" "--with-timer"
- "--timer-top-n" "50"))))))
+ (invoke "nosetests" "--with-timer" "--timer-top-n" "50"))))))
(native-inputs
- (list python-codecov python-coverage python-mock python-nose
- python-nose-timer))
+ (list python-codecov python-mock python-nose python-nose-timer))
(propagated-inputs
(list python-asn1crypto
python-colorama
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 02d0726b9be..7589ecbb8ae 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1678,7 +1678,6 @@ (define-public python-astropy
(native-inputs
(list pkg-config
python-colorlog
- python-coverage
python-cython-3
python-extension-helpers
python-h5py
@@ -2606,8 +2605,7 @@ (define-public python-poliastro
(lambda _
(setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-mypy
python-flit-core
python-pytest
@@ -4955,8 +4953,7 @@ (define-public python-asdf-astropy
(add-before 'check 'set-home-env
(lambda _ (setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-h5py
+ (list python-h5py
python-pandas
python-pytest
python-pytest-astropy
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index aa7f2988191..d8994cf65fa 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2767,8 +2767,7 @@ (define-public python-ega-download-client
(propagated-inputs (list python-htsget python-psutil python-requests
python-tqdm python-urllib3))
(native-inputs
- (list python-coverage
- python-mock
+ (list python-mock
python-pyfakefs
python-pytest
python-responses
@@ -5360,7 +5359,7 @@ (define-public python-scikit-bio
python-requests
python-scipy))
(native-inputs
- (list python-coverage python-pytest))
+ (list python-pytest))
(home-page "https://scikit-bio.org")
(synopsis "Data structures, algorithms and educational resources for bioinformatics")
(description
@@ -17972,8 +17971,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-coverage
- python-hatchling
+ (list python-hatchling
python-isort
python-pytest
python-pytest-cov))
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 880d3cb46f3..b7116b3f0e2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1617,8 +1617,7 @@ (define-public python-pytest-randomly
"not reordered "
"and not test_it_runs_before_stepwise "
"and not test_entrypoint_injection"))))))))
- (native-inputs (list python-coverage
- python-factory-boy
+ (native-inputs (list python-factory-boy
python-faker
python-numpy
python-pytest-xdist))
@@ -2715,7 +2714,7 @@ (define-public python-pytest-flakes
(add-installed-pythonpath inputs outputs)
(invoke "py.test" "-vv" "-k" "not test_syntax_error"))))))
(native-inputs
- (list python-coverage python-pytest python-pytest-pep8))
+ (list python-pytest python-pytest-pep8))
(propagated-inputs
(list python-pyflakes))
(home-page "https://github.com/fschulze/pytest-flakes")
@@ -3568,7 +3567,7 @@ (define-public python-aiounittest
#t)))))
(propagated-inputs (list python-wrapt))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(home-page
"https://github.com/kwarunek/aiounittest")
(synopsis "Test asyncio code more easily")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 8a0bd62d6b6..ba2698056da 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1189,8 +1189,7 @@ (define-public cpplint
(setenv "GUIX_PYTHONPATH"
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
- (list python-coverage
- python-pytest
+ (list python-pytest
python-pytest-cov
python-pytest-runner
python-testfixtures))
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d6..67567a6b310 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -269,7 +269,6 @@ (define-public reprotest
`(("diffoscope" ,diffoscope)
("help2man" ,help2man)
("libfaketime" ,libfaketime)
- ("python-coverage" ,python-coverage)
("python-docutils" ,python-docutils)
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4a271eaf0b5..298968d37c6 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -495,7 +495,6 @@ (define-public python-django-haystack
(list python-django))
(native-inputs
(list gdal
- python-coverage
python-dateutil
python-geopy
python-mock
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 610fb53087b..2620d5272b6 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2678,8 +2678,7 @@ (define-public python-scikit-rf
python-pyqtgraph
python-qtpy
python-scipy))
- (native-inputs (list python-coverage
- python-nbval
+ (native-inputs (list python-nbval
python-networkx
python-pytest
python-pytest-cov
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 69cc7e6ddc5..806120e939d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3264,7 +3264,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-coverage
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index f9102d3a447..0786010471f 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -64,7 +64,6 @@ (define-public gpodder
(build-system python-build-system)
(native-inputs
(list intltool
- python-coverage
python-minimock
python-pytest
python-pytest-cov
@@ -173,7 +172,7 @@ (define-public python-mygpoclient
"1fi5x6k1mngr0iviw2s4n1f3y2x7pwqy5ivkcrjdprzvwr37f0mh"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-minimock python-nose))
+ (list python-minimock python-nose))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eb8aa17fdfe..f83a23dd0be 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coverage
python-coveralls
python-nose
python-nose2
@@ -564,7 +563,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-pytest))
+ (list python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 9175780b748..6600aab6c6b 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -512,7 +512,7 @@ (define-public python-jupyter-packaging
(list python-deprecation python-packaging python-setuptools
python-tomlkit python-wheel))
(native-inputs
- (list python-pypa-build python-coverage python-pytest
+ (list python-pypa-build python-pytest
python-pytest-cov python-pytest-mock))
(home-page "https://jupyter.org")
(synopsis "Jupyter packaging utilities")
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index bf09c9ec4c1..19f73d562e7 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1364,7 +1364,6 @@ (define args
(list cmake
googletest
pybind11
- python-coverage
python-nbval
python-pytest
python-pytest-runner))
@@ -1443,8 +1442,7 @@ (define-public onnx-optimizer
#~(modify-phases #$phases
(delete 'relax-requirements)))))
(native-inputs
- (list cmake python-pytest python-pytest-runner python-nbval
- python-coverage))
+ (list cmake python-pytest python-pytest-runner python-nbval))
(inputs
(list onnx protobuf pybind11))
(propagated-inputs
@@ -4487,7 +4485,6 @@ (define-public python-lightning-utilities
(build-system python-build-system)
(propagated-inputs (list python-importlib-metadata python-packaging
python-typing-extensions))
- (native-inputs (list python-coverage))
(home-page "https://github.com/Lightning-AI/utilities")
(synopsis "PyTorch Lightning sample project")
(description "This package provides common Python utilities and GitHub
@@ -4701,7 +4698,6 @@ (define-public python-pytorch-lightning
(native-inputs
(list python-aiohttp
python-cloudpickle
- python-coverage
python-flaky
python-pympler
python-pytest
@@ -4731,7 +4727,6 @@ (define-public python-torchmetrics
python-typing-extensions))
(native-inputs
(list python-cloudpickle
- python-coverage
python-fire
python-mir-eval
python-mypy
@@ -5132,8 +5127,7 @@ (define-public python-gpytorch
#~(list "-k" (string-append "not test_deprecated_methods"
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
- (native-inputs (list python-coverage
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-nbval
python-pytest
python-setuptools
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ad026f5d359..fb9ff038de5 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4072,8 +4072,7 @@ (define-public python-pylast
;; https://github.com/pylast/pylast/issues/105
(arguments '(#:tests? #f))
(native-inputs
- (list python-coverage python-pytest python-flaky python-pyyaml
- python-setuptools-scm))
+ (list python-pytest python-flaky python-pyyaml python-setuptools-scm))
(home-page "https://github.com/pylast/pylast")
(synopsis "Python interface to Last.fm and Libre.fm")
(description "A Python interface to Last.fm and other API-compatible
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index feed16ebcef..4e7e46bf1b3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1100,8 +1100,7 @@ (define-public python-anaconda-client
(list python-clyent python-nbformat python-pyyaml python-requests
python-setuptools))
(native-inputs
- (list python-coverage
- python-dateutil
+ (list python-dateutil
python-freezegun
python-mock
python-pillow
@@ -1286,8 +1285,7 @@ (define-public conda
;; XXX: This is dragged in by libarchive and is needed at runtime.
zstd))
(native-inputs
- (list python-coverage
- python-flaky
+ (list python-flaky
python-pytest-timeout
python-pytest-xprocess
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index ca87289a1e1..eb48ae3fadf 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-coverage
- python-flake8
+ (list python-flake8
python-flask
python-httplib2
python-ipaddress
@@ -1145,7 +1144,7 @@ (define-public python-re-assert
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-covdefaults python-coverage python-pytest))
+ (list python-covdefaults python-pytest))
(propagated-inputs
(list python-regex))
(home-page "https://github.com/asottile/re-assert")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 34a9cd73a20..b2d789c92d0 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coverage
python-coveralls
python-hypothesis
python-pyannotate
@@ -247,8 +246,7 @@ (define-public python-pybcj
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-metadata))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-pytest-cov
python-setuptools-scm
@@ -281,8 +279,7 @@ (define-public python-bcj-cffi
(propagated-inputs
(list python-cffi python-toml python-setuptools-scm))
(native-inputs
- (list python-setuptools python-coverage python-pytest
- python-pytest-cov))
+ (list python-setuptools python-pytest python-pytest-cov))
(home-page "https://github.com/miurahr/bcj-cffi")
(synopsis "Branch / Call /Jump CFFI library in Python")
(description "This package provides an implementation of the Branch / Call /
@@ -407,8 +404,7 @@ (define-public python-pyppmd
"03w4x26mar0ha73c3v39psn1i0k6xrzwmaxfsxysic73jz99np07"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-pytest-benchmark
python-pytest-cov
@@ -441,7 +437,6 @@ (define-public python-ppmd-cffi
(native-inputs
(list python-hypothesis
python-setuptools-scm
- python-coverage
python-pytest
python-pytest-cov))
(home-page "https://github.com/miurahr/ppmd")
@@ -479,7 +474,6 @@ (define-public python-py7zr
(list python-setuptools
python-wheel
python-setuptools-scm
- python-coverage
python-coveralls
python-libarchive-c
python-py-cpuinfo
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ba378088cf8..ffac7968e02 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -977,8 +977,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-coverage
- python-isort
+ (native-inputs (list python-isort
python-pytest
python-pytest-cov
python-setuptools
@@ -1857,7 +1856,7 @@ (define-public python-flask-misaka
"12gm6hq3lvlj0ddw8p6lk5pky8jk3pw758ihffjl49shnnzc68zl"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-mock))
+ (list python-mock))
(propagated-inputs
(list python-flask python-misaka))
(home-page "https://github.com/singingwolfboy/flask-misaka/")
@@ -2996,8 +2995,7 @@ (define-public python-zope-interface
(build-system python-build-system)
(arguments '(#:tests? #f)) ; test suite can't find python-zope-testing
(native-inputs
- (list python-coverage python-nose python-zope-event
- python-zope-testing))
+ (list python-nose python-zope-event python-zope-testing))
(home-page "https://github.com/zopefoundation/zope.interface")
(synopsis "Python implementation of the \"design by contract\"
methodology")
@@ -3290,7 +3288,7 @@ (define-public python-zope-hookable
"0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-zope-testing))
+ (list python-zope-testing))
(home-page "https://github.com/zopefoundation/zope.hookable")
(synopsis "Zope hookable")
(description "This package supports the efficient creation of hookable
@@ -4499,7 +4497,7 @@ (define-public python-url
(propagated-inputs
(list python-publicsuffix))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(arguments
`(#:tests? #f)) ; FIXME: tests fail with "ImportError: No module named 'tests'"
(home-page "https://github.com/seomoz/url-py")
@@ -7168,7 +7166,7 @@ (define-public python-transaction
(propagated-inputs
(list python-zope-interface))
(native-inputs
- (list python-coverage python-mock python-nose))
+ (list python-mock python-nose))
(home-page "https://github.com/zopefoundation/transaction")
(synopsis "Transaction management for Python")
(description "This package contains a generic transaction implementation
@@ -7630,7 +7628,6 @@ (define-public python-sanic
(list python-bandit
python-beautifulsoup4
python-chardet
- python-coverage
python-cryptography
python-docutils
python-mypy
@@ -8329,7 +8326,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-nose python-selenium python-xunitparser))
+ (list python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
@@ -8378,8 +8375,7 @@ (define-public python-flask-combo-jsonapi
python-simplejson
python-six))
(native-inputs
- (list python-coverage
- python-coveralls
+ (list python-coveralls
python-pytest
python-pytest-runner))
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3ca12d05ee5..b849f6fdaa2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -318,7 +318,6 @@ (define-public python-apprise
python-requests
python-requests-oauthlib))
(native-inputs (list python-babel
- python-coverage
python-cryptography
python-paho-mqtt
python-pytest
@@ -1020,7 +1019,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-coveralls python-flake8 python-pydocstyle
+ (propagated-inputs (list python-coveralls python-pydocstyle
python-pytest python-pytest-cov))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
@@ -1182,7 +1181,7 @@ (define-public python-colorful
(base32 "0kyy9qhvrb5m9h8xmri7c88i0k1g5qc7017anw39gx44an7mn33y"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-pytest python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -1306,8 +1305,7 @@ (define-public python-lunr
'(list "-k" "not TestLanguageSupport"
"--ignore-glob=tests/acceptance_tests/*")))
(native-inputs
- (list python-coverage
- python-hatch-fancy-pypi-readme
+ (list python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
python-pytest-timeout
@@ -1340,8 +1338,7 @@ (define-public python-mdit-py-plugins
(list python-markdown-it-py
python-attrs))
(native-inputs
- (list python-coverage
- python-flit-core
+ (list python-flit-core
python-pytest
python-pytest-cov
python-pytest-regressions))
@@ -2689,8 +2686,7 @@ (define-public python-bidict
"02dy0b1k7qlhn7ajyzkrvxhyhjj0hzcq6ws3zjml9hkdz5znz92g"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-py
python-pytest
python-pytest-benchmark
@@ -3053,8 +3049,6 @@ (define-public python-sh
;; XXX: A Python 2 test fails when HOME=/homeless-shelter.
(setenv "HOME" "/tmp")
(invoke "python" "sh.py" "test"))))))
- (native-inputs
- (list python-coverage))
(home-page "https://github.com/amoffat/sh")
(synopsis "Python subprocess replacement")
(description "This package provides a replacement for Python's
@@ -3076,7 +3070,6 @@ (define-public python-cftime
(list python-numpy))
(native-inputs
(list python-check-manifest
- python-coverage
python-coveralls
python-cython
python-pytest-cov
@@ -3581,7 +3574,6 @@ (define-public python-can
(native-inputs
(list ;; python-canalystii ; Not packed yet
python-codecov
- python-coverage
python-future
python-hypothesis
python-mock
@@ -4519,7 +4511,6 @@ (define-public python-jsonargparse
python-typeshed-client))
(native-inputs
(list python-attrs
- python-coverage
python-pycodestyle
python-pydantic
python-pytest
@@ -5047,8 +5038,7 @@ (define-public python-extension-helpers
;; - _pytest.pathlib.ImportPathMismatchError: ('extension_helpers.conftes
(arguments (list #:tests? #f))
(native-inputs
- (list python-coverage
- python-pytest
+ (list python-pytest
python-pytest-astropy
python-pytest-cov
python-setuptools-scm
@@ -6008,8 +5998,7 @@ (define-public python-pyjwt
"1z85kwr945rbzrn5wabrsmck5x8disa9wc7b3y5gci7w65z5qa39"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage
- python-cryptography
+ (list python-cryptography
python-pytest
python-sphinx
python-sphinx-rtd-theme
@@ -6237,7 +6226,6 @@ (define-public python-virtualenv-clone
(native-inputs (list python-pytest
python-tox
python-virtualenv
- python-coverage
python-wheel
python-tomli
python-hypothesis))
@@ -8202,7 +8190,6 @@ (define-public python-lsp-server
(native-inputs
(list python-autopep8
python-flake8
- python-coverage
python-flaky
python-matplotlib
python-numpy
@@ -10222,7 +10209,6 @@ (define-public python-pikepdf
(native-inputs
(list pybind11
python-attrs
- python-coverage
python-hypothesis
python-setuptools-scm
python-psutil
@@ -16049,7 +16035,7 @@ (define-public python-tasklogger
(base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-deprecated))
- (native-inputs (list python-coverage python-coveralls python-nose2
+ (native-inputs (list python-coveralls python-nose2
python-numpy python-setuptools python-wheel))
(home-page "https://github.com/scottgigante/tasklogger")
(synopsis "Extension to the core Python logging library")
@@ -17605,8 +17591,7 @@ (define-public python-notebook
python-tornado-6
python-traitlets))
(native-inputs
- (list python-coverage
- python-jupyter-server
+ (list python-jupyter-server
python-nbval
python-pytest
python-pytest-cov
@@ -18367,7 +18352,6 @@ (define-public python-structlog
python-hatch-vcs
python-hatchling
;; For the tests
- python-coverage
python-freezegun
python-pretend
python-pytest
@@ -22689,7 +22673,7 @@ (define-public binwalk
(lambda _
(setenv "HOME" ""))))))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(home-page "https://github.com/ReFirmLabs/binwalk")
(synopsis "Firmware analysis tool")
(description "Binwalk is a tool for analyzing, reverse engineering, and
@@ -23273,8 +23257,7 @@ (define-public python-argcomplete
"def __disable_test_console_script"))
(invoke "python3" "./test/test.py" "-v")))))))
(native-inputs
- (list python-coverage
- python-pexpect
+ (list python-pexpect
python-setuptools
python-setuptools-scm
python-wheel
@@ -26267,7 +26250,7 @@ (define-public python-yq
(inputs
(list python-argcomplete python-pyyaml python-xmltodict python-toml jq))
(native-inputs
- (list python-coverage python-setuptools-scm python-wheel))
+ (list python-setuptools-scm python-wheel))
(home-page "https://github.com/kislyuk/yq")
(synopsis "Command-line YAML/XML processor")
(description
@@ -27336,7 +27319,7 @@ (define-public python-stone
(propagated-inputs
(list python-ply python-six))
(native-inputs
- (list python-coverage python-mock python-pytest python-pytest-runner))
+ (list python-mock python-pytest python-pytest-runner))
(home-page "https://github.com/dropbox/stone")
(synopsis "Official Api Spec Language for Dropbox")
(description
@@ -27592,8 +27575,7 @@ (define-public python-identify
;; system-error "utime" "~A" ("No such file or directory")
(delete 'ensure-no-mtimes-pre-1980))))
(native-inputs
- (list python-coverage python-pytest python-setuptools
- python-ukkonen python-wheel))
+ (list python-pytest python-setuptools python-ukkonen python-wheel))
(propagated-inputs
(list python-editdistance))
(home-page "https://github.com/chriskuehl/identify")
@@ -27689,8 +27671,7 @@ (define-public python-nodeenv
"not test_smoke"
" and not test_smoke_n_system_special_chars"))))
(native-inputs
- (list python-coverage
- python-mock
+ (list python-mock
python-pytest
python-setuptools
python-wheel))
@@ -30049,7 +30030,6 @@ (define-public python-anyio
python-typing-extensions))
(native-inputs
(list python-contextlib2
- python-coverage
python-hypothesis
python-mock
python-pytest
@@ -30415,7 +30395,7 @@ (define-public python-forbiddenfruit
(lambda _
(invoke "make" "SKIP_DEPS=1"))))))
(native-inputs
- (list python-nose python-coverage))
+ (list python-nose))
(home-page "https://github.com/clarete/forbiddenfruit")
(synopsis "Patch python built-in objects")
(description "This project allows Python code to extend built-in types.")
@@ -30593,7 +30573,6 @@ (define-public python-watchgod
"-k" "not test_watch_log and not test_awatch")))
(native-inputs
(list python-anyio
- python-coverage
python-pygments
python-pytest
python-pytest-asyncio
@@ -31387,8 +31366,7 @@ (define-public python-eliot
(list python-boltons python-pyrsistent python-six
python-zope-interface))
(native-inputs
- (list python-coverage
- python-dask
+ (list python-dask
python-hypothesis
python-pytest
python-setuptools
@@ -31420,7 +31398,6 @@ (define-public python-pem
(build-system python-build-system)
(native-inputs
(list python-certifi
- python-coverage
python-pretend
python-pyopenssl
python-pytest
@@ -33414,7 +33391,6 @@ (define-public python-scikit-build
gfortran
git-minimal/pinned ;for tests
ninja
- python-coverage
python-cython
python-hatchling
python-hatch-fancy-pypi-readme
@@ -34141,8 +34117,7 @@ (define-public python-minikanren
python-pytest-cov
python-pylint
python-sympy
- python-versioneer
- python-coverage))
+ python-versioneer))
(propagated-inputs
(list python-toolz python-cons python-multipledispatch
python-etuples python-logical-unification))
@@ -35085,8 +35060,7 @@ (define-public nikola
python-unidecode
python-yapsy))
(native-inputs
- (list python-coverage
- python-freezegun
+ (list python-freezegun
python-pytest
python-pytest-cov))
(arguments
@@ -35557,8 +35531,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-coverage python-mypy
- python-pretend python-pytest))
+ (native-inputs (list python-mypy python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
@@ -35956,7 +35929,7 @@ (define-public python-mike
"0yxp816x7s948xsd0fifvq9shg01xdxlifd9rzf5y2rd9iwz3hsn"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-shtab))
+ (list python-shtab))
(propagated-inputs
(list python-jinja2 python-mkdocs python-pyyaml python-verspec))
(home-page "https://github.com/jimporter/mike")
@@ -35978,8 +35951,7 @@ (define-public python-arpeggio
(base32
"0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n"))))
(build-system python-build-system)
- (native-inputs (list python-coverage
- python-coveralls
+ (native-inputs (list python-coveralls
python-mike
python-mkdocs
python-pytest
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 7831802284f..18d97ae44eb 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -1218,7 +1218,6 @@ (define-public python-dolfin-adjoint
(list fenics openmpi pybind11))
(native-inputs
(list pkg-config
- python-coverage
python-decorator
python-pkgconfig
python-pytest))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0a6f61e2280..bfc69062587 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2396,8 +2396,7 @@ (define-public python-emcee
(base32 "1vbz67cwzig28dlndkm6g246p1vcvj6yy2w65z8cdyffigf1j3lf"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy))
- (native-inputs (list python-coverage
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-cov
python-setuptools
python-setuptools-scm
@@ -6777,8 +6776,7 @@ (define-public python-rpy2
python-numpy
zlib))
(native-inputs
- (list python-coverage
- python-ipython
+ (list python-ipython
python-numpy
python-pandas
python-pytest
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 0f12f94d0bc..397a477972e 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -435,7 +435,6 @@ (define-public rtv
(native-inputs
(list ncurses
python-coveralls
- python-coverage
python-mock
python-pytest
python-vcrpy))
@@ -468,8 +467,7 @@ (define-public tuir
(list python-beautifulsoup4 python-decorator python-kitchen
python-requests python-six))
(native-inputs
- (list python-coverage
- python-coveralls
+ (list python-coveralls
python-mock
python-pytest
python-setuptools
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 90dc011a70e..e424e41a222 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1197,8 +1197,7 @@ (define-public python-halo
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
(native-inputs
- (list python-coverage
- python-nose
+ (list python-nose
python-setuptools
python-tox
python-twine
@@ -1229,8 +1228,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-coverage python-nose
- python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
(description "This package provides a Python library with graphical symbols
@@ -1257,8 +1255,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-coverage python-nose
- python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
(description "Spinners is a Python library that contains graphical spinners
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index bf2da58a3ee..2c7fd0365ca 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1674,7 +1674,6 @@ (define-public python-panflute
(build-system python-build-system)
(propagated-inputs (list python-click python-pyyaml))
(native-inputs (list python-configparser
- python-coverage
python-pandocfilters
python-pytest
python-pytest-cov
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 0016c5bc9b6..1c21f512754 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2064,7 +2064,6 @@ (define-public pre-commit
(native-inputs
(list git-minimal
python-covdefaults
- python-coverage
python-distlib
python-pytest
python-pytest-env
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c29a8b3ca7b..736be82c90b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6893,8 +6893,7 @@ (define-public python-httpretty
(when tests?
(invoke "nosetests")))))))
(native-inputs
- (list python-coverage
- python-eventlet
+ (list python-eventlet
python-nose
python-rednose
python-requests
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 2654f688d4b..1f767ba69b2 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1950,7 +1950,7 @@ (define-public python-xmltodict
"08cadlb9vsb4pmzc99lz3a2lx6qcfazyvgk10pcqijvyxlwcdn2h"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-nose python-setuptools python-wheel))
+ (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/martinblech/xmltodict")
(synopsis "Work with XML like you are working with JSON")
(description "This package provides a Python library to convert XML to
--
2.41.0
^ permalink raw reply related [relevance 50%]
* [bug#70858] [PATCH python-team v2 20/32] build-system/pyproject: Remove python-isort native-input.
` (6 preceding siblings ...)
2024-06-01 15:36 63% ` [bug#70858] [PATCH python-team v2 18/32] build-system/pyproject: Remove python-mypy native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 62% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 72% ` [bug#70858] [PATCH python-team v2 21/32] build-system/pyproject: Remove python-twine native-input Nicolas Graves via Guix-patches via
` (7 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/bioinformatics.scm (python-cooler,
scvelo)[native-inputs]: Remove python-isort.
* gnu/packages/databases.scm (aerich)[native-inputs]: Remove
python-isort.
* gnu/packages/django.scm (python-django-taggit)[native-inputs]:
Remove python-isort.
* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-isort.
* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-isort.
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-isort.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-isort.
* gnu/packages/machine-learning.scm (python-funsor,
python-pyro-ppl)[native-inputs]: Remove python-isort.
* gnu/packages/mail.scm (python-hyperkitty, postorius)[native-inputs]:
Remove python-isort.
* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-isort.
* gnu/packages/python-check.scm (python-pytest-toolbox)
[native-inputs]: Remove python-pytest-isort.
* gnu/packages/python-web.scm (python-ovh, python-tinycss2,
python-fastapi)[native-inputs]: Remove python-isort.
* gnu/packages/python-xyz.scm (python-jupytext, python-pyls-black,
python-eventlet, python-textdistance,
python-validators)[native-inputs]: Remove python-isort.
* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[native-inputs]: Remove python-isort.
* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-isort.
* gnu/packages/virtualization.scm (python-qemu-qmp)[native-inputs]:
Remove python-isort.
Change-Id: I6dc9a49cdbb10ddd33ea32854f891312d3a29e53
---
gnu/packages/bioinformatics.scm | 2 --
gnu/packages/databases.scm | 1 -
gnu/packages/django.scm | 2 +-
gnu/packages/finance.scm | 1 -
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 +---
gnu/packages/mail.scm | 3 +--
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 1 -
gnu/packages/python-web.scm | 4 +---
gnu/packages/python-xyz.scm | 7 ++-----
gnu/packages/sphinx.scm | 2 --
gnu/packages/statistics.scm | 1 -
gnu/packages/virtualization.scm | 1 -
16 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d8994cf65fa..366caec31fd 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17972,7 +17972,6 @@ (define-public python-cooler
python-simplejson))
(native-inputs
(list python-hatchling
- python-isort
python-pytest
python-pytest-cov))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
@@ -21816,7 +21815,6 @@ (define-public scvelo
(propagated-inputs
(list python-anndata
python-hnswlib
- python-isort
python-igraph
python-loompy
python-louvain
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ad27ec621ca..9ec7855109c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3251,7 +3251,6 @@ (define-public aerich
(list poetry
python-bandit
python-cryptography
- python-isort
python-pydantic
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f5b1e0462bb..48b1b38a97f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -387,7 +387,7 @@ (define-public python-django-taggit
(lambda _
(invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
(propagated-inputs
- (list python-django python-isort))
+ (list python-django))
(native-inputs
(list python-pytest python-mock))
(home-page
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7579001dd1f..6f70d61f700 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-isort
python-pillow
python-protobuf
python-pyqt
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index be96e6800a3..73644ab2bb4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3263,7 +3263,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-isort
python-pytest
python-pytest-aiohttp
python-readme-renderer
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index bbb19bd4cb8..39215a0ccb6 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -216,7 +216,6 @@ (define-public mdpo
(list python-bump2version
python-flake8-implicit-str-concat
python-flake8-print
- python-isort
python-pytest
python-pytest-cov
python-sphinx
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index ecc2dc2bb4c..f6a58943ecb 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-isort
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 686cd726e37..bec948a4bfd 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-isort
- python-nbsphinx
+ (native-inputs (list python-nbsphinx
python-pandas
python-pillow
python-pyro-api
@@ -5049,7 +5048,6 @@ (define-public python-pyro-ppl
(list ninja
jupyter
python-graphviz
- python-isort
python-lap
python-matplotlib
python-nbformat
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5743558e76b..7c4b6f2cb26 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3724,7 +3724,6 @@ (define-public python-hyperkitty
(native-inputs
(list python-beautifulsoup4
python-elasticsearch
- python-isort
python-lxml
python-mock
python-whoosh))
@@ -3763,7 +3762,7 @@ (define-public postorius
(list python-readme-renderer python-mailmanclient
python-django python-django-mailman3))
(native-inputs
- (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
+ (list python-beautifulsoup4 python-mock python-vcrpy))
(home-page "https://gitlab.com/mailman/postorius")
(synopsis "Web user interface for GNU Mailman")
(description
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 502ad09a3a6..9c4d56bd384 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 8fd3a8924f1..1087f7b9168 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1495,7 +1495,6 @@ (define-public python-pytest-toolbox
(native-inputs
(list python-pydantic
python-pytest
- python-pytest-isort
python-setuptools
python-wheel))
(home-page "https://github.com/samuelcolvin/pytest-toolbox")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index db815812299..a040eb81448 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -976,8 +976,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-isort
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-cov
python-setuptools
python-sphinx
@@ -9005,7 +9004,6 @@ (define-public python-fastapi
(native-inputs (list python-databases
python-flask
python-hatchling
- python-isort
python-jose
python-passlib
python-peewee
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 180158e3b64..4538dccd84c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
python-autopep8
python-flake8
python-gitpython
- python-isort
python-ipython-genutils
python-jupyter-server
python-pyaml
@@ -3020,7 +3019,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-toml python-tomli))
(native-inputs
- (list python-isort python-pytest
+ (list python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -4242,7 +4241,6 @@ (define-public python-eventlet
python-hatchling
python-hatch-vcs
python-pytest
- python-isort
python-twine))
(arguments
(list
@@ -12914,7 +12912,6 @@ (define-public python-textdistance
#t)))))
(native-inputs
(list python-hypothesis
- python-isort
python-numpy
python-pytest
python-pytest-runner
@@ -25046,7 +25043,7 @@ (define-public python-validators
(propagated-inputs
(list python-decorator python-six))
(native-inputs
- (list python-isort python-pytest))
+ (list python-pytest))
(home-page "https://github.com/kvesteri/validators")
(synopsis "Data validation library")
(description
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index ed3fba059d8..26ee93b3aaf 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -93,7 +93,6 @@ (define-public python-sphinx
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
@@ -196,7 +195,6 @@ (define-public python-sphinx-5
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index bfc69062587..de4fb6e3aa7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2446,7 +2446,6 @@ (define-public python-statsmodels
(native-inputs
(list python-colorama
python-cython
- python-isort
python-joblib
python-matplotlib
python-pytest
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 1a75ae0a09e..b0b71cceaf5 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2031,7 +2031,6 @@ (define-public python-qemu-qmp
(native-inputs
(list python-avocado-framework
python-flake8
- python-isort
python-pylint
python-setuptools
python-setuptools-scm
--
2.41.0
^ permalink raw reply related [relevance 62%]
* [bug#70858] [PATCH python-team v2 05/32] build-system/pyproject: Remove python-flake8 inputs.
2024-06-01 15:36 61% ` [bug#70858] [PATCH python-team v2 03/32] build-system/pyproject: Remove python-black input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 42% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 50% ` [bug#70858] [PATCH python-team v2 06/32] build-system/pyproject: Remove python-coverage input Nicolas Graves via Guix-patches via
` (13 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-crds)[native-inputs]: Remove
python-flake8.
* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-biom-format)[native-inputs]: Remove python-flake8.
* gnu/packages/ebook.scm (calibre)[native-inputs]: Remove
python-flake8.
* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-flake8.
* gnu/packages/finance.scm (python-mt-940)[native-inputs]: Remove
python-flake8.
* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-flake8.
* gnu/packages/gettext.scm (python-mdpo)[native-inputs]: Remove
python-flake8.
* gnu/packages/graph.scm (python-pygsp)[native-inputs]: Remove
python-flake8.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-flake8.
* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-captum, python-pyro-api,
python-pyro-ppl, python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-flake8.
* gnu/packages/music.scm (python-mutagen):
[arguments]<#:test-flags>: Ignore flake8 quality tests.
[native-inputs]: Remove python-flake8.
* gnu/packages/protobuf.scm (python-pure-protobuf):
[arguments]<#:phases>: Remove flake8 invocation from check phase.
[native-inputs]: Remove python-flake8.
* gnu/packages/python-web.scm (python-ovh, python-furl,
python-httplib2, python-http-ece, python-woob,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-flake8.
* gnu/packages/python-xyz.scm (python-apispec,
python-apispec-webframeworks, python-apprise, python-colorful,
python-pymd4c, python-pyls-black, python-docx, python-flasgger,
python-imageio, python-importlib-ressources, python-jaraco-test,
python-seaborn, python-progressbar2, python-inflect,
python-argcomplete, python-diff-cover, python-validators,
python-marshmallow, python-marshmallow-jsonapi, python-yq,
python-update-checker, python-eliot, python-dateparser,
python-jinja2-cli, python-nikola, python-verspec, python-mike,
python-arpeggio, python-versioneer, python-codespell)[native-inputs]:
Remove python-flake8.
* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-flake8.
* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[propagated-inputs]: Remove python-flake8.
* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-flake8.
* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-flake8.
* gnu/packages/wm.scm (qtile)[native-inputs]: Remove python-flake8.
* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-flake8.
Change-Id: I196a9c0b7497106c8f98598535cb8e0ea667481c
---
gnu/packages/astronomy.scm | 3 +-
gnu/packages/bioinformatics.scm | 7 +---
gnu/packages/ebook.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/finance.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graph.scm | 3 +-
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 15 ++------
gnu/packages/music.scm | 4 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-web.scm | 12 ++----
gnu/packages/python-xyz.scm | 62 +++++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/sphinx.scm | 2 -
gnu/packages/statistics.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/vpn.scm | 1 -
gnu/packages/wm.scm | 1 -
20 files changed, 36 insertions(+), 90 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c05f8e51885..02d0726b9be 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2188,8 +2188,7 @@ (define-public python-crds
python-roman-datamodels
python-stsynphot
python-requests))
- (native-inputs (list python-flake8
- python-ipython
+ (native-inputs (list python-ipython
python-lockfile
python-mock
python-nose
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index adeb7b1c3be..aa7f2988191 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-flake8
- python-poetry-core
+ (list python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
(synopsis
@@ -3006,7 +3005,6 @@ (define-public python-biom-format
(propagated-inputs
(list python-anndata
python-click
- python-flake8
python-future
python-h5py
python-numpy
@@ -21834,8 +21832,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-flake8
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-setuptools-scm
python-wheel))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 16d4fcd6e36..3d536e59add 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -154,7 +154,6 @@ (define-public calibre
(native-inputs
(list bash-minimal
pkg-config
- python-flake8
python-pyqt-builder
qtbase-5 ; for qmake
xdg-utils))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f082f346278..610fb53087b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2679,7 +2679,6 @@ (define-public python-scikit-rf
python-qtpy
python-scipy))
(native-inputs (list python-coverage
- python-flake8
python-nbval
python-networkx
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7d1efde8187..7579001dd1f 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -2307,9 +2307,7 @@ (define-public python-mt-940
;; Remove custom --cov flags.
(delete-file "pytest.ini")
(invoke "pytest" "-vv")))))))
- (native-inputs (list python-flake8
- python-pytest
- python-pyyaml))
+ (native-inputs (list python-pytest python-pyyaml))
(home-page "https://mt940.readthedocs.io/")
(synopsis "Python parser for MT940-encoded SWIFT data")
(description
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 81a854f8a2a..69cc7e6ddc5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3265,7 +3265,6 @@ (define-public python-geopy
(native-inputs
(list python-async-generator
python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 1408cc4cb46..bbb19bd4cb8 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -214,7 +214,6 @@ (define-public mdpo
(build-system python-build-system)
(native-inputs
(list python-bump2version
- python-flake8
python-flake8-implicit-str-concat
python-flake8-print
python-isort
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 033027a5aa9..eb8aa17fdfe 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -564,8 +564,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-flake8
- python-pytest))
+ (list python-coverage python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index db40b99928a..b396a97c0bc 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-flake8
python-isort
python-mypy
python-pytest
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 494d7174859..bf09c9ec4c1 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-flake8
- python-isort
+ (native-inputs (list python-isort
python-nbsphinx
python-pandas
python-pillow
@@ -1922,8 +1921,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-flake8
- python-keras
+ (native-inputs (list python-keras
python-mypy
python-pandas
python-pytest
@@ -4522,7 +4520,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-flake8
python-flask
python-flask-compress
python-ipython
@@ -5010,8 +5007,7 @@ (define-public python-pyro-api
(build-system python-build-system)
(arguments '(#:tests? #false)) ;requires pyro
(native-inputs
- (list python-flake8
- python-ipython
+ (list python-ipython
python-pytest
python-sphinx
python-sphinx-rtd-theme))
@@ -5060,7 +5056,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-flake8
python-graphviz
python-isort
python-lap
@@ -5107,8 +5102,7 @@ (define-public python-linear-operator
python-pytorch
python-scipy
python-typeguard))
- (native-inputs (list python-flake8
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-pytest
python-setuptools
python-setuptools-scm
@@ -5139,7 +5133,6 @@ (define-public python-gpytorch
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
(native-inputs (list python-coverage
- python-flake8
python-flake8-print
python-nbval
python-pytest
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ab3fe970997..ad026f5d359 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3968,6 +3968,7 @@ (define-public python-mutagen
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags '(list "--ignore=tests/quality/test_flake8.py")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'remove-hypothesis-deadlines
@@ -3978,8 +3979,7 @@ (define-public python-mutagen
(("( +)@given" all spaces)
(string-append spaces "@settings(deadline=None)\n" all))))))))
(native-inputs
- (list python-flake8
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-setuptools
python-wheel))
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8ca730df3c3..502ad09a3a6 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-flake8 python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov python-isort))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -477,8 +477,6 @@ (define-public python-pure-protobuf
(lambda _
(invoke "pytest" "--cov-report" "term-missing" "--cov"
"pure_protobuf")
- (invoke "flake8" "pure_protobuf" "tests"
- "--ignore=F541")
(invoke "isort" "-rc" "-c" "pure_protobuf" "tests"))))))
(home-page "https://pypi.org/project/pure-protobuf/")
(synopsis "Protobuf implementation using dataclasses")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4f5d7baab97..ba378088cf8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -978,7 +978,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-cov
@@ -1240,8 +1239,6 @@ (define-public python-furl
(build-system python-build-system)
(propagated-inputs
(list python-six python-orderedmultidict))
- (native-inputs
- (list python-flake8))
(home-page "https://github.com/gruns/furl")
(synopsis "URL manipulation in Python")
(description "Furl provides an easy-to-use alternative to the
@@ -1274,7 +1271,6 @@ (define-public python-httplib2
(("==") ">=")))))))
(native-inputs
(list python-cryptography
- python-flake8
python-future
python-mock
python-pytest
@@ -7313,7 +7309,7 @@ (define-public python-http-ece
(propagated-inputs
(list python-cryptography))
(native-inputs
- (list python-coverage python-flake8 python-mock python-nose))
+ (list python-coverage python-mock python-nose))
(home-page "https://github.com/web-push-libs/encrypted-content-encoding")
(synopsis "Encrypted Content Encoding for HTTP")
(description
@@ -8333,8 +8329,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-flake8 python-nose python-selenium
- python-xunitparser))
+ (list python-coverage python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
@@ -8973,8 +8968,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-flake8
- python-httpx
+ (list python-httpx
python-mypy
python-poetry-core
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 8d4ce3f9844..3ca12d05ee5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -320,7 +320,6 @@ (define-public python-apprise
(native-inputs (list python-babel
python-coverage
python-cryptography
- python-flake8
python-paho-mqtt
python-pytest
python-pytest-cov
@@ -1183,8 +1182,7 @@ (define-public python-colorful
(base32 "0kyy9qhvrb5m9h8xmri7c88i0k1g5qc7017anw39gx44an7mn33y"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-flake8 python-pytest python-setuptools
- python-wheel))
+ (list python-coverage python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -2370,7 +2368,7 @@ (define-public python-pymd4c
(inputs
(list md4c))
(native-inputs
- (list python-flake8 python-pkgconfig pkg-config))
+ (list python-pkgconfig pkg-config))
(home-page "https://github.com/dominickpastore/pymd4c")
(synopsis "Python bindings for MD4C")
(description
@@ -3028,7 +3026,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-toml python-tomli))
(native-inputs
- (list python-flake8 python-isort python-mypy python-pytest
+ (list python-isort python-mypy python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -7006,7 +7004,6 @@ (define-public python-docx
(build-system pyproject-build-system)
(native-inputs
(list behave
- python-flake8
python-mock
python-pyparsing
python-pytest
@@ -10809,7 +10806,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-flake8 python-fsspec python-pytest
+ (list python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -11587,8 +11584,7 @@ (define-public python-importlib-resources
(setenv "PYTHONPATH"
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
- (list python-flake8
- python-pytest
+ (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -11910,8 +11906,7 @@ (define-public python-jaraco-test
(arguments
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
- (native-inputs (list python-flake8
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -13710,8 +13705,7 @@ (define-public python-seaborn
python-scipy
python-statsmodels))
(native-inputs
- (list python-flake8
- python-flit-core
+ (list python-flit-core
python-ipykernel
python-nbconvert
python-numpydoc
@@ -18695,8 +18689,7 @@ (define-public python-progressbar2
(propagated-inputs
(list python-six python-utils))
(native-inputs
- (list python-flake8
- python-freezegun
+ (list python-freezegun
python-pycodestyle
python-pytest
python-pytest-cache
@@ -20052,8 +20045,7 @@ (define-public python-codespell
(inputs
(list python-chardet))
(native-inputs
- (list python-flake8
- python-pygments
+ (list python-pygments
python-pytest
python-pytest-cov
python-pytest-dependency
@@ -21144,8 +21136,7 @@ (define-public python-inflect
(setenv "PYTHONPATH"
(string-append (getcwd) "/_custom_build")))))))
(propagated-inputs (list python-pydantic))
- (native-inputs (list python-flake8
- python-pygments
+ (native-inputs (list python-pygments
python-pytest
python-pytest-black
python-pytest-checkdocs
@@ -23283,7 +23274,6 @@ (define-public python-argcomplete
(invoke "python3" "./test/test.py" "-v")))))))
(native-inputs
(list python-coverage
- python-mypy
python-pexpect
python-setuptools
python-setuptools-scm
@@ -24419,8 +24409,7 @@ (define-public python-diff-cover
python-setuptools ; For pkg_resources.
python-tomli))
(native-inputs
- (list python-flake8
- python-poetry-core
+ (list python-poetry-core
python-pylint
python-pytest
python-pytest-flake8
@@ -25087,7 +25076,7 @@ (define-public python-validators
(propagated-inputs
(list python-decorator python-six))
(native-inputs
- (list python-flake8 python-isort python-pytest))
+ (list python-isort python-pytest))
(home-page "https://github.com/kvesteri/validators")
(synopsis "Data validation library")
(description
@@ -25156,8 +25145,7 @@ (define-public python-marshmallow
(propagated-inputs
(list python-packaging))
(native-inputs
- (list python-flake8
- python-flake8-bugbear
+ (list python-flake8-bugbear
python-mypy
python-pytest
python-pytz
@@ -25185,7 +25173,6 @@ (define-public python-marshmallow-jsonapi
(list python-marshmallow))
(native-inputs
(list python-faker
- python-flake8
python-flake8-bugbear
python-flask
python-mock
@@ -25220,8 +25207,7 @@ (define-public python-apispec
(propagated-inputs
(list python-packaging))
(native-inputs
- (list python-flake8
- python-flake8-bugbear
+ (list python-flake8-bugbear
python-marshmallow
python-mypy
python-pytest
@@ -25249,7 +25235,6 @@ (define-public python-apispec-webframeworks
(propagated-inputs (list python-apispec python-setuptools))
(native-inputs
(list python-bottle
- python-flake8
python-flake8-bugbear
python-flask
python-mock
@@ -25298,7 +25283,6 @@ (define-public python-flasgger
(list python-apispec
python-apispec-webframeworks
python-decorator
- python-flake8
python-flask-jwt
python-flask-restful
python-flex
@@ -26283,7 +26267,7 @@ (define-public python-yq
(inputs
(list python-argcomplete python-pyyaml python-xmltodict python-toml jq))
(native-inputs
- (list python-coverage python-flake8 python-setuptools-scm python-wheel))
+ (list python-coverage python-setuptools-scm python-wheel))
(home-page "https://github.com/kislyuk/yq")
(synopsis "Command-line YAML/XML processor")
(description
@@ -27290,7 +27274,7 @@ (define-public python-update-checker
(base32 "04yb5a9mi45ax50m2m0ih6gdvkk1j7gfmy83dd58i1f59axlabba"))))
(build-system python-build-system)
(propagated-inputs (list python-requests))
- (native-inputs (list python-flake8 python-pytest))
+ (native-inputs (list python-pytest))
(home-page "https://github.com/bboe/update_checker")
(synopsis "Python module that will check for package updates")
(description "This package provides a Python module that will check for
@@ -31405,7 +31389,6 @@ (define-public python-eliot
(native-inputs
(list python-coverage
python-dask
- python-flake8
python-hypothesis
python-pytest
python-setuptools
@@ -32194,7 +32177,7 @@ (define-public python-dateparser
(list python-dateutil python-pytz python-regex python-ruamel.yaml
python-tzlocal))
(native-inputs
- (list python-flake8 python-pytest python-parameterized tzdata-for-tests
+ (list python-pytest python-parameterized tzdata-for-tests
python-setuptools python-wheel))
(arguments
`(#:phases
@@ -32722,11 +32705,10 @@ (define-public python-versioneer
(invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py")
(invoke "python" "test/run_pyflakes_src.py")
(invoke "pyflakes" "test")
- (invoke "flake8" "git_version.py" "versioneer.py")
(invoke "pycodestyle" "--max-line-length=88"
"git_version.py" "versioneer.py")))))))
(native-inputs
- (list git-minimal python-flake8 python-pycodestyle python-pyflakes
+ (list git-minimal python-pycodestyle python-pyflakes
python-pypa-build python-setuptools python-wheel))
(propagated-inputs
(list python-tomli))
@@ -33529,7 +33511,7 @@ (define-public python-jinja2-cli
(propagated-inputs
(list python-jinja2))
(native-inputs
- (list python-flake8 python-jinja2 python-pytest))
+ (list python-jinja2 python-pytest))
(home-page "https://github.com/mattrobenolt/jinja2-cli")
(synopsis "Command-line interface to Jinja2")
(description
@@ -35104,7 +35086,6 @@ (define-public nikola
python-yapsy))
(native-inputs
(list python-coverage
- python-flake8
python-freezegun
python-pytest
python-pytest-cov))
@@ -35576,7 +35557,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-coverage python-flake8 python-mypy
+ (native-inputs (list python-coverage python-mypy
python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
@@ -35975,7 +35956,7 @@ (define-public python-mike
"0yxp816x7s948xsd0fifvq9shg01xdxlifd9rzf5y2rd9iwz3hsn"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-flake8 python-shtab))
+ (list python-coverage python-shtab))
(propagated-inputs
(list python-jinja2 python-mkdocs python-pyyaml python-verspec))
(home-page "https://github.com/jimporter/mike")
@@ -35999,7 +35980,6 @@ (define-public python-arpeggio
(build-system python-build-system)
(native-inputs (list python-coverage
python-coveralls
- python-flake8
python-mike
python-mkdocs
python-pytest
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 99c0a121dde..7831802284f 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -1220,7 +1220,6 @@ (define-public python-dolfin-adjoint
(list pkg-config
python-coverage
python-decorator
- python-flake8
python-pkgconfig
python-pytest))
(propagated-inputs
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 4be9febb96c..ed3fba059d8 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -90,7 +90,6 @@ (define-public python-sphinx
python-colorama
python-docutils
python-filelock
- python-flake8
python-html5lib
python-imagesize
python-importlib-metadata
@@ -194,7 +193,6 @@ (define-public python-sphinx-5
python-colorama
python-docutils
python-filelock
- python-flake8
python-html5lib
python-imagesize
python-importlib-metadata
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index c2dc1cefef3..0a6f61e2280 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2447,7 +2447,6 @@ (define-public python-statsmodels
(native-inputs
(list python-colorama
python-cython
- python-flake8
python-isort
python-joblib
python-matplotlib
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 9d3b93faf90..bf2da58a3ee 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1675,7 +1675,6 @@ (define-public python-panflute
(propagated-inputs (list python-click python-pyyaml))
(native-inputs (list python-configparser
python-coverage
- python-flake8
python-pandocfilters
python-pytest
python-pytest-cov
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 9da51cb5617..d52d872909d 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -970,7 +970,6 @@ (define-public sshuttle
(native-inputs
(list python-setuptools-scm
;; For tests only.
- python-flake8
python-mock
python-pytest-cov
python-pytest-runner))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a1c94fe13a9..7da18bc821c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -654,7 +654,6 @@ (define-public qtile
python-xcffib))
(native-inputs
(list pkg-config
- python-flake8
python-pep8-naming
python-pytest
python-pytest-cov
--
2.41.0
^ permalink raw reply related [relevance 42%]
* [bug#70858] [PATCH python-team v2 23/32] gnu: python-tinycss2: Remove python-pytest-cov native-input.
` (9 preceding siblings ...)
2024-06-01 15:36 41% ` [bug#70858] [PATCH python-team v2 22/32] build-system/pyproject: Remove python-pytest-cov native-input Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 70% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 73% ` [bug#70858] [PATCH python-team v2 26/32] build-system/pyproject: Remove python-pytest-isort native-input Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/python-web.scm (python-tinycss2):
[arguments]<#:phases>: Add phase remove-unwanted-dependency to
ignore coverage options.
[native-inputs]: Remove python-pytest-cov.
Change-Id: I853fe3371be84be1655db0ee8d1dca8d23c50ef9
---
gnu/packages/python-web.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c1f803cb131..707bf903bd1 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5897,11 +5897,18 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'remove-unwanted-dependencies
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-cov
- python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70858] [PATCH python-team v2 03/32] build-system/pyproject: Remove python-black input.
@ 2024-06-01 15:36 61% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 42% ` [bug#70858] [PATCH python-team v2 05/32] build-system/pyproject: Remove python-flake8 inputs Nicolas Graves via Guix-patches via
` (14 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-liana-py, scvelo)[native-inputs]: Remove python-black.
* gnu/packages/databases.scm (datasette):
[arguments]<#:test-flags>: Ignore black tests.
<#:phases>: Remove parts related to black in relax-requirements
added phase.
[native-inputs]: Remove python-black.
* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-black.
* gnu/packages/graph.scm (python-graphtools)[native-inputs]: Remove
python-black.
* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-hyperopt, python-captum,
python-pyro-ppl)[native-inputs]: Remove python-black.
* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]:
Remove python-black.
* gnu/packages/python-web.scm (python-ovh, python-openai,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-black.
* gnu/packages/python-xyz.scm (python-pydantic-cli, python-imageio,
python-update-checker, python-eliot, python-minikanren,
python-jupytext)[native-inputs]: Remove python-black.
(ptpython)[propagated-inputs]: Remove python-black.
* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-black.
Change-Id: Ie8098afda264bf9a5ab2cfe5d915bc7a41fdc604
---
gnu/packages/bioinformatics.scm | 11 +++--------
gnu/packages/databases.scm | 8 ++------
gnu/packages/finance.scm | 1 -
gnu/packages/graph.scm | 1 -
gnu/packages/machine-learning.scm | 11 +++--------
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-web.scm | 8 +++-----
gnu/packages/python-xyz.scm | 15 +++++----------
gnu/packages/virtualization.scm | 3 +--
9 files changed, 18 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d4a39fd3e1a..adeb7b1c3be 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
@@ -2278,10 +2277,7 @@ (define-public python-liana-py
python-tqdm
tzdata))
(native-inputs
- (list python-black
- python-poetry-core
- python-pytest
- python-pytest-cov))
+ (list python-poetry-core python-pytest python-pytest-cov))
(home-page "https://github.com/saezlab/liana-py")
(synopsis "LIANA is a ligand-receptor analysis framework")
(description "This is a Ligand-Receptor inference framework. The
@@ -21838,8 +21834,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-hypothesis
python-pytest
python-setuptools-scm
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 67e6ced7c32..96b2c2a0437 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5537,16 +5537,13 @@ (define-public datasette
" or test_custom_query_with_unicode_characters"
" or test_searchmode)")
"-n" (number->string (parallel-job-count))
- "-m" "not serial") ;cannot run in parallel
+ "-m" "not serial" ;cannot run in parallel
+ "--ignore=tests/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
- ;; The package needlessly specifies exact versions
- ;; of dependencies, when it works fine with others.
(substitute* "setup.py"
- (("(black)==[0-9\\.]+" _ package)
- package)
(("click-default-group-wheel")
"click-default-group")))))))
(propagated-inputs
@@ -5569,7 +5566,6 @@ (define-public datasette
python-uvicorn))
(native-inputs
(list python-beautifulsoup4
- python-black
python-cogapp
python-pip
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3c32a220c4e..7d1efde8187 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-black
python-isort
python-pillow
python-protobuf
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eda8365a424..033027a5aa9 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-black
python-coverage
python-coveralls
python-nose
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index d5ce3bfe7de..494d7174859 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-isort
python-nbsphinx
python-pandas
@@ -1923,8 +1922,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-keras
python-mypy
python-pandas
@@ -2359,8 +2357,7 @@ (define-public python-hyperopt
python-six
python-tqdm))
(native-inputs
- (list python-black
- python-nose
+ (list python-nose
python-pymongo
python-pytest
python-wheel))
@@ -4525,7 +4522,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-black
python-flake8
python-flask
python-flask-compress
@@ -5064,7 +5060,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-black
python-flake8
python-graphviz
python-isort
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index e3f0499fecb..ca87289a1e1 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-flake8
python-flask
python-httplib2
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e417fc2bb47..4f5d7baab97 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -977,8 +977,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-black
- python-coverage
+ (native-inputs (list python-coverage
python-flake8
python-isort
python-pytest
@@ -2171,7 +2170,7 @@ (define-public python-openai
and not test_file_cli")))
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
- (native-inputs (list python-black python-pytest python-pytest-asyncio
+ (native-inputs (list python-pytest python-pytest-asyncio
python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
@@ -8974,8 +8973,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-httpx
python-mypy
python-poetry-core
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d81de891c4f..0388cefee4c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
(native-inputs
(list git-minimal
python-autopep8
- python-black
python-flake8
python-gitpython
python-isort
@@ -8029,8 +8028,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-black
- python-mypy
+ (list python-mypy
python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
@@ -10812,7 +10810,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-black python-flake8 python-fsspec python-pytest
+ (list python-flake8 python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -22112,8 +22110,7 @@ (define-public ptpython
(arguments
`(#:tests? #f)) ;there are no tests
(propagated-inputs
- (list python-appdirs python-black python-jedi python-prompt-toolkit
- python-pygments))
+ (list python-appdirs python-jedi python-prompt-toolkit python-pygments))
(home-page "https://github.com/jonathanslenders/ptpython")
(synopsis "Python Read-Eval-Print-Loop with nice IDE-like features")
(description
@@ -27295,7 +27292,7 @@ (define-public python-update-checker
(base32 "04yb5a9mi45ax50m2m0ih6gdvkk1j7gfmy83dd58i1f59axlabba"))))
(build-system python-build-system)
(propagated-inputs (list python-requests))
- (native-inputs (list python-black python-flake8 python-pytest))
+ (native-inputs (list python-flake8 python-pytest))
(home-page "https://github.com/bboe/update_checker")
(synopsis "Python module that will check for package updates")
(description "This package provides a Python module that will check for
@@ -31409,8 +31406,7 @@ (define-public python-eliot
(list python-boltons python-pyrsistent python-six
python-zope-interface))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-dask
python-flake8
python-hypothesis
@@ -34165,7 +34161,6 @@ (define-public python-minikanren
python-pytest
python-pytest-cov
python-pylint
- python-black
python-sympy
python-versioneer
python-coverage))
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 6d28b32c863..85ad5031059 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,8 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-black
- python-mypy
+ (list python-mypy
python-pyhamcrest
python-setuptools
python-twine
--
2.41.0
^ permalink raw reply related [relevance 61%]
* [bug#70858] [PATCH python-team v2 26/32] build-system/pyproject: Remove python-pytest-isort native-input.
` (10 preceding siblings ...)
2024-06-01 15:36 70% ` [bug#70858] [PATCH python-team v2 23/32] gnu: python-tinycss2: " Nicolas Graves via Guix-patches via
@ 2024-06-01 15:36 73% ` Nicolas Graves via Guix-patches via
2024-06-01 15:36 63% ` [bug#70858] [PATCH python-team v2 27/32] build-system/pyproject: Remove python-pytest-black native-input Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 15:36 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/dav.scm (radicale):
[native-inputs]: Remove python-pytest-isort.
* gnu/packages/python-web.scm (python-tinycss):
[arguments]<#:test-flags>: Ignore isort tests.
[native-inputs]: Remove python-pytest-isort.
Change-Id: I706e8c310adbeda49b91c6815d299172ce05df22
---
gnu/packages/dav.scm | 1 -
gnu/packages/python-web.scm | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 0612a72c831..99284220846 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -59,7 +59,6 @@ (define-public radicale
(native-inputs
(list python-pytest
python-pytest-flake8
- python-pytest-isort
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 707bf903bd1..0b794590620 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5861,10 +5861,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not test_speedups")))
+ '(list "-k" "not ISORT and not test_speedups")))
(native-inputs
(list python-pytest-flake8
- python-pytest-isort
python-pytest-runner
python-setuptools
python-wheel))
--
2.41.0
^ permalink raw reply related [relevance 73%]
* [bug#69980] [PATCH python-team v3 05/14] gnu: python-omnipath: Remove pre-commit from native-inputs.
@ 2024-06-01 14:57 70% ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-06-01 14:57 UTC (permalink / raw)
To: 69980; +Cc: Vinicius Monego, ngraves
From: Vinicius Monego <monego@posteo.net>
* gnu/packages/python-xyz.scm (python-omnipath)[native-inputs]: Remove
python-pre-commit.
Change-Id: Idfdf978df55e2c3cb3c8447aa18456cc9de4c4c2
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e8ead0ef12d..e417fc2bb47 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2135,7 +2135,6 @@ (define-public python-omnipath
python-wrapt))
(native-inputs
(list python-bump2version
- python-pre-commit
python-pytest
python-pytest-mock
python-pytest-socket
--
2.41.0
^ permalink raw reply related [relevance 70%]
* bug#70269: [PATCH v2] gnu: Add python-pybadges.
2024-05-13 17:05 68% ` [bug#70269] [PATCH v2] " Giacomo Leidi via Guix-patches via
@ 2024-05-31 10:02 70% ` Ludovic Courtès
0 siblings, 0 replies; 200+ results
From: Ludovic Courtès @ 2024-05-31 10:02 UTC (permalink / raw)
To: Giacomo Leidi
Cc: Sharlatan Hellseher, Munyoki Kilyungi, 70269-done,
Lars-Dominik Braun, jgart, Marius Bakke, Tanguy Le Carrour
[-- Attachment #1: Type: text/plain, Size: 99 bytes --]
Hi,
Applied with the changes below, as suggested by Andreas.
Thanks everyone!
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1098 bytes --]
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4970366c93d..5ca50fa5a6c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -9232,7 +9232,7 @@ (define-public python-pybadges
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/pybadges")
- (commit (string-append version))))
+ (commit version)))
(file-name (git-file-name name version))
(sha256
"1zgb9idz7m3mzf8wvik0gwmyrxp753axqjv2pab326cr5myj1s4b")))
@@ -9251,8 +9251,7 @@ (define-public python-pybadges
python-pytest
python-xmldiff))
(home-page "https://github.com/google/pybadges")
- (synopsis
- "Generate Github-style badges on the command-line")
+ (synopsis "Generate Github-style badges on the command-line")
(description
"This package provides @code{python-pybadges}: a library and command-line
tool for generating Github-style badges as SVG images.")
^ permalink raw reply related [relevance 70%]
* [bug#70970] [PATCH] gnu: Add python-simple-salesforce.
@ 2024-05-15 22:41 68% King, Spencer via Guix-patches via
0 siblings, 0 replies; 200+ results
From: King, Spencer via Guix-patches via @ 2024-05-15 22:41 UTC (permalink / raw)
To: 70970
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-Add-python-simple-salesforce.patch --]
[-- Type: application/octet-stream, Size: 1977 bytes --]
From 84223e47583c81bdcc4e8b537065d11e6ca04e76 Mon Sep 17 00:00:00 2001
Message-Id: <84223e47583c81bdcc4e8b537065d11e6ca04e76.1715812789.git.spencer.king@geneoscopy.com>
From: Spencer King <spencer.king@geneoscopy.com>
Date: Wed, 15 May 2024 22:39:25 +0000
Subject: [PATCH] gnu: Add python-simple-salesforce.
* gnu/packages/python-web.scm (python-simple-salesforce): New variable.
Change-Id: I45752a344149021a4a32565d61acd0cb6c15b39e
---
gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c00e38a120..5da79f243e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -9329,3 +9329,27 @@ (define-public python-pynetbox
(description "Python module to query and edit data stored in a
@url{https://netbox.dev,NetBox} instance.")
(license license:asl2.0)))
+
+(define-public python-simple-salesforce
+ (package
+ (name "python-simple-salesforce")
+ (version "1.12.6")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/simple-salesforce/simple-salesforce")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32 "0azn15h7fi9fbg4win3i9z7vyi8xxk9izvalnh4in0bwc3jzmfir"))
+ (file-name (git-file-name name version))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-responses))
+ (propagated-inputs (list python-more-itertools python-pyjwt
+ python-requests python-typing-extensions
+ python-zeep))
+ (home-page "https://github.com/simple-salesforce/simple-salesforce")
+ (synopsis "Basic Salesforce.com REST API client")
+ (description
+ "This package provides a basic Salesforce.com REST API client.")
+ (license license:asl2.0)))
base-commit: 4901f1b60499cf68362fa81e006c4fe633240e04
--
2.34.1
^ permalink raw reply related [relevance 68%]
* [bug#70269] [PATCH v2] gnu: Add python-pybadges.
2024-04-07 22:13 68% [bug#70269] [PATCH] gnu: Add python-pybadges Giacomo Leidi via Guix-patches via
@ 2024-05-13 17:05 68% ` Giacomo Leidi via Guix-patches via
2024-05-31 10:02 70% ` bug#70269: " Ludovic Courtès
0 siblings, 1 reply; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-05-13 17:05 UTC (permalink / raw)
To: 70269
Cc: Giacomo Leidi, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, Tanguy Le Carrour, jgart
* gnu/packages/python-web.scm (python-pybadges): New variable.
Change-Id: Idd53ddf94b24112015c0a0b82396cf366920417e
---
gnu/packages/python-web.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index affa2f52f4..df19b30386 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -9183,6 +9183,40 @@ (define-public python-whatthepatch
"This package provides a library to parse and apply patches.")
(license license:expat)))
+(define-public python-pybadges
+ (package
+ (name "python-pybadges")
+ (version "3.0.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/pybadges")
+ (commit (string-append version))))
+ (file-name (git-file-name name version))
+ (sha256
+ "1zgb9idz7m3mzf8wvik0gwmyrxp753axqjv2pab326cr5myj1s4b")))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~'("-k"
+ ;; Disable network dependent tests.
+ "not test_changes and not test_not_image_url and not test_http_url")))
+ (propagated-inputs (list python-jinja2 python-requests))
+ (native-inputs (list python-flask
+ python-fonttools
+ python-nox
+ python-pillow
+ python-pytest
+ python-xmldiff))
+ (home-page "https://github.com/google/pybadges")
+ (synopsis
+ "Generate Github-style badges on the command-line")
+ (description
+ "This package provides @code{python-pybadges}: a library and command-line
+tool for generating Github-style badges as SVG images.")
+ (license license:asl2.0)))
+
(define-public python-grid5000
(package
(name "python-grid5000")
base-commit: aa9ac252206615713ab988d7068da9e14a9bccc0
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#70858] [PATCH 11/32] build-system/pyproject: Remove python-coveralls native-input.
` (3 preceding siblings ...)
2024-05-10 7:55 70% ` [bug#70858] [PATCH 10/32] gnu: python-openid: Remove python-coverage native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 72% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 61% ` [bug#70858] [PATCH 17/32] build-system/pyproject: Remove python-tox native-input Nicolas Graves via Guix-patches via
` (10 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/geo.scm (python-cartopy)[native-inputs]: Remove
python-coveralls.
* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coveralls.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-py7zr)[native-inputs]: Remove python-coveralls.
* gnu/packages/python-science.scm (python-trimesh)[native-inputs]:
Remove python-coveralls.
* gnu/packages/python-web.scm (python-flask-combo-jsonapi)
[native-inputs]: Remove python-coveralls.
* gnu/packages/python-xyz.scm (python-affine, python-cftime,
python-ddlparse, python-tasklogger, python-minikanren,
python-arpeggio)[native-inputs]: Remove python-coveralls.
* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coveralls.
* gnu/packages/telegram.scm (tgcli)[native-inputs]: Remove
python-coveralls.
Change-Id: I47b3c21f985175876618f1457b242e6841eb6d3b
---
gnu/packages/geo.scm | 3 +--
gnu/packages/graph.scm | 3 +--
gnu/packages/python-compression.scm | 2 --
gnu/packages/python-science.scm | 3 +--
gnu/packages/python-web.scm | 3 +--
gnu/packages/python-xyz.scm | 12 ++++--------
gnu/packages/syndication.scm | 4 +---
gnu/packages/telegram.scm | 3 +--
8 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 806120e939d..be96e6800a3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1479,8 +1479,7 @@ (define-public python-cartopy
(inputs
(list geos))
(native-inputs
- (list python-coveralls
- python-cython
+ (list python-cython
python-pytest
python-pytest-cov
python-pytest-mpl
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index f83a23dd0be..d66a3676fd2 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coveralls
python-nose
python-nose2
python-pandas
@@ -563,7 +562,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coveralls python-pytest))
+ (list python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index b2d789c92d0..5faf7b2a3cb 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coveralls
python-hypothesis
python-pyannotate
python-pytest
@@ -474,7 +473,6 @@ (define-public python-py7zr
(list python-setuptools
python-wheel
python-setuptools-scm
- python-coveralls
python-libarchive-c
python-py-cpuinfo
python-pyannotate
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index f82feab0963..9301e82bb60 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -653,8 +653,7 @@ (define-public python-trimesh
(("\\$MESH_PRE")
"'$MESH_PRE'")))))))
(native-inputs
- (list python-coveralls
- python-pyinstrument
+ (list python-pyinstrument
python-pytest
python-pytest-cov))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fe79f629bb8..0e969eef306 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8370,8 +8370,7 @@ (define-public python-flask-combo-jsonapi
python-simplejson
python-six))
(native-inputs
- (list python-coveralls
- python-pytest
+ (list python-pytest
python-pytest-runner))
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
(synopsis "Flask extension to quickly create JSON:API 1.0 REST Web APIs")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 108b32d0459..c2926bf7497 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1019,7 +1019,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-coveralls python-pydocstyle
+ (propagated-inputs (list python-pydocstyle
python-pytest python-pytest-cov))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
@@ -3070,7 +3070,6 @@ (define-public python-cftime
(list python-numpy))
(native-inputs
(list python-check-manifest
- python-coveralls
python-cython
python-pytest-cov
python-sphinx
@@ -5678,7 +5677,6 @@ (define-public python-ddlparse
(build-system pyproject-build-system)
(native-inputs
(list python-codecov
- python-coveralls
python-pytest
python-pytest-cov
python-setuptools
@@ -16022,7 +16020,7 @@ (define-public python-tasklogger
(base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-deprecated))
- (native-inputs (list python-coveralls python-nose2
+ (native-inputs (list python-nose2
python-numpy python-setuptools python-wheel))
(home-page "https://github.com/scottgigante/tasklogger")
(synopsis "Extension to the core Python logging library")
@@ -34093,8 +34091,7 @@ (define-public python-minikanren
(invoke "python" "-m" "pytest" "-v" "tests/" "kanren/"))
#t)))))
(native-inputs
- (list python-coveralls
- python-pydocstyle
+ (list python-pydocstyle
python-pytest
python-pytest-cov
python-pylint
@@ -35928,8 +35925,7 @@ (define-public python-arpeggio
(base32
"0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n"))))
(build-system python-build-system)
- (native-inputs (list python-coveralls
- python-mike
+ (native-inputs (list python-mike
python-mkdocs
python-pytest
python-pytest-runner
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 0a6ff765c30..a9980f1777d 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -434,7 +434,6 @@ (define-public rtv
python-requests python-six))
(native-inputs
(list ncurses
- python-coveralls
python-mock
python-pytest
python-vcrpy))
@@ -467,8 +466,7 @@ (define-public tuir
(list python-beautifulsoup4 python-decorator python-kitchen
python-requests python-six))
(native-inputs
- (list python-coveralls
- python-mock
+ (list python-mock
python-pytest
python-vcrpy
python-setuptools
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 358374a5bb7..c5930180e6a 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -790,8 +790,7 @@ (define-public tgcli
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "tests")))))))
(native-inputs
- `(("coveralls" ,python-coveralls)
- ("pytest" ,python-pytest)
+ `(("pytest" ,python-pytest)
("pytest-click" ,python-pytest-click)
("pytest-cov" ,python-pytest-cov)
("mkdocs" ,python-mkdocs)
--
2.41.0
^ permalink raw reply related [relevance 72%]
* [bug#70858] [PATCH 29/32] build-system/pyproject: Remove python-pytest-mypy inputs.
` (13 preceding siblings ...)
2024-05-10 7:55 67% ` [bug#70858] [PATCH 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 65% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 69% ` [bug#70858] [PATCH 30/32] build-system/pyproject: Stop hiding options Nicolas Graves via Guix-patches via
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-czml3, python-poliastro)
[native-inputs]: Remove python-pytest-mypy.
* gnu/packages/check.scm (python-pytest-perf)[native-inputs]: Remove
python-pytest-mypy.
* gnu/packages/python-web.scm (python-portend)[native-inputs]: Remove
python-pytest-mypy.
* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-path, python-pip-run, python-inflect,
python-tempora, python-loguru, python-portalocker)[native-inputs]: Remove
python-pytest-mypy.
* gnu/packages/sphinx.scm (python-sphinx, python-sphinx-5):
[propagated-inputs]: Remove python-mypy.
Change-Id: Ia36ca82e0327a886f9c5317e9ef4ffc35dc8ac9d
---
gnu/packages/astronomy.scm | 4 +---
gnu/packages/check.scm | 1 -
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 17 ++---------------
gnu/packages/sphinx.scm | 2 --
5 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 61ab7520aef..2b78738f5a8 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2226,7 +2226,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/poliastro/czml3")
@@ -2604,8 +2603,7 @@ (define-public python-poliastro
python-flit-core
python-pytest
python-pytest-doctestplus
- python-pytest-mpl
- python-pytest-mypy))
+ python-pytest-mpl))
(propagated-inputs
(list python-astropy
python-astroquery
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index e8f121e9fe9..8eac2b13563 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2664,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2a7d083b9de..425aa9d5d0f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -313,7 +313,6 @@ (define-public python-portend
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/portend")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1b3837dddc4..733a60b087d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4928,7 +4928,6 @@ (define-public python-portalocker
"0lawjm736vs86wlnxc3qqh37l11z0yx81xq3dmrw33m86kaq2bh3"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-mypy
python-pytest-timeout
python-redis
python-setuptools
@@ -11525,7 +11524,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
(propagated-inputs
@@ -11652,7 +11650,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11684,7 +11681,6 @@ (define-public python-jaraco-collections
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.collections")
@@ -11742,7 +11738,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11774,7 +11769,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-mypy
python-setuptools
python-setuptools-scm
python-wheel))
@@ -11832,7 +11826,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.test")
@@ -11863,7 +11856,6 @@ (define-public python-jaraco-text
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
python-setuptools
python-wheel))
(home-page "https://github.com/jaraco/jaraco.text")
@@ -16503,8 +16495,7 @@ (define-public python-path
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden?
(package-properties
python-path-bootstrap)))))
@@ -16606,8 +16597,7 @@ (define-public python-pip-run
python-pygments
python-pytest
python-pytest-checkdocs
- python-pytest-enabler
- python-pytest-mypy)))
+ python-pytest-enabler)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21043,7 +21033,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-mypy
;; For the version number
python-setuptools-scm
python-setuptools
@@ -25891,7 +25880,6 @@ (define-public python-tempora
python-pytest-checkdocs
python-pytest-enabler
python-pytest-freezegun
- python-pytest-mypy
python-setuptools-scm
python-types-freezegun
python-types-pytz
@@ -32828,7 +32816,6 @@ (define-public python-loguru
(propagated-inputs (list python-colorama))
(native-inputs (list python-colorama
python-freezegun
- python-mypy
python-pre-commit
python-pytest
python-pytest-mypy-plugins
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 669120cad0a..35eaef3036e 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -94,7 +94,6 @@ (define-public python-sphinx
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
@@ -191,7 +190,6 @@ (define-public python-sphinx-5
python-imagesize
python-importlib-metadata
python-jinja2
- python-mypy
python-packaging
python-pygments
python-requests
--
2.41.0
^ permalink raw reply related [relevance 65%]
* [bug#70858] [PATCH 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input.
` (12 preceding siblings ...)
2024-05-10 7:55 63% ` [bug#70858] [PATCH 27/32] build-system/pyproject: Remove python-pytest-black native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 67% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 65% ` [bug#70858] [PATCH 29/32] build-system/pyproject: Remove python-pytest-mypy inputs Nicolas Graves via Guix-patches via
2024-05-10 7:55 69% ` [bug#70858] [PATCH 30/32] build-system/pyproject: Stop hiding options Nicolas Graves via Guix-patches via
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/check.scm (python-pytest-enabler, python-pytest-perf):
[native-inputs]: Remove python-pytest-flake8.
* gnu/packages/dav.scm (radicale)[native-inputs]: Remove
python-pytest-flake8.
* gnu/packages/jupyter.scm (python-nbstripout)[native-inputs]:
Remove python-pytest-flake8.
* gnu/packages/python-check.scm (python-pytest-csv):
[arguments]<#:test-flags>: Ignore flake8 test.
[native-inputs]: Remove python-pytest-flake8.
* gnu/packages/python-web.scm (python-mechanicalsoup,
python-tinycss2)[native-inputs]: Remove python-pytest-flake8.
(python-tinycss):
[arguments]<#:test-flags>: Ignore flake8 tests.
[native-inputs]: Remove python-pytest-flake8.
* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-context, python-jaraco-functools,
python-jaraco-packaging, python-jaraco-test, python-path,
python-pip-run, python-inflect, python-tempora, python-cairosvg)
[native-inputs]: Remove python-pytest-flake8.
Change-Id: I60ad04391d1c4b081e3293d50b3ac93c6430c7bf
---
gnu/packages/check.scm | 2 --
gnu/packages/dav.scm | 1 -
gnu/packages/jupyter.scm | 1 -
gnu/packages/python-check.scm | 5 +++--
gnu/packages/python-web.scm | 10 ++++------
gnu/packages/python-xyz.scm | 12 +-----------
6 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f8ead8df4e4..e8f121e9fe9 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2492,7 +2492,6 @@ (define-public python-pytest-enabler
python-toml))
(native-inputs (list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -2665,7 +2664,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 99284220846..b5a1ba749d8 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-flake8
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index c25663e4da6..4bc0bc2a8f4 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -817,7 +817,6 @@ (define-public python-nbstripout
(native-inputs
(list python-pytest
python-pytest-cram
- python-pytest-flake8
python-pytest-runner
python-setuptools
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index fdef98f6c8a..4b5ca23569a 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -214,9 +214,10 @@ (define-public python-pytest-csv
(base32
"17518f2fn5l98lyk9p8r7215c1whi61imzrh6ahrmcksr8w0zz04"))))
(build-system pyproject-build-system)
+ (arguments
+ (list #:test-flags '(list "--ignore=tests/test_flake8.py")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-xdist
+ (list python-pytest-xdist
python-setuptools
python-tabulate
python-wheel))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5f19d93ea19..2a7d083b9de 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1578,8 +1578,7 @@ (define-public python-mechanicalsoup
(propagated-inputs
(list python-beautifulsoup4 python-lxml python-requests python-six))
(native-inputs
- (list python-pytest-flake8
- python-pytest-httpbin
+ (list python-pytest-httpbin
python-pytest-mock
python-pytest-runner
python-requests-mock
@@ -5861,10 +5860,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not ISORT and not test_speedups")))
+ '(list "-k" "not ISORT and not FLAKE8 and not test_speedups")))
(native-inputs
- (list python-pytest-flake8
- python-pytest-runner python-setuptools python-wheel))
+ (list python-pytest-runner python-setuptools python-wheel))
(home-page "https://tinycss.readthedocs.io/")
(synopsis "Complete yet simple CSS parser for Python")
(description
@@ -5905,7 +5903,7 @@ (define-public python-tinycss2
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9c15ca8e566..1b3837dddc4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11525,7 +11525,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools-57
python-setuptools-scm))
@@ -11653,7 +11652,6 @@ (define-public python-jaraco-classes
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11744,7 +11742,6 @@ (define-public python-jaraco-context
(native-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11777,7 +11774,6 @@ (define-public python-jaraco-functools
(list python-jaraco-classes
python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-setuptools-scm
@@ -11807,7 +11803,6 @@ (define-public python-jaraco-packaging
(propagated-inputs
(list python-pytest
python-pytest-checkdocs
- python-pytest-flake8
python-rst.linker
python-setuptools
python-setuptools-scm
@@ -11837,7 +11832,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
python-setuptools
python-wheel))
@@ -16510,7 +16504,6 @@ (define-public python-path
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden?
(package-properties
@@ -16614,7 +16607,6 @@ (define-public python-pip-run
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy)))
(properties (alist-delete 'hidden? (package-properties
python-pip-run-bootstrap)))))
@@ -21051,7 +21043,6 @@ (define-public python-inflect
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-mypy
;; For the version number
python-setuptools-scm
@@ -25899,7 +25890,6 @@ (define-public python-tempora
python-pytest
python-pytest-checkdocs
python-pytest-enabler
- python-pytest-flake8
python-pytest-freezegun
python-pytest-mypy
python-setuptools-scm
@@ -29569,7 +29559,7 @@ (define-public python-cairosvg
(list python-cairocffi python-cssselect2 python-defusedxml
python-pillow python-tinycss2))
(native-inputs
- (list python-pytest-flake8 python-pytest-isort python-pytest-runner
+ (list python-pytest-isort python-pytest-runner
python-setuptools python-wheel))
(home-page "https://cairosvg.org/")
(synopsis "SVG to PDF/PS/PNG converter based on Cairo")
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#70858] [PATCH 22/32] build-system/pyproject: Remove python-pytest-cov native-input.
` (8 preceding siblings ...)
2024-05-10 7:55 71% ` [bug#70858] [PATCH 21/32] build-system/pyproject: Remove python-twine native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 41% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 70% ` [bug#70858] [PATCH 23/32] gnu: python-tinycss2: " Nicolas Graves via Guix-patches via
` (5 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-astroml, python-casa-formats-io,
python-cdflib, python-czml3, python-poliastro, python-tweakwcs,
python-wiimatch, python-stcal)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/audio.scm (python-pysox)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/backup.scm (borgmatic)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/bioinformatics.scm (python-biom-format, python-pyfaidx,
python-cooler, python-screed)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/build-tools.scm (meson-python)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/check.scm (python-pytest-nunit, python-pytest-timeout,
python-pytest-enabler, python-pytest-perf,
python-pyhamcrest)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/databases.scm (python-alembic)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/dav.scm (vdirsyncer, radicale)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/embedded.scm (mbed-tools)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/fontutils.scm (psautohint)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/geo.scm (python-fiona, python-cartopy)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/graphviz.scm (python-graphviz, python-uqbar)
[native-inputs]: Remove python-pytest-cov.
* gnu/packages/jupyter.scm (python-jupyter-packaging,
python-jupyter-server, python-jupyterlite-core, python-ipydatawidgets)
[native-inputs]: Remove python-pytest-cov.
* gnu/packages/machine-learning.scm (python-persim,
python-scikit-learn-extra, python-imbalanced-learn,
python-keras-application, python-keras-preprocessing, python-keras,
python-tensorly, python-pytorch-geometric, python-captum,
python-torchmetrics, python-pyro-ppl)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/mastodon.scm (python-mastodon-py)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/messaging.scm (zulip-term)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/package-management.scm (python-conda-package-handling):
[native-inputs]: Remove python-pytest-cov.
* gnu/packages/patchutils.scm (pwclient)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/python-check.scm (python-testfixtures, python-vcrpy,
python-pytest-filter-subpackage, python-atpublic, python-sybil,
python-vulture)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/python-crypto.scm (python-trustme)[native-inputs]:
Remove python-pytest-cov.
(python-certauth)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.
* gnu/packages/python-science.scm (python-scipy, python-trimesh,
python-pandaparallel, python-pyts, python-usetplot, python-pingouin,
python-opt-einsum, python-salib)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/python-web.scm (python-apiron, python-huggingface-hub,
python-portend, python-aiosignal, python-aiostream, python-ovh,
python-cbor2, python-httplib2, python-cheroot, parfive, python-jose,
python-pyscss, python-mechanicalsoup, python-priority, hypercorn,
python-aioftp, python-oauthlib, python-tinycss, python-cssselect2,
python-httpcore, python-wsgiprox, python-venusian, python-cloud-init,
python-siosocks, python-zeep, gunicorn)[native-inputs]: Remove
python-pytest-cov.
(python-warcio)[native-inputs]: Remove python-pytest-cov. Add
python-pytest.
* gnu/packages/python-xyz.scm (python-apprise, python-janus,
python-logbook, python-affine, python-mdit-py-plugins, python-pint,
python-rasterio, python-bidict, python-can, dosage, python-contourpy,
python-portalocker, python-extension-helpers, python-mizani,
python-cligj, python-ddlparse, python-robotframework-pythonlibcore,
python-lsp-server, python-sparse, python-pikepdf, python-imageio,
python-manimpango, python-importlib-resources, python-jaraco-classes,
python-jaraco-collections, python-jaraco-context,
python-jaraco-functools, python-jaraco-test, python-jaraco-text,
python-ipyparallel, python-three-merge, python-seaborn,
python-sentry-sdk, python-sniffio, python-get-version,
python-legacy-api-wrap, python-path, python-pip-run, python-debugpy,
python-notebook, python-ipywidgets, python-qstylizer,
python-cookiecutter, python-pyqtgraph, python-codespell,
python-inflect, python-lazy-loader, python-pymemcache, python-natsort,
python-mwclient, python-flasgger, python-tempora, python-outcome,
python-trio, python-apscheduler, python-iocapture, python-argh,
python-flit, python-watchdog, python-watchgod, python-cmd2,
python-inform, python-qtsass, python-scikit-build, python-minikanren,
python-tablib, nikola, python-ansicolors, python-shtab, python-scooby,
dynaconf, python-pyan3, python-numpydoc, python-loguru,
python-multidict)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/sphinx.scm (python-sphinx-gallery)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/statistics.scm (python-pymc, python-emcee,
python-rpy2)[native-inputs]: Remove python-pytest-cov.
* gnu/packages/task-management.scm (todoman)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/time.scm (python-arrow, python-tzlocal)[native-inputs]:
Remove python-pytest-cov.
* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/web.scm (anonip, python-tibanna)[native-inputs]: Remove
python-pytest-cov.
* gnu/packages/wm.scm (qtile)[native-inputs]: Remove
python-pytest-cov. Add python-coverage.
Change-Id: Ia8c96b18a60b6ceb00b345ef06351eae1a68e070
---
gnu/packages/astronomy.scm | 12 +--
gnu/packages/audio.scm | 2 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/bioinformatics.scm | 9 +-
gnu/packages/build-tools.scm | 1 -
gnu/packages/check.scm | 8 +-
gnu/packages/cpp.scm | 1 -
gnu/packages/databases.scm | 2 +-
gnu/packages/dav.scm | 2 -
gnu/packages/django.scm | 1 -
gnu/packages/embedded.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/fontutils.scm | 1 -
gnu/packages/geo.scm | 3 +-
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 2 -
gnu/packages/jupyter.scm | 7 +-
gnu/packages/machine-learning.scm | 20 ++---
gnu/packages/mastodon.scm | 1 -
gnu/packages/messaging.scm | 4 +-
gnu/packages/package-management.scm | 1 -
gnu/packages/patchutils.scm | 2 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 11 +--
gnu/packages/python-compression.scm | 9 +-
gnu/packages/python-crypto.scm | 3 +-
gnu/packages/python-science.scm | 16 ++--
gnu/packages/python-web.scm | 58 ++++---------
gnu/packages/python-xyz.scm | 123 +++++++---------------------
gnu/packages/sphinx.scm | 1 -
gnu/packages/statistics.scm | 6 +-
gnu/packages/task-management.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/time.scm | 2 -
gnu/packages/vpn.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/wm.scm | 1 -
37 files changed, 88 insertions(+), 234 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 426cfd8c88f..61ab7520aef 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -601,7 +601,7 @@ (define-public python-astroml
(setenv "HOME" "/tmp"))))))
(propagated-inputs (list python-astropy python-matplotlib python-numpy
python-scikit-learn python-scipy))
- (native-inputs (list python-pytest-astropy-header python-pytest-cov
+ (native-inputs (list python-pytest-astropy-header python-pytest
python-pytest-doctestplus python-pytest-remotedata
python-setuptools python-wheel))
(home-page "https://astroml.org")
@@ -2040,8 +2040,7 @@ (define-public python-casa-formats-io
(lambda _
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-openfiles
- python-setuptools))
+ (list python-pytest python-pytest-openfiles python-setuptools))
(propagated-inputs
(list python-astropy python-click python-dask python-numpy))
(home-page "https://casa-formats-io.readthedocs.io/")
@@ -2111,7 +2110,6 @@ (define-public python-cdflib
(list python-astropy
python-hypothesis
python-pytest
- python-pytest-cov
python-pytest-remotedata
python-setuptools-scm
python-xarray
@@ -2228,7 +2226,6 @@ (define-public python-czml3
(native-inputs
(list python-astropy
python-pytest
- python-pytest-cov
python-pytest-mypy
python-setuptools
python-wheel))
@@ -2606,7 +2603,6 @@ (define-public python-poliastro
(list python-hypothesis
python-flit-core
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-pytest-mpl
python-pytest-mypy))
@@ -3386,7 +3382,6 @@ (define-public python-stcal
(list python-cython-3
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm
python-setuptools
@@ -4605,7 +4600,6 @@ (define-public python-tweakwcs
python-stsci-stimage))
(native-inputs
(list python-pytest
- python-pytest-cov
python-scipy
python-setuptools
python-setuptools-scm))
@@ -5270,7 +5264,7 @@ (define-public python-wiimatch
"15kq7z30m9i286ncs9xvpaq3dq1p5fa47jz21prq146qwr7j6dm8"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy python-setuptools))
- (native-inputs (list python-pytest python-pytest-cov python-wheel
+ (native-inputs (list python-pytest python-wheel
python-pytest-doctestplus python-setuptools-scm))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e6d16211fd4..724430dae36 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -6197,7 +6197,7 @@ (define-public python-pysox
(propagated-inputs
(list python-numpy python-typing-extensions))
(native-inputs
- (list sox python-pytest python-pytest-cov python-soundfile))
+ (list sox python-pytest python-soundfile))
(home-page "https://github.com/rabitt/pysox")
(synopsis "Python wrapper around SoX")
(description "@code{python-pysox} is a wrapper around the @command{sox}
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 663eb2568fe..566ea06338b 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1357,7 +1357,7 @@ (define-public borgmatic
python-jsonschema
python-requests
python-ruamel.yaml))
- (native-inputs (list python-flexmock python-pytest python-pytest-cov))
+ (native-inputs (list python-flexmock python-pytest))
(home-page "https://torsion.org/borgmatic/")
(synopsis "Simple, configuration-driven backup software")
(description
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 3d5d381f0a0..5a4cf23eabb 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -3010,7 +3010,7 @@ (define-public python-biom-format
;;python-scikit-bio ;mutually recursive dependency
python-scipy))
(native-inputs
- (list python-cython python-pytest python-pytest-cov python-nose))
+ (list python-cython python-pytest python-nose))
(home-page "https://www.biom-format.org")
(synopsis "Biological Observation Matrix (BIOM) format utilities")
(description
@@ -10187,7 +10187,7 @@ (define-public python-screed
(base32 "0slva743xn93h4sl5zg2as4ricnnj5pp6nw9dm4qclk4i9xglkvk"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest-cov
+ (list python-pytest
python-pytest-runner
python-setuptools
python-wheel))
@@ -17920,7 +17920,6 @@ (define-public python-pyfaidx
python-mock
python-numpy
python-pytest
- python-pytest-cov
python-wheel))
(propagated-inputs (list python-setuptools))
(home-page "http://mattshirley.com")
@@ -17970,9 +17969,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-hatchling
- python-pytest
- python-pytest-cov))
+ (list python-hatchling python-pytest))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
(home-page "https://github.com/open2c/cooler")
(synopsis "Sparse binary format for genomic interaction matrices")
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 8fec2f8e2f2..29974dfd8b6 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -376,7 +376,6 @@ (define-public meson-python
python-cython
python-gitpython
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/mesonbuild/meson-python")
(synopsis "Meson-based build backend for Python")
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6042f763f15..6b16ec7711b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1530,7 +1530,7 @@ (define-public python-pytest-nunit
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;no tests included
(propagated-inputs (list python-attrs python-pytest))
- (native-inputs (list python-pytest python-pytest-cov python-setuptools
+ (native-inputs (list python-pytest python-setuptools
python-wheel python-xmlschema))
(home-page "https://github.com/pytest-dev/pytest-nunit")
(synopsis "Pytest plugin for generating NUnit3 test result XML output")
@@ -1796,7 +1796,7 @@ (define-public python-pytest-timeout
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(propagated-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(native-inputs
(list python-pexpect))
(home-page "https://github.com/pytest-dev/pytest-timeout")
@@ -2493,7 +2493,6 @@ (define-public python-pytest-enabler
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -2667,7 +2666,6 @@ (define-public python-pytest-perf
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -3242,7 +3240,7 @@ (define-public python-pyhamcrest
(base32
"05kdzlhs2kvj82pfca13qszszcj6dyrk4b9pbr46x06sq2s4qyls"))))
(native-inputs ;all native inputs are for tests
- (list python-pytest-cov python-mock python-pytest python-hypothesis))
+ (list python-mock python-pytest python-hypothesis))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index ba2698056da..9c693fb16c3 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1190,7 +1190,6 @@ (define-public cpplint
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-runner
python-testfixtures))
(home-page "https://github.com/cpplint/cpplint")
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 9ec7855109c..8abea7ec385 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3763,7 +3763,7 @@ (define-public python-alembic
(base32 "0lxi2g2025lz5k7k5dd5fc1lfijqi2yw6qqyjzp073z6laa8cckw"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-mock python-pytest-cov))
+ (list python-mock python-pytest))
(propagated-inputs
(list python-dateutil python-sqlalchemy python-mako python-editor))
(home-page "https://bitbucket.org/zzzeek/alembic")
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index b30b1ef5a59..0612a72c831 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -58,7 +58,6 @@ (define-public radicale
(build-system python-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-flake8
python-pytest-isort
python-pytest-runner
@@ -146,7 +145,6 @@ (define-public vdirsyncer
python-trustme
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpserver
radicale))
(inputs
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 48b1b38a97f..3ab2bc139d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -261,7 +261,6 @@ (define-public python-django-extensions
(list python-mock
python-factory-boy
python-pytest
- python-pytest-cov
python-pytest-django
python-shortuuid))
(home-page
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 1da41415194..542895c8779 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1798,7 +1798,6 @@ (define-public mbed-tools
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest
- python-pytest-cov
python-factory-boy
python-requests-mock
python-semver))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index af79172e53b..eaff8546dc4 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2681,7 +2681,6 @@ (define-public python-scikit-rf
(native-inputs (list python-nbval
python-networkx
python-pytest
- python-pytest-cov
python-pytest-mock
python-pyvisa))
(home-page "https://scikit-rf.org/")
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 84eb33d19bf..46b06765f0c 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -856,7 +856,6 @@ (define-public psautohint
(native-inputs
(list psautohint-font-data
python-pytest
- python-pytest-cov
python-pytest-xdist
python-setuptools-scm
python-setuptools
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 73644ab2bb4..a33de4bd669 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -935,7 +935,7 @@ (define-public python-fiona
(list gdal ; for gdal-config
python-boto3
python-cython
- python-pytest python-pytest-cov python-pytz))
+ python-pytest python-pytz))
(home-page "https://github.com/Toblerity/Fiona")
(synopsis
"Fiona reads and writes spatial data files")
@@ -1481,7 +1481,6 @@ (define-public python-cartopy
(native-inputs
(list python-cython
python-pytest
- python-pytest-cov
python-pytest-mpl
python-pytest-xdist
python-setuptools
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index b3c807c6774..d239dea20a4 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -217,7 +217,6 @@ (define-public mdpo
python-flake8-implicit-str-concat
python-flake8-print
python-pytest
- python-pytest-cov
python-sphinx
python-sphinx-argparse
python-sphinx-rtd-theme
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index f6a58943ecb..44ff4dc20d4 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -159,7 +159,6 @@ (define-public python-graphviz
graphviz
python-mock
python-pytest
- python-pytest-cov
python-pytest-mock
python-setuptools
python-wheel))
@@ -218,7 +217,6 @@ (define-public python-uqbar
(native-inputs
(list graphviz
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(propagated-inputs
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index 456b0544a9a..c25663e4da6 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -486,8 +486,7 @@ (define-public python-jupyter-packaging
(list python-deprecation python-packaging python-setuptools
python-tomlkit python-wheel))
(native-inputs
- (list python-pypa-build python-pytest
- python-pytest-cov python-pytest-mock))
+ (list python-pypa-build python-pytest python-pytest-mock))
(home-page "https://jupyter.org")
(synopsis "Jupyter packaging utilities")
(description "This package provides tools to help build and install
@@ -655,7 +654,6 @@ (define-public python-jupyterlite-core
(native-inputs (list python-ansi2html
python-hatchling
python-pytest-console-scripts
- python-pytest-cov
python-pytest-xdist
python-tornado-6))
(home-page "https://github.com/jupyterlite/jupyterlite")
@@ -1049,8 +1047,7 @@ (define-public python-ipydatawidgets
(native-inputs
(list python-jupyter-packaging
python-nbval
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://github.com/vidartf/ipydatawidgets")
(synopsis "Widgets to help facilitate reuse of large datasets across widgets")
(description
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 7c3faa94c5e..a3c598ba1c8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -926,8 +926,7 @@ (define-public python-persim
python-numpy
python-scikit-learn
python-scipy))
- (native-inputs (list python-pytest python-pytest-cov python-setuptools
- python-wheel))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://persim.scikit-tda.org")
(synopsis "Tools for analyzing persistence diagrams in Python")
(description
@@ -1796,7 +1795,7 @@ (define-public python-scikit-learn-extra
python-scikit-learn
python-scipy
python-packaging))
- (native-inputs (list python-pytest python-pytest-cov python-cython
+ (native-inputs (list python-pytest python-cython
python-setuptools python-wheel))
(home-page "https://github.com/scikit-learn-contrib/scikit-learn-extra")
(synopsis "Set of tools for scikit-learn")
@@ -1921,7 +1920,6 @@ (define-public python-imbalanced-learn
(native-inputs (list python-keras
python-pandas
python-pytest
- python-pytest-cov
python-setuptools
python-wheel
tensorflow))
@@ -3659,8 +3657,7 @@ (define-public python-keras-applications
(propagated-inputs
(list python-h5py python-numpy))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-pep8
- python-pytest-xdist))
+ (list python-pytest python-pytest-pep8 python-pytest-xdist))
(home-page "https://github.com/keras-team/keras-applications")
(synopsis "Reference implementations of popular deep learning models")
(description
@@ -3686,7 +3683,6 @@ (define-public python-keras-preprocessing
(list python-pandas
python-pillow
python-pytest
- python-pytest-cov
python-pytest-xdist
tensorflow))
(home-page "https://github.com/keras-team/keras-preprocessing/")
@@ -3828,7 +3824,6 @@ (define-public python-keras
python-markdown
python-pandas
python-pytest
- python-pytest-cov
python-pytest-pep8
python-pytest-timeout
python-pytest-xdist
@@ -3924,7 +3919,7 @@ (define-public python-tensorly
;; nor is examples/plot_quantum.py
" and not test_file_is_generated"))))
(propagated-inputs (list python-jsmin python-numpy python-scipy))
- (native-inputs (list python-pytest python-pytest-cov python-sphinx
+ (native-inputs (list python-pytest python-sphinx
python-setuptools python-wheel))
(home-page "https://github.com/tensorly/tensorly")
(synopsis "Tensor learning in Python")
@@ -4432,8 +4427,7 @@ (define-public python-pytorch-geometric
python-tqdm))
(native-inputs
(list python-flit-core
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://pyg.org")
(synopsis "Graph Neural Network library for PyTorch")
(description
@@ -4521,7 +4515,7 @@ (define-public python-captum
python-ipywidgets
python-parameterized
python-pytest
- python-pytest-cov
+ python-scikit-learn
python-setuptools))
(home-page "https://captum.ai")
(synopsis "Model interpretability for PyTorch")
@@ -4728,7 +4722,6 @@ (define-public python-torchmetrics
python-pandas
python-psutil
python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-pytest-rerunfailures
python-pytest-timeout
@@ -5057,7 +5050,6 @@ (define-public python-pyro-ppl
python-pillow
python-pypandoc
python-pytest
- python-pytest-cov
python-pytest-xdist
python-scikit-learn
python-scipy
diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
index b8006292cab..670a47ad821 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/mastodon.scm
@@ -179,7 +179,6 @@ (define-public python-mastodon-py
python-cryptography
python-http-ece
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-runner
python-pytest-vcr
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 35ff807e12c..1fd2ce391cf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3213,7 +3213,6 @@ (define-public zulip-term
(modules '((guix build utils)))
(snippet '(substitute* "setup.py"
(("\\=\\=1\\.7") ">=1.7") ; pytest-mock
- (("\\=\\=2\\.5") ">=2.5") ; pytest-cov
(("4\\.5\\.2") "4.4.2"))))) ; lxml
(build-system pyproject-build-system)
(arguments
@@ -3226,8 +3225,7 @@ (define-public zulip-term
python-urwid-readline
python-zulip))
(native-inputs
- (list python-distro python-pytest python-pytest-cov
- python-pytest-mock))
+ (list python-distro python-pytest python-pytest-mock))
(home-page "https://github.com/zulip/zulip-terminal")
(synopsis "Zulip's official terminal client")
(description "This package contains Zulip's official terminal client.")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 4e7e46bf1b3..2659fc8eff5 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1145,7 +1145,6 @@ (define-public python-conda-package-handling
(list python-cython
python-mock
python-pytest
- python-pytest-cov
python-pytest-mock
python-setuptools
python-wheel))
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index cdefa485836..870d5ae02c3 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -595,7 +595,7 @@ (define-public pwclient
"/share/man/man1"))
#t)))))
(native-inputs
- (list python-pbr python-pytest python-pytest-cov python-mock))
+ (list python-pbr python-pytest python-mock))
(home-page
"https://github.com/getpatchwork/pwclient")
(synopsis "Command-line client for the Patchwork patch tracking tool")
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 9c4d56bd384..91c8731726b 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 4426e5af2f5..fdef98f6c8a 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -243,7 +243,7 @@ (define-public python-testfixtures
(arguments
`(#:tests? #f)) ; PyTest-Django fails to build in master
(native-inputs
- (list python-pytest python-pytest-cov
+ (list python-pytest
;;("python-pytest-django" ,python-pytest-django)
python-wheel))
(synopsis "Tests components for Python")
@@ -417,7 +417,6 @@ (define-public python-vcrpy
python-ipaddress
python-mock
python-pytest
- python-pytest-cov
python-pytest-httpbin
python-urllib3))
(home-page "https://github.com/kevin1024/vcrpy")
@@ -724,7 +723,6 @@ (define-public python-pytest-filter-subpackage
(build-system pyproject-build-system)
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-doctestplus
python-setuptools-scm
python-setuptools
@@ -1868,7 +1866,7 @@ (define-public python-atpublic
(build-system pyproject-build-system)
(arguments (list #:build-backend "pdm.backend"))
(native-inputs
- (list python-pytest python-pdm-backend python-sybil python-pytest-cov))
+ (list python-pytest python-pdm-backend python-sybil))
(home-page "https://public.readthedocs.io/")
(synopsis "@code{@@public} decorator for populating @code{__all__}")
(description
@@ -2691,7 +2689,7 @@ (define-public python-sybil
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest")))))))
- (native-inputs (list python-pytest python-pytest-cov))
+ (native-inputs (list python-pytest))
(home-page "https://github.com/simplistix/sybil")
(synopsis "Automated testing for examples in code and documentation")
(description
@@ -2823,8 +2821,7 @@ (define-public python-vulture
;; skip test that uses python-pint
;; pint has many dependencies
"not test_whitelists_with_python")))))))
- (native-inputs (list python-pytest python-pytest-cov
- python-setuptools python-wheel))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-toml))
(home-page "https://github.com/jendrikseipp/vulture")
(synopsis "Find dead Python code")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 5faf7b2a3cb..fd194571633 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -112,7 +112,6 @@ (define-public python-multivolumefile
python-hypothesis
python-pyannotate
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(home-page "https://github.com/miurahr/multivolume")
@@ -247,7 +246,6 @@ (define-public python-pybcj
(native-inputs
(list python-hypothesis
python-pytest
- python-pytest-cov
python-setuptools-scm
python-setuptools
python-wheel))
@@ -278,7 +276,7 @@ (define-public python-bcj-cffi
(propagated-inputs
(list python-cffi python-toml python-setuptools-scm))
(native-inputs
- (list python-setuptools python-pytest python-pytest-cov))
+ (list python-setuptools python-pytest))
(home-page "https://github.com/miurahr/bcj-cffi")
(synopsis "Branch / Call /Jump CFFI library in Python")
(description "This package provides an implementation of the Branch / Call /
@@ -406,7 +404,6 @@ (define-public python-pyppmd
(list python-hypothesis
python-pytest
python-pytest-benchmark
- python-pytest-cov
python-pytest-timeout
python-setuptools-scm
python-setuptools
@@ -436,8 +433,7 @@ (define-public python-ppmd-cffi
(native-inputs
(list python-hypothesis
python-setuptools-scm
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://github.com/miurahr/ppmd")
(synopsis "Prediction by Partial Matching compression library")
(description "PPMd is a compression algorithm library using the Prediction
@@ -478,7 +474,6 @@ (define-public python-py7zr
python-pyannotate
python-pytest
python-pytest-benchmark
- python-pytest-cov
python-pytest-remotedata
python-pytest-timeout))
(home-page "https://github.com/miurahr/py7zr")
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 7aaa37d7965..6965a330624 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -457,7 +457,7 @@ (define-public python-certauth
(propagated-inputs
(list python-pyopenssl python-tldextract))
(native-inputs
- (list python-pytest-cov))
+ (list python-pytest))
(home-page "https://github.com/ikreymer/certauth")
(synopsis "Certificate authority creation tool")
(description "This package provides a small library, built on top of
@@ -1501,7 +1501,6 @@ (define-public python-trustme
(list python-more-itertools
python-pyopenssl
python-pytest
- python-pytest-cov
python-service-identity
python-setuptools
python-wheel
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 567fa5d1559..4511d9bc7c8 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -297,7 +297,6 @@ (define-public python-scipy
python-pooch
python-pydevtool
python-pytest
- python-pytest-cov
python-pytest-timeout
python-pytest-xdist))
(home-page "https://scipy.org/")
@@ -652,8 +651,7 @@ (define-public python-trimesh
"'$MESH_PRE'")))))))
(native-inputs
(list python-pyinstrument
- python-pytest
- python-pytest-cov))
+ python-pytest))
(propagated-inputs
(list python-chardet
python-colorlog
@@ -1122,7 +1120,6 @@ (define-public python-pandarallel
(list python-mkdocs-material
python-numpy
python-pytest
- python-pytest-cov
python-pytest-xdist
python-setuptools
python-wheel))
@@ -1357,8 +1354,7 @@ (define-public python-pyts
python-scikit-learn
python-scipy))
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools
- python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/johannfaouzi/pyts")
(synopsis "Python package for time series classification")
(description
@@ -1899,7 +1895,7 @@ (define-public python-upsetplot
(propagated-inputs
(list python-matplotlib python-pandas))
(native-inputs
- (list python-pytest-runner python-pytest-cov))
+ (list python-pytest-runner))
(home-page "https://upsetplot.readthedocs.io")
(synopsis "Draw UpSet plots with Pandas and Matplotlib")
(description
@@ -2048,7 +2044,7 @@ (define-public python-pingouin
(("kwargs\\[\"penalty\"\\] = \"none\"")
"kwargs[\"penalty\"] = None")))))))
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(propagated-inputs
(list python-matplotlib
python-mpmath
@@ -3090,7 +3086,7 @@ (define-public python-opt-einsum
(when tests?
(invoke "pytest" "-vv")))))))
(propagated-inputs (list python-numpy))
- (native-inputs (list python-pytest python-pytest-cov python-pytest-pep8))
+ (native-inputs (list python-pytest python-pytest-pep8))
(home-page "https://github.com/dgasmith/opt_einsum")
(synopsis "Optimizing numpys einsum function")
(description
@@ -3179,7 +3175,7 @@ (define-public python-salib
python-numpy
python-pandas
python-scipy))
- (native-inputs (list python-hatchling python-pytest python-pytest-cov))
+ (native-inputs (list python-hatchling python-pytest))
(home-page "https://salib.readthedocs.io/en/latest/")
(synopsis "Tools for global sensitivity analysis")
(description "SALib provides tools for global sensitivity analysis. It
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3aadc9060a0..c73bc6294e9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -201,7 +201,6 @@ (define-public python-huggingface-hub
python-pydantic
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-env
python-pytest-rerunfailures
python-pytest-vcr
@@ -314,7 +313,6 @@ (define-public python-portend
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-mypy
python-setuptools
@@ -432,7 +430,7 @@ (define-public python-aiosignal
(build-system pyproject-build-system)
(arguments (list #:test-flags #~(list "tests")))
(propagated-inputs (list python-frozenlist))
- (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov
+ (native-inputs (list python-pytest python-pytest-asyncio
python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/aiosignal")
(synopsis "Callback manager for Python @code{asyncio} projects")
@@ -681,12 +679,11 @@ (define-public python-aiostream
(sha256
(base32
"0l2ijb7yk0820wiyf6zrzx8fhzf8925an7r06mcaw3in1mr6rssq"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(native-inputs
(list python-setuptools
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-runner
python-wheel))
(home-page "https://github.com/vxgmichel/aiostream")
@@ -977,7 +974,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-pytest
- python-pytest-cov
python-setuptools
python-sphinx
python-wheel))
@@ -999,7 +995,6 @@ (define-public python-cbor2
(base32 "15y78xcc3zkmvj1mdzz8gyhf3apbl91073kwhzbjk5abc1civwlw"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-cov
python-setuptools
python-setuptools-scm
python-wheel))
@@ -1270,7 +1265,6 @@ (define-public python-httplib2
python-future
python-mock
python-pytest
- python-pytest-cov
python-pytest-forked
python-pytest-randomly
python-pytest-timeout
@@ -1300,8 +1294,7 @@ (define-public python-cheroot
(arguments
(list
#:test-flags
- #~(list "--cov=cheroot"
- ;; Tests are flaky in parallel invocation.
+ #~(list ;; Tests are flaky in parallel invocation.
;; "--numprocesses=auto"
"--doctest-modules"
"--showlocals"
@@ -1326,7 +1319,6 @@ (define-public python-cheroot
python-pyopenssl
python-pypytools
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-xdist
python-requests
@@ -1402,7 +1394,6 @@ (define-public parfive
python-tqdm))
(native-inputs (list python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-localserver
python-pytest-socket
python-setuptools
@@ -1471,8 +1462,7 @@ (define-public python-jose
#t)))))
(native-inputs
(list ;; All native inputs are for tests.
- python-pyasn1 python-pytest python-pytest-cov
- python-pytest-runner))
+ python-pyasn1 python-pytest python-pytest-runner))
(propagated-inputs
(list python-cryptography python-ecdsa python-rsa python-six))
(synopsis "JOSE implementation in Python")
@@ -1518,7 +1508,7 @@ (define-public python-pyscss
(base32 "1vinddg8sbh3v9n1r1wmvjx6ydk8xp7scbvhb3csl4y9xz7vhk6g"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(inputs
(list pcre))
(home-page "https://github.com/Kronuz/pyScss")
@@ -1585,12 +1575,11 @@ (define-public python-mechanicalsoup
(uri (pypi-uri "MechanicalSoup" version))
(sha256
(base32 "01sddjxy3rznh63hnl5lbv1hhk6xyiviwmkiw4x7v4ap35fb3lrp"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-beautifulsoup4 python-lxml python-requests python-six))
(native-inputs
- (list python-pytest-cov
- python-pytest-flake8
+ (list python-pytest-flake8
python-pytest-httpbin
python-pytest-mock
python-pytest-runner
@@ -2537,8 +2526,7 @@ (define-public python-priority
;; This test exceeded the Hypothesis deadline.
"not test_period_of_repetition"))))))
(native-inputs
- (list python-hypothesis python-pytest python-pytest-cov
- python-pytest-xdist))
+ (list python-hypothesis python-pytest python-pytest-xdist))
(home-page "https://python-hyper.org/projects/priority/en/latest/")
(synopsis "Pure-Python implementation of the HTTP/2 priority tree")
(description
@@ -2595,7 +2583,6 @@ (define-public hypercorn
python-poetry-core
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-trio
python-trio))
(home-page "https://gitlab.com/pgjones/hypercorn/")
@@ -3554,7 +3541,7 @@ (define-public python-apiron
(propagated-inputs
(list python-requests))
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(home-page "https://github.com/ithaka/apiron")
(synopsis "Python wrapper for interacting with RESTful APIs")
(description
@@ -3817,7 +3804,6 @@ (define-public python-aioftp
(native-inputs (list python-async-timeout
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-setuptools
python-trustme
python-wheel))
@@ -3924,7 +3910,7 @@ (define-public python-oauthlib
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-mock))
+ (list python-pytest python-mock))
(propagated-inputs
(list python-cryptography python-pyjwt python-blinker))
(home-page "https://github.com/oauthlib/oauthlib")
@@ -5878,7 +5864,7 @@ (define-public python-tinycss
(list #:test-flags
'(list "-k" "not test_speedups")))
(native-inputs
- (list python-pytest-cov python-pytest-flake8 python-pytest-isort
+ (list python-pytest-flake8 python-pytest-isort
python-pytest-runner python-setuptools python-wheel))
(home-page "https://tinycss.readthedocs.io/")
(synopsis "Complete yet simple CSS parser for Python")
@@ -5950,7 +5936,7 @@ (define-public python-cssselect2
(propagated-inputs
(list python-tinycss2))
(native-inputs
- (list python-pytest-cov python-pytest-runner))
+ (list python-pytest-runner))
(home-page "https://cssselect2.readthedocs.io/")
(synopsis "CSS selectors for Python ElementTree")
(description "@code{cssselect2} is a straightforward implementation of
@@ -6076,7 +6062,6 @@ (define-public gunicorn
python-aiohttp
python-gevent
python-pytest
- python-pytest-cov
python-sphinx
texinfo))
(propagated-inputs (list python-packaging python-setuptools python-wheel))
@@ -6431,7 +6416,6 @@ (define-public python-httpcore
(native-inputs
(list python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpbin
python-pytest-trio
python-uvicorn
@@ -6606,7 +6590,7 @@ (define-public python-wsgiprox
(propagated-inputs
(list python-certauth python-gevent python-websocket-client))
(native-inputs
- (list python-mock python-pytest-cov python-waitress))
+ (list python-mock python-waitress))
(home-page "https://github.com/webrecorder/wsgiprox")
(synopsis "HTTP/S proxy with WebSockets over WSGI")
(description "@code{wsgiprox} is a Python WSGI (Web Server Gateway
@@ -6646,9 +6630,7 @@ (define-public python-warcio
"test_capture_https_proxy_same_session")
" and not ")))))
(native-inputs
- ;; These inputs are required for the test suite.
- (list python-httpbin python-pytest-cov python-requests
- python-wsgiprox))
+ (list python-httpbin python-pytest python-requests python-wsgiprox))
(home-page "https://github.com/webrecorder/warcio")
(synopsis "Streaming web archival archive (WARC) library")
(description "warcio is a Python library to read and write the WARC format
@@ -6759,12 +6741,9 @@ (define-public python-venusian
(uri (pypi-uri "venusian" version))
(sha256
(base32 "0f7f67dkgxxcjfhpdd5frb9pszkf04lyzzpn5069q0xi89r2p17n"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(native-inputs
- `(("python-pytest" ,python-pytest)
- ("python-runner" ,python-pytest-runner)
- ("python-pytest-cov" ,python-pytest-cov)))
- (arguments '(#:test-target "pytest"))
+ (list python-pytest python-pytest-runner))
(home-page "https://docs.pylonsproject.org/projects/venusian")
(synopsis "Library for deferring decorator actions")
(description
@@ -7359,7 +7338,6 @@ (define-public python-cloud-init
(native-inputs
(list procps ;for ps when running tests
python-pytest
- python-pytest-cov
python-pytest-mock
python-passlib))
(home-page "https://github.com/canonical/cloud-init")
@@ -7745,8 +7723,7 @@ (define-public python-siosocks
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vvv")))))))
- (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov
- python-pytest-trio))
+ (native-inputs (list python-pytest python-pytest-asyncio python-pytest-trio))
(propagated-inputs (list python-trio))
(home-page "https://github.com/pohmelie/siosocks")
(synopsis "SOCKSv4 & SOCKSv5 TCP proxy protocol implementation in Python")
@@ -8778,7 +8755,6 @@ (define-public python-zeep
python-pretend
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-httpx
python-requests-mock))
(home-page "https://docs.python-zeep.org/en/stable/")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4e6f0e1a29a..bc4761e4c38 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -321,7 +321,6 @@ (define-public python-apprise
python-cryptography
python-paho-mqtt
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-xdist
python-setuptools
@@ -421,7 +420,7 @@ (define-public python-janus
(base32 "04hnrdcf03g1s0x3sr72sh9gnszz6kyfsl9dg8a4n0zvvhn6z5yz"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-asyncio
+ (list python-pytest python-pytest-asyncio
python-setuptools python-wheel))
(propagated-inputs (list python-typing-extensions))
(home-page "https://github.com/aio-libs/janus/")
@@ -586,8 +585,7 @@ (define-public python-logbook
(setenv "CYBUILD" "True")
(invoke "pytest" "--cov=logbook" "-r" "s" "tests")))))))
(native-inputs
- (list python-cython python-mock python-pytest python-pytest-cov
- python-brotli))
+ (list python-cython python-mock python-pytest python-brotli))
(home-page "https://github.com/getlogbook/logbook")
(synopsis "Logbook is a logging replacement for Python")
(description
@@ -1018,8 +1016,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-pydocstyle
- python-pytest python-pytest-cov))
+ (propagated-inputs (list python-pydocstyle python-pytest ))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
(synopsis "Matrices describing affine transformation of the plane")
@@ -1256,7 +1253,6 @@ (define-public python-contourpy
pkg-config
pybind11
python-pytest
- python-pytest-cov
python-wurlitzer))
(home-page "https://contourpy.readthedocs.io/")
(synopsis
@@ -1338,7 +1334,6 @@ (define-public python-mdit-py-plugins
(native-inputs
(list python-flit-core
python-pytest
- python-pytest-cov
python-pytest-regressions))
(home-page "https://github.com/executablebooks/mdit-py-plugins")
(synopsis "Collection of plugins for markdown-it-py")
@@ -1669,7 +1664,7 @@ (define-public python-pint
;; present in registry"
" and not test_load_definitions_stage_2"))))
(native-inputs
- (list python-pytest python-pytest-benchmark python-pytest-cov
+ (list python-pytest python-pytest-benchmark
python-pytest-mpl python-pytest-subtests
python-setuptools python-setuptools-scm python-wheel))
(propagated-inputs
@@ -2527,7 +2522,6 @@ (define-public python-rasterio
python-hypothesis
python-packaging
python-pytest
- python-pytest-cov
python-shapely
python-wheel))
(home-page "https://github.com/rasterio/rasterio")
@@ -2688,7 +2682,6 @@ (define-public python-bidict
python-py
python-pytest
python-pytest-benchmark
- python-pytest-cov
python-setuptools-scm
python-sortedcollections
python-sortedcontainers
@@ -3574,7 +3567,6 @@ (define-public python-can
python-parameterized
python-pyserial
python-pytest
- python-pytest-cov
python-pytest-runner
python-pytest-timeout
python-wheel))
@@ -4070,8 +4062,7 @@ (define-public dosage
python-requests
python-six))
(native-inputs
- (list python-pytest-cov python-pytest-xdist python-responses
- python-setuptools-scm))
+ (list python-pytest-xdist python-responses python-setuptools-scm))
(home-page "https://github.com/webcomics/dosage")
(synopsis "Comic strip downloader and archiver")
(description "Dosage is designed to keep a local copy of specific webcomics and other
@@ -4937,7 +4928,6 @@ (define-public python-portalocker
"0lawjm736vs86wlnxc3qqh37l11z0yx81xq3dmrw33m86kaq2bh3"))))
(build-system pyproject-build-system)
(native-inputs (list python-pytest
- python-pytest-cov
python-pytest-mypy
python-pytest-timeout
python-redis
@@ -5030,7 +5020,6 @@ (define-public python-extension-helpers
(native-inputs
(list python-pytest
python-pytest-astropy
- python-pytest-cov
python-setuptools-scm
python-setuptools
python-wheel))
@@ -5168,7 +5157,7 @@ (define-public python-mizani
(list python-matplotlib python-numpy python-pandas python-scipy))
(native-inputs
(list python-setuptools python-setuptools-scm
- python-pytest python-pytest-cov tzdata))
+ python-pytest tzdata))
(home-page "https://github.com/has2k1/mizani")
(synopsis "Create data visualizations in Python")
(description
@@ -5557,8 +5546,6 @@ (define-public python-cligj
(build-system python-build-system)
(propagated-inputs
(list python-click))
- (native-inputs
- (list python-pytest-cov))
(home-page "https://github.com/mapbox/cligj")
(synopsis "Click params for command line interfaces to GeoJSON")
(description
@@ -5667,10 +5654,7 @@ (define-public python-ddlparse
(base32 "1nh8m6rxslwk05daxshxmgk41qfp18yynydba49b13l4m8dnh634"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest
- python-pytest-cov
- python-setuptools
- python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/shinichi-takii/ddlparse")
(synopsis "Parses and converts DDL to BigQuery JSON schema")
@@ -7639,8 +7623,7 @@ (define-public python-robotframework-pythonlibcore
(when tests?
(invoke "utest/run.py")))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-mockito
- python-robotframework))
+ (list python-pytest python-pytest-mockito python-robotframework))
(home-page "https://github.com/robotframework/PythonLibCore")
(synopsis "Robot Framework Python library tools")
(description "PythonLibCore provides tools for creating larger test
@@ -8180,7 +8163,6 @@ (define-public python-lsp-server
python-pandas
python-pylint
python-pytest
- python-pytest-cov
python-rope
python-setuptools
python-wheel))
@@ -8704,7 +8686,7 @@ (define-public python-sparse
(list python-numba python-numpy python-scipy))
(native-inputs
(list python-dask python-importlib-metadata python-pytest
- python-pytest-black python-pytest-cov python-setuptools))
+ python-pytest-black python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
(description
@@ -9160,8 +9142,7 @@ (define-public python-numpydoc
"-k" "not test_MyClass and not test_my_function")))
(propagated-inputs (list python-jinja2 python-sphinx))
(native-inputs
- (list python-matplotlib python-pytest python-pytest-cov
- python-setuptools python-wheel))
+ (list python-matplotlib python-pytest python-setuptools python-wheel))
(home-page "https://pypi.org/project/numpydoc/")
(synopsis "Numpy's Sphinx extensions")
(description "Sphinx extension to support docstrings in Numpy format.")
@@ -9880,7 +9861,7 @@ (define-public python-multidict
"1kjrxav572j45xvr1iy60zb2g8zqvrinzdkl4ax36js4vczckl8d"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/multidict/")
(synopsis "Multidict implementation")
(description "Multidict is dict-like collection of key-value pairs
@@ -10187,7 +10168,6 @@ (define-public python-pikepdf
python-setuptools-scm
python-psutil
python-pytest
- python-pytest-cov
python-pytest-timeout
python-pytest-xdist
python-dateutil
@@ -10766,8 +10746,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-fsspec python-pytest
- python-pytest-cov python-wheel))
+ (list python-fsspec python-pytest python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
(description
@@ -11054,7 +11033,6 @@ (define-public python-manimpango
(list pkg-config
python-cython
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(inputs
@@ -11547,7 +11525,6 @@ (define-public python-importlib-resources
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -11678,7 +11655,6 @@ (define-public python-jaraco-classes
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -11712,7 +11688,6 @@ (define-public python-jaraco-collections
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-mypy
python-setuptools
@@ -11773,7 +11748,6 @@ (define-public python-jaraco-context
(list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -11808,7 +11782,6 @@ (define-public python-jaraco-functools
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-flake8
python-pytest-mypy
python-setuptools
@@ -11869,7 +11842,6 @@ (define-public python-jaraco-test
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -11903,7 +11875,6 @@ (define-public python-jaraco-text
(native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-mypy
python-setuptools
@@ -12048,7 +12019,6 @@ (define-public python-ipyparallel
(list python-ipython
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-tornado
python-testpath))
(propagated-inputs
@@ -13352,7 +13322,7 @@ (define-public python-three-merge
(propagated-inputs
(list python-diff-match-patch))
(native-inputs
- (list python-flaky python-pytest python-pytest-cov
+ (list python-flaky python-pytest
python-pytest-runner python-pytest-timeout))
(home-page "https://github.com/spyder-ide/three-merge")
(synopsis "Library for merging two strings with respect to a base one")
@@ -13676,7 +13646,6 @@ (define-public python-seaborn
python-numpydoc
python-mypy
python-pytest
- python-pytest-cov
python-pytest-xdist
python-pyyaml))
(home-page "https://seaborn.pydata.org/")
@@ -14315,7 +14284,6 @@ (define-public python-sentry-sdk
python-mock
python-pyrsistent
python-pytest
- python-pytest-cov
python-pytest-django
python-pytest-forked
python-pytest-localserver
@@ -16040,7 +16008,7 @@ (define-public python-sniffio
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-curio python-pytest python-pytest-cov))
+ (list python-curio python-pytest))
(home-page "https://github.com/python-trio/sniffio")
(synopsis "Detect which async library a program is running under")
(description "This package detects which async library a program is
@@ -16174,7 +16142,6 @@ (define-public python-get-version
(list python-pygments
python-pytest
python-pytest-black
- python-pytest-cov
python-setuptools
python-testpath))
(home-page "https://github.com/flying-sheep/get_version")
@@ -16289,7 +16256,7 @@ (define-public python-legacy-api-wrap
(build-system python-build-system)
(propagated-inputs
(list python-get-version python-pytest python-pytest-black
- python-pytest-cov python-setuptools))
+ python-setuptools))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
@@ -16551,7 +16518,6 @@ (define-public python-path
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy)))
@@ -16657,7 +16623,6 @@ (define-public python-pip-run
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy)))
@@ -17011,7 +16976,6 @@ (define-public python-debugpy
python-flask
python-psutil
python-pytest
- python-pytest-cov
python-pytest-timeout
python-pytest-xdist
python-requests))
@@ -17572,7 +17536,6 @@ (define-public python-notebook
(list python-jupyter-server
python-nbval
python-pytest
- python-pytest-cov
python-requests
python-requests-unixsocket
python-setuptools
@@ -17624,7 +17587,7 @@ (define-public python-ipywidgets
python-traitlets
python-widgetsnbextension))
(native-inputs
- (list python-mock python-pytest python-pytest-cov))
+ (list python-mock python-pytest))
(home-page "https://ipython.org")
(synopsis "IPython HTML widgets for Jupyter")
(description "Ipywidgets are interactive HTML widgets for Jupyter
@@ -18241,7 +18204,6 @@ (define-public python-qstylizer
(list python-pbr
python-pytest
python-pytest-catchlog
- python-pytest-cov
python-pytest-mock
python-pytest-runner
python-pytest-xdist))
@@ -19429,7 +19391,6 @@ (define-public python-cookiecutter
git
python-freezegun
python-pytest
- python-pytest-cov
python-pytest-mock))
(propagated-inputs (list python-arrow
python-binaryornot
@@ -19823,8 +19784,7 @@ (define-public python-pyqtgraph
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-xdist
- python-setuptools python-wheel))
+ (list python-pytest python-pytest-xdist python-setuptools python-wheel))
(inputs
(list qtbase-5))
(propagated-inputs
@@ -20009,7 +19969,6 @@ (define-public python-codespell
(native-inputs
(list python-pygments
python-pytest
- python-pytest-cov
python-pytest-dependency
python-tomli
python-setuptools
@@ -21102,7 +21061,6 @@ (define-public python-inflect
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-mypy
@@ -21668,8 +21626,7 @@ (define-public python-lazy-loader
"0dwghffnsjjf4pi4gwbl43rx04jmap375hdamafs5cpm6j78js1v"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest
- python-pytest-cov))
+ (list python-pytest))
(propagated-inputs
(list python-flit-core))
(home-page "https://scientific-python.org/specs/spec-0001/")
@@ -22236,8 +22193,7 @@ (define-public python-pymemcache
#:test-flags
'(list "--ignore=pymemcache/test/test_compression.py")))
(native-inputs
- (list python-faker python-pytest python-pytest-cov python-setuptools
- python-wheel))
+ (list python-faker python-pytest python-setuptools python-wheel))
(home-page "https://github.com/pinterest/pymemcache")
(synopsis "Comprehensive, fast, pure Python memcached client")
(description
@@ -22858,8 +22814,7 @@ (define-public python-natsort
(when tests?
(invoke "pytest" "-v")))))))
(native-inputs
- (list python-hypothesis python-pytest-cov python-pytest-mock
- python-pytest))
+ (list python-hypothesis python-pytest-mock python-pytest))
(propagated-inputs ; TODO: Add python-fastnumbers.
(list python-pyicu))
(home-page "https://github.com/SethMMorton/natsort")
@@ -24286,7 +24241,7 @@ (define-public python-mwclient
(propagated-inputs
(list python-requests-oauthlib python-six))
(native-inputs
- (list python-mock python-pytest python-pytest-cov
+ (list python-mock python-pytest
python-pytest-runner python-responses))
(home-page "https://github.com/btongminh/mwclient")
(synopsis "MediaWiki API client")
@@ -25244,7 +25199,6 @@ (define-public python-flasgger
python-flex
python-marshmallow
python-pytest
- python-pytest-cov
python-setuptools
python-wheel))
(home-page "https://github.com/rochacbruno/flasgger/")
@@ -25956,7 +25910,6 @@ (define-public python-tempora
python-pytest
python-pytest-black
python-pytest-checkdocs
- python-pytest-cov
python-pytest-enabler
python-pytest-flake8
python-pytest-freezegun
@@ -28941,7 +28894,7 @@ (define-public python-outcome
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-asyncio))
+ (list python-pytest python-pytest-asyncio))
(propagated-inputs
(list python-attrs))
(home-page "https://github.com/python-trio/outcome")
@@ -29014,7 +28967,6 @@ (define-public python-trio
python-pyopenssl
python-pytest
python-pytest-xdist
- python-pytest-cov
python-trustme
python-setuptools
python-wheel))
@@ -29257,7 +29209,6 @@ (define-public python-apscheduler
python-pyside-6
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-tornado5))
(home-page "https://github.com/agronholm/apscheduler")
(synopsis "Task scheduling library for Python")
@@ -29925,7 +29876,7 @@ (define-public python-iocapture
(invoke "py.test" "-v" "tests")
#t)))))
(propagated-inputs
- (list python-flexmock python-pytest python-pytest-cov python-six))
+ (list python-flexmock python-pytest python-six))
(home-page "https://github.com/oinume/iocapture")
(synopsis "Python capturing tool for stdout and stderr")
(description
@@ -30048,8 +29999,7 @@ (define-public python-argh
(when tests?
(invoke "pytest" "-vv")))))))
(propagated-inputs
- (list python-iocapture python-mock python-pytest python-pytest-cov
- python-pytest-xdist))
+ (list python-iocapture python-mock python-pytest python-pytest-xdist))
(home-page "https://github.com/neithere/argh/")
(synopsis "Argparse wrapper with natural syntax")
(description
@@ -30191,7 +30141,6 @@ (define-public python-flit
(list python-responses
python-pygments-github-lexers
python-pytest
- python-pytest-cov
python-sphinx
python-sphinxcontrib-github-alt
python-testpath))
@@ -30507,7 +30456,6 @@ (define-public python-watchdog
(list python-pathtools python-pyyaml))
(native-inputs
(list python-pytest
- python-pytest-cov
python-pytest-timeout
python-setuptools python-wheel))
(home-page "https://github.com/gorakhargosh/watchdog")
@@ -30541,7 +30489,6 @@ (define-public python-watchgod
python-pygments
python-pytest
python-pytest-asyncio
- python-pytest-cov
python-pytest-mock
python-pytest-sugar
python-pytest-toolbox
@@ -31665,7 +31612,6 @@ (define-public python-cmd2
(list python-invoke
python-mock
python-pytest
- python-pytest-cov
python-pytest-mock
python-setuptools
python-setuptools-scm
@@ -32361,7 +32307,7 @@ (define-public python-inform
(arguments
`(#:tests? #f)) ; PyPI tarball lacks tests
(native-inputs
- (list python-hypothesis python-pytest-cov python-pytest-runner))
+ (list python-hypothesis python-pytest-runner))
(propagated-inputs
(list python-arrow python-six))
(home-page "https://inform.readthedocs.io")
@@ -32907,7 +32853,6 @@ (define-public python-loguru
python-mypy
python-pre-commit
python-pytest
- python-pytest-cov
python-pytest-mypy-plugins
python-sphinx
python-sphinx-autobuild
@@ -32966,7 +32911,7 @@ (define-public python-qtsass
(for-each make-file-writable (find-files "."))
#t)))))
(native-inputs
- (list python-flaky python-pytest python-pytest-cov python-pytest-runner))
+ (list python-flaky python-pytest python-pytest-runner))
(propagated-inputs
(list python-libsass))
(home-page "https://github.com/spyder-ide/qtsass")
@@ -33356,7 +33301,6 @@ (define-public python-scikit-build
python-packaging
python-path
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytest-virtualenv
python-pytest-xdist
@@ -33929,7 +33873,7 @@ (define-public python-pyan3
"python-pyan3-fix-absolute-path-bug.patch"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-jinja2))
(home-page "https://github.com/Technologicat/pyan")
@@ -34070,7 +34014,6 @@ (define-public python-minikanren
(native-inputs
(list python-pydocstyle
python-pytest
- python-pytest-cov
python-pylint
python-sympy
python-versioneer))
@@ -34227,7 +34170,7 @@ (define-public python-tablib
(invoke "pytest")))))))
(native-inputs
(list python-pandas ;; required for test-suite
- python-pytest python-pytest-cov python-setuptools-scm))
+ python-pytest python-setuptools-scm))
(propagated-inputs
(list python-markuppy
python-odfpy
@@ -34742,7 +34685,7 @@ (define-public dynaconf
(list python-click python-configobj python-dotenv-0.13.0
python-ruamel.yaml-0.16 python-toml python-tomli))
(native-inputs
- (list python-django python-flask python-pytest python-pytest-cov
+ (list python-django python-flask python-pytest
python-pytest-mock python-setuptools python-wheel))
(home-page "https://www.dynaconf.com/")
(synopsis "The dynamic configurator for your Python project")
@@ -35017,8 +34960,7 @@ (define-public nikola
python-yapsy))
(native-inputs
(list python-freezegun
- python-pytest
- python-pytest-cov))
+ python-pytest))
(arguments
(list
#:phases
@@ -35268,8 +35210,7 @@ (define-public python-ansicolors
(base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest-cov
- unzip))
+ (list unzip))
(home-page "https://github.com/jonathaneunice/colors/")
(synopsis "ANSI colors for Python")
(description
@@ -35511,7 +35452,6 @@ (define-public python-shtab
(native-inputs
(list bash
python-pytest
- python-pytest-cov
python-pytest-timeout
python-setuptools
python-setuptools-scm
@@ -36098,7 +36038,6 @@ (define-public python-scooby
(list python-beautifulsoup4
python-numpy
python-pytest
- python-pytest-cov
python-pyvips-for-python-scooby
python-scipy))
(propagated-inputs
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index e49e215de79..669120cad0a 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -716,7 +716,6 @@ (define-public python-sphinx-gallery
python-numpy
python-pillow
python-pytest
- python-pytest-cov
python-setuptools
python-sphinx
python-wheel))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index de4fb6e3aa7..b8b162b0602 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2268,7 +2268,7 @@ (define-public python-pymc
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(setenv "HOME" "/tmp")))))))
- (native-inputs (list python-pytest-cov python-versioneer))
+ (native-inputs (list python-versioneer))
(propagated-inputs (list python-arviz
python-cachetools
python-cloudpickle
@@ -2397,7 +2397,6 @@ (define-public python-emcee
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy))
(native-inputs (list python-pytest
- python-pytest-cov
python-setuptools
python-setuptools-scm
python-wheel))
@@ -6778,8 +6777,7 @@ (define-public python-rpy2
(list python-ipython
python-numpy
python-pandas
- python-pytest
- python-pytest-cov))
+ python-pytest))
(home-page "https://rpy2.github.io")
(synopsis "Python interface to the R language")
(description "rpy2 is a redesign and rewrite of rpy. It is providing a
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm
index 96df50d7470..4b372cb6148 100644
--- a/gnu/packages/task-management.scm
+++ b/gnu/packages/task-management.scm
@@ -463,7 +463,6 @@ (define-public todoman
(native-inputs
(list python-setuptools-scm
python-pytest
- python-pytest-cov
python-freezegun))
(propagated-inputs
(list python-atomicwrites
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 2c7fd0365ca..f9f0b96f48a 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1676,7 +1676,6 @@ (define-public python-panflute
(native-inputs (list python-configparser
python-pandocfilters
python-pytest
- python-pytest-cov
python-requests))
(home-page "http://scorreia.com/software/panflute/")
(synopsis "Pythonic Pandoc filters")
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index d91058b378f..1064467020f 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -391,7 +391,6 @@ (define-public python-tzlocal
(native-inputs
(list python-check-manifest
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/regebro/tzlocal")
(synopsis "Local timezone information for Python")
@@ -511,7 +510,6 @@ (define-public python-arrow
(native-inputs
(list python-chai
python-pytest
- python-pytest-cov
python-pytest-mock
python-pytz
python-setuptools
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index d52d872909d..c0a4907b1b6 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -971,7 +971,6 @@ (define-public sshuttle
(list python-setuptools-scm
;; For tests only.
python-mock
- python-pytest-cov
python-pytest-runner))
(home-page "https://github.com/sshuttle/sshuttle")
(synopsis "VPN that transparently forwards connections over SSH")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 736be82c90b..2780672b1ce 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5111,7 +5111,6 @@ (define-public python-tibanna
(native-inputs
(list python-poetry-core
python-pytest
- python-pytest-cov
python-pytest-mock))
(home-page "https://github.com/4dn-dcic/tibanna")
(synopsis "Tibanna runs portable workflows on the AWS Cloud")
@@ -8736,7 +8735,7 @@ (define-public anonip
(when tests?
(invoke "pytest" "-vv" "tests.py" "anonip.py")))))))
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest))
(home-page "https://github.com/DigitaleGesellschaft/Anonip")
(synopsis "Anonymize IP addresses in log files")
(description
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 7da18bc821c..0f0b653ea2e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -656,7 +656,6 @@ (define-public qtile
(list pkg-config
python-pep8-naming
python-pytest
- python-pytest-cov
python-psutil
python-setuptools-scm
xorg-server-for-tests))
--
2.41.0
^ permalink raw reply related [relevance 41%]
* [bug#70858] [PATCH 21/32] build-system/pyproject: Remove python-twine native-input.
` (7 preceding siblings ...)
2024-05-10 7:55 62% ` [bug#70858] [PATCH 20/32] build-system/pyproject: Remove python-isort native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 71% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 41% ` [bug#70858] [PATCH 22/32] build-system/pyproject: Remove python-pytest-cov native-input Nicolas Graves via Guix-patches via
` (6 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-twine.
* gnu/packages/machine-learning.scm (python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-twine.
* gnu/packages/python-check.scm (python-testfixtures)[native-inputs]:
Remove python-twine.
* gnu/packages/python-web.scm (python-translation-finder)
[native-inputs]: Remove python-twine.
* gnu/packages/python-xyz.scm (python-cftime, python-eventlet,
python-eliot, python-arpeggio)[native-inputs]: Remove python-twine.
* gnu/packages/terminals.scm (python-halo)[native-inputs]: Remove
python-twine.
* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-twine.
Change-Id: Ie9ff17126810dc3e2b17ad42a1f765361401eae7
---
gnu/packages/gettext.scm | 1 -
gnu/packages/machine-learning.scm | 6 ++----
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 6 +-----
gnu/packages/terminals.scm | 3 +--
gnu/packages/virtualization.scm | 2 +-
7 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 39215a0ccb6..b3c807c6774 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -221,7 +221,6 @@ (define-public mdpo
python-sphinx
python-sphinx-argparse
python-sphinx-rtd-theme
- python-twine
python-yamllint))
(propagated-inputs
(list python-polib python-pymd4c))
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index d4ce01b0c1b..7c3faa94c5e 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -5093,8 +5093,7 @@ (define-public python-linear-operator
(native-inputs (list python-flake8-print
python-pytest
python-setuptools
- python-setuptools-scm
- python-twine))
+ python-setuptools-scm))
(home-page "https://github.com/cornellius-gp/linear_operator/")
(synopsis "Linear operator implementation")
(description "LinearOperator is a PyTorch package for abstracting away the
@@ -5123,8 +5122,7 @@ (define-public python-gpytorch
(native-inputs (list python-flake8-print
python-nbval
python-pytest
- python-setuptools
- python-twine))
+ python-setuptools))
(home-page "https://gpytorch.ai")
(synopsis "Implementation of Gaussian Processes in PyTorch")
(description
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index d51c5e19bba..4426e5af2f5 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -245,7 +245,7 @@ (define-public python-testfixtures
(native-inputs
(list python-pytest python-pytest-cov
;;("python-pytest-django" ,python-pytest-django)
- python-twine python-wheel))
+ python-wheel))
(synopsis "Tests components for Python")
(description "Testfixtures is a collection of helpers and mock objects that
are useful when writing automated tests in Python.")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d4988620385..3aadc9060a0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6221,7 +6221,7 @@ (define-public python-translation-finder
(list python-chardet python-pathlib2 python-ruamel.yaml python-six))
(native-inputs
(list python-codecov python-codacy-coverage python-pytest-cov
- python-pytest-runner python-twine))
+ python-pytest-runner))
(home-page "https://weblate.org/")
(synopsis "Translation file finder for Weblate")
(description "This package provides a function to find translation file in
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f467f5f5794..4e6f0e1a29a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3070,7 +3070,6 @@ (define-public python-cftime
python-cython
python-pytest-cov
python-sphinx
- python-twine
python-wheel))
(home-page "https://unidata.github.io/cftime/")
(synopsis "Library for time handling")
@@ -4240,8 +4239,7 @@ (define-public python-eventlet
(list python-black
python-hatchling
python-hatch-vcs
- python-pytest
- python-twine))
+ python-pytest))
(arguments
(list
#:test-flags
@@ -31340,7 +31338,6 @@ (define-public python-eliot
python-sphinx
python-sphinx-rtd-theme
python-testtools
- python-twine
python-twisted))
(home-page "https://github.com/itamarst/eliot/")
(synopsis "Eliot: the logging system that tells you why it happened")
@@ -35908,7 +35905,6 @@ (define-public python-arpeggio
python-mkdocs
python-pytest
python-pytest-runner
- python-twine
python-wheel))
(home-page "https://github.com/textX/Arpeggio")
(synopsis "Packrat parser interpreter for Python")
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index a0acaa71769..6a1946719a6 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1196,8 +1196,7 @@ (define-public python-halo
(build-system pyproject-build-system)
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
- (native-inputs (list python-nose
- python-twine python-setuptools python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
(description "Halo is a Python library to display graphical spinners in
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 90f46e6f23a..cf090aec9fc 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2808,7 +2808,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-pyhamcrest python-twine python-setuptools python-wheel))
+ (list python-pyhamcrest python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
(description
--
2.41.0
^ permalink raw reply related [relevance 71%]
* [bug#70858] [PATCH 06/32] build-system/pyproject: Remove python-coverage input.
2024-05-10 7:55 61% ` [bug#70858] [PATCH 03/32] build-system/pyproject: Remove python-black input Nicolas Graves via Guix-patches via
2024-05-10 7:55 42% ` [bug#70858] [PATCH 05/32] build-system/pyproject: Remove python-flake8 inputs Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 49% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 70% ` [bug#70858] [PATCH 10/32] gnu: python-openid: Remove python-coverage native-input Nicolas Graves via Guix-patches via
` (12 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/android.scm (python-androguard):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Adapt 'check phase replacement.
* gnu/packages/astronomy.scm (python-asdf-astropy, python-astropy,
python-poliastro)[native-inputs]: Remove python-coverage.
* gnu/packages/bioinformatics.scm (python-ega-download-client,
python-scikit-bio, python-cooler)[native-inputs]: Remove
python-coverage.
* gnu/packages/check.scm (python-pytest-randomly,
python-pytest-flakes, python-aiounittest)[native-inputs]: Remove
python-coverage.
* gnu/packages/cpp.scm (cpplint)[native-inputs]: Remove
python-coverage.
* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-coverage.
* gnu/packages/django.scm (python-django-haystack)[native-inputs]:
Remove python-coverage.
* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-coverage.
* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-coverage.
* gnu/packages/gpodder.scm (gpodder)[native-inputs]: Remove
python-coverage.
* gnu/packages/graph.scm (python-graphtools,
python-pygsp)[native-inputs]: Remove python-coverage.
* gnu/packages/jupyter.scm (python-jupyter-packaging)[native-inputs]:
Remove python-coverage.
* gnu/packages/machine-learning.scm (onnx, onnx-optimizer,
python-lightning-utilities, python-pytorch-lightning,
python-torchmetrics, python-gpytorch)[native-inputs]: Remove
python-coverage.
* gnu/packages/music.scm (python-pylast)[native-inputs]: Remove
python-coverage.
* gnu/packages/package-management.scm (python-anaconda-client,
conda)[native-inputs]: Remove python-coverage.
* gnu/packages/python-check.scm (python-vcrpy,
python-re-assert)[native-inputs]: Remove python-coverage.
* gnu/packages/python-compression.scm (python-multivolumefile,
python-pybcj, python-bcj-cffi, python-pyppmd, python-ppmd-cffi,
python-py7zr)[native-inputs]: Remove python-coverage.
* gnu/packages/python-web.scm (python-ovh, python-flask-misaka,
python-zope-interface, python-zope-hookable, python-url,
python-transaction, python-sanic, python-woob,
python-flask-combo-jsonapi)[native-inputs]: Remove python-coverage.
* gnu/packages/python-xyz.scm (python-apprise, python-arpeggio,
python-affine, python-colorful, python-lunr, python-mdit-py-plugins,
python-bidict, python-sh, python-cftime, python-can,
python-jsonargparse, python-extension-helpers, python-pyjwt,
python-virtualenv-clone, python-lsp-server, python-pikepdf,
python-tasklogger, python-notebook, python-structlog, binwalk,
python-argcomplete, python-attrs, python-yq, python-stone,
python-identify, python-nodeenv, python-anyio, python-forbiddenfruit,
python-watchgod, python-eliot, python-pem, python-scikit-build,
python-minikanren, nikola, python-verspec, python-mike)
[native-inputs]: Remove python-coverage.
* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-coverage.
* gnu/packages/statistics.scm (python-emcee,
python-rpy2)[native-inputs]: Remove python-coverage.
* gnu/packages/syndication.scm (rtv, tuir)[native-inputs]: Remove
python-coverage.
* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-coverage.
* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-coverage.
* gnu/packages/version-control.scm (pre-commit)[native-inputs]: Remove
python-coverage.
* gnu/packages/web.scm (python-httpretty)[native-inputs]: Remove
python-coverage.
* gnu/packages/xml.scm (python-xmltodict)[native-inputs]: Remove
python-coverage.
Change-Id: I66b28e624aac94f1a2f6e4fae5cdb444193cd8d9
---
gnu/packages/android.scm | 6 +--
gnu/packages/astronomy.scm | 7 +--
gnu/packages/bioinformatics.scm | 8 ++--
gnu/packages/check.scm | 7 ++-
gnu/packages/cpp.scm | 3 +-
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/engineering.scm | 3 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gpodder.scm | 3 +-
gnu/packages/graph.scm | 3 +-
gnu/packages/jupyter.scm | 2 +-
gnu/packages/machine-learning.scm | 10 +---
gnu/packages/music.scm | 3 +-
gnu/packages/package-management.scm | 6 +--
gnu/packages/python-check.scm | 5 +-
gnu/packages/python-compression.scm | 12 ++---
gnu/packages/python-web.scm | 20 ++++----
gnu/packages/python-xyz.scm | 72 +++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/statistics.scm | 6 +--
gnu/packages/syndication.scm | 4 +-
gnu/packages/terminals.scm | 8 ++--
gnu/packages/textutils.scm | 1 -
gnu/packages/version-control.scm | 1 -
gnu/packages/web.scm | 3 +-
gnu/packages/xml.scm | 2 +-
27 files changed, 63 insertions(+), 136 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index cbfbd6522f4..ab42f2be980 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -1072,11 +1072,9 @@ (define-public python-androguard
(replace 'check
;; Adapted from .travis.yml
(lambda _
- (invoke "nosetests" "--with-coverage" "--with-timer"
- "--timer-top-n" "50"))))))
+ (invoke "nosetests" "--with-timer" "--timer-top-n" "50"))))))
(native-inputs
- (list python-codecov python-coverage python-mock python-nose
- python-nose-timer))
+ (list python-codecov python-mock python-nose python-nose-timer))
(propagated-inputs
(list python-asn1crypto
python-colorama
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index ede10ab927a..0ff2511208d 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1678,7 +1678,6 @@ (define-public python-astropy
(native-inputs
(list pkg-config
python-colorlog
- python-coverage
python-cython-3
python-extension-helpers
python-h5py
@@ -2604,8 +2603,7 @@ (define-public python-poliastro
(lambda _
(setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-mypy
python-flit-core
python-pytest
@@ -4953,8 +4951,7 @@ (define-public python-asdf-astropy
(add-before 'check 'set-home-env
(lambda _ (setenv "HOME" "/tmp"))))))
(native-inputs
- (list python-coverage
- python-h5py
+ (list python-h5py
python-pandas
python-pytest
python-pytest-astropy
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4f3a3d0ba01..eabee35f70f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2766,8 +2766,7 @@ (define-public python-ega-download-client
(("==") ">=")))))))
(propagated-inputs (list python-htsget python-psutil python-requests
python-tqdm python-urllib3))
- (native-inputs (list python-coverage
- python-mock
+ (native-inputs (list python-mock
python-pyfakefs
python-pytest
python-responses
@@ -5359,7 +5358,7 @@ (define-public python-scikit-bio
python-requests
python-scipy))
(native-inputs
- (list python-coverage python-pytest))
+ (list python-pytest))
(home-page "https://scikit-bio.org")
(synopsis "Data structures, algorithms and educational resources for bioinformatics")
(description
@@ -17971,8 +17970,7 @@ (define-public python-cooler
python-scipy
python-simplejson))
(native-inputs
- (list python-coverage
- python-hatchling
+ (list python-hatchling
python-isort
python-pytest
python-pytest-cov))
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 880d3cb46f3..b7116b3f0e2 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1617,8 +1617,7 @@ (define-public python-pytest-randomly
"not reordered "
"and not test_it_runs_before_stepwise "
"and not test_entrypoint_injection"))))))))
- (native-inputs (list python-coverage
- python-factory-boy
+ (native-inputs (list python-factory-boy
python-faker
python-numpy
python-pytest-xdist))
@@ -2715,7 +2714,7 @@ (define-public python-pytest-flakes
(add-installed-pythonpath inputs outputs)
(invoke "py.test" "-vv" "-k" "not test_syntax_error"))))))
(native-inputs
- (list python-coverage python-pytest python-pytest-pep8))
+ (list python-pytest python-pytest-pep8))
(propagated-inputs
(list python-pyflakes))
(home-page "https://github.com/fschulze/pytest-flakes")
@@ -3568,7 +3567,7 @@ (define-public python-aiounittest
#t)))))
(propagated-inputs (list python-wrapt))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(home-page
"https://github.com/kwarunek/aiounittest")
(synopsis "Test asyncio code more easily")
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 8a0bd62d6b6..ba2698056da 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1189,8 +1189,7 @@ (define-public cpplint
(setenv "GUIX_PYTHONPATH"
(getenv "TMP_PYTHONPATH")))))))
(native-inputs
- (list python-coverage
- python-pytest
+ (list python-pytest
python-pytest-cov
python-pytest-runner
python-testfixtures))
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index fd2146456d6..67567a6b310 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -269,7 +269,6 @@ (define-public reprotest
`(("diffoscope" ,diffoscope)
("help2man" ,help2man)
("libfaketime" ,libfaketime)
- ("python-coverage" ,python-coverage)
("python-docutils" ,python-docutils)
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 4a271eaf0b5..298968d37c6 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -495,7 +495,6 @@ (define-public python-django-haystack
(list python-django))
(native-inputs
(list gdal
- python-coverage
python-dateutil
python-geopy
python-mock
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 610fb53087b..2620d5272b6 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2678,8 +2678,7 @@ (define-public python-scikit-rf
python-pyqtgraph
python-qtpy
python-scipy))
- (native-inputs (list python-coverage
- python-nbval
+ (native-inputs (list python-nbval
python-networkx
python-pytest
python-pytest-cov
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 69cc7e6ddc5..806120e939d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3264,7 +3264,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-coverage
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm
index f9102d3a447..0786010471f 100644
--- a/gnu/packages/gpodder.scm
+++ b/gnu/packages/gpodder.scm
@@ -64,7 +64,6 @@ (define-public gpodder
(build-system python-build-system)
(native-inputs
(list intltool
- python-coverage
python-minimock
python-pytest
python-pytest-cov
@@ -173,7 +172,7 @@ (define-public python-mygpoclient
"1fi5x6k1mngr0iviw2s4n1f3y2x7pwqy5ivkcrjdprzvwr37f0mh"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-minimock python-nose))
+ (list python-minimock python-nose))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eb8aa17fdfe..f83a23dd0be 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-coverage
python-coveralls
python-nose
python-nose2
@@ -564,7 +563,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-pytest))
+ (list python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index e2bef079ba0..456b0544a9a 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -486,7 +486,7 @@ (define-public python-jupyter-packaging
(list python-deprecation python-packaging python-setuptools
python-tomlkit python-wheel))
(native-inputs
- (list python-pypa-build python-coverage python-pytest
+ (list python-pypa-build python-pytest
python-pytest-cov python-pytest-mock))
(home-page "https://jupyter.org")
(synopsis "Jupyter packaging utilities")
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index b4f0f65c837..e6f6bfe410d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1364,7 +1364,6 @@ (define args
(list cmake
googletest
pybind11
- python-coverage
python-nbval
python-pytest
python-pytest-runner))
@@ -1443,8 +1442,7 @@ (define-public onnx-optimizer
#~(modify-phases #$phases
(delete 'relax-requirements)))))
(native-inputs
- (list cmake python-pytest python-pytest-runner python-nbval
- python-coverage))
+ (list cmake python-pytest python-pytest-runner python-nbval))
(inputs
(list onnx protobuf pybind11))
(propagated-inputs
@@ -4487,7 +4485,6 @@ (define-public python-lightning-utilities
(build-system python-build-system)
(propagated-inputs (list python-importlib-metadata python-packaging
python-typing-extensions))
- (native-inputs (list python-coverage))
(home-page "https://github.com/Lightning-AI/utilities")
(synopsis "PyTorch Lightning sample project")
(description "This package provides common Python utilities and GitHub
@@ -4700,7 +4697,6 @@ (define-public python-pytorch-lightning
(native-inputs
(list python-aiohttp
python-cloudpickle
- python-coverage
python-flaky
python-pympler
python-pytest
@@ -4730,7 +4726,6 @@ (define-public python-torchmetrics
python-typing-extensions))
(native-inputs
(list python-cloudpickle
- python-coverage
python-fire
python-mir-eval
python-mypy
@@ -5131,8 +5126,7 @@ (define-public python-gpytorch
#~(list "-k" (string-append "not test_deprecated_methods"
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
- (native-inputs (list python-coverage
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-nbval
python-pytest
python-setuptools
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 3af2b79b419..5420a140657 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4069,8 +4069,7 @@ (define-public python-pylast
;; https://github.com/pylast/pylast/issues/105
(arguments '(#:tests? #f))
(native-inputs
- (list python-coverage python-pytest python-flaky python-pyyaml
- python-setuptools-scm))
+ (list python-pytest python-flaky python-pyyaml python-setuptools-scm))
(home-page "https://github.com/pylast/pylast")
(synopsis "Python interface to Last.fm and Libre.fm")
(description "A Python interface to Last.fm and other API-compatible
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index feed16ebcef..4e7e46bf1b3 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1100,8 +1100,7 @@ (define-public python-anaconda-client
(list python-clyent python-nbformat python-pyyaml python-requests
python-setuptools))
(native-inputs
- (list python-coverage
- python-dateutil
+ (list python-dateutil
python-freezegun
python-mock
python-pillow
@@ -1286,8 +1285,7 @@ (define-public conda
;; XXX: This is dragged in by libarchive and is needed at runtime.
zstd))
(native-inputs
- (list python-coverage
- python-flaky
+ (list python-flaky
python-pytest-timeout
python-pytest-xprocess
python-wheel))
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 83fd723d12b..574a93782ce 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-coverage
- python-flake8
+ (list python-flake8
python-flask
python-httplib2
python-ipaddress
@@ -1145,7 +1144,7 @@ (define-public python-re-assert
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
- (list python-covdefaults python-coverage python-pytest))
+ (list python-covdefaults python-pytest))
(propagated-inputs
(list python-regex))
(home-page "https://github.com/asottile/re-assert")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 34a9cd73a20..b2d789c92d0 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -109,7 +109,6 @@ (define-public python-multivolumefile
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm
- python-coverage
python-coveralls
python-hypothesis
python-pyannotate
@@ -247,8 +246,7 @@ (define-public python-pybcj
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-metadata))
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-pytest-cov
python-setuptools-scm
@@ -281,8 +279,7 @@ (define-public python-bcj-cffi
(propagated-inputs
(list python-cffi python-toml python-setuptools-scm))
(native-inputs
- (list python-setuptools python-coverage python-pytest
- python-pytest-cov))
+ (list python-setuptools python-pytest python-pytest-cov))
(home-page "https://github.com/miurahr/bcj-cffi")
(synopsis "Branch / Call /Jump CFFI library in Python")
(description "This package provides an implementation of the Branch / Call /
@@ -407,8 +404,7 @@ (define-public python-pyppmd
"03w4x26mar0ha73c3v39psn1i0k6xrzwmaxfsxysic73jz99np07"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-pytest-benchmark
python-pytest-cov
@@ -441,7 +437,6 @@ (define-public python-ppmd-cffi
(native-inputs
(list python-hypothesis
python-setuptools-scm
- python-coverage
python-pytest
python-pytest-cov))
(home-page "https://github.com/miurahr/ppmd")
@@ -479,7 +474,6 @@ (define-public python-py7zr
(list python-setuptools
python-wheel
python-setuptools-scm
- python-coverage
python-coveralls
python-libarchive-c
python-py-cpuinfo
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4cf064e0742..942999f6cf9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -977,8 +977,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-coverage
- python-isort
+ (native-inputs (list python-isort
python-pytest
python-pytest-cov
python-setuptools
@@ -1856,7 +1855,7 @@ (define-public python-flask-misaka
"12gm6hq3lvlj0ddw8p6lk5pky8jk3pw758ihffjl49shnnzc68zl"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-mock))
+ (list python-mock))
(propagated-inputs
(list python-flask python-misaka))
(home-page "https://github.com/singingwolfboy/flask-misaka/")
@@ -2999,8 +2998,7 @@ (define-public python-zope-interface
(build-system python-build-system)
(arguments '(#:tests? #f)) ; test suite can't find python-zope-testing
(native-inputs
- (list python-coverage python-nose python-zope-event
- python-zope-testing))
+ (list python-nose python-zope-event python-zope-testing))
(home-page "https://github.com/zopefoundation/zope.interface")
(synopsis "Python implementation of the \"design by contract\"
methodology")
@@ -3293,7 +3291,7 @@ (define-public python-zope-hookable
"0hc82lfr7bk53nvbxvjkibkarngyrzgfk2i6bg8wshl0ly0pdl19"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-zope-testing))
+ (list python-zope-testing))
(home-page "https://github.com/zopefoundation/zope.hookable")
(synopsis "Zope hookable")
(description "This package supports the efficient creation of hookable
@@ -4500,7 +4498,7 @@ (define-public python-url
(propagated-inputs
(list python-publicsuffix))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(arguments
`(#:tests? #f)) ; FIXME: tests fail with "ImportError: No module named 'tests'"
(home-page "https://github.com/seomoz/url-py")
@@ -7162,7 +7160,7 @@ (define-public python-transaction
(propagated-inputs
(list python-zope-interface))
(native-inputs
- (list python-coverage python-mock python-nose))
+ (list python-mock python-nose))
(home-page "https://github.com/zopefoundation/transaction")
(synopsis "Transaction management for Python")
(description "This package contains a generic transaction implementation
@@ -7624,7 +7622,6 @@ (define-public python-sanic
(list python-bandit
python-beautifulsoup4
python-chardet
- python-coverage
python-cryptography
python-docutils
python-mypy
@@ -8323,7 +8320,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-nose python-selenium python-xunitparser))
+ (list python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
@@ -8372,8 +8369,7 @@ (define-public python-flask-combo-jsonapi
python-simplejson
python-six))
(native-inputs
- (list python-coverage
- python-coveralls
+ (list python-coveralls
python-pytest
python-pytest-runner))
(home-page "https://github.com/AdCombo/flask-combo-jsonapi")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fa77102857c..e84ce7df3eb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -318,7 +318,6 @@ (define-public python-apprise
python-requests
python-requests-oauthlib))
(native-inputs (list python-babel
- python-coverage
python-cryptography
python-paho-mqtt
python-pytest
@@ -1020,7 +1019,7 @@ (define-public python-affine
(base32
"1shyvajayyzbkp9dihb4mz835jnkp0kqqbyjfqci6v43da6q2kd2"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-coveralls python-flake8 python-pydocstyle
+ (propagated-inputs (list python-coveralls python-pydocstyle
python-pytest python-pytest-cov))
(native-inputs (list python-flit-core))
(home-page "https://github.com/rasterio/affine")
@@ -1182,7 +1181,7 @@ (define-public python-colorful
(base32 "0kyy9qhvrb5m9h8xmri7c88i0k1g5qc7017anw39gx44an7mn33y"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-pytest python-setuptools python-wheel))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -1306,8 +1305,7 @@ (define-public python-lunr
'(list "-k" "not TestLanguageSupport"
"--ignore-glob=tests/acceptance_tests/*")))
(native-inputs
- (list python-coverage
- python-hatch-fancy-pypi-readme
+ (list python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
python-pytest-timeout
@@ -1340,8 +1338,7 @@ (define-public python-mdit-py-plugins
(list python-markdown-it-py
python-attrs))
(native-inputs
- (list python-coverage
- python-flit-core
+ (list python-flit-core
python-pytest
python-pytest-cov
python-pytest-regressions))
@@ -2689,8 +2686,7 @@ (define-public python-bidict
"02dy0b1k7qlhn7ajyzkrvxhyhjj0hzcq6ws3zjml9hkdz5znz92g"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage
- python-hypothesis
+ (list python-hypothesis
python-py
python-pytest
python-pytest-benchmark
@@ -3053,8 +3049,6 @@ (define-public python-sh
;; XXX: A Python 2 test fails when HOME=/homeless-shelter.
(setenv "HOME" "/tmp")
(invoke "python" "sh.py" "test"))))))
- (native-inputs
- (list python-coverage))
(home-page "https://github.com/amoffat/sh")
(synopsis "Python subprocess replacement")
(description "This package provides a replacement for Python's
@@ -3076,7 +3070,6 @@ (define-public python-cftime
(list python-numpy))
(native-inputs
(list python-check-manifest
- python-coverage
python-coveralls
python-cython
python-pytest-cov
@@ -3581,7 +3574,6 @@ (define-public python-can
(native-inputs
(list ;; python-canalystii ; Not packed yet
python-codecov
- python-coverage
python-future
python-hypothesis
python-mock
@@ -4519,7 +4511,6 @@ (define-public python-jsonargparse
python-typeshed-client))
(native-inputs
(list python-attrs
- python-coverage
python-pycodestyle
python-pydantic
python-pytest
@@ -5047,8 +5038,7 @@ (define-public python-extension-helpers
;; - _pytest.pathlib.ImportPathMismatchError: ('extension_helpers.conftes
(arguments (list #:tests? #f))
(native-inputs
- (list python-coverage
- python-pytest
+ (list python-pytest
python-pytest-astropy
python-pytest-cov
python-setuptools-scm
@@ -6008,8 +5998,7 @@ (define-public python-pyjwt
"1z85kwr945rbzrn5wabrsmck5x8disa9wc7b3y5gci7w65z5qa39"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage
- python-cryptography
+ (list python-cryptography
python-pytest
python-sphinx
python-sphinx-rtd-theme
@@ -6237,7 +6226,6 @@ (define-public python-virtualenv-clone
(native-inputs (list python-pytest
python-tox
python-virtualenv
- python-coverage
python-wheel
python-tomli
python-hypothesis))
@@ -8202,7 +8190,6 @@ (define-public python-lsp-server
(native-inputs
(list python-autopep8
python-flake8
- python-coverage
python-flaky
python-matplotlib
python-numpy
@@ -10212,7 +10199,6 @@ (define-public python-pikepdf
(native-inputs
(list pybind11
python-attrs
- python-coverage
python-hypothesis
python-setuptools-scm
python-psutil
@@ -16044,7 +16030,7 @@ (define-public python-tasklogger
(base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-deprecated))
- (native-inputs (list python-coverage python-coveralls python-nose2
+ (native-inputs (list python-coveralls python-nose2
python-numpy python-setuptools python-wheel))
(home-page "https://github.com/scottgigante/tasklogger")
(synopsis "Extension to the core Python logging library")
@@ -17600,8 +17586,7 @@ (define-public python-notebook
python-tornado-6
python-traitlets))
(native-inputs
- (list python-coverage
- python-jupyter-server
+ (list python-jupyter-server
python-nbval
python-pytest
python-pytest-cov
@@ -18363,7 +18348,6 @@ (define-public python-structlog
python-hatch-vcs
python-hatchling
;; For the tests
- python-coverage
python-freezegun
python-pretend
python-pytest
@@ -22685,7 +22669,7 @@ (define-public binwalk
(lambda _
(setenv "HOME" ""))))))
(native-inputs
- (list python-coverage python-nose))
+ (list python-nose))
(home-page "https://github.com/ReFirmLabs/binwalk")
(synopsis "Firmware analysis tool")
(description "Binwalk is a tool for analyzing, reverse engineering, and
@@ -23269,8 +23253,7 @@ (define-public python-argcomplete
"def __disable_test_console_script"))
(invoke "python3" "./test/test.py" "-v")))))))
(native-inputs
- (list python-coverage
- python-pexpect
+ (list python-pexpect
python-setuptools
python-setuptools-scm
python-wheel
@@ -26263,7 +26246,7 @@ (define-public python-yq
(inputs
(list python-argcomplete python-pyyaml python-xmltodict python-toml jq))
(native-inputs
- (list python-coverage python-setuptools-scm python-wheel))
+ (list python-setuptools-scm python-wheel))
(home-page "https://github.com/kislyuk/yq")
(synopsis "Command-line YAML/XML processor")
(description
@@ -27332,7 +27315,7 @@ (define-public python-stone
(propagated-inputs
(list python-ply python-six))
(native-inputs
- (list python-coverage python-mock python-pytest python-pytest-runner))
+ (list python-mock python-pytest python-pytest-runner))
(home-page "https://github.com/dropbox/stone")
(synopsis "Official Api Spec Language for Dropbox")
(description
@@ -27588,8 +27571,7 @@ (define-public python-identify
;; system-error "utime" "~A" ("No such file or directory")
(delete 'ensure-no-mtimes-pre-1980))))
(native-inputs
- (list python-coverage python-pytest python-setuptools
- python-ukkonen python-wheel))
+ (list python-pytest python-setuptools python-ukkonen python-wheel))
(propagated-inputs
(list python-editdistance))
(home-page "https://github.com/chriskuehl/identify")
@@ -27685,8 +27667,7 @@ (define-public python-nodeenv
"not test_smoke"
" and not test_smoke_n_system_special_chars"))))
(native-inputs
- (list python-coverage python-mock python-pytest
- python-setuptools python-wheel))
+ (list python-mock python-pytest python-setuptools python-wheel))
(home-page "https://ekalinin.github.io/nodeenv/")
(synopsis "Create isolated node.js environments")
(description
@@ -30039,7 +30020,6 @@ (define-public python-anyio
python-typing-extensions))
(native-inputs
(list python-contextlib2
- python-coverage
python-hypothesis
python-mock
python-pytest
@@ -30405,7 +30385,7 @@ (define-public python-forbiddenfruit
(lambda _
(invoke "make" "SKIP_DEPS=1"))))))
(native-inputs
- (list python-nose python-coverage))
+ (list python-nose))
(home-page "https://github.com/clarete/forbiddenfruit")
(synopsis "Patch python built-in objects")
(description "This project allows Python code to extend built-in types.")
@@ -30583,7 +30563,6 @@ (define-public python-watchgod
"-k" "not test_watch_log and not test_awatch")))
(native-inputs
(list python-anyio
- python-coverage
python-pygments
python-pytest
python-pytest-asyncio
@@ -31377,8 +31356,7 @@ (define-public python-eliot
(list python-boltons python-pyrsistent python-six
python-zope-interface))
(native-inputs
- (list python-coverage
- python-dask
+ (list python-dask
python-hypothesis
python-pytest
python-setuptools
@@ -31410,7 +31388,6 @@ (define-public python-pem
(build-system python-build-system)
(native-inputs
(list python-certifi
- python-coverage
python-pretend
python-pyopenssl
python-pytest
@@ -33404,7 +33381,6 @@ (define-public python-scikit-build
gfortran
git-minimal/pinned ;for tests
ninja
- python-coverage
python-cython
python-hatchling
python-hatch-fancy-pypi-readme
@@ -34131,8 +34107,7 @@ (define-public python-minikanren
python-pytest-cov
python-pylint
python-sympy
- python-versioneer
- python-coverage))
+ python-versioneer))
(propagated-inputs
(list python-toolz python-cons python-multipledispatch
python-etuples python-logical-unification))
@@ -35075,8 +35050,7 @@ (define-public nikola
python-unidecode
python-yapsy))
(native-inputs
- (list python-coverage
- python-freezegun
+ (list python-freezegun
python-pytest
python-pytest-cov))
(arguments
@@ -35542,8 +35516,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-coverage python-mypy
- python-pretend python-pytest))
+ (native-inputs (list python-mypy python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
@@ -35941,7 +35914,7 @@ (define-public python-mike
"0yxp816x7s948xsd0fifvq9shg01xdxlifd9rzf5y2rd9iwz3hsn"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-shtab))
+ (list python-shtab))
(propagated-inputs
(list python-jinja2 python-mkdocs python-pyyaml python-verspec))
(home-page "https://github.com/jimporter/mike")
@@ -35963,8 +35936,7 @@ (define-public python-arpeggio
(base32
"0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n"))))
(build-system python-build-system)
- (native-inputs (list python-coverage
- python-coveralls
+ (native-inputs (list python-coveralls
python-mike
python-mkdocs
python-pytest
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 7831802284f..18d97ae44eb 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -1218,7 +1218,6 @@ (define-public python-dolfin-adjoint
(list fenics openmpi pybind11))
(native-inputs
(list pkg-config
- python-coverage
python-decorator
python-pkgconfig
python-pytest))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 0a6f61e2280..bfc69062587 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2396,8 +2396,7 @@ (define-public python-emcee
(base32 "1vbz67cwzig28dlndkm6g246p1vcvj6yy2w65z8cdyffigf1j3lf"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy))
- (native-inputs (list python-coverage
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-cov
python-setuptools
python-setuptools-scm
@@ -6777,8 +6776,7 @@ (define-public python-rpy2
python-numpy
zlib))
(native-inputs
- (list python-coverage
- python-ipython
+ (list python-ipython
python-numpy
python-pandas
python-pytest
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 29febdf3453..0a6ff765c30 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -435,7 +435,6 @@ (define-public rtv
(native-inputs
(list ncurses
python-coveralls
- python-coverage
python-mock
python-pytest
python-vcrpy))
@@ -468,8 +467,7 @@ (define-public tuir
(list python-beautifulsoup4 python-decorator python-kitchen
python-requests python-six))
(native-inputs
- (list python-coverage
- python-coveralls
+ (list python-coveralls
python-mock
python-pytest
python-vcrpy
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 26af13af498..e96ee664eff 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1196,7 +1196,7 @@ (define-public python-halo
(build-system pyproject-build-system)
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
- (native-inputs (list python-coverage python-nose python-tox
+ (native-inputs (list python-nose python-tox
python-twine python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
@@ -1224,8 +1224,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-coverage python-nose
- python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
(description "This package provides a Python library with graphical symbols
@@ -1252,8 +1251,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-coverage python-nose
- python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-tox python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
(description "Spinners is a Python library that contains graphical spinners
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index bf2da58a3ee..2c7fd0365ca 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1674,7 +1674,6 @@ (define-public python-panflute
(build-system python-build-system)
(propagated-inputs (list python-click python-pyyaml))
(native-inputs (list python-configparser
- python-coverage
python-pandocfilters
python-pytest
python-pytest-cov
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index bccc219f679..f85e8b274cb 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2064,7 +2064,6 @@ (define-public pre-commit
(native-inputs
(list git-minimal
python-covdefaults
- python-coverage
python-distlib
python-pytest
python-pytest-env
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index c29a8b3ca7b..736be82c90b 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -6893,8 +6893,7 @@ (define-public python-httpretty
(when tests?
(invoke "nosetests")))))))
(native-inputs
- (list python-coverage
- python-eventlet
+ (list python-eventlet
python-nose
python-rednose
python-requests
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 2654f688d4b..1f767ba69b2 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1950,7 +1950,7 @@ (define-public python-xmltodict
"08cadlb9vsb4pmzc99lz3a2lx6qcfazyvgk10pcqijvyxlwcdn2h"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-nose python-setuptools python-wheel))
+ (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/martinblech/xmltodict")
(synopsis "Work with XML like you are working with JSON")
(description "This package provides a Python library to convert XML to
--
2.41.0
^ permalink raw reply related [relevance 49%]
* [bug#70858] [PATCH 26/32] build-system/pyproject: Remove python-pytest-isort native-input.
` (10 preceding siblings ...)
2024-05-10 7:55 70% ` [bug#70858] [PATCH 23/32] gnu: python-tinycss2: " Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 73% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 63% ` [bug#70858] [PATCH 27/32] build-system/pyproject: Remove python-pytest-black native-input Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/dav.scm (radicale):
[native-inputs]: Remove python-pytest-isort.
* gnu/packages/python-web.scm (python-tinycss):
[arguments]<#:test-flags>: Ignore isort tests.
[native-inputs]: Remove python-pytest-isort.
Change-Id: I706e8c310adbeda49b91c6815d299172ce05df22
---
gnu/packages/dav.scm | 1 -
gnu/packages/python-web.scm | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index 0612a72c831..99284220846 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -59,7 +59,6 @@ (define-public radicale
(native-inputs
(list python-pytest
python-pytest-flake8
- python-pytest-isort
python-pytest-runner
python-waitress))
(propagated-inputs
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8c51282c9cb..340ef0836b4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5862,9 +5862,9 @@ (define-public python-tinycss
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- '(list "-k" "not test_speedups")))
+ '(list "-k" "not ISORT and not test_speedups")))
(native-inputs
- (list python-pytest-flake8 python-pytest-isort
+ (list python-pytest-flake8
python-pytest-runner python-setuptools python-wheel))
(home-page "https://tinycss.readthedocs.io/")
(synopsis "Complete yet simple CSS parser for Python")
--
2.41.0
^ permalink raw reply related [relevance 73%]
* [bug#70858] [PATCH 17/32] build-system/pyproject: Remove python-tox native-input.
` (4 preceding siblings ...)
2024-05-10 7:55 72% ` [bug#70858] [PATCH 11/32] build-system/pyproject: Remove python-coveralls native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 61% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 62% ` [bug#70858] [PATCH 18/32] build-system/pyproject: Remove python-mypy native-input Nicolas Graves via Guix-patches via
` (9 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/check.scm (python-pytest-regressions)[native-inputs]:
Remove python-tox.
* gnu/packages/diffoscope.scm (reprotest)[native-inputs]: Remove
python-tox.
* gnu/packages/django.scm (python-django-extensions)[native-inputs]:
Remove python-tox.
* gnu/packages/logging.scm (tailon)[native-inputs]: Remove python-tox.
* gnu/packages/messaging.scm (python-harmony)[native-inputs]: Remove
python-tox.
* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]: Remove
python-tox.
* gnu/packages/python-web.scm (python-omnipath,
python-sanic)[native-inputs]: Remove python-tox.
* gnu/packages/python-xyz.scm (python-lunr, python-bidict,
python-jsonargparse, python-ddlparse, python-virtualenv-clone,
python-honcho, python-pdfminer-six, python-shshsh,
python-marshmallow-jsonapi, python-apispec-webframeworks, bpython,
python-loguru, python-ansicolors)[native-inputs]: Remove python-tox.
* gnu/packages/radio.scm (chirp)[native-inputs]: Remove python-tox.
* gnu/packages/terminals.scm (python-halo, python-log-symbols,
python-spinners)[native-inputs]: Remove python-tox.
Change-Id: I39dadb40a73ad1c64ba8b9ef9d1b3fe7d1498b5a
---
gnu/packages/check.scm | 1 -
gnu/packages/diffoscope.scm | 1 -
gnu/packages/django.scm | 1 -
gnu/packages/logging.scm | 2 +-
gnu/packages/messaging.scm | 2 --
gnu/packages/python-check.scm | 1 -
gnu/packages/python-web.scm | 2 --
gnu/packages/python-xyz.scm | 27 ++++++++-------------------
gnu/packages/radio.scm | 3 +--
gnu/packages/terminals.scm | 6 +++---
10 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b7116b3f0e2..6042f763f15 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -3675,7 +3675,6 @@ (define-public python-pytest-regressions
python-pandas
python-pillow
python-restructuredtext-lint
- python-tox
python-setuptools-scm
python-pytest))
(home-page "https://github.com/ESSS/pytest-regressions")
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm
index 67567a6b310..bfe4ce99fdc 100644
--- a/gnu/packages/diffoscope.scm
+++ b/gnu/packages/diffoscope.scm
@@ -273,7 +273,6 @@ (define-public reprotest
("python-magic " ,python-magic)
("python-pytest " ,python-pytest)
("python-tlsh" ,python-tlsh)
- ("python-tox" ,python-tox)
("unzip" ,unzip)
("xxd" ,xxd)))
(build-system python-build-system)
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 298968d37c6..f5b1e0462bb 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -260,7 +260,6 @@ (define-public python-django-extensions
(native-inputs
(list python-mock
python-factory-boy
- python-tox
python-pytest
python-pytest-cov
python-pytest-django
diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm
index a757c22154f..3c593001d00 100644
--- a/gnu/packages/logging.scm
+++ b/gnu/packages/logging.scm
@@ -134,7 +134,7 @@ (define-public tailon
"0xkmrivzilsc9wqr8ms67v7399gxnh7pv5687k4rdpdgz4309fwc"))))
(build-system python-build-system)
(native-inputs
- (list python-tox python-wheel))
+ (list python-wheel))
(inputs
(list python-pyyaml-5 python-sockjs-tornado python-tornado-http-auth
python-tornado python-deepmerge))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index cb72bfb3e25..35ff807e12c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3504,8 +3504,6 @@ (define-public python-harmony
(base32
"1bm9xcnzpnpj6rlhbrnl2abwclzl7ivgh1vb5644y9mnhcs489js"))))
(build-system python-build-system)
- (native-inputs
- (list python-tox))
(inputs
(list python-librecaptcha python-keyring python-requests))
(synopsis "Discord account management")
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5345a15e108..7f1c73ee0ad 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -419,7 +419,6 @@ (define-public python-vcrpy
python-pytest
python-pytest-cov
python-pytest-httpbin
- python-tox
python-urllib3))
(home-page "https://github.com/kevin1024/vcrpy")
(synopsis "Automatically mock your HTTP interactions")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0e969eef306..fa908ceafd9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2137,7 +2137,6 @@ (define-public python-omnipath
python-pytest-socket
python-requests-mock
python-setuptools-scm
- python-tox
python-setuptools
python-wheel))
(home-page "https://omnipathdb.org/")
@@ -7634,7 +7633,6 @@ (define-public python-sanic
python-setuptools
python-slotscheck
python-towncrier
- python-tox
python-types-ujson
python-uvicorn
python-wheel))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ca6d5279d19..32a18f52d20 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1308,8 +1308,7 @@ (define-public python-lunr
(list python-hatch-fancy-pypi-readme
python-hatchling
python-pytest
- python-pytest-timeout
- python-tox))
+ python-pytest-timeout))
(propagated-inputs
(list python-importlib-metadata python-typing-extensions))
(home-page
@@ -2695,8 +2694,7 @@ (define-public python-bidict
python-sortedcollections
python-sortedcontainers
python-sphinx
- python-sphinx-autodoc-typehints
- python-tox))
+ python-sphinx-autodoc-typehints))
(arguments
`(#:phases (modify-phases %standard-phases
(add-after 'unpack 'relax-reqs
@@ -4513,7 +4511,6 @@ (define-public python-jsonargparse
python-pytest
python-pytest-subtests
python-responses
- python-tox
python-types-requests
python-setuptools
python-wheel))
@@ -5677,7 +5674,6 @@ (define-public python-ddlparse
(list python-pytest
python-pytest-cov
python-setuptools
- python-tox
python-wheel))
(propagated-inputs (list python-pyparsing))
(home-page "https://github.com/shinichi-takii/ddlparse")
@@ -6219,7 +6215,6 @@ (define-public python-virtualenv-clone
(delete-file "tox.ini")
(invoke "pytest" "-vvv" "tests")))))))
(native-inputs (list python-pytest
- python-tox
python-virtualenv
python-wheel
python-tomli
@@ -11332,7 +11327,7 @@ (define-public python-honcho
(base32 "1y0r8dw4pqcq7r4n58ixjdg1iy60lp0gxsd7d2jmhals16ij71rj"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-mock python-tox which)) ;for tests
+ (list python-pytest python-mock which)) ;for tests
(propagated-inputs
(list python-jinja2))
(arguments
@@ -20125,7 +20120,7 @@ (define-public python-pdfminer-six
(propagated-inputs
(list python-chardet python-cryptography python-sortedcontainers))
(native-inputs
- (list python-nose python-tox))
+ (list python-nose))
(home-page "https://github.com/pdfminer/pdfminer.six")
(synopsis "PDF parser and analyzer")
(description "@code{pdfminer.six} is a community maintained fork of
@@ -21272,9 +21267,7 @@ (define-public python-shshsh
"1wzqyj1a6jj6cyv5ymzy834qm2lyq80yy1kfz0q0zayq9gm1cj7f"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-poetry-core
- python-pytest
- python-tox))
+ (list python-poetry-core python-pytest))
(home-page "https://github.com/zqqqqz2000/shshsh")
(synopsis "Write Shell commands simply and safely within Python")
(description "This package provides a way to write Shell commands from
@@ -25140,8 +25133,7 @@ (define-public python-marshmallow-jsonapi
python-flake8-bugbear
python-flask
python-mock
- python-pytest
- python-tox))
+ python-pytest))
(home-page "https://github.com/marshmallow-code/marshmallow-jsonapi")
(synopsis "JSON:API 1.0 formatting with Marshmallow")
(description
@@ -25205,7 +25197,6 @@ (define-public python-apispec-webframeworks
python-pytest
python-pyyaml
python-tornado
- python-tox
python-wheel))
(home-page "https://github.com/marshmallow-code/apispec-webframeworks")
(synopsis "Web framework plugins for apispec")
@@ -26663,7 +26654,7 @@ (define-public bpython
python-watchdog
python-jedi))
(native-inputs
- (list python-sphinx python-mock python-tox python-wheel))
+ (list python-sphinx python-mock python-wheel))
(home-page "https://bpython-interpreter.org/")
(synopsis "Fancy interface to the Python interpreter")
(description "Bpython is a fancy interface to the Python
@@ -32923,7 +32914,6 @@ (define-public python-loguru
python-sphinx
python-sphinx-autobuild
python-sphinx-rtd-theme
- python-tox
python-setuptools
python-wheel))
(home-page "https://github.com/Delgan/loguru")
@@ -35280,8 +35270,7 @@ (define-public python-ansicolors
(base32 "1q3jqglkq4z0f6nkkn8bswcwqg012i2grrc27kabr8286dg4zycr"))))
(build-system python-build-system)
(native-inputs
- (list python-tox
- python-pytest-cov
+ (list python-pytest-cov
unzip))
(home-page "https://github.com/jonathaneunice/colors/")
(synopsis "ANSI colors for Python")
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 56e674a8edc..bfd601564d8 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3171,8 +3171,7 @@ (define-public chirp
python-pep8
python-pytest
python-pytest-mock
- python-pyyaml
- python-tox))
+ python-pyyaml))
(inputs
(list python-future
python-importlib-resources
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index e96ee664eff..a0acaa71769 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1196,7 +1196,7 @@ (define-public python-halo
(build-system pyproject-build-system)
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
- (native-inputs (list python-nose python-tox
+ (native-inputs (list python-nose
python-twine python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
@@ -1224,7 +1224,7 @@ (define-public python-log-symbols
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
(propagated-inputs (list python-colorama))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-log-symbols")
(synopsis "Python library with graphical symbols for logging on the terminal")
(description "This package provides a Python library with graphical symbols
@@ -1251,7 +1251,7 @@ (define-public python-spinners
(substitute* "requirements-dev.txt"
(("(.*)==(.*)$" _ dep ver)
(string-append dep ">=" ver))))))))
- (native-inputs (list python-nose python-setuptools python-tox python-wheel))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/py-spinners")
(synopsis "Python library with graphical spinners for the terminal")
(description "Spinners is a Python library that contains graphical spinners
--
2.41.0
^ permalink raw reply related [relevance 61%]
* [bug#70858] [PATCH 05/32] build-system/pyproject: Remove python-flake8 inputs.
2024-05-10 7:55 61% ` [bug#70858] [PATCH 03/32] build-system/pyproject: Remove python-black input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 42% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 49% ` [bug#70858] [PATCH 06/32] build-system/pyproject: Remove python-coverage input Nicolas Graves via Guix-patches via
` (13 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-crds)[native-inputs]: Remove
python-flake8.
* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-biom-format)[native-inputs]: Remove python-flake8.
* gnu/packages/ebook.scm (calibre)[native-inputs]: Remove
python-flake8.
* gnu/packages/engineering.scm (python-scikit-rf)[native-inputs]:
Remove python-flake8.
* gnu/packages/finance.scm (python-mt-940)[native-inputs]: Remove
python-flake8.
* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-flake8.
* gnu/packages/gettext.scm (python-mdpo)[native-inputs]: Remove
python-flake8.
* gnu/packages/graph.scm (python-pygsp)[native-inputs]: Remove
python-flake8.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-flake8.
* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-captum, python-pyro-api,
python-pyro-ppl, python-linear-operator,
python-gpytorch)[native-inputs]: Remove python-flake8.
* gnu/packages/music.scm (python-mutagen):
[arguments]<#:test-flags>: Ignore flake8 quality tests.
[native-inputs]: Remove python-flake8.
* gnu/packages/protobuf.scm (python-pure-protobuf):
[arguments]<#:phases>: Remove flake8 invocation from check phase.
[native-inputs]: Remove python-flake8.
* gnu/packages/python-web.scm (python-ovh, python-furl,
python-httplib2, python-http-ece, python-woob,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-flake8.
* gnu/packages/python-xyz.scm (python-apispec,
python-apispec-webframeworks, python-apprise, python-colorful,
python-pymd4c, python-pyls-black, python-docx, python-flasgger,
python-imageio, python-importlib-ressources, python-jaraco-test,
python-seaborn, python-progressbar2, python-inflect,
python-argcomplete, python-diff-cover, python-validators,
python-marshmallow, python-marshmallow-jsonapi, python-yq,
python-update-checker, python-eliot, python-dateparser,
python-jinja2-cli, python-nikola, python-verspec, python-mike,
python-arpeggio, python-versioneer, python-codespell)[native-inputs]:
Remove python-flake8.
* gnu/packages/simulation.scm (python-dolfin-adjoint)[native-inputs]:
Remove python-flake8.
* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[propagated-inputs]: Remove python-flake8.
* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-flake8.
* gnu/packages/vpn.scm (sshuttle)[native-inputs]: Remove
python-flake8.
* gnu/packages/wm.scm (qtile)[native-inputs]: Remove python-flake8.
* gnu/packages/textutils.scm (python-panflute)[native-inputs]: Remove
python-flake8.
Change-Id: I196a9c0b7497106c8f98598535cb8e0ea667481c
---
gnu/packages/astronomy.scm | 3 +-
gnu/packages/bioinformatics.scm | 7 +---
gnu/packages/ebook.scm | 1 -
gnu/packages/engineering.scm | 1 -
gnu/packages/finance.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graph.scm | 3 +-
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 15 ++------
gnu/packages/music.scm | 5 ++-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-web.scm | 12 ++----
gnu/packages/python-xyz.scm | 62 +++++++++++--------------------
gnu/packages/simulation.scm | 1 -
gnu/packages/sphinx.scm | 2 -
gnu/packages/statistics.scm | 1 -
gnu/packages/textutils.scm | 1 -
gnu/packages/vpn.scm | 1 -
gnu/packages/wm.scm | 1 -
20 files changed, 37 insertions(+), 90 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 32c6f30e8f6..ede10ab927a 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2186,8 +2186,7 @@ (define-public python-crds
python-roman-datamodels
python-stsynphot
python-requests))
- (native-inputs (list python-flake8
- python-ipython
+ (native-inputs (list python-ipython
python-lockfile
python-mock
python-nose
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 253c36947c3..4f3a3d0ba01 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-flake8
- python-poetry-core
+ (list python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
(synopsis
@@ -3005,7 +3004,6 @@ (define-public python-biom-format
(propagated-inputs
(list python-anndata
python-click
- python-flake8
python-future
python-h5py
python-numpy
@@ -21833,8 +21831,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-flake8
- python-hypothesis
+ (list python-hypothesis
python-pytest
python-setuptools-scm
python-wheel))
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 16d4fcd6e36..3d536e59add 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -154,7 +154,6 @@ (define-public calibre
(native-inputs
(list bash-minimal
pkg-config
- python-flake8
python-pyqt-builder
qtbase-5 ; for qmake
xdg-utils))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f082f346278..610fb53087b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2679,7 +2679,6 @@ (define-public python-scikit-rf
python-qtpy
python-scipy))
(native-inputs (list python-coverage
- python-flake8
python-nbval
python-networkx
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7d1efde8187..7579001dd1f 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -2307,9 +2307,7 @@ (define-public python-mt-940
;; Remove custom --cov flags.
(delete-file "pytest.ini")
(invoke "pytest" "-vv")))))))
- (native-inputs (list python-flake8
- python-pytest
- python-pyyaml))
+ (native-inputs (list python-pytest python-pyyaml))
(home-page "https://mt940.readthedocs.io/")
(synopsis "Python parser for MT940-encoded SWIFT data")
(description
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 81a854f8a2a..69cc7e6ddc5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3265,7 +3265,6 @@ (define-public python-geopy
(native-inputs
(list python-async-generator
python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-aiohttp
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index 1408cc4cb46..bbb19bd4cb8 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -214,7 +214,6 @@ (define-public mdpo
(build-system python-build-system)
(native-inputs
(list python-bump2version
- python-flake8
python-flake8-implicit-str-concat
python-flake8-print
python-isort
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 033027a5aa9..eb8aa17fdfe 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -564,8 +564,7 @@ (define-public python-pygsp
"")))))))
(propagated-inputs (list python-numpy python-scikit-image python-scipy))
(native-inputs
- (list python-coverage python-coveralls python-flake8
- python-pytest))
+ (list python-coverage python-coveralls python-pytest))
(home-page "https://github.com/epfl-lts2/pygsp")
(synopsis "Graph Signal Processing in Python")
(description "The PyGSP is a Python package to ease signal processing on
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index db40b99928a..b396a97c0bc 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-flake8
python-isort
python-mypy
python-pytest
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index e63dd0f0678..b4f0f65c837 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-flake8
- python-isort
+ (native-inputs (list python-isort
python-nbsphinx
python-pandas
python-pillow
@@ -1922,8 +1921,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-flake8
- python-keras
+ (native-inputs (list python-keras
python-mypy
python-pandas
python-pytest
@@ -4522,7 +4520,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-flake8
python-flask
python-flask-compress
python-ipython
@@ -5009,8 +5006,7 @@ (define-public python-pyro-api
(build-system python-build-system)
(arguments '(#:tests? #false)) ;requires pyro
(native-inputs
- (list python-flake8
- python-ipython
+ (list python-ipython
python-pytest
python-sphinx
python-sphinx-rtd-theme))
@@ -5059,7 +5055,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-flake8
python-graphviz
python-isort
python-lap
@@ -5106,8 +5101,7 @@ (define-public python-linear-operator
python-pytorch
python-scipy
python-typeguard))
- (native-inputs (list python-flake8
- python-flake8-print
+ (native-inputs (list python-flake8-print
python-pytest
python-setuptools
python-setuptools-scm
@@ -5138,7 +5132,6 @@ (define-public python-gpytorch
" and not test_t_matmul_matrix"))))
(propagated-inputs (list python-linear-operator python-scikit-learn))
(native-inputs (list python-coverage
- python-flake8
python-flake8-print
python-nbval
python-pytest
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6b765dcb3d6..3af2b79b419 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3968,6 +3968,7 @@ (define-public python-mutagen
(build-system pyproject-build-system)
(arguments
(list
+ #:test-flags '(list "--ignore=tests/quality/test_flake8.py")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'remove-hypothesis-deadlines
@@ -3978,8 +3979,8 @@ (define-public python-mutagen
(("( +)@given" all spaces)
(string-append spaces "@settings(deadline=None)\n" all))))))))
(native-inputs
- (list python-pytest python-hypothesis python-flake8
- python-setuptools python-wheel))
+ (list python-pytest python-hypothesis python-setuptools python-wheel))
+ (home-page "https://mutagen.readthedocs.io/")
(synopsis "Read and write audio tags")
(description "Mutagen is a Python module to handle audio metadata. It
supports ASF, FLAC, M4A, Monkey’s Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8ca730df3c3..502ad09a3a6 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-flake8 python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov python-isort))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -477,8 +477,6 @@ (define-public python-pure-protobuf
(lambda _
(invoke "pytest" "--cov-report" "term-missing" "--cov"
"pure_protobuf")
- (invoke "flake8" "pure_protobuf" "tests"
- "--ignore=F541")
(invoke "isort" "-rc" "-c" "pure_protobuf" "tests"))))))
(home-page "https://pypi.org/project/pure-protobuf/")
(synopsis "Protobuf implementation using dataclasses")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a7794741f42..4cf064e0742 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -978,7 +978,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-cov
@@ -1239,8 +1238,6 @@ (define-public python-furl
(build-system python-build-system)
(propagated-inputs
(list python-six python-orderedmultidict))
- (native-inputs
- (list python-flake8))
(home-page "https://github.com/gruns/furl")
(synopsis "URL manipulation in Python")
(description "Furl provides an easy-to-use alternative to the
@@ -1273,7 +1270,6 @@ (define-public python-httplib2
(("==") ">=")))))))
(native-inputs
(list python-cryptography
- python-flake8
python-future
python-mock
python-pytest
@@ -7307,7 +7303,7 @@ (define-public python-http-ece
(propagated-inputs
(list python-cryptography))
(native-inputs
- (list python-coverage python-flake8 python-mock python-nose))
+ (list python-coverage python-mock python-nose))
(home-page "https://github.com/web-push-libs/encrypted-content-encoding")
(synopsis "Encrypted Content Encoding for HTTP")
(description
@@ -8327,8 +8323,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-flake8 python-nose python-selenium
- python-xunitparser))
+ (list python-coverage python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
@@ -8967,8 +8962,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-flake8
- python-httpx
+ (list python-httpx
python-mypy
python-poetry-core
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e558dcdc83a..fa77102857c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -320,7 +320,6 @@ (define-public python-apprise
(native-inputs (list python-babel
python-coverage
python-cryptography
- python-flake8
python-paho-mqtt
python-pytest
python-pytest-cov
@@ -1183,8 +1182,7 @@ (define-public python-colorful
(base32 "0kyy9qhvrb5m9h8xmri7c88i0k1g5qc7017anw39gx44an7mn33y"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-flake8 python-pytest python-setuptools
- python-wheel))
+ (list python-coverage python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -2370,7 +2368,7 @@ (define-public python-pymd4c
(inputs
(list md4c))
(native-inputs
- (list python-flake8 python-pkgconfig pkg-config))
+ (list python-pkgconfig pkg-config))
(home-page "https://github.com/dominickpastore/pymd4c")
(synopsis "Python bindings for MD4C")
(description
@@ -3028,7 +3026,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-tomli))
(native-inputs
- (list python-flake8 python-isort python-mypy python-pytest
+ (list python-isort python-mypy python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -7006,7 +7004,6 @@ (define-public python-docx
(build-system pyproject-build-system)
(native-inputs
(list behave
- python-flake8
python-mock
python-pyparsing
python-pytest
@@ -10799,7 +10796,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-flake8 python-fsspec python-pytest
+ (list python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -11577,8 +11574,7 @@ (define-public python-importlib-resources
(setenv "PYTHONPATH"
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
- (list python-flake8
- python-pytest
+ (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -11900,8 +11896,7 @@ (define-public python-jaraco-test
(arguments
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
- (native-inputs (list python-flake8
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-black
python-pytest-checkdocs
python-pytest-cov
@@ -13706,8 +13701,7 @@ (define-public python-seaborn
python-scipy
python-statsmodels))
(native-inputs
- (list python-flake8
- python-flit-core
+ (list python-flit-core
python-ipykernel
python-nbconvert
python-numpydoc
@@ -18691,8 +18685,7 @@ (define-public python-progressbar2
(propagated-inputs
(list python-six python-utils))
(native-inputs
- (list python-flake8
- python-freezegun
+ (list python-freezegun
python-pycodestyle
python-pytest
python-pytest-cache
@@ -20048,8 +20041,7 @@ (define-public python-codespell
(inputs
(list python-chardet))
(native-inputs
- (list python-flake8
- python-pygments
+ (list python-pygments
python-pytest
python-pytest-cov
python-pytest-dependency
@@ -21140,8 +21132,7 @@ (define-public python-inflect
(setenv "PYTHONPATH"
(string-append (getcwd) "/_custom_build")))))))
(propagated-inputs (list python-pydantic))
- (native-inputs (list python-flake8
- python-pygments
+ (native-inputs (list python-pygments
python-pytest
python-pytest-black
python-pytest-checkdocs
@@ -23279,7 +23270,6 @@ (define-public python-argcomplete
(invoke "python3" "./test/test.py" "-v")))))))
(native-inputs
(list python-coverage
- python-mypy
python-pexpect
python-setuptools
python-setuptools-scm
@@ -24415,8 +24405,7 @@ (define-public python-diff-cover
python-setuptools ; For pkg_resources.
python-tomli))
(native-inputs
- (list python-flake8
- python-poetry-core
+ (list python-poetry-core
python-pylint
python-pytest
python-pytest-flake8
@@ -25083,7 +25072,7 @@ (define-public python-validators
(propagated-inputs
(list python-decorator python-six))
(native-inputs
- (list python-flake8 python-isort python-pytest))
+ (list python-isort python-pytest))
(home-page "https://github.com/kvesteri/validators")
(synopsis "Data validation library")
(description
@@ -25152,8 +25141,7 @@ (define-public python-marshmallow
(propagated-inputs
(list python-packaging))
(native-inputs
- (list python-flake8
- python-flake8-bugbear
+ (list python-flake8-bugbear
python-mypy
python-pytest
python-pytz
@@ -25181,7 +25169,6 @@ (define-public python-marshmallow-jsonapi
(list python-marshmallow))
(native-inputs
(list python-faker
- python-flake8
python-flake8-bugbear
python-flask
python-mock
@@ -25216,8 +25203,7 @@ (define-public python-apispec
(propagated-inputs
(list python-packaging))
(native-inputs
- (list python-flake8
- python-flake8-bugbear
+ (list python-flake8-bugbear
python-marshmallow
python-mypy
python-pytest
@@ -25245,7 +25231,6 @@ (define-public python-apispec-webframeworks
(propagated-inputs (list python-apispec python-setuptools))
(native-inputs
(list python-bottle
- python-flake8
python-flake8-bugbear
python-flask
python-mock
@@ -25294,7 +25279,6 @@ (define-public python-flasgger
(list python-apispec
python-apispec-webframeworks
python-decorator
- python-flake8
python-flask-jwt
python-flask-restful
python-flex
@@ -26279,7 +26263,7 @@ (define-public python-yq
(inputs
(list python-argcomplete python-pyyaml python-xmltodict python-toml jq))
(native-inputs
- (list python-coverage python-flake8 python-setuptools-scm python-wheel))
+ (list python-coverage python-setuptools-scm python-wheel))
(home-page "https://github.com/kislyuk/yq")
(synopsis "Command-line YAML/XML processor")
(description
@@ -27286,7 +27270,7 @@ (define-public python-update-checker
(base32 "04yb5a9mi45ax50m2m0ih6gdvkk1j7gfmy83dd58i1f59axlabba"))))
(build-system python-build-system)
(propagated-inputs (list python-requests))
- (native-inputs (list python-flake8 python-pytest))
+ (native-inputs (list python-pytest))
(home-page "https://github.com/bboe/update_checker")
(synopsis "Python module that will check for package updates")
(description "This package provides a Python module that will check for
@@ -31395,7 +31379,6 @@ (define-public python-eliot
(native-inputs
(list python-coverage
python-dask
- python-flake8
python-hypothesis
python-pytest
python-setuptools
@@ -32184,7 +32167,7 @@ (define-public python-dateparser
(list python-dateutil python-pytz python-regex python-ruamel.yaml
python-tzlocal))
(native-inputs
- (list python-flake8 python-pytest python-parameterized tzdata-for-tests
+ (list python-pytest python-parameterized tzdata-for-tests
python-setuptools python-wheel))
(arguments
`(#:phases
@@ -32712,11 +32695,10 @@ (define-public python-versioneer
(invoke "pyflakes" "setup.py" "versioneer.py" "git_version.py")
(invoke "python" "test/run_pyflakes_src.py")
(invoke "pyflakes" "test")
- (invoke "flake8" "git_version.py" "versioneer.py")
(invoke "pycodestyle" "--max-line-length=88"
"git_version.py" "versioneer.py")))))))
(native-inputs
- (list git-minimal python-flake8 python-pycodestyle python-pyflakes
+ (list git-minimal python-pycodestyle python-pyflakes
python-pypa-build python-setuptools python-wheel))
(propagated-inputs
(list python-tomli))
@@ -33519,7 +33501,7 @@ (define-public python-jinja2-cli
(propagated-inputs
(list python-jinja2))
(native-inputs
- (list python-flake8 python-jinja2 python-pytest))
+ (list python-jinja2 python-pytest))
(home-page "https://github.com/mattrobenolt/jinja2-cli")
(synopsis "Command-line interface to Jinja2")
(description
@@ -35094,7 +35076,6 @@ (define-public nikola
python-yapsy))
(native-inputs
(list python-coverage
- python-flake8
python-freezegun
python-pytest
python-pytest-cov))
@@ -35561,7 +35542,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-coverage python-flake8 python-mypy
+ (native-inputs (list python-coverage python-mypy
python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
@@ -35960,7 +35941,7 @@ (define-public python-mike
"0yxp816x7s948xsd0fifvq9shg01xdxlifd9rzf5y2rd9iwz3hsn"))))
(build-system python-build-system)
(native-inputs
- (list python-coverage python-flake8 python-shtab))
+ (list python-coverage python-shtab))
(propagated-inputs
(list python-jinja2 python-mkdocs python-pyyaml python-verspec))
(home-page "https://github.com/jimporter/mike")
@@ -35984,7 +35965,6 @@ (define-public python-arpeggio
(build-system python-build-system)
(native-inputs (list python-coverage
python-coveralls
- python-flake8
python-mike
python-mkdocs
python-pytest
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index 99c0a121dde..7831802284f 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -1220,7 +1220,6 @@ (define-public python-dolfin-adjoint
(list pkg-config
python-coverage
python-decorator
- python-flake8
python-pkgconfig
python-pytest))
(propagated-inputs
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index c86ef1e5615..2057649ede5 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -90,7 +90,6 @@ (define-public python-sphinx
python-colorama
python-docutils
python-filelock
- python-flake8
python-html5lib
python-imagesize
python-importlib-metadata
@@ -189,7 +188,6 @@ (define-public python-sphinx-5
python-colorama
python-docutils
python-filelock
- python-flake8
python-html5lib
python-imagesize
python-importlib-metadata
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index c2dc1cefef3..0a6f61e2280 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2447,7 +2447,6 @@ (define-public python-statsmodels
(native-inputs
(list python-colorama
python-cython
- python-flake8
python-isort
python-joblib
python-matplotlib
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 9d3b93faf90..bf2da58a3ee 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1675,7 +1675,6 @@ (define-public python-panflute
(propagated-inputs (list python-click python-pyyaml))
(native-inputs (list python-configparser
python-coverage
- python-flake8
python-pandocfilters
python-pytest
python-pytest-cov
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 9da51cb5617..d52d872909d 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -970,7 +970,6 @@ (define-public sshuttle
(native-inputs
(list python-setuptools-scm
;; For tests only.
- python-flake8
python-mock
python-pytest-cov
python-pytest-runner))
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a1c94fe13a9..7da18bc821c 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -654,7 +654,6 @@ (define-public qtile
python-xcffib))
(native-inputs
(list pkg-config
- python-flake8
python-pep8-naming
python-pytest
python-pytest-cov
--
2.41.0
^ permalink raw reply related [relevance 42%]
* [bug#70858] [PATCH 27/32] build-system/pyproject: Remove python-pytest-black native-input.
` (11 preceding siblings ...)
2024-05-10 7:55 73% ` [bug#70858] [PATCH 26/32] build-system/pyproject: Remove python-pytest-isort native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 63% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 67% ` [bug#70858] [PATCH 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/check.scm (python-pytest-perf, python-pytest-enabler)
[native-inputs]: Remove python-pytest-black.
* gnu/packages/python-web.scm (python-portend)[native-inputs]:
Remove python-pytest-black.
* gnu/packages/python-xyz.scm (python-importlib-resources,
python-jaraco-classes, python-jaraco-collections,
python-jaraco-context, python-jaraco-functools, python-jaraco-test,
python-jaraco-text, python-legacy-api-wrap, python-path,
python-pip-run, python-inflect, python-isort, python-tempora,
python-sparse)[native-inputs]: Remove python-pytest-black.
Change-Id: Ib46f1c4a3cc33821cda3d7b2172d36158aa812c9
---
gnu/packages/check.scm | 2 --
gnu/packages/python-web.scm | 1 -
gnu/packages/python-xyz.scm | 22 +++++-----------------
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 6b16ec7711b..f8ead8df4e4 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2491,7 +2491,6 @@ (define-public python-pytest-enabler
python-jaraco-functools
python-toml))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -2664,7 +2663,6 @@ (define-public python-pytest-perf
"and not upstream_url"))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 340ef0836b4..5f19d93ea19 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -311,7 +311,6 @@ (define-public python-portend
(propagated-inputs (list python-tempora))
;; TODO: Add python-pytest-ruff to native-inputs once it has been packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bc4761e4c38..9c15ca8e566 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8686,7 +8686,7 @@ (define-public python-sparse
(list python-numba python-numpy python-scipy))
(native-inputs
(list python-dask python-importlib-metadata python-pytest
- python-pytest-black python-setuptools))
+ python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
(description
@@ -11523,7 +11523,6 @@ (define-public python-importlib-resources
(string-append (getcwd) "/_custom_build")))))))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11653,7 +11652,6 @@ (define-public python-jaraco-classes
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11686,7 +11684,6 @@ (define-public python-jaraco-collections
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -11746,7 +11743,6 @@ (define-public python-jaraco-context
#:test-flags '(list "-k" "not project")))
(native-inputs
(list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11780,7 +11776,6 @@ (define-public python-jaraco-functools
(native-inputs
(list python-jaraco-classes
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-flake8
python-pytest-mypy
@@ -11840,7 +11835,6 @@ (define-public python-jaraco-test
(list #:test-flags '(list "-k" "http")))
(propagated-inputs (list python-jaraco-context python-jaraco-functools))
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -11873,7 +11867,6 @@ (define-public python-jaraco-text
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs (list python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-mypy
@@ -16255,8 +16248,7 @@ (define-public python-legacy-api-wrap
"06qhp0g543dy98vpa41hwdalvdbsjfc3ldk474yr9sd75mhl8jh3"))))
(build-system python-build-system)
(propagated-inputs
- (list python-get-version python-pytest python-pytest-black
- python-setuptools))
+ (list python-get-version python-pytest python-setuptools))
(home-page "https://github.com/flying-sheep/legacy-api-wrap")
(synopsis "Legacy API wrapper")
(description "This module defines a decorator to wrap legacy APIs. The
@@ -16516,7 +16508,6 @@ (define-public python-path
python-packaging
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -16621,7 +16612,6 @@ (define-public python-pip-run
(append python-nbformat
python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -21059,7 +21049,6 @@ (define-public python-inflect
(propagated-inputs (list python-pydantic))
(native-inputs (list python-pygments
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
@@ -24089,7 +24078,8 @@ (define-public python-isort
(arguments
(list
#:test-flags '(list "tests/unit/" "-k" "not test_gitignore"
- "--ignore=tests/unit/test_deprecated_finders.py")
+ "--ignore=tests/unit/test_deprecated_finders.py"
+ "--ignore=tests/unit/profiles/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'install 'install-example-plugins
@@ -24107,8 +24097,7 @@ (define-public python-isort
(apply invoke "pip" "--no-cache-dir" "--no-input"
"install" "--user" "--no-deps" example-whls)))))))
(native-inputs
- (list python-black
- python-colorama
+ (list python-colorama
python-hypothesmith
python-libcst-minimal
python-natsort
@@ -25908,7 +25897,6 @@ (define-public python-tempora
(native-inputs
(list python-freezegun
python-pytest
- python-pytest-black
python-pytest-checkdocs
python-pytest-enabler
python-pytest-flake8
--
2.41.0
^ permalink raw reply related [relevance 63%]
* [bug#70858] [PATCH 18/32] build-system/pyproject: Remove python-mypy native-input.
` (5 preceding siblings ...)
2024-05-10 7:55 61% ` [bug#70858] [PATCH 17/32] build-system/pyproject: Remove python-tox native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 62% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 62% ` [bug#70858] [PATCH 20/32] build-system/pyproject: Remove python-isort native-input Nicolas Graves via Guix-patches via
` (8 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/astronomy.scm (python-poliastro)[native-inputs]: Remove
python-mypy.
* gnu/packages/databases.scm (python-psycopg2)[native-inputs]: Remove
python-mypy.
* gnu/packages/engineering.scm (uranium, cura)[native-inputs]: Remove
python-mypy.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-mypy.
* gnu/packages/machine-learning.scm (python-imbalanced-learn,
python-captum, python-torchmetrics, python-pyro-ppl)[native-inputs]:
Remove python-mypy.
* gnu/packages/python-science.scm (python-scipy)[native-inputs]:
Remove python-mypy.
* gnu/packages/python-web.scm (python-huggingface-hub, python-asgiref,
python-starsessions-for-pytorch-lightning,
python-fastapi)[native-inputs]: Remove python-mypy.
* gnu/packages/python-xyz.scm (python-pyls-black, kalamine,
python-pydantic-cli, python-marshmallow, python-apispec,
python-typeguard, python-trio-typing, python-verspec,
python-catalogue, python-duckdb)[native-inputs]: Remove python-mypy.
* gnu/packages/serialization.scm (python-msgspec)[native-inputs]: Remove
python-mypy.
* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-mypy.
Change-Id: I947656750aa0c7732291d826641736aaefab274e
---
gnu/packages/astronomy.scm | 1 -
gnu/packages/databases.scm | 1 -
gnu/packages/engineering.scm | 2 --
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 ----
gnu/packages/python-science.scm | 1 -
gnu/packages/python-web.scm | 5 +----
gnu/packages/python-xyz.scm | 22 +++++++++-------------
gnu/packages/serialization.scm | 1 -
gnu/packages/virtualization.scm | 3 +--
10 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c2d874f8f3f..426cfd8c88f 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2604,7 +2604,6 @@ (define-public python-poliastro
(setenv "HOME" "/tmp"))))))
(native-inputs
(list python-hypothesis
- python-mypy
python-flit-core
python-pytest
python-pytest-cov
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index f9202639c53..ad27ec621ca 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -4112,7 +4112,6 @@ (define-public python-psycopg
(delete 'sanity-check))))
(native-inputs
(list python-cython-3
- python-mypy
python-psycopg-pool
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2620d5272b6..af79172e53b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3923,7 +3923,6 @@ (define-public uranium
graphviz
pkg-config
python-pytest
- python-mypy
python-certifi
python-twisted))
(propagated-inputs
@@ -4126,7 +4125,6 @@ (define-public cura
(build-system qt-build-system)
(native-inputs
(list python-certifi
- python-mypy
python-pytest
python-requests))
(inputs
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b396a97c0bc..ecc2dc2bb4c 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -218,7 +218,6 @@ (define-public python-uqbar
(native-inputs
(list graphviz
python-isort
- python-mypy
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index e6f6bfe410d..3e3b7ab8ea8 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1920,7 +1920,6 @@ (define-public python-imbalanced-learn
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
(native-inputs (list python-keras
- python-mypy
python-pandas
python-pytest
python-pytest-cov
@@ -4521,7 +4520,6 @@ (define-public python-captum
python-flask-compress
python-ipython
python-ipywidgets
- python-mypy
python-parameterized
python-pytest
python-pytest-cov
@@ -4728,7 +4726,6 @@ (define-public python-torchmetrics
(list python-cloudpickle
python-fire
python-mir-eval
- python-mypy
python-pandas
python-psutil
python-pytest
@@ -5054,7 +5051,6 @@ (define-public python-pyro-ppl
python-isort
python-lap
python-matplotlib
- python-mypy
python-nbformat
python-nbsphinx
python-nbstripout
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index e20cb56db9c..567fa5d1559 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -273,7 +273,6 @@ (define-public python-scipy
'())
(list python-matplotlib
python-mpmath
- python-mypy
python-numpy
python-numpydoc
python-pydata-sphinx-theme
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fa908ceafd9..04712745963 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -196,7 +196,6 @@ (define-public python-huggingface-hub
python-fastapi
python-jedi
python-jinja2
- python-mypy
python-numpy
python-pillow
python-pydantic
@@ -717,7 +716,7 @@ (define-public python-asgiref
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
- (list python-mypy python-pytest python-pytest-asyncio))
+ (list python-pytest python-pytest-asyncio))
(propagated-inputs
(list python-typing-extensions))
(home-page "https://github.com/django/asgiref/")
@@ -8957,7 +8956,6 @@ (define-public python-starsessions-for-pytorch-lightning
python-starlette-for-fastapi-0.88))
(native-inputs
(list python-httpx
- python-mypy
python-poetry-core
python-pytest
python-pytest-asyncio
@@ -9003,7 +9001,6 @@ (define-public python-fastapi
python-hatchling
python-isort
python-jose
- python-mypy
python-passlib
python-peewee
python-pytest
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32a18f52d20..dd2b35eb35d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3020,7 +3020,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-tomli))
(native-inputs
- (list python-isort python-mypy python-pytest
+ (list python-isort python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -6785,7 +6785,7 @@ (define-public kalamine
;; TODO: Add python-pytest-ruff to native-inputs once it has been
;; packaged.
(native-inputs
- (list python-hatchling python-mypy python-pytest))
+ (list python-hatchling python-pytest))
(home-page "https://github.com/OneDeadKey/kalamine")
(synopsis "Keyboard layout maker")
(description
@@ -8002,8 +8002,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-mypy
- python-pytest))
+ (list python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
(description
@@ -23457,6 +23456,8 @@ (define-public python-duckdb
(list
#:test-flags
'(list "--ignore=tests/slow/test_h2oai_arrow.py"
+ ;; stubs require mypy and don't actually check functionality.
+ "--ignore=tests/stubs/test_stubs.py"
;; Don't install anything, thank you.
"-k" "not test_install_non_existent_extension")
#:phases
@@ -23481,7 +23482,6 @@ (define-public python-duckdb
(list pybind11
python-fsspec
python-google-cloud-storage
- python-mypy
python-numpy
python-pandas
python-psutil
@@ -25103,7 +25103,6 @@ (define-public python-marshmallow
(list python-packaging))
(native-inputs
(list python-flake8-bugbear
- python-mypy
python-pytest
python-pytz
python-simplejson
@@ -25165,7 +25164,6 @@ (define-public python-apispec
(native-inputs
(list python-flake8-bugbear
python-marshmallow
- python-mypy
python-pytest
python-pyyaml
python-setuptools
@@ -26582,8 +26580,7 @@ (define-public python-typeguard
;; XXX: These fail when installed as a library:
;; https://github.com/agronholm/typeguard/issues/176
"not usefixtures and not test_cached_module")))))))
- (native-inputs (list python-mypy
- python-pytest
+ (native-inputs (list python-pytest
python-setuptools-scm
python-typing-extensions))
(home-page "https://github.com/agronholm/typeguard")
@@ -29050,8 +29047,7 @@ (define-public python-trio-typing
(native-inputs (list python-attrs python-pytest python-setuptools
python-wheel))
(propagated-inputs
- (list python-mypy python-mypy-extensions python-trio
- python-typing-extensions))
+ (list python-mypy-extensions python-trio python-typing-extensions))
(home-page "https://github.com/python-trio/trio-typing")
(synopsis "Static type checking support for Trio and related projects")
(description
@@ -35483,7 +35479,7 @@ (define-public python-verspec
(base32
"07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64"))))
(build-system python-build-system)
- (native-inputs (list python-mypy python-pretend python-pytest))
+ (native-inputs (list python-pretend python-pytest))
(arguments
`(#:phases (modify-phases %standard-phases
(replace 'check
@@ -36230,7 +36226,7 @@ (define-public python-catalogue
"0srdxiil2xys8q1gpc1nvzhvis3a33d8a7amk2i1rlpbg6p36pak"))))
(build-system python-build-system)
(native-inputs (list python-pytest))
- (inputs (list python python-zipp python-typing-extensions python-mypy))
+ (inputs (list python python-zipp python-typing-extensions))
(home-page "https://github.com/explosion/catalogue")
(synopsis "Lightweight function registries for your library")
(description
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 728d6404bb9..b39ce176502 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -719,7 +719,6 @@ (define-public python-msgspec
(native-inputs (list python-attrs
python-gcovr
python-msgpack
- python-mypy
python-pytest
python-setuptools-scm
python-versioneer
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b564bd043cb..b4dce1cc9d6 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,8 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-mypy python-pyhamcrest python-twine
- python-setuptools python-wheel))
+ (list python-pyhamcrest python-twine python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
(description
--
2.41.0
^ permalink raw reply related [relevance 62%]
* [bug#70858] [PATCH 23/32] gnu: python-tinycss2: Remove python-pytest-cov native-input.
` (9 preceding siblings ...)
2024-05-10 7:55 41% ` [bug#70858] [PATCH 22/32] build-system/pyproject: Remove python-pytest-cov native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 70% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 73% ` [bug#70858] [PATCH 26/32] build-system/pyproject: Remove python-pytest-isort native-input Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/python-web.scm (python-tinycss2):
[arguments]<#:phases>: Add phase remove-unwanted-dependency to
ignore coverage options.
[native-inputs]: Remove python-pytest-cov.
Change-Id: I853fe3371be84be1655db0ee8d1dca8d23c50ef9
---
gnu/packages/python-web.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c73bc6294e9..8c51282c9cb 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5895,11 +5895,18 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'remove-unwanted-dependencies
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
- (list python-flit python-pytest python-pytest-cov
- python-pytest-flake8 python-pytest-isort))
+ (list python-flit python-pytest python-pytest-flake8 python-pytest-isort))
(home-page "https://tinycss2.readthedocs.io/")
(synopsis "Low-level CSS parser for Python")
(description "@code{tinycss2} can parse strings, return Python objects
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70858] [PATCH 30/32] build-system/pyproject: Stop hiding options.
` (14 preceding siblings ...)
2024-05-10 7:55 65% ` [bug#70858] [PATCH 29/32] build-system/pyproject: Remove python-pytest-mypy inputs Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 69% ` Nicolas Graves via Guix-patches via
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/pdf.scm (python-pydyf, weasyprint)[arguments]
<#:test-flags>: Remove arguments hiding coverage options.
* gnu/packages/python-crypto.scm (python-keyring)
[arguments]<#:test-flags>: Remove arguments hiding coverage options.
* gnu/packages/python-web.scm (python-asgi-csrf, python-asgi-lifespan,
python-openapi-schema-validator, python-openapi-spec-validator,
python-openapi-core)[arguments]<#:test-flags>: Remove arguments hiding
coverage options.
(python-openapi-schema-validator, python-openapi-spec-validator)
[arguments]<#:phases>: Remove 'remove-coverage-pytest-options phase.
(python-cssselect2, python-tinycss2)[arguments]: Remove uneeded field.
(python-jsonpickle)[arguments]<#:test-flags>: Remove uneeded
test-flags.
* gnu/packages/python-xyz.scm (python-cattrs)
[arguments]<#:phases>: Remove arguments hiding coverage options.
Change-Id: Ibe08ecfebf8a24259c8658918d98fe9e5a8925b7
---
gnu/packages/pdf.scm | 6 +---
gnu/packages/python-crypto.scm | 1 -
gnu/packages/python-web.scm | 51 ++++------------------------------
gnu/packages/python-xyz.scm | 4 +--
4 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4e260d614de..16d4d9336e3 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -816,9 +816,6 @@ (define-public python-pydyf
(sha256
(base32 "18q43g5d9455msipcgd5fvnh8m4a2rz189slzfg80yycjw66rshs"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:test-flags #~'("-c" "/dev/null")))
(propagated-inputs (list python-pillow))
(native-inputs
(list ghostscript
@@ -1635,8 +1632,7 @@ (define-public weasyprint
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags #~(list "-c" "/dev/null"
- "-n" (number->string (parallel-job-count)))
+ #:test-flags #~(list "-n" (number->string (parallel-job-count)))
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'patch-library-paths
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6965a330624..6139856a906 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -288,7 +288,6 @@ (define-public python-keyring
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags '(list "-c" "/dev/null") ;avoid extra test dependencies
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'workaround-test-failure
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 425aa9d5d0f..a149e561243 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -738,10 +738,7 @@ (define-public python-asgi-csrf
(build-system pyproject-build-system)
(arguments
(list #:test-flags
- ;; Provide a null config to avoid the extraneous dependency on
- ;; python-pytest-coverage.
- #~(list "-c" "/dev/null"
- ;; Disable two failing tests (see:
+ #~(list ;; Disable two failing tests (see:
;; https://github.com/simonw/asgi-csrf/issues/24).
"-k" (string-append
"not (test_multipart "
@@ -780,8 +777,7 @@ (define-public python-asgi-lifespan
(arguments
(list
#:test-flags
- '(list "-c" "/dev/null" ;ignore coverage-related options
- "-k"
+ '(list "-k"
(string-append
;; XXX: Some tests fail because of a 'lifespan.shutdown.failed'
;; extra event, perhaps because our version of trio is older.
@@ -1528,10 +1524,7 @@ (define-public python-jsonpickle
(build-system pyproject-build-system)
(arguments
(list
- #:test-flags
- ;; Prevent running the flake8 and black pytest plugins, which only tests
- ;; style and frequently causes harmless failures.
- '(list "-o" "addopts=''" "tests")
+ #:test-flags '(list "tests")
#:phases
'(modify-phases %standard-phases
(add-before 'check 'pre-check
@@ -2178,13 +2171,7 @@ (define-public python-openapi-schema-validator
(list
#:test-flags
;; This one returns 5 instead of 4 elements
- '(list "-k" "not test_array_prefixitems_invalid")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ '(list "-k" "not test_array_prefixitems_invalid")))
(native-inputs (list python-poetry-core python-pytest))
(propagated-inputs
(list python-isodate
@@ -2222,13 +2209,7 @@ (define-public python-openapi-spec-validator
(list
;; These tests attempt to fetch resources from the Internet
#:test-flags '(list "--ignore-glob=tests/integration/validation/**"
- "-k" "not example")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'remove-coverage-pytest-options
- (lambda _
- (substitute* "pyproject.toml"
- (("^--cov.*") "")))))))
+ "-k" "not example")))
(native-inputs
(list python-poetry-core
python-pytest))
@@ -2267,9 +2248,6 @@ (define-public python-openapi-core
(list
#:test-flags
'(list "tests/unit"
- ;; Ignore Pytest configuration in setup.cfg that adds
- ;; unwanted flake8 and coverage options.
- "-c" "/dev/null"
"-k" (string-append
;; Type mismatches
"not TestFlaskOpenAPIRequest"
@@ -5891,14 +5869,6 @@ (define-public python-tinycss2
(sha256
(base32 "0zyc48vbmczpqj7f3f0d7zb3bz29fyj50dg0m6bbwbr5i88kq3sq"))))
(build-system pyproject-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'remove-unwanted-dependencies
- (lambda _
- (substitute* "pyproject.toml"
- (("^addopts.*") "")))))))
(propagated-inputs
(list python-webencodings))
(native-inputs
@@ -5925,17 +5895,6 @@ (define-public python-cssselect2
(sha256
(base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk"))))
(build-system pyproject-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-linters
- ;; Their check fails; none of our business.
- (lambda _
- (substitute* '("setup.py" "pyproject.toml")
- (("'pytest-flake8',") "")
- (("'pytest-isort',") "")
- (("--flake8") "")
- (("--isort") "")))))))
(propagated-inputs
(list python-tinycss2))
(native-inputs
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 733a60b087d..2bfeecf33e0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -21316,9 +21316,7 @@ (define-public python-cattrs
(substitute* "pyproject.toml"
;; Fix version string
(("dynamic = \\[\"version\"\\]")
- (string-append "version = \"" #$version "\""))
- ;; Just run pytest with no frills
- (("addopts = \"-l.*") "")))))))
+ (string-append "version = \"" #$version "\""))))))))
(native-inputs
(list python-hatchling
python-hatch-vcs
--
2.41.0
^ permalink raw reply related [relevance 69%]
* [bug#70858] [PATCH 10/32] gnu: python-openid: Remove python-coverage native-input.
` (2 preceding siblings ...)
2024-05-10 7:55 49% ` [bug#70858] [PATCH 06/32] build-system/pyproject: Remove python-coverage input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 70% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 72% ` [bug#70858] [PATCH 11/32] build-system/pyproject: Remove python-coveralls native-input Nicolas Graves via Guix-patches via
` (11 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/python-web.scm (python-openid):
[native-inputs]: Remove python-coverage.
[arguments]<#:phases>: Rewrite check phase.
Change-Id: Id4ea5abc531f5fd84b60ff22407eb608f1e6ac29
---
gnu/packages/python-web.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 942999f6cf9..fe79f629bb8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2341,17 +2341,18 @@ (define-public python-openid
"1bxf9a3ny1js422j962zfzl4a9dhj192pvai05whn7j0iy9gdyrk"))))
(build-system python-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "coverage" "run" "-m"
- "unittest" "openid.test.test_suite")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "python" "-m" "unittest" "openid.test.test_suite")
+ (format #t "test suite not run~%")))))))
(propagated-inputs
(list python-defusedxml))
(native-inputs
- (list python-coverage python-psycopg2 python-django))
+ (list python-psycopg2 python-django))
(home-page "https://github.com/necaris/python3-openid")
(synopsis "OpenID support for servers and consumers")
(description "This library provides OpenID authentication for Python, both
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70858] [PATCH 20/32] build-system/pyproject: Remove python-isort native-input.
` (6 preceding siblings ...)
2024-05-10 7:55 62% ` [bug#70858] [PATCH 18/32] build-system/pyproject: Remove python-mypy native-input Nicolas Graves via Guix-patches via
@ 2024-05-10 7:55 62% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 71% ` [bug#70858] [PATCH 21/32] build-system/pyproject: Remove python-twine native-input Nicolas Graves via Guix-patches via
` (7 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/bioinformatics.scm (python-cooler,
scvelo)[native-inputs]: Remove python-isort.
* gnu/packages/databases.scm (aerich)[native-inputs]: Remove
python-isort.
* gnu/packages/django.scm (python-django-taggit)[native-inputs]:
Remove python-isort.
* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-isort.
* gnu/packages/geo.scm (python-geopy)[native-inputs]: Remove
python-isort.
* gnu/packages/gettext.scm (mdpo)[native-inputs]: Remove python-isort.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Remove
python-isort.
* gnu/packages/machine-learning.scm (python-funsor,
python-pyro-ppl)[native-inputs]: Remove python-isort.
* gnu/packages/mail.scm (python-hyperkitty, postorius)[native-inputs]:
Remove python-isort.
* gnu/packages/protobuf.scm (python-pure-protobuf)[native-inputs]:
Remove python-isort.
* gnu/packages/python-check.scm (python-pytest-toolbox)
[native-inputs]: Remove python-pytest-isort.
* gnu/packages/python-web.scm (python-ovh, python-tinycss2,
python-fastapi)[native-inputs]: Remove python-isort.
* gnu/packages/python-xyz.scm (python-jupytext, python-pyls-black,
python-eventlet, python-textdistance,
python-validators)[native-inputs]: Remove python-isort.
* gnu/packages/sphinx.scm (python-sphinx,
python-sphinx-5)[native-inputs]: Remove python-isort.
* gnu/packages/statistics.scm (python-statsmodels)[native-inputs]:
Remove python-isort.
* gnu/packages/virtualization.scm (python-qemu-qmp)[native-inputs]:
Remove python-isort.
Change-Id: I6dc9a49cdbb10ddd33ea32854f891312d3a29e53
---
gnu/packages/bioinformatics.scm | 2 --
gnu/packages/databases.scm | 1 -
gnu/packages/django.scm | 2 +-
gnu/packages/finance.scm | 1 -
gnu/packages/geo.scm | 1 -
gnu/packages/gettext.scm | 1 -
gnu/packages/graphviz.scm | 1 -
gnu/packages/machine-learning.scm | 4 +---
gnu/packages/mail.scm | 3 +--
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-web.scm | 4 +---
gnu/packages/python-xyz.scm | 7 ++-----
gnu/packages/sphinx.scm | 2 --
gnu/packages/statistics.scm | 1 -
gnu/packages/virtualization.scm | 1 -
16 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index eabee35f70f..3d5d381f0a0 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -17971,7 +17971,6 @@ (define-public python-cooler
python-simplejson))
(native-inputs
(list python-hatchling
- python-isort
python-pytest
python-pytest-cov))
;; Almost all the projects of the Mirnylab are moved under Open2C umbrella
@@ -21815,7 +21814,6 @@ (define-public scvelo
(propagated-inputs
(list python-anndata
python-hnswlib
- python-isort
python-igraph
python-loompy
python-louvain
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index ad27ec621ca..9ec7855109c 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3251,7 +3251,6 @@ (define-public aerich
(list poetry
python-bandit
python-cryptography
- python-isort
python-pydantic
python-pytest
python-pytest-asyncio
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f5b1e0462bb..48b1b38a97f 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -387,7 +387,7 @@ (define-public python-django-taggit
(lambda _
(invoke "python3" "-m" "django" "test" "--settings=tests.settings"))))))
(propagated-inputs
- (list python-django python-isort))
+ (list python-django))
(native-inputs
(list python-pytest python-mock))
(home-page
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 7579001dd1f..6f70d61f700 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-isort
python-pillow
python-protobuf
python-pyqt
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index be96e6800a3..73644ab2bb4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3263,7 +3263,6 @@ (define-public python-geopy
(list python-geographiclib))
(native-inputs
(list python-async-generator
- python-isort
python-pytest
python-pytest-aiohttp
python-readme-renderer
diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm
index bbb19bd4cb8..39215a0ccb6 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -216,7 +216,6 @@ (define-public mdpo
(list python-bump2version
python-flake8-implicit-str-concat
python-flake8-print
- python-isort
python-pytest
python-pytest-cov
python-sphinx
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index ecc2dc2bb4c..f6a58943ecb 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -217,7 +217,6 @@ (define-public python-uqbar
and not test_sphinx_book_text_broken_strict")))
(native-inputs
(list graphviz
- python-isort
python-pytest
python-pytest-cov
python-setuptools
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3e3b7ab8ea8..d4ce01b0c1b 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-isort
- python-nbsphinx
+ (native-inputs (list python-nbsphinx
python-pandas
python-pillow
python-pyro-api
@@ -5048,7 +5047,6 @@ (define-public python-pyro-ppl
(list ninja
jupyter
python-graphviz
- python-isort
python-lap
python-matplotlib
python-nbformat
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5743558e76b..7c4b6f2cb26 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -3724,7 +3724,6 @@ (define-public python-hyperkitty
(native-inputs
(list python-beautifulsoup4
python-elasticsearch
- python-isort
python-lxml
python-mock
python-whoosh))
@@ -3763,7 +3762,7 @@ (define-public postorius
(list python-readme-renderer python-mailmanclient
python-django python-django-mailman3))
(native-inputs
- (list python-beautifulsoup4 python-isort python-mock python-vcrpy))
+ (list python-beautifulsoup4 python-mock python-vcrpy))
(home-page "https://gitlab.com/mailman/postorius")
(synopsis "Web user interface for GNU Mailman")
(description
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 502ad09a3a6..9c4d56bd384 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -469,7 +469,7 @@ (define-public python-pure-protobuf
(base32 "15dp5pvazd0jx4wzzh79080ah7hkpd3axh40al9vhzs2hf3v90hx"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-isort))
+ (list python-pytest python-pytest-cov))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 7f1c73ee0ad..d51c5e19bba 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1487,8 +1487,7 @@ (define-public python-pytest-toolbox
(substitute* "setup.cfg"
((".*timeout.*") ""))))))))
(native-inputs
- (list python-pydantic python-pytest python-pytest-isort
- python-setuptools python-wheel))
+ (list python-pydantic python-pytest python-setuptools python-wheel))
(home-page "https://github.com/samuelcolvin/pytest-toolbox")
(synopsis "Numerous useful plugins for Pytest")
(description
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 04712745963..d4988620385 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -976,8 +976,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-isort
- python-pytest
+ (native-inputs (list python-pytest
python-pytest-cov
python-setuptools
python-sphinx
@@ -8999,7 +8998,6 @@ (define-public python-fastapi
(native-inputs (list python-databases
python-flask
python-hatchling
- python-isort
python-jose
python-passlib
python-peewee
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6fc3f0dbb06..f467f5f5794 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
python-autopep8
python-flake8
python-gitpython
- python-isort
python-ipython-genutils
python-jupyter-server
python-pyaml
@@ -3020,7 +3019,7 @@ (define-public python-pyls-black
(propagated-inputs
(list python-black python-lsp-server python-tomli))
(native-inputs
- (list python-isort python-pytest
+ (list python-pytest
python-pytest-runner python-setuptools python-wheel))
(home-page "https://github.com/rupert/pyls-black")
(synopsis "Black plugin for the Python Language Server")
@@ -4242,7 +4241,6 @@ (define-public python-eventlet
python-hatchling
python-hatch-vcs
python-pytest
- python-isort
python-twine))
(arguments
(list
@@ -12910,7 +12908,6 @@ (define-public python-textdistance
#t)))))
(native-inputs
(list python-hypothesis
- python-isort
python-numpy
python-pytest
python-pytest-runner
@@ -25041,7 +25038,7 @@ (define-public python-validators
(propagated-inputs
(list python-decorator python-six))
(native-inputs
- (list python-isort python-pytest))
+ (list python-pytest))
(home-page "https://github.com/kvesteri/validators")
(synopsis "Data validation library")
(description
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 2057649ede5..e49e215de79 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -93,7 +93,6 @@ (define-public python-sphinx
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
@@ -191,7 +190,6 @@ (define-public python-sphinx-5
python-html5lib
python-imagesize
python-importlib-metadata
- python-isort
python-jinja2
python-mypy
python-packaging
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index bfc69062587..de4fb6e3aa7 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2446,7 +2446,6 @@ (define-public python-statsmodels
(native-inputs
(list python-colorama
python-cython
- python-isort
python-joblib
python-matplotlib
python-pytest
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b4dce1cc9d6..90f46e6f23a 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2031,7 +2031,6 @@ (define-public python-qemu-qmp
(native-inputs
(list python-avocado-framework
python-flake8
- python-isort
python-pylint
python-setuptools
python-setuptools-scm
--
2.41.0
^ permalink raw reply related [relevance 62%]
* [bug#70858] [PATCH 03/32] build-system/pyproject: Remove python-black input.
@ 2024-05-10 7:55 61% ` Nicolas Graves via Guix-patches via
2024-05-10 7:55 42% ` [bug#70858] [PATCH 05/32] build-system/pyproject: Remove python-flake8 inputs Nicolas Graves via Guix-patches via
` (14 subsequent siblings)
15 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-10 7:55 UTC (permalink / raw)
To: 70858; +Cc: ngraves
* gnu/packages/bioinformatics.scm (python-doubletdetection,
python-liana-py, scvelo)[native-inputs]: Remove python-black.
* gnu/packages/databases.scm (datasette):
[arguments]<#:test-flags>: Ignore black tests.
<#:phases>: Remove parts related to black in relax-requirements
added phase.
[native-inputs]: Remove python-black.
* gnu/packages/finance.scm (python-trezor)[native-inputs]: Remove
python-black.
* gnu/packages/graph.scm (python-graphtools)[native-inputs]: Remove
python-black.
* gnu/packages/machine-learning.scm (python-funsor,
python-imbalanced-learn, python-hyperopt, python-captum,
python-pyro-ppl)[native-inputs]: Remove python-black.
* gnu/packages/python-check.scm (python-vcrpy)[native-inputs]:
Remove python-black.
* gnu/packages/python-web.scm (python-ovh, python-openai,
python-starsessions-for-pytorch-lightning)[native-inputs]: Remove
python-black.
* gnu/packages/python-xyz.scm (python-pydantic-cli, python-imageio,
python-update-checker, python-eliot, python-minikanren,
python-jupytext)[native-inputs]: Remove python-black.
(ptpython)[propagated-inputs]: Remove python-black.
* gnu/packages/virtualization.scm (python-transient)[native-inputs]:
Remove python-black.
Change-Id: Ie8098afda264bf9a5ab2cfe5d915bc7a41fdc604
---
gnu/packages/bioinformatics.scm | 11 +++--------
gnu/packages/databases.scm | 8 ++------
gnu/packages/finance.scm | 1 -
gnu/packages/graph.scm | 1 -
gnu/packages/machine-learning.scm | 11 +++--------
gnu/packages/python-check.scm | 3 +--
gnu/packages/python-web.scm | 8 +++-----
gnu/packages/python-xyz.scm | 15 +++++----------
gnu/packages/virtualization.scm | 2 +-
9 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a611caf715a..253c36947c3 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2152,8 +2152,7 @@ (define-public python-doubletdetection
python-scipy
python-tqdm))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-poetry-core
python-pytest))
(home-page "https://github.com/JonathanShor/DoubletDetection")
@@ -2278,10 +2277,7 @@ (define-public python-liana-py
python-tqdm
tzdata))
(native-inputs
- (list python-black
- python-poetry-core
- python-pytest
- python-pytest-cov))
+ (list python-poetry-core python-pytest python-pytest-cov))
(home-page "https://github.com/saezlab/liana-py")
(synopsis "LIANA is a ligand-receptor analysis framework")
(description "This is a Ligand-Receptor inference framework. The
@@ -21837,8 +21833,7 @@ (define-public scvelo
python-umap-learn
pybind11))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-hypothesis
python-pytest
python-setuptools-scm
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 67e6ced7c32..96b2c2a0437 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5537,16 +5537,13 @@ (define-public datasette
" or test_custom_query_with_unicode_characters"
" or test_searchmode)")
"-n" (number->string (parallel-job-count))
- "-m" "not serial") ;cannot run in parallel
+ "-m" "not serial" ;cannot run in parallel
+ "--ignore=tests/test_black.py")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'relax-requirements
(lambda _
- ;; The package needlessly specifies exact versions
- ;; of dependencies, when it works fine with others.
(substitute* "setup.py"
- (("(black)==[0-9\\.]+" _ package)
- package)
(("click-default-group-wheel")
"click-default-group")))))))
(propagated-inputs
@@ -5569,7 +5566,6 @@ (define-public datasette
python-uvicorn))
(native-inputs
(list python-beautifulsoup4
- python-black
python-cogapp
python-pip
python-pytest
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3c32a220c4e..7d1efde8187 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1149,7 +1149,6 @@ (define-public python-trezor
python-typing-extensions))
(native-inputs ; Only needed for running the tests
(list protobuf
- python-black
python-isort
python-pillow
python-protobuf
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index eda8365a424..033027a5aa9 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -476,7 +476,6 @@ (define-public python-graphtools
(native-inputs
(list util-linux ;for lscpu
python-anndata
- python-black
python-coverage
python-coveralls
python-nose
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index ba6f51b3f11..e63dd0f0678 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -175,8 +175,7 @@ (define-public python-funsor
(propagated-inputs (list python-makefun python-multipledispatch
python-numpy python-opt-einsum
python-typing-extensions))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-isort
python-nbsphinx
python-pandas
@@ -1923,8 +1922,7 @@ (define-public python-imbalanced-learn
(getcwd)))))))
(propagated-inputs (list python-joblib python-numpy python-scikit-learn
python-scipy python-threadpoolctl))
- (native-inputs (list python-black
- python-flake8
+ (native-inputs (list python-flake8
python-keras
python-mypy
python-pandas
@@ -2359,8 +2357,7 @@ (define-public python-hyperopt
python-six
python-tqdm))
(native-inputs
- (list python-black
- python-nose
+ (list python-nose
python-pymongo
python-pytest
python-wheel))
@@ -4525,7 +4522,6 @@ (define-public python-captum
(list python-matplotlib python-numpy python-pytorch python-tqdm))
(native-inputs (list jupyter
python-annoy
- python-black
python-flake8
python-flask
python-flask-compress
@@ -5063,7 +5059,6 @@ (define-public python-pyro-ppl
(native-inputs
(list ninja
jupyter
- python-black
python-flake8
python-graphviz
python-isort
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 5571cee2088..83fd723d12b 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -411,8 +411,7 @@ (define-public python-vcrpy
(propagated-inputs
(list python-pyyaml python-six python-wrapt python-yarl))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-flake8
python-flask
python-httplib2
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 61ea8a63558..a7794741f42 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -977,8 +977,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-black
- python-coverage
+ (native-inputs (list python-coverage
python-flake8
python-isort
python-pytest
@@ -2174,7 +2173,7 @@ (define-public python-openai
and not test_file_cli")))
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
- (native-inputs (list python-black python-pytest python-pytest-asyncio
+ (native-inputs (list python-pytest python-pytest-asyncio
python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
@@ -8968,8 +8967,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-httpx
python-mypy
python-poetry-core
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3f86ea8224b..7eff059637e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -478,7 +478,6 @@ (define-public python-jupytext
(native-inputs
(list git-minimal
python-autopep8
- python-black
python-flake8
python-gitpython
python-isort
@@ -8029,8 +8028,7 @@ (define-public python-pydantic-cli
(propagated-inputs
(list python-pydantic))
(native-inputs
- (list python-black
- python-mypy
+ (list python-mypy
python-pytest))
(home-page "https://github.com/mpkocher/pydantic-cli")
(synopsis "Turn Pydantic defined data models into CLI tools")
@@ -10802,7 +10800,7 @@ (define-public python-imageio
(propagated-inputs
(list python-imageio-ffmpeg python-numpy python-pillow python-tifffile python-setuptools))
(native-inputs
- (list python-black python-flake8 python-fsspec python-pytest
+ (list python-flake8 python-fsspec python-pytest
python-pytest-cov python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
@@ -22108,8 +22106,7 @@ (define-public ptpython
(arguments
`(#:tests? #f)) ;there are no tests
(propagated-inputs
- (list python-appdirs python-black python-jedi python-prompt-toolkit
- python-pygments))
+ (list python-appdirs python-jedi python-prompt-toolkit python-pygments))
(home-page "https://github.com/jonathanslenders/ptpython")
(synopsis "Python Read-Eval-Print-Loop with nice IDE-like features")
(description
@@ -27291,7 +27288,7 @@ (define-public python-update-checker
(base32 "04yb5a9mi45ax50m2m0ih6gdvkk1j7gfmy83dd58i1f59axlabba"))))
(build-system python-build-system)
(propagated-inputs (list python-requests))
- (native-inputs (list python-black python-flake8 python-pytest))
+ (native-inputs (list python-flake8 python-pytest))
(home-page "https://github.com/bboe/update_checker")
(synopsis "Python module that will check for package updates")
(description "This package provides a Python module that will check for
@@ -31399,8 +31396,7 @@ (define-public python-eliot
(list python-boltons python-pyrsistent python-six
python-zope-interface))
(native-inputs
- (list python-black
- python-coverage
+ (list python-coverage
python-dask
python-flake8
python-hypothesis
@@ -34155,7 +34151,6 @@ (define-public python-minikanren
python-pytest
python-pytest-cov
python-pylint
- python-black
python-sympy
python-versioneer
python-coverage))
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 20cbb0b8bed..b564bd043cb 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2809,7 +2809,7 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-black python-mypy python-pyhamcrest python-twine
+ (list python-mypy python-pyhamcrest python-twine
python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
--
2.41.0
^ permalink raw reply related [relevance 61%]
* [bug#70855] [PATCH 90/92] gnu: python-cssselect2: Move to pyproject-build-system.
` (9 preceding siblings ...)
2024-05-09 22:54 70% ` [bug#70855] [PATCH 85/92] gnu: python-warcio: " Nicolas Graves via Guix-patches via
@ 2024-05-09 22:54 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:54 42% ` [bug#70855] [PATCH 92/92] build-system/pyproject: Add missing native-inputs Nicolas Graves via Guix-patches via
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:54 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-cssselect2):
[build-system]: Move to pyproject-build-system.
[arguments]<#:phases>: Remove uneeded 'check phase replacement.
Change-Id: I0bdcf546d24bd738d5c547c36faa91483408d1ab
---
gnu/packages/python-web.scm | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5f07b3cfc50..05413fd2e7e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5930,7 +5930,7 @@ (define-public python-cssselect2
(uri (pypi-uri "cssselect2" version))
(sha256
(base32 "1j2fcr217rsvkipsg6zjq03rl64rxnvb5hqqpx0dv58fhspvkywk"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -5941,11 +5941,7 @@ (define-public python-cssselect2
(("'pytest-flake8',") "")
(("'pytest-isort',") "")
(("--flake8") "")
- (("--isort") ""))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (lambda _ (invoke "pytest"))))))))
+ (("--isort") "")))))))
(propagated-inputs
(list python-tinycss2))
(native-inputs
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 85/92] gnu: python-warcio: Move to pyproject-build-system.
` (8 preceding siblings ...)
2024-05-09 22:54 70% ` [bug#70855] [PATCH 76/92] gnu: python-zope-i18nmessageid: " Nicolas Graves via Guix-patches via
@ 2024-05-09 22:54 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:54 70% ` [bug#70855] [PATCH 90/92] gnu: python-cssselect2: " Nicolas Graves via Guix-patches via
2024-05-09 22:54 42% ` [bug#70855] [PATCH 92/92] build-system/pyproject: Add missing native-inputs Nicolas Graves via Guix-patches via
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:54 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-warcio):
[build-system]: Move to pyproject-build-system.
[arguments]: Use <#:test-flags> instead of check phase replacement.
Change-Id: I7fd1ad51cddcbeb42c6aeeda552eb1a7bcd6e712
---
gnu/packages/python-web.scm | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c24a3daa2e1..5f07b3cfc50 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6631,24 +6631,18 @@ (define-public python-warcio
(sha256
(base32
"11afr6zy3r6rda81010iq496dazg4xid0izg3smg6ighpmvsnzf2"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
(list
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv"
- ;; These tests fail due to networking requirements.
- "-k" (format #f "not ~a"
- (string-join
- '("test_post_chunked"
- "test_remote"
- "test_capture_http_proxy"
- "test_capture_https_proxy"
- "test_capture_https_proxy_same_session")
- " and not ")))))))))
+ #:test-flags ; These tests fail due to networking requirements.
+ '(list "-k" (format #f "not ~a"
+ (string-join
+ '("test_post_chunked"
+ "test_remote"
+ "test_capture_http_proxy"
+ "test_capture_https_proxy"
+ "test_capture_https_proxy_same_session")
+ " and not ")))))
(native-inputs
;; These inputs are required for the test suite.
(list python-httpbin python-pytest-cov python-requests
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 92/92] build-system/pyproject: Add missing native-inputs.
` (10 preceding siblings ...)
2024-05-09 22:54 70% ` [bug#70855] [PATCH 90/92] gnu: python-cssselect2: " Nicolas Graves via Guix-patches via
@ 2024-05-09 22:54 42% ` Nicolas Graves via Guix-patches via
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:54 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/astronomy.scm (python-drms, python-spherical-geometry,
python-asdf-coordinates-schemacs, python-asdf-wcs-schemas, python-rad)
[native-inputs]: Add python-setuptools and python-wheel.
(python-casa-formats-io, python-tweakwcs)[native-inputs]: Add
python-setuptools.
* gnu/packages/bioinformatics.scm (python-ega-download-client)
[native-inputs]: Add python-setuptools and python-wheel.
* gnu/packages/databases.scm (datasette)[native-inputs]: Add
python-pip.
* gnu/packages/django.scm (python-django-localflavor,
python-django-contact-form)[native-inputs]: Add python-setuptools and
python-wheel.
* gnu/packages/graphviz.scm (python-uqbar)[native-inputs]: Add
python-setuptools and python-wheel.
* gnu/packages/jupyter.scm (python-jupyterlab-server)[native-inputs]:
Add python-wheel.
(python-nbstripout)[native-inputs]: Add python-setuptools and
python-wheel.
* gnu/packages/machine-learning.scm (python-captum,
python-linear-operator, python-gpytorch)[native-inputs]: Add
python-setuptools.
* gnu/packages/music.scm (abjad, abjad-ext-rmarkers,
abjed-ext-nauert, python-mutagen)[native-inputs]: Add
python-setuptools and python-wheel.
* gnu/packages/package-management.scm
(python-conda-package-handling)[native-inputs]: Add python-setuptools
and python-wheel.
(conda)[native-inputs]: Add python-wheel.
* gnu/packages/python-check.scm (python-pyinstrument,
python-pytest-testmon, python-pytest-trio, python-nbval,
python-pytest-toolbox)[native-inputs]: Add python-setuptools and
python-wheel.
(python-nptyping)[native-inputs]: Add python-setuptools.
* gnu/packages/python-check.scm (python-dask-expr)[native-inputs]:
Add python-setuptools and python-wheel.
* gnu/packages/python-web.scm (parfive, python-aioftp, python-hupper,
python-sanic, python-mechanicalsoup, python-tinycss, python-aiostream,
python-cbor2, gunicorn)[native-inputs]: Add python-setuptools and
python-wheel.
* gnu/packages/python-xyz.scm (python-apprise, python-jaraco-classes,
python-sparse, python-shtab, python-pyan3)[native-inputs]: Add
python-setuptools.
(python-jupytext, python-orderedmultidict, python-ukkonen,
python-identify, python-nodeenv, python-cfgv, python-zarr,
python-multipart, python-nbconvert, python-cram, python-immutables,
python-numpydoc, python-cairosvg, python-unidecode, python-black,
python-multidict, python-mpv-jsonipc, python-humanize,
python-cmd2)[native-inputs]: Add python-setuptools and python-wheel.
(python-partd, python-dask, python-zarr)[native-inputs]: Add
python-wheel.
(python-nbconvert)[propagated-inputs]: Add texlive-etoolbox. Remove
duplicate textlive-jknapltx.
(python-isort)[native-inputs]: Add python-pip.
* gnu/packages/simulation.scm (python-fenics-dijitso)[native-inputs]:
Add python-setuptools and python-wheel.
* gnu/packages/sphinx.scm (python-pydata-sphinx-theme,
python-sphinx-autodoc-typehints)[native-inputs]: Add
python-setuptools.
* gnu/packages/syndication.scm (tuir)[native-inputs]: Add
python-setuptools and python-wheel.
* gnu/packages/terminals.scm (python-halo)[native-inputs]: Add
python-setuptools and python-wheel.
* gnu/packages/time.scm (python-arrow, python-dateutil)
[native-inputs]: Add python-setuptools and python-wheel.
* gnu/packages/version-control.scm (pre-commit)[native-inputs]: Add
python-setuptools and python-wheel.
* gnu/packages/virtualization.scm (python-qemu-qmp,
python-transient)[native-inputs]: Add python-setuptools and
python-wheel.
* gnu/packages/xorg.scm (python-xcffib)[native-inputs]: Add
python-setuptools and python-wheel.
Change-Id: Id61cf8cdc47bd4c2871c0a9c8e9a5bfd51157df0
---
gnu/packages/astronomy.scm | 25 +++++++----
gnu/packages/bioinformatics.scm | 9 +++-
gnu/packages/databases.scm | 1 +
gnu/packages/django.scm | 2 +
gnu/packages/graphviz.scm | 4 +-
gnu/packages/jupyter.scm | 7 +++-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/music.scm | 10 ++---
gnu/packages/package-management.scm | 12 ++++--
gnu/packages/python-check.scm | 17 +++++---
gnu/packages/python-science.scm | 4 +-
gnu/packages/python-web.scm | 46 +++++++++++++++------
gnu/packages/python-xyz.scm | 64 +++++++++++++++++++----------
gnu/packages/simulation.scm | 2 +-
gnu/packages/sphinx.scm | 4 +-
gnu/packages/syndication.scm | 4 +-
gnu/packages/terminals.scm | 2 +-
gnu/packages/time.scm | 10 +++--
gnu/packages/version-control.scm | 2 +
gnu/packages/virtualization.scm | 9 ++--
gnu/packages/xorg.scm | 4 +-
21 files changed, 169 insertions(+), 73 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index de5193d9b83..32c6f30e8f6 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -2041,7 +2041,8 @@ (define-public python-casa-formats-io
(lambda _
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-openfiles))
+ (list python-pytest python-pytest-cov python-pytest-openfiles
+ python-setuptools))
(propagated-inputs
(list python-astropy python-click python-dask python-numpy))
(home-page "https://casa-formats-io.readthedocs.io/")
@@ -2254,9 +2255,11 @@ (define-public python-drms
(build-system pyproject-build-system)
(native-inputs
(list python-astropy
- python-pytest-astropy
python-pytest
- python-setuptools-scm))
+ python-pytest-astropy
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(propagated-inputs (list python-numpy python-pandas))
(home-page "https://sunpy.org")
(synopsis "Access astronomical HMI, AIA and MDI data with Python")
@@ -3230,7 +3233,9 @@ (define-public python-spherical-geometry
(native-inputs
(list python-pytest
python-pytest-astropy-header
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(inputs
(list qd))
(propagated-inputs
@@ -4607,6 +4612,7 @@ (define-public python-tweakwcs
python-pytest
python-pytest-cov
python-scipy
+ python-setuptools
python-setuptools-scm))
(home-page "https://tweakwcs.readthedocs.io/en/latest/")
(synopsis
@@ -4800,7 +4806,9 @@ (define python-asdf-coordinates-schemas
(native-inputs
(list python-pytest
python-pytest-xdist
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(propagated-inputs
(list python-asdf))
(home-page "https://github.com/asdf-format/asdf-coordinates-schemas")
@@ -4986,7 +4994,9 @@ (define python-asdf-wcs-schemas
(list python-asdf
python-pytest
python-pytest-openfiles
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(propagated-inputs
(list python-asdf-coordinates-schemas
python-asdf-standard
@@ -5053,7 +5063,8 @@ (define-public python-rad
;; python-rad -> python-roman-datamodels -> python-crds -> python-rad
#:test-flags #~(list "--ignore=tests/test_schemas.py")))
(native-inputs
- (list python-pytest python-setuptools-scm))
+ (list python-pytest python-setuptools
+ python-setuptools-scm python-wheel))
(propagated-inputs (list python-asdf python-asdf-astropy))
(home-page "https://github.com/spacetelescope/rad")
(synopsis "Roman Attribute Dictionary")
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 47cca108658..a611caf715a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2771,8 +2771,13 @@ (define-public python-ega-download-client
(("==") ">=")))))))
(propagated-inputs (list python-htsget python-psutil python-requests
python-tqdm python-urllib3))
- (native-inputs (list python-coverage python-pytest python-pyfakefs
- python-responses python-mock))
+ (native-inputs (list python-coverage
+ python-mock
+ python-pyfakefs
+ python-pytest
+ python-responses
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/EGA-archive/ega-download-client")
(synopsis "EGA download client")
(description "PyEGA3 is a tool for viewing and downloading files from
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index a3a550c40c3..67e6ced7c32 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5571,6 +5571,7 @@ (define-public datasette
(list python-beautifulsoup4
python-black
python-cogapp
+ python-pip
python-pytest
python-pytest-asyncio
python-pytest-runner
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 21099f0ff0f..4a271eaf0b5 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -294,6 +294,8 @@ (define-public python-django-localflavor
(if tests?
(apply invoke "python" "-m" "django" "test" test-flags)
(format #t "test suite not run~%")))))))
+ (native-inputs
+ (list python-setuptools python-wheel))
(propagated-inputs
(list python-django python-stdnum))
(home-page "https://django-localflavor.readthedocs.io/en/latest/")
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index 2c23b6abd5c..db40b99928a 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -221,7 +221,9 @@ (define-public python-uqbar
python-isort
python-mypy
python-pytest
- python-pytest-cov))
+ python-pytest-cov
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-black python-sphinx-5 python-unidecode
(package/inherit python-sphinx-rtd-theme
diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm
index cf3fa509966..e2bef079ba0 100644
--- a/gnu/packages/jupyter.scm
+++ b/gnu/packages/jupyter.scm
@@ -409,7 +409,8 @@ (define-public python-jupyterlab-server
python-requests-mock
python-ruamel.yaml
python-strict-rfc3339
- python-werkzeug))
+ python-werkzeug
+ python-wheel))
(home-page "https://jupyter.org")
(synopsis "Server components for JupyterLab applications")
(description "JupyterLab Server sits between JupyterLab and Jupyter
@@ -819,7 +820,9 @@ (define-public python-nbstripout
(list python-pytest
python-pytest-cram
python-pytest-flake8
- python-pytest-runner))
+ python-pytest-runner
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/kynan/nbstripout")
(synopsis "Strips outputs from Jupyter and IPython notebooks")
(description
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 21d58d9aae9..ba6f51b3f11 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -4535,7 +4535,7 @@ (define-public python-captum
python-parameterized
python-pytest
python-pytest-cov
- python-scikit-learn))
+ python-setuptools))
(home-page "https://captum.ai")
(synopsis "Model interpretability for PyTorch")
(description "Captum is a model interpretability and understanding library
@@ -5114,6 +5114,7 @@ (define-public python-linear-operator
(native-inputs (list python-flake8
python-flake8-print
python-pytest
+ python-setuptools
python-setuptools-scm
python-twine))
(home-page "https://github.com/cornellius-gp/linear_operator/")
@@ -5146,6 +5147,7 @@ (define-public python-gpytorch
python-flake8-print
python-nbval
python-pytest
+ python-setuptools
python-twine))
(home-page "https://gpytorch.ai")
(synopsis "Implementation of Gaussian Processes in PyTorch")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 37fe94b56de..6b765dcb3d6 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1698,7 +1698,7 @@ (define-public abjad
(inputs
(list lilypond))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-quicktions
python-ply
@@ -1730,7 +1730,7 @@ (define-public abjad-ext-rmakers
(base32 "1y8s55b4mlsigm0xkk6qjpp08c75rv0swvjp0lj3cs6lgqdjxdjl"))))
(build-system pyproject-build-system)
(native-inputs
- (list lilypond python-pytest))
+ (list lilypond python-pytest python-setuptools python-wheel))
(propagated-inputs
(list abjad))
(home-page "https://abjad.github.io")
@@ -1755,7 +1755,7 @@ (define-public abjad-ext-nauert
(base32 "0j4pf4h27jm3df0dn2rwkdx6zqcxvr7pqchbaa9rffz7q4hbakmf"))))
(build-system pyproject-build-system)
(native-inputs
- (list lilypond python-pytest))
+ (list lilypond python-pytest python-setuptools python-wheel))
(propagated-inputs
(list abjad))
(home-page "https://abjad.github.io")
@@ -3978,8 +3978,8 @@ (define-public python-mutagen
(("( +)@given" all spaces)
(string-append spaces "@settings(deadline=None)\n" all))))))))
(native-inputs
- (list python-pytest python-hypothesis python-flake8))
- (home-page "https://mutagen.readthedocs.io/")
+ (list python-pytest python-hypothesis python-flake8
+ python-setuptools python-wheel))
(synopsis "Read and write audio tags")
(description "Mutagen is a Python module to handle audio metadata. It
supports ASF, FLAC, M4A, Monkey’s Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 949c42e274b..feed16ebcef 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1143,8 +1143,13 @@ (define-public python-conda-package-handling
(inputs
(list libarchive))
(native-inputs
- (list python-cython python-pytest python-pytest-cov
- python-pytest-mock python-mock))
+ (list python-cython
+ python-mock
+ python-pytest
+ python-pytest-cov
+ python-pytest-mock
+ python-setuptools
+ python-wheel))
(home-page "https://conda.io")
(synopsis "Create and extract conda packages of various formats")
(description
@@ -1284,7 +1289,8 @@ (define-public conda
(list python-coverage
python-flaky
python-pytest-timeout
- python-pytest-xprocess))
+ python-pytest-xprocess
+ python-wheel))
(home-page "https://github.com/conda/conda")
(synopsis "Cross-platform, OS-agnostic, system-level binary package manager")
(description
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 46c8b3414e4..5571cee2088 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -377,7 +377,9 @@ (define-public python-pyinstrument
python-greenlet
python-pytest
python-pytest-asyncio
- python-pytest-trio))
+ python-pytest-trio
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/joerick/pyinstrument")
(synopsis "Call stack profiler for Python")
(description
@@ -1169,7 +1171,8 @@ (define-public python-pytest-testmon
(base32 "01qhbkb3n8c5c4id94w6b06q9wb7b6a33mqwyrkdfzk5pzv1gcyd"))))
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;there are none
- (native-inputs (list python-coverage python-pytest))
+ (native-inputs (list python-coverage python-pytest
+ python-setuptools python-wheel))
(home-page "https://github.com/tarpas/pytest-testmon")
(synopsis "Selects tests affected by changed files and methods")
(description
@@ -1198,7 +1201,8 @@ (define-public python-pytest-trio
;; No keyboard interrupt in our build environment.
" and not test_actual_test"))))
(native-inputs
- (list python-hypothesis python-pytest python-pytest-cov))
+ (list python-hypothesis python-pytest python-pytest-cov
+ python-setuptools python-wheel))
(propagated-inputs
(list python-async-generator python-outcome python-pytest python-trio))
(home-page "https://github.com/python-trio/pytest-trio")
@@ -1487,7 +1491,8 @@ (define-public python-pytest-toolbox
(substitute* "setup.cfg"
((".*timeout.*") ""))))))))
(native-inputs
- (list python-pydantic python-pytest python-pytest-isort))
+ (list python-pydantic python-pytest python-pytest-isort
+ python-setuptools python-wheel))
(home-page "https://github.com/samuelcolvin/pytest-toolbox")
(synopsis "Numerous useful plugins for Pytest")
(description
@@ -1585,7 +1590,8 @@ (define-public python-nbval
(delete-file "tests/\
ipynb-test-samples/test-latex-pass-correctouput.ipynb"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-sympy))
+ (list python-pytest python-pytest-cov python-setuptools python-sympy
+ python-wheel))
(propagated-inputs
(list python-ipykernel python-jupyter-client python-nbformat
python-six python-coverage))
@@ -2062,6 +2068,7 @@ (define-public python-nptyping
(native-inputs
(list python-beartype
python-mypy
+ python-setuptools
python-typeguard
python-wheel))
(propagated-inputs (list python-numpy python-typing-extensions))
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index dd4cffea8e1..f82feab0963 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -2157,7 +2157,9 @@ (define-public python-dask-expr
;; package without creating a mutually recursive dependency.
(list python-dask/bootstrap
python-pytest
- python-versioneer))
+ python-setuptools
+ python-versioneer
+ python-wheel))
(home-page "https://github.com/dask/dask-expr")
(synopsis "Dask DataFrames with query optimization")
(description "This is a rewrite of Dask DataFrame that includes query
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 05413fd2e7e..61ea8a63558 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -684,10 +684,12 @@ (define-public python-aiostream
"0l2ijb7yk0820wiyf6zrzx8fhzf8925an7r06mcaw3in1mr6rssq"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest
+ (list python-setuptools
+ python-pytest
python-pytest-asyncio
python-pytest-cov
- python-pytest-runner))
+ python-pytest-runner
+ python-wheel))
(home-page "https://github.com/vxgmichel/aiostream")
(synopsis "Generator-based operators for asynchronous iteration")
(description "@code{aiostream} provides a collection of stream operators that can
@@ -1001,7 +1003,11 @@ (define-public python-cbor2
(sha256
(base32 "15y78xcc3zkmvj1mdzz8gyhf3apbl91073kwhzbjk5abc1civwlw"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest python-pytest-cov python-setuptools-scm))
+ (native-inputs (list python-pytest
+ python-pytest-cov
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/agronholm/cbor2")
(synopsis "Concise Binary Object Representation (CBOR) (de)serializer")
(description "This Python library provides encoding and decoding for the
@@ -1407,7 +1413,9 @@ (define-public parfive
python-pytest-cov
python-pytest-localserver
python-pytest-socket
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(home-page "https://parfive.readthedocs.io/")
(synopsis "HTTP and FTP parallel file downloader")
(description
@@ -1594,7 +1602,9 @@ (define-public python-mechanicalsoup
python-pytest-httpbin
python-pytest-mock
python-pytest-runner
- python-requests-mock))
+ python-requests-mock
+ python-setuptools
+ python-wheel))
(home-page "https://mechanicalsoup.readthedocs.io/")
(synopsis "Python library for automating website interaction")
(description
@@ -3813,9 +3823,13 @@ (define-public python-aioftp
(base32
"0w621mg956m9rn7v39jpwi4gpnpl90pprwl29cp640dahqqv38ms"))))
(build-system pyproject-build-system)
- (native-inputs (list python-async-timeout python-pytest
- python-pytest-asyncio python-pytest-cov
- python-trustme))
+ (native-inputs (list python-async-timeout
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-setuptools
+ python-trustme
+ python-wheel))
(propagated-inputs (list python-siosocks))
(home-page "https://aioftp.readthedocs.io/")
(synopsis "FTP client/server for asyncio in Python")
@@ -5874,7 +5888,7 @@ (define-public python-tinycss
'(list "-k" "not test_speedups")))
(native-inputs
(list python-pytest-cov python-pytest-flake8 python-pytest-isort
- python-pytest-runner))
+ python-pytest-runner python-setuptools python-wheel))
(home-page "https://tinycss.readthedocs.io/")
(synopsis "Complete yet simple CSS parser for Python")
(description
@@ -6074,6 +6088,7 @@ (define-public gunicorn
python-pytest-cov
python-sphinx
texinfo))
+ (propagated-inputs (list python-packaging python-setuptools python-wheel))
(home-page "https://gunicorn.org/")
(synopsis "Python WSGI HTTP Server for UNIX")
(description "Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP
@@ -6866,8 +6881,13 @@ (define-public python-hupper
(build-system python-build-system)
(arguments '(#:test-target "pytest"))
(native-inputs
- (list python-pytest python-pytest-runner python-watchdog python-mock
- python-pytest-cov))
+ (list python-mock
+ python-pytest
+ python-pytest-cov
+ python-pytest-runner
+ python-setuptools
+ python-watchdog
+ python-wheel))
(propagated-inputs
(list python-pytz))
(home-page "https://readthedocs.org/projects/hupper")
@@ -7618,11 +7638,13 @@ (define-public python-sanic
python-pytest-benchmark
python-pytest-sanic
python-sanic-testing
+ python-setuptools
python-slotscheck
python-towncrier
python-tox
python-types-ujson
- python-uvicorn))
+ python-uvicorn
+ python-wheel))
(home-page "https://github.com/sanic-org/sanic/")
(synopsis "Async Python web server/framework")
(description
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 614ff9b23c3..3f86ea8224b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -326,6 +326,7 @@ (define-public python-apprise
python-pytest-cov
python-pytest-mock
python-pytest-xdist
+ python-setuptools
python-wheel))
(arguments
(list
@@ -483,8 +484,10 @@ (define-public python-jupytext
python-isort
python-ipython-genutils
python-jupyter-server
+ python-pyaml
python-pytest
- python-pyaml))
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-markdown-it-py
python-mdit-py-plugins
@@ -5957,6 +5960,7 @@ (define-public python-unidecode
(base32
"1x620s4dk4d501pivhlfzbi2d1r5fnm9cssqwkn76f7d8sfk9nyg"))))
(build-system pyproject-build-system)
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://pypi.org/project/Unidecode/")
(synopsis "ASCII transliterations of Unicode text")
(description
@@ -8260,7 +8264,8 @@ (define-public python-black
python-typed-ast
python-typing-extensions))
(native-inputs
- (list python-pytest python-pytest-aiohttp python-setuptools-scm))
+ (list python-pytest python-pytest-aiohttp python-setuptools
+ python-setuptools-scm python-wheel))
(home-page "https://github.com/psf/black")
(synopsis "The uncompromising code formatter")
(description "Black is the uncompromising Python code formatter.")
@@ -8734,7 +8739,7 @@ (define-public python-sparse
(list python-numba python-numpy python-scipy))
(native-inputs
(list python-dask python-importlib-metadata python-pytest
- python-pytest-black python-pytest-cov))
+ python-pytest-black python-pytest-cov python-setuptools))
(home-page "https://github.com/pydata/sparse/")
(synopsis "Library for multi-dimensional sparse arrays")
(description
@@ -9189,7 +9194,9 @@ (define-public python-numpydoc
;; TODO: unclear why these fail.
"-k" "not test_MyClass and not test_my_function")))
(propagated-inputs (list python-jinja2 python-sphinx))
- (native-inputs (list python-matplotlib python-pytest python-pytest-cov))
+ (native-inputs
+ (list python-matplotlib python-pytest python-pytest-cov
+ python-setuptools python-wheel))
(home-page "https://pypi.org/project/numpydoc/")
(synopsis "Numpy's Sphinx extensions")
(description "Sphinx extension to support docstrings in Numpy format.")
@@ -9908,7 +9915,7 @@ (define-public python-multidict
"1kjrxav572j45xvr1iy60zb2g8zqvrinzdkl4ax36js4vczckl8d"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov))
+ (list python-pytest python-pytest-cov python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/multidict/")
(synopsis "Multidict implementation")
(description "Multidict is dict-like collection of key-value pairs
@@ -9929,7 +9936,7 @@ (define-public python-orderedmultidict
(propagated-inputs
(list python-six))
(native-inputs
- (list python-flake8 python-pycodestyle))
+ (list python-flake8 python-pycodestyle python-setuptools python-wheel))
(home-page "https://github.com/gruns/orderedmultidict")
(synopsis "Python Ordered Multivalue Dictionary - omdict")
(description "This package contains a library for ordered multivalue
@@ -11711,6 +11718,7 @@ (define-public python-jaraco-classes
python-pytest-cov
python-pytest-flake8
python-pytest-mypy
+ python-setuptools
python-setuptools-scm
python-wheel))
(propagated-inputs (list python-more-itertools))
@@ -15114,7 +15122,7 @@ (define-public python-cram
(invoke "make" "test"))))))
(build-system python-build-system)
(native-inputs
- (list python-coverage which))
+ (list python-coverage python-setuptools python-wheel which))
(synopsis "Simple testing framework for command line applications")
(description
"Cram is a functional testing framework for command line applications.
@@ -15858,8 +15866,9 @@ (define-public python-immutables
(uri (pypi-uri "immutables" version))
(sha256
(base32 "1x4cinh0xbl6p6p2yfm2s07mxxy3lf0zzai9gqpydk4482bwfdjk"))))
- (build-system python-build-system)
- (native-inputs (list python-mypy python-pytest))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-mypy python-pytest
+ python-setuptools python-wheel))
(home-page "https://github.com/MagicStack/immutables")
(synopsis "High-performance immutable mapping type for Python")
(description
@@ -17494,6 +17503,7 @@ (define-public python-nbconvert
texlive-collection-basic
texlive-enumitem
texlive-environ
+ texlive-etoolbox
texlive-eurosym
texlive-etoolbox
texlive-fancyvrb
@@ -17504,7 +17514,6 @@ (define-public python-nbconvert
texlive-hyperref
texlive-infwarerr
texlive-jknapltx
- texlive-jknapltx
texlive-kvoptions
texlive-lm
texlive-lm-math
@@ -24199,6 +24208,7 @@ (define-public python-isort
python-hypothesmith
python-libcst-minimal
python-natsort
+ python-pip
python-poetry-core
python-pylama
python-pypa-build
@@ -26954,6 +26964,7 @@ (define-public python-mpv-jsonipc
(sha256
(base32 "0ymdwrx544a6gn6wm9dixpgzbfrbpxvcj5ys7m41cgb4lvpvx691"))))
(build-system pyproject-build-system)
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/iwalton3/python-mpv-jsonipc")
(synopsis "Python API to control MPV using JSON IPC")
(description "Python MPV JSONIPC implements an interface similar to
@@ -27569,7 +27580,7 @@ (define-public python-ukkonen
(sha256
(base32 "17gspl2dsykg000275svvyam4k7wz9ypi9xrfrmsgcgryczravlc"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-cffi))
(home-page "https://github.com/asottile/ukkonen")
(synopsis "Implementation of bounded Levenshtein distance (Ukkonen)")
@@ -27598,7 +27609,8 @@ (define-public python-identify
;; system-error "utime" "~A" ("No such file or directory")
(delete 'ensure-no-mtimes-pre-1980))))
(native-inputs
- (list python-coverage python-pytest python-ukkonen))
+ (list python-coverage python-pytest python-setuptools
+ python-ukkonen python-wheel))
(propagated-inputs
(list python-editdistance))
(home-page "https://github.com/chriskuehl/identify")
@@ -27694,7 +27706,8 @@ (define-public python-nodeenv
"not test_smoke"
" and not test_smoke_n_system_special_chars"))))
(native-inputs
- (list python-coverage python-mock python-pytest))
+ (list python-coverage python-mock python-pytest
+ python-setuptools python-wheel))
(home-page "https://ekalinin.github.io/nodeenv/")
(synopsis "Create isolated node.js environments")
(description
@@ -27795,7 +27808,7 @@ (define-public python-cfgv
(base32 "0g7jg6dssyax6k85lk8afs8qdzgq138g6ij0jmmhgdv5fzks6k9z"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/asottile/cfgv")
(synopsis "Configuration validation library")
(description
@@ -28004,7 +28017,8 @@ (define-public python-zarr
python-pytest-doctestplus
python-pytest-timeout
python-pytest-xdist
- python-setuptools-scm))
+ python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/zarr-developers/zarr-python")
(synopsis "Chunked, compressed, N-dimensional arrays for Python")
(description
@@ -28438,7 +28452,7 @@ (define-public python-partd
(build-system pyproject-build-system)
(propagated-inputs
(list python-locket python-numpy python-pandas python-pyzmq python-toolz))
- (native-inputs (list python-setuptools))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/dask/partd/")
(synopsis "Appendable key-value storage")
(description "Partd stores key-value pairs. Values are raw bytes. We
@@ -28588,7 +28602,8 @@ (define-public python-dask
python-pytest-rerunfailures
python-pytest-runner
python-pytest-xdist
- python-versioneer))
+ python-versioneer
+ python-wheel))
(home-page "https://github.com/dask/dask/")
(synopsis "Parallel computing with task scheduling")
(description
@@ -29164,7 +29179,7 @@ (define-public python-humanize
"006vpl19bffy9fn0sssxbfakcvgrx7fhvy6l515fzln7vwpqf7zf"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-freezegun python-pytest))
+ (list python-freezegun python-setuptools python-pytest python-wheel))
(home-page "https://github.com/jmoiron/humanize")
(synopsis "Print numerical information in a human-readable form")
(description "This package provides a Python module that displays numbers
@@ -29681,7 +29696,8 @@ (define-public python-cairosvg
(list python-cairocffi python-cssselect2 python-defusedxml
python-pillow python-tinycss2))
(native-inputs
- (list python-pytest-flake8 python-pytest-isort python-pytest-runner))
+ (list python-pytest-flake8 python-pytest-isort python-pytest-runner
+ python-setuptools python-wheel))
(home-page "https://cairosvg.org/")
(synopsis "SVG to PDF/PS/PNG converter based on Cairo")
(description "CairoSVG is a SVG converter based on Cairo. It can export
@@ -31724,7 +31740,9 @@ (define-public python-cmd2
python-pytest
python-pytest-cov
python-pytest-mock
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/python-cmd2/cmd2")
(synopsis "Tool for building interactive command line applications")
(description
@@ -33993,7 +34011,7 @@ (define-public python-pyan3
"python-pyan3-fix-absolute-path-bug.patch"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-wheel))
+ (list python-pytest python-pytest-cov python-setuptools python-wheel))
(propagated-inputs
(list python-jinja2))
(home-page "https://github.com/Technologicat/pyan")
@@ -35495,7 +35513,8 @@ (define-public python-multipart
"0hzshd665rl1bkwvaj9va4j3gs8nmb478fbvligx20663xhmzfzp"))))
(build-system python-build-system)
(propagated-inputs (list python-six))
- (native-inputs (list python-pyyaml python-mock python-pytest-cov))
+ (native-inputs (list python-mock python-pytest python-pytest-cov
+ python-pyyaml python-setuptools python-wheel))
(arguments
`(#:phases (modify-phases %standard-phases
;; There is a bug in the test_suit specification.
@@ -35583,6 +35602,7 @@ (define-public python-shtab
python-pytest
python-pytest-cov
python-pytest-timeout
+ python-setuptools
python-setuptools-scm
python-wheel))
(home-page "https://github.com/iterative/shtab")
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index ed029efeac1..99c0a121dde 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -577,7 +577,7 @@ (define-public python-fenics-dijitso
(inputs
(list openmpi python-numpy))
(native-inputs
- (list python-pytest-cov))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-mpi4py))
(arguments
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index e6668146849..c86ef1e5615 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -1153,9 +1153,11 @@ (define-public python-sphinx-autodoc-typehints
(native-inputs
(list python-nptyping
python-pytest
+ python-setuptools
python-setuptools-scm
python-sphobjinv
- python-typing-extensions))
+ python-typing-extensions
+ python-wheel))
(home-page "https://pypi.org/project/sphinx-autodoc-typehints/")
(synopsis "Type hints for the Sphinx autodoc extension")
(description "This extension allows you to use Python 3 annotations for
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index d986e049ccf..a2d8c61be45 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -474,7 +474,9 @@ (define-public tuir
python-mock
python-pylint
python-pytest
- python-vcrpy))
+ python-vcrpy
+ python-setuptools
+ python-wheel))
(home-page "https://gitlab.com/ajak/tuir")
(synopsis "Terminal viewer for Reddit (Terminal UI for Reddit)")
(description
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 203254490ef..98a6bf6684a 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -1197,7 +1197,7 @@ (define-public python-halo
(propagated-inputs (list python-colorama python-log-symbols python-six
python-spinners python-termcolor))
(native-inputs (list python-coverage python-nose python-pylint python-tox
- python-twine))
+ python-twine python-setuptools python-wheel))
(home-page "https://github.com/manrajgrover/halo")
(synopsis "Python library to display graphical spinners in the terminal")
(description "Halo is a Python library to display graphical spinners in
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 552ac346c4a..d91058b378f 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -252,7 +252,8 @@ (define-public python-dateutil
;; XXX: Fails to get timezone from /etc/localtime.
"--ignore=dateutil/test/test_tz.py")))
(native-inputs
- (list python-pytest python-pytest-cov python-setuptools-scm))
+ (list python-pytest python-pytest-cov python-setuptools
+ python-setuptools-scm python-wheel))
(propagated-inputs
(list python-six))
(home-page "https://dateutil.readthedocs.io/en/stable/")
@@ -508,13 +509,14 @@ (define-public python-arrow
;; Remove when python-dateutil > 2.8.1.
"-k" "not test_parse_tz_name_zzz")))
(native-inputs
- (list ;; For testing
- python-chai
+ (list python-chai
python-pytest
python-pytest-cov
python-pytest-mock
python-pytz
- python-simplejson))
+ python-setuptools
+ python-simplejson
+ python-wheel))
(propagated-inputs
(list python-dateutil))
(home-page "https://github.com/arrow-py/arrow")
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 226bcd4ad63..bccc219f679 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2069,6 +2069,8 @@ (define-public pre-commit
python-pytest
python-pytest-env
python-re-assert
+ python-setuptools
+ python-wheel
which))
;; Propagate because pre-commit is also used as a module.
(propagated-inputs
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 5f1148b7430..20cbb0b8bed 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -2030,10 +2030,12 @@ (define-public python-qemu-qmp
(format #t "test suite not run~%")))))))
(native-inputs
(list python-avocado-framework
- python-setuptools-scm
python-flake8
python-isort
- python-pylint))
+ python-pylint
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(propagated-inputs
(list python-pygments
python-urwid
@@ -2807,7 +2809,8 @@ (define-public python-transient
python-requests
python-toml))
(native-inputs
- (list python-black python-mypy python-pyhamcrest python-twine))
+ (list python-black python-mypy python-pyhamcrest python-twine
+ python-setuptools python-wheel))
(home-page "https://github.com/ALSchwalm/transient")
(synopsis "QEMU Wrapper written in Python")
(description
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6c894fc45bf..f2fbec1b23d 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -109,6 +109,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
@@ -1740,7 +1741,8 @@ (define-public python-xcffib
(source (package-source xcffibgen))
(build-system pyproject-build-system)
(native-inputs
- (list pkg-config which xcb-proto xcffibgen))
+ (list pkg-config python-setuptools python-wheel
+ which xcb-proto xcffibgen))
(inputs
(list libxcb))
(propagated-inputs
--
2.41.0
^ permalink raw reply related [relevance 42%]
* [bug#70855] [PATCH 76/92] gnu: python-zope-i18nmessageid: Move to pyproject-build-system.
` (7 preceding siblings ...)
2024-05-09 22:53 70% ` [bug#70855] [PATCH 40/92] gnu: python-flask-login: " Nicolas Graves via Guix-patches via
@ 2024-05-09 22:54 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:54 70% ` [bug#70855] [PATCH 85/92] gnu: python-warcio: " Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:54 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-zope-i18nmessageid):
[build-system]: Move to pyproject-build-system.
[native-inputs]: Add python-setuptools and python-wheel.
Change-Id: Ia9e142a53721bb6d7495d87b59d5f4f3b3f77bf2
---
gnu/packages/python-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4d3fc75bb3c..c24a3daa2e1 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3123,9 +3123,10 @@ (define-public python-zope-i18nmessageid
(uri (pypi-uri "zope.i18nmessageid" version))
(sha256
(base32 "14mx62khys82p2gmmf3m40x4jmvcz3rndvl6qik2n2qfp13n7ds7"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-zope-testrunner))
+ (list python-coverage python-setuptools
+ python-wheel python-zope-testrunner))
(propagated-inputs
(list python-six))
(home-page "https://pypi.org/project/zope.i18nmessageid/")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system.
` (4 preceding siblings ...)
2024-05-09 22:53 70% ` [bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0 Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 37/92] gnu: python-tinycss: " Nicolas Graves via Guix-patches via
` (5 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-cbor2):
[build-system]: Move to pyproject-build-system.
[arguments]: Remove uneeded field.
Change-Id: I2e27fa48950aa9d10e140bfbdc12df3d22661282
---
gnu/packages/python-web.scm | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dc868102572..aa04a02bad5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1000,15 +1000,7 @@ (define-public python-cbor2
(uri (pypi-uri "cbor2" version))
(sha256
(base32 "15y78xcc3zkmvj1mdzz8gyhf3apbl91073kwhzbjk5abc1civwlw"))))
- (build-system python-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
+ (build-system pyproject-build-system)
(native-inputs (list python-pytest python-pytest-cov python-setuptools-scm))
(home-page "https://github.com/agronholm/cbor2")
(synopsis "Concise Binary Object Representation (CBOR) (de)serializer")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 40/92] gnu: python-flask-login: Move to pyproject-build-system.
` (6 preceding siblings ...)
2024-05-09 22:53 70% ` [bug#70855] [PATCH 37/92] gnu: python-tinycss: " Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:54 70% ` [bug#70855] [PATCH 76/92] gnu: python-zope-i18nmessageid: " Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-flask-login):
[build-system]: Move to pyproject-build-system.
[arguments]: Remove uneeded field.
Change-Id: I9f3abb36b642ad2860c68f13f9d9e8b8b5f40811
---
gnu/packages/python-web.scm | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 88dc08c18f6..4d3fc75bb3c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4856,14 +4856,7 @@ (define-public python-flask-login
(file-name (git-file-name name version))
(sha256
(base32 "12yw01ccgjn9c88cbkrd6k1ykjxd8fxip2b1isvxjirphnlqhn9g"))))
- (build-system python-build-system)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv" "-c" "/dev/null")))))))
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-flask))
(native-inputs
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 25/92] gnu: gunicorn: Move to pyproject-build-system.
` (2 preceding siblings ...)
2024-05-09 22:53 70% ` [bug#70855] [PATCH 19/92] gnu: python-apiron: Move to pyproject-build-system Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 61% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0 Nicolas Graves via Guix-patches via
` (7 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (gunicorn): Improve package style.
[build-system]: Move to pyproject-build-system.
[arguments]<#:phases>: Remove check phase replacement, now in
<#:test-flags>. Use gexp. Remove wrap phase replacement (will not be
needed after merge of 25235).
Change-Id: I83e09cd0a22c0a5d249e50af199c5c648e53aa65
---
gnu/packages/python-web.scm | 41 ++++++++++---------------------------
1 file changed, 11 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fd9d49e2e2f..494b11422f3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6064,29 +6064,25 @@ (define-public gunicorn
(base32
"1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0"))))
(outputs '("out" "doc"))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
+ (list
+ #:test-flags '(list
+ ;; Disable the geventlet tests because eventlet uses
+ ;; dnspython, which does not work in the build
+ ;; container due to lack of /etc/resolv.conf, etc.
+ "--ignore=tests/workers/test_geventlet.py")
+ #:phases
+ #~(modify-phases %standard-phases
(add-after 'build 'build-doc
(lambda _
(invoke "make" "-C" "docs" "PAPER=a4" "html" "info")
(delete-file "docs/build/texinfo/Makefile")
(delete-file "docs/build/texinfo/Gunicorn.texi")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (if tests?
- (begin
- (invoke "pytest" "-vv"
- ;; Disable the geventlet tests because eventlet uses
- ;; dnspython, which does not work in the build
- ;; container due to lack of /etc/resolv.conf, etc.
- "--ignore=tests/workers/test_geventlet.py"))
- (format #t "test suite not run~%"))))
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((doc (string-append (assoc-ref outputs "doc")
- "/share/doc/" ,name "-" ,version))
+ "/share/doc/" #$name "-" #$version))
(html (string-append doc "/html"))
(info (string-append doc "/info"))
(examples (string-append doc "/examples")))
@@ -6098,22 +6094,7 @@ (define-public gunicorn
(copy-recursively "examples" examples)
(for-each (lambda (file)
(copy-file file (string-append doc "/" file)))
- '("README.rst" "NOTICE" "LICENSE" "THANKS")))))
- ;; XXX: The wrap phase includes native inputs on PYTHONPATH, (see
- ;; <https://bugs.gnu.org/25235>), leading to an inflated closure
- ;; size. Override it to only add the essential entries.
- (replace 'wrap
- (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (python (assoc-ref (or native-inputs inputs) "python"))
- (sitedir (string-append "/lib/python"
- (python-version python)
- "/site-packages")))
- (wrap-program (string-append out "/bin/gunicorn")
- `("PYTHONPATH" ":" prefix
- ,(map (lambda (output)
- (string-append output sitedir))
- (list python out))))))))))
+ '("README.rst" "NOTICE" "LICENSE" "THANKS"))))))))
(native-inputs
(list binutils ;; for ctypes.util.find_library()
python-aiohttp
--
2.41.0
^ permalink raw reply related [relevance 61%]
* [bug#70855] [PATCH 19/92] gnu: python-apiron: Move to pyproject-build-system.
2024-05-09 22:53 70% ` [bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1 Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 61% ` [bug#70855] [PATCH 25/92] gnu: gunicorn: " Nicolas Graves via Guix-patches via
` (8 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-apiron):
[build-system]: Move to pyproject-build-system.
[arguments]<#:phases>: Replace field with <#:test-flags>.
Change-Id: I04bb9739b6356fd50fc07ae54838764d51ed22d6
---
gnu/packages/python-web.scm | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 73f26bb9528..fd9d49e2e2f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3554,16 +3554,9 @@ (define-public python-apiron
(uri (pypi-uri "apiron" version))
(sha256
(base32 "1qwbqn47sf0aqznj1snbv37v8ijx476qqkjf5l9pac7xjkxsr8qk"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (add-installed-pythonpath inputs outputs)
- (invoke "pytest" "-vv" "--cov" "-k"
- ;; This test tries to connect to the internet.
- "not test_call"))))))
+ (list #:test-flags '(list "-k" "not test_call")))
(propagated-inputs
(list python-requests))
(native-inputs
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0.
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1 Nicolas Graves via Guix-patches via
` (10 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-http-ece): Update to 1.2.0.
Change-Id: I8d82959841b64db48eb01b88914298ba12f1a388
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3cebbbbe739..11fa240350c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7330,7 +7330,7 @@ (define-public python-js2py
(define-public python-http-ece
(package
(name "python-http-ece")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method git-fetch)
@@ -7340,7 +7340,7 @@ (define-public python-http-ece
(file-name (git-file-name name version))
(sha256
(base32
- "0bp4cc0xc123i72h80ax3qz3ixfwx3j7pw343kc7i6kdvfi8klx7"))))
+ "11v9cpmx4jc0nk25af96plzjz3mg1ysm1m001nx6jns06hil1gpy"))))
(build-system python-build-system)
(arguments
`(#:phases
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0.
` (3 preceding siblings ...)
2024-05-09 22:53 61% ` [bug#70855] [PATCH 25/92] gnu: gunicorn: " Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system Nicolas Graves via Guix-patches via
` (6 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (gunicorn): Update to 21.2.0.
Change-Id: Ia9931763ff45ee8e3f925ce54c20bce6549d809a
---
gnu/packages/python-web.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 494b11422f3..dc868102572 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6055,14 +6055,13 @@ (define-public python-uvloop
(define-public gunicorn
(package
(name "gunicorn")
- (version "20.1.0")
+ (version "21.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "gunicorn" version))
(sha256
- (base32
- "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0"))))
+ (base32 "0cqhr2g880snpi45qvvch288m4fdyd5vqrcz3gk9hkv33pzqpv48"))))
(outputs '("out" "doc"))
(build-system pyproject-build-system)
(arguments
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 37/92] gnu: python-tinycss: Move to pyproject-build-system.
` (5 preceding siblings ...)
2024-05-09 22:53 70% ` [bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 40/92] gnu: python-flask-login: " Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-tinycss):
[build-system]: Move to pyproject-build-system.
[arguments]<#:test-flags>: Ignore failing test.
Change-Id: I972a3c6390df5f8af79c952292db8a4e24a4aa33
---
gnu/packages/python-web.scm | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index aa04a02bad5..88dc08c18f6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5874,20 +5874,10 @@ (define-public python-tinycss
(uri (pypi-uri "tinycss" version))
(sha256
(base32 "0vkifr595h28ymkjhrswwf0bm23lhznh5f44xyp7x7jy1ssnyc0j"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'disable-flake8-isort
- ;; Flake8 and isort tests fail.
- (lambda _
- (substitute* "setup.cfg" ((" --flake8 --isort") ""))
- #t))
- (replace 'check
- (lambda _
- ;; Disable failing test.
- (invoke "python" "-m" "pytest" "-k"
- "not test_speedups"))))))
+ (list #:test-flags
+ '(list "-k" "not test_speedups")))
(native-inputs
(list python-pytest-cov python-pytest-flake8 python-pytest-isort
python-pytest-runner))
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1.
2024-05-09 22:53 70% ` [bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
@ 2024-05-09 22:53 70% ` Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 19/92] gnu: python-apiron: Move to pyproject-build-system Nicolas Graves via Guix-patches via
` (9 subsequent siblings)
11 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 22:53 UTC (permalink / raw)
To: 70855; +Cc: ngraves
* gnu/packages/python-web.scm (python-zope-i18nmessageid): Update to 5.1.1.
Change-Id: Ia53db09774addf05b0a856fd1f573c5dd5c902aa
---
gnu/packages/python-web.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 11fa240350c..73f26bb9528 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3124,14 +3124,13 @@ (define-public python-zope-testrunner-bootstrap
(define-public python-zope-i18nmessageid
(package
(name "python-zope-i18nmessageid")
- (version "5.0.1")
+ (version "5.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "zope.i18nmessageid" version))
(sha256
- (base32
- "0ndhn4w1qgwkfbwf9vm2bgq418z5g0wmfsgl0d9nz62cd0mi8d4m"))))
+ (base32 "14mx62khys82p2gmmf3m40x4jmvcz3rndvl6qik2n2qfp13n7ds7"))))
(build-system python-build-system)
(native-inputs
(list python-coverage python-zope-testrunner))
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#69980] [PATCH v2 07/14] gnu: python-omnipath: Remove pre-commit from native-inputs.
@ 2024-05-09 14:47 70% ` Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-09 14:47 UTC (permalink / raw)
To: 69980; +Cc: Vinicius Monego, ngraves
From: Vinicius Monego <monego@posteo.net>
* gnu/packages/python-xyz.scm (python-omnipath)[native-inputs]: Remove
python-pre-commit.
Change-Id: Idfdf978df55e2c3cb3c8447aa18456cc9de4c4c2
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dd1e005b721..3cebbbbe739 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2136,7 +2136,6 @@ (define-public python-omnipath
python-wrapt))
(native-inputs
(list python-bump2version
- python-pre-commit
python-pytest
python-pytest-mock
python-pytest-socket
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 064/714] gnu: python-httplib2: Remove python-flake8 native-input.
` (4 preceding siblings ...)
2024-05-03 22:19 70% ` [bug#70735] [PATCH 063/714] gnu: python-furl: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 065/714] gnu: python-http-ece: " Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-httplib2):
[native-inputs]: Remove python-flake8.
Change-Id: Ia9cc0ed55faaea65f6769fae052c6809cffd99a8
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d509de15f6..a2456cb15e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1271,7 +1271,6 @@ (define-public python-httplib2
(("==") ">=")))))))
(native-inputs
(list python-cryptography
- python-flake8
python-future
python-mock
python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0.
` (8 preceding siblings ...)
2024-05-03 22:19 70% ` [bug#70735] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-http-ece): Update to 1.2.0.
Change-Id: I8d82959841b64db48eb01b88914298ba12f1a388
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d019d6b299..0b60f5248e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7263,7 +7263,7 @@ (define-public python-js2py
(define-public python-http-ece
(package
(name "python-http-ece")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method git-fetch)
@@ -7273,7 +7273,7 @@ (define-public python-http-ece
(file-name (git-file-name name version))
(sha256
(base32
- "0bp4cc0xc123i72h80ax3qz3ixfwx3j7pw343kc7i6kdvfi8klx7"))))
+ "11v9cpmx4jc0nk25af96plzjz3mg1ysm1m001nx6jns06hil1gpy"))))
(build-system python-build-system)
(arguments
`(#:phases
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-flake8 native-input.
` (7 preceding siblings ...)
2024-05-03 22:19 70% ` [bug#70735] [PATCH 066/714] gnu: python-woob: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-starsessions-for-pytorch-lightning):
[native-inputs]: Remove python-flake8.
Change-Id: I628228d21fab2e237afcbc8ba8724d33c0f3ea01
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 679030d13b..d019d6b299 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8927,8 +8927,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-flake8
- python-httpx
+ (list python-httpx
python-mypy
python-poetry-core
python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input.
` (2 preceding siblings ...)
2024-05-03 22:18 70% ` [bug#70735] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 063/714] gnu: python-furl: " Nicolas Graves via Guix-patches via
` (5 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-ovh):
[native-inputs]: Remove python-flake8.
Change-Id: I10683f09aab22ce637eaf0a96a0ea1a7de788d07
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3ae90c9360..31766b356d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -975,7 +975,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-cov
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 063/714] gnu: python-furl: Remove python-flake8 native-input.
` (3 preceding siblings ...)
2024-05-03 22:19 70% ` [bug#70735] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 064/714] gnu: python-httplib2: " Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-furl):
[native-inputs]: Remove python-flake8.
Change-Id: I1b0f6747d7a2c93b053be88525bfe577f16c91a5
---
gnu/packages/python-web.scm | 2 --
1 file changed, 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 31766b356d..d509de15f6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1239,8 +1239,6 @@ (define-public python-furl
(build-system python-build-system)
(propagated-inputs
(list python-six python-orderedmultidict))
- (native-inputs
- (list python-flake8))
(home-page "https://github.com/gruns/furl")
(synopsis "URL manipulation in Python")
(description "Furl provides an easy-to-use alternative to the
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 066/714] gnu: python-woob: Remove python-flake8 native-input.
` (6 preceding siblings ...)
2024-05-03 22:19 70% ` [bug#70735] [PATCH 065/714] gnu: python-http-ece: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: " Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-woob):
[native-inputs]: Remove python-flake8.
Change-Id: I2d2ae0b058551852c760adaeae8db275c0c46312
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 12536e715d..679030d13b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8288,8 +8288,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-flake8 python-nose python-selenium
- python-xunitparser))
+ (list python-coverage python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 065/714] gnu: python-http-ece: Remove python-flake8 native-input.
` (5 preceding siblings ...)
2024-05-03 22:19 70% ` [bug#70735] [PATCH 064/714] gnu: python-httplib2: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:19 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 066/714] gnu: python-woob: " Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:19 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-http-ece):
[native-inputs]: Remove python-flake8.
Change-Id: Ia22d6ab59aa65a7f77d58da9e70140d0dc17325b
---
gnu/packages/python-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a2456cb15e..12536e715d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7283,7 +7283,7 @@ (define-public python-http-ece
(propagated-inputs
(list python-cryptography))
(native-inputs
- (list python-coverage python-flake8 python-mock python-nose))
+ (list python-coverage python-mock python-nose))
(home-page "https://github.com/web-push-libs/encrypted-content-encoding")
(synopsis "Encrypted Content Encoding for HTTP")
(description
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 009/714] gnu: python-openai: Remove python-black native-input.
2024-05-03 22:18 70% ` [bug#70735] [PATCH 002/714] gnu: python-ovh: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:18 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:18 70% ` [bug#70735] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black Nicolas Graves via Guix-patches via
` (7 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:18 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-openai):
[native-inputs]: Remove python-black.
Change-Id: Ie1d7f9fd55b35f9a5a514a318bd09338caa67a09
---
gnu/packages/python-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3fccdcdf59..cfd3755868 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2152,7 +2152,7 @@ (define-public python-openai
and not test_file_cli")))
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
- (native-inputs (list python-black python-pytest python-pytest-asyncio
+ (native-inputs (list python-pytest python-pytest-asyncio
python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 002/714] gnu: python-ovh: Remove python-black native-input.
@ 2024-05-03 22:18 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:18 70% ` [bug#70735] [PATCH 009/714] gnu: python-openai: " Nicolas Graves via Guix-patches via
` (8 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:18 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-ovh):
[native-inputs]: Remove python-black.
Change-Id: I62a0ac9c37a72ab5e7e979001bb347c2c75a8be9
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index bd9c50a006..3fccdcdf59 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -974,8 +974,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-black
- python-coverage
+ (native-inputs (list python-coverage
python-flake8
python-isort
python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70735] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black.
2024-05-03 22:18 70% ` [bug#70735] [PATCH 002/714] gnu: python-ovh: " Nicolas Graves via Guix-patches via
2024-05-03 22:18 70% ` [bug#70735] [PATCH 009/714] gnu: python-openai: " Nicolas Graves via Guix-patches via
@ 2024-05-03 22:18 70% ` Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input Nicolas Graves via Guix-patches via
` (6 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 22:18 UTC (permalink / raw)
To: 70735; +Cc: ngraves
* gnu/packages/python-web.scm (python-starsessions-for-pytorch-lightning):
[native-inputs]: Remove python-black.
Change-Id: Id74da2f987ba02fd9c778fbcf9be7598c9367698
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index cfd3755868..3ae90c9360 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8932,8 +8932,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-httpx
python-mypy
python-poetry-core
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70744] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black.
2024-05-03 16:55 70% ` [bug#70736] [PATCH 002/714] gnu: python-ovh: " Nicolas Graves via Guix-patches via
2024-05-03 16:55 70% ` [bug#70747] [PATCH 009/714] gnu: python-openai: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:55 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input Nicolas Graves via Guix-patches via
` (6 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:55 UTC (permalink / raw)
To: 70744; +Cc: ngraves
* gnu/packages/python-web.scm (python-starsessions-for-pytorch-lightning):
[native-inputs]: Remove python-black.
Change-Id: Id74da2f987ba02fd9c778fbcf9be7598c9367698
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index cfd3755868..3ae90c9360 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8932,8 +8932,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-black
- python-flake8
+ (list python-flake8
python-httpx
python-mypy
python-poetry-core
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 064/714] gnu: python-httplib2: Remove python-flake8 native-input.
` (4 preceding siblings ...)
2024-05-03 16:56 70% ` [bug#70739] [PATCH 063/714] gnu: python-furl: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 065/714] gnu: python-http-ece: " Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-httplib2):
[native-inputs]: Remove python-flake8.
Change-Id: Ia9cc0ed55faaea65f6769fae052c6809cffd99a8
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d509de15f6..a2456cb15e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1271,7 +1271,6 @@ (define-public python-httplib2
(("==") ">=")))))))
(native-inputs
(list python-cryptography
- python-flake8
python-future
python-mock
python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0.
` (8 preceding siblings ...)
2024-05-03 16:56 70% ` [bug#70739] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-http-ece): Update to 1.2.0.
Change-Id: I8d82959841b64db48eb01b88914298ba12f1a388
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d019d6b299..0b60f5248e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7263,7 +7263,7 @@ (define-public python-js2py
(define-public python-http-ece
(package
(name "python-http-ece")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method git-fetch)
@@ -7273,7 +7273,7 @@ (define-public python-http-ece
(file-name (git-file-name name version))
(sha256
(base32
- "0bp4cc0xc123i72h80ax3qz3ixfwx3j7pw343kc7i6kdvfi8klx7"))))
+ "11v9cpmx4jc0nk25af96plzjz3mg1ysm1m001nx6jns06hil1gpy"))))
(build-system python-build-system)
(arguments
`(#:phases
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 065/714] gnu: python-http-ece: Remove python-flake8 native-input.
` (5 preceding siblings ...)
2024-05-03 16:56 70% ` [bug#70739] [PATCH 064/714] gnu: python-httplib2: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 066/714] gnu: python-woob: " Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-http-ece):
[native-inputs]: Remove python-flake8.
Change-Id: Ia22d6ab59aa65a7f77d58da9e70140d0dc17325b
---
gnu/packages/python-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a2456cb15e..12536e715d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7283,7 +7283,7 @@ (define-public python-http-ece
(propagated-inputs
(list python-cryptography))
(native-inputs
- (list python-coverage python-flake8 python-mock python-nose))
+ (list python-coverage python-mock python-nose))
(home-page "https://github.com/web-push-libs/encrypted-content-encoding")
(synopsis "Encrypted Content Encoding for HTTP")
(description
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 063/714] gnu: python-furl: Remove python-flake8 native-input.
` (3 preceding siblings ...)
2024-05-03 16:56 70% ` [bug#70739] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 064/714] gnu: python-httplib2: " Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-furl):
[native-inputs]: Remove python-flake8.
Change-Id: I1b0f6747d7a2c93b053be88525bfe577f16c91a5
---
gnu/packages/python-web.scm | 2 --
1 file changed, 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 31766b356d..d509de15f6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1239,8 +1239,6 @@ (define-public python-furl
(build-system python-build-system)
(propagated-inputs
(list python-six python-orderedmultidict))
- (native-inputs
- (list python-flake8))
(home-page "https://github.com/gruns/furl")
(synopsis "URL manipulation in Python")
(description "Furl provides an easy-to-use alternative to the
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input.
` (2 preceding siblings ...)
2024-05-03 16:55 70% ` [bug#70744] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 063/714] gnu: python-furl: " Nicolas Graves via Guix-patches via
` (5 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-ovh):
[native-inputs]: Remove python-flake8.
Change-Id: I10683f09aab22ce637eaf0a96a0ea1a7de788d07
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3ae90c9360..31766b356d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -975,7 +975,6 @@ (define-public python-ovh
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
(native-inputs (list python-coverage
- python-flake8
python-isort
python-pytest
python-pytest-cov
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-flake8 native-input.
` (7 preceding siblings ...)
2024-05-03 16:56 70% ` [bug#70739] [PATCH 066/714] gnu: python-woob: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-starsessions-for-pytorch-lightning):
[native-inputs]: Remove python-flake8.
Change-Id: I628228d21fab2e237afcbc8ba8724d33c0f3ea01
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 679030d13b..d019d6b299 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8927,8 +8927,7 @@ (define-public python-starsessions-for-pytorch-lightning
python-itsdangerous
python-starlette-for-fastapi-0.88))
(native-inputs
- (list python-flake8
- python-httpx
+ (list python-httpx
python-mypy
python-poetry-core
python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70739] [PATCH 066/714] gnu: python-woob: Remove python-flake8 native-input.
` (6 preceding siblings ...)
2024-05-03 16:56 70% ` [bug#70739] [PATCH 065/714] gnu: python-http-ece: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:56 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: " Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:56 UTC (permalink / raw)
To: 70739; +Cc: ngraves
* gnu/packages/python-web.scm (python-woob):
[native-inputs]: Remove python-flake8.
Change-Id: I2d2ae0b058551852c760adaeae8db275c0c46312
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 12536e715d..679030d13b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8288,8 +8288,7 @@ (define-public python-woob
python-six
python-unidecode))
(native-inputs
- (list python-coverage python-flake8 python-nose python-selenium
- python-xunitparser))
+ (list python-coverage python-nose python-selenium python-xunitparser))
(home-page "https://woob.tech/")
(synopsis "Woob, Web Outside Of Browsers")
(description "Woob is a collection of applications able to interact with
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70747] [PATCH 009/714] gnu: python-openai: Remove python-black native-input.
2024-05-03 16:55 70% ` [bug#70736] [PATCH 002/714] gnu: python-ovh: " Nicolas Graves via Guix-patches via
@ 2024-05-03 16:55 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:55 70% ` [bug#70744] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black Nicolas Graves via Guix-patches via
` (7 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:55 UTC (permalink / raw)
To: 70747; +Cc: ngraves
* gnu/packages/python-web.scm (python-openai):
[native-inputs]: Remove python-black.
Change-Id: Ie1d7f9fd55b35f9a5a514a318bd09338caa67a09
---
gnu/packages/python-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3fccdcdf59..cfd3755868 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2152,7 +2152,7 @@ (define-public python-openai
and not test_file_cli")))
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
- (native-inputs (list python-black python-pytest python-pytest-asyncio
+ (native-inputs (list python-pytest python-pytest-asyncio
python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70736] [PATCH 002/714] gnu: python-ovh: Remove python-black native-input.
@ 2024-05-03 16:55 70% ` Nicolas Graves via Guix-patches via
2024-05-03 16:55 70% ` [bug#70747] [PATCH 009/714] gnu: python-openai: " Nicolas Graves via Guix-patches via
` (8 subsequent siblings)
9 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2024-05-03 16:55 UTC (permalink / raw)
To: 70736; +Cc: ngraves
* gnu/packages/python-web.scm (python-ovh):
[native-inputs]: Remove python-black.
Change-Id: I62a0ac9c37a72ab5e7e979001bb347c2c75a8be9
---
gnu/packages/python-web.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index bd9c50a006..3fccdcdf59 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -974,8 +974,7 @@ (define-public python-ovh
(build-system pyproject-build-system)
(arguments (list #:tests? #f)) ; XXX: tests require networking
(propagated-inputs (list python-requests))
- (native-inputs (list python-black
- python-coverage
+ (native-inputs (list python-coverage
python-flake8
python-isort
python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70483] [PATCH v2 1/1] gnu: Add python-robotframework-requests.
@ 2024-04-23 8:54 65% ` Markku Korkeala
0 siblings, 0 replies; 200+ results
From: Markku Korkeala @ 2024-04-23 8:54 UTC (permalink / raw)
To: 70483
Cc: Markku Korkeala, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, Tanguy Le Carrour, jgart
* gnu/packages/python-web.scm (python-robotframework-requests): New variable.
Change-Id: I01d814d1a9e20d26e9bfa4a0a77ba91577da2bd8
---
Improved the patch according to feedback:
Moved package to gnu/packages/python-web.scm
Switched to pyproject-build-system
Simplified the test phase
Removed duplicate and unnecessary dependencies
Fixed description identation
gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5a532f8460..2d0695d5a4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -64,6 +64,7 @@
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2024 normally_js <normally_js@posteo.net>
+;;; Copyright © 2024 Markku Korkeala <markku.korkeala@iki.fi>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3763,6 +3764,33 @@ (define-public python-requests-ftp
adapter for use with the Requests library.")
(license license:asl2.0)))
+(define-public python-robotframework-requests
+ (package
+ (name "python-robotframework-requests")
+ (version "0.9.7")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/MarketSquare/robotframework-requests")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "077j8p5k41v53slyv8h32fcmqfi7m6z3r4gmyqqaawm5szfmy61m"))))
+ (build-system pyproject-build-system)
+ (arguments
+ '(#:test-flags '("-v" "utests/")))
+ (propagated-inputs (list python-requests python-robotframework))
+ (native-inputs (list python-flask python-mock python-pytest
+ python-pytest-cov))
+ (home-page "https://github.com/MarketSquare/robotframework-requests")
+ (synopsis "Robot Framework keyword library wrapper around requests")
+ (description
+ "RequestsLibrary is a Robot Framework library aimed to provide HTTP
+api testing functionalities by wrapping the well known Python Requests
+Library.")
+ (license license:expat)))
+
(define-public python-aioftp
(package
(name "python-aioftp")
base-commit: ee9cf4f00bcb8966fa125787e8534580b270bb99
--
2.41.0
^ permalink raw reply related [relevance 65%]
* [bug#70489] [PATCH 06/47] gnu: parfive: Update to 2.1.0.
@ 2024-04-20 23:21 70% ` Sharlatan Hellseher
0 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2024-04-20 23:21 UTC (permalink / raw)
To: 70489
Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, Tanguy Le Carrour, jgart
* gnu/packages/python-web.scm (parfive): Update to 2.1.0.
Change-Id: I6207150e012c03943d4553854123831d1bba3e55
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5a532f8460..fb6abb9d80 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1378,13 +1378,13 @@ (define-public httpie
(define-public parfive
(package
(name "parfive")
- (version "2.0.2")
+ (version "2.1.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "parfive" version))
(sha256
(base32
- "0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh"))))
+ "13nw2y7wjzj6w049av6ff4d0zxgbhkrgck0xyh676c114hcv8v6d"))))
(build-system pyproject-build-system)
(arguments
(list
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#70269] [PATCH] gnu: Add python-pybadges.
@ 2024-04-07 22:13 68% Giacomo Leidi via Guix-patches via
2024-05-13 17:05 68% ` [bug#70269] [PATCH v2] " Giacomo Leidi via Guix-patches via
0 siblings, 1 reply; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-04-07 22:13 UTC (permalink / raw)
To: 70269
Cc: Giacomo Leidi, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, Tanguy Le Carrour, jgart
* gnu/packages/python-web.scm (python-pybadges): New variable.
Change-Id: Idd53ddf94b24112015c0a0b82396cf366920417e
---
gnu/packages/python-web.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9ad081beb1..da4f019476 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -9123,6 +9123,40 @@ (define-public python-whatthepatch
"This package provides a library to parse and apply patches.")
(license license:expat)))
+(define-public python-pybadges
+ (package
+ (name "python-pybadges")
+ (version "3.0.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/google/pybadges")
+ (commit (string-append version))))
+ (file-name (git-file-name name version))
+ (sha256
+ "1zgb9idz7m3mzf8wvik0gwmyrxp753axqjv2pab326cr5myj1s4b")))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~'("-k"
+ ;; Disable network dependent tests.
+ "not test_changes and not test_not_image_url and not test_http_url")))
+ (propagated-inputs (list python-jinja2 python-requests))
+ (native-inputs (list python-flask
+ python-fonttools
+ python-nox
+ python-pillow
+ python-pytest
+ python-xmldiff))
+ (home-page "https://github.com/google/pybadges")
+ (synopsis
+ "Libbrary and command-line tool for generating Github-style badges")
+ (description
+ "This package provides @code{python-pybadges}: a library and command-line
+tool for generating Github-style badges.")
+ (license license:asl2.0)))
+
(define-public python-grid5000
(package
(name "python-grid5000")
base-commit: 69951a61a1d8f1f2135ea2dc836738be282b97bc
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#69980] [PATCH 08/13] gnu: python-omnipath: Remove pre-commit from native-inputs.
@ 2024-03-24 13:40 70% ` Vinicius Monego
0 siblings, 0 replies; 200+ results
From: Vinicius Monego @ 2024-03-24 13:40 UTC (permalink / raw)
To: 69980; +Cc: Vinicius Monego
* gnu/packages/python-xyz.scm (python-omnipath)[native-inputs]: Remove
python-pre-commit.
Change-Id: Idfdf978df55e2c3cb3c8447aa18456cc9de4c4c2
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fc01fc4b83..bbe4ddd788 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2101,7 +2101,6 @@ (define-public python-omnipath
python-wrapt))
(native-inputs
(list python-bump2version
- python-pre-commit
python-pytest
python-pytest-mock
python-requests-mock
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#69867] [PATCH 1/2] gnu: Add python-noiseprotocol.
@ 2024-03-20 18:55 69% ` normalmente
0 siblings, 0 replies; 200+ results
From: normalmente @ 2024-03-20 18:55 UTC (permalink / raw)
To: 69867
Cc: mail, normalmente, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, Tanguy Le Carrour, jgart
* gnu/packages/python-web.scm (python-noiseprotocol): New variable.
Change-Id: Id62f22f9fd3f019beded5ce5c0fe9123c34f8bb2
---
gnu/packages/python-web.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9ad081beb1..67bc193b4d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -63,6 +63,7 @@
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
+;;; Copyright © 2024 normally_js <normally_js@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3422,6 +3423,24 @@ (define-public python-ndg-httpsclient
(home-page "https://github.com/cedadev/ndg_httpsclient/")
(license license:bsd-3)))
+(define-public python-noiseprotocol
+ (package
+ (name "python-noiseprotocol")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "noiseprotocol" version))
+ (sha256
+ (base32 "0ifnj0mpbqsfqba9n12vf5yzxj4qf2gxql3ry43qyshgnrqsi4mh"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-cryptography))
+ (home-page "https://github.com/plizonczyk/noiseprotocol")
+ (synopsis "Implementation of Noise Protocol Framework")
+ (description
+ "This package provides an implementation of Noise Protocol Framework.")
+ (license license:expat)))
+
(define-public python-websocket-client
(package
(name "python-websocket-client")
--
2.41.0
^ permalink raw reply related [relevance 69%]
* [bug#60238] [PATCH v3 6/7] gnu: Add python-cheroot.
@ 2024-03-17 17:08 64% ` Sharlatan Hellseher
0 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2024-03-17 17:08 UTC (permalink / raw)
To: 60238
Cc: Sharlatan Hellseher, dan, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, Tanguy Le Carrour, jgart
From: dan <i@dan.games>
* gnu/packages/python-web.scm (python-cheroot): New variable.
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
gnu/packages/python-web.scm | 57 +++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c2bdfc8da8..f14c0a7bde 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -58,6 +58,7 @@
;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2023 dan <i@dan.games>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
@@ -1279,6 +1280,62 @@ (define-public python-httplib2
other HTTP libraries.")
(license license:expat)))
+(define-public python-cheroot
+ (package
+ (name "python-cheroot")
+ (version "10.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "cheroot" version))
+ (sha256
+ (base32
+ "1w0ind0dza9j1py56y23344piqkpyfmcm060qfrnk6gggy3s3i2r"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ #~(list "--cov=cheroot"
+ ;; Tests a flaky in parallel invocation.
+ ;; "--numprocesses=auto"
+ "--doctest-modules"
+ "--showlocals"
+ ;; Disable test requiring networking.
+ "-k" "not test_tls_client_auth")
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? test-flags #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "/tmp"
+ (apply invoke "pytest" "-v"
+ (append test-flags (list #$output))))))))))
+ (propagated-inputs
+ (list python-jaraco-functools
+ python-more-itertools
+ python-six))
+ (native-inputs
+ (list python-cryptography
+ python-jaraco-text
+ python-portend
+ python-pyopenssl
+ python-pypytools
+ python-pytest
+ python-pytest-cov
+ python-pytest-mock
+ python-pytest-xdist
+ python-requests
+ python-requests-toolbelt
+ python-requests-unixsocket
+ python-setuptools-scm
+ python-setuptools-scm-git-archive
+ python-trustme))
+ (home-page "https://cheroot.cherrypy.dev")
+ (synopsis "Highly-optimized, pure-python HTTP server")
+ (description
+ "Cheroot is a high-performance, pure-Python HTTP server.")
+ (license license:bsd-3)))
+
(define-public httpie
(package
(name "httpie")
--
2.41.0
^ permalink raw reply related [relevance 64%]
* [bug#69765] [PATCH 3/4] gnu: python-web: Update python-s3transfer to 0.10.0.
@ 2024-03-13 1:11 70% Daniel Ziltener via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Daniel Ziltener via Guix-patches via @ 2024-03-13 1:11 UTC (permalink / raw)
To: 69765; +Cc: dziltener
---
gnu/packages/python-web.scm | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6b61ba10b3..a3de510394 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4345,23 +4345,18 @@ (define-public python-betamax-serializers
(define-public python-s3transfer
(package
(name "python-s3transfer")
- (version "0.5.0")
+ (version "0.10.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "s3transfer" version))
(sha256
(base32
- "0k6sc956yrrv9b4laa0r79jhxajpyxr21jcd1ka8m1n53lz85vah"))))
- (build-system python-build-system)
+ "0nsr664ci9bqysmiqrigv03kz5idjwxy4ibrwpjbpvnmfbvbpj6h"))))
+ (build-system pyproject-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; Some of the 'integration' tests require network access or
- ;; login credentials.
- (invoke "nosetests" "--exclude=integration")))))))
+ (delete 'check))))
(native-inputs
(list python-docutils python-mock python-nose))
(propagated-inputs
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#69768] [PATCH 4/4] gnu: python-web: Update awscli to 1.32.61.
@ 2024-03-13 1:12 70% Daniel Ziltener via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Daniel Ziltener via Guix-patches via @ 2024-03-13 1:12 UTC (permalink / raw)
To: 69768; +Cc: dziltener
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a3de510394..bfd0a6a1e7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3763,15 +3763,15 @@ (define-public awscli
(package
;; Note: updating awscli typically requires updating botocore as well.
(name "awscli")
- (version "1.22.90")
+ (version "1.32.61")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "0ky4ax4xh7s8w1l0hwc7w9ii8afvh9nib3kz09qhiqdinxzrlv54"))))
- (build-system python-build-system)
+ "1xms4yd07i8869jk7kmd0p80fj7qnf18kip3kmxwalnqygpwsqfw"))))
+ (build-system pyproject-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
'(#:tests? #f
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#68492] [PATCH v2 2/2] gnu: Add python-fastapi-pagination.
2024-02-28 23:35 64% ` [bug#68492] [PATCH v2 1/2] gnu: Add python-fastapi-pagination-minimal Giacomo Leidi via Guix-patches via
@ 2024-02-28 23:35 68% ` Giacomo Leidi via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-02-28 23:35 UTC (permalink / raw)
To: 68492
Cc: Giacomo Leidi, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (python-fastapi-pagination): New variable.
Change-Id: I3d5563baf7167e0bd0718cdbfc4a869a0bc96911
---
gnu/packages/python-web.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 1ff5d1009d..8d0c5c278b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8824,6 +8824,38 @@ (define-public python-fastapi-pagination-minimal
return paginated responses to your clients.")
(license license:expat)))
+(define-public python-fastapi-pagination
+ (package
+ (inherit python-fastapi-pagination-minimal)
+ (name "python-fastapi-pagination")
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs
+ python-fastapi-pagination-minimal)
+ (prepend python-asyncpg
+ python-databases
+ python-django
+ python-fastapi
+ python-pydantic
+ python-sqlalchemy
+ (package
+ (inherit python-tortoise-orm)
+ (arguments
+ (substitute-keyword-arguments (package-arguments
+ python-tortoise-orm)
+ ((#:phases phases '%standard-phases)
+ `(modify-phases ,phases
+ (delete 'sanity-check)))))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-tortoise-orm)
+ (replace "python-aiosqlite" python-aiosqlite)))))))
+ (description
+ (string-append (package-description python-fastapi-pagination-minimal)
+ "
+
+This package, as opposed to @code{python-fastapi-pagination-minimal}, depends on
+all available optional dependencies supported by mainline
+@code{fastapi-pagination}."))))
+
(define-public python-pyactiveresource
(package
(name "python-pyactiveresource")
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#68492] [PATCH v2 1/2] gnu: Add python-fastapi-pagination-minimal.
2024-01-15 23:25 67% [bug#68492] [PATCH] gnu: Add python-fastapi-pagination Giacomo Leidi via Guix-patches via
@ 2024-02-28 23:35 64% ` Giacomo Leidi via Guix-patches via
2024-02-28 23:35 68% ` [bug#68492] [PATCH v2 2/2] gnu: Add python-fastapi-pagination Giacomo Leidi via Guix-patches via
0 siblings, 1 reply; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-02-28 23:35 UTC (permalink / raw)
To: 68492
Cc: Giacomo Leidi, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm
(python-fastapi-pagination-minimal): New variable.
Change-Id: I69e06ba405bce57409d83f3545e6db2905d3c6a4
---
gnu/packages/python-web.scm | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index cde4ac4f58..1ff5d1009d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
-;;; Copyright © 2020, 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020, 2022, 2024 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -8791,6 +8791,39 @@ (define-public python-fastapi-csrf-protect
pattern.")
(license license:expat)))
+(define-public python-fastapi-pagination-minimal
+ (package
+ (name "python-fastapi-pagination-minimal")
+ (version "0.12.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uriyyo/fastapi-pagination")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qkcphjk1qy680v1hkmqbs4p7srvx020wy39b97anrn9dyyi5ah6"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; Tests depend on python-cassandra,
+ ;; which is not yet packaged in Guix.
+ `(#:tests? #f))
+ (native-inputs
+ (list poetry))
+ ;; These are the only required dependencies,
+ ;; please add all optional dependencies to the
+ ;; full python-fastapi-pagination below.
+ (propagated-inputs (list python-fastapi
+ python-pydantic))
+ (home-page "https://github.com/uriyyo/fastapi-pagination")
+ (synopsis "FastAPI pagination library")
+ (description "@code{fastapi-pagination} is a Python library designed to
+simplify pagination in FastAPI applications. It provides a set of utility
+functions and data models to help you paginate your database queries and
+return paginated responses to your clients.")
+ (license license:expat)))
+
(define-public python-pyactiveresource
(package
(name "python-pyactiveresource")
base-commit: 23283c50e96d7812a42b1272329fa3ba05a5a6e6
--
2.41.0
^ permalink raw reply related [relevance 64%]
* [bug#69449] [PATCH python-team 8/9] gnu: python-flask: Rename to python-flask-2.
2024-02-28 10:15 67% ` [bug#69449] [PATCH python-team 6/9] gnu: python-werkzeug: Rename variable to python-werkzeug-2 Tanguy Le Carrour
2024-02-28 10:15 66% ` [bug#69449] [PATCH python-team 7/9] gnu: Add python-werkzeug-3 Tanguy Le Carrour
@ 2024-02-28 10:15 70% ` Tanguy Le Carrour
2024-02-28 10:15 67% ` [bug#69449] [PATCH python-team 9/9] gnu: Add python-flask-3 Tanguy Le Carrour
3 siblings, 0 replies; 200+ results
From: Tanguy Le Carrour @ 2024-02-28 10:15 UTC (permalink / raw)
To: 69449
Cc: Tanguy Le Carrour, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (python-flask): Rename to...
(python-flask-2): ... this. Add new variable defining
default python-flask.
Change-Id: Ibcfa805089f1ea17de52525b75e20dc5c2d54ee8
---
gnu/packages/python-web.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e8edc1604c..3bdabc311a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3923,7 +3923,7 @@ (define-public python-webtest
minimum of WSGI.")
(license license:expat)))
-(define-public python-flask
+(define-public python-flask-2
(package
(name "python-flask")
(version "2.1.1")
@@ -3957,6 +3957,8 @@ (define-public python-flask
presume or force a developer to use a particular tool or library.")
(license license:bsd-3)))
+(define-public python-flask python-flask-2)
+
(define-public python-flask-compress
(package
(name "python-flask-compress")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#69449] [PATCH python-team 6/9] gnu: python-werkzeug: Rename variable to python-werkzeug-2.
@ 2024-02-28 10:15 67% ` Tanguy Le Carrour
2024-02-28 10:15 66% ` [bug#69449] [PATCH python-team 7/9] gnu: Add python-werkzeug-3 Tanguy Le Carrour
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Tanguy Le Carrour @ 2024-02-28 10:15 UTC (permalink / raw)
To: 69449
Cc: Tanguy Le Carrour, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (python-werkzeug): Rename to...
(python-werkzeug-2): ... this. Add new variable defining
default python-werkzeug.
Change-Id: I6b77baf7731303735bcd7ae707fdd68f8b956c99
---
gnu/packages/python-web.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 88e40959c3..960ad0d879 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -30,7 +30,7 @@
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
-;;; Copyright © 2019, 2020 Tanguy Le Carrour <tanguy@bioneland.org>
+;;; Copyright © 2019, 2020, 2024 Tanguy Le Carrour <tanguy@bioneland.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
@@ -4971,7 +4971,7 @@ (define-public python-publicsuffix2
List. Forked from and using the same API as the publicsuffix package.")
(license (list license:expat license:mpl2.0))))
-(define-public python-werkzeug
+(define-public python-werkzeug-2
(package
(name "python-werkzeug")
(version "2.0.2")
@@ -5008,7 +5008,7 @@ (define-public python-werkzeug
(define-public python-werkzeug-1.0
(package
- (inherit python-werkzeug)
+ (inherit python-werkzeug-2)
(version "1.0.1")
(source (origin
(method url-fetch)
@@ -5030,6 +5030,8 @@ (define-public python-werkzeug-1.0
(native-inputs
(list python-pytest python-pytest-timeout))))
+(define-public python-werkzeug python-werkzeug-2)
+
(define-public python-bottle
(package
(name "python-bottle")
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#69449] [PATCH python-team 9/9] gnu: Add python-flask-3.
` (2 preceding siblings ...)
2024-02-28 10:15 70% ` [bug#69449] [PATCH python-team 8/9] gnu: python-flask: Rename to python-flask-2 Tanguy Le Carrour
@ 2024-02-28 10:15 67% ` Tanguy Le Carrour
3 siblings, 0 replies; 200+ results
From: Tanguy Le Carrour @ 2024-02-28 10:15 UTC (permalink / raw)
To: 69449
Cc: Tanguy Le Carrour, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (python-flask-3): New variable.
Change-Id: I8556a3e2fed74368c6d4db99cd859ecb33a3d573
---
gnu/packages/python-web.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3bdabc311a..215cdd2335 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3957,6 +3957,39 @@ (define-public python-flask-2
presume or force a developer to use a particular tool or library.")
(license license:bsd-3)))
+(define-public python-flask-3
+ (package
+ (name "python-flask")
+ (version "3.0.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "flask" version))
+ (sha256
+ (base32
+ "0zfbxxgl5zpbvswxywrr6fam6rj0vknv317flx84484rnzs06b42"))))
+ (build-system pyproject-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "python" "-m" "pytest" "-vv" "tests")))))))
+ (native-inputs
+ (list python-flit-core python-pytest))
+ (propagated-inputs
+ (list python-blinker
+ python-click
+ python-itsdangerous
+ python-jinja2
+ python-werkzeug-3))
+ (home-page "https://flask.palletsprojects.com")
+ (synopsis "Microframework based on Werkzeug, Jinja2 and good intentions")
+ (description "Flask is a micro web framework based on the Werkzeug toolkit
+and Jinja2 template engine. It is called a micro framework because it does not
+presume or force a developer to use a particular tool or library.")
+ (license license:bsd-3)))
+
(define-public python-flask python-flask-2)
(define-public python-flask-compress
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#69449] [PATCH python-team 7/9] gnu: Add python-werkzeug-3.
2024-02-28 10:15 67% ` [bug#69449] [PATCH python-team 6/9] gnu: python-werkzeug: Rename variable to python-werkzeug-2 Tanguy Le Carrour
@ 2024-02-28 10:15 66% ` Tanguy Le Carrour
2024-02-28 10:15 70% ` [bug#69449] [PATCH python-team 8/9] gnu: python-flask: Rename to python-flask-2 Tanguy Le Carrour
2024-02-28 10:15 67% ` [bug#69449] [PATCH python-team 9/9] gnu: Add python-flask-3 Tanguy Le Carrour
3 siblings, 0 replies; 200+ results
From: Tanguy Le Carrour @ 2024-02-28 10:15 UTC (permalink / raw)
To: 69449
Cc: Tanguy Le Carrour, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (python-werkzeug-3): New variable.
Change-Id: I9e53b3a5e303cc36aeaf7b3cfb678fb6aab1b6a7
---
gnu/packages/python-web.scm | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 960ad0d879..e8edc1604c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5030,6 +5030,41 @@ (define-public python-werkzeug-1.0
(native-inputs
(list python-pytest python-pytest-timeout))))
+(define-public python-werkzeug-3
+ (package
+ (name "python-werkzeug")
+ (version "3.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "werkzeug" version))
+ (sha256
+ (base32 "1k0x7fxlbvshcpbr9d16z2w1s3irngadwyll0jj1hax7rqg82zjh"))))
+ (build-system pyproject-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? inputs outputs #:allow-other-keys)
+ (when tests?
+ ;; Some tests rely on the network and on a newer version
+ ;; or python-watchdog.
+ (delete-file "tests/test_serving.py")
+ (invoke "python" "-m" "pytest")))))))
+ (propagated-inputs (list))
+ (native-inputs (list python-ephemeral-port-reserve python-flit-core
+ python-markupsafe python-watchdog
+ python-pytest python-pytest-timeout
+ python-pytest-xprocess))
+ (home-page "https://werkzeug.palletsprojects.com")
+ (synopsis "Utilities for WSGI applications")
+ (description
+ "One of the most advanced WSGI utility modules. It includes a
+powerful debugger, full-featured request and response objects, HTTP utilities to
+handle entity tags, cache control headers, HTTP dates, cookie handling, file
+uploads, a powerful URL routing system and a bunch of community-contributed
+addon modules.")
+ (license license:bsd-3)))
+
(define-public python-werkzeug python-werkzeug-2)
(define-public python-bottle
--
2.41.0
^ permalink raw reply related [relevance 66%]
* [bug#69295] [PATCH 08/46] gnu: python-aioftp: Update to 0.22.3.
2024-02-20 23:43 70% ` [bug#69295] [PATCH 05/46] gnu: parfive: Update to 2.0.2 Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 06/46] gnu: parfive: Simplify package Sharlatan Hellseher
@ 2024-02-20 23:43 70% ` Sharlatan Hellseher
2 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2024-02-20 23:43 UTC (permalink / raw)
To: 69295
Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (python-aioftp): Update to 0.22.3.
[build-system]: Swap to pyproject-build-system, there is no setup.py in
new release.
[arguments] <#:phases>: Use standard 'check phase.
Change-Id: I8e6a145da86e5ed56eb184d98d54bc8093a3bd1f
---
gnu/packages/python-web.scm | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index de57d5be94..cde4ac4f58 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3546,20 +3546,14 @@ (define-public python-requests-ftp
(define-public python-aioftp
(package
(name "python-aioftp")
- (version "0.21.4")
+ (version "0.22.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "aioftp" version))
(sha256
(base32
- "1f8vql2j2b3ykqyh5bxzsp8x5f2if2c1ya232ld3hz3cc7a2dfr8"))))
- (build-system python-build-system)
- (arguments
- (list #:phases #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vvv")))))))
+ "0w621mg956m9rn7v39jpwi4gpnpl90pprwl29cp640dahqqv38ms"))))
+ (build-system pyproject-build-system)
(native-inputs (list python-async-timeout python-pytest
python-pytest-asyncio python-pytest-cov
python-trustme))
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#69295] [PATCH 06/46] gnu: parfive: Simplify package.
2024-02-20 23:43 70% ` [bug#69295] [PATCH 05/46] gnu: parfive: Update to 2.0.2 Sharlatan Hellseher
@ 2024-02-20 23:43 70% ` Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 08/46] gnu: python-aioftp: Update to 0.22.3 Sharlatan Hellseher
2 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2024-02-20 23:43 UTC (permalink / raw)
To: 69295
Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (parfive) [build-system]: Swap to
pyproject-build-system.
[arguments] <#:phases>: Use standard 'check phase. <#:test-flags>: Move
disabled tests here and remove 'disable-test-requiring-network phase.
Change-Id: I08b67b2aa7027ac37e0a3df4da7ebb01ea3c451e
---
gnu/packages/python-web.scm | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index adae8d7272..de57d5be94 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1326,18 +1326,15 @@ (define-public parfive
(sha256
(base32
"0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- (list #:phases #~(modify-phases %standard-phases
- (add-before 'check 'disable-test-requiring-network
- (lambda _
- (substitute* "parfive/tests/test_downloader.py"
- (("def test_ftp")
- "def __off_test_ftp"))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "python" "-m" "pytest" "-vvv" "parfive")))))))
+ (list
+ ;; Disable tests requiring network access.
+ #:test-flags
+ #~(list "-k" (string-append
+ "not test_ftp"
+ " and not test_ftp_pasv_command"
+ " and not test_ftp_http"))))
(propagated-inputs (list python-aiofiles python-aioftp python-aiohttp
python-tqdm))
(native-inputs (list python-pytest
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#69295] [PATCH 05/46] gnu: parfive: Update to 2.0.2.
@ 2024-02-20 23:43 70% ` Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 06/46] gnu: parfive: Simplify package Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 08/46] gnu: python-aioftp: Update to 0.22.3 Sharlatan Hellseher
2 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2024-02-20 23:43 UTC (permalink / raw)
To: 69295
Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (parfive): Update to 2.0.2.
Change-Id: I3890cbae4d706c5f3391809fc6b4ce36140f059d
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5a6f401f89..adae8d7272 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1319,13 +1319,13 @@ (define-public httpie
(define-public parfive
(package
(name "parfive")
- (version "2.0.1")
+ (version "2.0.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "parfive" version))
(sha256
(base32
- "19dcbb6g56l5s3ih0bhs3p4acgc0gf4zdzpj4w87m69li2nhmgpx"))))
+ "0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh"))))
(build-system python-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#62389] [PATCH v3 3/5] gnu: python-treq: Update to 20.9.0.
@ 2024-02-11 19:54 89% ` Miguel Ángel Moreno
0 siblings, 0 replies; 200+ results
From: Miguel Ángel Moreno @ 2024-02-11 19:54 UTC (permalink / raw)
To: 62389; +Cc: mail
* gnu/packages/python-web.scm (python-treq): Update to 20.9.0.
Change-Id: I4c2a64affa0aa14bf46da1bbe0b1186c18f7424d
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c0cc46e5f..fc8a93189f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5474,14 +5474,14 @@ (define-public python-hyperlink
(define-public python-treq
(package
(name "python-treq")
- (version "18.6.0")
+ (version "20.9.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "treq" version))
(sha256
(base32
- "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+ "18kdk11d84lyxj6dz183nblc6c6r4rj1hk0lpsyiykzgbakjrkc3"))))
(build-system python-build-system)
(propagated-inputs
(list python-attrs
--
2.41.0
--
Best regards,
Miguel Ángel Moreno
^ permalink raw reply related [relevance 89%]
* [bug#69035] [PATCH] gnu: httpie: Update to 3.2.2.
@ 2024-02-11 4:35 69% kiasoc5 via Guix-patches via
0 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2024-02-11 4:35 UTC (permalink / raw)
To: 69035
Cc: kiasoc5, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
Sharlatan Hellseher, jgart
* gnu/packages/python-web.scm (httpie): Update to 3.2.2.
[propagated-inputs]: Remove python-pysocks; add python-importlib-metadata, python-pip,
and python-setuptools.
Change-Id: If767947e836bdee6bf145fc5290113d79e99fe89
---
gnu/packages/python-web.scm | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c0cc46e5f..2f2682bc78 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1280,28 +1280,30 @@ (define-public python-httplib2
(define-public httpie
(package
(name "httpie")
- (version "3.2.1")
+ (version "3.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "httpie" version))
(sha256
(base32
- "1v736y2h7lcyrnxs9y5sf4xwzgll7pc2s6r3ny929mm8lcn07h69"))))
+ "140w4mr0w7scpf4j5qm4h475vbwrgxzkdwyygwcmql1r1cgngywb"))))
(build-system python-build-system)
(arguments
;; The tests attempt to access external web servers, so we cannot run them.
'(#:tests? #f))
(propagated-inputs
- (list python-colorama
+ (list python-charset-normalizer
+ python-colorama
+ python-defusedxml
+ python-importlib-metadata
+ python-multidict
+ python-pip
python-pygments
python-requests
python-requests-toolbelt
- python-pysocks
- python-charset-normalizer
- python-defusedxml
python-rich
- python-multidict))
+ python-setuptools))
(home-page "https://httpie.io")
(synopsis "cURL-like tool for humans")
(description
base-commit: f45d05133472a9da13eae20ba4a676c696682c90
--
2.41.0
^ permalink raw reply related [relevance 69%]
* [bug#68901] [PATCH] gnu: whoogle-search: Update to 0.8.4.
@ 2024-02-02 23:35 70% Skylar Chan
0 siblings, 0 replies; 200+ results
From: Skylar Chan @ 2024-02-02 23:35 UTC (permalink / raw)
To: 68901; +Cc: Skylar Chan
* gnu/packages/python-web.scm (whoogle-search): Update to 0.8.4.
[propagated-inputs]: Add python-validators.
Change-Id: I4543808d662e7e946c8a398b28ca963e75d4bfd1
---
gnu/packages/python-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c0cc46e5f..2dd5dd1c5a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5342,13 +5342,13 @@ (define-public python-google-auth-oauthlib
(define-public whoogle-search
(package
(name "whoogle-search")
- (version "0.8.3")
+ (version "0.8.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "whoogle-search" version))
(sha256
(base32
- "09b9k97jflajvrs0npyz994rj8xkk400s98jw63b6vpsgw9q9nk4"))))
+ "0hsy4l98nzj6i1lf63wvqd0yharkaz44zsxh863ymy47rxnwimz7"))))
(build-system pyproject-build-system)
(arguments
(list
@@ -5364,6 +5364,7 @@ (define-public whoogle-search
python-dotenv
python-requests
python-stem
+ python-validators
python-waitress))
(home-page "https://github.com/benbusby/whoogle-search")
(synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine")
base-commit: bf7991a8c767abd32cfb2c92e3d57665a7cabf00
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#68649] [PATCH 1/3] gnu: Add python-zconfig.
@ 2024-01-21 21:12 67% ` Troy Figiel
2024-01-21 21:12 70% ` [bug#68649] [PATCH 2/3] gnu: Add python-zodbpickle Troy Figiel
2024-01-21 21:13 66% ` [bug#68649] [PATCH 3/3] gnu: Add python-zodb Troy Figiel
2 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-21 21:12 UTC (permalink / raw)
To: 68649
* gnu/packages/python-web.scm (python-zconfig): New variable.
---
gnu/packages/python-web.scm | 38 +++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c7303fa99..91e60bad8b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2651,6 +2651,44 @@ (define-public python-zc-lockfile
files. These locks can also be used to mediate access to other files.")
(license license:zpl2.1)))
+(define-public python-zconfig
+ (package
+ (name "python-zconfig")
+ (version "4.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "ZConfig" version))
+ (sha256
+ (base32 "0mh13p38vq7ip4zkvaplzr8w0mqrmmqiyb5y663d165slvxl5mpq"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ ;; This test assumes we still have setup.py in the
+ ;; directory from which we import zconfig, which
+ ;; does not work after installing the package.
+ (delete-file-recursively
+ "src/ZConfig/tests/test_readme.py")
+ (invoke "zope-testrunner" "-vv" "--test-path=src"
+ "--all"))
+ (format #t "test suite not run~%")))))))
+ (native-inputs (list python-docutils python-manuel python-zope-exceptions
+ python-zope-testrunner))
+ (home-page "https://github.com/zopefoundation/ZConfig/")
+ (synopsis "Structured configuration library intended for general use")
+ (description
+ "@code{zconfig} is a configuration library intended for general
+use. It supports a hierarchical schema-driven configuration model that allows
+a schema to specify data conversion routines written in Python. Its model is
+very different from the model supported by the @code{configparser} module
+found in Python's standard library, and is more suitable to
+configuration-intensive applications.")
+ (license license:zpl2.1)))
+
(define-public python-zope-event
(package
(name "python-zope-event")
--
2.42.0
^ permalink raw reply related [relevance 67%]
* [bug#68649] [PATCH 3/3] gnu: Add python-zodb.
2024-01-21 21:12 67% ` [bug#68649] [PATCH 1/3] gnu: Add python-zconfig Troy Figiel
2024-01-21 21:12 70% ` [bug#68649] [PATCH 2/3] gnu: Add python-zodbpickle Troy Figiel
@ 2024-01-21 21:13 66% ` Troy Figiel
2 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-21 21:13 UTC (permalink / raw)
To: 68649
* gnu/packages/python-web.scm (python-zodb): New variable.
---
gnu/packages/python-web.scm | 51 +++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4267b417c8..762b7d7bb2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2689,6 +2689,57 @@ (define-public python-zconfig
configuration-intensive applications.")
(license license:zpl2.1)))
+(define-public python-zodb
+ (package
+ (name "python-zodb")
+ (version "5.8.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "ZODB" version))
+ (sha256
+ (base32 "1pv4w8mnx6j4xvkcjbkh99pv8ljby7g9f7zjq7zhdmk06sykmiy6"))))
+ (build-system pyproject-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (begin
+ ;; This test does not work after installing the
+ ;; package, since it expects the ZODB source code
+ ;; to reside in the src/ directory.
+ (delete-file-recursively
+ "src/ZODB/tests/testdocumentation.py")
+ (invoke "zope-testrunner" "-vv" "--test-path=src"
+ "--all"))
+ (format #t "test suite not run~%")))))))
+ (propagated-inputs (list python-btrees
+ python-persistent
+ python-zconfig
+ python-six
+ python-transaction
+ python-zc-lockfile
+ python-zodbpickle
+ python-zope-interface))
+ (native-inputs (list python-manuel python-zope-testing
+ python-zope-testrunner))
+ (home-page "http://zodb-docs.readthedocs.io")
+ (synopsis "Object-oriented database for Python")
+ (description
+ "@code{ZODB} provides an object-oriented and @acronym{ACID,
+Atomicity Consistency Isolation Durability} compliant database for Python with
+a high degree of transparency. @code{ZODB} is an object-oriented database,
+not an object-relational mapping. This comes with several advantaged:
+
+@itemize
+@item no separate language for database operations
+@item very little impact on your code to make objects persistent
+@item no database mapper that partially hides the database.
+@item almost no seam between code and database.
+@end itemize")
+ (license license:zpl2.1)))
+
(define-public python-zodbpickle
(package
(name "python-zodbpickle")
--
2.42.0
^ permalink raw reply related [relevance 66%]
* [bug#68649] [PATCH 2/3] gnu: Add python-zodbpickle.
2024-01-21 21:12 67% ` [bug#68649] [PATCH 1/3] gnu: Add python-zconfig Troy Figiel
@ 2024-01-21 21:12 70% ` Troy Figiel
2024-01-21 21:13 66% ` [bug#68649] [PATCH 3/3] gnu: Add python-zodb Troy Figiel
2 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-21 21:12 UTC (permalink / raw)
To: 68649
* gnu/packages/python-web.scm (python-zodbpickle): New variable.
---
gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 91e60bad8b..4267b417c8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2689,6 +2689,34 @@ (define-public python-zconfig
configuration-intensive applications.")
(license license:zpl2.1)))
+(define-public python-zodbpickle
+ (package
+ (name "python-zodbpickle")
+ (version "3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "zodbpickle" version))
+ (sha256
+ (base32 "04fcmdx10lk5ww740avphd1fj5wic2bav9skkavhif670vkk5v5r"))))
+ (build-system pyproject-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "zope-testrunner" "-vv" "--test-path=src"
+ "--all")
+ (format #t "test suite not run~%")))))))
+ (native-inputs (list python-zope-testrunner))
+ (home-page "https://github.com/zopefoundation/zodbpickle")
+ (synopsis "Uniform pickling interface for @code{zodb}")
+ (description
+ "This package is a fork of the @code{pickle} module (and the
+supporting C extension) from both Python 3.2 and Python 3.3. The fork adds
+support for the @code{noload} operations used by @code{zodb}.")
+ (license (list license:psfl license:zpl2.1))))
+
(define-public python-zope-event
(package
(name "python-zope-event")
--
2.42.0
^ permalink raw reply related [relevance 70%]
* [bug#68492] [PATCH] gnu: Add python-fastapi-pagination.
@ 2024-01-15 23:25 67% Giacomo Leidi via Guix-patches via
2024-02-28 23:35 64% ` [bug#68492] [PATCH v2 1/2] gnu: Add python-fastapi-pagination-minimal Giacomo Leidi via Guix-patches via
0 siblings, 1 reply; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-01-15 23:25 UTC (permalink / raw)
To: 68492; +Cc: Giacomo Leidi
* gnu/packages/python-web.scm (python-fastapi-pagination): New variable.
Change-Id: I335d984607ebb954032dd4b1eedccf436584c59d
---
gnu/packages/python-web.scm | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 418100c084..ecb546ca8e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
-;;; Copyright © 2020, 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020, 2022, 2024 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -8663,6 +8663,35 @@ (define-public python-fastapi-csrf-protect
pattern.")
(license license:expat)))
+(define-public python-fastapi-pagination
+ (package
+ (name "python-fastapi-pagination")
+ (version "0.12.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uriyyo/fastapi-pagination")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qkcphjk1qy680v1hkmqbs4p7srvx020wy39b97anrn9dyyi5ah6"))))
+ (build-system pyproject-build-system)
+ (arguments
+ ;; Tests depend on python-cassandra
+ `(#:tests? #f))
+ (native-inputs
+ (list poetry))
+ (propagated-inputs (list python-fastapi
+ python-pydantic))
+ (home-page "https://github.com/uriyyo/fastapi-pagination")
+ (synopsis "FastAPI pagination library")
+ (description "@code{fastapi-pagination} is a Python library designed to
+simplify pagination in FastAPI applications. It provides a set of utility
+functions and data models to help you paginate your database queries and
+return paginated responses to your clients.")
+ (license license:expat)))
+
(define-public python-pyactiveresource
(package
(name "python-pyactiveresource")
base-commit: 19db1551dc6f6180d2cda9084c2dec37bf4923c9
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#66886] [PATCH v4 3/6] gnu: python-rich: Update to 13.7.0.
@ 2024-01-14 23:59 68% ` Giacomo Leidi via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-01-14 23:59 UTC (permalink / raw)
To: 66886; +Cc: Giacomo Leidi
* gnu/packages/bioinformatics.scm (multiqc)[propagated-inputs]: Use
python-rich-12.4.
* gnu/packages/python-xyz.scm (python-rich): Update to 13.7.0;
[source]: switch to git-origin to have tests;
[build-system]: switch to pyproject-build-system;
[arguments]: remove it since this boilerplate is now handled by the
pyproject-build-system;
[propagated-inputs]: remove python-colorama as it's not listed on
pyproject.toml;
replace python-commonmark with python-markdown-it-py;
use python-pygments-2.16;
move python-attrs from here...;
[native-inputs]: ...to here;
drop "tests" input;
add python-pytest-cov;
[home-page]: https://github.com/willmcgugan/rich now redirects to
https://github.com/Textualize/rich ;
(python-rich-12.4): new variable;
(pelican)[propagated-inputs]: use python-pygments-2.16.
* gnu/packages/python-web.scm (httpie)[propagated-inputs]: Use
python-pygments-2.16.
Change-Id: I16ea6f27d24f84d86db659c224705c81fac3b42e
---
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 64 ++++++++++++++++-----------------
3 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index f75254ed9f..60d0dc6f8f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12512,7 +12512,7 @@ (define-public multiqc
python-numpy
python-pyyaml
python-requests
- python-rich
+ python-rich-12.4
python-rich-click
python-simplejson
python-spectra))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 567b01f396..74ec405a94 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1208,7 +1208,7 @@ (define-public httpie
'(#:tests? #f))
(propagated-inputs
(list python-colorama
- python-pygments
+ python-pygments-2.16
python-requests
python-requests-toolbelt
python-pysocks
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a0ad12a29f..cef458e0fc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7205,7 +7205,7 @@ (define-public pelican
python-feedgenerator
python-jinja2
python-markdown
- python-pygments
+ python-pygments-2.16
python-pytz
python-rich
python-unidecode))
@@ -18585,49 +18585,47 @@ (define-public python-slugid
(define-public python-rich
(package
(name "python-rich")
- (version "12.4.1")
+ (version "13.7.0")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "rich" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Textualize/rich")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "149vjb4cpf9mz14iig0b6d8065dm8aslp6pc45g9ipmp1wf00ffj"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs tests? #:allow-other-keys)
- (when tests?
- (copy-recursively (string-append
- (assoc-ref inputs "tests") "/tests")
- "tests")
- (invoke "python" "-m" "pytest" "-vv")))))))
+ "0qyhw2vvk17qdmfrmi45z4dd0fkwx3l2qrf3iy0yc2y7pfgrmg9g"))))
+ (build-system pyproject-build-system)
(propagated-inputs
- (list python-attrs python-colorama python-commonmark python-pygments
- python-typing-extensions))
+ (list python-markdown-it-py python-pygments-2.16 python-typing-extensions))
(native-inputs
- `(("python-pytest" ,python-pytest)
- ("tests"
- ;; The release on pypi comes without tests. We can't build from this
- ;; checkout, though, because installation requires an invocation of
- ;; poetry.
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/willmcgugan/rich")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9"))))))
- (home-page "https://github.com/willmcgugan/rich")
+ (list poetry python-attr python-pytest python-pytest-cov))
+ (home-page "https://github.com/Textualize/rich")
(synopsis "Render rich text and more to the terminal")
(description
"This is a Python package for rendering rich text, tables, progress bars,
syntax highlighting, markdown and more to the terminal.")
(license license:expat)))
+(define-public python-rich-12.4
+ (package
+ (inherit python-rich)
+ (version "12.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Textualize/rich")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "python-rich" version))
+ (sha256
+ (base32
+ "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9"))))
+ (propagated-inputs
+ (list python-colorama
+ python-commonmark
+ python-pygments
+ python-typing-extensions))))
+
(define-public python-rich-click
(package
(name "python-rich-click")
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#68459] [PATCH v4 3/6] gnu: python-rich: Update to 13.7.0.
@ 2024-01-14 23:56 68% ` Giacomo Leidi via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2024-01-14 23:56 UTC (permalink / raw)
To: 68459; +Cc: Giacomo Leidi
* gnu/packages/bioinformatics.scm (multiqc)[propagated-inputs]: Use
python-rich-12.4.
* gnu/packages/python-xyz.scm (python-rich): Update to 13.7.0;
[source]: switch to git-origin to have tests;
[build-system]: switch to pyproject-build-system;
[arguments]: remove it since this boilerplate is now handled by the
pyproject-build-system;
[propagated-inputs]: remove python-colorama as it's not listed on
pyproject.toml;
replace python-commonmark with python-markdown-it-py;
use python-pygments-2.16;
move python-attrs from here...;
[native-inputs]: ...to here;
drop "tests" input;
add python-pytest-cov;
[home-page]: https://github.com/willmcgugan/rich now redirects to
https://github.com/Textualize/rich ;
(python-rich-12.4): new variable;
(pelican)[propagated-inputs]: use python-pygments-2.16.
* gnu/packages/python-web.scm (httpie)[propagated-inputs]: Use
python-pygments-2.16.
Change-Id: I16ea6f27d24f84d86db659c224705c81fac3b42e
---
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 64 ++++++++++++++++-----------------
3 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index f75254ed9f..60d0dc6f8f 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -12512,7 +12512,7 @@ (define-public multiqc
python-numpy
python-pyyaml
python-requests
- python-rich
+ python-rich-12.4
python-rich-click
python-simplejson
python-spectra))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 567b01f396..74ec405a94 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1208,7 +1208,7 @@ (define-public httpie
'(#:tests? #f))
(propagated-inputs
(list python-colorama
- python-pygments
+ python-pygments-2.16
python-requests
python-requests-toolbelt
python-pysocks
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a0ad12a29f..cef458e0fc 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7205,7 +7205,7 @@ (define-public pelican
python-feedgenerator
python-jinja2
python-markdown
- python-pygments
+ python-pygments-2.16
python-pytz
python-rich
python-unidecode))
@@ -18585,49 +18585,47 @@ (define-public python-slugid
(define-public python-rich
(package
(name "python-rich")
- (version "12.4.1")
+ (version "13.7.0")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "rich" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Textualize/rich")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "149vjb4cpf9mz14iig0b6d8065dm8aslp6pc45g9ipmp1wf00ffj"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs tests? #:allow-other-keys)
- (when tests?
- (copy-recursively (string-append
- (assoc-ref inputs "tests") "/tests")
- "tests")
- (invoke "python" "-m" "pytest" "-vv")))))))
+ "0qyhw2vvk17qdmfrmi45z4dd0fkwx3l2qrf3iy0yc2y7pfgrmg9g"))))
+ (build-system pyproject-build-system)
(propagated-inputs
- (list python-attrs python-colorama python-commonmark python-pygments
- python-typing-extensions))
+ (list python-markdown-it-py python-pygments-2.16 python-typing-extensions))
(native-inputs
- `(("python-pytest" ,python-pytest)
- ("tests"
- ;; The release on pypi comes without tests. We can't build from this
- ;; checkout, though, because installation requires an invocation of
- ;; poetry.
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/willmcgugan/rich")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9"))))))
- (home-page "https://github.com/willmcgugan/rich")
+ (list poetry python-attr python-pytest python-pytest-cov))
+ (home-page "https://github.com/Textualize/rich")
(synopsis "Render rich text and more to the terminal")
(description
"This is a Python package for rendering rich text, tables, progress bars,
syntax highlighting, markdown and more to the terminal.")
(license license:expat)))
+(define-public python-rich-12.4
+ (package
+ (inherit python-rich)
+ (version "12.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Textualize/rich")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "python-rich" version))
+ (sha256
+ (base32
+ "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9"))))
+ (propagated-inputs
+ (list python-colorama
+ python-commonmark
+ python-pygments
+ python-typing-extensions))))
+
(define-public python-rich-click
(package
(name "python-rich-click")
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#68431] [PATCH 3/3] gnu: python-requests-kerberos: Enable tests.
2024-01-13 17:59 70% ` [bug#68431] [PATCH 2/3] gnu: python-requests-kerberos: Fix build Troy Figiel
@ 2024-01-13 18:04 69% ` Troy Figiel
1 sibling, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-13 18:04 UTC (permalink / raw)
To: 68431
* gnu/packages/python-web.scm (python-requests-kerberos): Enable tests.
[source]: Replace the PyPI release by the Github release.
[arguments]<#:phases>: Replace the default check phase with a pytest
invocation.
[native-inputs]: Add python-pytest and python-pytest-mock.
---
gnu/packages/python-web.scm | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e13716081f..7b25bee15a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3300,13 +3300,23 @@ (define-public python-requests-kerberos
(package
(name "python-requests-kerberos")
(version "0.14.0")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "requests-kerberos" version))
- (sha256
- (base32
- "1lbgjs779cjxhz07lfl9dbyp3qfh8a3ir2393042wfg518jd3afd"))))
+ ;; No tests in the PyPI tarball.
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/requests/requests-kerberos")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0s30pcnlir3j2jmf7yh065f294cf3x0x5i3ldskn8mm0a3657mv3"))))
(build-system python-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vv")))))))
(propagated-inputs (list python-cryptography
python-pyspnego
python-requests
@@ -3316,6 +3326,7 @@ (define-public python-requests-kerberos
;; code though.
python-gssapi
python-krb5))
+ (native-inputs (list python-pytest python-pytest-mock))
(home-page "https://github.com/requests/requests-kerberos")
(synopsis "Kerberos authentication handler for python-requests")
(description "This package provides a Kerberos authentication handler for
--
2.42.0
^ permalink raw reply related [relevance 69%]
* [bug#68431] [PATCH 2/3] gnu: python-requests-kerberos: Fix build.
@ 2024-01-13 17:59 70% ` Troy Figiel
2024-01-13 18:04 69% ` [bug#68431] [PATCH 3/3] gnu: python-requests-kerberos: Enable tests Troy Figiel
1 sibling, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-13 17:59 UTC (permalink / raw)
To: 68431
* gnu/packages/python-web.scm (python-requests-kerberos)[propagated-inputs]:
Add python-gssapi and python-krb5.
---
gnu/packages/python-web.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 567b01f396..e13716081f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3307,8 +3307,15 @@ (define-public python-requests-kerberos
(base32
"1lbgjs779cjxhz07lfl9dbyp3qfh8a3ir2393042wfg518jd3afd"))))
(build-system python-build-system)
- (propagated-inputs (list python-cryptography python-pyspnego
- python-requests))
+ (propagated-inputs (list python-cryptography
+ python-pyspnego
+ python-requests
+
+ ;; Required through pyspnego[kerberos]. Only
+ ;; `python-krb5' is directly used in the source
+ ;; code though.
+ python-gssapi
+ python-krb5))
(home-page "https://github.com/requests/requests-kerberos")
(synopsis "Kerberos authentication handler for python-requests")
(description "This package provides a Kerberos authentication handler for
--
2.42.0
^ permalink raw reply related [relevance 70%]
* [bug#68424] [PATCH 2/3] gnu: hypercorn: Remove unnecessary native-input.
2024-01-13 11:26 70% ` [bug#68424] [PATCH 1/3] gnu: hypercorn: Add missing propagated-inputs Troy Figiel
@ 2024-01-13 11:36 70% ` Troy Figiel
2024-01-13 11:40 69% ` [bug#68424] [PATCH 3/3] gnu: hypercorn: Reformat with guix style Troy Figiel
2 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-13 11:36 UTC (permalink / raw)
To: 68424
* gnu/packages/python-web.scm (hypercorn)[native-inputs]: Remove python-mock.
---
gnu/packages/python-web.scm | 1 -
1 file changed, 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dd85581032..f88ea6437e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2400,7 +2400,6 @@ (define-public hypercorn
python-wsproto))
(native-inputs
(list python-hypothesis
- python-mock
python-poetry-core
python-pytest
python-pytest-asyncio
--
2.42.0
^ permalink raw reply related [relevance 70%]
* [bug#68424] [PATCH 3/3] gnu: hypercorn: Reformat with guix style.
2024-01-13 11:26 70% ` [bug#68424] [PATCH 1/3] gnu: hypercorn: Add missing propagated-inputs Troy Figiel
2024-01-13 11:36 70% ` [bug#68424] [PATCH 2/3] gnu: hypercorn: Remove unnecessary native-input Troy Figiel
@ 2024-01-13 11:40 69% ` Troy Figiel
2 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-13 11:40 UTC (permalink / raw)
To: 68424
* gnu/packages/python-web.scm (hypercorn): Reformat with guix style.
---
gnu/packages/python-web.scm | 46 ++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f88ea6437e..ee1a4d8a3f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2380,32 +2380,30 @@ (define-public hypercorn
(package
(name "hypercorn")
(version "0.14.4")
- (source (origin
- (method git-fetch) ;PyPI does not have tests
- (uri (git-reference
- (url "https://github.com/pgjones/hypercorn")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0zyf5b8959sd12ycmqzvsb8746i3gn76rz55gxvix5cwj672m7yx"))))
+ (source
+ (origin
+ (method git-fetch) ;PyPI does not have tests
+ (uri (git-reference
+ (url "https://github.com/pgjones/hypercorn")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0zyf5b8959sd12ycmqzvsb8746i3gn76rz55gxvix5cwj672m7yx"))))
(build-system pyproject-build-system)
;; Propagate because Hypercorn also exposes functionality over a module.
- (propagated-inputs
- (list python-exceptiongroup
- python-h11
- python-h2
- python-priority
- python-tomli
- python-wsproto))
- (native-inputs
- (list python-hypothesis
- python-poetry-core
- python-pytest
- python-pytest-asyncio
- python-pytest-cov
- python-pytest-trio
- python-trio))
+ (propagated-inputs (list python-exceptiongroup
+ python-h11
+ python-h2
+ python-priority
+ python-tomli
+ python-wsproto))
+ (native-inputs (list python-hypothesis
+ python-poetry-core
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-pytest-trio
+ python-trio))
(home-page "https://gitlab.com/pgjones/hypercorn/")
(synopsis "ASGI Server based on Hyper libraries")
(description
--
2.42.0
^ permalink raw reply related [relevance 69%]
* [bug#68424] [PATCH 1/3] gnu: hypercorn: Add missing propagated-inputs.
@ 2024-01-13 11:26 70% ` Troy Figiel
2024-01-13 11:36 70% ` [bug#68424] [PATCH 2/3] gnu: hypercorn: Remove unnecessary native-input Troy Figiel
2024-01-13 11:40 69% ` [bug#68424] [PATCH 3/3] gnu: hypercorn: Reformat with guix style Troy Figiel
2 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-13 11:26 UTC (permalink / raw)
To: 68424
* gnu/packages/python-web.scm (hypercorn)[propagated-inputs]: Add
python-exceptiongroup and python-tomli. Remove python-toml and python-typing-extensions.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 567b01f396..dd85581032 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2392,11 +2392,11 @@ (define-public hypercorn
(build-system pyproject-build-system)
;; Propagate because Hypercorn also exposes functionality over a module.
(propagated-inputs
- (list python-h11
+ (list python-exceptiongroup
+ python-h11
python-h2
python-priority
- python-toml
- python-typing-extensions
+ python-tomli
python-wsproto))
(native-inputs
(list python-hypothesis
--
2.42.0
^ permalink raw reply related [relevance 70%]
* [bug#68197] [PATCH v2REVISION 2/5] gnu: Add python-requests-2.31.
2024-01-02 1:25 63% ` [bug#68197] [PATCH v2REVISION 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
@ 2024-01-02 1:25 67% ` Jaeme Sifat via Guix-patches via
2024-01-02 1:25 66% ` [bug#68197] [PATCH v2REVISION 4/5] gnu: Add python-websockets-12 Jaeme Sifat via Guix-patches via
1 sibling, 0 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2024-01-02 1:25 UTC (permalink / raw)
To: 68197
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-requests-2.31): New variable.
* gnu/packages/python-web.scm (python-requests): Inherit from
python-requests-2.31.
Change-Id: I63aa988a03d198bbc010b56e8742b5d000caeaeb
---
gnu/packages/python-web.scm | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index cd5cac4f44..261277155a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3212,25 +3212,23 @@ (define-public python-beren
"@code{beren} provides a REST client for Orthanc, a DICOM server.")
(license license:gpl3+)))
-(define-public python-requests
+(define-public python-requests-2.31
(package
(name "python-requests")
- (version "2.28.1")
+ (version "2.31.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "requests" version))
(sha256
(base32
- "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
- (build-system python-build-system)
+ "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l"))))
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-certifi
python-charset-normalizer
python-idna
python-urllib3))
- (arguments
- ;; FIXME: Some tests require network access.
- '(#:tests? #f))
+ (arguments (list #:tests? #f))
(home-page "http://python-requests.org/")
(synopsis "Python HTTP library")
(description
@@ -3238,6 +3236,24 @@ (define-public python-requests
than Python’s urllib2 library.")
(license license:asl2.0)))
+(define-public python-requests
+ (package
+ (inherit python-requests-2.31)
+ (name "python-requests")
+ (version "2.28.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "requests" version))
+ (sha256
+ (base32
+ "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
+ (build-system python-build-system) ; Tests require network access.
+ (propagated-inputs
+ (list python-certifi
+ python-charset-normalizer
+ python-idna
+ python-urllib3))))
+
(define-public python-requests-kerberos
(package
(name "python-requests-kerberos")
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#68197] [PATCH v2REVISION 4/5] gnu: Add python-websockets-12.
2024-01-02 1:25 63% ` [bug#68197] [PATCH v2REVISION 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
2024-01-02 1:25 67% ` [bug#68197] [PATCH v2REVISION 2/5] gnu: Add python-requests-2.31 Jaeme Sifat via Guix-patches via
@ 2024-01-02 1:25 66% ` Jaeme Sifat via Guix-patches via
1 sibling, 0 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2024-01-02 1:25 UTC (permalink / raw)
To: 68197
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-websockets-12): New variable.
Change-Id: I5e4555098039d17db87f16f488e302cc27668898
---
gnu/packages/python-web.scm | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 261277155a..2797f9ff49 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6336,8 +6336,32 @@ (define-public python-warcio
files.")
(license license:asl2.0))))
+(define-public python-websockets-12
+ (package
+ (name "python-websockets")
+ (version "12.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "websockets" version))
+ (sha256
+ (base32 "06wbik9ksfbzafq0fla3r2pjvgpy3c0qrr87w3hhs9kcpfy9rpw1"))))
+ (build-system pyproject-build-system)
+ (arguments (list #:tests? #f))
+ (home-page "https://github.com/aaugustin/websockets")
+ (synopsis
+ "Python implementation of the WebSocket Protocol (RFC 6455 & 7692)")
+ (description
+ "@code{websockets} is a library for building WebSocket servers and clients
+in Python with a focus on correctness and simplicity.
+
+Built on top of @code{asyncio}, Python's standard asynchronous I/O framework,
+it provides an elegant coroutine-based API.")
+ (license license:bsd-3)))
+
(define-public python-websockets
(package
+ (inherit python-websockets-12)
(name "python-websockets")
(version "11.0.3")
(source
@@ -6356,17 +6380,7 @@ (define-public python-websockets
#~(modify-phases %standard-phases
(add-before 'check 'extend-test-timeout
(lambda _
- (setenv "WEBSOCKETS_TESTS_TIMEOUT_FACTOR" "10"))))))
- (home-page "https://github.com/aaugustin/websockets")
- (synopsis
- "Python implementation of the WebSocket Protocol (RFC 6455 & 7692)")
- (description
- "@code{websockets} is a library for building WebSocket servers and clients
-in Python with a focus on correctness and simplicity.
-
-Built on top of @code{asyncio}, Python's standard asynchronous I/O framework,
-it provides an elegant coroutine-based API.")
- (license license:bsd-3)))
+ (setenv "WEBSOCKETS_TESTS_TIMEOUT_FACTOR" "10"))))))))
(define-public python-selenium
(package
--
2.41.0
^ permalink raw reply related [relevance 66%]
* [bug#68197] [PATCH v2REVISION 1/5] gnu: Add python-urllib3-2.
` (2 preceding siblings ...)
2024-01-01 23:21 66% ` [bug#68197] [PATCH 4/5] gnu: Add python-websockets-12 Jaeme Sifat via Guix-patches via
@ 2024-01-02 1:25 63% ` Jaeme Sifat via Guix-patches via
2024-01-02 1:25 67% ` [bug#68197] [PATCH v2REVISION 2/5] gnu: Add python-requests-2.31 Jaeme Sifat via Guix-patches via
2024-01-02 1:25 66% ` [bug#68197] [PATCH v2REVISION 4/5] gnu: Add python-websockets-12 Jaeme Sifat via Guix-patches via
3 siblings, 2 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2024-01-02 1:25 UTC (permalink / raw)
To: 68197
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-urllib3-2): New variable.
* gnu/packages/python-web.scm (python-urllib3): Inherit python-urllib3-2.
Change-Id: Ib96504a72eb6f4485a777854bd7580c4b092756a
---
gnu/packages/python-web.scm | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 06b578dac7..cd5cac4f44 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -60,6 +60,7 @@
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
+;;; Copyright © 2024 Jaeme Sifat <jaeme@runbox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3597,8 +3598,31 @@ (define-public python-unalix
addon for removing tracking fields from URLs.")
(license license:lgpl3+)))
+(define-public python-urllib3-2
+ (package
+ (name "python-urllib3")
+ (version "2.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "urllib3" version))
+ (sha256
+ (base32
+ "0m1dnpbw2dyxp7658v1fm37zzx5mb4n9p2g7i22ag3qln2pshynz"))))
+ (build-system pyproject-build-system)
+ (arguments `(#:tests? #f))
+ (native-inputs (list python-hatchling))
+ (home-page "https://urllib3.readthedocs.io/")
+ (synopsis "HTTP library with thread-safe connection pooling")
+ (description
+ "Urllib3 supports features left out of urllib and urllib2 libraries. It
+can reuse the same socket connection for multiple requests, it can POST files,
+supports url redirection and retries, and also gzip and deflate decoding.")
+ (license license:expat)))
+
(define-public python-urllib3
(package
+ (inherit python-urllib3-2)
(name "python-urllib3")
(version "1.26.15")
(source
@@ -3609,7 +3633,7 @@ (define-public python-urllib3
(base32
"01dkqv0rsjqyw4wrp6yj8h3bcnl7c678qkj845596vs7p4bqff4a"))))
(build-system python-build-system)
- (arguments `(#:tests? #f))
+ (native-inputs '())
(propagated-inputs
(append
;; These 5 inputs are used to build urrlib3[secure]
@@ -3623,14 +3647,7 @@ (define-public python-urllib3
(package-transitive-supported-systems python-pyopenssl))
(list python-pyopenssl)
'())
- (list python-pysocks)))
- (home-page "https://urllib3.readthedocs.io/")
- (synopsis "HTTP library with thread-safe connection pooling")
- (description
- "Urllib3 supports features left out of urllib and urllib2 libraries. It
-can reuse the same socket connection for multiple requests, it can POST files,
-supports url redirection and retries, and also gzip and deflate decoding.")
- (license license:expat)))
+ (list python-pysocks)))))
(define-public awscli
(package
base-commit: ee0cf3b9ff4cd5a9d3637d09677195ea9ee1a8c0
--
2.41.0
^ permalink raw reply related [relevance 63%]
* [bug#68197] [PATCH 4/5] gnu: Add python-websockets-12.
2024-01-01 23:21 64% ` [bug#68197] [PATCH 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
2024-01-01 23:21 67% ` [bug#68197] [PATCH 2/5] gnu: Add python-requests-2.31 Jaeme Sifat via Guix-patches via
@ 2024-01-01 23:21 66% ` Jaeme Sifat via Guix-patches via
2024-01-02 1:25 63% ` [bug#68197] [PATCH v2REVISION 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
3 siblings, 0 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2024-01-01 23:21 UTC (permalink / raw)
To: 68197
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-websockets-12): New variable.
Change-Id: I5e4555098039d17db87f16f488e302cc27668898
---
gnu/packages/python-web.scm | 36 +++++++++++++++++++++++++-----------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 92d041e794..35e9a027e9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6335,8 +6335,32 @@ (define-public python-warcio
files.")
(license license:asl2.0))))
+(define-public python-websockets-12
+ (package
+ (name "python-websockets")
+ (version "12.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "websockets" version))
+ (sha256
+ (base32 "06wbik9ksfbzafq0fla3r2pjvgpy3c0qrr87w3hhs9kcpfy9rpw1"))))
+ (build-system pyproject-build-system)
+ (arguments (list #:tests? #f))
+ (home-page "https://github.com/aaugustin/websockets")
+ (synopsis
+ "Python implementation of the WebSocket Protocol (RFC 6455 & 7692)")
+ (description
+ "@code{websockets} is a library for building WebSocket servers and clients
+in Python with a focus on correctness and simplicity.
+
+Built on top of @code{asyncio}, Python's standard asynchronous I/O framework,
+it provides an elegant coroutine-based API.")
+ (license license:bsd-3)))
+
(define-public python-websockets
(package
+ (inherit python-websockets-12)
(name "python-websockets")
(version "11.0.3")
(source
@@ -6355,17 +6379,7 @@ (define-public python-websockets
#~(modify-phases %standard-phases
(add-before 'check 'extend-test-timeout
(lambda _
- (setenv "WEBSOCKETS_TESTS_TIMEOUT_FACTOR" "10"))))))
- (home-page "https://github.com/aaugustin/websockets")
- (synopsis
- "Python implementation of the WebSocket Protocol (RFC 6455 & 7692)")
- (description
- "@code{websockets} is a library for building WebSocket servers and clients
-in Python with a focus on correctness and simplicity.
-
-Built on top of @code{asyncio}, Python's standard asynchronous I/O framework,
-it provides an elegant coroutine-based API.")
- (license license:bsd-3)))
+ (setenv "WEBSOCKETS_TESTS_TIMEOUT_FACTOR" "10"))))))))
(define-public python-selenium
(package
--
2.41.0
^ permalink raw reply related [relevance 66%]
* [bug#68197] [PATCH 2/5] gnu: Add python-requests-2.31.
2024-01-01 23:21 64% ` [bug#68197] [PATCH 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
@ 2024-01-01 23:21 67% ` Jaeme Sifat via Guix-patches via
2024-01-01 23:21 66% ` [bug#68197] [PATCH 4/5] gnu: Add python-websockets-12 Jaeme Sifat via Guix-patches via
2024-01-02 1:25 63% ` [bug#68197] [PATCH v2REVISION 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
3 siblings, 0 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2024-01-01 23:21 UTC (permalink / raw)
To: 68197
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-requests-2.31): New variable.
* gnu/packages/python-web.scm (python-requests): Inherit from
python-requests-2.31.
Change-Id: I63aa988a03d198bbc010b56e8742b5d000caeaeb
---
gnu/packages/python-web.scm | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b2d67996a7..92d041e794 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3211,25 +3211,23 @@ (define-public python-beren
"@code{beren} provides a REST client for Orthanc, a DICOM server.")
(license license:gpl3+)))
-(define-public python-requests
+(define-public python-requests-2.31
(package
(name "python-requests")
- (version "2.28.1")
+ (version "2.31.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "requests" version))
(sha256
(base32
- "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
- (build-system python-build-system)
+ "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l"))))
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-certifi
python-charset-normalizer
python-idna
python-urllib3))
- (arguments
- ;; FIXME: Some tests require network access.
- '(#:tests? #f))
+ (arguments (list #:tests? #f))
(home-page "http://python-requests.org/")
(synopsis "Python HTTP library")
(description
@@ -3237,6 +3235,24 @@ (define-public python-requests
than Python’s urllib2 library.")
(license license:asl2.0)))
+(define-public python-requests
+ (package
+ (inherit python-requests-2.31)
+ (name "python-requests")
+ (version "2.28.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "requests" version))
+ (sha256
+ (base32
+ "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
+ (build-system python-build-system) ; Tests require network access.
+ (propagated-inputs
+ (list python-certifi
+ python-charset-normalizer
+ python-idna
+ python-urllib3))))
+
(define-public python-requests-kerberos
(package
(name "python-requests-kerberos")
--
2.41.0
^ permalink raw reply related [relevance 67%]
* [bug#68197] [PATCH 1/5] gnu: Add python-urllib3-2.
@ 2024-01-01 23:21 64% ` Jaeme Sifat via Guix-patches via
2024-01-01 23:21 67% ` [bug#68197] [PATCH 2/5] gnu: Add python-requests-2.31 Jaeme Sifat via Guix-patches via
` (2 subsequent siblings)
3 siblings, 0 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2024-01-01 23:21 UTC (permalink / raw)
To: 68197
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-urllib3-2): New variable.
* gnu/packages/python-web.scm (python-urllib3): Inherit python-urllib3-2.
Change-Id: Ib96504a72eb6f4485a777854bd7580c4b092756a
---
gnu/packages/python-web.scm | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 06b578dac7..b2d67996a7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3597,8 +3597,31 @@ (define-public python-unalix
addon for removing tracking fields from URLs.")
(license license:lgpl3+)))
+(define-public python-urllib3-2
+ (package
+ (name "python-urllib3")
+ (version "2.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "urllib3" version))
+ (sha256
+ (base32
+ "0m1dnpbw2dyxp7658v1fm37zzx5mb4n9p2g7i22ag3qln2pshynz"))))
+ (build-system pyproject-build-system)
+ (arguments `(#:tests? #f))
+ (native-inputs (list python-hatchling))
+ (home-page "https://urllib3.readthedocs.io/")
+ (synopsis "HTTP library with thread-safe connection pooling")
+ (description
+ "Urllib3 supports features left out of urllib and urllib2 libraries. It
+can reuse the same socket connection for multiple requests, it can POST files,
+supports url redirection and retries, and also gzip and deflate decoding.")
+ (license license:expat)))
+
(define-public python-urllib3
(package
+ (inherit python-urllib3-2)
(name "python-urllib3")
(version "1.26.15")
(source
@@ -3609,7 +3632,7 @@ (define-public python-urllib3
(base32
"01dkqv0rsjqyw4wrp6yj8h3bcnl7c678qkj845596vs7p4bqff4a"))))
(build-system python-build-system)
- (arguments `(#:tests? #f))
+ (native-inputs '())
(propagated-inputs
(append
;; These 5 inputs are used to build urrlib3[secure]
@@ -3623,14 +3646,7 @@ (define-public python-urllib3
(package-transitive-supported-systems python-pyopenssl))
(list python-pyopenssl)
'())
- (list python-pysocks)))
- (home-page "https://urllib3.readthedocs.io/")
- (synopsis "HTTP library with thread-safe connection pooling")
- (description
- "Urllib3 supports features left out of urllib and urllib2 libraries. It
-can reuse the same socket connection for multiple requests, it can POST files,
-supports url redirection and retries, and also gzip and deflate decoding.")
- (license license:expat)))
+ (list python-pysocks)))))
(define-public awscli
(package
--
2.41.0
^ permalink raw reply related [relevance 64%]
* [bug#68193] [PATCH] gnu: Add python-zc-lockfile.
@ 2024-01-01 18:52 88% Troy Figiel
0 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-01 18:52 UTC (permalink / raw)
To: 68193
* gnu/packages/python-web.scm (python-zc-lockfile): New variable.
---
gnu/packages/python-web.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 06b578dac7..82663a9754 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -60,6 +60,7 @@
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
+;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2595,6 +2596,32 @@ (define-public python-webob
object to help create WSGI responses.")
(license license:expat)))
+(define-public python-zc-lockfile
+ (package
+ (name "python-zc-lockfile")
+ (version "3.0.post1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "zc.lockfile" version))
+ (sha256
+ (base32 "1v41irj7azaag3f14xyviv3l8mvap74v5p3q274k68vakrnyxcmd"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (if tests?
+ (invoke "zope-testrunner" "--test-path=src")
+ (format #t "test suite not run~%")))))))
+ (native-inputs (list python-zope-testing python-zope-testrunner))
+ (home-page "https://github.com/zopefoundation/zc.lockfile")
+ (synopsis "Interprocess locks using lock files")
+ (description
+ "This package provides an implementation of interprocess locks using lock
+files. These locks can also be used to mediate access to other files.")
+ (license license:zpl2.1)))
+
(define-public python-zope-event
(package
(name "python-zope-event")
base-commit: ff586211aaf0e3b468ff3cedc5ede18e8ab529dd
--
2.40.1
^ permalink raw reply related [relevance 88%]
* [bug#68191] [PATCH] gnu: Add python-portend.
@ 2024-01-01 17:53 87% Troy Figiel
0 siblings, 0 replies; 200+ results
From: Troy Figiel @ 2024-01-01 17:53 UTC (permalink / raw)
To: 68191
* gnu/packages/python-web.scm (python-portend): New variable.
---
gnu/packages/python-web.scm | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 06b578dac7..8eed01c3e2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -60,6 +60,7 @@
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
+;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -201,6 +202,38 @@ (define-public python-lazr-uri
reusable library for parsing, manipulating, and generating URIs.")
(license license:lgpl3)))
+(define-public python-portend
+ (package
+ (name "python-portend")
+ (version "3.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "portend" version))
+ (sha256
+ (base32 "0wpvixicc3d0lack65554mvdrrckkn18p1xcgiv9v5cwq59a6l2j"))))
+ (build-system pyproject-build-system)
+ ;; Do not test pyproject.toml with python-pytest-checkdocs as it tries to
+ ;; download dependencies.
+ (arguments
+ '(#:test-flags '("-k" "not project")))
+ (propagated-inputs (list python-tempora))
+ ;; TODO: Add python-pytest-ruff to native-inputs once it has been packaged.
+ (native-inputs (list python-pytest
+ python-pytest-black
+ python-pytest-checkdocs
+ python-pytest-cov
+ python-pytest-enabler
+ python-pytest-mypy))
+ (home-page "https://github.com/jaraco/portend")
+ (synopsis "Monitor TCP ports for bound or unbound states")
+ (description
+ "@code{python-portend} can be used to monitor TCP ports for bound or
+unbound states. For example, waiting for a port to be occupied or freed
+within a set timeout. @code{python-portend} can also be used directly from
+the command line.")
+ (license license:expat)))
+
(define-public python-prawcore
(package
(name "python-prawcore")
base-commit: ff586211aaf0e3b468ff3cedc5ede18e8ab529dd
--
2.40.1
^ permalink raw reply related [relevance 87%]
* [bug#67737] [PATCH staging] gnu: python-requests: Update to 2.31.0.
@ 2023-12-10 3:18 70% Jaeme Sifat via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Jaeme Sifat via Guix-patches via @ 2023-12-10 3:18 UTC (permalink / raw)
To: 67737
Cc: Jaeme Sifat, Lars-Dominik Braun, Marius Bakke, Munyoki Kilyungi,
jgart
* gnu/packages/python-web.scm (python-requests): Update to 2.31.0.
Change-Id: I19ba51c887e88ea09eebeb3b8e2fbcd6daea05e6
---
gnu/packages/python-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 06b578dac7..394fd2dc44 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -60,6 +60,7 @@
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
+;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3214,13 +3215,13 @@ (define-public python-beren
(define-public python-requests
(package
(name "python-requests")
- (version "2.28.1")
+ (version "2.31.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "requests" version))
(sha256
(base32
- "10vrr7bijzrypvms3g2sgz8vya7f9ymmcv423ikampgy0aqrjmbw"))))
+ "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l"))))
(build-system python-build-system)
(propagated-inputs
(list python-certifi
base-commit: 61f2d84e75c340c2ba528d392f522c51b8843f34
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#66886] [PATCH v3 3/6] gnu: python-rich: Update to 13.7.0.
@ 2023-12-03 15:22 68% ` Giacomo Leidi via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2023-12-03 15:22 UTC (permalink / raw)
To: 66886; +Cc: Giacomo Leidi
* gnu/packages/bioinformatics.scm (multiqc)[propagated-inputs]: Use
python-rich-12.4.
* gnu/packages/python-xyz.scm (python-rich): Update to 13.7.0;
[source]: switch to git-origin to have tests;
[build-system]: switch to pyproject-build-system;
[arguments]: remove it since this boilerplate is now handled by the
pyproject-build-system;
[propagated-inputs]: remove python-colorama as it's not listed on
pyproject.toml;
replace python-commonmark with python-markdown-it-py;
use python-pygments-2.16;
move python-attrs from here...;
[native-inputs]: ...to here;
drop "tests" input;
add python-pytest-cov;
[home-page]: https://github.com/willmcgugan/rich now redirects to
https://github.com/Textualize/rich ;
(python-rich-12.4): new variable;
(pelican)[propagated-inputs]: use python-pygments-2.16.
* gnu/packages/python-web.scm (httpie)[propagated-inputs]: Use
python-pygments-2.16.
Change-Id: I16ea6f27d24f84d86db659c224705c81fac3b42e
---
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/python-web.scm | 2 +-
gnu/packages/python-xyz.scm | 64 ++++++++++++++++-----------------
3 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index a414a58382..63a58f1e26 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11938,7 +11938,7 @@ (define-public multiqc
python-numpy
python-pyyaml
python-requests
- python-rich
+ python-rich-12.4
python-rich-click
python-simplejson
python-spectra))
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9d8f3c156f..ab36d2ce28 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1175,7 +1175,7 @@ (define-public httpie
'(#:tests? #f))
(propagated-inputs
(list python-colorama
- python-pygments
+ python-pygments-2.16
python-requests
python-requests-toolbelt
python-pysocks
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a238764b14..7b96576810 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -7182,7 +7182,7 @@ (define-public pelican
python-feedgenerator
python-jinja2
python-markdown
- python-pygments
+ python-pygments-2.16
python-pytz
python-rich
python-unidecode))
@@ -18216,49 +18216,47 @@ (define-public python-slugid
(define-public python-rich
(package
(name "python-rich")
- (version "12.4.1")
+ (version "13.7.0")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "rich" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Textualize/rich")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "149vjb4cpf9mz14iig0b6d8065dm8aslp6pc45g9ipmp1wf00ffj"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key inputs tests? #:allow-other-keys)
- (when tests?
- (copy-recursively (string-append
- (assoc-ref inputs "tests") "/tests")
- "tests")
- (invoke "python" "-m" "pytest" "-vv")))))))
+ "0qyhw2vvk17qdmfrmi45z4dd0fkwx3l2qrf3iy0yc2y7pfgrmg9g"))))
+ (build-system pyproject-build-system)
(propagated-inputs
- (list python-attrs python-colorama python-commonmark python-pygments
- python-typing-extensions))
+ (list python-markdown-it-py python-pygments-2.16 python-typing-extensions))
(native-inputs
- `(("python-pytest" ,python-pytest)
- ("tests"
- ;; The release on pypi comes without tests. We can't build from this
- ;; checkout, though, because installation requires an invocation of
- ;; poetry.
- ,(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/willmcgugan/rich")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9"))))))
- (home-page "https://github.com/willmcgugan/rich")
+ (list poetry python-attr python-pytest python-pytest-cov))
+ (home-page "https://github.com/Textualize/rich")
(synopsis "Render rich text and more to the terminal")
(description
"This is a Python package for rendering rich text, tables, progress bars,
syntax highlighting, markdown and more to the terminal.")
(license license:expat)))
+(define-public python-rich-12.4
+ (package
+ (inherit python-rich)
+ (version "12.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Textualize/rich")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name "python-rich" version))
+ (sha256
+ (base32
+ "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9"))))
+ (propagated-inputs
+ (list python-colorama
+ python-commonmark
+ python-pygments
+ python-typing-extensions))))
+
(define-public python-rich-click
(package
(name "python-rich-click")
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#67237] [PATCH 26/32] gnu: parfive: Improve package style.
2023-11-17 12:16 70% ` [bug#67237] [PATCH 25/32] gnu: parfive: Update to 2.0.2 Sharlatan Hellseher
@ 2023-11-17 12:16 69% ` Sharlatan Hellseher
1 sibling, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2023-11-17 12:16 UTC (permalink / raw)
To: 67237
Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, jgart
* gnu/packages/python-web.scm (parfive): Update package style.
[build-system]: Swap to python-build-system.
[arguments]{phases}: Remove 'disable-test-requiring-network phase. Use
standard 'check phase. {test-flags}: Disable tests requiring network
access.
Change-Id: I5d233079f629398232f134c41fad6ea516c44c7f
---
gnu/packages/python-web.scm | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4b6f20745c..cc95643f07 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1204,18 +1204,15 @@ (define-public parfive
(sha256
(base32
"0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- (list #:phases #~(modify-phases %standard-phases
- (add-before 'check 'disable-test-requiring-network
- (lambda _
- (substitute* "parfive/tests/test_downloader.py"
- (("def test_ftp")
- "def __off_test_ftp"))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "python" "-m" "pytest" "-vvv" "parfive")))))))
+ (list
+ #:test-flags
+ ;; Disable tests requiring network access.
+ #~(list "-k" (string-append "not test_ftp"
+ " and not test_download_unique"
+ " and not test_custom_user_agent"
+ " and not test_multipart"))))
(propagated-inputs (list python-aiofiles python-aioftp python-aiohttp
python-tqdm))
(native-inputs (list python-pytest
--
2.41.0
^ permalink raw reply related [relevance 69%]
* [bug#67237] [PATCH 25/32] gnu: parfive: Update to 2.0.2.
@ 2023-11-17 12:16 70% ` Sharlatan Hellseher
2023-11-17 12:16 69% ` [bug#67237] [PATCH 26/32] gnu: parfive: Improve package style Sharlatan Hellseher
1 sibling, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2023-11-17 12:16 UTC (permalink / raw)
To: 67237
Cc: Sharlatan Hellseher, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, jgart
* gnu/packages/python-web.scm (parfive): Update to 2.0.2.
Change-Id: Ie06cf90d17b419f22dea7e312eb1124c679bdfdd
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8d5af5bd46..4b6f20745c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1197,13 +1197,13 @@ (define-public httpie
(define-public parfive
(package
(name "parfive")
- (version "2.0.1")
+ (version "2.0.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "parfive" version))
(sha256
(base32
- "19dcbb6g56l5s3ih0bhs3p4acgc0gf4zdzpj4w87m69li2nhmgpx"))))
+ "0pf8rzfwxpkn84xzb4v8m1fy3k7kjlh8f9ln4y5xqlnbqpwi30lh"))))
(build-system python-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#66881] [PATCH] gnu: whoogle-search: Update to 0.8.3.
@ 2023-11-01 12:00 65% Spencer Skylar Chan
0 siblings, 0 replies; 200+ results
From: Spencer Skylar Chan @ 2023-11-01 12:00 UTC (permalink / raw)
To: 66881
[-- Attachment #1: Type: text/plain, Size: 114 bytes --]
Updated using guix refresh, which is why the propagated inputs shrunk
so much. Otherwise seems to work correctly.
[-- Attachment #2: 0001-gnu-whoogle-search-Update-to-0.8.3.patch --]
[-- Type: text/x-patch, Size: 3018 bytes --]
From 6b06706ab479426621eeaf32e95ceb5e8c48b304 Mon Sep 17 00:00:00 2001
From: Skylar Chan <schan12@umd.edu>
Date: Tue, 31 Oct 2023 20:39:51 -0400
Subject: [PATCH] gnu: whoogle-search: Update to 0.8.3.
* gnu/packages/python-web.scm (whoogle-search): Update to 0.8.3.
[propagated-inputs]: Remove python-attrs, python-cachelib, python-certifi, python-cffi,
python-chardet, python-click, python-flask-session, python-idna,
python-itsdangerous, python-jinja2, python-markupsafe,
python-more-itertools, python-packaging, python-pluggy, python-py,
python-pycodestyle, python-pycparser, python-pyopenssl,
python-pyparsing, python-pysocks, python-dateutil, python-soupsieve,
python-urllib3, python-wcwidth, and python-werkzeug.
Change-Id: Ie665b548cdd996fa74e70313b02b9b5c2a0d75d2
---
gnu/packages/python-web.scm | 35 +++++------------------------------
1 file changed, 5 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8d5af5bd46..9d8f3c156f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5204,54 +5204,29 @@ (define-public python-google-auth-oauthlib
(define-public whoogle-search
(package
(name "whoogle-search")
- (version "0.8.2")
+ (version "0.8.3")
(source (origin
(method url-fetch)
(uri (pypi-uri "whoogle-search" version))
(sha256
(base32
- "1r6ymainwc3b8aar90b74mpnx3rsfscgzh0llwvsb03fbhiypw5g"))))
+ "09b9k97jflajvrs0npyz994rj8xkk400s98jw63b6vpsgw9q9nk4"))))
(build-system pyproject-build-system)
(arguments
(list
;; The tests need network access
#:tests? #f))
(propagated-inputs
- (list python-attrs
- python-beautifulsoup4
- python-cachelib
- python-certifi
- python-cffi
+ (list python-beautifulsoup4
python-brotli
- python-chardet
- python-click
python-cryptography
python-cssutils
python-defusedxml
python-flask
- python-flask-session
- python-idna
- python-itsdangerous
- python-jinja2
- python-markupsafe
- python-more-itertools
- python-packaging
- python-pluggy
- python-py
- python-pycodestyle
- python-pycparser
- python-pyopenssl
- python-pyparsing
- python-pysocks
- python-dateutil
+ python-dotenv
python-requests
- python-soupsieve
python-stem
- python-urllib3
- python-waitress
- python-wcwidth
- python-werkzeug
- python-dotenv))
+ python-waitress))
(home-page "https://github.com/benbusby/whoogle-search")
(synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine")
(description
base-commit: a0a377fdd6c873aeb6340afeddcd23b4ead7657d
--
2.39.2
^ permalink raw reply related [relevance 65%]
* [bug#66417] [PATCH 2/3] gnu: python-google-api-client: Update to 2.102.0
2023-10-09 7:40 70% ` [bug#66417] [PATCH 1/3] gnu: Add python-google-auth-oauthlib Pierre-Evariste Dagand
@ 2023-10-09 7:40 68% ` Pierre-Evariste Dagand
2023-10-09 7:40 61% ` [bug#66417] [PATCH 3/3] gnu: Remove python-google-api-core-1 and its dependency python-google-auth-1 Pierre-Evariste Dagand
2 siblings, 0 replies; 200+ results
From: Pierre-Evariste Dagand @ 2023-10-09 7:40 UTC (permalink / raw)
To: 66417
Cc: Pierre-Evariste Dagand, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, jgart
* gnu/packages/python-web.scm (python-google-api-client): Update to 2.102.0
* gnu/packages/python-web.scm (python-google-auth-httplib2): Update to 0.1.1
---
gnu/packages/python-web.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0e52f2fdbd..4dcc5b5fb9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5136,22 +5136,23 @@ (define-public python-google
(define-public python-google-api-client
(package
(name "python-google-api-client")
- (version "1.12.8")
+ (version "2.102.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "google-api-python-client" version))
(sha256
(base32
- "1fq89wifa9ymby655is246w5d54ixybffj5vz7lwzhpf8926ifgk"))))
+ "07b9afz3g3lk976i974h6ikvl7wzwm0a0ws0iynxvmd4favgjvwh"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ; tests require internet access
(propagated-inputs
- (list python-google-api-core-1
- python-google-auth-1
+ (list python-google-api-core
+ python-google-auth
python-google-auth-httplib2
python-httplib2
+ python-pyparsing
python-six
python-uritemplate-3))
(home-page "https://github.com/google/google-api-python-client")
@@ -5162,12 +5163,12 @@ (define-public python-google-api-client
(define-public python-google-auth-httplib2
(package
(name "python-google-auth-httplib2")
- (version "0.1.0")
+ (version "0.1.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "google-auth-httplib2" version))
(sha256
- (base32 "1b1hrhah01hx6bj3rb83iybrdwqv0bbdy63py39srv1bcgykjz50"))))
+ (base32 "0agwwgw04nks7lzpm224fbvpnjfgzz67pkrfls77ipf6zmawajy6"))))
(build-system python-build-system)
(propagated-inputs
(list python-google-auth python-httplib2 python-six))
--
2.41.0
^ permalink raw reply related [relevance 68%]
* [bug#66417] [PATCH 1/3] gnu: Add python-google-auth-oauthlib.
@ 2023-10-09 7:40 70% ` Pierre-Evariste Dagand
2023-10-09 7:40 68% ` [bug#66417] [PATCH 2/3] gnu: python-google-api-client: Update to 2.102.0 Pierre-Evariste Dagand
2023-10-09 7:40 61% ` [bug#66417] [PATCH 3/3] gnu: Remove python-google-api-core-1 and its dependency python-google-auth-1 Pierre-Evariste Dagand
2 siblings, 0 replies; 200+ results
From: Pierre-Evariste Dagand @ 2023-10-09 7:40 UTC (permalink / raw)
To: 66417
Cc: Pierre-Evariste Dagand, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, jgart
* gnu/packages/python-web.scm (python-google-auth-oauthlib): New variable.
---
gnu/packages/python-web.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d7fe634aba..0e52f2fdbd 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5180,6 +5180,26 @@ (define-public python-google-auth-httplib2
for httplib2 transport.")
(license license:asl2.0)))
+(define-public python-google-auth-oauthlib
+ (package
+ (name "python-google-auth-oauthlib")
+ (version "1.1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "google-auth-oauthlib" version))
+ (sha256
+ (base32 "1yvsjd1vh440nsh9vpnig23sq4k1ia749x5g1dwm7r4110xqrsl3"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-google-auth python-requests-oauthlib))
+ (native-inputs (list python-flask))
+ (home-page
+ "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib")
+ (synopsis "Google Authentication Library: oauthlib")
+ (description "This package provides a Google Authentication Library plugin
+with oauthlib.")
+ (license license:asl2.0)))
+
(define-public whoogle-search
(package
(name "whoogle-search")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#66417] [PATCH 3/3] gnu: Remove python-google-api-core-1 and its dependency python-google-auth-1
2023-10-09 7:40 70% ` [bug#66417] [PATCH 1/3] gnu: Add python-google-auth-oauthlib Pierre-Evariste Dagand
2023-10-09 7:40 68% ` [bug#66417] [PATCH 2/3] gnu: python-google-api-client: Update to 2.102.0 Pierre-Evariste Dagand
@ 2023-10-09 7:40 61% ` Pierre-Evariste Dagand
2 siblings, 0 replies; 200+ results
From: Pierre-Evariste Dagand @ 2023-10-09 7:40 UTC (permalink / raw)
To: 66417
Cc: Pierre-Evariste Dagand, Lars-Dominik Braun, Marius Bakke,
Munyoki Kilyungi, jgart
python-google-auth-1 doesn't self-test anymore. The tests depend on
`python-mock` (easy to fix) but also on an outdated version of
`python-cryptography`.
---
gnu/packages/python-web.scm | 82 -------------------------------------
1 file changed, 82 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4dcc5b5fb9..977258acf6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7567,42 +7567,6 @@ (define-public python-google-auth
server-to-server authentication mechanisms to access Google APIs.")
(license license:asl2.0)))
-(define-public python-google-auth-1
- (package
- (inherit python-google-auth)
- (name "python-google-auth")
- (version "1.35.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "google-auth" version))
- (sha256
- (base32 "13nqj6hikvbdmbs1vb78c88ym0pd03m09ch00biqw64c0blkn0xp"))))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest")))))))
- (propagated-inputs
- (list python-cachetools
- python-pyasn1-modules
- python-rsa
- python-six
- ;; For the extras
- python-pyopenssl
- python-pyu2f))
- (native-inputs
- (list python-flask
- python-freezegun
- python-oauth2client
- python-pytest
- python-pytest-localserver
- python-requests
- python-responses
- python-urllib3))))
-
(define-public python-google-resumable-media
(package
(name "python-google-resumable-media")
@@ -7702,52 +7666,6 @@ (define-public python-google-api-core
clients.")
(license license:asl2.0)))
-(define-public python-google-api-core-1
- (package
- (inherit python-google-api-core)
- (name "python-google-api-core")
- (version "1.32.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "google-api-core" version))
- (sha256
- (base32 "0709va9sisll7axkv6ii2x5s0ls38rqp1jnvs6nkpmg7z163q70h"))))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (for-each
- delete-file
- '(;; The test suite can't find AsyncMock.
- "tests/asyncio/test_page_iterator_async.py"
- "tests/asyncio/test_retry_async.py"
- ;; Skip the tests depending on grpc.
- "tests/asyncio/test_operation_async.py"
- "tests/asyncio/test_grpc_helpers_async.py"
- "tests/asyncio/operations_v1/test_operations_async_client.py"
- "tests/unit/test_bidi.py"
- "tests/unit/test_exceptions.py"
- "tests/unit/test_grpc_helpers.py"
- "tests/unit/test_operation.py"
- "tests/unit/operations_v1/test_operations_client.py"))
- (delete-file-recursively "tests/asyncio/gapic")
- (delete-file-recursively "tests/unit/gapic")
- (invoke "pytest" "-k" "not test_constructor_defaults")))))))
- (propagated-inputs
- (list python-google-auth-1
- python-googleapis-common-protos
- python-packaging
- python-protobuf
- python-proto-plus
- python-pytz
- python-requests))
- (native-inputs
- (list python-pytest
- python-pytest-asyncio))))
-
(define-public python-google-cloud-core
(package
(name "python-google-cloud-core")
--
2.41.0
^ permalink raw reply related [relevance 61%]
* [bug#62773] [PATCH] gnu: python-requests_ntlm: Update to 1.2.0.
[not found] <877cuin3g0.fsf@VM-0-5-ubuntu.mail-host-address-is-not-set>
2023-04-11 9:58 89% ` [bug#62773] gnu: python-requests_ntlm: Update to 1.2.0 c4droid
@ 2023-09-14 9:42 70% ` c4droid
1 sibling, 0 replies; 200+ results
From: c4droid @ 2023-09-14 9:42 UTC (permalink / raw)
To: 62773; +Cc: efraim
[-- Attachment #1: Type: text/plain, Size: 112 bytes --]
Hi, Efraim.
I tested it on latest guix revisions, requests-ntlm 1.2.0 can be packed, modified patch is attached.
[-- Attachment #2: 0001-gnu-python-requests_ntlm-Update-to-1.2.0.patch --]
[-- Type: application/octet-stream, Size: 1420 bytes --]
From dc77e452add231892fc69e05e3d25cb9d3b94bd7 Mon Sep 17 00:00:00 2001
Message-ID: <dc77e452add231892fc69e05e3d25cb9d3b94bd7.1694683856.git.c4droid@foxmail.com>
From: c4droid <c4droid@foxmail.com>
Date: Thu, 14 Sep 2023 17:29:26 +0800
Subject: [PATCH] gnu: python-requests_ntlm: Update to 1.2.0.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93fd2d2..12f0ce6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3215,17 +3215,17 @@ (define-public python-requests-unixsocket
(define-public python-requests_ntlm
(package
(name "python-requests_ntlm")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "requests_ntlm" version))
(sha256
(base32
- "0wgbqzaq9w7bas16b7brdb75f91bh3275fb459093bk1ihpck2ci"))))
+ "1a0np7lk8ma1plv1s4aw5q9h2z3aljprkl9qsfypqcaf0zsqbhik"))))
(build-system python-build-system)
(propagated-inputs
- (list python-cryptography python-ntlm-auth python-requests))
+ (list python-cryptography python-pyspnego python-requests))
(home-page "https://github.com/requests/requests-ntlm")
(synopsis
"NTLM authentication support for Requests")
base-commit: cf5cb0875b06b5823e9de8bbd01ddd8c0b0d15a7
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65758] [PATCH v7 29/57] gnu: Remove python-pysolr.
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 02/57] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 03/57] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
@ 2023-09-06 9:15 70% ` Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-09-06 9:15 UTC (permalink / raw)
To: 65758; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-pysolr): Delete variable.
---
gnu/packages/python-web.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 78ab265603..c073793544 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6737,31 +6737,6 @@ (define-public python-robot-detection
@url{http://www.robotstxt.org}.")
(license license:gpl3+)))
-(define-public python-pysolr
- (package
- (name "python-pysolr")
- (version "3.9.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pysolr" version))
- (sha256
- (base32
- "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"))))
- (build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; Tests require network access.
- (propagated-inputs
- (list python-requests))
- (native-inputs
- (list python-setuptools-scm))
- (home-page "https://github.com/django-haystack/pysolr/")
- (synopsis "Lightweight python wrapper for Apache Solr")
- (description
- "This module provides an interface that queries the Apache Solr server
-using a pure Python implementation.")
- (license license:bsd-3)))
-
(define-public python-pyjsparser
(package
(name "python-pyjsparser")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65758] [PATCH v7 02/57] gnu: python-asgiref: Update to 3.6.0.
@ 2023-09-06 9:15 70% ` Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 03/57] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 29/57] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-09-06 9:15 UTC (permalink / raw)
To: 65758; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-asgiref): Update to 3.6.0.
---
gnu/packages/python-web.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93fd2d2278..fe3916864e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -548,20 +548,13 @@ (define-public python-aiostream
(define-public python-asgiref
(package
(name "python-asgiref")
- (version "3.4.1")
+ (version "3.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "asgiref" version))
(sha256
- (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))
- (build-system python-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
+ (base32 "01lmjidadid0czd32d2c21lb6q78ri0pr0i74a4qqg4dppkxyrwm"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-pytest python-pytest-asyncio))
(home-page "https://github.com/django/asgiref/")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65758] [PATCH v7 03/57] gnu: Add python-asgiref-3.4.1.
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 02/57] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
@ 2023-09-06 9:15 70% ` Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 29/57] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-09-06 9:15 UTC (permalink / raw)
To: 65758; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-asgiref-3.4.1): New variable.
---
gnu/packages/python-web.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fe3916864e..78ab265603 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -565,6 +565,17 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgiref-3.4.1
+ (package
+ (inherit python-asgiref)
+ (version "3.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgiref" version))
+ (sha256
+ (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))))
+
(define-public python-asgi-csrf
(package
(name "python-asgi-csrf")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65758] [PATCH v6 29/55] gnu: Remove python-pysolr.
2023-09-05 16:30 70% ` [bug#65758] [PATCH v6 02/55] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-09-05 16:30 70% ` [bug#65758] [PATCH v6 03/55] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
@ 2023-09-05 16:31 70% ` Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-09-05 16:31 UTC (permalink / raw)
To: 65758; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-pysolr): Delete variable.
---
gnu/packages/python-web.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 78ab265603..c073793544 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6737,31 +6737,6 @@ (define-public python-robot-detection
@url{http://www.robotstxt.org}.")
(license license:gpl3+)))
-(define-public python-pysolr
- (package
- (name "python-pysolr")
- (version "3.9.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pysolr" version))
- (sha256
- (base32
- "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"))))
- (build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; Tests require network access.
- (propagated-inputs
- (list python-requests))
- (native-inputs
- (list python-setuptools-scm))
- (home-page "https://github.com/django-haystack/pysolr/")
- (synopsis "Lightweight python wrapper for Apache Solr")
- (description
- "This module provides an interface that queries the Apache Solr server
-using a pure Python implementation.")
- (license license:bsd-3)))
-
(define-public python-pyjsparser
(package
(name "python-pyjsparser")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65758] [PATCH v6 03/55] gnu: Add python-asgiref-3.4.1.
2023-09-05 16:30 70% ` [bug#65758] [PATCH v6 02/55] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
@ 2023-09-05 16:30 70% ` Nicolas Graves via Guix-patches via
2023-09-05 16:31 70% ` [bug#65758] [PATCH v6 29/55] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-09-05 16:30 UTC (permalink / raw)
To: 65758; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-asgiref-3.4.1): New variable.
---
gnu/packages/python-web.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index fe3916864e..78ab265603 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -565,6 +565,17 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgiref-3.4.1
+ (package
+ (inherit python-asgiref)
+ (version "3.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgiref" version))
+ (sha256
+ (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))))
+
(define-public python-asgi-csrf
(package
(name "python-asgi-csrf")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65758] [PATCH v6 02/55] gnu: python-asgiref: Update to 3.6.0.
@ 2023-09-05 16:30 70% ` Nicolas Graves via Guix-patches via
2023-09-05 16:30 70% ` [bug#65758] [PATCH v6 03/55] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
2023-09-05 16:31 70% ` [bug#65758] [PATCH v6 29/55] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-09-05 16:30 UTC (permalink / raw)
To: 65758; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-asgiref): Update to 3.6.0.
---
gnu/packages/python-web.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93fd2d2278..fe3916864e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -548,20 +548,13 @@ (define-public python-aiostream
(define-public python-asgiref
(package
(name "python-asgiref")
- (version "3.4.1")
+ (version "3.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "asgiref" version))
(sha256
- (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))
- (build-system python-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
+ (base32 "01lmjidadid0czd32d2c21lb6q78ri0pr0i74a4qqg4dppkxyrwm"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-pytest python-pytest-asyncio))
(home-page "https://github.com/django/asgiref/")
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#64375] [PATCH 2/4] gnu: python-sanic: Update to 21.12.2.
@ 2023-08-29 14:01 70% ` peter
2023-08-29 14:01 70% ` [bug#64375] [PATCH 3/4] gnu: python-quart: Update to 0.18.4 peter
1 sibling, 0 replies; 200+ results
From: peter @ 2023-08-29 14:01 UTC (permalink / raw)
To: 64375; +Cc: Peter Polidoro
From: Peter Polidoro <peter@polidoro.io>
* gnu/packages/python-web.scm (python-sanic): Update to 21.12.2.
---
gnu/packages/python-web.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4c38636af5..5e3f3a0ed2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7017,14 +7017,14 @@ (define-public python-sanic
(package
(name "python-sanic")
;; We provide the latest LTS version of python-sanic.
- (version "21.12.1")
+ (version "21.12.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sanic" version))
(sha256
(base32
- "0b8mcd1q9qkwcv2qz8nlyaacs0bp7a1l31sdq2m8hhkxykzfq5bg"))))
+ "1qz5dq19dc1aagwapq2cxpgy40kyw6dk488jdl68d139midf29n4"))))
(build-system python-build-system)
(arguments
(list
@@ -7048,7 +7048,8 @@ (define-public python-sanic
;; Unclear why they fail since core-updates merge.
" and not test_missing_sni"
" and not test_no_matching_cert"
- " and not test_wildcards"))))))))
+ " and not test_wildcards"
+ " and not test_json_encoding"))))))))
(propagated-inputs
(list python-aiofiles
python-httptools
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#64375] [PATCH 3/4] gnu: python-quart: Update to 0.18.4.
2023-08-29 14:01 70% ` [bug#64375] [PATCH 2/4] gnu: python-sanic: Update to 21.12.2 peter
@ 2023-08-29 14:01 70% ` peter
1 sibling, 0 replies; 200+ results
From: peter @ 2023-08-29 14:01 UTC (permalink / raw)
To: 64375; +Cc: Peter Polidoro
From: Peter Polidoro <peter@polidoro.io>
* gnu/packages/python-web.scm (python-quart): Update to 0.18.4.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5e3f3a0ed2..ac2f2be3d8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7976,7 +7976,7 @@ (define-public python-tweepy
(define-public python-quart
(package
(name "python-quart")
- (version "0.17.0")
+ (version "0.18.4")
(source
(origin
(method url-fetch)
@@ -7992,9 +7992,9 @@ (define-public python-quart
python-itsdangerous
python-jinja2
python-markupsafe
- python-toml
+ python-tomli
python-werkzeug))
- (home-page "https://gitlab.com/pgjones/quart/")
+ (home-page "https://github.com/pallets/quart")
(synopsis "Python ASGI web microframework with the same API as Flask")
(description
"This package provides a Python ASGI web microframework with the same API
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#65114] [PATCH 2/6] gnu: python-cssselect: Update to 1.2.0.
2023-08-06 15:33 66% ` [bug#65114] [PATCH 1/6] gnu: python-w3lib: Update to 2.1.2 Vinicius Monego
@ 2023-08-06 15:33 70% ` Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 3/6] gnu: python-parsel: Update to 1.8.1 Vinicius Monego
2023-08-06 15:33 67% ` [bug#65114] [PATCH 6/6] gnu: python-scrapy: Update to 2.10.0 Vinicius Monego
2 siblings, 0 replies; 200+ results
From: Vinicius Monego @ 2023-08-06 15:33 UTC (permalink / raw)
To: 65114; +Cc: Vinicius Monego
* gnu/packages/python-web.scm (python-cssselect): Update to 1.2.0.
[build-system]: Use pyproject-build-system.
[arguments]: Do not override the check phase.
---
gnu/packages/python-web.scm | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 24071a8553..9ecd9f35a3 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2095,7 +2095,7 @@ (define-public python-css-parser
(define-public python-cssselect
(package
(name "python-cssselect")
- (version "1.1.0")
+ (version "1.2.0")
(source (origin
;; The PyPI release does not contain tests.
(method git-fetch)
@@ -2105,13 +2105,8 @@ (define-public python-cssselect
(file-name (git-file-name name version))
(sha256
(base32
- "0xslrnhbrmgakp4xg6k26qffay3kqffp3a2z2sk27c65rwxa79kc"))))
- (build-system python-build-system)
- (arguments
- `(#:phases (modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "pytest" "-vv"))))))
+ "1x4nrvb1p1byi1whmspik7lbh303akdlh762dayfxam3hycsh5kk"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-lxml python-pytest))
(home-page "https://github.com/scrapy/cssselect")
--
2.34.1
^ permalink raw reply related [relevance 70%]
* [bug#65114] [PATCH 3/6] gnu: python-parsel: Update to 1.8.1.
2023-08-06 15:33 66% ` [bug#65114] [PATCH 1/6] gnu: python-w3lib: Update to 2.1.2 Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 2/6] gnu: python-cssselect: Update to 1.2.0 Vinicius Monego
@ 2023-08-06 15:33 70% ` Vinicius Monego
2023-08-06 15:33 67% ` [bug#65114] [PATCH 6/6] gnu: python-scrapy: Update to 2.10.0 Vinicius Monego
2 siblings, 0 replies; 200+ results
From: Vinicius Monego @ 2023-08-06 15:33 UTC (permalink / raw)
To: 65114; +Cc: Vinicius Monego
* gnu/packages/python-web.scm (python-parsel): Update to 1.8.1.
[build-system]: Use pyproject-build-system.
[propagated-inputs]: Add python-jmespath, python-typing-extensions. Remove
python-six.
[native-inputs]: Add python-psutil. Remove python-pytest-runner.
---
gnu/packages/python-web.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9ecd9f35a3..70a1ab082f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8039,21 +8039,22 @@ (define-public python-protego
(define-public python-parsel
(package
(name "python-parsel")
- (version "1.6.0")
+ (version "1.8.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "parsel" version))
(sha256
- (base32 "0yawf9r3r863lwxj0n89i7h3n8xjbsl5b7n6xg76r68scl5yzvvh"))))
- (build-system python-build-system)
+ (base32 "0f8yh30y3961a7kqwcnp4j3s7044ilakykiavc0skwdkr5l8xwmg"))))
+ (build-system pyproject-build-system)
(propagated-inputs
(list python-cssselect
+ python-jmespath
python-lxml
- python-six
+ python-typing-extensions
python-w3lib))
(native-inputs
- (list python-pytest python-pytest-runner))
+ (list python-psutil python-pytest))
(home-page "https://github.com/scrapy/parsel")
(synopsis "Extract data from HTML and XML using XPath and CSS selectors")
(description "Parsel is a library to extract and remove data from
--
2.34.1
^ permalink raw reply related [relevance 70%]
* [bug#65114] [PATCH 1/6] gnu: python-w3lib: Update to 2.1.2.
@ 2023-08-06 15:33 66% ` Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 2/6] gnu: python-cssselect: Update to 1.2.0 Vinicius Monego
` (2 more replies)
0 siblings, 3 replies; 200+ results
From: Vinicius Monego @ 2023-08-06 15:33 UTC (permalink / raw)
To: 65114; +Cc: Vinicius Monego
* gnu/packages/python-web.scm (python-w3lib): Update to 2.1.2.
[source]: Remove patch.
[build-system]: Use pyproject-build-system.
[arguments]: Do not override the check phase.
[native-inputs]: Remove python-six.
* gnu/packages/patches/python-w3lib-fix-test-failure.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../python-w3lib-fix-test-failure.patch | 60 -------------------
gnu/packages/python-web.scm | 16 ++---
3 files changed, 4 insertions(+), 73 deletions(-)
delete mode 100644 gnu/packages/patches/python-w3lib-fix-test-failure.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 77707127a7..e091b310c2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1730,7 +1730,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-shiboken-2-compat.patch \
%D%/packages/patches/python-telingo-fix-comparison.patch \
%D%/packages/patches/python-typeguard-python3.10.patch \
- %D%/packages/patches/python-w3lib-fix-test-failure.patch \
%D%/packages/patches/python-wxwidgets-type-errors.patch \
%D%/packages/patches/quodlibet-fix-invalid-glob.patch \
%D%/packages/patches/quodlibet-fix-mtime-tests.patch \
diff --git a/gnu/packages/patches/python-w3lib-fix-test-failure.patch b/gnu/packages/patches/python-w3lib-fix-test-failure.patch
deleted file mode 100644
index f38fc749df..0000000000
--- a/gnu/packages/patches/python-w3lib-fix-test-failure.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From fae6cc40e112cd13697cb0e8d79976f32c72491d Mon Sep 17 00:00:00 2001
-From: Eugenio Lacuesta <eugenio.lacuesta@gmail.com>
-Date: Wed, 10 Mar 2021 12:31:05 -0300
-Subject: [PATCH] [CI] Mark single add_or_replace_parameter test as xfail
-
----
-This patch is based on upstream commit
-fae6cc40e112cd13697cb0e8d79976f32c72491d which is part of
-https://github.com/scrapy/w3lib/pull/166.
-
- .gitignore | 3 ++-
- tests/test_url.py | 25 ++++++++++++++-----------
- 2 files changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/tests/test_url.py b/tests/test_url.py
-index 8b07c00..0f7458e 100644
---- a/tests/test_url.py
-+++ b/tests/test_url.py
-@@ -1,12 +1,14 @@
--# -*- coding: utf-8 -*-
- from __future__ import absolute_import
- import os
- import unittest
-+
-+import pytest
-+from six.moves.urllib.parse import urlparse
-+
- from w3lib.url import (is_url, safe_url_string, safe_download_url,
- url_query_parameter, add_or_replace_parameter, url_query_cleaner,
- file_uri_to_path, parse_data_uri, path_to_file_uri, any_to_uri,
- urljoin_rfc, canonicalize_url, parse_url, add_or_replace_parameters)
--from six.moves.urllib.parse import urlparse
-
-
- class UrlTests(unittest.TestCase):
-@@ -310,10 +311,6 @@ def test_add_or_replace_parameter(self):
- self.assertEqual(add_or_replace_parameter(url, 'arg3', 'nv3'),
- 'http://domain/test?arg1=v1&arg2=v2&arg3=nv3')
-
-- url = 'http://domain/test?arg1=v1;arg2=v2'
-- self.assertEqual(add_or_replace_parameter(url, 'arg1', 'v3'),
-- 'http://domain/test?arg1=v3&arg2=v2')
--
- self.assertEqual(add_or_replace_parameter("http://domain/moreInfo.asp?prodID=", 'prodID', '20'),
- 'http://domain/moreInfo.asp?prodID=20')
- url = 'http://rmc-offers.co.uk/productlist.asp?BCat=2%2C60&CatID=60'
-@@ -338,6 +335,13 @@ def test_add_or_replace_parameter(self):
- self.assertEqual(add_or_replace_parameter(url, 'arg1', 'v3'),
- 'http://domain/test?arg1=v3&arg2=v2')
-
-+ @pytest.mark.xfail(reason="https://github.com/scrapy/w3lib/issues/164")
-+ def test_add_or_replace_parameter_fail(self):
-+ self.assertEqual(
-+ add_or_replace_parameter('http://domain/test?arg1=v1;arg2=v2', 'arg1', 'v3'),
-+ 'http://domain/test?arg1=v3&arg2=v2'
-+ )
-+
- def test_add_or_replace_parameters(self):
- url = 'http://domain/test'
- self.assertEqual(add_or_replace_parameters(url, {'arg': 'v'}),
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 17c9563cfd..24071a8553 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7752,25 +7752,17 @@ (define-public python-smart-open
(define-public python-w3lib
(package
(name "python-w3lib")
- (version "1.22.0")
+ (version "2.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "w3lib" version))
- (patches (search-patches "python-w3lib-fix-test-failure.patch"))
(sha256
(base32
- "1pv02lvvmgz2qb61vz1jkjc04fgm4hpfvaj5zm4i3mjp64hd1mha"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest")))))))
+ "1cd4b3w5g3pfccsg79kjj27fwi216ip927rjq7isp8pfjzlp8nzd"))))
+ (build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-six))
+ (list python-pytest))
(home-page "https://github.com/scrapy/w3lib")
(synopsis "Python library of web-related functions")
(description
--
2.34.1
^ permalink raw reply related [relevance 66%]
* [bug#65114] [PATCH 6/6] gnu: python-scrapy: Update to 2.10.0.
2023-08-06 15:33 66% ` [bug#65114] [PATCH 1/6] gnu: python-w3lib: Update to 2.1.2 Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 2/6] gnu: python-cssselect: Update to 1.2.0 Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 3/6] gnu: python-parsel: Update to 1.8.1 Vinicius Monego
@ 2023-08-06 15:33 67% ` Vinicius Monego
2 siblings, 0 replies; 200+ results
From: Vinicius Monego @ 2023-08-06 15:33 UTC (permalink / raw)
To: 65114; +Cc: Vinicius Monego
* gnu/packages/python-web.scm (python-scrapy): Update to 2.10.0.
[build-system]: Use pyproject-build-system.
[arguments]: Use G-Expressions. Do not override the check phase, skip tests
in #:test-flags instead. Run tests sequentially and skip fewer tests.
---
gnu/packages/python-web.scm | 42 ++++++++++++++++---------------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 70a1ab082f..c12740b587 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8065,36 +8065,30 @@ (define-public python-parsel
(define-public python-scrapy
(package
(name "python-scrapy")
- (version "2.7.1")
+ (version "2.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Scrapy" version))
(sha256
- (base32 "0kpi3hg2ycs6s8cg41r2zc1axd0rpnps8bnzg7wisjyjaf1l1yih"))))
- (build-system python-build-system)
+ (base32 "0fdf1kx39zy7b0v5gkwwqvm58ww63z5bvm78yjymhfn0r0zs65jf"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest"
- "-n" (number->string (parallel-job-count))
- ;; These tests fail when run in parallel (see:
- ;; https://github.com/scrapy/scrapy/issues/5502).
- "--ignore" "tests/test_engine.py"
- "--ignore" "tests/test_engine_stop_download_bytes.py"
- "--ignore" "tests/test_engine_stop_download_headers.py"
- ;; This test require network access.
- "--ignore" "tests/test_command_check.py"
- "-k"
- (string-append
- ;; The followin tests fail for unknown reasons.
- "not test_server_set_cookie_domain_suffix_public_private"
- " and not test_user_set_cookie_domain_suffix_public_private"
- " and not test_pformat")
- "tests")))))))
+ (list #:test-flags
+ ;; Tests fail with DNS lookup or need a display.
+ #~(list "-k" (string-append
+ "not test_SCRAPY_CHECK_set"
+ " and not "
+ (string-join
+ (list "test_check_all_default_contracts"
+ "test_check_cb_kwargs_contract"
+ "test_check_returns_items_contract"
+ "test_check_returns_requests_contract"
+ "test_check_scrapes_contract"
+ "test_pformat"
+ "test_pformat_old_windows"
+ "test_pformat_windows")
+ " and not ")))))
(propagated-inputs
(list python-botocore ; Optional: For S3FeedStorage class.
python-cryptography
--
2.34.1
^ permalink raw reply related [relevance 67%]
* [bug#65010] [PATCH 0/8] Misc Python build system improvements
@ 2023-08-02 10:37 28% Lars-Dominik Braun
0 siblings, 0 replies; 200+ results
From: Lars-Dominik Braun @ 2023-08-02 10:37 UTC (permalink / raw)
To: 65010
[-- Attachment #1: Type: text/plain, Size: 3259 bytes --]
Hi,
the attached patches contain various Python build system improvements
including an original TOML parser (which may be used by other build
systems and importers in the future too) and fixes for #62781 and #63044.
I’m also pushing the patches to the pyproject-toml branch. As always,
a world rebuild is required.
Cheers,
Lars
Lars-Dominik Braun (8):
build-system/pyproject: Use python-sans-pip-wrapper as default-python.
build-system/python: Ignore symlinks when changing mtime.
gnu: criu: Change file mtimes to fix build.
gnu: sssd: Change file mtimes to fix build.
guix: toml: Add TOML parser.
build-system/pyproject: Use TOML parser.
gnu: python-pytest-xdist: Disable failing test.
guix: pyproject-build-system: Default configure-flags to empty
dictionary.
Makefile.am | 2 +
gnu/packages/admin.scm | 2 +-
gnu/packages/astronomy.scm | 81 +++--
gnu/packages/bioinformatics.scm | 79 +++--
gnu/packages/bootloaders.scm | 3 +
gnu/packages/build-tools.scm | 10 +-
gnu/packages/check.scm | 14 +-
gnu/packages/databases.scm | 12 +-
gnu/packages/digest.scm | 2 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/fontutils.scm | 9 +-
gnu/packages/geo.scm | 10 +-
gnu/packages/graph.scm | 7 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/license.scm | 5 +-
gnu/packages/machine-learning.scm | 32 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/monitoring.scm | 2 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/potassco.scm | 10 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-build.scm | 33 +-
gnu/packages/python-check.scm | 30 +-
gnu/packages/python-compression.scm | 20 +-
gnu/packages/python-crypto.scm | 15 +-
gnu/packages/python-science.scm | 24 +-
gnu/packages/python-web.scm | 57 ++-
gnu/packages/python-xyz.scm | 260 +++++++++-----
gnu/packages/qt.scm | 3 +-
gnu/packages/rpc.scm | 2 +-
gnu/packages/serialization.scm | 4 +-
gnu/packages/sphinx.scm | 4 +-
gnu/packages/sssd.scm | 9 +-
gnu/packages/statistics.scm | 14 +-
gnu/packages/terminals.scm | 5 +-
gnu/packages/time.scm | 3 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/tree-sitter.scm | 4 +-
gnu/packages/video.scm | 2 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/virtualization.scm | 20 +-
guix/build-system/pyproject.scm | 12 +-
guix/build/pyproject-build-system.scm | 56 +--
guix/build/python-build-system.scm | 4 +-
guix/build/toml.scm | 478 ++++++++++++++++++++++++++
tests/toml.scm | 442 ++++++++++++++++++++++++
46 files changed, 1503 insertions(+), 306 deletions(-)
create mode 100644 guix/build/toml.scm
create mode 100644 tests/toml.scm
base-commit: 5aceacac65784bd2e1fd12304f965ae6026de49d
--
2.41.0
[-- Attachment #2: 0001-build-system-pyproject-Use-python-sans-pip-wrapper-a.patch --]
[-- Type: text/plain, Size: 134545 bytes --]
From 70baccd8068f35ff8dce0955eaea60f7ea9c240e Mon Sep 17 00:00:00 2001
Message-ID: <70baccd8068f35ff8dce0955eaea60f7ea9c240e.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Thu, 11 May 2023 08:33:02 +0200
Subject: [PATCH 1/8] build-system/pyproject: Use python-sans-pip-wrapper as
default-python.
Also adds python-setuptools and python-wheel to relevant packages,
either to native-inputs or to propagated inputs if the pkg_resources
Python module is loaded at runtime.
* guix/build-system/pyproject.scm (default-python): Default to
python-sans-pip-wrapper.
---
gnu/packages/admin.scm | 2 +-
gnu/packages/astronomy.scm | 81 ++++++---
gnu/packages/bioinformatics.scm | 79 ++++++---
gnu/packages/bootloaders.scm | 3 +
gnu/packages/check.scm | 9 +-
gnu/packages/databases.scm | 12 +-
gnu/packages/digest.scm | 2 +-
gnu/packages/engineering.scm | 2 +-
gnu/packages/fontutils.scm | 9 +-
gnu/packages/geo.scm | 10 +-
gnu/packages/graph.scm | 7 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/license.scm | 5 +-
gnu/packages/machine-learning.scm | 32 ++--
gnu/packages/maths.scm | 4 +-
gnu/packages/monitoring.scm | 2 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/potassco.scm | 10 +-
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-build.scm | 3 +-
gnu/packages/python-check.scm | 30 +++-
gnu/packages/python-compression.scm | 20 ++-
gnu/packages/python-crypto.scm | 15 +-
gnu/packages/python-science.scm | 19 +-
gnu/packages/python-web.scm | 57 ++++--
gnu/packages/python-xyz.scm | 260 +++++++++++++++++++---------
gnu/packages/qt.scm | 3 +-
gnu/packages/rpc.scm | 2 +-
gnu/packages/serialization.scm | 4 +-
gnu/packages/sphinx.scm | 4 +-
gnu/packages/statistics.scm | 14 +-
gnu/packages/terminals.scm | 5 +-
gnu/packages/time.scm | 3 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/tree-sitter.scm | 4 +-
gnu/packages/video.scm | 2 +-
gnu/packages/vim.scm | 4 +-
guix/build-system/pyproject.scm | 7 +-
38 files changed, 516 insertions(+), 227 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index fa697b79fb..75b8c9f2f1 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -4848,7 +4848,7 @@ (define-public jc
(lambda _
(substitute* (find-files "tests" "^test.*\\.py$")
(("America/Los_Angeles") "PST8PDT")))))))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-pygments python-ruamel.yaml python-xmltodict))
(home-page "https://github.com/kellyjonbrazil/jc")
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 5b9434fb33..8fc727e0d6 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -521,7 +521,8 @@ (define-public python-astroml
(propagated-inputs (list python-astropy python-matplotlib python-numpy
python-scikit-learn python-scipy))
(native-inputs (list python-pytest-astropy-header python-pytest-cov
- python-pytest-doctestplus python-pytest-remotedata))
+ python-pytest-doctestplus python-pytest-remotedata
+ python-setuptools python-wheel))
(home-page "https://astroml.org")
(synopsis "Tools for machine learning and data mining in astronomy")
(description "This package provides tools for machine learning and data
@@ -613,7 +614,8 @@ (define-public python-gatspy
;; XXX: we don't have supersmoother
" and not test_supersmoother.py"))))
(propagated-inputs (list python-astroml python-numpy python-scipy))
- (native-inputs (list python-pytest python-nose python-setuptools-scm))
+ (native-inputs (list python-pytest python-nose python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://github.com/astroml/gatspy")
(synopsis "General tools for astronomical time series in Python")
(description "This package provides general tools for astronomical time
@@ -1470,7 +1472,9 @@ (define-public python-astropy-healpix
(list python-extension-helpers
python-hypothesis
python-pytest-astropy
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-astropy python-numpy))
(home-page "https://github.com/astropy/astropy-healpix")
@@ -1553,7 +1557,9 @@ (define-public python-astroscrappy
python-pytest-astropy
python-scikit-image
python-scipy
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(propagated-inputs (list python-astropy python-numpy))
(home-page "https://github.com/astropy/astroscrappy")
(synopsis "Speedy Cosmic Ray Annihilation Package in Python")
@@ -1651,7 +1657,9 @@ (define-public python-cdflib
python-pytest
python-pytest-cov
python-pytest-remotedata
- python-xarray))
+ python-xarray
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/MAVENSDC/cdflib")
(synopsis "Python library to deal with NASA's CDF astronmical data format")
(description "This package provides a Python @acronym{CDF, Computable
@@ -1741,7 +1749,9 @@ (define-public python-czml3
(list python-astropy
python-pytest
python-pytest-cov
- python-pytest-mypy))
+ python-pytest-mypy
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/poliastro/czml3")
(synopsis "Python library to write CZML")
(description
@@ -1818,9 +1828,10 @@ (define-public python-drizzle
;; Cython extensions have to be built before running
;; the tests.
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
- (propagated-inputs (list python-astropy python-numpy))
+ (propagated-inputs (list python-astropy python-numpy python-setuptools))
(native-inputs (list python-coverage python-flake8 python-pytest
- python-pytest-cov python-setuptools-scm))
+ python-pytest-cov python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/spacetelescope/drizzle")
(synopsis
"Astronomical tool for combining dithered images into a single image")
@@ -1871,7 +1882,8 @@ (define-public python-hvpy
(arguments
(list #:tests? #f)) ; Requires HTTP(S) access to api.beta.helioviewer.org
(propagated-inputs (list python-pydantic python-requests))
- (native-inputs (list python-pytest python-pytest-astropy))
+ (native-inputs (list python-pytest python-pytest-astropy python-setuptools
+ python-wheel))
(home-page "https://helioviewer.org/")
(synopsis "Helioviewer Python API Wrapper")
(description "@code{hvpy} is a Python API wrapper around the formal
@@ -1892,7 +1904,9 @@ (define-public python-mpl-animators
(native-inputs
(list python-pytest
python-pytest-mpl
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-astropy
python-matplotlib
@@ -2039,7 +2053,9 @@ (define-public python-poppy
python-pytest
python-pytest-astropy
python-sphinx
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://poppy-optics.readthedocs.io/")
(synopsis "Physical Optics Propagation in Python")
(description
@@ -2069,7 +2085,8 @@ (define-public python-pyvo
(base32 "17acv1yhz1jrsx9f35nr1vg276ibaivh4i243qkmp6abzvfyg907"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest-astropy python-requests-mock python-setuptools-scm))
+ (list python-pytest-astropy python-requests-mock python-setuptools-scm
+ python-setuptools python-wheel))
(propagated-inputs
(list python-astropy python-mimeparse python-pillow python-requests))
(home-page "https://github.com/astropy/pyvo")
@@ -2405,8 +2422,9 @@ (define-public python-stsci-image
;; the tests.
(invoke "python" "setup.py" "build_ext"
"--inplace"))))))
- (propagated-inputs (list python-numpy python-scipy))
- (native-inputs (list python-pytest python-setuptools-scm))
+ (propagated-inputs (list python-numpy python-scipy python-setuptools))
+ (native-inputs (list python-pytest python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/spacetelescope/stsci.image")
(synopsis "Image array manipulation functions")
(description
@@ -2456,7 +2474,8 @@ (define-public python-stsci-stimage
#:tests? #f))
(propagated-inputs (list python-numpy))
(native-inputs (list python-codecov python-pytest python-pytest-cov
- python-setuptools-scm))
+ python-setuptools python-setuptools-scm
+ python-wheel))
(home-page "https://stscistimage.readthedocs.io/en/latest/")
(synopsis "STScI image processing")
(description "This package provides an astronomical Python package with
@@ -2486,7 +2505,9 @@ (define-public python-stcal
python-pytest-cov
python-pytest-doctestplus
python-pytest-openfiles
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/spacetelescope/stcal")
(synopsis "STScI tools and algorithms used in calibration pipelines")
(description "STScI tools and algorithms used in calibration pipelines.")
@@ -3296,7 +3317,9 @@ (define-public python-pynbody
(native-inputs
(list python-cython
python-pandas
- python-pytest))
+ python-pytest
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-h5py
python-matplotlib
@@ -3328,9 +3351,10 @@ (define-public python-pysynphot
(setenv "PYSYN_CDBS"
(string-append #$output "/crds")))))))
(native-inputs (list python-pytest python-pytest-remotedata
- python-setuptools-scm))
+ python-setuptools-scm python-wheel))
(propagated-inputs (list python-astropy python-beautifulsoup4 python-numpy
- python-pytest-astropy-header python-six))
+ python-pytest-astropy-header python-six
+ python-setuptools))
(home-page "https://github.com/spacetelescope/pysynphot")
(synopsis "Python Synthetic Photometry Utilities")
(description
@@ -3396,7 +3420,7 @@ (define-public python-synphot
#:tests? #f))
(propagated-inputs (list python-astropy python-numpy python-scipy))
(native-inputs (list python-pytest python-pytest-astropy
- python-setuptools-scm))
+ python-setuptools-scm python-setuptools python-wheel))
(home-page "https://github.com/spacetelescope/synphot_refactor")
(synopsis "Synthetic photometry using Astropy")
(description
@@ -3467,7 +3491,9 @@ (define-public python-asdf
python-pytest-openfiles
python-pytest-remotedata
python-semantic-version
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-asdf-standard
python-asdf-transform-schemas
@@ -3514,7 +3540,9 @@ (define-public python-asdf-standard
python-pypa-build
python-pytest
python-packaging
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(propagated-inputs (list python-importlib-resources))
(home-page "https://asdf-standard.readthedocs.io/")
(synopsis "ASDF standard schemas")
@@ -3542,7 +3570,7 @@ (define python-asdf-transform-schemas
(arguments
;; Dependency cycle with python-asdf
(list #:tests? #f))
- (native-inputs (list python-setuptools-scm))
+ (native-inputs (list python-setuptools-scm python-setuptools python-wheel))
(propagated-inputs (list python-asdf-standard python-importlib-resources))
(home-page "https://github.com/asdf-format/asdf-transform-schemas")
(synopsis "ASDF schemas for transforms")
@@ -3661,7 +3689,7 @@ (define python-asdf-unit-schemas
(arguments
;; Dependency cycle with python-asdf
(list #:tests? #f))
- (native-inputs (list python-setuptools-scm))
+ (native-inputs (list python-setuptools-scm python-setuptools python-wheel))
(propagated-inputs (list python-asdf-standard python-importlib-resources))
(home-page "https://asdf-unit-schemas.readthedocs.io/")
(synopsis "ASDF serialization schemas for the units defined by @code{astropy.units}")
@@ -3903,9 +3931,10 @@ (define-public python-wiimatch
(base32
"0x6p5z6a2cqinckwlpinjxagvmswl149s1jn6ihmdxk4k0h8rrz0"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-numpy python-scipy))
+ (propagated-inputs (list python-numpy python-scipy python-setuptools))
(native-inputs (list python-codecov python-pytest python-pytest-cov
- python-pytest-doctestplus python-setuptools-scm))
+ python-pytest-doctestplus python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/spacetelescope/wiimatch")
(synopsis
"Optimal matching of weighted N-dimensional image intensity data")
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index d1448e390f..e6ba3e561a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1401,7 +1401,8 @@ (define-public python-bcbio-gff
(base32
"1pm1szyxabhn8jismrj9cjhf88ajgcmm39f0cgf36iagw5qakprl"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-biopython python-six))
+ (propagated-inputs (list python-biopython python-six python-setuptools
+ python-wheel))
(native-inputs (list python-pytest))
(home-page "https://github.com/chapmanb/bcbb/tree/master/gff")
(synopsis "Read and write GFF files with Biopython integration")
@@ -1526,7 +1527,7 @@ (define-public python-bulkvis
python-tornado-6
python-tqdm
python-umap-learn))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/LooseLab/bulkVis")
(synopsis "Interactive visualization of bulk RNA-seq data")
(description
@@ -1765,7 +1766,8 @@ (define-public python-demuxem
python-scikit-learn
python-scipy
python-seaborn))
- (native-inputs (list python-cython python-setuptools-scm))
+ (native-inputs (list python-cython python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://github.com/lilab-bcb/demuxEM")
(synopsis "Analyze cell-hashing/nucleus-hashing data")
(description
@@ -1838,6 +1840,7 @@ (define-public python-hclust2
python-numpy
python-pandas
python-scipy))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/SegataLab/hclust2/")
(synopsis "Plotting heat-maps for publications")
(description
@@ -1857,7 +1860,7 @@ (define-public python-htsget
"111q4pzkav26aa3hkgh948wqlyrq7dq6sjml9z63n3blw8s6b0c4"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-setuptools-scm))
+ (list python-setuptools-scm python-setuptools python-wheel))
(propagated-inputs
(list python-humanize python-requests python-six))
(home-page "https://pypi.org/project/htsget/")
@@ -1935,6 +1938,7 @@ (define-public python-logomaker
(build-system pyproject-build-system)
(propagated-inputs
(list python-matplotlib python-numpy python-pandas))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://logomaker.readthedocs.io")
(synopsis "Package for making Sequence Logos")
(description "Logomaker is a Python package for generating
@@ -1968,7 +1972,8 @@ (define-public python-pegasusio
python-pillow
python-scipy
python-zarr))
- (native-inputs (list python-cython python-setuptools-scm))
+ (native-inputs (list python-cython python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://github.com/lilab-bcb/pegasusio")
(synopsis "Read or write single-cell genomics data")
(description
@@ -2027,7 +2032,7 @@ (define-public python-phenograph
python-scikit-learn
python-scipy))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/dpeerlab/PhenoGraph.git")
(synopsis "Graph-based clustering for high-dimensional single-cell data")
(description
@@ -2058,6 +2063,7 @@ (define-public python-phylophlan
python-numpy
python-pandas
python-seaborn))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/biobakery/phylophlan")
(synopsis
"Phylogenetic analysis of microbial isolates and genomes from metagenomes")
@@ -2137,6 +2143,8 @@ (define-public python-pybedtools
python-cython
kentutils ; for bedGraphToBigWig
python-six
+ python-setuptools
+ python-wheel
;; For the test suite.
python-pytest
python-psutil))
@@ -2330,6 +2338,7 @@ (define-public python-readpaf
"15m6ffks4zwpp1ycwk6n02py6mw2yh7qr0vhpc178b91gldr97ia"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-pandas))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/alexomics/read-paf")
(synopsis "Minimap2 PAF file reader")
(description
@@ -2442,6 +2451,7 @@ (define-public python-biopython
(lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs
(list python-numpy))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://biopython.org/")
(synopsis "Tools for biological computation in Python")
(description
@@ -3494,7 +3504,8 @@ (define-public python-bx-python
(inputs
(list zlib))
(native-inputs
- (list python-cython python-lzo python-pytest))
+ (list python-cython python-lzo python-pytest python-setuptools
+ python-wheel))
(home-page "https://github.com/bxlab/bx-python")
(synopsis "Tools for manipulating biological data")
(description
@@ -3656,6 +3667,8 @@ (define-public python-pysam
(native-inputs
(list python-cython
python-pytest
+ python-setuptools
+ python-wheel
;; Dependencies below are are for tests only.
samtools
bcftools))
@@ -3734,6 +3747,8 @@ (define-public python-plastid
(native-inputs
`(("python-cython" ,python-cython)
("python-nose" ,python-nose)
+ ("python-setuptools" ,python-setuptools)
+ ("python-wheel" ,python-wheel)
("test-data"
,(origin
(method url-fetch)
@@ -4061,7 +4076,8 @@ (define-public python-dnaio
(arguments
(list #:tests? #false)) ;there are none
(native-inputs
- (list python-cython python-pytest python-setuptools-scm))
+ (list python-cython python-pytest python-setuptools-scm
+ python-setuptools python-wheel))
(propagated-inputs
(list python-xopen))
(home-page "https://github.com/marcelm/dnaio/")
@@ -4239,6 +4255,7 @@ (define-public python-pybigwig
(list python-numpy))
(inputs
(list libbigwig zlib curl))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/dpryan79/pyBigWig")
(synopsis "Access bigWig files in Python using libBigWig")
(description
@@ -4277,9 +4294,11 @@ (define-public python-schema-salad
python-rdflib-jsonld
python-requests
python-ruamel.yaml
+ python-setuptools ; For pkg_resources.
python-typing-extensions))
(native-inputs
- (list python-black python-pytest python-pytest-runner))
+ (list python-black python-pytest python-pytest-runner
+ python-wheel))
(home-page "https://github.com/common-workflow-language/schema_salad")
(synopsis "Schema Annotations for Linked Avro Data (SALAD)")
(description
@@ -4380,6 +4399,7 @@ (define-public python-scrublet
python-scikit-learn
python-scipy
python-umap-learn))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/swolock/scrublet")
(synopsis "Tool to indentify and remove doublets in single-cell data")
(description "This package provides a tool for identifying and removing
@@ -4456,6 +4476,7 @@ (define-public cwltool
python-requests
python-ruamel.yaml
python-schema-salad
+ python-setuptools ; For pkg_resources.
python-shellescape
python-typing-extensions
;; Not listed as needed but still necessary:
@@ -4467,7 +4488,8 @@ (define-public cwltool
python-pytest
python-pytest-cov
python-pytest-mock
- python-pytest-runner))
+ python-pytest-runner
+ python-wheel))
(home-page
"https://github.com/common-workflow-language/common-workflow-language")
(synopsis "Common Workflow Language reference implementation")
@@ -4521,7 +4543,8 @@ (define-public python-dendropy
(substitute* "tests/test_datamodel_taxon.py"
(("collections.Iterable")
"collections.abc.Iterable")))))))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-wheel))
+ (propagated-inputs (list python-setuptools))
(home-page "https://dendropy.org/")
(synopsis "Library for phylogenetics and phylogenetic computing")
(description
@@ -5115,7 +5138,8 @@ (define-public python-bamnostic
(base32
"0cjpzyqz6r4lmiwry2gcxdczwpkhl3lyyjg4s8addln17691ysxk"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-pytest))
+ (propagated-inputs (list python-pytest python-setuptools))
+ (native-inputs (list python-wheel))
(home-page "https://github.com/betteridiot/bamnostic/")
(synopsis "Tool for binary alignment map, random access and parsing")
(description
@@ -5213,7 +5237,7 @@ (define-public python-ete3
python-pyqt
python-scipy))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "http://etetoolkit.org")
(synopsis "Python environment for phylogenetic tree exploration")
(description
@@ -5234,6 +5258,7 @@ (define-public python-illumina-utils
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;there are none
(propagated-inputs (list python-matplotlib python-numpy python-levenshtein))
+ (native-inputs (list python-setuptools python-wheel python-pip))
(home-page "https://github.com/meren/illumina-utils")
(synopsis "Library and scripts to work with Illumina paired-end data")
(description
@@ -5255,6 +5280,7 @@ (define-public python-pyani
(propagated-inputs
(list python-biopython python-matplotlib python-pandas
python-scipy python-seaborn))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://widdowquinn.github.io/pyani/")
(synopsis "Calculate genome-scale average nucleotide identity")
(description
@@ -8607,7 +8633,9 @@ (define-public python-screed
(build-system pyproject-build-system)
(native-inputs
(list python-pytest-cov
- python-pytest-runner))
+ python-pytest-runner
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/dib-lab/screed/")
(synopsis "Short read sequence database utilities")
(description "Screed parses FASTA and FASTQ files and generates databases.
@@ -8949,7 +8977,7 @@ (define-public seqmagick
(inputs
(list python-biopython python-pygtrie))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/fhcrc/seqmagick")
(synopsis "Tools for converting and modifying sequence files")
(description
@@ -11672,10 +11700,12 @@ (define-public multiqc
python-requests
python-rich
python-rich-click
+ python-setuptools ; For pkg_resources.
python-simplejson
python-spectra))
(native-inputs
`(("python-pytest" ,python-pytest)
+ ("python-wheel" ,python-wheel)
("tests"
,(let ((commit "c3e7400affe3f3ca996973805797af61b93070ba"))
(origin
@@ -13301,9 +13331,10 @@ (define-public python-goatools
python-pydot
python-requests
python-scipy
+ python-setuptools
python-statsmodels
python-xlsxwriter))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-wheel))
(home-page "https://github.com/tanghaibao/goatools")
(synopsis "Python scripts to find enrichment of GO terms")
(description "Python scripts to find enrichment of GO terms. In addition,
@@ -13419,9 +13450,10 @@ (define-public python-mgatk
python-pysam
python-regex
python-ruamel.yaml
+ python-setuptools
snakemake))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-wheel))
(home-page "https://github.com/caleblareau/mgatk")
(synopsis "Mitochondrial genome analysis toolkit.")
(description "This package is a Python-based command line interface for
@@ -15658,6 +15690,7 @@ (define-public python-scanpy
python-patsy
python-scikit-learn
python-scipy
+ python-setuptools ; For pkg_resources.
python-seaborn
python-session-info
python-sinfo
@@ -16008,7 +16041,9 @@ (define-public python-pyfaidx
python-mock
python-numpy
python-pytest
- python-pytest-cov))
+ python-pytest-cov
+ python-wheel))
+ (propagated-inputs (list python-setuptools))
(home-page "http://mattshirley.com")
(synopsis "Random access to fasta subsequences")
(description
@@ -16174,7 +16209,7 @@ (define-public python-hicmatrix
python-scipy
python-tables))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/deeptools/HiCMatrix/")
(synopsis "HiCMatrix class for HiCExplorer and pyGenomeTracks")
(description
@@ -17038,6 +17073,7 @@ (define-public cnvkit
python-scipy
;; R packages
r-dnacopy))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://cnvkit.readthedocs.org/")
(synopsis "Copy number variant detection from targeted DNA sequencing")
(description
@@ -19146,7 +19182,9 @@ (define-public python-cgatcore
(list python-pytest
lsof
inetutils
- openssl))
+ openssl
+ python-setuptools
+ python-wheel))
(inputs (list time))
(propagated-inputs
(list python-apsw
@@ -19647,6 +19685,7 @@ (define-public python-dna-features-viewer
(list python-biopython
python-matplotlib
python-packaging))
+ (native-inputs (list python-setuptools python-wheel))
(home-page
"https://github.com/Edinburgh-Genome-Foundry/DnaFeaturesViewer")
(synopsis "Plot features from DNA sequences")
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 069d02b52c..ec8cddbd16 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages bootloaders)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages xorg)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (guix build-system gnu)
@@ -676,6 +677,8 @@ (define u-boot
pkg-config ;for 'make menuconfig'
python
python-pyelftools
+ python-setuptools
+ python-wheel
swig
(list util-linux "lib")))
(home-page "https://www.denx.de/wiki/U-Boot/")
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 71dc9eb54b..691fe67605 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -833,7 +833,7 @@ (define-public python-gixy
(base32
"0gymjcnvjx9snyrzdbmjnk93ibb161q72xam29vnl3yyac4r1330"))))
(build-system pyproject-build-system)
- (native-inputs (list python-nose))
+ (native-inputs (list python-nose python-setuptools python-wheel))
(propagated-inputs
(list python-cached-property python-configargparse
python-jinja2 python-six
@@ -1705,7 +1705,8 @@ (define-public python-pytest-forked
;; 'hypothesis' plugin is not in the environment (due to
;; <http://issues.guix.gnu.org/25235>), which would cause the test suite
;; to fail (see: https://github.com/pytest-dev/pytest-forked/issues/54).
- (list python-pytest-bootstrap python-setuptools-scm))
+ (list python-pytest-bootstrap python-setuptools
+ python-setuptools-scm python-wheel))
(home-page "https://github.com/pytest-dev/pytest-forked")
(synopsis "Pytest plugin to run tests in isolated forked subprocesses")
(description "This package provides a Pytest plugin which enables running
@@ -2030,7 +2031,7 @@ (define-public python-pytest-asyncio
(lambda _
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
#$(package-version this-package)))))))
- (native-inputs (list python-setuptools-scm))
+ (native-inputs (list python-setuptools-scm python-setuptools python-wheel))
(propagated-inputs (list python-pytest))
(home-page "https://github.com/pytest-dev/pytest-asyncio")
(synopsis "Pytest support for asyncio")
@@ -2467,7 +2468,9 @@ (define-public python-pytest-mypy-plugins
python-mypy
python-pytest
python-pyyaml
+ python-setuptools
python-regex))
+ (native-inputs (list python-wheel))
(home-page "https://github.com/TypedDjango/pytest-mypy-plugins")
(synopsis "Pytest plugin for writing tests for mypy plugins")
(description "This package provides a pytest plugin for writing tests for
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 762d8bd402..bdaa84f00a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -3062,6 +3062,7 @@ (define-public python-aiomysql
(build-system pyproject-build-system)
(arguments '(#:tests? #f)) ;test suite requires docker
(propagated-inputs (list python-pymysql))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/aiomysql")
(synopsis "MySQL driver for Python")
(description "@code{aiomysql} is a driver for accessing a MySQL database
@@ -3452,7 +3453,8 @@ (define-public python-sqlalchemy
(build-system pyproject-build-system)
(native-inputs
(list python-cython ; for C extensions
- python-pytest python-mock python-pytest-xdist)) ; for tests
+ python-pytest python-mock python-pytest-xdist ; for tests
+ python-setuptools python-wheel))
(propagated-inputs
(list python-greenlet))
(arguments
@@ -3646,7 +3648,7 @@ (define-public python-sqlite-utils
(propagated-inputs (list python-click python-click-default-group
python-dateutil python-sqlite-fts4
python-tabulate))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/simonw/sqlite-utils")
(synopsis
"CLI tool and Python utility functions for manipulating SQLite databases")
@@ -3719,7 +3721,7 @@ (define-public python-apsw
"02sgja00azvd08wi2wm105apmhp2644s7aw9b1zdg3dkcwjnsiad"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-cython unzip))
+ (list python-cython unzip python-setuptools python-wheel))
(inputs (list sqlite-next)) ;SQLite 3.40 required.
(arguments
(list
@@ -4039,7 +4041,7 @@ (define-public python-hiredis
;; The fix was forwarded upstream, see:
;; https://github.com/redis/hiredis-py/pull/160.
(delete-file "tests/__init__.py"))))))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(inputs (list hiredis))
(home-page "https://github.com/redis/hiredis-py")
(synopsis "Python extension that wraps protocol parsing code in hiredis")
@@ -4131,6 +4133,8 @@ (define-public python-redis
(list python-pytest
python-pytest-asyncio
python-pytest-timeout
+ python-setuptools
+ python-wheel
redis))
(propagated-inputs
(list python-async-timeout))
diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm
index 481771804b..e478f43b77 100644
--- a/gnu/packages/digest.scm
+++ b/gnu/packages/digest.scm
@@ -123,7 +123,7 @@ (define-public python-xxhash
"1hdxcscry59gh0znlm71ya23mm9rfmvz8lvvlplzxzf63pib28dc"))))
(build-system pyproject-build-system)
;; Needed to embed the correct version string
- (native-inputs (list python-setuptools-scm))
+ (native-inputs (list python-setuptools-scm python-setuptools python-wheel))
(home-page "https://github.com/ifduyue/python-xxhash")
(synopsis "Python binding for xxHash")
(description "This package provides Python bindings for the xxHash hash
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 88f541d2e9..11b85508ec 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2530,7 +2530,7 @@ (define-public python-pyvisa
(substitute* "pyvisa/shell.py"
(("from .thirdparty import prettytable")
"import prettytable")))))))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-dataclasses python-prettytable
python-typing-extensions))
(home-page "https://pyvisa.readthedocs.io/en/latest/")
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 153602b4b4..7b0123b6cb 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -491,7 +491,8 @@ (define-public python-ufo2ft
(sha256
(base32 "1rg2997af8blvswlwif0kpz2vxrlh555gzqslz6yv9y7i7v8lphl"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest python-setuptools-scm))
+ (native-inputs (list python-pytest python-setuptools-scm
+ python-setuptools python-wheel))
(propagated-inputs
(list python-booleanoperations
python-cffsubr
@@ -638,7 +639,8 @@ (define-public python-glyphslib
"--ignore=tests/builder/interpolation_test.py")))
(native-inputs
(list python-setuptools-scm
-
+ python-setuptools
+ python-wheel
;; For tests.
python-pytest
python-xmldiff))
@@ -809,6 +811,7 @@ (define-public psautohint
python-pytest-cov
python-pytest-xdist
python-setuptools-scm
+ python-setuptools
python-wheel))
(home-page "https://github.com/adobe-type-tools/psautohint")
(synopsis "Adobe's PostScript autohinter")
@@ -1693,7 +1696,7 @@ (define-public python-ufolib2
(base32 "0yx4i8q5rfyqhr2fj70a7z1bp1jv7bdlr64ww9z4nv9ycbda4x9j"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-setuptools-scm))
+ (list python-pytest python-setuptools-scm python-setuptools python-wheel))
(propagated-inputs (list python-attrs python-fonttools))
(home-page "https://github.com/fonttools/ufoLib2")
(synopsis "Unified Font Object (UFO) font processing library")
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index cce4f2518d..78d683d9e4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -351,7 +351,9 @@ (define-public python-h3
python-numpy
python-pytest
python-scikit-build
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(inputs (list h3))
(home-page "https://uber.github.io/h3-py")
(synopsis "Python bindings for H3")
@@ -959,7 +961,7 @@ (define-public python-geopandas
(list python-fiona python-packaging python-pandas python-pyproj
python-shapely))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://geopandas.org")
(synopsis "Geographic pandas extensions")
(description "The goal of GeoPandas is to make working with
@@ -1014,7 +1016,7 @@ (define-public python-osmnx
python-rtree
python-shapely))
(native-inputs
- (list python-numpy python-pytest))
+ (list python-numpy python-pytest python-setuptools python-wheel))
(home-page "https://github.com/gboeing/osmnx")
(synopsis
"Retrieve, model, analyze, and visualize OpenStreetMap street networks")
@@ -1801,7 +1803,7 @@ (define-public python-rtree
(string-append "\"" libspatialindex
"/lib/libspatialindex_c.so\"")))))))))
(native-inputs
- (list python-numpy python-pytest python-wheel))
+ (list python-numpy python-pytest python-setuptools python-wheel))
(inputs
(list libspatialindex))
(home-page "https://github.com/Toblerity/rtree")
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 5510828edf..013ef1a193 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -185,7 +185,7 @@ (define-public python-igraph
(string-append igraph "/lib")))))))))))
(inputs (list igraph))
(propagated-inputs (list python-texttable))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://igraph.org/python/")
(synopsis "Python bindings for the igraph network analysis library"))))
@@ -353,11 +353,12 @@ (define-public python-vtraag-louvain
(("self.use_pkgconfig = False")
"self.use_pkgconfig = True")))))))
(inputs (list igraph))
- (propagated-inputs (list python-igraph))
+ (propagated-inputs (list python-igraph python-setuptools))
(native-inputs
(list pkg-config
python-ddt
- python-setuptools-scm))
+ python-setuptools-scm
+ python-wheel))
(home-page "https://github.com/vtraag/louvain")
(synopsis "Community detection in large networks")
(description
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm
index b91c365e3c..9ba62f9e07 100644
--- a/gnu/packages/graphviz.scm
+++ b/gnu/packages/graphviz.scm
@@ -156,7 +156,9 @@ (define-public python-graphviz
python-mock
python-pytest
python-pytest-cov
- python-pytest-mock))
+ python-pytest-mock
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/xflr6/graphviz")
(synopsis "Simple Python interface for Graphviz")
(description
diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm
index ca8375d19d..3a10bf3293 100644
--- a/gnu/packages/license.scm
+++ b/gnu/packages/license.scm
@@ -179,13 +179,14 @@ (define-public reuse
(base32 "0ij2mpdnawjabnsy291157wzci9050dfclwib95phg7pnmd6xsw0"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-poetry-core python-pytest))
+ (list python-poetry-core python-pytest python-wheel))
(inputs
(list python-binaryornot
python-boolean.py
python-debian
python-jinja2
- python-license-expression))
+ python-license-expression
+ python-setuptools)) ; For pkg_resources.
(home-page "https://reuse.software/")
(synopsis "Provide and verify copyright and licensing information")
(description
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3923573d57..0532083b02 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -745,7 +745,7 @@ (define-public python-sacrebleu
python-portalocker
python-regex
python-tabulate))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/mjpost/sacrebleu")
(synopsis
"Compute shareable, comparable, and reproducible BLEU, chrF, and TER scores")
@@ -786,7 +786,7 @@ (define-public python-spacy-legacy
(build-system pyproject-build-system)
;; This package depends on spacy, which depends on this package.
(arguments (list #:tests? #false))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://spacy.io")
(synopsis "Legacy registered functions for spaCy backwards compatibility")
(description
@@ -807,7 +807,7 @@ (define-public python-spacy-loggers
(build-system pyproject-build-system)
;; This package depends on spacy, which depends on this package.
(arguments (list #:tests? #false))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/explosion/spacy-loggers")
(synopsis "Logging utilities for SpaCy")
(description "This package provides logging utilities for the SpaCy
@@ -1548,7 +1548,7 @@ (define-public python-tslearn
python-scikit-learn
tensorflow
python-wheel))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/tslearn-team/tslearn")
(synopsis "Machine learning toolkit for time series data")
(description "This is a Python library for time series data mining.
@@ -1594,7 +1594,9 @@ (define-public python-imbalanced-learn
python-mypy
python-pandas
python-pytest
- python-pytest-cov))
+ python-pytest-cov
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/scikit-learn-contrib/imbalanced-learn")
(synopsis "Toolbox for imbalanced dataset in machine learning")
(description "This is a Python package offering a number of re-sampling
@@ -1737,7 +1739,9 @@ (define-public python-cleanlab
(native-inputs
(list python-pytest
python-pytorch
- python-torchvision))
+ python-torchvision
+ python-setuptools
+ python-wheel))
(home-page "https://cleanlab.ai")
(synopsis "Automatically find and fix dataset issues")
(description
@@ -1769,7 +1773,7 @@ (define-public python-cleanlab-1
python-scipy
python-tqdm))
(native-inputs
- (list python-pytest))))
+ (list python-pytest python-setuptools python-wheel))))
(define-public python-cma
(package
@@ -1810,7 +1814,7 @@ (define-public python-cmaes
(base32 "1f3143w8ii6i93bdh65iazrq1lryccd805ndnqww5l8h7qnnzpkm"))
(file-name (git-file-name name version))))
(build-system pyproject-build-system)
- (native-inputs (list python-hypothesis))
+ (native-inputs (list python-hypothesis python-setuptools python-wheel))
(propagated-inputs (list python-numpy))
(home-page "https://github.com/CyberAgentAILab/cmaes")
(synopsis "CMA-ES implementation for Python")
@@ -1981,13 +1985,15 @@ (define-public python-hyperopt
python-networkx
python-numpy
python-scipy
+ python-setuptools ; For pkg_resources.
python-six
python-tqdm))
(native-inputs
(list python-black
python-nose
python-pymongo
- python-pytest))
+ python-pytest
+ python-wheel))
(home-page "https://hyperopt.github.io/hyperopt/")
(synopsis "Library for hyperparameter optimization")
(description "Hyperopt is a Python library for serial and parallel
@@ -3537,7 +3543,8 @@ (define-public python-tensorly
;; nor is examples/plot_quantum.py
" and not test_file_is_generated"))))
(propagated-inputs (list python-jsmin python-numpy python-scipy))
- (native-inputs (list python-pytest python-pytest-cov python-sphinx))
+ (native-inputs (list python-pytest python-pytest-cov python-sphinx
+ python-setuptools python-wheel))
(home-page "https://github.com/tensorly/tensorly")
(synopsis "Tensor learning in Python")
(description
@@ -3966,6 +3973,7 @@ (define-public python-readchar
(lambda _
(delete-file "readchar/_win_read.py"))))))
(propagated-inputs (list python-setuptools))
+ (native-inputs (list python-wheel))
(home-page "https://github.com/magmax/python-readchar")
(synopsis "Library to easily read single chars and key strokes")
(description "This package provides a Python library to easily read single
@@ -4199,7 +4207,7 @@ (define-public python-torchvision
python-pillow-simd
python-pytorch))
(native-inputs
- (list which python-pytest))
+ (list which python-pytest python-setuptools python-wheel))
(home-page "https://pytorch.org/vision/stable/index.html")
(synopsis "Datasets, transforms and models specific to computer vision")
(description
@@ -4747,7 +4755,7 @@ (define-public python-brian2
;; Required by codegen.
python-setuptools
python-sympy))
- (native-inputs (list python-pytest python-pytest-xdist))
+ (native-inputs (list python-pytest python-pytest-xdist python-wheel))
(home-page "https://briansimulator.org/")
(synopsis "Clock-driven simulator for spiking neural networks")
(description
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 0d74a2a55c..112e3ee071 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -161,6 +161,7 @@ (define-module (gnu packages maths)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -4823,7 +4824,8 @@ (define-public python-blis
(invoke "python" "setup.py" "build_ext" "--inplace"
"-j" (number->string (parallel-job-count))))))))
(propagated-inputs (list python-numpy))
- (native-inputs (list python-cython python-pytest))
+ (native-inputs (list python-cython python-pytest
+ python-setuptools python-wheel))
(home-page "https://github.com/explosion/cython-blis")
(synopsis "Blis as a self-contained C-extension for Python")
(description
diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm
index 3238f11fb4..b979feff06 100644
--- a/gnu/packages/monitoring.scm
+++ b/gnu/packages/monitoring.scm
@@ -326,7 +326,7 @@ (define-public zabbix-cli
(string-append #$output "/share/doc/"
#$name "/html")))))))
(native-inputs
- (list python-pytest python-sphinx))
+ (list python-pytest python-sphinx python-setuptools python-wheel))
(inputs
(list ncurses python-requests))
(home-page "https://github.com/unioslo/zabbix-cli")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index dacd4433d2..4aedbd613c 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -963,7 +963,8 @@ (define-public python-anaconda-client
(add-before 'check 'set-HOME
(lambda _ (setenv "HOME" "/tmp"))))))
(propagated-inputs
- (list python-clyent python-nbformat python-pyyaml python-requests))
+ (list python-clyent python-nbformat python-pyyaml python-requests
+ python-setuptools))
(native-inputs
(list python-coverage
python-dateutil
@@ -971,7 +972,8 @@ (define-public python-anaconda-client
python-mock
python-pillow
python-pytest
- python-pytz))
+ python-pytz
+ python-wheel))
(home-page "https://github.com/Anaconda-Platform/anaconda-client")
(synopsis "Anaconda Cloud command line client library")
(description
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index e6d7caa1ef..217521f37b 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -341,7 +341,8 @@ (define-public python-clorm
(("self\\.assertTrue\\(os_called\\)" all)
(string-append "# " all))))))))
(propagated-inputs (list python-clingo))
- (native-inputs (list python-typing-extensions))
+ (native-inputs (list python-typing-extensions
+ python-setuptools python-wheel))
(home-page "https://potassco.org")
(synopsis "Object relational mapping to clingo")
(description "@acronym{Clorm, Clingo ORM} provides an @acronym{ORM,
@@ -366,6 +367,7 @@ (define-public python-telingo
"0g3khxfdzc2hc7dkiyyqhb399h6h21m5wkp6wy8w71n0m32fiy53"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-clingo))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://potassco.org/")
(synopsis "Solve dynamic temporal logic programs")
(description "This package provides a system to solve dynamic temporal
@@ -393,8 +395,10 @@ (define-public python-clingraph
python-imageio
python-jinja2
python-jsonschema
- python-networkx))
- (native-inputs (list dot2tex graphviz python-pylint python-pytest))
+ python-networkx
+ python-setuptools))
+ (native-inputs (list dot2tex graphviz python-pylint python-pytest
+ python-wheel))
(home-page "https://github.com/potassco/clingraph")
(synopsis "Visualizer for graphs defined as logic programs")
(description
diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index 8cd805799e..d026809093 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -381,7 +381,9 @@ (define-public python-mypy-protobuf
(list python-grpc-stubs
python-grpcio-tools
python-pytest
- python-typing-extensions))
+ python-typing-extensions
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list protobuf
python-protobuf
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index 154c97e9e4..faaffbcea5 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -206,7 +206,7 @@ (define-public python-trove-classifiers
(build-system pyproject-build-system)
(arguments (list #:build-backend "setuptools.build_meta"
#:tests? #f)) ;keep dependencies to a minimum
- (native-inputs (list python-wheel))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/pypa/trove-classifiers")
(synopsis "Canonical source for classifiers on PyPI")
(description "This package is the canonical source for classifiers use on
@@ -588,6 +588,7 @@ (define-public python-flit-scm
;; builder instead.
#:build-backend "setuptools.build_meta"))
(propagated-inputs (list python-flit-core python-setuptools-scm python-tomli))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://gitlab.com/WillDaSilva/flit_scm")
(synopsis "PEP 518 build backend combining flit_core and setuptools_scm")
(description "This package provides a PEP 518 build backend that uses
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 87e15b4560..92289cb164 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -586,7 +586,9 @@ (define-public python-pytest-doctestplus
" and not test_remote_data_requires"
" and not test_remote_data_ignore_warnings"))))
(native-inputs
- (list python-numpy python-pytest python-setuptools-scm))
+ (list python-numpy python-pytest python-setuptools python-setuptools-scm
+ python-wheel))
+ (propagated-inputs (list python-setuptools)) ;; for pkg_resources
(home-page "https://github.com/astropy/pytest-doctestplus")
(synopsis "Pytest plugin with advanced doctest features")
(description
@@ -636,7 +638,9 @@ (define-public python-pytest-filter-subpackage
(list python-pytest
python-pytest-cov
python-pytest-doctestplus
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/astropy/pytest-filter-subpackage")
(synopsis "Pytest plugin for filtering based on sub-packages")
(description
@@ -749,7 +753,8 @@ (define-public python-pytest-remotedata
"not test_default_behavior"
" and not test_strict_with_decorator"))))
(native-inputs
- (list python-pytest python-setuptools-scm))
+ (list python-pytest python-setuptools python-setuptools-scm
+ python-wheel))
(propagated-inputs
(list python-packaging))
(home-page "https://github.com/astropy/pytest-remotedata")
@@ -843,7 +848,9 @@ (define-public python-pytest-mpl
(list
#:test-flags #~(list "-m" "mpl_image_compare")))
(native-inputs
- (list python-pytest))
+ (list python-pytest
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-jinja2
python-matplotlib
@@ -1770,7 +1777,8 @@ (define-public python-memory-profiler
(("def test_memory_profiler")
"def __off_test_memory_profiler")))))))
(native-inputs
- (list python-pytest python-pytest-fixture-config python-safety))
+ (list python-pytest python-pytest-fixture-config python-safety
+ python-setuptools python-wheel))
(propagated-inputs (list python-psutil))
(home-page "https://github.com/pythonprofilers/memory_profiler")
(synopsis "Memory profiler for Python")
@@ -2178,7 +2186,7 @@ (define-public python-aioresponses
(native-inputs
(list python-pbr python-ddt python-pytest))
(propagated-inputs
- (list python-aiohttp))
+ (list python-aiohttp python-setuptools))
(home-page "https://github.com/pnuckowski/aioresponses")
(synopsis "Mock out requests made by ClientSession from aiohttp package")
(description
@@ -2390,7 +2398,9 @@ (define-public python-nox
(native-inputs
(list python-jinja2
python-pytest
- python-tox))
+ python-tox
+ python-setuptools
+ python-wheel))
(home-page "https://nox.thea.codes/")
(synopsis "Flexible test automation")
(description
@@ -2544,7 +2554,8 @@ (define-public python-pytest-httpx
(base32 "1ncpd74hmsz4sadvjg99fnfscxpgh3mc2siini0dhxzwgwdkk5i7"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-httpx))
- (native-inputs (list python-pytest python-pytest-asyncio))
+ (native-inputs (list python-pytest python-pytest-asyncio python-setuptools
+ python-wheel))
(home-page "https://colin-b.github.io/pytest_httpx/")
(synopsis "Pytest plugin to mock httpx")
(description "This package provides a pytest fixture to mock httpx
@@ -2621,7 +2632,8 @@ (define-public python-vulture
;; skip test that uses python-pint
;; pint has many dependencies
"not test_whitelists_with_python")))))))
- (native-inputs (list python-pytest python-pytest-cov))
+ (native-inputs (list python-pytest python-pytest-cov
+ python-setuptools python-wheel))
(propagated-inputs (list python-toml))
(home-page "https://github.com/jendrikseipp/vulture")
(synopsis "Find dead Python code")
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 000d42524d..9d8ea8b156 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -64,7 +64,9 @@ (define-public python-multivolumefile
python-hypothesis
python-pyannotate
python-pytest
- python-pytest-cov))
+ python-pytest-cov
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/miurahr/multivolume")
(synopsis "Treat multiple files as one")
(description "MultiVolumefile is a Python library that provides a
@@ -89,7 +91,9 @@ (define-public python-pybcj
python-hypothesis
python-pytest
python-pytest-cov
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://codeberg.org/miurahr/pybcj")
(synopsis "BCJ filter library")
(description "In data compression, BCJ, short for Branch-Call-Jump, refers
@@ -149,6 +153,7 @@ (define-public python-brotlicffi
(setenv "USE_SHARED_BROTLI" "1"))))))
(propagated-inputs (list python-cffi))
(inputs (list brotli))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/python-hyper/brotlicffi")
(synopsis "Python CFFI bindings to the Brotli library")
(description "This package provides Python CFFI bindings to the Brotli
@@ -170,7 +175,9 @@ (define-public python-inflate64
(native-inputs
(list python-pyannotate
python-pytest
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://pypi.org/project/inflate64/")
(synopsis "deflate64 compression/decompression library")
(description "The @code{inflate64} package provides @code{Deflater} and
@@ -199,7 +206,7 @@ (define-public python-isal
(add-after 'unpack 'use-dynamic-linking
(lambda _ (setenv "PYTHON_ISAL_LINK_DYNAMIC" "1"))))))
(inputs (list isa-l))
- (native-inputs (list python-cython))
+ (native-inputs (list python-cython python-setuptools python-wheel))
(home-page "https://github.com/pycompression/python-isal")
(synopsis "Python bindings for the ISA-L compression library")
(description
@@ -225,7 +232,9 @@ (define-public python-pyppmd
python-pytest-benchmark
python-pytest-cov
python-pytest-timeout
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/miurahr/pyppmd")
(synopsis "PPMd compression/decompression library")
(description "Pyppmd provides classes and functions for compressing and
@@ -287,6 +296,7 @@ (define-public python-py7zr
python-texttable))
(native-inputs
(list python-setuptools
+ python-wheel
python-setuptools-scm
python-coverage
python-coveralls
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 44babe5c8c..fb4cc63097 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -298,7 +298,9 @@ (define-public python-keyring
(native-inputs
(list python-toml
python-pytest
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(propagated-inputs
(list python-importlib-metadata
python-jaraco-classes
@@ -530,7 +532,9 @@ (define-public python-cryptography
python-pretend
python-pytest ;for subtests
python-pytest-benchmark
- python-pytest-subtests))
+ python-pytest-subtests
+ python-setuptools
+ python-wheel))
(inputs (list python-cryptography-rust))
(propagated-inputs (list python-cffi))
(home-page "https://github.com/pyca/cryptography")
@@ -1038,7 +1042,7 @@ (define-public python-m2crypto
;; certificates.
#:tests? #f))
(inputs (list openssl))
- (native-inputs (list swig))
+ (native-inputs (list swig python-setuptools python-wheel))
(home-page "https://gitlab.com/m2crypto/m2crypto")
(synopsis "Python crypto and TLS toolkit")
(description "@code{M2Crypto} is a complete Python wrapper for OpenSSL
@@ -1218,7 +1222,8 @@ (define-public python-service-identity
(base32
"0d4x84crbz0a17d8gi90z6zlxwm9pslc65rx0cdw2797ra360v3f"))))
(build-system pyproject-build-system)
- (native-inputs (list python-idna python-pytest))
+ (native-inputs (list python-idna python-pytest python-setuptools
+ python-wheel))
(propagated-inputs (list python-attrs python-cryptography python-pyasn1
python-pyasn1-modules python-six))
(home-page "https://service-identity.readthedocs.io/")
@@ -1449,6 +1454,8 @@ (define-public python-trustme
python-pytest
python-pytest-cov
python-service-identity
+ python-setuptools
+ python-wheel
python-zipp))
(propagated-inputs
(list python-cryptography
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 86ba4209fd..538a3c2f0e 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -191,9 +191,12 @@ (define-public python-scikit-allel
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(propagated-inputs
(list python-dask
- python-numpy))
+ python-numpy
+ python-click))
(native-inputs
(list python-cython
+ python-setuptools
+ python-wheel
;; The following are all needed for the tests
htslib
python-h5py
@@ -340,7 +343,7 @@ (define-public python-scikit-optimize
python-scikit-learn
python-scipy))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://scikit-optimize.github.io/")
(synopsis "Sequential model-based optimization toolbox")
(description "Scikit-Optimize, or @code{skopt}, is a simple and efficient
@@ -743,7 +746,7 @@ (define-public python-xarray
"1339fz5gxkizq02h6vn19546x9p4c3nd9ipzpcg39h7gwhg26yi6"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-setuptools-scm python-pytest))
+ (list python-setuptools python-setuptools-scm python-pytest python-wheel))
(propagated-inputs
(list python-numpy python-pandas))
(home-page "https://github.com/pydata/xarray")
@@ -840,7 +843,8 @@ (define-public python-pytensor
"--ignore" "tests/tensor/"
"--ignore" "tests/sandbox/"
"--ignore" "tests/sparse/sandbox/")))))))
- (native-inputs (list python-cython python-pytest python-versioneer))
+ (native-inputs (list python-cython python-pytest python-versioneer
+ python-setuptools python-wheel))
(propagated-inputs (list python-cons
python-etuples
python-filelock
@@ -1585,7 +1589,9 @@ (define-public python-plotnine
python-mock
python-pandas
python-pytest python-pytest-cov
- tzdata-for-tests))
+ tzdata-for-tests
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/has2k1/plotnine")
(synopsis "Grammar of Graphics for Python")
(description
@@ -2035,7 +2041,8 @@ (define-public python-libneuroml
"0mrm4rd6x1sm6hkvhk20mkqp9q53sl3lbvq6hqzyymkw1iqq6bhy"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-lxml python-six))
- (native-inputs (list python-pytest python-numpy python-tables))
+ (native-inputs (list python-pytest python-numpy python-tables
+ python-setuptools python-wheel))
(home-page "https://libneuroml.readthedocs.org/en/latest/")
(synopsis
"Python library for working with NeuroML descriptions of neuronal models")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 17c9563cfd..1389a15934 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -304,7 +304,8 @@ (define-public python-aiosignal
(build-system pyproject-build-system)
(arguments (list #:test-flags #~(list "tests")))
(propagated-inputs (list python-frozenlist))
- (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov))
+ (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov
+ python-setuptools python-wheel))
(home-page "https://github.com/aio-libs/aiosignal")
(synopsis "Callback manager for Python @code{asyncio} projects")
(description "This Python module provides @code{Signal}, an abstraction to
@@ -601,7 +602,9 @@ (define-public python-asgi-csrf
python-httpx
python-pytest
python-pytest-asyncio
- python-starlette))
+ python-starlette
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/simonw/asgi-csrf")
(synopsis "ASGI middleware for protecting against CSRF attacks")
(description "This Asynchronous Server Gateway Interface (ASGI)
@@ -642,7 +645,9 @@ (define-public python-asgi-lifespan
(native-inputs (list python-pytest
python-pytest-asyncio
python-pytest-trio
- python-starlette))
+ python-starlette
+ python-setuptools
+ python-wheel))
(propagated-inputs (list python-sniffio))
(home-page "https://github.com/florimondmanca/asgi-lifespan")
(synopsis "Programmatic startup/shutdown of ASGI apps")
@@ -764,7 +769,9 @@ (define-public python-aws-xray-sdk
python-pytest-benchmark
python-requests
python-sqlalchemy
- python-webtest))
+ python-webtest
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-aiohttp
python-botocore
@@ -1101,7 +1108,9 @@ (define-public python-httplib2
python-pytest-randomly
python-pytest-timeout
python-pytest-xdist
- python-six))
+ python-six
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/httplib2/httplib2")
(synopsis "Comprehensive HTTP client library")
(description
@@ -1419,7 +1428,7 @@ (define-public python-h11
(base32 "17b97c56y31hi0n0x0cb5a87x4xr9jijf2y06pzj0977k6zgn6cg"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/python-hyper/h11")
(synopsis "Pure-Python, bring-your-own-I/O implementation of HTTP/1.1")
(description
@@ -1825,7 +1834,9 @@ (define-public python-omnipath
python-pytest-mock
python-requests-mock
python-setuptools-scm
- python-tox))
+ python-tox
+ python-setuptools
+ python-wheel))
(home-page "https://omnipathdb.org/")
(synopsis "Python client for the OmniPath web service")
(description "This package provides a Python client for the OmniPath web
@@ -1855,7 +1866,7 @@ (define-public python-openai
(propagated-inputs (list python-aiohttp python-requests python-tqdm
python-typing-extensions))
(native-inputs (list python-black python-pytest python-pytest-asyncio
- python-pytest-mock))
+ python-pytest-mock python-setuptools python-wheel))
(home-page "https://github.com/openai/openai-python")
(synopsis "Python client library for the OpenAI API")
(description "This package provides a Python client library for the
@@ -2060,7 +2071,7 @@ (define-public python-cssutils
"and not encutils "
"and not website.logging")))))))
(native-inputs
- (list python-pytest python-jaraco-test))
+ (list python-pytest python-jaraco-test python-setuptools python-wheel))
(home-page "https://github.com/jaraco/cssutils")
(synopsis
"CSS Cascading Style Sheets library for Python")
@@ -2243,7 +2254,7 @@ (define-public python-wsproto
(base32 "0rahm1j9danv1l6i6as80acwv16ycihxkhrvwjiqh9drxhk5ymmd"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-h11))
(home-page "https://github.com/python-hyper/wsproto/")
@@ -3728,7 +3739,7 @@ (define-public python-flask-compress
"178jzz6jxlxllcjqamzh5q7ahfh90m5cl1il9vmjs3xhz65z35pf"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-brotli python-flask))
- (native-inputs (list python-setuptools-scm))
+ (native-inputs (list python-setuptools-scm python-setuptools python-wheel))
(home-page "https://github.com/colour-science/flask-compress")
(synopsis "Compress responses in a Flask app")
(description
@@ -3751,6 +3762,7 @@ (define-public python-flask-seasurf
(arguments
(list #:tests? #false)) ;there are none
(propagated-inputs (list python-flask))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/maxcountryman/flask-seasurf/")
(synopsis "CSRF extension for Flask")
(description "SeaSurf is a Flask extension for preventing cross-site
@@ -4182,7 +4194,7 @@ (define-public python-flask-jwt
"flask_jwt/__init__.py")
(("access_token.decode\\('utf-8'\\)") "access_token")))))))
(propagated-inputs (list python-flask python-pyjwt))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/mattupstate/flask-jwt")
(synopsis "JWT token authentication for Flask apps")
(description "This package implements JWT token authentication for Flask
@@ -4209,7 +4221,9 @@ (define-public python-flask-restful
(native-inputs
(list python-blinker
python-mock
- python-pytest))
+ python-pytest
+ python-setuptools
+ python-wheel))
(home-page "https://www.github.com/flask-restful/flask-restful/")
(synopsis "Flask module for creating REST APIs")
(description
@@ -4870,9 +4884,9 @@ (define-public python-paste
(delete-file "tests/test_proxy.py") #t))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-nose))
+ (list python-pytest python-wheel))
(propagated-inputs
- (list python-six))
+ (list python-six python-setuptools))
(home-page "https://pythonpaste.readthedocs.io/")
(synopsis
"Python web development tools, focusing on WSGI")
@@ -5148,6 +5162,7 @@ (define-public whoogle-search
python-wcwidth
python-werkzeug
python-dotenv))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/benbusby/whoogle-search")
(synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine")
(description
@@ -5989,7 +6004,9 @@ (define-public python-httpcore
python-pytest-httpbin
python-pytest-trio
python-uvicorn
- python-trustme))
+ python-setuptools
+ python-trustme
+ python-wheel))
(propagated-inputs
(list python-anyio
python-certifi
@@ -6023,7 +6040,7 @@ (define-public python-httpcore-bootstrap
(package/inherit python-httpcore
(name "python-httpcore-bootstrap")
(arguments (list #:tests? #f))
- (native-inputs '()))))
+ (native-inputs (list python-setuptools python-wheel)))))
(define-public python-httpx
(package
@@ -6067,7 +6084,9 @@ (define-public python-httpx
python-trio
python-trio-typing
python-trustme
- python-uvicorn))
+ python-uvicorn
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-charset-normalizer
python-brotli
@@ -6299,7 +6318,7 @@ (define-public python-rapidjson
"/include/rapidjson" "'"))
(("if not os.path.isdir.*") "if False:")))))))
(native-inputs
- (list rapidjson python-pytest python-pytz))
+ (list rapidjson python-pytest python-pytz python-setuptools python-wheel))
(home-page "https://github.com/python-rapidjson/python-rapidjson")
(synopsis "Python wrapper around rapidjson")
(description "This package provides a python wrapper around rapidjson.")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b8e8097c7b..eee0e5f744 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -307,7 +307,8 @@ (define-public python-janus
(base32 "04hnrdcf03g1s0x3sr72sh9gnszz6kyfsl9dg8a4n0zvvhn6z5yz"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-asyncio))
+ (list python-pytest python-pytest-cov python-pytest-asyncio
+ python-setuptools python-wheel))
(propagated-inputs (list python-typing-extensions))
(home-page "https://github.com/aio-libs/janus/")
(synopsis
@@ -579,6 +580,7 @@ (define-public python-fit-nbinom
"12v8l5i35vjbpvh5i4lw29ys6vpr3z7pysyrx33hxaq09zr015mx"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-scipy))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/joachimwolff/fit_nbinom")
(synopsis "Negative binomial maximum likelihood estimator")
(description "This package provides an implementation in Python using
@@ -597,7 +599,8 @@ (define-public python-docrep
"0523jrzjj29kxpdllmfhrfj9kysi9mphp2m7ippjkn5b07i1g2pd"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-six))
- (native-inputs (list python-pytest python-pytest-runner))
+ (native-inputs (list python-pytest python-pytest-runner
+ python-setuptools python-wheel))
(home-page "https://github.com/Chilipp/docrep")
(synopsis "Python package for docstring repetition")
(description "Docrep is the documentation repetition module. This module
@@ -655,6 +658,7 @@ (define-public python-adjusttext
"05zf0xn7ab40dan213fwbp1z4rybih8dphf9mzb2ddmbafxq41mv"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-matplotlib python-numpy))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/Phlya/adjustText")
(synopsis "Adjust text position in matplotlib plots to minimize overlaps")
(description
@@ -772,6 +776,7 @@ (define-public python-colored
"196ins0m7f90xz5dw764dlx060ziqbcydqzzq40b4ir5858baf3r"))))
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;the tests are not run automatically
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://gitlab.com/dslackw/colored")
(synopsis "Simple library for color and formatting to terminal")
(description "This is a very simple Python library for color and
@@ -794,7 +799,8 @@ (define-public python-colorful
(base32 "1fcz5v8b318a3dsdha4c874jsf3wmcw3f25bv2csixclyzacli98"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-coverage python-flake8 python-pytest))
+ (list python-coverage python-flake8 python-pytest python-setuptools
+ python-wheel))
(propagated-inputs
(list python-colorama))
(home-page "http://github.com/timofurrer/colorful")
@@ -1101,7 +1107,8 @@ (define-public python-pdoc
(base32
"0gxkw607nrd67ck4w8jri9vfrm5g60qvp8b134m8zkiphbxjnx0l"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest python-jinja2 python-pygments))
+ (native-inputs (list python-pytest python-jinja2 python-pygments
+ python-setuptools python-wheel))
(arguments
(list
;; Some tests fail, presumably because of slight version mismatches of
@@ -1202,6 +1209,7 @@ (define-public python-plotext
"1gpy1z2i4vq1mcrhysxahz4339pbl9rzk58rf5m5gf5ym9xji6ii"))))
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;there are none
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/piccolomo/plotext")
(synopsis "Plots in the terminal")
(description "Plotext lets you plot directly to the terminal.")
@@ -1331,6 +1339,8 @@ (define-public python-skranger
python-matplotlib
python-pandas
python-poetry-core
+ python-setuptools
+ python-wheel
python-pytest))
(home-page "https://github.com/crflynn/skranger")
(synopsis "Python bindings for C++ ranger random forests")
@@ -1399,7 +1409,7 @@ (define-public python-tenacity
(build-system pyproject-build-system)
(native-inputs
(list python-setuptools-scm python-tornado-6 python-typeguard
- python-pytest))
+ python-pytest python-setuptools python-wheel))
(home-page "https://github.com/jd/tenacity")
(synopsis "Retrying library for python")
(description "Tenacity is a general-purpose python library to simplify the
@@ -1527,7 +1537,7 @@ (define-public python-glymur
;; which is patched above.
(delete-file "tests/test_config.py"))))))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(inputs
(list openjpeg ; glymur/lib/openjp2.py
libtiff)) ; glymur/lib/tiff.py
@@ -1796,7 +1806,7 @@ (define-public python-rasterio
python-click-plugins
python-cligj
python-numpy
- python-setuptools
+ python-setuptools ; For pkg_resources.
python-snuggs))
(native-inputs (list gdal
python-boto3
@@ -1805,7 +1815,8 @@ (define-public python-rasterio
python-packaging
python-pytest
python-pytest-cov
- python-shapely))
+ python-shapely
+ python-wheel))
(home-page "https://github.com/rasterio/rasterio")
(synopsis "Fast and direct raster I/O for use with Numpy and SciPy")
(description "This package implements fast and direct raster I/O for use
@@ -1833,7 +1844,7 @@ (define-public python-shapely
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
(native-inputs
(list python-cython python-matplotlib python-pytest
- python-pytest-cov))
+ python-pytest-cov python-setuptools python-wheel))
(inputs
(list geos))
(propagated-inputs
@@ -2119,7 +2130,9 @@ (define-public python-h5netcdf
(native-inputs
(list python-netcdf4
python-pytest
- python-setuptools-scm))
+ python-setuptools
+ python-setuptools-scm
+ python-wheel))
(propagated-inputs
(list python-h5py python-packaging))
(home-page "https://h5netcdf.org")
@@ -2414,7 +2427,7 @@ (define-public python-license-expression
(base32 "0lvshl2fhwa568d3y3vmx45hdp8gk5w9yl3b2q5d66r5vqn1sfwl"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-setuptools-scm python-pytest))
+ (list python-setuptools-scm python-pytest python-setuptools python-wheel))
(propagated-inputs
(list python-boolean.py))
(home-page "https://github.com/nexB/license-expression")
@@ -2537,7 +2550,8 @@ (define-public python-filelock-3.5
(base32
"058av1r760ws7z6qffsjpqa39fmdxw0s1wnyr7p50y3zclg6cyqk"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest python-setuptools-scm))
+ (native-inputs (list python-pytest python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://github.com/tox-dev/py-filelock")
(synopsis "Platform independent file lock")
(description "@code{filelock} contains a single module implementing
@@ -2798,7 +2812,8 @@ (define-public python-can
;; These tests fail with "OSError: [Errno 19] No such device".
"-k" "not BasicTestUdpMulticastBusIPv")))
(propagated-inputs
- (list python-msgpack python-typing-extensions python-wrapt))
+ (list python-msgpack python-typing-extensions python-wrapt
+ python-setuptools))
(native-inputs
(list ;; python-canalystii ; Not packed yet
python-codecov
@@ -2811,7 +2826,8 @@ (define-public python-can
python-pytest
python-pytest-cov
python-pytest-runner
- python-pytest-timeout))
+ python-pytest-timeout
+ python-wheel))
(home-page "https://github.com/hardbyte/python-can")
(synopsis "Controller Area Network (CAN) interface module for Python")
(description "This package defines the @code{can} module, which provides
@@ -2912,6 +2928,7 @@ (define-public python-optparse-pretty
(base32 "1920wbh2b7a8qn7zx2iiqbcdaax335l81a73x9pp8h11yzs2jdmh"))))
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;There are none
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/gvalkov/optparse-pretty")
(synopsis "Compact help formatter for optparse")
(description
@@ -3156,6 +3173,7 @@ (define-public python-fastprogress
;; XXX: Fails with: "In procedure utime: No such file
;; or directory".
(delete 'ensure-no-mtimes-pre-1980))))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/fastai/fastprogress")
(synopsis "Progress bar for Jupyter Notebook and console")
(description
@@ -3389,6 +3407,8 @@ (define-public python-omero-py
python-pytest
python-pytest-rerunfailures
python-pytest-xdist
+ python-setuptools
+ python-wheel
unzip
(origin
(method url-fetch)
@@ -3679,7 +3699,9 @@ (define-public python-jsonargparse
python-pytest-subtests
python-responses
python-tox
- python-types-requests))
+ python-types-requests
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/omni-us/jsonargparse/")
(synopsis "Implement minimal boilerplate CLIs derived from type hints")
(description
@@ -3884,7 +3906,7 @@ (define-public python-palettable
(base32
"1a4h0jpsr3wjciqg9a5kslxv65d3qqgmqgkpai4cl77wlpcxfk89"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://jiffyclub.github.io/palettable/")
(synopsis "Color palettes for Python")
(description "Palettable (formerly brewer2mpl) is a library of color
@@ -3965,7 +3987,8 @@ (define-public python-parsley
(string-append "not test_sending_empty_netstring"
" and not test_sending_one_netstring"
" and not test_sending_two_netstrings"))))
- (native-inputs (list python-pytest python-twisted))
+ (native-inputs (list python-pytest python-twisted python-setuptools
+ python-wheel))
(home-page "https://launchpad.net/parsley")
(synopsis "Parsing and pattern matching Python library")
(description
@@ -4069,7 +4092,9 @@ (define-public python-portalocker
python-pytest-cov
python-pytest-mypy
python-pytest-timeout
- python-redis))
+ python-redis
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/WoLpH/portalocker")
(synopsis "Python library for file locking")
(description "Portalocker is a library to provide an easy API to file
@@ -4159,7 +4184,9 @@ (define-public python-extension-helpers
python-pytest
python-pytest-astropy
python-pytest-cov
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://extension-helpers.readthedocs.io")
(synopsis "Astropy ecosystem utilities for building and installing packages")
(description
@@ -4633,12 +4660,14 @@ (define-public python-clickhouse-connect
python-orjson
python-pandas
python-pytz
+ python-setuptools ; For pkg_resources.
python-sqlalchemy
python-urllib3
python-zstandard))
(native-inputs
(list python-cython
- python-pytest))
+ python-pytest
+ python-wheel))
(home-page "https://github.com/ClickHouse/clickhouse-connect")
(synopsis
"ClickHouse database core driver for Python, Pandas, and Superset")
@@ -4683,7 +4712,7 @@ (define-public python-cloup
"05c6cjpnf9s72gyn5dckxbmd8rf2kgdzfsl7pqzrnc1lcdl13zmv"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-click))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/janLuke/cloup")
(synopsis "Extension library for python-click")
(description
@@ -4787,7 +4816,8 @@ (define-public python-jsonschema
(when tests?
(setenv "JSON_SCHEMA_TEST_SUITE" "json")
(invoke "trial" "jsonschema")))))))
- (native-inputs (list python-setuptools-scm python-twisted))
+ (native-inputs (list python-setuptools-scm python-twisted
+ python-setuptools python-wheel))
(propagated-inputs
(list python-attrs
python-importlib-metadata
@@ -4990,7 +5020,9 @@ (define-public python-pyjwt
python-cryptography
python-pytest
python-sphinx
- python-sphinx-rtd-theme))
+ python-sphinx-rtd-theme
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/progrium/pyjwt")
(synopsis "JSON Web Token implementation in Python")
(description
@@ -5237,7 +5269,7 @@ (define-public python-uc-micro-py
(base32
"17f55gi55rg47nm88fn3f8851ph03dgykdp011lxr3j6hk18lyfv"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/tsutsu3/uc.micro-py")
(synopsis "Unicode data files for linkify-it-py projects")
(description "This package contains a micro subset of Unicode data files
@@ -5259,7 +5291,7 @@ (define-public python-linkify-it-py
"0fg0a1lc8xbb62y9krxcp708ll58dxcwm8i7rrwpkd5sh2229f6x"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-uc-micro-py))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/tsutsu3/linkify-it-py")
(synopsis "Links recognition library with full Unicode support")
(description "This is Python port of
@@ -5284,7 +5316,7 @@ (define-public python-makefun
"19a8dga8rnmjn5gy1cy1wdi28swbkdkypwbqikbxil6ynqcg3c20"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-setuptools-scm))
+ (list python-pytest python-setuptools python-setuptools-scm python-wheel))
(home-page "https://github.com/smarie/python-makefun")
(synopsis "Library to dynamically create python functions")
(description "@code{makefun} helps create functions dynamically with a
@@ -5867,7 +5899,9 @@ (define-public python-docx
python-flake8
python-mock
python-pyparsing
- python-pytest))
+ python-pytest
+ python-setuptools
+ python-wheel))
(propagated-inputs
(list python-lxml))
(home-page "https://github.com/python-openxml/python-docx/")
@@ -6025,6 +6059,7 @@ (define-public python-pygtrie
(base32
"1qm4xdmzd4q5pc9h5gjdpr5m7lg06k8dvqnjn7d07d3fhani8d90"))))
(build-system pyproject-build-system)
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/mina86/pygtrie")
(synopsis "Pure Python trie data structure implementation")
(description
@@ -7447,7 +7482,7 @@ (define-public python-pygit2
(base32 "1v34xdvh6i5cn5srwicvp0i2kvv8fzsv0v9p72ng081nsczmhgvr"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-cffi libgit2))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/libgit2/pygit2")
(synopsis "Python bindings for libgit2")
(description "Pygit2 is a set of Python bindings to the libgit2 shared library.")
@@ -7685,7 +7720,9 @@ (define-public python-norns
(base32
"1r1lcq59v6l75wkbp7mypanr69a6fv6m58v6dw3v6b4vwz5nqg0z"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-appdirs python-nose python-pyyaml))
+ (propagated-inputs (list python-appdirs python-nose python-pyyaml
+ python-setuptools))
+ (native-inputs (list python-wheel))
(home-page "https://github.com/simonvh/norns")
(synopsis "Simple YAML-based config module")
(description "This package provides a simple YAML-based config module.")
@@ -9006,9 +9043,10 @@ (define-public python-imageio
(delete-file "tests/test_freeimage.py"))))))
(inputs (list freeimage))
(propagated-inputs
- (list python-imageio-ffmpeg python-numpy python-pillow python-psutil))
+ (list python-imageio-ffmpeg python-numpy python-pillow python-psutil
+ python-setuptools))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-wheel))
(home-page "https://imageio.github.io/")
(synopsis "Library for reading and writing a wide range of image data")
(description
@@ -10083,7 +10121,9 @@ (define-public python-jaraco-test
python-pytest-cov
python-pytest-enabler
python-pytest-flake8
- python-pytest-mypy))
+ python-pytest-mypy
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/jaraco/jaraco.test")
(synopsis "Testing support by jaraco")
(description "This package provides testing support by jaraco.")
@@ -10441,6 +10481,7 @@ (define-public python-jupyter-client-bootstrap
python-pyzmq
python-tornado-6
python-traitlets))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://jupyter.org/")
(synopsis "Jupyter protocol implementation and client libraries")
(description
@@ -10478,7 +10519,9 @@ (define-public python-jupyter-client
python-pytest-timeout
python-async-generator
python-ipython
- python-ipykernel-bootstrap))
+ python-ipykernel-bootstrap
+ python-setuptools
+ python-wheel))
(properties (alist-delete 'hidden? (package-properties base))))))
(define-public python-ipykernel
@@ -10559,6 +10602,8 @@ (define-public python-ipykernel
;; avoids that.
python-pytest-bootstrap
python-pytest-timeout
+ python-setuptools
+ python-wheel
tini))
(home-page "https://ipython.org")
(synopsis "IPython Kernel for Jupyter")
@@ -10578,7 +10623,7 @@ (define-public python-ipykernel-bootstrap
;; left out here to break the cycle.
#:phases #~(modify-phases %standard-phases
(delete 'sanity-check))))
- (native-inputs '())
+ (native-inputs (list python-setuptools python-wheel))
(propagated-inputs
(modify-inputs (package-propagated-inputs parent)
(replace "python-jupyter-client" python-jupyter-client-bootstrap)
@@ -10648,7 +10693,9 @@ (define-public python-pubmed-parser
python-unidecode))
(native-inputs
(list python-pytest
- python-pytest-cov))
+ python-pytest-cov
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/titipata/pubmed_parser")
(synopsis "Parser for Pubmed Open-Access Subset and MEDLINE XML repository")
(description
@@ -11875,6 +11922,7 @@ (define-public python-qnorm
"{ name = \"Maarten van der Sande\", email = \"maartenvandersande@hotmail.com\"}")
(("license = \"MIT\"") "license = { file = \"LICENSE\"}")))))))
(propagated-inputs (list python-numba python-numpy python-pandas))
+ (native-inputs (list python-setuptools python-wheel python-toml))
(home-page "https://github.com/Maarten-vd-Sande/qnorm")
(synopsis "Quantile normalization")
(description "This tool implements quantile normalization. It properly
@@ -11935,7 +11983,9 @@ (define-public python-singledispatch
(build-system pyproject-build-system)
(native-inputs
(list python-pytest
- python-six)) ; required for conversion, not at run-time
+ python-setuptools
+ python-six ; required for conversion, not at run-time
+ python-wheel))
(home-page
"https://docs.python.org/3/library/functools.html#functools.singledispatch")
(synopsis "Backport of singledispatch feature from Python 3.4")
@@ -12363,7 +12413,8 @@ (define-public python-pyproject-metadata
"00zahgw9zjfqwf0218bj5k732aibnn68cq1p8f0wmbirb7fy5k31"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-packaging))
- (native-inputs (list python-pypa-build python-pytest python-tomli))
+ (native-inputs (list python-pypa-build python-pytest python-setuptools
+ python-tomli python-wheel))
(home-page "https://github.com/FFY00/python-pyproject-metadata")
(synopsis "Dataclass for PEP 621 metadata")
(description "This project does not implement the parsing of
@@ -13134,7 +13185,8 @@ (define-public python-pyftpdlib
;; Using Pytest instead of the Makefile causes the command line tests to
;; fail on unknown Pytest arguments.
(arguments (list #:test-flags #~(list "-k" "not TestCommandLineParser")))
- (native-inputs (list python-psutil python-pytest))
+ (native-inputs (list python-psutil python-pytest python-setuptools
+ python-wheel))
(propagated-inputs (list python-pyopenssl python-pysendfile))
(home-page "https://github.com/giampaolo/pyftpdlib/")
(synopsis "Asynchronous and scalable Python FTP server library")
@@ -13881,7 +13933,8 @@ (define-public python-snuggs
"0yv1wayrw9g6k0c2f721kha7wsv0s1fdlxpf5x7f34iqzq9z272h"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-numpy python-pyparsing))
- (native-inputs (list python-hypothesis python-pytest))
+ (native-inputs (list python-hypothesis python-pytest python-setuptools
+ python-wheel))
(home-page "https://github.com/mapbox/snuggs")
(synopsis "Snuggs are S-expressions for Numpy")
(description "Snuggs are S-expressions for Numpy.")
@@ -14326,7 +14379,7 @@ (define-public python-path-bootstrap
(build-system pyproject-build-system)
(arguments
(list #:tests? #f))
- (native-inputs (list python-setuptools-scm))
+ (native-inputs (list python-setuptools python-setuptools-scm python-wheel))
(home-page "https://github.com/jaraco/path")
(synopsis "Object-oriented file system path manipulation library")
(description "@code{path} (formerly @code{path.py}) implements path
@@ -14932,7 +14985,9 @@ (define-public python-fastjsonschema
python-pylint
python-pytest
python-pytest-benchmark
- python-pytest-cache))
+ python-pytest-cache
+ python-setuptools
+ python-wheel))
(home-page
"https://github.com/horejsek/python-fastjsonschema")
(synopsis
@@ -15015,7 +15070,7 @@ (define-public python-bleach
(delete-file-recursively "bleach/_vendor/html5lib")))))
(build-system pyproject-build-system)
(propagated-inputs (list python-html5lib python-tinycss2 python-webencodings))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/mozilla/bleach")
(synopsis "Whitelist-based HTML-sanitizing tool")
(description "Bleach is an easy whitelist-based HTML-sanitizing tool.")
@@ -15551,7 +15606,7 @@ (define-public python-chardet
(base32
"1r9ixxnish9j3dq4h0z0cwlkr4f5lgi6d8mhbzw59hbbjlmp2qhd"))))
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(build-system pyproject-build-system)
(arguments
(list #:test-flags
@@ -15752,7 +15807,7 @@ (define-public python-confection
(build-system pyproject-build-system)
(propagated-inputs (list python-pydantic python-srsly
python-typing-extensions))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/explosion/confection")
(synopsis "Config system for Python")
(description "Confection is a lightweight library that offers a
@@ -15816,7 +15871,8 @@ (define-public python-omegaconf
(propagated-inputs (list java-antlr4-runtime-python
python-pydevd
python-pyyaml))
- (native-inputs (list icedtea antlr4 python-pytest python-pytest-mock))
+ (native-inputs (list icedtea antlr4 python-pytest python-pytest-mock
+ python-setuptools python-wheel))
(home-page "https://github.com/omry/omegaconf")
(synopsis "Flexible configuration system")
(description "OmegaConf is a hierarchical configuration system and
@@ -15836,7 +15892,7 @@ (define-public python-configargparse
"17vky4ihicbf7nggg30xs7h3g5rxzwgch8vilnnrvdaacszkq2qv"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-mock python-pytest))
+ (list python-mock python-pytest python-setuptools python-wheel))
(synopsis "Replacement for argparse")
(description "A drop-in replacement for argparse that allows options to also
be set via config files and/or environment variables.")
@@ -16951,6 +17007,7 @@ (define-public python-xdg
(base32
"14hwk9j5zjc8rvirw95mrb07zdnpjaxjx2mj3rnq8pnlyaa809r4"))))
(build-system pyproject-build-system)
+ (arguments (list #:tests? #f)) ; No tests in PyPi tarball.
(native-inputs
(list python-poetry-core))
(home-page "https://github.com/srstevenson/xdg-base-dirs")
@@ -17433,7 +17490,8 @@ (define-public python-cesium
python-scikit-learn
python-scipy
python-toolz))
- (native-inputs (list python-cython python-pytest python-setuptools-scm))
+ (native-inputs (list python-cython python-pytest python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://pypi.org/project/cesium/")
(synopsis "Library for time-series feature extraction and processing")
(description
@@ -17510,7 +17568,8 @@ (define-public python-pyqtgraph
(lambda _
(setenv "QT_QPA_PLATFORM" "offscreen"))))))
(native-inputs
- (list python-pytest python-pytest-cov python-pytest-xdist))
+ (list python-pytest python-pytest-cov python-pytest-xdist
+ python-setuptools python-wheel))
(inputs
(list qtbase-5))
(propagated-inputs
@@ -17699,7 +17758,9 @@ (define-public python-codespell
python-pytest
python-pytest-cov
python-pytest-dependency
- python-tomli))
+ python-tomli
+ python-setuptools
+ python-wheel))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -18823,7 +18884,9 @@ (define-public python-inflect
python-pytest-flake8
python-pytest-mypy
;; For the version number
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/jaraco/inflect")
(synopsis "Correctly generate plurals, singular nouns, ordinals, indefinite articles")
(description
@@ -20873,7 +20936,8 @@ (define-public python-xopen
(propagated-inputs
(list pigz python-isal python-typing-extensions))
(native-inputs
- (list python-pytest python-pytest-timeout python-setuptools-scm))
+ (list python-pytest python-pytest-timeout python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://github.com/marcelm/xopen/")
(synopsis "Open compressed files transparently")
(description "This module provides an @code{xopen} function that works
@@ -20957,6 +21021,7 @@ (define-public python-chevron
"1gqfh00ics2k1sm5g46l3bi8cl5fc5d1cwzh1ylvcxvdvypklqc7"))))
(build-system pyproject-build-system)
(arguments (list #:tests? #false)) ;there are none
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/noahmorrison/chevron")
(synopsis "Mustache templating language renderer")
(description "This package provides a Python implementation of the
@@ -21009,7 +21074,9 @@ (define-public python-duckdb
python-pyarrow
python-pytest
python-pytest-runner
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://www.duckdb.org")
(synopsis "DuckDB embedded database")
(description "DuckDB is an in-process SQL OLAP database management
@@ -21868,6 +21935,7 @@ (define-public python-diff-cover
python-jinja2
python-pluggy
python-pygments
+ python-setuptools ; For pkg_resources.
python-tomli))
(native-inputs
(list python-flake8
@@ -22082,7 +22150,8 @@ (define-public python-gtts
;; Disable tests that require internet.
(list #:test-flags '(list "-k" "not net")))
(native-inputs
- (list python-pytest python-testfixtures python-click python-requests))
+ (list python-pytest python-testfixtures python-click python-requests
+ python-setuptools python-wheel))
(home-page "https://github.com/pndurette/gTTS")
(synopsis "Google Translate text-to-speech interface")
(description
@@ -22574,7 +22643,9 @@ (define-public python-marshmallow
python-mypy
python-pytest
python-pytz
- python-simplejson))
+ python-simplejson
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/marshmallow-code/marshmallow")
(synopsis "Convert complex datatypes to and from native Python datatypes")
(description "@code{marshmallow} provides a library for converting complex
@@ -22636,7 +22707,9 @@ (define-public python-apispec
python-marshmallow
python-mypy
python-pytest
- python-pyyaml))
+ python-pyyaml
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/marshmallow-code/apispec")
(synopsis "Swagger/OpenAPI specification generator")
(description "@code{python-apispec} is a pluggable API specification
@@ -22655,7 +22728,7 @@ (define-public python-apispec-webframeworks
(base32
"1wyw30402xq2a8icrsjmy9v43jyvawcjd85ccb2zicqlg4k5pcqd"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-apispec))
+ (propagated-inputs (list python-apispec python-setuptools))
(native-inputs
(list python-bottle
python-flake8
@@ -22665,7 +22738,8 @@ (define-public python-apispec-webframeworks
python-pytest
python-pyyaml
python-tornado
- python-tox))
+ python-tox
+ python-wheel))
(home-page "https://github.com/marshmallow-code/apispec-webframeworks")
(synopsis "Web framework plugins for apispec")
(description "This package provides plugins for using @code{apispec} with
@@ -23354,7 +23428,9 @@ (define-public python-tempora
python-pytest-mypy
python-setuptools-scm
python-types-freezegun
- python-types-pytz))
+ python-types-pytz
+ python-setuptools
+ python-wheel))
(propagated-inputs (list python-jaraco-functools python-pytz))
(home-page "https://github.com/jaraco/tempora")
(synopsis "Python date and time objects and routines")
@@ -23530,7 +23606,9 @@ (define-public python-zict
(list python-pytest
python-pytest-asyncio
python-pytest-repeat
- python-pytest-timeout))
+ python-pytest-timeout
+ python-setuptools
+ python-wheel))
(home-page "https://zict.readthedocs.io/en/latest/")
(synopsis "Composable mutable mapping tools")
(description "This package provides abstract @code{MutableMapping} classes
@@ -23716,7 +23794,7 @@ (define-public python-whatever
(base32 "1q7ajgqjfivxqsqgnhp4lc4p6jxyh4zprcsdbpd6dw54inaf0av5"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/Suor/whatever")
(synopsis "Make anonymous functions by partial application of operators")
(description "@code{whatever} provides an easy way to make anonymous
@@ -23738,7 +23816,7 @@ (define-public python-funcy
(file-name (git-file-name name version))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-whatever))
+ (list python-pytest python-whatever python-setuptools python-wheel))
(home-page "https://github.com/Suor/funcy")
(synopsis "Functional tools")
(description "@code{funcy} is a library that provides functional tools.
@@ -24126,7 +24204,7 @@ (define-public python-pybloom-live
"040i6bjqvl33j30v865shsk30s3h7f16pqwiaj5kig857dfmqm4r"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-bitarray python-xxhash))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/joseph-fox/python-bloomfilter")
(synopsis "Bloom filter")
(description "This package provides a scalable Bloom filter implemented in
@@ -25063,7 +25141,8 @@ (define-public python-numcodecs
python-msgpack
python-typing-extensions))
(native-inputs
- (list python-cython python-pytest python-setuptools-scm))
+ (list python-cython python-pytest python-setuptools-scm
+ python-setuptools python-wheel))
(home-page "https://github.com/zarr-developers/numcodecs")
(synopsis "Buffer compression and transformation codecs")
(description
@@ -25169,6 +25248,7 @@ (define-public python-anndata
python-pandas
python-scipy
python-scikit-learn
+ python-setuptools ; For pkg_resources.
python-zarr))
(native-inputs
(list python-boltons
@@ -25206,7 +25286,7 @@ (define-public python-dill
(with-directory-excursion "/tmp"
(invoke "nosetests" "-v"))))))))
(native-inputs
- (list python-nose))
+ (list python-nose python-setuptools python-wheel))
(home-page "https://pypi.org/project/dill/")
(synopsis "Serialize all of Python")
(description "Dill extends Python's @code{pickle} module for serializing
@@ -25258,6 +25338,7 @@ (define-public python-multiprocess
(invoke "python" "-m" "multiprocess.tests")))))))
(propagated-inputs
(list python-dill))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://pypi.org/project/multiprocess/")
(synopsis "Multiprocessing and multithreading in Python")
(description
@@ -25619,7 +25700,8 @@ (define-public python-fsspec
(propagated-inputs
(list python-aiohttp python-libarchive-c python-requests python-tqdm))
(native-inputs
- (list python-pytest python-pytest-mock python-numpy))
+ (list python-pytest python-pytest-mock python-numpy python-setuptools
+ python-wheel))
(home-page "https://github.com/intake/filesystem_spec")
(synopsis "File-system specification")
(description "The purpose of this package is to produce a template or
@@ -25845,6 +25927,7 @@ (define-public python-absl-py
(base32
"0ga3b0m8lfsv1m3260p83lhis52yvz3d42q8gip4gfj823849hnj"))))
(build-system pyproject-build-system)
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/abseil/abseil-py")
(synopsis "Abseil Python common libraries")
(description
@@ -26149,7 +26232,8 @@ (define-public python-trio-typing
(sha256
(base32 "15wa66cs165wawh4pi808ac43n67b8jqddi5ppdcbkj5gfi68hpi"))))
(build-system pyproject-build-system)
- (native-inputs (list python-attrs python-pytest))
+ (native-inputs (list python-attrs python-pytest python-setuptools
+ python-wheel))
(propagated-inputs
(list python-mypy python-mypy-extensions python-trio
python-typing-extensions))
@@ -27291,7 +27375,7 @@ (define-public python-funcparserlib
(when tests?
(invoke "python" "-m" "unittest" "discover" "-v")))))))
;; ModuleNotFoundError: No module named 'poetry'
- (native-inputs (list python-poetry-core))
+ (native-inputs (list python-poetry-core python-six))
(home-page "https://github.com/vlasovskikh/funcparserlib")
(synopsis
"Recursive descent parsing library based on functional combinators")
@@ -27575,7 +27659,9 @@ (define-public python-watchgod
python-pytest-cov
python-pytest-mock
python-pytest-sugar
- python-pytest-toolbox))
+ python-pytest-toolbox
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/samuelcolvin/watchgod")
(synopsis "Simple, modern file watching and code reload in Python")
(description
@@ -28838,7 +28924,7 @@ (define-public python-blessed
;; Avoid python-pytest-coverage
#:test-flags '(list "-c /dev/null")))
(propagated-inputs (list python-six python-wcwidth))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/jquast/blessed")
(synopsis "Wrapper around terminal capabilities")
(description
@@ -29105,7 +29191,8 @@ (define-public python-dateparser
(list python-dateutil python-pytz python-regex python-ruamel.yaml
python-tzlocal))
(native-inputs
- (list python-flake8 python-pytest python-parameterized tzdata-for-tests))
+ (list python-flake8 python-pytest python-parameterized tzdata-for-tests
+ python-setuptools python-wheel))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -29802,7 +29889,9 @@ (define-public python-loguru
python-sphinx
python-sphinx-autobuild
python-sphinx-rtd-theme
- python-tox))
+ python-tox
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/Delgan/loguru")
(synopsis "Python logging made (stupidly) simple")
(description "Python logging made (stupidly) simple")
@@ -31896,6 +31985,7 @@ (define-public python-types-requests
"0cas3cjkhrvsz2rmqnhqiihy9j79wxi9xbih8jk0p9r48c2q3iyy"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-types-urllib3))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/python/typeshed")
(synopsis "Typing stubs for requests")
(description "This package provides typing stubs for requests.")
@@ -31928,6 +32018,7 @@ (define-public python-types-urllib3
(base32
"0zcipjdnbnc8ymk8mh9n5mypa0qr03rqj98lbmahldcdrrap6md1"))))
(build-system pyproject-build-system)
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/python/typeshed")
(synopsis "Typing stubs for urllib3")
(description "This package provides typing stubs for urllib3.")
@@ -31945,6 +32036,7 @@ (define-public python-typeshed-client
"1vdwp1jjg27b22qxgm49v21nb8vm1iki3bfsm0fnq2rsz5alfwz2"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-importlib-resources))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/JelleZijlstra/typeshed_client")
(synopsis "Library for accessing stubs in typeshed")
(description
@@ -32349,7 +32441,9 @@ (define-public python-srsly
python-pytest-timeout
python-mock
python-numpy
- python-psutil))
+ python-psutil
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/explosion/srsly")
(synopsis "Serialization utilities for Python")
(description "This package bundles some of the best Python serialization
@@ -32578,7 +32672,7 @@ (define-public python-iteround
(base32 "1irw4sqrsgpc0ibxdv1hlx0d0jr1fqs48bj6mpfylzqkag9ywlfj"))))
(build-system pyproject-build-system)
(native-inputs
- (list python-pytest))
+ (list python-pytest python-setuptools python-wheel))
(home-page "https://github.com/cgdeboer/iteround")
(synopsis "Sum-safe rounding for Iterables")
(description "Iteround is a standard library sum-safe rounding library for
@@ -32692,7 +32786,10 @@ (define-public python-deepdiff
python-mock
python-numpy
python-pytest
- python-pyyaml))
+ python-pyyaml
+ python-setuptools
+ python-wheel
+ python-toml))
(home-page "https://github.com/seperman/deepdiff")
(synopsis "Deep difference and search of any Python object/data")
(description
@@ -32721,7 +32818,9 @@ (define-public python-deepmerge
(setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
(native-inputs
(list python-setuptools-scm
- python-pytest))
+ python-pytest
+ python-setuptools
+ python-wheel))
(home-page "https://deepmerge.readthedocs.io/en/latest/")
(synopsis "Merge nested data structures")
(description
@@ -33146,7 +33245,7 @@ (define-public python-cogapp
(base32
"1c0xx3p3lzrlyqhmccyq9c50f8v9pqk2992gb4nl50h2yy1m3s8v"))))
(build-system pyproject-build-system)
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(home-page "https://nedbatchelder.com/code/cog")
(synopsis "Content generation tool that leverages Python")
(description "Cog is a file generation tool. It allows using pieces of
@@ -33556,7 +33655,10 @@ (define-public staticsite
python-ruamel.yaml
python-slugify
python-tornado
- tzdata-for-tests))
+ tzdata-for-tests
+ python-setuptools
+ python-wheel
+ python-toml))
(home-page "https://github.com/spanezz/staticsite")
(synopsis "Static site generator")
(description "Statistic is a static site generator based on Markdown and
@@ -33632,8 +33734,9 @@ (define-public python-zbarlight
(base32
"1v5c9bim8af6g8kgxp2dhm96n5vkr8sqi56w0bdh1xy49v03lw3g"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-pillow))
+ (propagated-inputs (list python-pillow python-setuptools))
(inputs (list zbar))
+ (native-inputs (list python-wheel))
(home-page "https://github.com/Polyconseil/zbarlight")
(synopsis "Simple Python wrapper for the zbar barcode library")
(description "Zbarlight is a simple wrapper for the zbar library. It can
@@ -33652,6 +33755,7 @@ (define-public python-zeroc-ice
"0bqkrjxp2fbz34x3wxkxji39kxinypzg8q2994sibiay29mpipxb"))))
(build-system pyproject-build-system)
(inputs (list openssl))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://zeroc.com")
(synopsis "RPC framework")
(description
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e8654eee44..08bc47fded 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3220,7 +3220,8 @@ (define-public python-sip
(native-inputs
(list python-wrapper))
(propagated-inputs
- (list python-toml python-packaging python-ply))
+ (list python-toml python-packaging python-ply python-setuptools
+ python-wheel))
(home-page "https://www.riverbankcomputing.com/software/sip/intro")
(synopsis "Python binding creator for C and C++ libraries")
(description
diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm
index a88c79f8b9..83c951c337 100644
--- a/gnu/packages/rpc.scm
+++ b/gnu/packages/rpc.scm
@@ -253,7 +253,7 @@ (define-public python-grpcio
(inputs
(list abseil-cpp-20211102.0 c-ares grpc-for-python-grpcio openssl re2 zlib))
(native-inputs
- (list python-cython))
+ (list python-cython python-setuptools python-wheel))
(propagated-inputs
(list python-six))
(home-page "https://grpc.io")
diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm
index 9c114aaf39..6d6c4386c9 100644
--- a/gnu/packages/serialization.scm
+++ b/gnu/packages/serialization.scm
@@ -656,7 +656,9 @@ (define-public python-msgspec
python-mypy
python-pytest
python-setuptools-scm
- python-versioneer))
+ python-versioneer
+ python-setuptools
+ python-wheel))
(propagated-inputs (list python-pyyaml python-tomli python-tomli-w))
(home-page "https://jcristharif.com/msgspec/")
(synopsis "Fast serialization/validation library")
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 173accd768..5d70da8fec 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -371,7 +371,9 @@ (define-public python-sphinx-panels
(propagated-inputs (list python-docutils-0.15 python-sphinx-4))
(native-inputs
(list python-pytest
- python-pytest-regressions))
+ python-pytest-regressions
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/executablebooks/sphinx-panels")
(synopsis "Sphinx extension for creating panels in a grid layout")
(description
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index dc620b13a1..9b314c3773 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -2049,7 +2049,7 @@ (define-public python-vega-datasets
;; Remove dataset with unclear license.
(lambda _
(delete-file "vega_datasets/_data/la-riots.csv"))))))
- (native-inputs (list python-pytest))
+ (native-inputs (list python-pytest python-setuptools python-wheel))
(propagated-inputs (list python-pandas))
(home-page "https://github.com/altair-viz/vega_datasets")
(synopsis "Example datasets used by Vega-related projects")
@@ -2082,6 +2082,7 @@ (define-public python-altair
python-jsonschema
python-numpy
python-pandas
+ python-setuptools
python-toolz
python-typing-extensions))
(native-inputs (list python-black
@@ -2115,7 +2116,8 @@ (define-public python-hdmedians
(lambda _
;; Cython extensions have to be built before running the tests.
(invoke "python" "setup.py" "build_ext" "--inplace"))))))
- (propagated-inputs (list python-cython python-numpy))
+ (propagated-inputs (list python-cython python-numpy python-setuptools
+ python-wheel))
(native-inputs (list python-nose))
(home-page "http://github.com/daleroberts/hdmedians")
(synopsis "High-dimensional medians")
@@ -2165,7 +2167,9 @@ (define-public python-arviz
python-scipy
python-typing-extensions
python-xarray
- python-xarray-einstats))
+ python-xarray-einstats
+ python-setuptools
+ python-wheel))
(home-page "https://github.com/arviz-devs/arviz")
(synopsis "Exploratory analysis of Bayesian models")
(description
@@ -2307,7 +2311,9 @@ (define-public python-statsmodels
python-pytest
python-pytest-randomly
python-pytest-xdist
- python-setuptools-scm))
+ python-setuptools-scm
+ python-setuptools
+ python-wheel))
(home-page "https://statsmodels.sourceforge.net/")
(synopsis "Statistical modeling and econometrics in Python")
(description
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 081ef19af1..a336b33d34 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -99,6 +99,7 @@ (define-module (gnu packages terminals)
#:use-module (gnu packages popt)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
@@ -244,8 +245,8 @@ (define-public asciinema
(substitute* "tests/pty_test.py"
(("python3") (search-input-file inputs "/bin/python3"))))))))
(native-inputs
- ;; For tests.
- (list python-pytest))
+ (list python-pytest ; For tests.
+ python-setuptools python-wheel))
(home-page "https://asciinema.org")
(synopsis "Terminal session recorder")
(description
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 5c8f65a1e6..33b0457af2 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -245,6 +245,7 @@ (define-public python-dateutils
"1wg3f3imjq3snvjccv64h5498pqv9xz664xhni7bsh8mnay91p83"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-dateutil python-pytz))
+ (native-inputs (list python-setuptools python-wheel))
(home-page "https://github.com/jmcantrell/python-dateutils")
(synopsis "Various utilities for working with date and datetime objects")
(description
@@ -328,7 +329,7 @@ (define-public python-timezonefinder
;; It's optional, remove this constrain where python-pytz is updated.
#:test-flags #~(list "-k" "not test_with_pytz")))
(native-inputs
- (list python-poetry-core python-pytest))
+ (list python-poetry-core python-pytest python-setuptools))
(propagated-inputs
(list python-cffi python-h3-3 python-numba python-numpy python-pytz))
(home-page "https://timezonefinder.michelfe.it/gui")
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 8ae2118188..ec4fb58f38 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -50,6 +50,7 @@ (define-module (gnu packages tor)
#:use-module (gnu packages glib)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
@@ -446,7 +447,8 @@ (define-public tractor
"1542g6alycwlmvndxcijzn4d5lgycmxxb78gqd8qwgm9kw0fnr3q"))))
(build-system pyproject-build-system)
(native-inputs
- (list (list glib "bin"))) ; for glib-compile-schemas.
+ (list python-setuptools python-wheel
+ (list glib "bin"))) ; for glib-compile-schemas.
(inputs
(list python-fire
python-psutil
diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm
index 117c2acb0c..f4e897fbc5 100644
--- a/gnu/packages/tree-sitter.scm
+++ b/gnu/packages/tree-sitter.scm
@@ -29,6 +29,7 @@ (define-module (gnu packages tree-sitter)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages node)
+ #:use-module (gnu packages python-build)
#:use-module (guix build-system cargo)
#:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
@@ -86,7 +87,8 @@ (define-public python-tree-sitter
name)))))))))
(inputs (list tree-sitter))
(native-inputs
- (list tree-sitter-python tree-sitter-javascript))
+ (list tree-sitter-python tree-sitter-javascript
+ python-setuptools python-wheel))
(home-page "https://github.com/tree-sitter/py-tree-sitter")
(synopsis "Python bindings to the Tree-sitter parsing library")
(description "This package provides Python bindings to the
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 801c2602e4..ea3dd7c793 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -5051,7 +5051,7 @@ (define-public gaupol
"1z9j3r9pm4rdynlmhgsgnwnnaqw5274yfy4kyillgd77msnpbhaw"))))
(build-system pyproject-build-system)
(native-inputs
- (list gettext-minimal pkg-config))
+ (list gettext-minimal pkg-config python-setuptools python-wheel))
(inputs
(list python-pygobject
gtk+
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index d58b022123..a0c738e768 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -65,6 +65,7 @@ (define-module (gnu packages vim)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages ruby)
#:use-module (gnu packages serialization)
@@ -935,7 +936,8 @@ (define-public python-neovim-remote
(base32
"00kxlb3f1k7iaxzpsr07scavmnyg8c1jmicmr13mfk2lcdac6g2b"))))
(build-system pyproject-build-system)
- (propagated-inputs (list python-psutil python-pynvim))
+ (propagated-inputs (list python-psutil python-pynvim python-setuptools))
+ (native-inputs (list python-wheel))
(home-page "https://github.com/mhinz/neovim-remote")
(synopsis "Control nvim processes using `nvr` commandline tool")
(description "This package provide a `nvr` command, which can open File in
diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 2a2c3af3f3..94b9d79692 100644
--- a/guix/build-system/pyproject.scm
+++ b/guix/build-system/pyproject.scm
@@ -52,7 +52,12 @@ (define (default-python)
"Return the default Python package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((python (resolve-interface '(gnu packages python))))
- (module-ref python 'python-toolchain)))
+ ;; We are using python-sans-pip-wrapper, because it does not contain
+ ;; setuptools. This allows us to skip the dependency on setuptools for
+ ;; packages which don’t need it. And it allows us to more easily swap
+ ;; out setuptools if a different version is required.
+ ;; Using python-toolchain here might cause dependency cycles.
+ (module-ref python 'python-sans-pip-wrapper)))
(define sanity-check.py
(search-auxiliary-file "python/sanity-check.py"))
--
2.41.0
[-- Attachment #3: 0002-build-system-python-Ignore-symlinks-when-changing-mt.patch --]
[-- Type: text/plain, Size: 1538 bytes --]
From f4697d0da0018e66ae759a9495a82f364cad5ccd Mon Sep 17 00:00:00 2001
Message-ID: <f4697d0da0018e66ae759a9495a82f364cad5ccd.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 13 May 2023 15:31:06 +0200
Subject: [PATCH 2/8] build-system/python: Ignore symlinks when changing mtime.
* guix/build/python-build-system.scm (ensure-no-mtimes-pre-1980): Ignore
'symlink.
---
guix/build/python-build-system.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index aa04664b25..8e18d6d0df 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -37,6 +37,7 @@ (define-module (guix build python-build-system)
#:use-module (srfi srfi-26)
#:export (%standard-phases
add-installed-pythonpath
+ ensure-no-mtimes-pre-1980
site-packages
python-version
python-build))
@@ -270,7 +271,8 @@ (define* (ensure-no-mtimes-pre-1980 #:rest _)
;; timestamps before 1980.
(let ((early-1980 315619200)) ; 1980-01-02 UTC
(ftw "." (lambda (file stat flag)
- (unless (<= early-1980 (stat:mtime stat))
+ (unless (or (<= early-1980 (stat:mtime stat))
+ (eq? (stat:type stat) 'symlink))
(utime file early-1980 early-1980))
#t))))
--
2.41.0
[-- Attachment #4: 0003-gnu-criu-Change-file-mtimes-to-fix-build.patch --]
[-- Type: text/plain, Size: 2914 bytes --]
From a0d4c891e6cf3522c6769e82d888d906445363f5 Mon Sep 17 00:00:00 2001
Message-ID: <a0d4c891e6cf3522c6769e82d888d906445363f5.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 13 May 2023 15:31:22 +0200
Subject: [PATCH 3/8] gnu: criu: Change file mtimes to fix build.
* gnu/packages/virtualization.scm (criu)[arguments]: Add
python-build-system to #:modules and #:imported modules, add phase
'ensure-no-mtimes-pre-1980.
---
gnu/packages/virtualization.scm | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9556fbc61e..04059fc73e 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -143,6 +143,7 @@ (define-module (gnu packages virtualization)
#:use-module (guix git-download)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix modules)
#:use-module (guix packages)
#:use-module (guix utils)
#:use-module (srfi srfi-1)
@@ -1750,8 +1751,12 @@ (define-public criu
(string-append "XMLTO="
(search-input-file %build-inputs
"/bin/xmlto")))
- #:modules ((ice-9 ftw)
- ,@%gnu-build-system-modules)
+ #:modules ((guix build gnu-build-system)
+ (guix build utils)
+ ((guix build python-build-system)
+ #:select (ensure-no-mtimes-pre-1980)))
+ #:imported-modules ,(append %gnu-build-system-modules
+ %python-build-system-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure) ; no configure script
@@ -1774,17 +1779,8 @@ (define-public criu
(substitute* "criu/include/plugin.h"
(("/var") (string-append (assoc-ref outputs "out"))))
))
- ;; TODO: use
- ;; (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980)
- ;; when it no longer throws due to trying to call UTIME on symlinks.
(add-after 'unpack 'ensure-no-mtimes-pre-1980
- (lambda _
- (let ((early-1980 315619200)) ; 1980-01-02 UTC
- (ftw "." (lambda (file stat flag)
- (unless (or (<= early-1980 (stat:mtime stat))
- (eq? (stat:type stat) 'symlink))
- (utime file early-1980 early-1980))
- #t)))))
+ ensure-no-mtimes-pre-1980)
(add-before 'build 'fix-symlink
(lambda* (#:key inputs #:allow-other-keys)
;; The file 'images/google/protobuf/descriptor.proto' points to
--
2.41.0
[-- Attachment #5: 0004-gnu-sssd-Change-file-mtimes-to-fix-build.patch --]
[-- Type: text/plain, Size: 2040 bytes --]
From 824c6ea30573c3a02f33058bd1739be4cd980da2 Mon Sep 17 00:00:00 2001
Message-ID: <824c6ea30573c3a02f33058bd1739be4cd980da2.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 13 May 2023 16:20:23 +0200
Subject: [PATCH 4/8] gnu: sssd: Change file mtimes to fix build.
* gnu/packages/sssd.scm (sssd)[arguments]: Add
python-build-system to #:modules and #:imported modules, add phase
'ensure-no-mtimes-pre-1980.
---
gnu/packages/sssd.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/sssd.scm b/gnu/packages/sssd.scm
index 251275312f..85c6875f4f 100644
--- a/gnu/packages/sssd.scm
+++ b/gnu/packages/sssd.scm
@@ -31,6 +31,7 @@ (define-module (gnu packages sssd)
#:use-module (guix utils)
#:use-module (guix build utils)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages)
#:use-module (gnu packages adns)
@@ -186,10 +187,16 @@ (define-public sssd
(string-append "--with-xml-catalog-path="
#$(this-package-native-input "docbook-xml")
"/xml/dtd/docbook/catalog.xml"))
+ #:modules '((guix build gnu-build-system)
+ (guix build utils)
+ ((guix build python-build-system)
+ #:select (ensure-no-mtimes-pre-1980)))
+ #:imported-modules (append %gnu-build-system-modules
+ %python-build-system-modules)
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'ensure-no-mtimes-pre-1980
- (@@ (guix build python-build-system) ensure-no-mtimes-pre-1980))
+ ensure-no-mtimes-pre-1980)
(add-after 'patch-source-shebangs 'patch-more-shebangs
(lambda _
(substitute* '("src/tools/analyzer/sss_analyze"
--
2.41.0
[-- Attachment #6: 0005-guix-toml-Add-TOML-parser.patch --]
[-- Type: text/plain, Size: 35790 bytes --]
From 72d66e838ce9d3d2182c570ee3088063e372fcdd Mon Sep 17 00:00:00 2001
Message-ID: <72d66e838ce9d3d2182c570ee3088063e372fcdd.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 23 Jul 2023 11:20:03 +0200
Subject: [PATCH 5/8] guix: toml: Add TOML parser.
* guix/build/toml.scm: New file.
* tests/toml.scm: New file.
* Makefile.am: Register new files.
---
Makefile.am | 2 +
guix/build/toml.scm | 478 ++++++++++++++++++++++++++++++++++++++++++++
tests/toml.scm | 442 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 922 insertions(+)
create mode 100644 guix/build/toml.scm
create mode 100644 tests/toml.scm
diff --git a/Makefile.am b/Makefile.am
index d76bfd2522..b5b3ccd241 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -271,6 +271,7 @@ MODULES = \
guix/build/bournish.scm \
guix/build/qt-utils.scm \
guix/build/make-bootstrap.scm \
+ guix/build/toml.scm \
guix/search-paths.scm \
guix/packages.scm \
guix/import/cabal.scm \
@@ -572,6 +573,7 @@ SCM_TESTS = \
tests/system.scm \
tests/style.scm \
tests/texlive.scm \
+ tests/toml.scm \
tests/transformations.scm \
tests/ui.scm \
tests/union.scm \
diff --git a/guix/build/toml.scm b/guix/build/toml.scm
new file mode 100644
index 0000000000..d5ea01d001
--- /dev/null
+++ b/guix/build/toml.scm
@@ -0,0 +1,478 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Lars-Dominik Braun <lars@6xq.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+;; This is a TOML parser adapted from the ABNF for v1.0.0 from
+;; https://github.com/toml-lang/toml/blob/1.0.0/toml.abnf
+;; The PEG grammar tries to follow the ABNF as closely as possible with
+;; few deviations commented.
+;;
+;; The semantics are defined in https://toml.io/en/v1.0.0
+;; Currently unimplemented:
+;; - Array of Tables
+
+(define-module (guix build toml)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 peg)
+ #:use-module (ice-9 textual-ports)
+ #:use-module (srfi srfi-1)
+ #:use-module (srfi srfi-19)
+ #:use-module (srfi srfi-35)
+ #:export (parse-toml parse-toml-file recursive-assoc-ref &file-not-consumed &already-defined))
+
+(define-condition-type &toml-error &error toml-error?)
+(define-condition-type &file-not-consumed &toml-error file-not-consumed?)
+(define-condition-type &already-defined &toml-error already-defined?)
+
+;; Overall Structure
+(define-peg-pattern toml-file body (and expression
+ (* (and ignore-newline expression))))
+(define-peg-pattern expression body (or
+ (and ws keyval ws (? comment))
+ (and ws table ws (? comment))
+ (and ws (? comment))))
+
+;; Whitespace
+(define-peg-pattern ws none (* wschar))
+(define-peg-pattern wschar body (or " " "\t"))
+
+;; Newline
+(define-peg-pattern newline body (or "\n" "\r\n"))
+;; This newline’s content is ignored, so we don’t need a bunch of (ignore newline).
+(define-peg-pattern ignore-newline none newline)
+
+;; Comment
+(define-peg-pattern non-ascii body (or (range #\x80 #\xd7ff)
+ (range #\xe000 #\x10ffff)))
+(define-peg-pattern non-eol body (or "\t" (range #\x20 #\x7f) non-ascii))
+
+(define-peg-pattern comment none (and "#" (* non-eol)))
+
+;; Key-Value pairs
+(define-peg-pattern keyval all (and key keyval-sep val))
+
+(define-peg-pattern key body (or dotted-key
+ simple-key))
+(define-peg-pattern simple-key all (or quoted-key
+ unquoted-key))
+(define-peg-pattern unquoted-key body (+ (or (range #\A #\Z)
+ (range #\a #\z)
+ (range #\0 #\9)
+ "-"
+ "_")))
+(define-peg-pattern quoted-key all (or basic-string
+ literal-string))
+(define-peg-pattern dotted-key body (and simple-key
+ (+ (and dot-sep simple-key))))
+(define-peg-pattern dot-sep none (and ws "." ws))
+(define-peg-pattern keyval-sep none (and ws "=" ws))
+
+(define-peg-pattern val body (or string
+ boolean
+ array
+ inline-table
+ date-time
+ float
+ integer))
+
+;; String
+(define-peg-pattern string all (or ml-basic-string
+ basic-string
+ ml-literal-string
+ literal-string))
+
+;; Basic String
+(define-peg-pattern basic-string body (and (ignore "\"")
+ (* basic-char)
+ (ignore "\"")))
+(define-peg-pattern basic-char body (or basic-unescaped escaped))
+(define-peg-pattern basic-unescaped body (or wschar
+ "\x21"
+ (range #\x23 #\x5B)
+ (range #\x5D #\x7E)
+ non-ascii))
+(define-peg-pattern escaped all (and
+ (ignore "\\")
+ (or "\"" "\\" "b" "f" "n" "r" "t"
+ (and (ignore "u")
+ HEXDIG HEXDIG HEXDIG HEXDIG)
+ (and (ignore "U")
+ HEXDIG HEXDIG HEXDIG HEXDIG
+ HEXDIG HEXDIG HEXDIG HEXDIG))))
+
+;; Multiline Basic String
+(define-peg-pattern ml-basic-string body (and
+ ml-basic-string-delim
+ (? ignore-newline)
+ ml-basic-body
+ ml-basic-string-delim))
+(define-peg-pattern ml-basic-string-delim none "\"\"\"")
+(define-peg-pattern ml-basic-body body (and
+ (* mlb-content)
+ (* (and mlb-quotes (+ mlb-content)))
+ (? mlb-quotes-final)))
+
+(define-peg-pattern mlb-content body (or mlb-char newline mlb-escaped-nl))
+(define-peg-pattern mlb-char body (or mlb-unescaped escaped))
+(define-peg-pattern mlb-quotes body (or "\"\"" "\""))
+;; We need to convince the parser to backtrack here, thus the additional followed-by rule.
+(define-peg-pattern mlb-quotes-final body (or (and "\"\"" (followed-by
+ ml-basic-string-delim))
+ (and "\"" (followed-by
+ ml-basic-string-delim))))
+(define-peg-pattern mlb-unescaped body (or wschar
+ "\x21"
+ (range #\x23 #\x5B)
+ (range #\x5D #\x7E)
+ non-ascii))
+;; Escaped newlines and following whitespace are removed from the output.
+(define-peg-pattern mlb-escaped-nl none (and "\\" ws newline
+ (* (or wschar newline))))
+
+;; Literal String
+(define-peg-pattern literal-string body (and (ignore "'")
+ (* literal-char)
+ (ignore "'")))
+(define-peg-pattern literal-char body (or "\x09"
+ (range #\x20 #\x26)
+ (range #\x28 #\x7E)
+ non-ascii))
+
+;; Multiline Literal String
+(define-peg-pattern ml-literal-string body (and
+ ml-literal-string-delim
+ (? ignore-newline)
+ ml-literal-body
+ ml-literal-string-delim))
+(define-peg-pattern ml-literal-string-delim none "'''")
+(define-peg-pattern ml-literal-body body (and
+ (* mll-content)
+ (* (and mll-quotes (+ mll-content)))
+ (? mll-quotes-final)))
+
+(define-peg-pattern mll-content body (or mll-char newline))
+(define-peg-pattern mll-char body (or "\x09"
+ (range #\x20 #\x26)
+ (range #\x28 #\x7E)
+ non-ascii))
+(define-peg-pattern mll-quotes body (or "''" "'"))
+;; We need to convince the parser to backtrack here, thus the additional followed-by rule.
+(define-peg-pattern mll-quotes-final body (or (and "''" (followed-by
+ ml-literal-string-delim))
+ (and "'" (followed-by
+ ml-literal-string-delim))))
+
+;; Integer
+(define-peg-pattern integer all (or hex-int oct-int bin-int dec-int))
+
+(define-peg-pattern digit1-9 body (range #\1 #\9))
+(define-peg-pattern digit0-7 body (range #\0 #\7))
+(define-peg-pattern digit0-1 body (range #\0 #\1))
+(define-peg-pattern DIGIT body (range #\0 #\9))
+(define-peg-pattern HEXDIG body (or DIGIT
+ (range #\a #\f)
+ (range #\A #\F)))
+
+(define-peg-pattern dec-int all (and (? (or "-" "+")) unsigned-dec-int))
+(define-peg-pattern unsigned-dec-int body (or (and digit1-9 (+ (or DIGIT (and (ignore "_") DIGIT))))
+ DIGIT))
+
+(define-peg-pattern hex-int all (and (ignore "0x")
+ HEXDIG
+ (* (or HEXDIG (and (ignore "_") HEXDIG)))))
+(define-peg-pattern oct-int all (and (ignore "0o")
+ digit0-7
+ (* (or digit0-7 (and (ignore "_") digit0-7)))))
+(define-peg-pattern bin-int all (and (ignore "0b")
+ digit0-1
+ (* (or digit0-1 (and (ignore "_") digit0-1)))))
+
+;; Float
+(define-peg-pattern float all (or
+ (and float-int-part (or exp (and frac (? exp))))
+ special-float))
+(define-peg-pattern float-int-part body dec-int)
+(define-peg-pattern frac body (and "." zero-prefixable-int))
+(define-peg-pattern zero-prefixable-int body (and DIGIT (* (or DIGIT (and (ignore "_") DIGIT)))))
+
+(define-peg-pattern exp body (and (or "e" "E") float-exp-part))
+(define-peg-pattern float-exp-part body (and (? (or "-" "+")) zero-prefixable-int))
+(define-peg-pattern special-float body (and (? (or "-" "+")) (or "inf" "nan")))
+
+;; Boolean
+(define-peg-pattern boolean all (or "true" "false"))
+
+;; Date and Time (as defined in RFC 3339)
+
+(define-peg-pattern date-time body (or offset-date-time
+ local-date-time
+ local-date
+ local-time))
+
+(define-peg-pattern date-fullyear all (and DIGIT DIGIT DIGIT DIGIT))
+(define-peg-pattern date-month all (and DIGIT DIGIT)) ; 01-12
+(define-peg-pattern date-mday all (and DIGIT DIGIT)) ; 01-28, 01-29, 01-30, 01-31 based on month/year
+(define-peg-pattern time-delim none (or "T" "t" " ")) ; T, t, or space
+(define-peg-pattern time-hour all (and DIGIT DIGIT)) ; 00-23
+(define-peg-pattern time-minute all (and DIGIT DIGIT)) ; 00-59
+(define-peg-pattern time-second all (and DIGIT DIGIT)) ; 00-58, 00-59, 00-60 based on leap second rules
+(define-peg-pattern time-secfrac all (and (ignore ".") (+ DIGIT)))
+(define-peg-pattern time-numoffset body (and (or "+" "-")
+ time-hour
+ (ignore ":")
+ time-minute))
+(define-peg-pattern time-offset all (or "Z" time-numoffset))
+
+(define-peg-pattern partial-time body (and time-hour
+ (ignore ":")
+ time-minute
+ (ignore ":")
+ time-second
+ (? time-secfrac)))
+(define-peg-pattern full-date body (and date-fullyear
+ (ignore "-")
+ date-month
+ (ignore "-")
+ date-mday))
+(define-peg-pattern full-time body (and partial-time time-offset))
+
+;; Offset Date-Time
+(define-peg-pattern offset-date-time all (and full-date time-delim full-time))
+
+;; Local Date-Time
+(define-peg-pattern local-date-time all (and full-date time-delim partial-time))
+
+;; Local Date
+(define-peg-pattern local-date all full-date)
+
+;; Local Time
+(define-peg-pattern local-time all partial-time)
+
+;; Array
+(define-peg-pattern array all (and (ignore "[")
+ (? array-values)
+ (ignore ws-comment-newline)
+ (ignore "]")))
+
+(define-peg-pattern array-values body (or
+ (and ws-comment-newline
+ val
+ ws-comment-newline
+ (ignore ",")
+ array-values)
+ (and ws-comment-newline
+ val
+ ws-comment-newline
+ (ignore (? ",")))))
+
+(define-peg-pattern ws-comment-newline none (* (or wschar (and (? comment) ignore-newline))))
+
+;; Table
+(define-peg-pattern table all (or array-table
+ std-table))
+
+;; Standard Table
+(define-peg-pattern std-table all (and (ignore "[") ws key ws (ignore "]")))
+(define-peg-pattern array-table all (and (ignore "[[") ws key ws (ignore "]]")))
+
+;; Inline Table
+(define-peg-pattern inline-table all (and (ignore "{")
+ (* ws)
+ (? inline-table-keyvals)
+ (* ws)
+ (ignore "}")))
+(define-peg-pattern inline-table-sep none (and ws "," ws))
+(define-peg-pattern inline-table-keyvals body (and keyval
+ (? (and inline-table-sep inline-table-keyvals))))
+
+
+;; Parsing
+
+(define (recursive-acons key value alist)
+ "Add a VALUE to ALIST of alists descending into keys according to the
+list in KEY. For instance of KEY is (a b) this would create
+alist[a][b] = value."
+ (match key
+ (((? string? key))
+ (if (assoc-ref alist key)
+ (raise (condition (&already-defined)))
+ (alist-cons key value alist)))
+ ((elem rest ...) (match (assoc-ref alist elem)
+ (#f
+ (acons elem (recursive-acons rest value '()) alist))
+ (old-value
+ (acons elem (recursive-acons rest value old-value) (alist-delete elem alist)))))
+ (() alist)))
+
+(define (recursive-assoc-ref alist key)
+ "Retrieve a value from ALIST of alists, descending into each value of
+the list KEY. For instance a KEY (a b) would retrieve alist[a][b]."
+ (match key
+ (((? string? key)) (assoc-ref alist key))
+ ((elem rest ...) (recursive-assoc-ref (assoc-ref alist elem) rest))))
+
+(define (eval-toml-file parse-tree)
+ "Convert toml parse tree to alist."
+
+ (define (assoc-ref->number alist key)
+ (and=> (and=> (assq-ref alist key) car) string->number))
+
+ (define (eval-date rest)
+ (let ((args (keyword-flatten '(date-fullyear
+ date-month
+ date-mday
+ time-hour
+ time-minute
+ time-second
+ time-secfrac
+ time-offset)
+ rest)))
+ (make-date
+ (assoc-ref->number args 'time-secfrac)
+ (assoc-ref->number args 'time-second)
+ (assoc-ref->number args 'time-minute)
+ (assoc-ref->number args 'time-hour)
+ (assoc-ref->number args 'date-mday)
+ (assoc-ref->number args 'date-month)
+ (assoc-ref->number args 'date-fullyear)
+ (match (assq-ref args 'time-offset)
+ (("Z") 0)
+ ((sign ('time-hour hour) ('time-minute minute))
+ (* (+
+ (* (string->number (string-append sign hour)) 60)
+ (string->number minute)) 60))
+ (#f #f)))))
+
+ (define (eval-value value)
+ "Evaluate right-hand-side of 'keyval token (i.e., a value)."
+ (match value
+ (('boolean "true")
+ #t)
+ (('boolean "false")
+ #f)
+ (('integer ('dec-int int))
+ (string->number int 10))
+ (('integer ('hex-int int))
+ (string->number int 16))
+ (('integer ('oct-int int))
+ (string->number int 8))
+ (('integer ('bin-int int))
+ (string->number int 2))
+ (('float ('dec-int int) b)
+ (string->number (string-append int b) 10))
+ (('float other)
+ (match other
+ ("inf" +inf.0)
+ ("+inf" +inf.0)
+ ("-inf" -inf.0)
+ ("nan" +nan.0)
+ ("+nan" +nan.0)
+ ("-nan" -nan.0)))
+ (('offset-date-time rest ...)
+ (eval-date rest))
+ (('local-date-time rest ...)
+ (eval-date rest))
+ (('local-date rest ...)
+ (eval-date rest))
+ (('local-time rest ...)
+ (eval-date rest))
+ (('string str ...)
+ (apply string-append
+ (map (match-lambda
+ (('escaped "\"") "\"")
+ (('escaped "\\") "\\")
+ (('escaped "b") "\b")
+ (('escaped "t") "\t")
+ (('escaped "n") "\n")
+ (('escaped (? (lambda (x) (>= (string-length x) 4)) u))
+ (list->string (list (integer->char (string->number u 16)))))
+ ((? string? s) s))
+ (keyword-flatten '(escaped) str))))
+ ('string "")
+ (('array tails ...)
+ (map eval-value (keyword-flatten '(boolean integer float string array
+ inline-table offset-date-time
+ local-date-time local-date
+ local-time)
+ tails)))
+ ('array (list))
+ (('inline-table tails ...)
+ (eval (keyword-flatten '(keyval) tails) '() '()))))
+
+ (define (ensure-list value)
+ (if (list? value)
+ value
+ (list value)))
+
+ (define (simple-key->list keys)
+ (map
+ (match-lambda
+ (('simple-key 'quoted-key) "")
+ (('simple-key ('quoted-key k)) k)
+ (('simple-key (? string? k)) k)
+ (other (raise-exception `(invalid-simple-key ,other))))
+ (keyword-flatten '(simple-key) keys)))
+
+ (define (skip-keyval tails)
+ "Skip key-value pairs in tails until the next table."
+ (match tails
+ ((('keyval key val) tails ...)
+ (skip-keyval tails))
+ (('keyval keyval)
+ '())
+ (other other)))
+
+ (define (eval parse-tree current-table result)
+ "Evaluate toml file body."
+
+ (match parse-tree
+ ((('table ('std-table names ...)) tails ...)
+ (eval tails (simple-key->list names) result))
+ ((('table ('array-table names ...)) tails ...)
+ ;; Not implemented.
+ (eval (skip-keyval tails) '() result))
+ ((('keyval key val) tails ...)
+ (recursive-acons
+ (append current-table (ensure-list (simple-key->list key)))
+ (eval-value val)
+ (eval tails current-table result)))
+ (('keyval key val)
+ (recursive-acons
+ (append current-table (ensure-list (simple-key->list key)))
+ (eval-value val)
+ result))
+ (()
+ '())))
+
+ (eval parse-tree '() '()))
+
+(define (parse-toml str)
+ "Parse and evaluate toml document from string STR."
+
+ (let* ((match (match-pattern toml-file str))
+ (end (peg:end match))
+ (tree (peg:tree match))
+ (flat-tree (keyword-flatten '(table keyval) tree)))
+ (if (eq? end (string-length str))
+ (eval-toml-file flat-tree)
+ (raise (condition (&file-not-consumed))))))
+
+(define (parse-toml-file file)
+ "Parse and evaluate toml document from file FILE."
+
+ (parse-toml (call-with-input-file file get-string-all)))
+
diff --git a/tests/toml.scm b/tests/toml.scm
new file mode 100644
index 0000000000..cd731cd2f0
--- /dev/null
+++ b/tests/toml.scm
@@ -0,0 +1,442 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2023 Lars-Dominik Braun <lars@6xq.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (test-toml)
+ #:use-module (guix build toml)
+ #:use-module (guix tests)
+ #:use-module (srfi srfi-19) ; For datetime.
+ #:use-module (srfi srfi-64)
+ #:use-module (ice-9 match))
+
+(test-begin "toml")
+
+;; Tests taken from https://toml.io/en/v1.0.0
+
+(test-error "parse-toml: Unspecified key"
+ &file-not-consumed
+ (parse-toml "key = # INVALID"))
+
+(test-error "parse-toml: Missing EOL"
+ &file-not-consumed
+ (parse-toml "first = \"Tom\" last = \"Preston-Werner\" # INVALID"))
+
+(test-equal "parse-toml: Bare keys"
+ '(("key" . "value") ("bare_key" . "value") ("bare-key" . "value") ("1234" . "value"))
+ (parse-toml "key = \"value\"
+bare_key = \"value\"
+bare-key = \"value\"
+1234 = \"value\""))
+
+(test-equal "parse-toml: Quoted keys"
+ '(("127.0.0.1" . "value")
+ ("character encoding" . "value")
+ ("ʎǝʞ" . "value")
+ ("key2" . "value")
+ ("quoted \"value\"" . "value"))
+ (parse-toml "\"127.0.0.1\" = \"value\"
+\"character encoding\" = \"value\"
+\"ʎǝʞ\" = \"value\"
+'key2' = \"value\"
+'quoted \"value\"' = \"value\""))
+
+(test-equal "parse-toml: No key"
+ #f
+ (parse-toml "= \"no key name\""))
+
+(test-equal "parse-toml: Empty key"
+ '(("" . "blank"))
+ (parse-toml "\"\" = \"blank\""))
+
+(test-equal "parse-toml: Dotted keys"
+ '(("name" . "Orange")
+ ("physical" ("color" . "orange")
+ ("shape" . "round"))
+ ("site" ("google.com" . #t)))
+ (parse-toml "name = \"Orange\"
+physical.color = \"orange\"
+physical.shape = \"round\"
+site.\"google.com\" = true"))
+
+(test-equal "parse-toml: Dotted keys with whitespace"
+ '(("fruit" ("name" . "banana") ("color" . "yellow") ("flavor" . "banana")))
+ (parse-toml "fruit.name = \"banana\" # this is best practice
+fruit. color = \"yellow\" # same as fruit.color
+fruit . flavor = \"banana\" # same as fruit.flavor"))
+
+(test-error "parse-toml: Multiple keys"
+ &already-defined
+ (parse-toml "name = \"Tom\"
+name = \"Pradyun\""))
+
+(test-equal "parse-toml: Implicit tables"
+ '(("fruit" ("apple" ("smooth" . #t)) ("orange" . 2)))
+ (parse-toml "fruit.apple.smooth = true
+fruit.orange = 2"))
+
+(test-error "parse-toml: Write to value"
+ &already-defined
+ (parse-toml "fruit.apple = 1
+fruit.apple.smooth = true"))
+
+(test-equal "parse-toml: String"
+ '(("str" . "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF."))
+ (parse-toml "str = \"I'm a string. \\\"You can quote me\\\". Name\\tJos\\u00E9\\nLocation\\tSF.\""))
+
+(test-equal "parse-toml: Empty string"
+ '(("str1" . "")
+ ("str2" . "")
+ ("str3" . "")
+ ("str4" . ""))
+ (parse-toml "str1 = \"\"
+str2 = ''
+str3 = \"\"\"\"\"\"
+str4 = ''''''"))
+
+(test-equal "parse-toml: Multi-line basic strings"
+ '(("str1" . "Roses are red\nViolets are blue")
+ ("str2" . "The quick brown fox jumps over the lazy dog.")
+ ("str3" . "The quick brown fox jumps over the lazy dog.")
+ ("str4" . "Here are two quotation marks: \"\". Simple enough.")
+ ("str5" . "Here are three quotation marks: \"\"\".")
+ ("str6" . "Here are fifteen quotation marks: \"\"\"\"\"\"\"\"\"\"\"\"\"\"\".")
+ ("str7" . "\"This,\" she said, \"is just a pointless statement.\""))
+ (parse-toml "str1 = \"\"\"
+Roses are red
+Violets are blue\"\"\"
+
+str2 = \"\"\"
+The quick brown \\
+
+
+ fox jumps over \\
+ the lazy dog.\"\"\"
+
+str3 = \"\"\"\\
+ The quick brown \\
+ fox jumps over \\
+ the lazy dog.\\
+ \"\"\"
+
+str4 = \"\"\"Here are two quotation marks: \"\". Simple enough.\"\"\"
+# str5 = \"\"\"Here are three quotation marks: \"\"\".\"\"\" # INVALID
+str5 = \"\"\"Here are three quotation marks: \"\"\\\".\"\"\"
+str6 = \"\"\"Here are fifteen quotation marks: \"\"\\\"\"\"\\\"\"\"\\\"\"\"\\\"\"\"\\\".\"\"\"
+
+# \"This,\" she said, \"is just a pointless statement.\"
+str7 = \"\"\"\"This,\" she said, \"is just a pointless statement.\"\"\"\""))
+
+(test-equal "parse-toml: Literal string"
+ '(("winpath" . "C:\\Users\\nodejs\\templates")
+ ("winpath2" . "\\\\ServerX\\admin$\\system32\\")
+ ("quoted" . "Tom \"Dubs\" Preston-Werner")
+ ("regex" . "<\\i\\c*\\s*>"))
+ (parse-toml "winpath = 'C:\\Users\\nodejs\\templates'
+winpath2 = '\\\\ServerX\\admin$\\system32\\'
+quoted = 'Tom \"Dubs\" Preston-Werner'
+regex = '<\\i\\c*\\s*>'"))
+
+(test-equal "parse-toml: Multi-line literal strings"
+ '(("regex2" . "I [dw]on't need \\d{2} apples")
+ ("lines" . "The first newline is\ntrimmed in raw strings.\n All other whitespace\n is preserved.\n")
+ ("quot15" . "Here are fifteen quotation marks: \"\"\"\"\"\"\"\"\"\"\"\"\"\"\"")
+ ("apos15" . "Here are fifteen apostrophes: '''''''''''''''")
+ ("str" . "'That,' she said, 'is still pointless.'"))
+ (parse-toml "regex2 = '''I [dw]on't need \\d{2} apples'''
+lines = '''
+The first newline is
+trimmed in raw strings.
+ All other whitespace
+ is preserved.
+'''
+quot15 = '''Here are fifteen quotation marks: \"\"\"\"\"\"\"\"\"\"\"\"\"\"\"'''
+
+# apos15 = '''Here are fifteen apostrophes: '''''''''''''''''' # INVALID
+apos15 = \"Here are fifteen apostrophes: '''''''''''''''\"
+
+# 'That,' she said, 'is still pointless.'
+str = ''''That,' she said, 'is still pointless.''''"))
+
+(test-equal "parse-toml: Decimal integer"
+ '(("int1" . 99) ("int2" . 42) ("int3" . 0) ("int4" . -17))
+ (parse-toml "int1 = +99
+int2 = 42
+int3 = 0
+int4 = -17"))
+
+(test-equal "parse-toml: Decimal integer underscores"
+ '(("int5" . 1000) ("int6" . 5349221) ("int7" . 5349221) ("int8" . 12345))
+ (parse-toml "int5 = 1_000
+int6 = 5_349_221
+int7 = 53_49_221 # Indian number system grouping
+int8 = 1_2_3_4_5 # VALID but discouraged"))
+
+(test-equal "parse-toml: Hexadecimal"
+ `(("hex1" . ,#xdeadbeef) ("hex2" . ,#xdeadbeef) ("hex3" . ,#xdeadbeef))
+ (parse-toml "hex1 = 0xDEADBEEF
+hex2 = 0xdeadbeef
+hex3 = 0xdead_beef"))
+
+(test-equal "parse-toml: Octal"
+ `(("oct1" . ,#o01234567) ("oct2" . #o755))
+ (parse-toml "oct1 = 0o01234567
+oct2 = 0o755"))
+
+(test-equal "parse-toml: Binary"
+ `(("bin1" . ,#b11010110))
+ (parse-toml "bin1 = 0b11010110"))
+
+(test-equal "parse-toml: Float"
+ '(("flt1" . 1.0)
+ ("flt2" . 3.1415)
+ ("flt3" . -0.01)
+ ("flt4" . 5e+22)
+ ("flt5" . 1e06)
+ ("flt6" . -2e-2)
+ ("flt7" . 6.626e-34)
+ ("flt8" . 224617.445991228))
+ (parse-toml "# fractional
+flt1 = +1.0
+flt2 = 3.1415
+flt3 = -0.01
+
+# exponent
+flt4 = 5e+22
+flt5 = 1e06
+flt6 = -2E-2
+
+# both
+flt7 = 6.626e-34
+
+flt8 = 224_617.445_991_228"))
+
+(test-equal "parse-toml: Float"
+ '(("sf1" . +inf.0)
+ ("sf2" . +inf.0)
+ ("sf3" . -inf.0)
+ ("sf4" . +nan.0)
+ ("sf5" . +nan.0)
+ ("sf6" . -nan.0))
+ (parse-toml "# infinity
+sf1 = inf # positive infinity
+sf2 = +inf # positive infinity
+sf3 = -inf # negative infinity
+
+# not a number
+sf4 = nan # actual sNaN/qNaN encoding is implementation-specific
+sf5 = +nan # same as `nan`
+sf6 = -nan # valid, actual encoding is implementation-specific"))
+
+(test-equal "parse-toml: Boolean"
+ '(("bool1" . #t)
+ ("bool2" . #f))
+ (parse-toml "bool1 = true
+bool2 = false"))
+
+(test-equal "parse-toml: Offset date-time"
+ `(("odt1" . ,(make-date #f 0 32 7 27 5 1979 0))
+ ("odt2" . ,(make-date #f 0 32 0 27 5 1979 (* -7 60 60)))
+ ("odt3" . ,(make-date 999999 0 32 0 27 5 1979 (* 7 60 60)))
+ ("odt4" . ,(make-date #f 0 32 7 27 5 1979 0)))
+ (parse-toml "odt1 = 1979-05-27T07:32:00Z
+odt2 = 1979-05-27T00:32:00-07:00
+odt3 = 1979-05-27T00:32:00.999999+07:00
+odt4 = 1979-05-27 07:32:00Z"))
+
+(test-equal "parse-toml: Local date-time"
+ `(("ldt1" . ,(make-date #f 0 32 7 27 5 1979 #f))
+ ("ldt2" . ,(make-date 999999 0 32 0 27 5 1979 #f)))
+ (parse-toml "ldt1 = 1979-05-27T07:32:00
+ldt2 = 1979-05-27T00:32:00.999999"))
+
+(test-equal "parse-toml: Local date"
+ `(("ld1" . ,(make-date #f #f #f #f 27 5 1979 #f)))
+ (parse-toml "ld1 = 1979-05-27"))
+
+(test-equal "parse-toml: Local time"
+ `(("lt1" . ,(make-date #f 0 32 7 #f #f #f #f))
+ ("lt2" . ,(make-date 999999 0 32 0 #f #f #f #f)))
+ (parse-toml "lt1 = 07:32:00
+lt2 = 00:32:00.999999"))
+
+(test-equal "parse-toml: Arrays"
+ '(("integers" 1 2 3)
+ ("colors" "red" "yellow" "green")
+ ("nested_arrays_of_ints" (1 2) (3 4 5))
+ ("nested_mixed_array" (1 2) ("a" "b" "c"))
+ ("string_array" "all" "strings")
+ ("numbers" 0.1 0.2 0.5 1 2 5)
+ ("contributors" "Foo Bar <foo@example.com>" (("name" . "Baz Qux") ("email" . "bazqux@example.com") ("url" . "https://example.com/bazqux")))
+ ("integers2" 1 2 3)
+ ("integers3" 1 2))
+ (parse-toml "integers = [ 1, 2, 3 ]
+colors = [ \"red\", \"yellow\", \"green\" ]
+nested_arrays_of_ints = [ [ 1, 2 ], [3, 4, 5] ]
+nested_mixed_array = [ [ 1, 2 ], [\"a\", \"b\", \"c\"] ]
+string_array = [ \"all\", 'strings' ]
+
+# Mixed-type arrays are allowed
+numbers = [ 0.1, 0.2, 0.5, 1, 2, 5 ]
+contributors = [
+ \"Foo Bar <foo@example.com>\",
+ { name = \"Baz Qux\", email = \"bazqux@example.com\", url = \"https://example.com/bazqux\" }
+]
+
+integers2 = [
+ 1, 2, 3
+]
+
+integers3 = [
+ 1,
+ 2, # this is ok
+]"))
+
+(test-equal "parse-toml: Tables"
+ '(("table-1" ("key1" . "some string")
+ ("key2" . 123))
+ ("table-2" ("key1" . "another string")
+ ("key2" . 456)))
+ (parse-toml "[table-1]
+key1 = \"some string\"
+key2 = 123
+
+[table-2]
+key1 = \"another string\"
+key2 = 456"))
+
+
+(test-equal "parse-toml: Dotted table"
+ '(("dog" ("tater.man" ("type" ("name" . "pug")))))
+ (parse-toml "[dog.\"tater.man\"]
+type.name = \"pug\""))
+
+
+(test-equal "parse-toml: Dotted table with whitespace"
+ '(("a" ("b" ("c" ("x" . 1))))
+ ("d" ("e" ("f" ("x" . 1))))
+ ("g" ("h" ("i" ("x" . 1))))
+ ("j" ("ʞ" ("l" ("x" . 1)))))
+ (parse-toml "[a.b.c] # this is best practice
+x=1
+[ d.e.f ] # same as [d.e.f]
+x=1
+[ g . h . i ] # same as [g.h.i]
+x=1
+[ j . \"ʞ\" . 'l' ] # same as [j.\"ʞ\".'l']
+x=1"))
+
+;; XXX: technically this is not allowed, but we permit it.
+(test-equal "parse-toml: Multiple tables"
+ '(("fruit" ("apple" . "red") ("orange" . "orange")))
+ (parse-toml "[fruit]
+apple = \"red\"
+
+[fruit]
+orange = \"orange\""))
+
+(test-equal "parse-toml: Assignment to non-table"
+ #f
+ (parse-toml "[fruit]
+apple = \"red\"
+
+[fruit.apple]
+texture = \"smooth\""))
+
+(test-equal "parse-toml: Dotted keys create tables"
+ '(("fruit" ("apple" ("color" . "red") ("taste" ("sweet" . #t)))))
+ (parse-toml "fruit.apple.color = \"red\"
+fruit.apple.taste.sweet = true"))
+
+(test-equal "parse-toml: Inline tables"
+ '(("name" ("first" . "Tom") ("last" . "Preston-Werner"))
+ ("point" ("x" . 1) ("y" . 2))
+ ("animal" ("type" ("name" . "pug"))))
+ (parse-toml "name = { first = \"Tom\", last = \"Preston-Werner\" }
+point = { x = 1, y = 2 }
+animal = { type.name = \"pug\" }"))
+
+(test-error "parse-toml: Invalid assignment to inline table"
+ #t
+ (parse-toml "[product]
+type = { name = \"Nail\" }
+type.edible = false # INVALID"))
+
+;; We do not catch this semantic error yet.
+(test-expect-fail 1)
+(test-error "parse-toml: Invalid assignment to implicit table"
+ #f
+ (parse-toml "[product]
+type.name = \"Nail\"
+type = { edible = false } # INVALID"))
+
+;; Not implemented.
+(test-expect-fail 1)
+(test-equal "parse-toml: Array of tables"
+ '(("products" (("name" . "Hammer") ("sku" . 738594937))
+ ()
+ (("name" . "Nail") ("sku" . 284758393) ("color" . "gray"))))
+ (parse-toml "[[products]]
+name = \"Hammer\"
+sku = 738594937
+
+[[products]] # empty table within the array
+
+[[products]]
+name = \"Nail\"
+sku = 284758393
+
+color = \"gray\""))
+
+;; Not implemented.
+(test-expect-fail 1)
+(test-equal "parse-toml: Array of tables"
+ '(("fruits" ((("name" . "apple")
+ ("physical" (("color" . "red") ("shape" . "round")))
+ ("varieties" ((("name" . "red delicious")) (("name" . "granny smith")))))
+ (("name" . "banana")
+ ("varieties" (((("name" . "plantain")))))))))
+ (parse-toml "[[fruits]]
+name = \"apple\"
+
+[fruits.physical] # subtable
+color = \"red\"
+shape = \"round\"
+
+[[fruits.varieties]] # nested array of tables
+name = \"red delicious\"
+
+[[fruits.varieties]]
+name = \"granny smith\"
+
+
+[[fruits]]
+name = \"banana\"
+
+[[fruits.varieties]]
+name = \"plantain\""))
+
+;; Not implemented.
+(test-expect-fail 1)
+(test-error "parse-toml: Assignment to statically defined array"
+ #f
+ (parse-toml "fruits = []
+
+[[fruits]]
+x=1"))
+
+(test-end "toml")
+
--
2.41.0
[-- Attachment #7: 0006-build-system-pyproject-Use-TOML-parser.patch --]
[-- Type: text/plain, Size: 10580 bytes --]
From 8e079b48b7c07c07360db8eb6305e8044d86dd87 Mon Sep 17 00:00:00 2001
Message-ID: <8e079b48b7c07c07360db8eb6305e8044d86dd87.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 23 Jul 2023 11:22:03 +0200
Subject: [PATCH 6/8] build-system/pyproject: Use TOML parser.
More reliable than regular expressions.
* guix/build-system/pyproject.scm (%pyproject-build-system-modules): Add (guix build toml).
(pyproject-build): Add argument #:backend-path.
* guix/build/pyproject-build-system.scm (build): Add support for
auto-detected and override backend-path.
* gnu/packages/python-build.scm (python-tomli)[arguments]: Remove
'add-self-to-path, because it is not necessary any more.
(python-poetry-core): Same.
(python-hatchling): Same.
(python-pdm-backend): Same.
---
gnu/packages/python-build.scm | 30 ++------------
guix/build-system/pyproject.scm | 3 ++
guix/build/pyproject-build-system.scm | 56 +++++++++++++++------------
3 files changed, 39 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm
index faaffbcea5..4a8138dcae 100644
--- a/gnu/packages/python-build.scm
+++ b/gnu/packages/python-build.scm
@@ -178,13 +178,7 @@ (define-public python-tomli
(base32 "0kwazq3i18rphcr8gak4fgzdcj5w5bbn4k4j2l6ma32gj496qlny"))))
(build-system pyproject-build-system)
(arguments
- `(#:tests? #f ;disabled to avoid extra dependencies
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'add-self-to-path
- (lambda _
- ;; The build system of tomli requires... tomli.
- (setenv "PYTHONPATH" "src"))))))
+ `(#:tests? #f)) ;disabled to avoid extra dependencies
(native-inputs (list python-flit-core-bootstrap python-six-bootstrap))
(home-page "https://github.com/hukkin/tomli")
(synopsis "Small and fast TOML parser")
@@ -505,13 +499,7 @@ (define-public python-poetry-core
(base32 "053c8dw632p7jkhjb51k0wcx6hdw4r3lk97mds76df653qxnqmf6"))))
(build-system pyproject-build-system)
(arguments
- `(#:tests? #f ;disabled to avoid extra dependencies
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'add-self-to-path
- (lambda _
- ;; The build system requires itself.
- (setenv "PYTHONPATH" "src"))))))
+ `(#:tests? #f)) ;disabled to avoid extra dependencies
(home-page "https://github.com/python-poetry/poetry-core")
(synopsis "Poetry PEP 517 build back-end")
(description
@@ -651,12 +639,7 @@ (define-public python-hatchling
"1nn5cyc9fgrbawz38drfkl2s588k2gn3yqdm2cldbx9zy0fsjbj6"))))
(build-system pyproject-build-system)
(arguments
- (list #:tests? #f ;to keep dependencies to a minimum
- #:phases #~(modify-phases %standard-phases
- (add-before 'build 'add-src-to-path
- ;; Hatchling uses itself to build itself.
- (lambda _
- (setenv "PYTHONPATH" "src"))))))
+ (list #:tests? #f)) ;to keep dependencies to a minimum
(propagated-inputs (list python-editables
python-packaging-bootstrap
python-pathspec
@@ -730,12 +713,7 @@ (define-public python-pdm-backend
(build-system pyproject-build-system)
(arguments
(list
- #:tests? #f ; Depends on pytest, which we cannot import into this module.
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'set-pythonpath
- (lambda _
- (setenv "PYTHONPATH" (string-append (getcwd) "/src")))))))
+ #:tests? #f)) ; Depends on pytest, which we cannot import into this module.
(home-page "https://pdm-backend.fming.dev/")
(synopsis
"PEP 517 build backend for PDM")
diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 94b9d79692..585117cbf0 100644
--- a/guix/build-system/pyproject.scm
+++ b/guix/build-system/pyproject.scm
@@ -46,6 +46,7 @@ (define %pyproject-build-system-modules
;; Build-side modules imported by default.
`((guix build pyproject-build-system)
(guix build json)
+ (guix build toml)
,@%python-build-system-modules))
(define (default-python)
@@ -93,6 +94,7 @@ (define* (pyproject-build name inputs
#:key source
(tests? #t)
(configure-flags ''())
+ (backend-path #f)
(build-backend #f)
(test-backend #f)
(test-flags ''())
@@ -116,6 +118,7 @@ (define* (pyproject-build name inputs
#:source #+source
#:configure-flags #$configure-flags
#:system #$system
+ #:backend-path #$backend-path
#:build-backend #$build-backend
#:test-backend #$test-backend
#:test-flags #$test-flags
diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm
index c69ccc9d64..a1919eacf6 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -21,11 +21,13 @@ (define-module (guix build pyproject-build-system)
#:use-module ((guix build python-build-system) #:prefix python:)
#:use-module (guix build utils)
#:use-module (guix build json)
+ #:use-module (guix build toml)
#:use-module (ice-9 match)
#:use-module (ice-9 ftw)
#:use-module (ice-9 format)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 regex)
+ #:use-module (ice-9 textual-ports)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
@@ -60,8 +62,8 @@ (define-module (guix build pyproject-build-system)
;;; wheel and expected to be created by the installing utility.
;;; TODO: Add support for PEP-621 entry points.
;;;
-;;; Caveats:
-;;; - There is no support for in-tree build backends.
+;;; This module also supports in-tree build backends, which can be
+;;; overridden by #:backend-path.
;;;
;;; Code:
;;;
@@ -86,23 +88,23 @@ (define-condition-type &cannot-extract-multiple-wheels &python-build-error
;; Raised, when no wheel has been built by the build system.
(define-condition-type &no-wheels-built &python-build-error no-wheels-built?)
-(define* (build #:key outputs build-backend configure-flags #:allow-other-keys)
+(define* (build #:key outputs build-backend backend-path configure-flags #:allow-other-keys)
"Build a given Python package."
- (define (pyproject.toml->build-backend file)
- "Look up the build backend in a pyproject.toml file."
- (call-with-input-file file
- (lambda (in)
- (let loop
- ((line (read-line in 'concat)))
- (if (eof-object? line) #f
- (let ((m (string-match "build-backend = [\"'](.+)[\"']" line)))
- (if m
- (match:substring m 1)
- (loop (read-line in 'concat)))))))))
-
(let* ((wheel-output (assoc-ref outputs "wheel"))
(wheel-dir (if wheel-output wheel-output "dist"))
+ (pyproject.toml (if (file-exists? "pyproject.toml")
+ (parse-toml-file "pyproject.toml")
+ '()))
+ ;; backend-path is prepended to sys.path, so in-tree backends can be
+ ;; found. We assume toml is json-compatible and do not encode the resulting
+ ;; JSON list expression.
+ (auto-backend-path (recursive-assoc-ref
+ pyproject.toml
+ '("build-system" "backend-path")))
+ (use-backend-path (call-with-output-string
+ (cut write-json
+ (or backend-path auto-backend-path '()) <>)))
;; There is no easy way to get data from Guile into Python via
;; s-expressions, but we have JSON serialization already, which Python
;; also supports out-of-the-box.
@@ -111,10 +113,9 @@ (define* (build #:key outputs build-backend configure-flags #:allow-other-keys)
;; python-setuptools’ default backend supports setup.py *and*
;; pyproject.toml. Allow overriding this automatic detection via
;; build-backend.
- (auto-build-backend (if (file-exists? "pyproject.toml")
- (pyproject.toml->build-backend
- "pyproject.toml")
- #f))
+ (auto-build-backend (recursive-assoc-ref
+ pyproject.toml
+ '("build-system" "build-backend")))
;; Use build system detection here and not in importer, because a) we
;; have alot of legacy packages and b) the importer cannot update arbitrary
;; fields in case a package switches its build system.
@@ -122,15 +123,22 @@ (define* (build #:key outputs build-backend configure-flags #:allow-other-keys)
auto-build-backend
"setuptools.build_meta")))
(format #t
- "Using '~a' to build wheels, auto-detected '~a', override '~a'.~%"
- use-build-backend auto-build-backend build-backend)
+ (string-append
+ "Using '~a' to build wheels, auto-detected '~a', override '~a'.~%"
+ "Prepending '~a' to sys.path, auto-detected '~a', override '~a'.~%")
+ use-build-backend auto-build-backend build-backend
+ use-backend-path auto-backend-path backend-path)
(mkdir-p wheel-dir)
;; Call the PEP 517 build function, which drops a .whl into wheel-dir.
(invoke "python" "-c"
"import sys, importlib, json
-config_settings = json.loads (sys.argv[3])
-builder = importlib.import_module(sys.argv[1])
-builder.build_wheel(sys.argv[2], config_settings=config_settings)"
+backend_path = json.loads (sys.argv[1]) or []
+backend_path.extend (sys.path)
+sys.path = backend_path
+config_settings = json.loads (sys.argv[4])
+builder = importlib.import_module(sys.argv[2])
+builder.build_wheel(sys.argv[3], config_settings=config_settings)"
+ use-backend-path
use-build-backend
wheel-dir
config-settings)))
--
2.41.0
[-- Attachment #8: 0007-gnu-python-pytest-xdist-Disable-failing-test.patch --]
[-- Type: text/plain, Size: 1484 bytes --]
From e987a9e28ec0d8d1b8ecdb2486eb12eae270a49d Mon Sep 17 00:00:00 2001
Message-ID: <e987a9e28ec0d8d1b8ecdb2486eb12eae270a49d.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Tue, 25 Jul 2023 18:26:58 +0200
Subject: [PATCH 7/8] gnu: python-pytest-xdist: Disable failing test.
* gnu/packages/check.scm (python-pytest-xdist)[arguments]: Skip failing
test.
---
gnu/packages/check.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 691fe67605..2e1cda27b1 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1631,7 +1631,10 @@ (define-public python-pytest-xdist
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv"
- "-n" (number->string (parallel-job-count)))))))))
+ "-n" (number->string (parallel-job-count))
+ ;; Fails with OSError: cannot send to <Channel id=1 closed>
+ ;; on foreign distribution.
+ "-k" "not test_internal_errors_propagate_to_controller")))))))
(native-inputs (list python-setuptools-scm python-filelock python-pytest))
(propagated-inputs (list python-execnet python-pytest-forked))
(home-page "https://github.com/pytest-dev/pytest-xdist")
--
2.41.0
[-- Attachment #9: 0008-guix-pyproject-build-system-Default-configure-flags-.patch --]
[-- Type: text/plain, Size: 3170 bytes --]
From b3726639df72aa3943d8e403e3c2b9a6cde05421 Mon Sep 17 00:00:00 2001
Message-ID: <b3726639df72aa3943d8e403e3c2b9a6cde05421.1690972374.git.lars@6xq.net>
In-Reply-To: <cover.1690972374.git.lars@6xq.net>
References: <cover.1690972374.git.lars@6xq.net>
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sun, 30 Jul 2023 13:36:37 +0200
Subject: [PATCH 8/8] guix: pyproject-build-system: Default configure-flags to
empty dictionary.
PEP 517 specifies it should be a dictionary and thus meson-python cannot
handle an empty list.
Fixes: <https://issues.guix.gnu.org/62781>
---
gnu/packages/build-tools.scm | 10 ++--------
gnu/packages/python-science.scm | 5 -----
guix/build-system/pyproject.scm | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index a365cca849..09a8a175e8 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -355,10 +355,7 @@ (define-public meson-python
"1hpjw9qj6ff8ixjs0pz7qysc8v57jxgaf5n1p6bqm9bh3mc3wnrx"))))
(build-system pyproject-build-system)
(arguments
- ;; The project is configured to use itself to build ('mesonpy') and fails;
- ;; use another PEP 517 build system.
- (list #:build-backend "setuptools.build_meta"
- #:test-flags #~(list "tests"
+ (list #:test-flags #~(list "tests"
;; The test_pep518 tries to install
;; dependencies from the network using pip.
"-k" "not test_pep518")))
@@ -370,10 +367,7 @@ (define-public meson-python
python-tomli
python-wheel))
(native-inputs
- (list python-pypa-build
- python-wheel
-
- ;; For tests.
+ (list ;; For tests.
git-minimal/pinned
patchelf
pkg-config
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 538a3c2f0e..47890389b5 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -93,11 +93,6 @@ (define-public python-scipy
(build-system pyproject-build-system)
(arguments
(list
- ;; FIXME: The default 'mesonpy' build system doesn't seem to work with
- ;; our pyproject-build-system, errors with: AttributeError: 'list'
- ;; object has no attribute 'items' (see:
- ;; https://issues.guix.gnu.org/62781).
- #:build-backend "setuptools.build_meta"
#:phases
#~(modify-phases %standard-phases
(replace 'check
diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm
index 585117cbf0..c0e089eac7 100644
--- a/guix/build-system/pyproject.scm
+++ b/guix/build-system/pyproject.scm
@@ -93,7 +93,7 @@ (define* (lower name
(define* (pyproject-build name inputs
#:key source
(tests? #t)
- (configure-flags ''())
+ (configure-flags ''(@))
(backend-path #f)
(build-backend #f)
(test-backend #f)
--
2.41.0
^ permalink raw reply related [relevance 28%]
* [bug#64747] [PATCH] gnu: Add python-pynetbox.
@ 2023-07-20 17:13 70% Timotej Lazar
0 siblings, 0 replies; 200+ results
From: Timotej Lazar @ 2023-07-20 17:13 UTC (permalink / raw)
To: 64747; +Cc: Timotej Lazar, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-pynetbox): New variable.
---
gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6f855a503b..bce7fbd0e8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8686,3 +8686,28 @@ (define-public python-enoslib
scientific testbeds. It lets you deploy networks of machines on actual
hardware on Grid'5000 or via OpenStack, to Vagrant, Chameleon, and more.")
(license license:gpl3+)))
+
+(define-public python-pynetbox
+ (package
+ (name "python-pynetbox")
+ (version "7.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "pynetbox" version))
+ (sha256
+ (base32
+ "16ps9zgcjzyzn95lry277741i8php4ci3plsyd2vqxd57havba7b"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ ;; Integration tests depend on docker.
+ (delete-file-recursively "tests/integration"))))))
+ (propagated-inputs (list python-requests))
+ (native-inputs (list python-pytest python-pyyaml python-setuptools-scm))
+ (home-page "https://github.com/netbox-community/pynetbox")
+ (synopsis "NetBox API client library")
+ (description "Python module to query and edit data stored in a
+@url{https://netbox.dev,NetBox} instance.")
+ (license license:asl2.0)))
base-commit: 21b718f4d6c3ded8ef50d12f6e9ae6474f74620f
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#64542] [PATCH] gnu: Add python-ovh.
@ 2023-07-09 13:58 70% Liliana Marie Prikler
0 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-07-09 13:58 UTC (permalink / raw)
To: 64542; +Cc: lars, jgart
* gnu/packages/python-web.scm (python-ovh): New variable.
---
gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d0ac175039..7ac1ef236a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -778,6 +778,34 @@ (define-public python-aws-xray-sdk
emit information from within their applications to the AWS X-Ray service.")
(license license:asl2.0)))
+(define-public python-ovh
+ (package
+ (name "python-ovh")
+ (version "1.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "ovh" version))
+ (sha256
+ (base32
+ "0ygniv12lixh9rvnjcd01gzbzk2b5xwcg2a59b7964a77dd9p3qh"))))
+ (build-system pyproject-build-system)
+ (arguments (list #:tests? #f)) ; XXX: tests require networking
+ (propagated-inputs (list python-requests))
+ (native-inputs (list python-black
+ python-coverage
+ python-flake8
+ python-isort
+ python-pytest
+ python-pytest-cov
+ python-setuptools
+ python-sphinx
+ python-wheel))
+ (home-page "https://api.ovh.com")
+ (synopsis "Interact with OVHcloud APIs")
+ (description "This package provides the official module to perform HTTP requests
+to the OVHcloud APIs.")
+ (license license:bsd-3)))
+
(define-public python-cbor2
(package
(name "python-cbor2")
base-commit: 8306d3e52902c0d9cffd9a79b379c917c8cf49be
--
2.41.0
^ permalink raw reply related [relevance 70%]
* [bug#64474] [PATCH 3/3] gnu: awscli: Update to 1.28.0.
2023-07-05 12:17 70% ` [bug#64474] [PATCH 2/3] gnu: python-s3transfer: Update to 0.6.1 Roman Scherer
@ 2023-07-05 12:17 70% ` Roman Scherer
1 sibling, 0 replies; 200+ results
From: Roman Scherer @ 2023-07-05 12:17 UTC (permalink / raw)
To: 64474; +Cc: Roman Scherer
* gnu/packages/python-web.scm (awscli): Update to 1.28.0.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ddce9d504a..761343d2ad 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3490,14 +3490,14 @@ (define-public awscli
(package
;; Note: updating awscli typically requires updating botocore as well.
(name "awscli")
- (version "1.22.90")
+ (version "1.28.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "0ky4ax4xh7s8w1l0hwc7w9ii8afvh9nib3kz09qhiqdinxzrlv54"))))
+ "0rmvnwlvr12lgin09gbcppsj21nn6ynfypvcxpsvzmr3vxg1j0qg"))))
(build-system python-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#64474] [PATCH 2/3] gnu: python-s3transfer: Update to 0.6.1.
@ 2023-07-05 12:17 70% ` Roman Scherer
2023-07-05 12:17 70% ` [bug#64474] [PATCH 3/3] gnu: awscli: Update to 1.28.0 Roman Scherer
1 sibling, 0 replies; 200+ results
From: Roman Scherer @ 2023-07-05 12:17 UTC (permalink / raw)
To: 64474; +Cc: Roman Scherer
* gnu/packages/python-web.scm (python-s3transfer): Update to 0.6.1.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d0ac175039..ddce9d504a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4028,13 +4028,13 @@ (define-public python-betamax-serializers
(define-public python-s3transfer
(package
(name "python-s3transfer")
- (version "0.5.0")
+ (version "0.6.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "s3transfer" version))
(sha256
(base32
- "0k6sc956yrrv9b4laa0r79jhxajpyxr21jcd1ka8m1n53lz85vah"))))
+ "1adwmjf8w7s1a948h9xd6lcqhwdpmrm2pxp10l4hqk0zf69b82v4"))))
(build-system python-build-system)
(arguments
`(#:phases
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#64382] [PATCH 2/8] gnu: python-sanic: Update to 21.12.2.
@ 2023-06-30 20:02 70% ` peter
2023-06-30 20:02 68% ` [bug#64378] [PATCH 3/8] gnu: python-uvicorn: Update to 0.22.0 peter
2023-06-30 20:02 70% ` [bug#64383] [PATCH 4/8] gnu: python-starlette: Update to 0.26.0 peter
2 siblings, 0 replies; 200+ results
From: peter @ 2023-06-30 20:02 UTC (permalink / raw)
To: 64382; +Cc: Peter Polidoro
From: Peter Polidoro <peter@polidoro.io>
* gnu/packages/python-web.scm (): Update to 21.12.2.
---
gnu/packages/python-web.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6869eb0a8b..2df564f8b7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6915,14 +6915,14 @@ (define-public python-sanic
(package
(name "python-sanic")
;; We provide the latest LTS version of python-sanic.
- (version "21.12.1")
+ (version "21.12.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sanic" version))
(sha256
(base32
- "0b8mcd1q9qkwcv2qz8nlyaacs0bp7a1l31sdq2m8hhkxykzfq5bg"))))
+ "1qz5dq19dc1aagwapq2cxpgy40kyw6dk488jdl68d139midf29n4"))))
(build-system python-build-system)
(arguments
(list
@@ -6946,7 +6946,8 @@ (define-public python-sanic
;; Unclear why they fail since core-updates merge.
" and not test_missing_sni"
" and not test_no_matching_cert"
- " and not test_wildcards"))))))))
+ " and not test_wildcards"
+ " and not test_json_encoding"))))))))
(propagated-inputs
(list python-aiofiles
python-httptools
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#64378] [PATCH 3/8] gnu: python-uvicorn: Update to 0.22.0.
2023-06-30 20:02 70% ` [bug#64382] [PATCH 2/8] gnu: python-sanic: Update to 21.12.2 peter
@ 2023-06-30 20:02 68% ` peter
2023-06-30 20:02 70% ` [bug#64383] [PATCH 4/8] gnu: python-starlette: Update to 0.26.0 peter
2 siblings, 0 replies; 200+ results
From: peter @ 2023-06-30 20:02 UTC (permalink / raw)
To: 64378; +Cc: Peter Polidoro
From: Peter Polidoro <peter@polidoro.io>
* gnu/packages/python-web.scm (python-uvicorn): Update to 0.22.0.
---
gnu/packages/python-web.scm | 43 ++++++++++---------------------------
1 file changed, 11 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2df564f8b7..0c14e14665 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5599,46 +5599,25 @@ (define-public python-httptools
(define-public python-uvicorn
(package
(name "python-uvicorn")
- (version "0.17.6")
- (source
- (origin
- ;; PyPI tarball has no tests.
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/encode/uvicorn")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0npwls02nhna2lyw2nksxij16l9agf12c9f42pvxb5yrpi9l16c8"))))
- (build-system python-build-system)
+ (version "0.22.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "uvicorn" version))
+ (sha256
+ (base32
+ "1n4f5i6g4gnsj8z1wvjdyl9admsipc5q6rq5mbcyfz5m7ph7l9vr"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv" "-o" "asyncio_mode=auto"
- "-k"
- (string-append
- ;; These error or fail due to networking.
- "not test_keepalive "
- "and not test_bind_unix_socket_works_with_"
- "reload_or_workers "))))))))
- (native-inputs
- (list python-httpx-bootstrap
- python-pytest
- python-pytest-asyncio
- python-pytest-mock
- python-requests
- python-trustme
- python-wsproto))
+ `(#:tests? #f)) ; no tests in PyPI and no setup.py in github
(propagated-inputs
(list python-asgiref
python-click
python-dotenv
python-h11
+ python-hatchling
python-httptools
python-pyyaml
+ python-typing-extensions
python-uvloop
python-watchgod
python-websockets))
--
2.40.1
^ permalink raw reply related [relevance 68%]
* [bug#64383] [PATCH 4/8] gnu: python-starlette: Update to 0.26.0.
2023-06-30 20:02 70% ` [bug#64382] [PATCH 2/8] gnu: python-sanic: Update to 21.12.2 peter
2023-06-30 20:02 68% ` [bug#64378] [PATCH 3/8] gnu: python-uvicorn: Update to 0.22.0 peter
@ 2023-06-30 20:02 70% ` peter
2 siblings, 0 replies; 200+ results
From: peter @ 2023-06-30 20:02 UTC (permalink / raw)
To: 64383; +Cc: Peter Polidoro
From: Peter Polidoro <peter@polidoro.io>
* gnu/packages/python-web.scm (python-starlette): Update to 0.26.0.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 0c14e14665..d92ea9dc02 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8283,7 +8283,7 @@ (define-public python-sendgrid
(define-public python-starlette
(package
(name "python-starlette")
- (version "0.25.0")
+ (version "0.26.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -8292,7 +8292,7 @@ (define-public python-starlette
(file-name (git-file-name name version))
(sha256
(base32
- "1mkkj15lphgycnp51dnrfxbyrx3dicjdcpsqvwc7yw55zyih6h5k"))))
+ "0jykqjl7ghqqxqlsiw2jhr280a4xcf6crkb18pawlaf1hscb4k38"))))
(build-system pyproject-build-system)
(propagated-inputs (list python-anyio
python-typing-extensions
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#55474] [PATCH v5 30/55] gnu: Remove python-pysolr.
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 02/55] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 03/55] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
@ 2023-06-25 16:57 70% ` Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-06-25 16:57 UTC (permalink / raw)
To: 55474; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-pysolr): Delete variable.
---
gnu/packages/python-web.scm | 25 -------------------------
1 file changed, 25 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 785ee0d03d..8a05fa8d53 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6640,31 +6640,6 @@ (define-public python-robot-detection
@url{http://www.robotstxt.org}.")
(license license:gpl3+)))
-(define-public python-pysolr
- (package
- (name "python-pysolr")
- (version "3.9.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pysolr" version))
- (sha256
- (base32
- "1rj5jmscvxjwcmlfi6hmkj44l4x6n3ln5p7d8d18j566hzmmzw3f"))))
- (build-system python-build-system)
- (arguments
- '(#:tests? #f)) ; Tests require network access.
- (propagated-inputs
- (list python-requests))
- (native-inputs
- (list python-setuptools-scm))
- (home-page "https://github.com/django-haystack/pysolr/")
- (synopsis "Lightweight python wrapper for Apache Solr")
- (description
- "This module provides an interface that queries the Apache Solr server
-using a pure Python implementation.")
- (license license:bsd-3)))
-
(define-public python-pyjsparser
(package
(name "python-pyjsparser")
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#55474] [PATCH v5 03/55] gnu: Add python-asgiref-3.4.1.
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 02/55] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
@ 2023-06-25 16:57 70% ` Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 30/55] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-06-25 16:57 UTC (permalink / raw)
To: 55474; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-asgiref-3.4.1): New variable.
---
gnu/packages/python-web.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2a22d2b911..785ee0d03d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -565,6 +565,17 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgiref-3.4.1
+ (package
+ (inherit python-asgiref)
+ (version "3.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgiref" version))
+ (sha256
+ (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))))
+
(define-public python-asgi-csrf
(package
(name "python-asgi-csrf")
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#55474] [PATCH v5 02/55] gnu: python-asgiref: Update to 3.6.0.
@ 2023-06-25 16:57 70% ` Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 03/55] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 30/55] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-06-25 16:57 UTC (permalink / raw)
To: 55474; +Cc: ngraves, Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-asgiref): Update to 3.6.0.
---
gnu/packages/python-web.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6869eb0a8b..2a22d2b911 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -548,20 +548,13 @@ (define-public python-aiostream
(define-public python-asgiref
(package
(name "python-asgiref")
- (version "3.4.1")
+ (version "3.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "asgiref" version))
(sha256
- (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))
- (build-system python-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
+ (base32 "01lmjidadid0czd32d2c21lb6q78ri0pr0i74a4qqg4dppkxyrwm"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-pytest python-pytest-asyncio))
(home-page "https://github.com/django/asgiref/")
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#62389] [PATCH v2 3/6] gnu: python-treq: Update to 20.9.0.
@ 2023-06-07 17:31 89% ` Miguel Ángel Moreno
0 siblings, 0 replies; 200+ results
From: Miguel Ángel Moreno @ 2023-06-07 17:31 UTC (permalink / raw)
To: 62389; +Cc: me
* gnu/packages/python-web.scm (python-treq): Update to 20.9.0.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dbd6e98730..837fb5b6a0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5134,14 +5134,14 @@ (define-public python-hyperlink
(define-public python-treq
(package
(name "python-treq")
- (version "18.6.0")
+ (version "20.9.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "treq" version))
(sha256
(base32
- "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+ "18kdk11d84lyxj6dz183nblc6c6r4rj1hk0lpsyiykzgbakjrkc3"))))
(build-system python-build-system)
(propagated-inputs
(list python-attrs
--
2.40.1
--
Best regards,
Miguel Ángel Moreno
^ permalink raw reply related [relevance 89%]
* [bug#62922] [PATCH v2] gnu: python-lazr-restfulclient: Add missing dependencies.
2023-04-18 8:12 64% [bug#62922] [PATCH] gnu: python-lazr-restfulclient: Add missing dependency Tom Willemse
@ 2023-05-22 18:38 89% ` Ivan Vilata i Balaguer
0 siblings, 0 replies; 200+ results
From: Ivan Vilata i Balaguer @ 2023-05-22 18:38 UTC (permalink / raw)
To: 62922
[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]
Fixes <https://issues.guix.gnu.org/62922>.
* gnu/packages/python-web.scm (python-lazr-restfulclient): Add missing
dependencies.
[propagated-inputs] Add python-pyparsing and python-six.
---
The original patch from Tom Willemse still issued a DistributionNotFound error
on pyparsing. This alternative version adds both dependencies (without extra
reformatting). Thanks Tom for the initiative!
gnu/packages/python-web.scm | 3 +++
1 file changed, 3 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b6ad489626..262309032f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -59,6 +59,7 @@
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com>
+;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan@selidor.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -143,6 +144,8 @@ (define-public python-lazr-restfulclient
(list python-distro
python-httplib2
python-oauthlib
+ python-pyparsing
+ python-six
python-wadllib))
(home-page "https://launchpad.net/lazr.restfulclient")
(synopsis "Web client Python library extending wadlib")
base-commit: dff1689bb37e5303868584d3f1d7a33cbcb7f51e
--
2.39.2
--
Ivan Vilata i Balaguer -- https://elvil.net/
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [relevance 89%]
* [bug#63612] [PATCH 1/6] gnu: Add python-ephemeral-port-reserve.
@ 2023-05-20 16:44 70% ` kiasoc5 via Guix-patches via
2023-05-20 16:44 67% ` [bug#63612] [PATCH 4/6] gnu: python-werkzeug: Update to 2.2.3 kiasoc5 via Guix-patches via
2023-05-20 16:44 70% ` [bug#63612] [PATCH 5/6] gnu: python-flask: Update to 2.2.2 kiasoc5 via Guix-patches via
2 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2023-05-20 16:44 UTC (permalink / raw)
To: 63612; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-ephemeral-port-reserve): New variable.
---
gnu/packages/python-web.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b6ad489626..337c2b72c0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5802,6 +5802,26 @@ (define-public python-port-for
association.")
(license license:expat)))
+(define-public python-ephemeral-port-reserve
+ (package
+ (name "python-ephemeral-port-reserve")
+ (version "1.1.4")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "ephemeral_port_reserve" version))
+ (sha256
+ (base32
+ "1chl9hil7ggz6l4sfhmp0l2j55qcskbc3pj9360b0309jwndmxxq"))))
+ (build-system pyproject-build-system)
+ (home-page "https://github.com/Yelp/ephemeral-port-reserve/")
+ (synopsis
+ "Find an unused port, reliably.")
+ (description
+ "@code{ephemeral-port-reserve} provides a reliable and race-free
+implementation of the ``port 0 trick'': bind to an ephemeral port, force it into
+the TIME_WAIT state, and unbind it.")
+ (license license:expat)))
+
(define-public python-livereload
(package
(name "python-livereload")
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#63612] [PATCH 5/6] gnu: python-flask: Update to 2.2.2.
2023-05-20 16:44 70% ` [bug#63612] [PATCH 1/6] gnu: Add python-ephemeral-port-reserve kiasoc5 via Guix-patches via
2023-05-20 16:44 67% ` [bug#63612] [PATCH 4/6] gnu: python-werkzeug: Update to 2.2.3 kiasoc5 via Guix-patches via
@ 2023-05-20 16:44 70% ` kiasoc5 via Guix-patches via
2 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2023-05-20 16:44 UTC (permalink / raw)
To: 63612; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-flask): Update to 2.2.2.
[build-system]: Switch to pyproject-build-system.
[arguments]: Delete it.
---
gnu/packages/python-web.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b675edab12..f20a7432f9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3624,21 +3624,14 @@ (define-public python-webtest
(define-public python-flask
(package
(name "python-flask")
- (version "2.1.1")
+ (version "2.2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "Flask" version))
(sha256
(base32
- "1j0rjly2yhbm566lq2s8543fs7fz86f77abps539djcfalzbvjd8"))))
- (build-system python-build-system)
- (arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv" "tests")))))))
+ "0ayadjqn8lky9rmly7r33sm589fkysld56vjjqplibf4346lab34"))))
+ (build-system pyproject-build-system)
(native-inputs
(list python-pytest))
(propagated-inputs
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#63612] [PATCH 4/6] gnu: python-werkzeug: Update to 2.2.3.
2023-05-20 16:44 70% ` [bug#63612] [PATCH 1/6] gnu: Add python-ephemeral-port-reserve kiasoc5 via Guix-patches via
@ 2023-05-20 16:44 67% ` kiasoc5 via Guix-patches via
2023-05-20 16:44 70% ` [bug#63612] [PATCH 5/6] gnu: python-flask: Update to 2.2.2 kiasoc5 via Guix-patches via
2 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2023-05-20 16:44 UTC (permalink / raw)
To: 63612; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-werkzeug): Update to 2.2.3.
[build-system]: Switch to pyproject-build-system.
[arguments]: Delete check phase. Use test flags. Skip another test.
[propagated-inputs]: Add python-markupsafe.
[native-inputs]: Add python-cryptography, python-ephemeral-port-reserve,
python-greenlet, and python-watchdog.
---
gnu/packages/python-web.scm | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 337c2b72c0..b675edab12 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4625,29 +4625,30 @@ (define-public python-publicsuffix2
(define-public python-werkzeug
(package
(name "python-werkzeug")
- (version "2.0.2")
+ (version "2.2.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Werkzeug" version))
(sha256
(base32
- "16nvv9dh37ssf5pkny9yj2li0n6wyzsygh8a9i86r3gfipybcaxa"))))
- (build-system python-build-system)
+ "1zhaznfq2pc6czbg5gjg3pm92hq9mkip9wg6kn5kbnnl2yacq71f"))))
+ (build-system pyproject-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? inputs outputs #:allow-other-keys)
- (when tests?
- (add-installed-pythonpath inputs outputs)
- (invoke "python" "-m" "pytest"
- ;; Test tries to use the network.
- "-k not test_reloader_sys_path")))))))
+ (list
+ #:test-flags
+ ;; Test tries to use the network.
+ '(list "-k" "not test_exclude_patterns and not test_reloader_sys_path")))
(propagated-inputs
- (list python-requests))
+ (list python-requests python-markupsafe))
(native-inputs
- (list python-pytest python-pytest-timeout python-pytest-xprocess))
+ (list python-cryptography
+ python-ephemeral-port-reserve
+ python-greenlet
+ python-pytest
+ python-pytest-timeout
+ python-pytest-xprocess
+ python-watchdog))
(home-page "https://palletsprojects.com/p/werkzeug/")
(synopsis "Utilities for WSGI applications")
(description "One of the most advanced WSGI utility modules. It includes a
--
2.40.1
^ permalink raw reply related [relevance 67%]
* [bug#63601] [PATCH] gnu: whoogle-search: Update to 0.8.2.
@ 2023-05-19 20:49 70% Spencer Skylar Chan
0 siblings, 0 replies; 200+ results
From: Spencer Skylar Chan @ 2023-05-19 20:49 UTC (permalink / raw)
To: 63601
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0001-gnu-whoogle-search-Update-to-0.8.2.patch --]
[-- Type: text/x-patch, Size: 1175 bytes --]
From d9e61b6fde7a8f15ebca589265a3f1a41601b18d Mon Sep 17 00:00:00 2001
From: Spencer Skylar Chan <schan12@umd.edu>
Date: Fri, 19 May 2023 16:42:28 -0400
Subject: [PATCH] gnu: whoogle-search: Update to 0.8.2.
* gnu/packages/python-web.scm (whoogle-search): Update to 0.8.2.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b6ad489626..d121d66077 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4995,13 +4995,13 @@ (define-public python-google-auth-httplib2
(define-public whoogle-search
(package
(name "whoogle-search")
- (version "0.8.1")
+ (version "0.8.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "whoogle-search" version))
(sha256
(base32
- "1kqkb23wb9a4a8zdky2066887vgv7ywhivhxi5nipkx07mf8v01k"))))
+ "1r6ymainwc3b8aar90b74mpnx3rsfscgzh0llwvsb03fbhiypw5g"))))
(build-system pyproject-build-system)
(arguments
(list
base-commit: 0aab24855238cc7c7a31066ab39cd94e534b857f
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#63165] [PATCH v2] gnu: python-cssutils: Update to 2.6.0.
@ 2023-04-29 5:43 68% ` kiasoc5 via Guix-patches via
0 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2023-04-29 5:43 UTC (permalink / raw)
To: 63165; +Cc: kiasoc5
Resending second patch with a better commit message.
* gnu/packages/python-web.scm (python-cssutils): Update to 2.6.0.
[build-system]: Switch to pyproject-build-system.
[arguments]: Enable tests.
[native-inputs]: Remove unzip; add python-pytest and python-jaraco-test.
[homepage]: Update it.
---
gnu/packages/python-web.scm | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d7ad051007..3c34c1c043 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1929,20 +1929,29 @@ (define-public python-openid
(define-public python-cssutils
(package
(name "python-cssutils")
- (version "1.0.2")
+ (version "2.6.0")
(source
- (origin
- (method url-fetch)
- (uri (pypi-uri "cssutils" version))
- (sha256
- (base32
- "1bxchrbqzapwijap0yhlxdil1w9bmwvgx77aizlkhc2mcxjg1z52"))))
- (build-system python-build-system)
- (native-inputs
- (list unzip)) ; for unpacking the source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "cssutils" version))
+ (sha256
+ (base32
+ "13l1y0xr3fgbl95w3pinb5av5dqk2ip39pih6vgrz47c3hyd5p7p"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:tests? #f)) ; tests require python-pbr < 1.7.0
- (home-page "https://cthedot.de/cssutils/")
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "pytest" "-vv" "-k"
+ ;; disable tests requiring network
+ (string-append "not test_parseUrl "
+ "and not encutils "
+ "and not website.logging")))))))
+ (native-inputs
+ (list python-pytest python-jaraco-test))
+ (home-page "https://github.com/jaraco/cssutils")
(synopsis
"CSS Cascading Style Sheets library for Python")
(description
base-commit: 4884ee6dd4b1694a4a502dd8058d6c61fa0c0199
prerequisite-patch-id: 81152a28167c5753792b6ac435f46dd43dadcb13
--
2.40.1
^ permalink raw reply related [relevance 68%]
* [bug#63165] [PATCH 2/2] gnu: python-cssutils: Update to 2.6.0.
@ 2023-04-29 5:31 70% ` kiasoc5 via Guix-patches via
0 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2023-04-29 5:31 UTC (permalink / raw)
To: 63165; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-cssutils): Update to 2.6.0.
[native-inputs]: Remove unzip; add python-pytest and python-jaraco-test.
---
gnu/packages/python-web.scm | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d7ad051007..3c34c1c043 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1929,20 +1929,29 @@ (define-public python-openid
(define-public python-cssutils
(package
(name "python-cssutils")
- (version "1.0.2")
+ (version "2.6.0")
(source
- (origin
- (method url-fetch)
- (uri (pypi-uri "cssutils" version))
- (sha256
- (base32
- "1bxchrbqzapwijap0yhlxdil1w9bmwvgx77aizlkhc2mcxjg1z52"))))
- (build-system python-build-system)
- (native-inputs
- (list unzip)) ; for unpacking the source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "cssutils" version))
+ (sha256
+ (base32
+ "13l1y0xr3fgbl95w3pinb5av5dqk2ip39pih6vgrz47c3hyd5p7p"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:tests? #f)) ; tests require python-pbr < 1.7.0
- (home-page "https://cthedot.de/cssutils/")
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda _
+ (invoke "pytest" "-vv" "-k"
+ ;; disable tests requiring network
+ (string-append "not test_parseUrl "
+ "and not encutils "
+ "and not website.logging")))))))
+ (native-inputs
+ (list python-pytest python-jaraco-test))
+ (home-page "https://github.com/jaraco/cssutils")
(synopsis
"CSS Cascading Style Sheets library for Python")
(description
--
2.40.1
^ permalink raw reply related [relevance 70%]
* [bug#62922] [PATCH] gnu: python-lazr-restfulclient: Add missing dependency
@ 2023-04-18 8:12 64% Tom Willemse
2023-05-22 18:38 89% ` [bug#62922] [PATCH v2] gnu: python-lazr-restfulclient: Add missing dependencies Ivan Vilata i Balaguer
0 siblings, 1 reply; 200+ results
From: Tom Willemse @ 2023-04-18 8:12 UTC (permalink / raw)
To: 62922; +Cc: Tom Willemse
* gnu/packages/python-web.scm (python-lazr-restfulclient): Add missing
dependency: python-six
---
Trying to rebuild my guix home config I ran into the following error:
starting phase `sanity-check'
validating 'lazr.restfulclient' /gnu/store/llar0l72885zagk7km0hvjlq4hb3g2sx-python-lazr-restfulclient-0.14.4/lib/python3.9/site-packages
...checking requirements: ERROR: lazr.restfulclient==0.14.4 DistributionNotFound(Requirement.parse('six'), {'lazr.restfulclient'})
error: in phase 'sanity-check': uncaught exception:
%exception #<&invoke-error program: "python" arguments: ("/gnu/store/35ix1m6m8a5s21j02ajhdyqxb2xkshfb-sanity-check.py" "/gnu/store/llar0l72885zagk7km0hvjlq4hb3g2sx-python-lazr-restfulclient-0.14.4/lib/python3.9/site-packages") exit-status: 1 term-signal: #f stop-signal: #f>
phase `sanity-check' failed after 0.2 seconds
command "python" "/gnu/store/35ix1m6m8a5s21j02ajhdyqxb2xkshfb-sanity-check.py" "/gnu/store/llar0l72885zagk7km0hvjlq4hb3g2sx-python-lazr-restfulclient-0.14.4/lib/python3.9/site-packages" failed with status 1
From what I understand from the text it indicates that the requirements.txt of
the lazr restfulclient project specifies a dependency on six, but that package
hasn't been installed in the environment. Adding this dependency fixes the issue
for me.
gnu/packages/python-web.scm | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index d84b5efdf9..051346c66a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -127,21 +127,19 @@ (define-public python-lazr-restfulclient
(package
(name "python-lazr-restfulclient")
(version "0.14.4")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "lazr.restfulclient" version))
- (sha256
- (base32 "11yhlqmdf2cqbdfzn8gdmzvmcivh4fflr18zf412sflvfjrdc3xz"))))
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "lazr.restfulclient" version))
+ (sha256
+ (base32
+ "11yhlqmdf2cqbdfzn8gdmzvmcivh4fflr18zf412sflvfjrdc3xz"))))
(build-system python-build-system)
;; Disable the test suite to avoid the lazr.authentication requirement,
;; which requires the ancient 'oauth', a Python 2 only library.
- (arguments (list #:tests? #f))
- (propagated-inputs
- (list python-distro
- python-httplib2
- python-oauthlib
- python-wadllib))
+ (arguments
+ (list #:tests? #f))
+ (propagated-inputs (list python-distro python-httplib2 python-oauthlib
+ python-wadllib python-six))
(home-page "https://launchpad.net/lazr.restfulclient")
(synopsis "Web client Python library extending wadlib")
(description "This package provides a programmable client library that
base-commit: 79b2221ce43b8026eae6461a9269466cae946cac
--
2.40.0
^ permalink raw reply related [relevance 64%]
* [bug#62873] [PATCH] Merge branch 'master' into gnome-team.
@ 2023-04-15 21:30 16% ` Liliana Marie Prikler
0 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-04-15 21:30 UTC (permalink / raw)
To: 62873
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 594141 bytes --]
---
Note: master is at 7c7853d269fe53271dd35d5bd941d18a2cb55120 in this commit.
NEWS | 3 +++
doc/guix.texi | 38 +++++++++++++++++++-------------------
gnu/local.mk | 9 +++++----
gnu/packages/admin.scm | 56 +++++++++++++++++++++++++++++++++++++-------------------
gnu/packages/audio.scm | 63 ++++-----------------------------------------------------------
gnu/packages/benchmark.scm | 41 ++++++++++++++++++++++++++++-------------
gnu/packages/build-tools.scm | 2 +-
gnu/packages/c.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
gnu/packages/calendar.scm | 4 ++--
gnu/packages/cdrom.scm | 1 +
gnu/packages/certs.scm | 4 ++--
gnu/packages/check.scm | 12 ++++++------
gnu/packages/crates-graphics.scm | 7 +++++--
gnu/packages/crates-io.scm | 2489 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
gnu/packages/databases.scm | 112 ++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------
gnu/packages/electronics.scm | 22 +++++++++-------------
gnu/packages/emulators.scm | 5 +++--
gnu/packages/fonts.scm | 60 ++++++++++++++++++++++++++++++++----------------------------
gnu/packages/fontutils.scm | 77 +++++++++++++++++++++++++++++++----------------------------------------------
gnu/packages/freedesktop.scm | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
gnu/packages/games.scm | 8 ++++----
gnu/packages/gl.scm | 23 +++++++++++++----------
gnu/packages/gnome.scm | 20 +++++++++++---------
gnu/packages/gnunet.scm | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
gnu/packages/gnuzilla.scm | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
gnu/packages/golang.scm | 6 +++---
gnu/packages/graphics.scm | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------
gnu/packages/gstreamer.scm | 91 ++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
gnu/packages/ibus.scm | 32 ++++++++++++++++++++------------
gnu/packages/image.scm | 4 ++--
gnu/packages/jami.scm | 70 +++++++++++++++++++---------------------------------------------------
gnu/packages/kde-frameworks.scm | 14 ++++++--------
gnu/packages/less.scm | 5 +++--
gnu/packages/libcanberra.scm | 6 ------
gnu/packages/linux.scm | 20 ++++++++++----------
gnu/packages/lisp-xyz.scm | 8 ++++----
gnu/packages/lisp.scm | 15 +++++++--------
gnu/packages/man.scm | 4 ++--
gnu/packages/maths.scm | 44 ++++++++++++++++++++++++++++++--------------
gnu/packages/minetest.scm | 9 +++++----
gnu/packages/music.scm | 97 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
gnu/packages/nss.scm | 10 +++++-----
gnu/packages/package-management.scm | 6 +++---
gnu/packages/patches/glslang-install-static-libs.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gnu/packages/patches/jami-libjami-headers-search.patch | 45 ++++++++++++---------------------------------
gnu/packages/patches/libcdio-glibc-compat.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
gnu/packages/patches/mariadb-link-libatomic.patch | 83 -----------------------------------------------------------------------------------
gnu/packages/patches/openboardview-use-system-mpc.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
gnu/packages/patches/openboardview-use-system-utf8.patch | 48 ------------------------------------------------
gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch | 25 +++++++++++++++++++++++++
gnu/packages/patches/python-afdko-suppress-copyright-test.patch | 20 --------------------
gnu/packages/patches/python2-pyopenssl-openssl-compat.patch | 51 ---------------------------------------------------
gnu/packages/patches/rust-openssl-sys-no-vendor.patch | 30 ++++++++++++++++++------------
gnu/packages/patches/webkitgtk-libelogind.patch | 38 ++++++++++++++++++++++++++++++++++++++
gnu/packages/perl-check.scm | 4 ++--
gnu/packages/perl.scm | 4 ++--
gnu/packages/photo.scm | 6 ++----
gnu/packages/python-check.scm | 9 ++++-----
gnu/packages/python-compression.scm | 16 +++++++---------
gnu/packages/python-crypto.scm | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
gnu/packages/python-web.scm | 17 ++++++++---------
gnu/packages/python-xyz.scm | 106 +++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
gnu/packages/qt.scm | 1193 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
gnu/packages/radio.scm | 84 +++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
gnu/packages/rails.scm | 6 ++++++
gnu/packages/ruby.scm | 22 ++++++++++++++--------
gnu/packages/rust-apps.scm | 24 +++++++++++++++++++-----
gnu/packages/sdl.scm | 82 +++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
gnu/packages/sphinx.scm | 31 ++++++++++++++++++++-----------
gnu/packages/syndication.scm | 6 +++---
gnu/packages/telephony.scm | 11 +++++++----
gnu/packages/toolkits.scm | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
gnu/packages/unicode.scm | 18 ++----------------
gnu/packages/version-control.scm | 4 ++++
gnu/packages/video.scm | 102 +++++++++++++++++++++++++++++++++---------------------------------------------------------------------
gnu/packages/vulkan.scm | 258 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
gnu/packages/web.scm | 18 ++++++++++--------
gnu/packages/webkit.scm | 60 +++++++++++++++++++++++++++++++-----------------------------
gnu/packages/xdisorg.scm | 63 +++++++++++++++------------------------------------------------
gnu/packages/xiph.scm | 8 ++++----
gnu/packages/xorg.scm | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------
gnu/tests/databases.scm | 6 +++++-
guix/build/qt-utils.scm | 5 ++---
83 files changed, 4422 insertions(+), 3188 deletions(-)
create mode 100644 gnu/packages/patches/glslang-install-static-libs.patch
create mode 100644 gnu/packages/patches/libcdio-glibc-compat.patch
delete mode 100644 gnu/packages/patches/mariadb-link-libatomic.patch
create mode 100644 gnu/packages/patches/openboardview-use-system-mpc.patch
delete mode 100644 gnu/packages/patches/openboardview-use-system-utf8.patch
create mode 100644 gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch
delete mode 100644 gnu/packages/patches/python-afdko-suppress-copyright-test.patch
delete mode 100644 gnu/packages/patches/python2-pyopenssl-openssl-compat.patch
create mode 100644 gnu/packages/patches/webkitgtk-libelogind.patch
diff --git a/NEWS b/NEWS
index 47545f6..79c80cf 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
Please send Guix bug reports to bug-guix@gnu.org.
+* Changes in 1.5.0 (since 1.4.0)
+** Package management
+*** New ‘rpm’ format for the ‘guix pack’ command
* Changes in 1.4.0 (since 1.3.0)
** Package management
*** New ‘guix home’ command, for home environment management
diff --git a/doc/guix.texi b/doc/guix.texi
index acb6f0c..adb1975 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14398,7 +14398,7 @@ for compatibility with an upgraded @code{flex} package.
@table @code
@item --list-transitive
-@itemx --T
+@itemx -T
List all the packages which one or more packages depend upon.
@example
@@ -18464,7 +18464,7 @@ The Kmscon package to use.
@cindex @abbr{nscd, name service cache daemon}
@defvar nscd-service-type
Type of the service that runs the libc @abbr{nscd, name service cache
-daemon}, whose value is a @code{<nscd-configuration>} object.
+daemon}, whose value is an @code{<nscd-configuration>} object.
For convenience, the Shepherd service for nscd provides the following actions:
@@ -18992,7 +18992,7 @@ seconds for the negative lookups. @xref{Invoking guix publish,
@end deftp
@defvar rngd-service-type
-Type of the service that runs rng-tools rngd, whose value is a
+Type of the service that runs rng-tools rngd, whose value is an
@code{<rngd-configuration>} object.
@end defvar
@@ -26315,7 +26315,7 @@ variables.
@defvar getmail-service-type
This is the type of the @uref{http://pyropus.ca/software/getmail/, Getmail}
-mail retriever, whose value should be an @code{getmail-configuration}.
+mail retriever, whose value should be a @code{getmail-configuration}.
@end defvar
Available @code{getmail-configuration} fields are:
@@ -31520,7 +31520,7 @@ The list of knot-zone-configuration used by this configuration.
@defvar knot-resolver-service-type
This is the type of the knot resolver service, whose value should be
-an @code{knot-resolver-configuration} object as in this example:
+a @code{knot-resolver-configuration} object as in this example:
@lisp
(service knot-resolver-service-type
@@ -31557,7 +31557,7 @@ Number of milliseconds for @code{kres-cache-gc} to periodically trim the cache.
@subsubheading Dnsmasq Service
@defvar dnsmasq-service-type
-This is the type of the dnsmasq service, whose value should be an
+This is the type of the dnsmasq service, whose value should be a
@code{dnsmasq-configuration} object as in this example:
@lisp
@@ -37570,7 +37570,7 @@ on whatever else might be trying to use the disk at the time.
@defvar fstrim-service-type
Type for a service that periodically runs @command{fstrim}, whose value must
-be a @code{<fstrim-configuration>} object. The service can be instantiated
+be an @code{<fstrim-configuration>} object. The service can be instantiated
in its default configuration with:
@lisp
@@ -42313,7 +42313,7 @@ for home services is that they have to be declared in a
record.
@defvar home-mcron-service-type
-This is the type of the @code{mcron} home service, whose value is an
+This is the type of the @code{mcron} home service, whose value is a
@code{home-mcron-configuration} object. It allows to manage scheduled
tasks.
@@ -42661,16 +42661,16 @@ to the @code{services} field of your @code{home-environment}:
@end lisp
@defvar home-ssh-agent-service-type
-This is the type of the @code{git daemon} home service, whose value is an
+This is the type of the @code{ssh-agent} home service, whose value is a
@code{home-ssh-agent-configuration} object.
@end defvar
@deftp {Data Type} home-ssh-agent-configuration
Available @code{home-ssh-agent-configuration} fields are:
@table @asis
-@item @code{git} (default: @code{git}) (type: file-like)
-The git package to use.
+@item @code{openssh} (default: @code{openssh}) (type: file-like)
+The OpenSSH package to use.
@item @code{socket-directory} (default: @code{@env{XDG_RUNTIME_DIR}/ssh-agent"}) (type: gexp)
The directory to write the ssh-agent's @file{socket} file.
@@ -43100,16 +43100,16 @@ to the @code{services} field of your @code{home-environment}:
@end lisp
@defvar home-znc-service-type
-This is the type of the @code{git daemon} home service, whose value is an
+This is the type of the ZNC home service, whose value is a
@code{home-znc-configuration} object.
@end defvar
@deftp {Data Type} home-znc-configuration
Available @code{home-znc-configuration} fields are:
@table @asis
-@item @code{git} (default: @code{git}) (type: file-like)
-The git package to use.
+@item @code{znc} (default: @code{znc}) (type: file-like)
+The ZNC package to use.
@item @code{extra-options} (default: @code{'()})
Extra options will be passed to @command{znc}, please run @command{man
@@ -43122,9 +43122,9 @@ znc} for more information.
@subsection Media Home Services
@cindex kodi
-The @uref{https://kodi.tv, KODI media center} can be run as a daemon on
+The @uref{https://kodi.tv, Kodi media center} can be run as a daemon on
a media server. With the @code{(gnu home services kodi)} service, you
-can configure KODI to run upon login.
+can configure Kodi to run upon login.
Here is an example of a service and its configuration that you could add
to the @code{services} field of your @code{home-environment}:
@@ -43136,16 +43136,16 @@ to the @code{services} field of your @code{home-environment}:
@end lisp
@defvar home-kodi-service-type
-This is the type of the @code{git daemon} home service, whose value is an
+This is the type of the Kodi home service, whose value is a
@code{home-kodi-configuration} object.
@end defvar
@deftp {Data Type} home-kodi-configuration
Available @code{home-kodi-configuration} fields are:
@table @asis
-@item @code{git} (default: @code{git}) (type: file-like)
-The git package to use.
+@item @code{kodi} (default: @code{kodi}) (type: file-like)
+The Kodi package to use.
@item @code{extra-options} (default: @code{'()})
Extra options will be passed to @command{kodi}, please run @command{man
diff --git a/gnu/local.mk b/gnu/local.mk
index 4590508..72b7376 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1249,6 +1249,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-2.29-supported-locales.patch \
%D%/packages/patches/glibc-static-nss.patch \
%D%/packages/patches/glibc-supported-locales.patch \
+ %D%/packages/patches/glslang-install-static-libs.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnash-fix-giflib-version.patch \
@@ -1490,6 +1491,7 @@ dist_patch_DATA = \
%D%/packages/patches/lierolibre-newer-libconfig.patch \
%D%/packages/patches/lierolibre-remove-arch-warning.patch \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \
+ %D%/packages/patches/libcdio-glibc-compat.patch \
%D%/packages/patches/linbox-fix-pkgconfig.patch \
%D%/packages/patches/linphone-desktop-without-sdk.patch \
%D%/packages/patches/linux-libre-infodocs-target.patch \
@@ -1522,7 +1524,6 @@ dist_patch_DATA = \
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/mailutils-variable-lookup.patch \
%D%/packages/patches/make-impure-dirs.patch \
- %D%/packages/patches/mariadb-link-libatomic.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
%D%/packages/patches/mathjax-disable-webpack.patch \
@@ -1616,7 +1617,7 @@ dist_patch_DATA = \
%D%/packages/patches/onnx-skip-model-downloads.patch \
%D%/packages/patches/openbios-aarch64-riscv64-support.patch \
%D%/packages/patches/openboardview-use-system-imgui.patch \
- %D%/packages/patches/openboardview-use-system-utf8.patch \
+ %D%/packages/patches/openboardview-use-system-mpc.patch \
%D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
@@ -1631,6 +1632,7 @@ dist_patch_DATA = \
%D%/packages/patches/openssl-3.0-c-rehash-in.patch \
%D%/packages/patches/opentaxsolver-file-browser-fix.patch \
%D%/packages/patches/open-zwave-hidapi.patch \
+ %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \
%D%/packages/patches/osip-CVE-2017-7853.patch \
%D%/packages/patches/ots-no-include-missing-file.patch \
@@ -1731,7 +1733,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \
%D%/packages/patches/python-3-no-static-lib.patch \
- %D%/packages/patches/python-afdko-suppress-copyright-test.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \
@@ -1753,7 +1754,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pillow-CVE-2022-45199.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-pyflakes-test-location.patch \
- %D%/packages/patches/python2-pyopenssl-openssl-compat.patch \
%D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-libxml2-utf8.patch \
%D%/packages/patches/python-magic-python-bytecode.patch \
@@ -2004,6 +2004,7 @@ dist_patch_DATA = \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
+ %D%/packages/patches/webkitgtk-libelogind.patch \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \
%D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index c974a1d..1c2b212 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -35,7 +35,7 @@
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
@@ -2795,13 +2795,13 @@ specified directories.")
(define-public ansible-core
(package
(name "ansible-core")
- (version "2.11.6")
+ (version "2.14.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible-core" version))
(sha256
- (base32 "0fih7nxszni8imi5sywsifd976v77ydhip43pzg7dd65qy1h5mck"))))
+ (base32 "057g87smxcn6zc558xk4zr6ga4q8clmkyxghn5gx60a94sy61clh"))))
(build-system python-build-system)
(arguments
`(#:modules ((guix build python-build-system)
@@ -2837,10 +2837,25 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
(and (eq? 'symlink (stat:type (lstat x)))
(string-prefix? "ansible-" x)
(string=? "ansible" (readlink x)))))))))
+ (add-after 'unpack 'skip-controller-tests
+ (lambda _
+ ;; XXX: This disables all the controller tests, which fail for
+ ;; unknown reasons, seemingly while attempting to set the
+ ;; locale to en_US.UTF-8.
+ (substitute* "test/lib/ansible_test/_internal/commands\
+/units/__init__.py"
+ (("^ if test_context == TestContext.controller:.*"
+ all)
+ (string-append all " continue\n")))))
(add-after 'unpack 'preserve-pythonpath
(lambda _
(substitute* "test/lib/ansible_test/_internal/ansible_util.py"
(("PYTHONPATH=get_ansible_python_path\\(args\\)" all)
+ (string-append all "+ ':' + os.environ['GUIX_PYTHONPATH']")))
+ (substitute* "test/lib/ansible_test/_internal/commands\
+/units/__init__.py"
+ (("PYTHONPATH=get_units_ansible_python_path\\(args, \
+test_context)" all)
(string-append all "+ ':' + os.environ['GUIX_PYTHONPATH']")))))
(add-after 'unpack 'patch-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -2852,31 +2867,35 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
(("/usr/bin/python")
(which "python")))))
(replace 'check
- ;; The environment for the test suite can be tricky to get right.
- ;; The environment used for Ansible's CI defined in the following
- ;; Dockerfile can be used as a reference:
- ;; https://raw.githubusercontent.com/ansible/
- ;; default-test-container/master/Dockerfile.
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
;; Otherwise Ansible fails to create its config directory.
(setenv "HOME" "/tmp")
- (setenv "PATH" (string-append (getenv "PATH") ":"
- (assoc-ref outputs "out") "/bin"))
- (add-installed-pythonpath inputs outputs)
;; This test module messes up with sys.path and causes many
;; test failures.
(delete-file "test/units/_vendor/test_vendor.py")
;; The test fails when run in the container, for reasons
;; unknown.
(delete-file "test/units/utils/test_display.py")
;; This test fail for reasons unknown.
(delete-file "test/units/cli/test_adhoc.py")
+ ;; These tests fail in the container; it appears that the
+ ;; mocking of the absolute file names such as /usr/bin/svcs do
+ ;; not work as intended there.
+ (delete-file "test/units/modules/test_iptables.py")
+ (delete-file "test/units/modules/test_service.py")
+ ;; These tests fail with a "unsupported locale setting" error
+ ;; when invoking 'locale.setlocale(locale.LC_ALL, '')'
+ (delete-file "test/units/module_utils/basic/\
+test_command_nonexisting.py")
+ (delete-file "test/units/module_utils/basic/test_tmpdir.py")
;; The test suite needs to be run with 'ansible-test', which
;; does some extra environment setup. Taken from
;; https://raw.githubusercontent.com/ansible/ansible/\
;; devel/test/utils/shippable/shippable.sh.
- (invoke "ansible-test" "units" "-v")))))))
+ (invoke "ansible-test" "units" "-v"
+ "--num-workers" (number->string
+ (parallel-job-count)))))))))
(native-inputs
(list openssh
openssl
@@ -2894,7 +2913,7 @@ sys.argv[0] = re.sub(r'\\.([^/]*)-real$', r'\\1', sys.argv[0])
(list python-cryptography
python-jinja2
python-pyyaml
- python-packaging ;for version number parsing
+ python-packaging ;for version number parsing
python-resolvelib-0.5))
(home-page "https://www.ansible.com/")
(synopsis "Radically simple IT automation")
@@ -2922,16 +2941,15 @@ provides the following commands:
(define-public ansible
(package
(name "ansible")
- (version "4.7.0")
+ (version "7.4.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ansible" version))
(sha256
- (base32 "0aab9id6dqfw2111r731c7y1p77dpzczynmgl4d989p3a7n54z0b"))))
+ (base32 "142barhwz0wx5kn74xi0bfl21iwq2yq3jp14kxajsg9nggndcr09"))))
(build-system python-build-system)
- (propagated-inputs
- (list ansible-core))
+ (propagated-inputs (list ansible-core))
;; The Ansible collections are found by ansible-core via the Python search
;; path; the following search path ensures that they are found even when
;; Python is not present in the profile.
@@ -3568,15 +3586,15 @@ produce uniform output across heterogeneous networks.")
(define-public cbatticon
(package
(name "cbatticon")
- (version "1.6.10")
+ (version "1.6.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/valr/cbatticon")
(commit version)))
(sha256
- (base32 "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"))
+ (base32 "1xs37xrycvk0021r5l3xs4ijgf3lm25d2zhm8dppb5kx66xcj22m"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index cf7fcd8..220e0b8 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2062,16 +2062,16 @@ follower.")
(define-public fluidsynth
(package
(name "fluidsynth")
- (version "2.2.4")
+ (version "2.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/FluidSynth/fluidsynth")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "1061rdj69503spkd8vmfl3fqvyg4l41k5xcc4gw7niy31hnpnjmn"))))
+ "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no check target
@@ -2092,7 +2092,6 @@ follower.")
(list alsa-lib
glib
jack-1
- lash
libsndfile
readline))
(home-page "https://www.fluidsynth.org/")
@@ -2747,60 +2746,6 @@ plugin function as a JACK application.")
to be plugged into a wide range of audio synthesis and recording packages.")
(license license:lgpl2.1+)))
-(define-public lash
- (package
- (name "lash")
- (version "0.6.0-rc2")
- (source (origin
- (method url-fetch)
- ;; The tilde is not permitted in the builder name, but is used
- ;; in the tarball.
- (uri (string-append
- "mirror://savannah/lash/lash-"
- (string-join (string-split version #\-) "~")
- ".tar.bz2"))
- (file-name (string-append name "-" version ".tar.bz2"))
- (sha256
- (base32
- "12z1vx3krrzsfccpah9xjs68900xvr7bw92wx8np5871i2yv47iw"))))
- (build-system gnu-build-system)
- (arguments
- '(;; Glibc no longer includes Sun RPC support, so tell the build system
- ;; to use libtirpc instead.
- #:make-flags (list (string-append "CFLAGS=-I"
- (assoc-ref %build-inputs "libtirpc")
- "/include/tirpc -ltirpc"))
- #:phases
- (modify-phases %standard-phases
- ;; lashd embeds an ancient version of sigsegv so we just skip it
- (add-after 'unpack 'skip-lashd
- (lambda _
- (substitute* '("Makefile.am" "Makefile.in")
- (("lashd ") ""))
- #t)))
- #:configure-flags '("--disable-static")))
- (inputs
- `(("bdb" ,bdb)
- ("gtk" ,gtk+-2)
- ("jack" ,jack-1)
- ("libtirpc" ,libtirpc)
- ("readline" ,readline)
- ("python" ,python-2)))
- ;; According to pkg-config, packages depending on lash also need to have
- ;; at least the following packages declared as inputs.
- (propagated-inputs
- (list alsa-lib dbus libxml2))
- (native-inputs
- (list pkg-config))
- (home-page "https://www.nongnu.org/lash/")
- (synopsis "Audio application session manager")
- (description
- "LASH is a session management system for audio applications. It allows
-you to save and restore audio sessions consisting of multiple interconneced
-applications, restoring program state (i.e. loaded patches) and the
-connections between them.")
- (license license:gpl2+)))
-
(define-public libbs2b
(package
(name "libbs2b")
@@ -3313,15 +3258,15 @@ lv2-c++-tools.")
(define-public openal
(package
(name "openal")
- (version "1.20.1")
+ (version "1.22.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://openal-soft.org/openal-releases/openal-soft-"
version ".tar.bz2"))
(sha256
(base32
- "0vax0b1lgd4212bpxa1rciz52d4mv3dkfvcbbhzw4cjp698v1kmn"))))
+ "081xgkma2a19dscwx21xdpklh8gq399w4f1fx737qsx7rnawr55f"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no check target
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index fd8513f..0cc8def 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
-;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
@@ -382,39 +382,55 @@ setup against another one.")
(define-public python-locust
(package
(name "python-locust")
- (version "2.8.6")
+ (version "2.15.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "locust" version))
(sha256
(base32
- "1gn13j758j36knlcdyyyggn60rpw98iqdkvl3kjsz34brysic6q1"))))
+ "05cznfqda0yq2j351jjdssayvj5qc11xkbkwdvv81hcmz4xpyc56"))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'relax-requirements
+ (add-before 'check 'increase-resource-limits
(lambda _
- (substitute* "setup.py"
- (("setuptools_scm<=6.0.1")
- "setuptools_scm")
- (("Jinja2<3.1.0")
- "Jinja2"))))
+ ;; XXX: Copied from ungoogled-chromium.
+ ;; Try increasing the soft resource limit of max open files to 2048,
+ ;; or equal to the hard limit, whichever is lower.
+ (call-with-values (lambda () (getrlimit 'nofile))
+ (lambda (soft hard)
+ (when (and soft (< soft 2048))
+ (if hard
+ (setrlimit 'nofile (min hard 2048) hard)
+ (setrlimit 'nofile 2048 #f))
+ (format #t
+ "increased maximum number of open files from ~d to ~d~%"
+ soft (if hard (min hard 2048) 2048)))))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "python" "-m" "pytest" "locust"
"-k" (string-join
- '(;; These tests return "non-zero exit status 1".
+ '( ;; These tests return "non-zero exit status 1".
"not test_default_headless_spawn_options"
"not test_default_headless_spawn_options_with_shape"
"not test_headless_spawn_options_wo_run_time"
+ ;; These tests fail with a HTTP return code of
+ ;; 500 instead of 200, for unknown reasons.
+ "not test_autostart_mutliple_locustfiles_with_shape"
+ "not test_autostart_w_load_shape"
+ "not test_autostart_wo_run_time"
+ "not test_percentile_parameter"
;; These tests depend on networking.
"not test_html_report_option"
+ "not test_json_schema"
"not test_web_options"
- ;; This test fails because of the warning "System open
- ;; file limit '1024' is below minimum setting '10000'".
+ ;; These tests fail because of the warning
+ ;; "System open file limit '1024' is below
+ ;; minimum setting '10000'".
+ "not test_autostart_w_run_time"
"not test_skip_logging"
;; On some (slow?) machines, the following tests
;; fail, with the processes returning exit code
@@ -433,7 +449,6 @@ setup against another one.")
python-flask-cors
python-gevent
python-geventhttpclient
- python-jinja2
python-msgpack
python-psutil
python-pyzmq
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index c53d4dd..3417674 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -1007,7 +1007,7 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
(list
bash-minimal python perl clisp
;; Unicode data:
- ucd-next
+ ucd
;; Programs for the tests:
cppi indent git-minimal/pinned autoconf))
(home-page "https://www.gnu.org/software/gnulib/")
diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm
index b2f1661..b12aaf1 100644
--- a/gnu/packages/c.scm
+++ b/gnu/packages/c.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
-;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 David Dashyan <mail@davie.li>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@@ -1145,6 +1145,54 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
(home-page "https://microsoft.github.io/mimalloc/")
(license license:expat)))
+;;; The package is named orangeduck-mpc to differentiate it from GNU mpc.
+(define-public orangeduck-mpc
+ ;; The last release lacks an 'install' target.
+ (let ((commit "7c910e9303833c349f7432188ff77f2745254df2")
+ (revision "0"))
+ (package
+ (name "orangeduck-mpc")
+ (version (git-version "0.9.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/orangeduck/mpc")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "01a4vcxdnz0fbn90c9zc3jzklyqqvp9sfjpjwpq0f5r0l2pp37ad"))
+ (patches
+ (search-patches "orangeduck-mpc-fix-pkg-config.patch"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "PREFIX=" #$output))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-Makefile
+ (lambda _
+ (substitute* "Makefile"
+ ;; Do not attempt to alter the permissions,
+ ;; otherwise 'install' would error with
+ ;; "cannot stat [...] Permission denied"
+ ;; errors.
+ (("\\s\\-m[0-9]{3}\\s")
+ " "))))
+ (delete 'configure))))
+ (home-page "https://github.com/orangeduck/mpc")
+ (synopsis "Parser Combinator library for C ")
+ (description "@code{mpc} is a lightweight Parser Combinator library for C.
+@code{mpc} can help with tasks such as:
+@itemize
+@item Building a new programming language
+@item Building a new data format
+@item Parsing an existing programming language
+@item Parsing an existing data format
+@item Embedding a Domain Specific Language
+@item Implementing Greenspun's Tenth Rule.
+@end itemize")
+ (license license:bsd-2))))
+
;;; Factored out of the ck package so that it can be adjusted and called on
;;; the host side easily, without impacting the package definition.
(define (gnu-triplet->ck-machine target)
@@ -1317,20 +1365,21 @@ will take care of dispatching tasks to available cores.")
"0x9f7ivww8c7cigf4ck0hfx2bm79qgx6q4ccwzqbzkrmcrl9shfb"))))
(build-system cmake-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'build)
- (delete 'configure)
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (with-directory-excursion "test"
- (invoke "cmake" ".")
- (invoke "make")))))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (install-file "utf8.h" (string-append out "/include"))))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'build)
+ (delete 'configure)
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "test"
+ (invoke "cmake" ".")
+ (invoke "make")))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (install-file "utf8.h"
+ (string-append #$output "/include/utf8")))))))
(home-page "https://github.com/sheredom/utf8.h")
(synopsis "Single header UTF-8 string functions for C and C++")
(description "A simple one header solution to supporting UTF-8 strings in
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 32a8f23..cf42861 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -121,15 +121,15 @@ the <tz.h> library for handling time zones and leap seconds.")
(define-public libical
(package
(name "libical")
- (version "3.0.14")
+ (version "3.0.16")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/libical/libical/releases/download/v"
version "/libical-" version ".tar.gz"))
(sha256
(base32
- "13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122"))))
+ "0cqc1wpalxmxjx8dmcaga9w8kd5l7944hqmidz43hifaf7fhaixl"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; test suite appears broken
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index cfb2b6b..dcb90a6 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -113,6 +113,7 @@ caching facility provided by the library.")
(method url-fetch)
(uri (string-append "mirror://gnu/libcdio/libcdio-"
version ".tar.bz2"))
+ (patches (search-patches "libcdio-glibc-compat.patch"))
(sha256
(base32
"0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45"))))
diff --git a/gnu/packages/certs.scm b/gnu/packages/certs.scm
index b8dfe96..1228829 100644
--- a/gnu/packages/certs.scm
+++ b/gnu/packages/certs.scm
@@ -131,7 +131,7 @@ that was originally contributed to Debian.")
;; XXX We used to refer to the nss package here, but that eventually caused
;; module cycles. The below is a quick copy-paste job that must be kept in
;; sync manually. Surely there's a better way…?
- (version "3.81")
+ (version "3.85")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -142,7 +142,7 @@ that was originally contributed to Debian.")
"nss-" version ".tar.gz")))
(sha256
(base32
- "19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8"))
+ "15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index b54ca4f..990c6d5 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1586,13 +1586,13 @@ Python's @code{random.seed}.")
(define-public python-pytest-mock
(package
(name "python-pytest-mock")
- (version "3.6.1")
+ (version "3.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-mock" version))
(sha256
- (base32 "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0"))
+ (base32 "0kzdwwdjw001qzf1n4qzh7c364rvmb0cmkfqdwr2l9bwxy2v1ggv"))
(modules '((guix build utils)))
(snippet
;; Some tests do a string match on Pytest output, and fails when
@@ -1698,14 +1698,14 @@ result back.")
(define-public python-pytest-timeout
(package
(name "python-pytest-timeout")
- (version "2.0.2")
+ (version "2.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-timeout" version))
(sha256
(base32
- "04l1cd2qyp3fbccw95a8nqg682r647v7yil8807dgs7xv9a8pyg6"))))
+ "1nf339zg6qam3681f72j9c8fbqk8qcilna92psmzh4n60isa0z60"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
@@ -2058,14 +2058,14 @@ have failed since the last commit or what tests are currently failing.")))
(define-public python-coverage
(package
(name "python-coverage")
- (version "5.2.1")
+ (version "5.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "coverage" version))
(sha256
(base32
- "16z8i18msgs8k74n73dj9x49wzkl0vk4vq8k5pl1bsj70y7b4k53"))))
+ "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))
(build-system python-build-system)
(arguments
;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors.
diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
index a1b29a4..2f07235 100644
--- a/gnu/packages/crates-graphics.scm
+++ b/gnu/packages/crates-graphics.scm
@@ -38,6 +38,7 @@
#:use-module (gnu packages assembly)
#:use-module (gnu packages crates-io)
#:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages llvm)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
@@ -3103,20 +3104,22 @@ the platform-specific getters provided by winit, or another library.")
(define-public rust-x11-2
(package
(name "rust-x11")
- (version "2.18.2")
+ (version "2.20.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "x11" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0wz7l6dlbraa9zalh9i45v9wibvkir9m2m1sg0jnzcbcaj9d1v3p"))))
+ (base32 "10pbvmcyqm6j6zr4zk7znk8silmilihv8jxmbxbl1b0pkidqsqy2"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3))))
+ (propagated-inputs
+ (list mesa))
(home-page "https://github.com/erlepereira/x11-rs")
(synopsis "X11 library bindings for Rust")
(description "This crate provides X11 library bindings for Rust.")
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 6b1f537..9d06fc8 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12,12 +12,11 @@
;;; Copyright © 2020 André Batista <nandre@riseup.net>
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Antoine Côté <antoine.cote@posteo.net>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Antero Mejr <antero@kodmin.com>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 muradm <mail@muradm.net>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
@@ -31,6 +30,7 @@
;;; Copyright © 2022 ( <paren@disroot.org>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
+;;; Copyright © 2022 Paul Alesius <paul@unnservice.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -53,6 +53,7 @@
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
@@ -68,6 +69,7 @@
#:use-module (gnu packages databases)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
@@ -2678,6 +2680,50 @@ it outputs messages to Android's logcat.")
("rust-lazy-static" ,rust-lazy-static-1)
("rust-log" ,rust-log-0.4))))))
+(define-public rust-android-system-properties-0.1
+ (package
+ (name "rust-android-system-properties")
+ (version "0.1.5")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "android-system-properties" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "04b3wrz12837j7mdczqd95b732gw5q7q66cv4yn4646lvccp57l1"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2))))
+ (home-page "https://github.com/nical/android_system_properties")
+ (synopsis "Minimal Android system properties wrapper")
+ (description
+ "This package provides a minimal Android system properties wrapper.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-anes-0.1
+ (package
+ (name "rust-anes")
+ (version "0.1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "anes" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "16bj1ww1xkwzbckk32j2pnbn5vk6wgsl3q4p3j9551xbcarwnijb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ;FIXME: unresolved import anes::parser..?
+ #:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-libc" ,rust-libc-0.2))
+ #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1))))
+ (home-page "https://github.com/zrzka/anes-rs")
+ (synopsis "Parse ANSI escape sequences")
+ (description
+ "This package contains an ANSI escape sequences provider and parser.")
+ ;; The user can choose either license.
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-ansi-parser-0.6
(package
(name "rust-ansi-parser")
@@ -2893,14 +2939,14 @@ last place (ULPs) comparisons.")
(define-public rust-arbitrary-1
(package
(name "rust-arbitrary")
- (version "1.0.1")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "arbitrary" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "14a6r7q9b1kf1m7810p8bcl51q11mrwc5z7fjkz0lx6kdvyk0x13"))))
+ (base32 "106qgz0qxs202xlvjfyvw8dkb6ynr1ymmcclfh89l56mj2zpzm19"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -3712,17 +3758,17 @@ library for Rust.")
("rust-mime" ,rust-mime-0.3)
("rust-mime-guess" ,rust-mime-guess-2))))))
-(define-public rust-asn1-derive-0.8
+(define-public rust-asn1-derive-0.13
(package
(name "rust-asn1-derive")
- (version "0.8.7")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "asn1_derive" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "098w0mxz4bx9w7v72gsl5wva6f0qbvzyc52m0s0n8svqbyh4z2dw"))))
+ (version "0.13.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "asn1-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1bvqriazb23gysygpzng1dhzjgnlv274q2yj5gpmlpl7jp0pkaxz"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -3736,30 +3782,63 @@ library for Rust.")
"This package provides #[derive] support for @code{asn1}.")
(license license:bsd-3)))
-(define-public rust-asn1-0.8
+(define-public rust-asn1-derive-0.8
(package
- (name "rust-asn1")
+ (inherit rust-asn1-derive-0.13)
+ (name "rust-asn1-derive")
(version "0.8.7")
(source
(origin
(method url-fetch)
- (uri (crate-uri "asn1" version))
+ (uri (crate-uri "asn1_derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1caacmvgn463n1yc4ac6vl9phrh56ij7l3xgf6qgzbpyjm8v7zyg"))))
+ (base32 "098w0mxz4bx9w7v72gsl5wva6f0qbvzyc52m0s0n8svqbyh4z2dw"))))))
+
+(define-public rust-asn1-0.13
+ (package
+ (name "rust-asn1")
+ (version "0.13.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "asn1" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1idxxw14h3dvrj72k4g0hx1aqigd986a00cg0yxfw2gfc9gbmzra"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-asn1-derive" ,rust-asn1-derive-0.8)
+ (("rust-asn1-derive" ,rust-asn1-derive-0.13)
("rust-chrono" ,rust-chrono-0.4))
#:cargo-development-inputs
(("rust-libc" ,rust-libc-0.2))))
(home-page "https://github.com/alex/rust-asn1")
(synopsis "ASN.1 (DER) parser and writer")
(description
"This is a Rust library for parsing and generating ASN.1 data (DER only).")
(license license:bsd-3)))
+(define-public rust-asn1-0.8
+ (package
+ (inherit rust-asn1-0.13)
+ (name "rust-asn1")
+ (version "0.8.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "asn1" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1caacmvgn463n1yc4ac6vl9phrh56ij7l3xgf6qgzbpyjm8v7zyg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-asn1-derive" ,rust-asn1-derive-0.8)
+ ("rust-chrono" ,rust-chrono-0.4))
+ #:cargo-development-inputs
+ (("rust-libc" ,rust-libc-0.2))))))
+
(define-public rust-as-slice-0.1
(package
(name "rust-as-slice")
@@ -5654,8 +5733,42 @@ RFC4648 Base32 or in Crockford Base32.")
c6e7d37. However, this package works only up to 128 bytes.")
(license license:expat)))
+(define-public rust-base64-0.21
+ (package
+ (name "rust-base64")
+ (version "0.21.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "base64" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0sidjip5b33sr6w7kasfj9qxpbda41nw0x4gjjk55g55a6mdv954"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.4)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rstest" ,rust-rstest-0.15)
+ ("rust-rstest-reuse" ,rust-rstest-reuse-0.4)
+ ("rust-structopt" ,rust-structopt-0.3))
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ (substitute* "Cargo.toml"
+ (("0.12.0")
+ ,(package-version rust-rstest-0.15))
+ (("0.3.0")
+ ,(package-version rust-rstest-reuse-0.4))))))))
+ (home-page "https://github.com/marshallpierce/rust-base64")
+ (synopsis "Encodes and decodes base64 as bytes or utf8")
+ (description
+ "This package encodes and decodes base64 as bytes or utf8.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-base64-0.13
(package
+ (inherit rust-base64-0.21)
(name "rust-base64")
(version "0.13.0")
(source
@@ -5666,25 +5779,19 @@ c6e7d37. However, this package works only up to 128 bytes.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32 "1z82g23mbzjgijkpcrilc7nljpxpvpf7zxf6iyiapkgka2ngwkch"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-development-inputs
(("rust-criterion" ,rust-criterion-0.3)
("rust-rand" ,rust-rand-0.6)
("rust-structopt" ,rust-structopt-0.3))
#:phases
- (modify-phases %standard-phases
+ (modify-phases %standard-phases
(add-after 'unpack 'fix-criterion-minor-version
- (lambda* _
- (substitute* "Cargo.toml"
- (("0\\.3\\.2")
- ,(package-version rust-criterion-0.3))))))))
- (home-page "https://github.com/marshallpierce/rust-base64")
- (synopsis "Encodes and decodes base64 as bytes or utf8")
- (description
- "This package encodes and decodes base64 as bytes or utf8.")
- (license (list license:expat license:asl2.0))))
+ (lambda* _
+ (substitute* "Cargo.toml"
+ (("0\\.3\\.2")
+ ,(package-version rust-criterion-0.3))))))))))
(define-public rust-base64-0.12
(package
@@ -6068,42 +6175,54 @@ that uses Serde for transforming structs into bytes and vice versa!")
(("rust-serde-bytes" ,rust-serde-bytes-0.10)
("rust-serde-derive" ,rust-serde-derive-1))))))
-(define-public rust-bindgen-0.59
+(define-public rust-bindgen-0.64
(package
(name "rust-bindgen")
- (version "0.59.2")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "bindgen" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "1f4fpycxmbrqk8r2x9brhfgjh86mzc6bngn4a9631x78b2jaklib"))))
+ (version "0.64.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "bindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1d0zmfc5swjgaydbamxb4xm687ahgv18dbcpvrzbf39665h3w964"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-bitflags" ,rust-bitflags-1)
("rust-cexpr" ,rust-cexpr-0.6)
("rust-clang-sys" ,rust-clang-sys-1)
- ("rust-clap" ,rust-clap-2)
- ("rust-env-logger" ,rust-env-logger-0.9)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-lazycell" ,rust-lazycell-1)
("rust-log" ,rust-log-0.4)
("rust-peeking-take-while" ,rust-peeking-take-while-0.1)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-regex" ,rust-regex-1)
("rust-rustc-hash" ,rust-rustc-hash-1)
("rust-shlex" ,rust-shlex-1)
+ ("rust-syn" ,rust-syn-1)
("rust-which" ,rust-which-4))))
(home-page "https://rust-lang.github.io/rust-bindgen/")
(synopsis "Generate Rust FFI bindings to C and C++ libraries")
(description "This package can be used to automatically generate Rust FFI
bindings to C and C++ libraries.")
(license license:bsd-3)))
+(define-public rust-bindgen-0.59
+ (package
+ (inherit rust-bindgen-0.64)
+ (name "rust-bindgen")
+ (version "0.59.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "bindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1f4fpycxmbrqk8r2x9brhfgjh86mzc6bngn4a9631x78b2jaklib"))))))
+
(define-public rust-bindgen-0.58
(package
(inherit rust-bindgen-0.59)
@@ -8465,53 +8584,90 @@ of built-in fundamental numeric types.")
"This package provides a library for interaction with units of bytes.")
(license license:expat)))
+(define-public rust-bytecheck-0.6
+ (package
+ (name "rust-bytecheck")
+ (version "0.6.9")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "bytecheck" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0vs0a8p3bpaz3vc15zknqkd5ajgzgswf2bmd1mbwdbdm28naq76i"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-bytecheck-derive" ,rust-bytecheck-derive-0.6)
+ ("rust-ptr-meta" ,rust-ptr-meta-0.1)
+ ("rust-simdutf8" ,rust-simdutf8-0.1)
+ ("rust-uuid" ,rust-uuid-1))))
+ (home-page "https://github.com/rkyv/bytecheck")
+ (synopsis "Type validation framework")
+ (description "This package provides a type validation framework for
+Rust.")
+ (license license:expat)))
+
(define-public rust-bytecheck-0.5
(package
+ (inherit rust-bytecheck-0.6)
(name "rust-bytecheck")
(version "0.5.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "bytecheck" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0q11ap6nqj0rsc8ypwjh918916zlrcrzdgqm175gnpb2yn9axyh1"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-bytecheck-derive" ,rust-bytecheck-derive-0.5)
("rust-log" ,rust-log-0.4)
("rust-ptr-meta" ,rust-ptr-meta-0.1)
- ("rust-simdutf8" ,rust-simdutf8-0.1))))
+ ("rust-simdutf8" ,rust-simdutf8-0.1))))))
+
+(define-public rust-bytecheck-derive-0.6
+ (package
+ (name "rust-bytecheck-derive")
+ (version "0.6.9")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "bytecheck_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gxr63mi91rrjzfzcb8pfwsnarp9i2w1n168nc05aq4fx7mpdr8k"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
(home-page "https://github.com/rkyv/bytecheck")
- (synopsis "Type validation framework")
- (description "This package provides a type validation framework for
-Rust.")
+ (synopsis "Derive macro for bytecheck")
+ (description "This package provides a Derive macro for bytecheck, the type
+validation framework for Rust.")
(license license:expat)))
(define-public rust-bytecheck-derive-0.5
(package
+ (inherit rust-bytecheck-derive-0.6)
(name "rust-bytecheck-derive")
(version "0.5.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "bytecheck_derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "0grbkwwv5j91n7zrimci6fh4k79flxga3mkjg50jysnyraizi088"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
- (home-page "https://github.com/rkyv/bytecheck")
- (synopsis "Derive macro for bytecheck")
- (description "This package provides a Derive macro for bytecheck, the type
-validation framework for Rust.")
- (license license:expat)))
+ ("rust-syn" ,rust-syn-1))))))
(define-public rust-bytecount-0.6
(package
@@ -8585,42 +8741,19 @@ in a byte slice, fast.")
("rust-quickcheck" ,rust-quickcheck-0.6)
("rust-rand" ,rust-rand-0.4))))))
-(define-public rust-bytemuck-1.5
- (package
- (name "rust-bytemuck")
- (version "1.5.0")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "bytemuck" version))
- (file-name
- (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "18355qn3r9yp7ibg00r688sjx58g2qsjylwyq15w5b41b46asjss"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs
- (("rust-bytemuck-derive" ,rust-bytemuck-derive-1))))
- (home-page "https://github.com/Lokathor/bytemuck")
- (synopsis "Crate for mucking around with piles of bytes")
- (description
- "This package provides a crate for mucking around with piles of bytes.")
- (license license:zlib)))
-
(define-public rust-bytemuck-1
(package
(name "rust-bytemuck")
- (version "1.4.0")
+ (version "1.12.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "bytemuck" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "071043n73hwi55z9c55ga4v52v8a7ri56gqja8r98clkdyxns14j"))))
+ "0zwlaqkrp7r7bnl2n40x9ncpspb93d8xcckar61f54nal7csi8xa"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -8634,15 +8767,15 @@ in a byte slice, fast.")
(define-public rust-bytemuck-derive-1
(package
(name "rust-bytemuck-derive")
- (version "1.0.0")
+ (version "1.3.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "bytemuck-derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1k59b6g2d87nf32qwhp73vng3al0zklxg64iiwf0pkxy74xf5ni8"))))
+ "1d1j74dgq9b0wx73hvirsyzr3hmi7ip16bfvwc3q0bzic2wk7qjz"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -9312,19 +9445,19 @@ capabilities.")
("rust-error-chain" ,rust-error-chain-0.12)
("rust-libc" ,rust-libc-0.2))))))
-(define-public rust-cargo-0.53
+(define-public rust-cargo-0.60
(package
(name "rust-cargo")
- (version "0.53.0")
+ (version "0.60.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "cargo" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "12ns9v4dd8vnvsaqgd897h2zc19w00i5ii3slda653zbhfzm6zna"))))
+ "0xws4y7h4mmq8flnzsgf6fph2hx3rjgypyll4wzp15035ymly6dw"))))
(build-system cargo-build-system)
(arguments
`(;; The test suite is disabled as the internal 'cargo-test-macro' and
@@ -9335,14 +9468,15 @@ capabilities.")
("rust-atty" ,rust-atty-0.2)
("rust-bytesize" ,rust-bytesize-1)
("rust-cargo-platform" ,rust-cargo-platform-0.1)
+ ("rust-cargo-util" ,rust-cargo-util-0.1)
("rust-clap" ,rust-clap-2)
("rust-core-foundation" ,rust-core-foundation-0.9)
("rust-crates-io" ,rust-crates-io-0.33)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
("rust-crypto-hash" ,rust-crypto-hash-0.3)
("rust-curl" ,rust-curl-0.4)
("rust-curl-sys" ,rust-curl-sys-0.4)
- ("rust-env-logger" ,rust-env-logger-0.8)
+ ("rust-env-logger" ,rust-env-logger-0.9)
("rust-filetime" ,rust-filetime-0.2)
("rust-flate2" ,rust-flate2-1)
("rust-flate2" ,rust-flate2-1)
@@ -9364,22 +9498,23 @@ capabilities.")
("rust-memchr" ,rust-memchr-2)
("rust-miow" ,rust-miow-0.3)
("rust-num-cpus" ,rust-num-cpus-1)
- ("rust-opener" ,rust-opener-0.4)
+ ("rust-opener" ,rust-opener-0.5)
("rust-openssl" ,rust-openssl-0.10)
+ ("rust-os-info" ,rust-os-info-3)
("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
("rust-rand" ,rust-rand-0.8)
("rust-rustc-workspace-hack" ,rust-rustc-workspace-hack-1)
- ("rust-rustfix" ,rust-rustfix-0.5)
+ ("rust-rustfix" ,rust-rustfix-0.6)
("rust-same-file" ,rust-same-file-1)
("rust-semver" ,rust-semver-0.10)
("rust-serde" ,rust-serde-1)
("rust-serde-ignored" ,rust-serde-ignored-0.1)
("rust-serde-json" ,rust-serde-json-1)
("rust-shell-escape" ,rust-shell-escape-0.1)
+ ("rust-socket2" ,rust-socket2-0.4)
("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1)
("rust-tar" ,rust-tar-0.4)
- ("rust-tar" ,rust-tar-0.4)
("rust-tempfile" ,rust-tempfile-3)
("rust-termcolor" ,rust-termcolor-1)
("rust-toml" ,rust-toml-0.5)
@@ -9587,16 +9722,16 @@ optional dependency graph analysis.")
(define-public rust-cargo-platform-0.1
(package
(name "rust-cargo-platform")
- (version "0.1.1")
+ (version "0.1.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "cargo-platform" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1mzi60pf0z83qkzqp7jwd61xnqz2b5ydsj7rnnikbgyicd5989h2"))))
+ "09zsf76b9yr02jh17xq925xp1w824w2bwvb78fd0gpx5m1fq5nyb"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -9607,6 +9742,48 @@ optional dependency graph analysis.")
supported by Cargo.")
(license (list license:expat license:asl2.0))))
+(define-public rust-cargo-util-0.1
+ (package
+ (name "rust-cargo-util")
+ (version "0.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cargo-util" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1sz0gzcyp9ycb4zwj69qs9gd8kn9hv9nh2dq42c59x5xccqph755"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/rust-lang/cargo")
+ (synopsis "Utilities for Cargo")
+ (description "Miscellaneous support code used by Cargo.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-cargon-0.0
+ (package
+ (name "rust-cargon")
+ (version "0.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cargon" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-gcc" ,rust-gcc-0.3))))
+ (home-page "https://github.com/bryant/argon2rs")
+ (synopsis "Thin wrapper around the Argon2 C library")
+ (description
+ "This package provides a thin wrapper around the Argon2 C library. It is
+used in argon2rs' bench suite.")
+ (license license:wtfpl2)))
+
(define-public rust-cassowary-0.3
(package
(name "rust-cassowary")
@@ -9659,21 +9836,20 @@ box''.")
(package
(inherit rust-cast-0.3)
(name "rust-cast")
- (version "0.2.3")
+ (version "0.2.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "cast" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1c5z7zryj0zwnhdgs6rw5dfvnlwc1vm19jzrlgx5055alnwk952b"))))
+ "16p3bqi3qad1qdjgjc1r0x72iinj1aw2k8fw5zx2l51s52sdl92c"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-rustc-version" ,rust-rustc-version-0.2))
+ `(#:cargo-inputs
+ (("rust-rustc-version" ,rust-rustc-version-0.4))
#:cargo-development-inputs
(("rust-quickcheck" ,rust-quickcheck-0.9))))))
@@ -9702,15 +9878,15 @@ box''.")
(define-public rust-cc-1
(package
(name "rust-cc")
- (version "1.0.73")
+ (version "1.0.79")
(source
(origin
(method url-fetch)
(uri (crate-uri "cc" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "04ccylrjq94jssh8f7d7hxv64gs9f1m1jrsxb7wqgfxk4xljmzrg"))))
+ "07x93b8zbf3xc2dggdd460xlk1wg8lxm6yflwddxj8b15030klsh"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f
@@ -10161,31 +10337,34 @@ Encoding Standard.")
(define-public rust-chrono-0.4
(package
(name "rust-chrono")
- (version "0.4.19")
+ (version "0.4.24")
(source
(origin
(method url-fetch)
(uri (crate-uri "chrono" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0wyfl6c00vhfl562spnfcna3zkw8jqvcp652m9iskhl8j26dc2k7"))))
+ "0fv7idr8c7vdb0xi32w45a7pafnyzk7m0bknfggj5pva0qcmjg2f"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-js-sys" ,rust-js-sys-0.3)
- ("rust-libc" ,rust-libc-0.2)
+ (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-criterion" ,rust-criterion-0.4)
+ ("rust-iana-time-zone" ,rust-iana-time-zone-0.1)
+ ("rust-js-sys" ,rust-js-sys-0.3)
("rust-num-integer" ,rust-num-integer-0.1)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-pure-rust-locales" ,rust-pure-rust-locales-0.5)
+ ("rust-rkyv" ,rust-rkyv-0.7)
("rust-rustc-serialize" ,rust-rustc-serialize-0.3)
("rust-serde" ,rust-serde-1)
("rust-time" ,rust-time-0.1)
- ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2))
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))
#:cargo-development-inputs
- (("rust-bincode" ,rust-bincode-0.8)
- ("rust-criterion" ,rust-criterion-0.3)
+ (("rust-bincode" ,rust-bincode-1)
("rust-doc-comment" ,rust-doc-comment-0.3)
("rust-num-iter" ,rust-num-iter-0.1)
("rust-serde-derive" ,rust-serde-derive-1)
@@ -10328,6 +10507,75 @@ transfer coding.")
(sha256
(base32 "11yghnd24w0i9p8g368c3pg7qh9nfz7kgri6pywja9pnmakj13a9"))))))
+(define-public rust-ciborium-0.2
+ (package
+ (name "rust-ciborium")
+ (version "0.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "ciborium" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "13vqkm88kaq8nvxhaj6qsl0gsc16rqsin014fx5902y6iib3ghdh"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-ciborium-io" ,rust-ciborium-io-0.2)
+ ("rust-ciborium-ll" ,rust-ciborium-ll-0.2)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-hex" ,rust-hex-0.4)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rstest" ,rust-rstest-0.11)
+ ("rust-serde-bytes" ,rust-serde-bytes-0.11))))
+ (home-page "https://github.com/enarx/ciborium")
+ (synopsis "Serde implementation of CBOR")
+ (description
+ "This package provides CBOR serialization implementations for serde.")
+ (license license:asl2.0)))
+
+(define-public rust-ciborium-io-0.2
+ (package
+ (name "rust-ciborium-io")
+ (version "0.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "ciborium-io" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0sdkk7l7pqi2nsbm9c6g8im1gb1qdd83l25ja9xwhg07mx9yfv9l"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/enarx/ciborium")
+ (synopsis "Simplified Read/Write traits")
+ (description
+ "This package provides simplified Read/Write traits for @code{no_std}
+usage.")
+ (license license:asl2.0)))
+
+(define-public rust-ciborium-ll-0.2
+ (package
+ (name "rust-ciborium-ll")
+ (version "0.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "ciborium-ll" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "06ygqh33k3hp9r9mma43gf189b6cyq62clk65f4w1q54nni30c11"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs (("rust-hex" ,rust-hex-0.4))
+ #:cargo-inputs (("rust-ciborium-io" ,rust-ciborium-io-0.2)
+ ("rust-half" ,rust-half-1))))
+ (home-page "https://github.com/enarx/ciborium")
+ (synopsis "Low-level CBOR codec primitives")
+ (description
+ "This package provides low-level primitives for parsing the CBOR codec.")
+ (license license:asl2.0)))
+
(define-public rust-ci-info-0.3
(package
(name "rust-ci-info")
@@ -10776,28 +11024,45 @@ for programs written with Clap.")
with Clap to generate Fig completion scripts.")
(license (list license:expat license:asl2.0))))
-(define-public rust-clap-lex-0.2
+(define-public rust-clap-lex-0.3
(package
(name "rust-clap-lex")
- (version "0.2.4")
+ (version "0.3.0")
(source (origin
(method url-fetch)
- (uri (crate-uri "clap-lex" version))
+ (uri (crate-uri "clap_lex" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+ "1a4dzbnlxiamfsn0pnkhn7n9bdfjh66j9fxm6mmr7d227vvrhh8d"))))
(build-system cargo-build-system)
(arguments
- (list #:cargo-inputs
- `(("rust-os-str-bytes" ,rust-os-str-bytes-6))))
+ `(#:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
(home-page "https://github.com/clap-rs/clap/tree/master/clap_lex")
(synopsis "Command line parser for Clap")
(description
- "This package provides a parser for command line options. As opposed to a
-declarative parser, @code{rust-clap-lex} processes arguments as a stream of tokens.")
+ "This package provides a parser for command line options. As opposed
+to a declarative parser, @code{rust-clap-lex} processes arguments as a
+stream of tokens.")
+ ;; The user can choose either license.
(license (list license:expat license:asl2.0))))
+(define-public rust-clap-lex-0.2
+ (package
+ (inherit rust-clap-lex-0.3)
+ (name "rust-clap-lex")
+ (version "0.2.4")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "clap-lex" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
+ (build-system cargo-build-system)
+ (arguments
+ (list #:cargo-inputs `(("rust-os-str-bytes" ,rust-os-str-bytes-6))))))
+
(define-public rust-clearscreen-1
(package
(name "rust-clearscreen")
@@ -11291,21 +11556,28 @@ CMAKE environmental variable is set.")
(define-public rust-codespan-reporting-0.11
(package
(name "rust-codespan-reporting")
- (version "0.11.0")
+ (version "0.11.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "codespan-reporting" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "04wwbn2c5rcfz3zn4kj7nyvpj37hn5cxh0m8w1r3af4ak6w45kn6"))))
+ (base32 "0vkfay0aqk73d33kh79k1kqxx06ka22894xhqi89crnc6c6jff1m"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-serde" ,rust-serde-1)
("rust-termcolor" ,rust-termcolor-1)
- ("rust-unicode-width" ,rust-unicode-width-0.1))))
+ ("rust-unicode-width" ,rust-unicode-width-0.1))
+ #:cargo-development-inputs
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-insta" ,rust-insta-1)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-peg" ,rust-peg-0.6)
+ ("rust-rustyline" ,rust-rustyline-6)
+ ("rust-structopt" ,rust-structopt-0.3)
+ ("rust-unindent" ,rust-unindent-0.1))))
(home-page "https://github.com/brendanzab/codespan")
(synopsis "Beautiful diagnostic reporting for text-based programming languages")
(description
@@ -11469,17 +11741,18 @@ colors.")
(define-public rust-combine-4
(package
(name "rust-combine")
- (version "4.6.3")
+ (version "4.6.6")
(source
(origin
(method url-fetch)
(uri (crate-uri "combine" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0qihymj493vvs054gzpcmp4lzb098zrj2p9miv19yzvrrjm2gdsh"))))
+ (base32 "1m7s43cpi36vihmlda217xxgsdni3pbwgwfsa9zimdghhjfnxv9m"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
+ `(#:cargo-development-inputs
+ (("rust-partial-io" ,rust-partial-io-0.3))
#:cargo-inputs
(("rust-bytes" ,rust-bytes-1)
("rust-bytes" ,rust-bytes-0.5)
@@ -11491,7 +11764,7 @@ colors.")
("rust-tokio" ,rust-tokio-1)
("rust-tokio" ,rust-tokio-0.3)
("rust-tokio" ,rust-tokio-0.2)
- ("rust-tokio-util" ,rust-tokio-util-0.6))))
+ ("rust-tokio-util" ,rust-tokio-util-0.7))))
(home-page "https://github.com/Marwes/combine")
(synopsis "Parser combinators on arbitrary streams with zero-copy support")
(description
@@ -12312,26 +12585,42 @@ the browser's console.")
const functions with conditional compilations.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-const-oid-0.9
+ (package
+ (name "rust-const-oid")
+ (version "0.9.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "const-oid" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0fyxvwnl3x6bxhy08a3g4ryf8mky6wnhwd6ll4g6mjxgfnk1ihyf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t))
+ (home-page "https://github.com/RustCrypto/formats/tree/master/const-oid")
+ (synopsis "Implementation of the ISO/IEC Object Identifier (OID)")
+ (description
+ "This package is a const-friendly implementation of the ISO/IEC Object
+Identifier (OID) standard as defined in ITU X.660, with support for BER/DER
+encoding/decoding as well as heapless no_std (i.e., embedded) support.")
+ ;; The user can choose either license.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-const-oid-0.6
(package
+ (inherit rust-const-oid-0.9)
(name "rust-const-oid")
(version "0.6.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "const-oid" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "12vv7csqqjj0x1l5mf51lgqiw76k5c3mb1yzfhfcqysks2j2lvwx"))))
- (build-system cargo-build-system)
- (arguments `(#:skip-build? #t))
- (home-page "https://github.com/RustCrypto/formats/tree/master/const-oid")
- (synopsis "Implementation of the ISO/IEC Object Identifier (OID)")
- (description
- "This package is a const-friendly implementation of the ISO/IEC Object
-Identifier (OID) standard as defined in ITU X.660, with support for BER/DER
-encoding/decoding as well as heapless no_std (i.e., embedded) support.")
- (license (list license:asl2.0 license:expat))))
+ (arguments `(#:skip-build? #t))))
(define-public rust-const-random-0.1
(package
@@ -12494,8 +12783,42 @@ semantics than those provided by @code{as} or @code{From}/@code{Into}.")
(description "Convert strings into any case.")
(license license:expat)))
+(define-public rust-cookie-0.15
+ (package
+ (name "rust-cookie")
+ (version "0.15.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "cookie" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "03gql9c2l0wg3hpfp67wg2ns21wysk0xsjxwdbjrf0s6grrcgwfm"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-aes-gcm" ,rust-aes-gcm-0.8)
+ ("rust-base64" ,rust-base64-0.13)
+ ("rust-hkdf" ,rust-hkdf-0.10)
+ ("rust-hmac" ,rust-hmac-0.10)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-sha2" ,rust-sha2-0.9)
+ ("rust-subtle" ,rust-subtle-2)
+ ("rust-time" ,rust-time-0.2)
+ ("rust-version-check" ,rust-version-check-0.9))))
+ (home-page "https://github.com/SergioBenitez/cookie-rs")
+ (synopsis
+ "Crate for parsing HTTP cookie headers and managing a cookie jar")
+ (description
+ "Parse HTTP cookie headers and manage a cookie jar with this crate.
+It supports signed and private (encrypted + signed) jars.")
+ ;; The user can choose either license.
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-cookie-0.12
(package
+ (inherit rust-cookie-0.15)
(name "rust-cookie")
(version "0.12.0")
(source
@@ -12507,20 +12830,12 @@ semantics than those provided by @code{as} or @code{From}/@code{Into}.")
(sha256
(base32
"1mdvqixahcywvqp0y8k2skkgbpfhsp0w73l9mz93dcrx1gq091l8"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-base64" ,rust-base64-0.10)
("rust-ring" ,rust-ring-0.14)
("rust-time" ,rust-time-0.1)
- ("rust-url" ,rust-url-1))))
- (home-page "https://github.com/SergioBenitez/cookie-rs")
- (synopsis
- "Crate for parsing HTTP cookie headers and managing a cookie jar")
- (description
- "Parse HTTP cookie headers and manage a cookie jar with this crate.
-It supports signed and private (encrypted + signed) jars.")
- (license (list license:asl2.0 license:expat))))
+ ("rust-url" ,rust-url-1))))))
(define-public rust-cookie-0.11
(package
@@ -12640,36 +12955,6 @@ contents of the OS-level clipboard.")
numbers using the CORDIC method.")
(license license:bsd-3)))
-(define-public rust-cookie-0.15
- (package
- (name "rust-cookie")
- (version "0.15.1")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "cookie" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "03gql9c2l0wg3hpfp67wg2ns21wysk0xsjxwdbjrf0s6grrcgwfm"))))
- (build-system cargo-build-system)
- (arguments
- `(#:cargo-inputs
- (("rust-aes-gcm" ,rust-aes-gcm-0.8)
- ("rust-base64" ,rust-base64-0.13)
- ("rust-hkdf" ,rust-hkdf-0.10)
- ("rust-hmac" ,rust-hmac-0.10)
- ("rust-percent-encoding" ,rust-percent-encoding-2)
- ("rust-rand" ,rust-rand-0.8)
- ("rust-sha2" ,rust-sha2-0.9)
- ("rust-subtle" ,rust-subtle-2)
- ("rust-time" ,rust-time-0.2)
- ("rust-version-check" ,rust-version-check-0.9))))
- (home-page "https://github.com/SergioBenitez/cookie-rs")
- (synopsis "HTTP cookie parsing and cookie jar management")
- (description "This package provides HTTP cookie parsing and cookie jar
-management. It supports signed and private (encrypted, authenticated) jars.")
- (license (list license:expat license:asl2.0))))
-
(define-public rust-core2-0.3
(package
(name "rust-core2")
@@ -12912,14 +13197,14 @@ intrinsics.")
(define-public rust-core-foundation-sys-0.8
(package
(name "rust-core-foundation-sys")
- (version "0.8.2")
+ (version "0.8.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "core-foundation-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "06wq7yb7mlkc4h2kbc0yjfi0xv44z4snzdpr7c1l0zm4hi91n8pa"))))
+ (base32 "1p5r2wckarkpkyc4z83q08dwpvcafrb1h6fxfa3qnikh8szww9sq"))))
(build-system cargo-build-system)
(home-page "https://github.com/servo/core-foundation-rs")
(synopsis "Bindings to Core Foundation for macOS")
@@ -13234,16 +13519,16 @@ to the @code{is_x86_feature_detected!} macro.")
(define-public rust-crates-io-0.33
(package
(name "rust-crates-io")
- (version "0.33.0")
+ (version "0.33.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "crates-io" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "147mggf85fz77vsrzsvsxxwid4f4fg30zwfyirx7sl1k7y33hw91"))))
+ "0nmpzr697a6v12ljwpmjrhqpmkf784nsm8m1g6jwadmkq96p3mxj"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -13356,8 +13641,59 @@ final xor value. It has many built-in CRC functions.")
Rust.")
(license license:bsd-3)))
+(define-public rust-criterion-0.4
+ (package
+ (name "rust-criterion")
+ (version "0.4.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "criterion" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-anes" ,rust-anes-0.1)
+ ("rust-async-std" ,rust-async-std-1)
+ ("rust-atty" ,rust-atty-0.2)
+ ("rust-cast" ,rust-cast-0.3)
+ ("rust-ciborium" ,rust-ciborium-0.2)
+ ("rust-clap" ,rust-clap-3)
+ ("rust-criterion-plot" ,rust-criterion-plot-0.5)
+ ("rust-csv" ,rust-csv-1)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-itertools" ,rust-itertools-0.10)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-oorandom" ,rust-oorandom-11.1)
+ ("rust-plotters" ,rust-plotters-0.3)
+ ("rust-rayon" ,rust-rayon-1)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-derive" ,rust-serde-derive-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-smol" ,rust-smol-1)
+ ("rust-tinytemplate" ,rust-tinytemplate-1)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-walkdir" ,rust-walkdir-2))
+ #:cargo-development-inputs
+ (("rust-approx" ,rust-approx-0.5)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-quickcheck" ,rust-quickcheck-1)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-tempfile" ,rust-tempfile-3))))
+ (home-page "https://bheisler.github.io/criterion.rs/book/index.html")
+ (synopsis "Statistics-driven micro-benchmarking library")
+ (description
+ "This package provides a statistics-driven micro-benchmarking library.")
+ ;; The user can choose either license.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-criterion-0.3
(package
+ (inherit rust-criterion-0.4)
(name "rust-criterion")
(version "0.3.5")
(source
@@ -13368,7 +13704,6 @@ Rust.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32 "044d2x7cxfvw2g558lzyllcv7jcdkw9xmacmb0nzx8pv4pyxl10n"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-async-std" ,rust-async-std-1)
@@ -13398,12 +13733,7 @@ Rust.")
("rust-futures" ,rust-futures-0.3)
("rust-quickcheck" ,rust-quickcheck-1)
("rust-rand" ,rust-rand-0.8)
- ("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://bheisler.github.io/criterion.rs/book/index.html")
- (synopsis "Statistics-driven micro-benchmarking library")
- (description
- "This package provides a statistics-driven micro-benchmarking library.")
- (license (list license:asl2.0 license:expat))))
+ ("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-criterion-0.2
(package
@@ -13468,8 +13798,35 @@ Rust.")
criterion.")
(license (list license:expat license:asl2.0))))
+(define-public rust-criterion-plot-0.5
+ (package
+ (name "rust-criterion-plot")
+ (version "0.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "criterion-plot" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1c866xkjqqhzg4cjvg01f8w6xc1j3j7s58rdksl52skq89iq4l3b"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-itertool-num" ,rust-itertools-num-0.1)
+ ("rust-num-complex" ,rust-num-complex-0.4)
+ ("rust-rand" ,rust-rand-0.8))
+ #:cargo-inputs
+ (("rust-cast" ,rust-cast-0.3)
+ ("rust-itertools" ,rust-itertools-0.10))))
+ (home-page "https://github.com/bheisler/criterion.rs")
+ (synopsis "Criterion's plotting library")
+ (description "This package provides criterion's plotting library.")
+ ;; The user can choose either license.
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-criterion-plot-0.4
(package
+ (inherit rust-criterion-plot-0.5)
(name "rust-criterion-plot")
(version "0.4.4")
(source
@@ -13480,19 +13837,14 @@ criterion.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32 "0mys2zkizh5az6ax77m5aqifk0vz35rn0a6wykvmjx9gkzg9c2fh"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cast" ,rust-cast-0.2)
("rust-itertools" ,rust-itertools-0.10))
#:cargo-development-inputs
(("rust-itertools-num" ,rust-itertools-num-0.1)
("rust-num-complex" ,rust-num-complex-0.2)
- ("rust-rand" ,rust-rand-0.4))))
- (home-page "https://github.com/bheisler/criterion.rs")
- (synopsis "Criterion's plotting library")
- (description "This package provides criterion's plotting library.")
- (license (list license:expat license:asl2.0))))
+ ("rust-rand" ,rust-rand-0.4))))))
(define-public rust-criterion-plot-0.3
(package
@@ -13521,14 +13873,14 @@ criterion.")
(define-public rust-critical-section-1
(package
(name "rust-critical-section")
- (version "1.1.0")
+ (version "1.1.1")
(source (origin
(method url-fetch)
(uri (crate-uri "critical-section" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "06p0j7yy289six3k7j3m3f1phk9n7h9x2cd8fjfbw6fhh4aaaayh"))))
+ "0ljyfwzl8avwsr42kqmg7mmcw01d5rn1m8gnw48y2j95bnns0j35"))))
(build-system cargo-build-system)
(home-page "https://github.com/rust-embedded/critical-section")
(synopsis "Critical section abstraction")
@@ -13562,24 +13914,25 @@ criterion.")
(define-public rust-crossbeam-0.8
(package
(name "rust-crossbeam")
- (version "0.8.0")
+ (version "0.8.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "103xnwzkk1zd9kiy6f0f131ap433qfkc757wyrha5bxa7pmsc0gx"))))
+ (base32 "0b0s0ans81ja6gm7awlaw3k2rqywzmhq4mm9ra8yaak16q6sy098"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9)
("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3)
- ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))))
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.8))))
(home-page "https://github.com/crossbeam-rs/crossbeam")
(synopsis "Tools for concurrent programming in Rust")
(description "This package provides tools for concurrent programming.")
@@ -13639,16 +13992,16 @@ message passing.")
(package
(inherit rust-crossbeam-channel-0.5)
(name "rust-crossbeam-channel")
- (version "0.4.2")
+ (version "0.4.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam-channel" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0qd05n5bcwafkmbzq1lspwrfi29xnzlw46qarg1sl0lwj68qdvfc"))))
+ "11zvmp8p94vaqp4xyhzymw8xndnpwq12x5qgvxkway7lprygwlxi"))))
(arguments
`(#:cargo-inputs
(("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7)
@@ -13683,18 +14036,17 @@ message passing.")
(define-public rust-crossbeam-deque-0.8
(package
(name "rust-crossbeam-deque")
- (version "0.8.0")
+ (version "0.8.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam-deque" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1ad995vzq74k7jd1pgn9zxbacyzj9ii6l0svhlb2dxzy8vxnxbwl"))))
+ (base32 "1z6ifz35lyk0mw818xcl3brgss2k8islhgdmfk9s5fwjnr982pki"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))))
@@ -13708,16 +14060,16 @@ message passing.")
(package
(inherit rust-crossbeam-deque-0.8)
(name "rust-crossbeam-deque")
- (version "0.7.3")
+ (version "0.7.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam-deque" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "11c2c0x5grdba3ah3g94yn6b8s47xi8qwm85h8hq5vmf9nbsy0lz"))))
+ "1v99xcdjk4zixvxnq7pssip670mlyhw1ma3qc88ca11jxnfz43y2"))))
(arguments
`(#:cargo-inputs
(("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.8)
@@ -13729,24 +14081,26 @@ message passing.")
(define-public rust-crossbeam-epoch-0.9
(package
(name "rust-crossbeam-epoch")
- (version "0.9.1")
+ (version "0.9.13")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam-epoch" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "17anyfg5azjpmcfidq6wn4phj9h0a0zqcxksi33w44akz4wsgam1"))))
+ (base32 "0nlxkmx3q93jvsshnmwaiich6bf7ddq1jzhzmaw4pxrf9hgsza81"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-cfg-if" ,rust-cfg-if-1)
- ("rust-const-fn" ,rust-const-fn-0.4)
+ `(#:cargo-inputs
+ (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-cfg-if" ,rust-cfg-if-1)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
- ("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-memoffset" ,rust-memoffset-0.6)
- ("rust-scopeguard" ,rust-scopeguard-1))))
+ ("rust-loom" ,rust-loom-0.5)
+ ("rust-memoffset" ,rust-memoffset-0.7)
+ ("rust-scopeguard" ,rust-scopeguard-1))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.8)
+ ("rust-rustversion" ,rust-rustversion-1))))
(home-page
"https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch")
(synopsis "Epoch-based garbage collection")
@@ -13782,19 +14136,21 @@ message passing.")
(define-public rust-crossbeam-queue-0.3
(package
(name "rust-crossbeam-queue")
- (version "0.3.6")
+ (version "0.3.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam-queue" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "19ram1wp87i57w834hwl95mzz9g53qlzkraq6lvab629n21jbm0w"))))
+ (base32 "1p9s6n4ckwdgxkb7a8ay9zjzmgc8ppfbxix2vr07rwskibmb7kyi"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
- ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))))
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.6))))
(home-page
"https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
(synopsis "Concurrent queues in Rust")
@@ -13846,20 +14202,22 @@ message passing.")
(define-public rust-crossbeam-utils-0.8
(package
(name "rust-crossbeam-utils")
- (version "0.8.11")
+ (version "0.8.14")
(source
(origin
(method url-fetch)
(uri (crate-uri "crossbeam-utils" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1g426qw2j7czkbg0vw6mzifhgy1ng4qgpp2sn4vlamkvvi57v22i"))))
+ (base32 "17wjbnlj4whbdvc1syk2gfy8maqx01sg2hmqpdnjh9l7g7x6ddsg"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-cfg-if" ,rust-cfg-if-1)
- ("rust-loom" ,rust-loom-0.5)
- ("rust-once-cell" ,rust-once-cell-1))))
+ ("rust-loom" ,rust-loom-0.5))
+ #:cargo-development-inputs
+ (("rust-rand" ,rust-rand-0.8)
+ ("rust-rustversion" ,rust-rustversion-1))))
(home-page
"https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils")
(synopsis "Utilities for concurrent programming")
@@ -14194,24 +14552,26 @@ using const generics.")
(define-public rust-crypto-common-0.1
(package
(name "rust-crypto-common")
- (version "0.1.1")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "crypto-common" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "1l4q4ync13i056vjc775v0za8qh987da7yvrjj25q909cd9nngb8"))))
+ (version "0.1.6")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "crypto-common" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1cvby95a6xg7kxdz5ln3rl9xh66nz66w46mm3g56ri1z5x815yqv"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build?
- #t
- #:cargo-inputs
- (("rust-generic-array" ,rust-generic-array-0.14)
- ("rust-rand-core" ,rust-rand-core-0.6))))
+ `(#:cargo-inputs
+ (("rust-generic-array" ,rust-generic-array-0.14)
+ ("rust-rand-core" ,rust-rand-core-0.6)
+ ("rust-typenum" ,rust-typenum-1))))
(home-page "https://github.com/RustCrypto/traits")
(synopsis "Common cryptographic traits")
- (description "Common cryptographic traits")
+ (description
+ "This package contains a collection of traits which describe functionality
+of cryptographic primitives.")
+ ;; The user can choose either license.
(license (list license:expat license:asl2.0))))
(define-public rust-crypto-mac-0.11
@@ -14867,14 +15227,14 @@ use with bindgen.")
(define-public rust-curl-0.4
(package
(name "rust-curl")
- (version "0.4.34")
+ (version "0.4.43")
(source
(origin
(method url-fetch)
(uri (crate-uri "curl" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0vkm6fyizf8m9yxpv3n5pm9ag3bwlyqa6nz2ga8qkzm5y4m1cs72"))))
+ (base32 "07v5s3qafyl9gnnlzbddgg5fzy41gncy00ahbbv46nr0xyp5bn1p"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #false ;require internet access
@@ -14904,15 +15264,15 @@ requests")
(define-public rust-curl-sys-0.4
(package
(name "rust-curl-sys")
- (version "0.4.44+curl-7.77.0")
+ (version "0.4.53+curl-7.82.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "curl-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1wds1gi15fja0i8gjfgk0a6c17ljsv17jvlngh8ky69b6blqavab"))
+ "0lh398vd34c55afyw5csbxqmnp7caxgpgci3y89c60lmb9d914l0"))
(modules '((guix build utils)))
(snippet
'(begin (delete-file-recursively "curl") #t))))
@@ -15003,16 +15363,16 @@ attributes.")
(define-public rust-cxx-1
(package
(name "rust-cxx")
- (version "1.0.49")
+ (version "1.0.86")
(source
(origin
(method url-fetch)
(uri (crate-uri "cxx" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0xj29zzd45bkk797902h22kppzmrzm7v9a2wijfiqr964vhrldk5"))))
+ "0yc5gz723hiwqk7waygj63655fh5vzq3551p1j2wyzc06xf0glai"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Cannot compile cxx-test-suite.
@@ -15063,16 +15423,16 @@ attributes.")
(define-public rust-cxx-build-1
(package
(name "rust-cxx-build")
- (version "1.0.49")
+ (version "1.0.86")
(source
(origin
(method url-fetch)
(uri (crate-uri "cxx-build" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0shmkgv3cnh06ws1p555znj1hh23phynaz73rgnz95gradsdwnwg"))))
+ "0w5a2wdkdh44gmi0psynaazx4j7d1947sr7nyaccayxjc4gjhi2h"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -15084,7 +15444,8 @@ attributes.")
("rust-scratch" ,rust-scratch-1)
("rust-syn" ,rust-syn-1))
#:cargo-development-inputs
- (("rust-cxx-gen" ,rust-cxx-gen-0.7)
+ (("rust-cxx" ,rust-cxx-1)
+ ("rust-cxx-gen" ,rust-cxx-gen-0.7)
("rust-pkg-config" ,rust-pkg-config-0.3))))
(home-page "https://cxx.rs")
(synopsis "C++ code generator")
@@ -15123,21 +15484,20 @@ crate into a Cargo build.")
(define-public rust-cxx-gen-0.7
(package
(name "rust-cxx-gen")
- (version "0.7.49")
+ (version "0.7.86")
(source
(origin
(method url-fetch)
(uri (crate-uri "cxx-gen" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "08v366jxd2vc8jc2cbvrga0866pwfcaq6hl8yylfx0vhs2n53j53"))))
+ "1z08a3c4xpnz91a4nc2b4f2kbmadjrrimr8awx1k4g0rmjdmq5mr"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-cc" ,rust-cc-1)
- ("rust-codespan-reporting" ,rust-codespan-reporting-0.11)
+ (("rust-codespan-reporting" ,rust-codespan-reporting-0.11)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
@@ -15193,16 +15553,16 @@ crate into higher level tools.")
(define-public rust-cxxbridge-flags-1
(package
(name "rust-cxxbridge-flags")
- (version "1.0.49")
+ (version "1.0.86")
(source
(origin
(method url-fetch)
(uri (crate-uri "cxxbridge-flags" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "18cv8a8sgyiwfqspdyfq18jizf0rlhg90ibdl0zp8jhcv498s6gr"))))
+ "073qx3gnf8df9xzfy9xfcz9b79m0638x4a0isfq2fb527g4hpdb1"))))
(build-system cargo-build-system)
(home-page "https://github.com/dtolnay/cxx")
(synopsis "Compiler configuration of the `cxx` crate")
@@ -15228,16 +15588,16 @@ crate (implementation detail).")
(define-public rust-cxxbridge-macro-1
(package
(name "rust-cxxbridge-macro")
- (version "1.0.49")
+ (version "1.0.86")
(source
(origin
(method url-fetch)
(uri (crate-uri "cxxbridge-macro" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0gkwvihw74dh8p3fz3552wnxanrpwmwfy38ylz2z8knjq0y8y4v3"))))
+ "19c7pjvjll72yb9wyrmpdylwqglizn8kayww8qcm24b2gvd1zrir"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -15725,16 +16085,16 @@ hexadecimal, base32, and base64.")
(define-public rust-data-url-0.1
(package
(name "rust-data-url")
- (version "0.1.0")
+ (version "0.1.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "data-url" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "176wa1n8h71iwyaxhar4sqwrgrvb5sxk26az0fy88vnxrsffjgyk"))))
+ "14z15yiyklp5dv0k0q6pd83irrn0y8hj9y3fj17akkrbf37byc1s"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -15965,16 +16325,16 @@ verifying the contents.")
(define-public rust-decimal-2
(package
(name "rust-decimal")
- (version "2.0.4")
+ (version "2.1.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "decimal" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1vb3i8vg1dxrw3kzbfiag3gg7rdjd73z80mwbwkq60vnphiqfig6"))))
+ "0k8ij9brz6kdk7j4hq916s85qrplpy3ixs9v9h1ibsxsj5zbg2js"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -16400,14 +16760,14 @@ Rust.")
(define-public rust-derive-arbitrary-1
(package
(name "rust-derive-arbitrary")
- (version "1.0.1")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "derive_arbitrary" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0nig0iydva7a9h9i9qyi6an9w5qjafmn3qlzvdqqiw0x2kp824jz"))))
+ (base32 "0zw12jc6k6aixqs6m2rsj56grhx2xjw2l8rhr8rj1wj897qdy0s9"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -18065,17 +18425,16 @@ Rust.")
(define-public rust-dtoa-0.4
(package
(name "rust-dtoa")
- (version "0.4.4")
+ (version "0.4.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "dtoa" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0phbm7i0dpn44gzi07683zxaicjap5064w62pidci4fhhciv8mza"))))
+ "1c5j0wz118dhrczx6spc5za7dnbfxablr4adyahg9aknrsc9i2an"))))
(build-system cargo-build-system)
- (arguments '(#:skip-build? #t))
(home-page "https://github.com/dtolnay/dtoa")
(synopsis "Fast functions for printing floating-point primitives")
(description "This crate provides fast functions for printing
@@ -18086,22 +18445,22 @@ floating-point primitives to an @code{io::Write}.")
(define-public rust-dtoa-short-0.3
(package
(name "rust-dtoa-short")
- (version "0.3.2")
+ (version "0.3.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "dtoa-short" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1wkn7ziqffq8hj0a411lgn7674ackzdk734ikp230rmp2f2hn0jr"))))
+ "1mh22nwja3v8922h0hq77c29k1da634lvkn9cvg9xrqhmqlk7q5x"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-dtoa" ,rust-dtoa-0.4))
#:cargo-development-inputs
- (("rust-float-cmp" ,rust-float-cmp-0.3))))
+ (("rust-float-cmp" ,rust-float-cmp-0.4))))
(home-page "https://github.com/upsuper/dtoa-short")
(synopsis "Serialize float number and truncate to certain precision")
(description
@@ -18462,20 +18821,20 @@ signing, and verification in pure Rust.")
(define-public rust-either-1
(package
(name "rust-either")
- (version "1.6.1")
+ (version "1.8.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "either" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0mwl9vngqf5jvrhmhn9x60kr5hivxyjxbmby2pybncxfqhf4z3g7"))))
+ "15z70yaivlkpx27vzv99ibf8d2x5jp24yn69y0xi20w86v4c3rch"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rust-serde" ,rust-serde-1))))
+ `(#:cargo-inputs (("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://github.com/bluss/either")
(synopsis
"Enum @code{Either} with variants @code{Left} and @code{Right}")
@@ -19022,16 +19381,16 @@ encodings.")
(define-public rust-encoding-rs-0.8
(package
(name "rust-encoding-rs")
- (version "0.8.28")
+ (version "0.8.31")
(source
(origin
(method url-fetch)
(uri (crate-uri "encoding_rs" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0rf0r99q4kgjrx22kx7pjyjg4lm21599y3ggvy3hzj2spi7h5pw0"))))
+ "0azc6rblf75vd862ymjahdfch27j1sshb7zynshrx7ywi5an6llq"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -19574,25 +19933,26 @@ deserialized from environment variables.")
(define-public rust-erased-serde-0.3
(package
(name "rust-erased-serde")
- (version "0.3.11")
+ (version "0.3.24")
(source
(origin
(method url-fetch)
(uri (crate-uri "erased-serde" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1lgkpkk7nx6f24gmr3psyj8d2avc9701r9jyw1i4ssp10lbnv2yq"))))
+ "0zdaj96bf39h75rkdxkd1znik97s3j7m8ppgbxxfq5y0h59n1jp4"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (;("rust-serde-cbor" ,rust-serde-cbor-0.9)
+ (("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde-cbor" ,rust-serde-cbor-0.11)
("rust-serde-derive" ,rust-serde-derive-1)
- ("rust-serde-json" ,rust-serde-json-1))))
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-trybuild" ,rust-trybuild-1))))
(home-page "https://github.com/dtolnay/erased-serde")
(synopsis "Type-erased Serialize and Serializer traits")
(description
@@ -20110,20 +20470,28 @@ traits but without the boilerplate.")
(define-public rust-eyre-0.6
(package
(name "rust-eyre")
- (version "0.6.6")
- (source
- (origin
- (method url-fetch)
- (uri (crate-uri "eyre" version))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32 "1f0fbmrcykp84av1yb1d4cqj28jwf0zg1z49a1cgw8vrcf7ms8mw"))))
+ (version "0.6.8")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "eyre" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1sy7x8p74jfx1mvj4ifl0lxkxaqvmswdgdr84y1dqb6055d6nasc"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-indenter" ,rust-indenter-0.3)
- ("rust-once-cell" ,rust-once-cell-1))))
+ `(#:cargo-inputs (("rust-indenter" ,rust-indenter-0.3)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-pyo3" ,rust-pyo3-0.13))
+ #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-backtrace" ,rust-backtrace-0.3)
+ ("rust-futures" ,rust-futures-0.3)
+ ("rust-pyo3" ,rust-pyo3-0.13)
+ ("rust-rustversion" ,rust-rustversion-1)
+ ("rust-syn" ,rust-syn-1)
+ ("rust-thiserror" ,rust-thiserror-1)
+ ("rust-trybuild" ,rust-trybuild-1))))
+ (native-inputs (list python))
(home-page "https://github.com/yaahc/eyre")
(synopsis "Trait object based error handling type")
(description
@@ -22077,16 +22445,16 @@ stabilized, and eventually removed. This library reïnstates these traits.")
(define-public rust-futf-0.1
(package
(name "rust-futf")
- (version "0.1.4")
+ (version "0.1.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "futf" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0fxc18bnabird5jl941nsd6d25vq8cn8barmz4d30dlkzbiir73w"))))
+ "0hvqk2r7v4fnc34hvc3vkri89gn52d5m9ihygmwn75l1hhp0whnz"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -22101,16 +22469,16 @@ stabilized, and eventually removed. This library reïnstates these traits.")
(define-public rust-futures-0.3
(package
(name "rust-futures")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0l7i1hcag46k5v34cbn5dk45gwxn5yy5rxcvmbaxhi02lnhm546s"))))
+ "115z5bqihd2jq75s8n7jxy4k83kpv67vhic4snch6d7h1wmpkqhk"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -22153,16 +22521,16 @@ featuring zero allocations, composability, and iterator-like interfaces.")
(define-public rust-futures-channel-0.3
(package
(name "rust-futures-channel")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-channel" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0ihq3a3yc6ial3sw536q75hrhixq22xk6wn5qzpnxazgqxz1plzj"))))
+ "1xadcvj4hi6278hq6i0vnrsa231fyiylh2n03rx7d2ch79k1flrf"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -22204,18 +22572,21 @@ featuring zero allocations, composability, and iterator-like interfaces.")
(define-public rust-futures-core-0.3
(package
(name "rust-futures-core")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-core" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0r8ag0mkxx9cd74yrccjk31lph4gr6lhgb9di6rx39wdvrfi9rbr"))))
+ "02467z5mv0219hkrgmpvsb3h7vb8pg31s1j901h7vxg11x6zz47c"))))
(build-system cargo-build-system)
- (arguments '(#:skip-build? #t))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-portable-atomic" ,rust-portable-atomic-1))))
(home-page "https://rust-lang.github.io/futures-rs")
(synopsis "Core traits and types in for the @code{futures} library")
(description "This package provides the core traits and types in for the
@@ -22271,16 +22642,16 @@ the computation on the threads themselves.")
(define-public rust-futures-executor-0.3
(package
(name "rust-futures-executor")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-executor" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1ffr1zclhz60ql49n2pj44jhhk22yah41xwlpyb30jws03f9zrg9"))))
+ "03mm37yv235i2ifjfaacw5cl8cmiyirj8ap3d64fr5xblqshmpp8"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -22356,16 +22727,16 @@ intrusive collections.")
(define-public rust-futures-io-0.3
(package
(name "rust-futures-io")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-io" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0005hz30pdxlbdamhd0imixmxcjpwrfxxr27kljxh6i84lshbgi8"))))
+ "0cc5s3qdgls25rlm3zpdf9fdk6gwmfp0fiiph39b5bmjdwdkgf5z"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://rust-lang.github.io/futures-rs")
@@ -22478,20 +22849,19 @@ and removes almost all unsafe code from it.")
(define-public rust-futures-macro-0.3
(package
(name "rust-futures-macro")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-macro" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1pgyb219ybh3fj3ig0h1c2b7k4cqldy95ifdpnd9yb9jvmdd51y2"))))
+ (base32 "0w3ahy69varlfw57rb2pag7jwngy771vvzmcag7mlfx3gpw3m9wm"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
- ("rust-proc-macro2" ,rust-proc-macro2-1)
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
("rust-syn" ,rust-syn-1))))
(home-page "https://rust-lang.github.io/futures-rs")
@@ -22565,16 +22935,16 @@ different @code{Future}s at once and handling the first one to complete.")
(define-public rust-futures-sink-0.3
(package
(name "rust-futures-sink")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-sink" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1mj22d4w6digh7wfp6jkr5fdcl9r138q41fxzm1yg8mx568cdxfa"))))
+ "0r43djzf0caz89c724ishpzxy59y6nw7ykfvh1nd9kz8nc5q447k"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://rust-lang.github.io/futures-rs")
@@ -22610,44 +22980,46 @@ futures-rs library.")
(define-public rust-futures-task-0.3
(package
(name "rust-futures-task")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-task" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "11ldlpl7mis5crys731dj7s7npgigdgrzdm7mi2y86m8ivmhgphk"))))
+ (base32 "0rk3jg6lri1rrn03ns89cmw8lircbaf2i2d4mr10zc8hyqdrmxyw"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs (("rust-once-cell" ,rust-once-cell-1))))
+ `(#:skip-build? #t))
(home-page "https://rust-lang.github.io/futures-rs")
(synopsis "Tools for working with tasks")
(description "This package provides tools for working with tasks.")
(license (list license:expat license:asl2.0))))
(define-public rust-futures-test-0.3
(package
(name "rust-futures-test")
- (version "0.3.5")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-test" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0v9r2mmgdbm0x4gppd5jzf4rss7439ivkqwi604m0r2il3zap6ci"))))
+ "0pbdzvbmzrnc67bpp7hbh7l5mavqifpgk2vhaprr0vlr6qrpcyi4"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:tests? #f ; Doc tests fail.
+ #:cargo-inputs
(("rust-futures-core" ,rust-futures-core-0.3)
("rust-futures-executor" ,rust-futures-executor-0.3)
("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-futures-macro" ,rust-futures-macro-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
("rust-futures-task" ,rust-futures-task-0.3)
("rust-futures-util" ,rust-futures-util-0.3)
- ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-pin-project" ,rust-pin-project-1)
("rust-pin-utils" ,rust-pin-utils-0.1))))
(home-page "https://rust-lang.github.io/futures-rs")
(synopsis "Test components built off futures-rs")
@@ -22734,15 +23106,15 @@ timeouts and delays with futures.")
(define-public rust-futures-util-0.3
(package
(name "rust-futures-util")
- (version "0.3.12")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "futures-util" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0jv25s07igmqavigdfzr02yw6j1q0vg8pw2p2vmgvcx4yb88qak3"))))
+ (base32 "1lbvdf6hq62yczd87glm6ih8h5qkagsl7xdiwhmqvwzymkins7cw"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -22757,8 +23129,6 @@ timeouts and delays with futures.")
("rust-memchr" ,rust-memchr-2)
("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
("rust-pin-utils" ,rust-pin-utils-0.1)
- ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
- ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1)
("rust-slab" ,rust-slab-0.4)
("rust-tokio-io" ,rust-tokio-io-0.1))))
(home-page "https://rust-lang.github.io/futures-rs")
@@ -23996,7 +24366,7 @@ libcurl, which is intended to be used with the @code{git2} crate.")
`(#:skip-build? #t
#:cargo-inputs
(("rust-approx" ,rust-approx-0.5)
- ("rust-bytemuck" ,rust-bytemuck-1.5)
+ ("rust-bytemuck" ,rust-bytemuck-1)
("rust-mint" ,rust-mint-0.5)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.8)
@@ -24024,7 +24394,7 @@ graphics.")
`(#:skip-build? #t ; TODO: we need a more recent criterion
#:cargo-inputs
(("rust-approx" ,rust-approx-0.4)
- ("rust-bytemuck" ,rust-bytemuck-1.5)
+ ("rust-bytemuck" ,rust-bytemuck-1)
("rust-mint" ,rust-mint-0.5)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.8)
@@ -24051,7 +24421,7 @@ graphics.")
(arguments
`(#:skip-build? #t ; TODO: we need a more recent criterion
#:cargo-inputs
- (("rust-bytemuck" ,rust-bytemuck-1.5)
+ (("rust-bytemuck" ,rust-bytemuck-1)
("rust-mint" ,rust-mint-0.5)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.8)
@@ -24078,7 +24448,7 @@ graphics.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bytemuck" ,rust-bytemuck-1.5)
+ (("rust-bytemuck" ,rust-bytemuck-1)
("rust-mint" ,rust-mint-0.5)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.8)
@@ -24109,7 +24479,7 @@ graphics.")
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-bytemuck" ,rust-bytemuck-1.5)
+ (("rust-bytemuck" ,rust-bytemuck-1)
("rust-mint" ,rust-mint-0.5)
("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.7)
@@ -25578,8 +25948,35 @@ consistent, and reasonably well performing.")
#:cargo-inputs
(("rust-unicode-segmentation" ,rust-unicode-segmentation-1))))))
+(define-public rust-hermit-abi-0.2
+ (package
+ (name "rust-hermit-abi")
+ (version "0.2.6")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "hermit-abi" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1iz439yz9qzk3rh9pqx2rz5c4107v3qbd7bppfsbzb1mzr02clgf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+ (home-page "https://github.com/hermitcore/rusty-hermit")
+ (synopsis "Small interface to call functions from RustyHermit")
+ (description
+ "Hermit-abi is small interface to call functions from the unikernel RustyHermit.
+It is used to build the target x86_64-unknown-hermit.")
+ ;; The user can choose either license.
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-hermit-abi-0.1
(package
+ (inherit rust-hermit-abi-0.2)
(name "rust-hermit-abi")
(version "0.1.10")
(source
@@ -25591,19 +25988,12 @@ consistent, and reasonably well performing.")
(sha256
(base32
"0blmmzik5cs79ivq70s9gal8ypgzj50wnl2hwsaam46gjjbz2p3j"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
("rust-libc" ,rust-libc-0.2)
- ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
- (home-page "https://github.com/hermitcore/rusty-hermit")
- (synopsis "Small interface to call functions from RustyHermit")
- (description
- "Hermit-abi is small interface to call functions from the unikernel RustyHermit.
-It is used to build the target x86_64-unknown-hermit.")
- (license (list license:expat license:asl2.0))))
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))))
(define-public rust-hex-0.4
(package
@@ -26999,6 +27389,56 @@ with hyper.")
"This package provides a Knuth-Liang hyphenation for a variety of languages.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-iana-time-zone-haiku-0.1
+ (package
+ (name "rust-iana-time-zone-haiku")
+ (version "0.1.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "iana-time-zone-haiku" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "1jix9qrqxclj9r4wkg7d3fr987d77vdg3qy2c5hl4ry19wlaw0q7"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-cxx" ,rust-cxx-1)
+ ("rust-cxx-build" ,rust-cxx-build-1))))
+ (home-page "https://github.com/strawlab/iana-time-zone")
+ (synopsis "IANA-time-zone support crate for Haiku OS")
+ (description
+ "This package provides iana-time-zone support crate for Haiku OS.")
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-iana-time-zone-0.1
+ (package
+ (name "rust-iana-time-zone")
+ (version "0.1.53")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "iana-time-zone" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ra7nvai8n3alvljswacjbnhfcpivpi7xqbc5n048w18gdk25hb4"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Not all files included.
+ #:cargo-inputs
+ (("rust-android-system-properties" ,rust-android-system-properties-0.1)
+ ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8)
+ ("rust-iana-time-zone-haiku" ,rust-iana-time-zone-haiku-0.1)
+ ("rust-js-sys" ,rust-js-sys-0.3)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-winapi" ,rust-winapi-0.3))
+ #:cargo-development-inputs
+ (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3))))
+ (home-page "https://github.com/strawlab/iana-time-zone")
+ (synopsis "IANA time zone")
+ (description
+ "This package provides the IANA time zone for the current system.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-ident-case-1
(package
(name "rust-ident-case")
@@ -27400,28 +27840,28 @@ that efficiently appends and removes common indentation after every newline.")
(define-public rust-indexmap-1
(package
(name "rust-indexmap")
- (version "1.7.0")
+ (version "1.9.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "indexmap" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "19b2zwfajhsfcgny0clv8y4jppy704znfhv8nv2dw9a18l2kcqxw"))))
+ (base32 "16dkr2h5p379jcr8rnb420396yvzid2myirc2w70zcf43yffg18q"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1)
- ("rust-hashbrown" ,rust-hashbrown-0.11)
- ("rust-rayon" ,rust-rayon-1)
+ (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-quickcheck" ,rust-quickcheck-1)
+ ("rust-rustc-rayon" ,rust-rustc-rayon-0.4)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-fnv" ,rust-fnv-1)
("rust-fxhash" ,rust-fxhash-0.2)
- ("rust-itertools" ,rust-itertools-0.9)
+ ("rust-itertools" ,rust-itertools-0.10)
("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-quickcheck" ,rust-quickcheck-0.9)
- ("rust-rand" ,rust-rand-0.7)
+ ("rust-quickcheck" ,rust-quickcheck-1)
+ ("rust-rand" ,rust-rand-0.8)
("rust-serde-derive" ,rust-serde-derive-1))))
(home-page "https://github.com/bluss/indexmap")
(synopsis "Hash table with consistent order and fast iteration")
@@ -27435,6 +27875,33 @@ removals, and it allows lookup of its elements by either hash table key
or numerical index. A corresponding hash set type is also provided.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-indexmap-1.7
+ (package
+ (inherit rust-indexmap-1)
+ (name "rust-indexmap")
+ (version "1.7.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "indexmap" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "19b2zwfajhsfcgny0clv8y4jppy704znfhv8nv2dw9a18l2kcqxw"))))
+ (arguments
+ `(#:cargo-inputs
+ (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-hashbrown" ,rust-hashbrown-0.11)
+ ("rust-rayon" ,rust-rayon-1)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-fnv" ,rust-fnv-1)
+ ("rust-fxhash" ,rust-fxhash-0.2)
+ ("rust-itertools" ,rust-itertools-0.9)
+ ("rust-lazy-static" ,rust-lazy-static-1)
+ ("rust-quickcheck" ,rust-quickcheck-0.9)
+ ("rust-rand" ,rust-rand-0.7)
+ ("rust-serde-derive" ,rust-serde-derive-1))))))
+
(define-public rust-indicatif-0.16
(package
(name "rust-indicatif")
@@ -28080,35 +28547,57 @@ versions < 0.2.")
;; Either license can be chosen at the users option.
(license (list license:expat license:asl2.0))))
+(define-public rust-io-lifetimes-1
+ (package
+ (name "rust-io-lifetimes")
+ (version "1.0.3")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "io-lifetimes" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0g76f1c4w3cgyl6qn3kfmi7srphrmjhx3a0rl4qks4ib4n9jl4a6"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1)
+ ("rust-fs-err" ,rust-fs-err-2)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-mio" ,rust-mio-0.8)
+ ("rust-os-pipe" ,rust-os-pipe-1)
+ ("rust-socket2" ,rust-socket2-0.4)
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-windows-sys" ,rust-windows-sys-0.42))))
+ (home-page "https://github.com/sunfishcode/io-lifetimes")
+ (synopsis "Low-level I/O ownership and borrowing library")
+ (description
+ "This package provides a low-level I/O ownership and borrowing
+library.")
+ ;; The user can choose either license.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-io-lifetimes-0.7
(package
+ (inherit rust-io-lifetimes-1)
(name "rust-io-lifetimes")
(version "0.7.5")
(source (origin
(method url-fetch)
(uri (crate-uri "io-lifetimes" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"0x10ak2iy4p24g7bnp1rfrq6aqddjlzkykgwjdayi7nl97wmxkjr"))))
- (build-system cargo-build-system)
(arguments
(list #:cargo-inputs
`(("rust-async-std" ,rust-async-std-1)
("rust-fs-err" ,rust-fs-err-2)
("rust-libc" ,rust-libc-0.2)
("rust-mio" ,rust-mio-0.8)
("rust-os-pipe" ,rust-os-pipe-1)
("rust-socket2" ,rust-socket2-0.4)
("rust-tokio" ,rust-tokio-1)
- ("rust-windows-sys" ,rust-windows-sys-0.42))))
- (home-page "https://github.com/sunfishcode/io-lifetimes")
- (synopsis "Low-level I/O ownership and borrowing library")
- (description
- "This package provides a low-level I/O ownership and borrowing
-library.")
- (license (list license:asl2.0
- license:expat))))
+ ("rust-windows-sys" ,rust-windows-sys-0.42))))))
(define-public rust-iovec-0.1
(package
@@ -28374,6 +28863,31 @@ and locking in the core framework.")
whether or not a given path points to an executable file.")
(license (list license:expat license:asl2.0))))
+(define-public rust-is-terminal-0.4
+ (package
+ (name "rust-is-terminal")
+ (version "0.4.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "is-terminal" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0c2322dg9s35h87ln33w6qsjlgplhzza89rwmkvac4r9ikvhjxlj"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-hermit-abi" ,rust-hermit-abi-0.2)
+ ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+ ("rust-rustix" ,rust-rustix-0.36)
+ ("rust-windows-sys" ,rust-windows-sys-0.42))))
+ (home-page "https://github.com/sunfishcode/is-terminal")
+ (synopsis "Test whether a given stream is a terminal")
+ (description
+ "@code{is-terminal} is a simple utility that tests whether a given
+stream runs in a TTY.")
+ (license license:expat)))
+
(define-public rust-iso8601-0.3
(package
(name "rust-iso8601")
@@ -28398,14 +28912,14 @@ whether or not a given path points to an executable file.")
(define-public rust-itertools-0.10
(package
(name "rust-itertools")
- (version "0.10.3")
+ (version "0.10.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "itertools" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1qy55fqbaisr9qgbn7cvdvqlfqbh1f4ddf99zwan56z7l6gx3ad9"))))
+ (base32 "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -28915,16 +29429,16 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.")
(define-public rust-jobserver-0.1
(package
(name "rust-jobserver")
- (version "0.1.22")
+ (version "0.1.24")
(source
(origin
(method url-fetch)
(uri (crate-uri "jobserver" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1zg7p4khibisbvd8b1lqvvni6lr00g49d4bq2zj6m76bs7jmlbwp"))))
+ "1yn1vxbbqv7dqir6qbfcj8h8ddjf89m5mhvm36h13xx7k5raf9dg"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -30373,16 +30887,16 @@ functions and static variables these libraries contain.")
(define-public rust-libm-0.2
(package
(name "rust-libm")
- (version "0.2.1")
+ (version "0.2.6")
(source
(origin
(method url-fetch)
(uri (crate-uri "libm" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0akh56sh51adhagmk9l84dyrlz60gv8ri05xhr13i1b18czkpmy7"))))
+ "1ywg7jfcgfv4jypxi3f6rpf7n9509ky695bfzy1fqhms7ymhi09l"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -30906,16 +31420,16 @@ to count the number of lines in a file.")
(define-public rust-link-cplusplus-1
(package
(name "rust-link-cplusplus")
- (version "1.0.4")
+ (version "1.0.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "link-cplusplus" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0m7365ig7r88x7b4gkzj5m7b6wiq42pi1ign7mvyq63jr22sfspr"))))
+ "1x84vvg7gn94x9zrvd67602h3ricmhlv19cpl2alzhqkqz4hglpc"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs (("rust-cc" ,rust-cc-1))))
@@ -31020,8 +31534,37 @@ in plain text. It is smart about where a link ends, such as with trailing
punctuation.")
(license (list license:expat license:asl2.0))))
+(define-public rust-linux-raw-sys-0.1
+ (package
+ (name "rust-linux-raw-sys")
+ (version "0.1.3")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "linux-raw-sys" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0zxlp1c4h7kkc4ldgcj5cn7dzynvlksg8y0s9czn2v1sjvc0i7wg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-libc" ,rust-libc-0.2)
+ ("rust-static-assertions" ,rust-static-assertions-1))
+ #:cargo-inputs
+ (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))))
+ (home-page "https://github.com/sunfishcode/linux-raw-sys")
+ (synopsis "Generated bindings for Linux APIs")
+ (description
+ "This package provides automatically generated bindings for
+Linux userspace APIs.")
+ ;; The user can choose either license, or a variant of ASL2.0 with
+ ;; LLVM exception. See COPYRIGHT in the repository.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-linux-raw-sys-0.0.46
(package
+ (inherit rust-linux-raw-sys-0.1)
(name "rust-linux-raw-sys")
(version "0.0.46")
(source (origin
@@ -31038,14 +31581,7 @@ punctuation.")
("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))
#:cargo-development-inputs
`(("rust-libc" ,rust-libc-0.2)
- ("rust-static-assertions" ,rust-static-assertions-1))))
- (home-page "https://github.com/sunfishcode/linux-raw-sys")
- (synopsis "Generated bindings for Linux APIs")
- (description
- "This package provides automatically generated bindings for
-Linux userspace APIs.")
- (license (list license:asl2.0
- license:expat))))
+ ("rust-static-assertions" ,rust-static-assertions-1))))))
(define-public rust-libssh2-sys-0.2
(package
@@ -31182,19 +31718,20 @@ by inspecting the system for user preference.")
(define-public rust-lock-api-0.4
(package
(name "rust-lock-api")
- (version "0.4.5")
+ (version "0.4.9")
(source
(origin
(method url-fetch)
(uri (crate-uri "lock_api" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "028izfyraynijd9h9x5miv1vmg6sjnw1v95wgm7f4xlr7h4lsaki"))))
+ "1py41vk243hwk345nhkn5nw0bd4m03gzjmprdjqq6rg5dwv12l23"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-owning-ref" ,rust-owning-ref-0.4)
+ (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-owning-ref" ,rust-owning-ref-0.4)
("rust-scopeguard" ,rust-scopeguard-1)
("rust-serde" ,rust-serde-1))))
(home-page "https://github.com/Amanieu/parking_lot")
@@ -31892,22 +32429,23 @@ library")
(define-public rust-macrotest-1
(package
(name "rust-macrotest")
- (version "1.0.8")
+ (version "1.0.9")
(source
(origin
(method url-fetch)
(uri (crate-uri "macrotest" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "06xk9i9amh325vr6w9dmnlxfp6zamrq57zfl031zd0fscqm3vjx2"))))
+ (base32 "043gc53ch1szw7ihdclnygn464v62viw48iigd5l2iffhq4sx2bl"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-diff" ,rust-diff-0.1)
("rust-glob" ,rust-glob-0.3)
- ("rust-rand" ,rust-rand-0.7)
+ ("rust-prettyplease" ,rust-prettyplease-0.1)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
+ ("rust-syn" ,rust-syn-1)
("rust-toml" ,rust-toml-0.5))))
(home-page "https://github.com/eupn/macrotest")
(synopsis "Test harness for macro expansion")
@@ -32045,28 +32583,25 @@ algorithms. It supports CBC block cipher mode, PKCS5 padding and 64, 128,
(define-public rust-markup5ever-0.10
(package
(name "rust-markup5ever")
- (version "0.10.0")
+ (version "0.10.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "markup5ever" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1aqxl1lsc8s6ycsw5ibwynadnb9qpiab4ggwgdq9pjlnjdk8vqxa"))))
+ "1zf8iq2czd6kz99fjs3pgf5c17lfz75ds31khkfiqbc50gxl0kx2"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-log" ,rust-log-0.4)
("rust-phf" ,rust-phf-0.8)
- ("rust-string-cache" ,rust-string-cache-0.8)
- ("rust-tendril" ,rust-tendril-0.4)
("rust-phf-codegen" ,rust-phf-codegen-0.8)
- ("rust-serde" ,rust-serde-1)
- ("rust-serde-derive" ,rust-serde-derive-1)
- ("rust-serde-json" ,rust-serde-json-1)
- ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5))))
+ ("rust-string-cache" ,rust-string-cache-0.8)
+ ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5)
+ ("rust-tendril" ,rust-tendril-0.4))))
(home-page "https://github.com/servo/html5ever")
(synopsis "Common code for xml5ever and html5ever")
(description
@@ -32172,17 +32707,16 @@ statement, the first matching branch is the item that gets emitted.")
(define-public rust-matches-0.1
(package
(name "rust-matches")
- (version "0.1.8")
+ (version "0.1.9")
(source
(origin
(method url-fetch)
(uri (crate-uri "matches" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "020axl4q7rk9vz90phs7f8jas4imxal9y9kxl4z4v7a6719mrz3z"))))
+ "0gw5ib38jfgyyah8nyyxr036grqv1arkf1srgfa4h386dav7iqx3"))))
(build-system cargo-build-system)
- (arguments '(#:skip-build? #t))
(home-page "https://github.com/SimonSapin/rust-std-candidates")
(synopsis "Macro to evaluate whether an expression matches a pattern")
(description "This package provides a macro to evaluate, as a boolean,
@@ -32356,21 +32890,21 @@ parallelize and optimize.")
(package
(inherit rust-matrixmultiply-0.3)
(name "rust-matrixmultiply")
- (version "0.2.3")
+ (version "0.2.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "matrixmultiply" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "13s7nfd3dfcsrixld2lk8c563ih5xzczl2w36hprfc016rkfrxyl"))))
+ "1hc4vp19x823xgkm374wsxnzmqbjhmyaj5nr0lhm9k9i02x0cs4i"))))
(arguments
`(#:cargo-inputs
(("rust-rawpointer" ,rust-rawpointer-0.2))
#:cargo-development-inputs
(("rust-bencher" ,rust-bencher-0.1)
- ("rust-itertools" ,rust-itertools-0.7))))))
+ ("rust-itertools" ,rust-itertools-0.8))))))
(define-public rust-matrixmultiply-0.1
(package
@@ -32600,21 +33134,24 @@ unstable -Z self-profile flag.")
(define-public rust-memchr-2
(package
(name "rust-memchr")
- (version "2.4.1")
+ (version "2.5.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "memchr" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0smq8xzd40njqpfzv5mghigj91fzlfrfg842iz8x0wqvw2dw731h"))))
+ "0vanfk5mzs1g1syqnj03q8n0syggnhn55dq535h2wxr7rwpfbzrd"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-libc" ,rust-libc-0.2))))
+ `(#:cargo-inputs
+ (("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1))
+ #:cargo-development-inputs
+ (("rust-quickcheck" ,rust-quickcheck-1))))
(home-page "https://github.com/BurntSushi/rust-memchr")
(synopsis "Safe interface to memchr")
(description "The @code{memchr} crate provides heavily optimized routines
@@ -34392,7 +34929,7 @@ transformations and statically-sized or dynamically-sized matrices.")
(("rust-abomonation" ,rust-abomonation-0.7)
("rust-alga" ,rust-alga-0.9)
("rust-approx" ,rust-approx-0.4)
- ("rust-bytemuck" ,rust-bytemuck-1.5)
+ ("rust-bytemuck" ,rust-bytemuck-1)
("rust-glam" ,rust-glam-0.13)
("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1)
("rust-matrixmultiply" ,rust-matrixmultiply-0.3)
@@ -35315,16 +35852,16 @@ cryptographic library.")
(define-public rust-new-debug-unreachable-1
(package
(name "rust-new-debug-unreachable")
- (version "1.0.3")
+ (version "1.0.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "new_debug_unreachable" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0c1br326qa0rrzxrn2rd5ah7xaprig2i9r4rwsx06vnvc1f003zl"))))
+ "0m1bg3wz3nvxdryg78x4i8hh9fys4wp2bi0zg821dhvf44v4g8p4"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page
@@ -36035,38 +36572,25 @@ implementation (which is unstable / requires nightly).")
(define-public rust-nom-7
(package
(name "rust-nom")
- (version "7.1.1")
+ (version "7.1.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "nom" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0djc3lq5xihnwhrvkc4bj0fd58sjf632yh6hfiw545x355d3x458"))))
+ "132lkkqd8hcbmpb90hncwknr7rn6knfq7774d679k74iqilpfl75"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Tests require example directory, not included in tarball.
#:cargo-inputs
(("rust-memchr" ,rust-memchr-2)
- ("rust-minimal-lexical" ,rust-minimal-lexical-0.2)
- ("rust-version-check" ,rust-version-check-0.9))
+ ("rust-minimal-lexical" ,rust-minimal-lexical-0.2))
#:cargo-development-inputs
- (("rust-criterion" ,rust-criterion-0.3)
- ("rust-doc-comment" ,rust-doc-comment-0.3)
- ("rust-jemallocator" ,rust-jemallocator-0.3)
- ("rust-proptest" ,rust-proptest-1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'configure 'override-jemalloc
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((jemalloc (assoc-ref inputs "jemalloc")))
- (setenv "JEMALLOC_OVERRIDE"
- (string-append jemalloc "/lib/libjemalloc_pic.a")))
- #t)))))
- (native-inputs
- (list jemalloc))
+ (("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-proptest" ,rust-proptest-1))))
(home-page "https://github.com/Geal/nom")
(synopsis
"Byte-oriented, zero-copy, parser combinators library")
@@ -36079,20 +36603,27 @@ combinators library.")
(package
(inherit rust-nom-7)
(name "rust-nom")
- (version "6.0.1")
+ (version "6.2.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "nom" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1w0ppq112myzwk23c8m0wmq0nv73xvn0g9gl2kfm83aadgylq0w8"))))
+ "19h3l5hajpcszwl6nzcmgs4mpng73ifn6akslq7n4g1s12wm2p4w"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Allow any version of memchr 2.
+ (substitute* "Cargo.toml"
+ ((">=2.0, <2.4") "2.0"))))))
(arguments
`(#:tests? #f ; Tests require example directory, not included in tarball.
#:cargo-inputs
(("rust-bitvec" ,rust-bitvec-0.19)
+ ("rust-funty" ,rust-funty-1)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-lexical-core" ,rust-lexical-core-0.7)
("rust-memchr" ,rust-memchr-2)
@@ -36109,7 +36640,8 @@ combinators library.")
(let ((jemalloc (assoc-ref inputs "jemalloc")))
(setenv "JEMALLOC_OVERRIDE"
(string-append jemalloc "/lib/libjemalloc_pic.a")))
- #t)))))))
+ #t)))))
+ (native-inputs (list jemalloc))))
(define-public rust-nom-5
(package
@@ -37157,16 +37689,16 @@ directly.")
(package
(inherit rust-num-rational-0.3)
(name "rust-num-rational")
- (version "0.2.3")
+ (version "0.2.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "num-rational" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "18q3vq3xldhaj0z3f92am8f59m1awywgdj28c7wvx0bcksgwfkfs"))))
+ "1vsaz96chxcgpqd5a0dq8hb3b4sj6dnlhwmpbkf4mx6vnls0202w"))))
(arguments
`(#:cargo-inputs
(("rust-num-bigint" ,rust-num-bigint-0.2)
@@ -37771,22 +38303,25 @@ other crates to create safe wrappers around Oniguruma.")
(define-public rust-once-cell-1
(package
(name "rust-once-cell")
- (version "1.15.0")
+ (version "1.17.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "once_cell" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1q9r8c0ls1qgjp89p4rd36sjv4671pz6710c106ajwcv2c2asbg8"))))
+ "0rpackaf6ljxkcaa3svaiak1ddsbh0hqf5z3l7bb78hyfjhznqbg"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:tests? #f ; Needs a newer rust
+ #:cargo-inputs
(("rust-atomic-polyfill" ,rust-atomic-polyfill-1)
+ ("rust-critical-section" ,rust-critical-section-1)
("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
#:cargo-development-inputs
- (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ (("rust-critical-section" ,rust-critical-section-1)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-regex" ,rust-regex-1))))
(home-page "https://github.com/matklad/once_cell")
@@ -37896,19 +38431,19 @@ the system.")
(("rust-pathdiff" ,rust-pathdiff-0.2)
("rust-winapi" ,rust-winapi-0.3))))))
-(define-public rust-opener-0.4
+(define-public rust-opener-0.5
(package
(name "rust-opener")
- (version "0.4.1")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "opener" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1bpknqvhqkalhmq8n2m97apc0r3y194ppybl1qxay34xr83p848k"))))
+ "0lkrn4fv1h4m8gmp7ll6x7vjvb6kls2ngwa5cgsh2ix5fb6yp8sf"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -37946,14 +38481,14 @@ crate.")
(define-public rust-openssl-0.10
(package
(name "rust-openssl")
- (version "0.10.41")
+ (version "0.10.49")
(source (origin
(method url-fetch)
(uri (crate-uri "openssl" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1l2vpxq5ln326s64lbacqs4hq6k5yn2zhwqbyby0sj9nagvfp3v1"))))
+ "0cssygqbgdim10y7qrgz0rj5k839jqiv2n9ccw1lx8ipp1m10bsd"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -38056,28 +38591,28 @@ system for OpenSSL.")
(define-public rust-openssl-sys-0.9
(package
(name "rust-openssl-sys")
- (version "0.9.75")
+ (version "0.9.84")
(source
(origin
(method url-fetch)
(uri (crate-uri "openssl-sys" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0bxlrsfkvryv179na416mvj0s90v9yngkmkkv8y1lm0h4w6bvyg5"))
+ (base32 "1ym0vcfnyp8bf8lidz8w0yx0n6pva37nvdww0c22kn62kp7fl81s"))
(patches (search-patches "rust-openssl-sys-no-vendor.patch"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
;; Build dependencies:
("rust-autocfg" ,rust-autocfg-1)
- ("rust-bindgen" ,rust-bindgen-0.59)
+ ("rust-bindgen" ,rust-bindgen-0.64)
("rust-cc" ,rust-cc-1)
("rust-pkg-config" ,rust-pkg-config-0.3)
("rust-vcpkg" ,rust-vcpkg-0.2))))
(native-inputs
(list pkg-config))
- (inputs
+ (propagated-inputs
(list openssl))
(home-page "https://github.com/sfackler/rust-openssl")
(synopsis "FFI bindings to OpenSSL")
@@ -38193,8 +38728,37 @@ system for OpenSSL.")
PartialOrd types, like floats.")
(license (list license:expat license:asl2.0))))
+(define-public rust-ordered-float-3
+ (package
+ (name "rust-ordered-float")
+ (version "3.4.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "ordered-float" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1gr31ksgbqariv6hz3s5bc15a5vh4k65dyn8m7j59lhnji0b2knq"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-bytemuck" ,rust-bytemuck-1)
+ ("rust-num-traits" ,rust-num-traits-0.2)
+ ("rust-proptest" ,rust-proptest-1)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rkyv" ,rust-rkyv-0.7)
+ ("rust-schemars" ,rust-schemars-0.8)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-speedy" ,rust-speedy-0.8))))
+ (home-page "https://github.com/reem/rust-ordered-float")
+ (synopsis "Wrappers for total ordering on floats")
+ (description
+ "This package provides wrappers for total ordering on floats in Rust.")
+ (license license:expat)))
+
(define-public rust-ordered-float-2
(package
+ (inherit rust-ordered-float-3)
(name "rust-ordered-float")
(version "2.1.1")
(source
@@ -38206,20 +38770,14 @@ PartialOrd types, like floats.")
(sha256
(base32
"0632g8bacvras6nig1bb1ihgc560476jkrb3is6n542ll86q8vvn"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build?
#t
#:cargo-inputs
(("rust-num-traits" ,rust-num-traits-0.2)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (("rust-serde-test" ,rust-serde-test-1))))
- (home-page "https://github.com/reem/rust-ordered-float")
- (synopsis "Wrappers for total ordering on floats")
- (description
- "This package provides wrappers for total ordering on floats in Rust.")
- (license license:expat)))
+ (("rust-serde-test" ,rust-serde-test-1))))))
(define-public rust-ordered-float-1
(package
@@ -38293,22 +38851,49 @@ iteration. NOTE: This crate was renamed to @code{indexmap}. Please use it
under its new name.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-os-info-3
+ (package
+ (name "rust-os-info")
+ (version "3.0.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "os_info" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "09x2sm4pgcpk14hakj4iq0zkglx1bwxlq3a5mbwc737dpwh11jba"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-development-inputs
+ (("rust-doc-comment" ,rust-doc-comment-0.3)
+ ("rust-pretty-assertions" ,rust-pretty-assertions-0.7))
+ #:cargo-inputs
+ (("rust-log" ,rust-log-0.4)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-winapi" ,rust-winapi-0.3))))
+ (home-page "https://github.com/stanislav-tkach/os_info")
+ (synopsis "Detect the operating system type and version")
+ (description
+ "This library detects the operating system type and version.")
+ (license license:expat)))
+
(define-public rust-os-pipe-1
(package
(name "rust-os-pipe")
- (version "1.0.1")
+ (version "1.1.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "os-pipe" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0mczqmqrkzmln4xg5ki1gwgykf4dsii0h4p7fxf667889ysz54ic"))))
+ (base32 "0fa640v9bi1qcq3jgq1p76lphi4fwj4a9msrmfrq87n1z3qm58n6"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
- ("rust-winapi" ,rust-winapi-0.3))))
+ ("rust-windows-sys" ,rust-windows-sys-0.42))))
(native-inputs
(list python-minimal-wrapper)) ; For the tests.
(home-page "https://github.com/oconnor663/os_pipe.rs")
@@ -38638,29 +39223,25 @@ normally prevent moving a type that has been borrowed from.")
(define-public rust-packed-simd-2-0.3
(package
(name "rust-packed-simd-2")
- (version "0.3.6")
+ (version "0.3.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "packed-simd-2" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1i8hmhsyzqsas2rhxg088mcwvzljrqhvf8lfz8b1dj6g2rkw1h3i"))
+ (base32 "10p2bm0p57shg3arlpfwm6z0bbnlkyr4g0dlkmpwvz6qaba4r4d1"))
(modules '((guix build utils)))
(snippet
'(begin
;; Unpin the dependencies.
(substitute* "Cargo.toml"
- (("=0.2.73") "^0.2.73")
- (("=0.3.23") "^0.3.23"))
- #t))))
+ (("version = \"=") "version = \"^"))))))
(build-system cargo-build-system)
(arguments
- `(#:tests? #f ; error[E0432]: unresolved import `packed_simd`
- #:skip-build? #t
- #:cargo-inputs
- (("rust-cfg-if" ,rust-cfg-if-0.1)
+ `(#:cargo-inputs
+ (("rust-cfg-if" ,rust-cfg-if-1)
("rust-core-arch" ,rust-core-arch-0.1)
("rust-libm" ,rust-libm-0.1)
("rust-sleef-sys" ,rust-sleef-sys-0.1))
@@ -38673,8 +39254,7 @@ normally prevent moving a type that has been borrowed from.")
(modify-phases %standard-phases
(add-after 'unpack 'enable-unstable-features
(lambda _
- (setenv "RUSTC_BOOTSTRAP" "1")
- #t)))))
+ (setenv "RUSTC_BOOTSTRAP" "1"))))))
(home-page "https://github.com/rust-lang-nursery/packed_simd")
(synopsis "Portable Packed SIMD vectors")
(description "Portable Packed SIMD vectors.")
@@ -39040,11 +39620,12 @@ unparking.")
(base32 "13r2xk7mnxfc5g0g6dkdxqdqad99j7s7z8zhzz4npw5r0g0v4hip"))))
(build-system cargo-build-system)
(arguments
- (list #:skip-build? #t
- #:cargo-inputs
- `(("rust-instant" ,rust-instant-0.1)
- ("rust-lock-api" ,rust-lock-api-0.4)
- ("rust-parking-lot-core" ,rust-parking-lot-core-0.8))))
+ (list #:cargo-inputs
+ `(("rust-lock-api" ,rust-lock-api-0.4)
+ ("rust-parking-lot-core" ,rust-parking-lot-core-0.9))
+ #:cargo-development-inputs
+ `(("rust-bincode" ,rust-bincode-1)
+ ("rust-rand" ,rust-rand-0.8))))
(home-page "https://github.com/Amanieu/parking_lot")
(synopsis
"Efficient implementations of the standard synchronization primitives")
@@ -39178,14 +39759,14 @@ synchronization primitives.")
(define-public rust-parking-lot-core-0.9
(package
(name "rust-parking-lot-core")
- (version "0.9.3")
+ (version "0.9.6")
(source (origin
(method url-fetch)
(uri (crate-uri "parking_lot_core" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0ab95rljb99rm51wcic16jgbajcr6lgbqkrr21w7bc2wyb5pk8h9"))))
+ "1grkf6s7zgl5blgw941g98z5csfjbrxavprspc8396aw9f0zh7ms"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -39196,7 +39777,7 @@ synchronization primitives.")
("rust-redox-syscall" ,rust-redox-syscall-0.2)
("rust-smallvec" ,rust-smallvec-1)
("rust-thread-id" ,rust-thread-id-4)
- ("rust-windows-sys" ,rust-windows-sys-0.36))))
+ ("rust-windows-sys" ,rust-windows-sys-0.42))))
(home-page "https://github.com/Amanieu/parking_lot")
(synopsis "API for creating custom synchronization primitives")
(description "This package provides an advanced API for creating custom
@@ -40177,20 +40758,22 @@ runtime support for rust-peg grammars. To use rust-peg, see the peg crate.")
(define-public rust-pem-1
(package
(name "rust-pem")
- (version "1.0.2")
+ (version "1.1.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "pem" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0iqrvfnm71x9pvff39d5ajwn3gc9glxlv4d4h22max7342db18z9"))))
+ (base32 "1f184b7vs5kgwglfsy9adqqy7625jsq8jj1lsxah9abn78kmr0x8"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-base64" ,rust-base64-0.13))
+ (("rust-base64" ,rust-base64-0.13)
+ ("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (("rust-criterion" ,rust-criterion-0.3))))
+ (("rust-criterion" ,rust-criterion-0.3)
+ ("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://github.com/jcreekmore/pem-rs")
(synopsis "Parse and encode PEM-encoded data")
(description
@@ -40356,41 +40939,44 @@ algorithm.")
(define-public rust-pest-2
(package
(name "rust-pest")
- (version "2.1.3")
+ (version "2.5.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "pest" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0lry80bm90x47nq71wxq83kjrm9ashpz4kbm92p90ysdx4m8gx0h"))))
+ "02n3b2hv9ciysybs9qzxza25gp8493dd7r8b57kfkxwi9nhb8ms2"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-serde" ,rust-serde-1)
+ (("rust-bytecount" ,rust-bytecount-0.6)
+ ("rust-memchr" ,rust-memchr-2)
+ ("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
+ ("rust-thiserror" ,rust-thiserror-1)
("rust-ucd-trie" ,rust-ucd-trie-0.1))))
(home-page "https://pest.rs/")
(synopsis "The Elegant Parser")
(description "The Elegant Parser.")
(license (list license:asl2.0 license:expat))))
(define-public rust-pest-derive-2
(package
(name "rust-pest-derive")
- (version "2.1.0")
+ (version "2.5.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "pest_derive" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1l5jfa6ril71cw5nsiw0r45br54dd8cj2r1nc2d1wq6wb3jilgc3"))))
+ "19m0wd2lcg6d2halnlfcgl0mfpgjy5a29q875vk6bp8c7cwxl714"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -40405,16 +40991,16 @@ algorithm.")
(define-public rust-pest-generator-2
(package
(name "rust-pest-generator")
- (version "2.1.1")
+ (version "2.5.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "pest_generator" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1h3z8jccki87mn7gppy4292s1ah98z4md998w5pd04jpkclwz7vv"))))
+ "0z52iw9g9jcg8v7d56s9m49cbl1k5wsxax1wjl1666f8v0s3dda6"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -40432,23 +41018,23 @@ algorithm.")
(define-public rust-pest-meta-2
(package
(name "rust-pest-meta")
- (version "2.1.2")
+ (version "2.5.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "pest_meta" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0iymvrh7lcfi8iarkgq0hwgarr00np3l4xg4bx42rmvgi6czshyz"))))
+ "0lbskklh77xnyk1yr8c387l80s37s30lrfv636s7hild58rz3x0f"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-maplit" ,rust-maplit-1)
+ (("rust-once-cell" ,rust-once-cell-1)
("rust-pest" ,rust-pest-2)
- ("rust-sha-1" ,rust-sha-1-0.8))))
+ ("rust-sha2" ,rust-sha2-0.10))))
(home-page "https://pest.rs")
(synopsis "Pest meta language parser and validator")
(description
@@ -40545,21 +41131,22 @@ and graph algorithms.")
(define-public rust-phf-0.10
(package
(name "rust-phf")
- (version "0.10.0")
+ (version "0.10.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "phf" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "17s0k0z1rjczk37cpbmn718h7dkqci1kk9w2spbmjjwc06qkvz5r"))))
+ (base32 "0naj8n5nasv5hj5ldlva3cl6y3sv7zp3kfgqylhbrg55v3mg3fzs"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
+ `(#:tests? #f ; Doc tests fail.
#:cargo-inputs
(("rust-phf-macros" ,rust-phf-macros-0.10)
("rust-phf-shared" ,rust-phf-shared-0.10)
- ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5))))
+ ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)
+ ("rust-serde" ,rust-serde-1))))
(home-page "https://github.com/sfackler/rust-phf")
(synopsis "Runtime support for perfect hash function data structures")
(description "This package provides runtime support for perfect hash
@@ -40900,21 +41487,20 @@ function data structures.")
(define-public rust-pin-project-1
(package
(name "rust-pin-project")
- (version "1.0.2")
+ (version "1.0.12")
(source
(origin
(method url-fetch)
(uri (crate-uri "pin-project" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "19qw2nm2kk38v9j16nsm8j3fkh0g8pjq0k4cplx7i2f4q8vj5k4w"))))
+ (base32 "1k3f9jkia3idxl2pqxamszwnl89dk52fa4jqj3p7zmmwnq4scadd"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-pin-project-internal" ,rust-pin-project-internal-1))
#:cargo-development-inputs
- (("rust-pin-project-auxiliary-macro"
- ,rust-pin-project-auxiliary-macro-0.0)
+ (("rust-macrotest" ,rust-macrotest-1)
("rust-rustversion" ,rust-rustversion-1)
("rust-static-assertions" ,rust-static-assertions-1)
("rust-trybuild" ,rust-trybuild-1))))
@@ -40928,18 +41514,28 @@ function data structures.")
(package
(inherit rust-pin-project-1)
(name "rust-pin-project")
- (version "0.4.22")
+ (version "0.4.30")
(source
(origin
(method url-fetch)
(uri (crate-uri "pin-project" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "05wwxy46j9z27ibbiisjqk0rivf0z00h4al1f92mwjp9pz6sdqqj"))))
+ (base32 "0nlxmsiq39bc73iryh92yslrp2jzlkdjjxd7rv5sjzpflljgkw1y"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (substitute* "Cargo.toml"
+ (("version = \"=") "version = \"^"))))))
(arguments
- `(#:tests? #f ; XXX: Fix-me.
- #:cargo-inputs
- (("rust-pin-project-internal" ,rust-pin-project-internal-0.4))))))
+ `(#:cargo-inputs
+ (("rust-pin-project-internal" ,rust-pin-project-internal-0.4))
+ #:cargo-development-inputs
+ (("rust-rustversion" ,rust-rustversion-1)
+ ("rust-ryu" ,rust-ryu-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-toml" ,rust-toml-0.5)
+ ("rust-trybuild" ,rust-trybuild-1))))))
(define-public rust-pin-project-auxiliary-macro-0.0
(package
@@ -40962,14 +41558,14 @@ function data structures.")
(define-public rust-pin-project-internal-1
(package
(name "rust-pin-project-internal")
- (version "1.0.2")
+ (version "1.0.12")
(source
(origin
(method url-fetch)
(uri (crate-uri "pin-project-internal" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0pwy3m32scf3ypjb9ai151lmaa27vyj06lc64i28l0r31fzx5s7q"))))
+ (base32 "0maa6icn7rdfy4xvgfaq7m7bwpw9f19wg76f1ncsiixd0lgdp6q6"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #false
@@ -40988,20 +41584,22 @@ crate.")
(package
(inherit rust-pin-project-internal-1)
(name "rust-pin-project-internal")
- (version "0.4.22")
+ (version "0.4.30")
(source
(origin
(method url-fetch)
(uri (crate-uri "pin-project-internal" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1xxac6f3ip45zqbfcmmk748ywjw9sbavz1fcswvqgn3rrx2zs3va"))))
+ (base32 "07p6mwz6kz317a6n3p93yk4llj939ihqdz7d1mwl7gmyx468s745"))))
(arguments
- `(#:tests? #f ; XXX: Fix-me.
+ `(#:tests? #f ; XXX: Doc tests fail.
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))))
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-rustversion" ,rust-rustversion-1))))))
(define-public rust-pin-project-lite-0.2
(package
@@ -41185,15 +41783,15 @@ with additional support for PKCS#8v2 asymmetric key packages (RFC 5958).")
(define-public rust-pkg-config-0.3
(package
(name "rust-pkg-config")
- (version "0.3.19")
+ (version "0.3.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "pkg-config" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0k4860955riciibxr8bhnklp79jydp4xfylwdn5v9kj96hxlac9q"))))
+ "0q2i61dhqvawc51zfzl3jich57w0cjgfa894hn6ings7ffgsbjba"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-development-inputs
@@ -41992,6 +42590,40 @@ for constructing a Message Authentication Code (MAC).")
overloading without macros in Rust.")
(license license:expat)))
+(define-public rust-portable-atomic-1
+ (package
+ (name "rust-portable-atomic")
+ (version "1.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "portable-atomic" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "06p5dglnqj43m4fj70dwcqhv9rmy9amn9pdpgpzd8fx0hf30rh1r"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ; Not all test dependencies declared.
+ #:cargo-inputs
+ (("rust-critical-section" ,rust-critical-section-1)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-critical-section" ,rust-critical-section-1)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ ("rust-fastrand" ,rust-fastrand-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-paste" ,rust-paste-1)
+ ("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-test" ,rust-serde-test-1)
+ ("rust-sptr" ,rust-sptr-0.3)
+ ("rust-static-assertions" ,rust-static-assertions-1))))
+ (home-page "https://github.com/taiki-e/portable-atomic")
+ (synopsis "Portable atomic types")
+ (description
+ "This package provides portable atomic types, including support for
+128-bit atomics, atomic float, etc.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-postgres-0.19
(package
(name "rust-postgres")
@@ -42642,6 +43274,29 @@ replacements, adding colorful diffs.")
("rust-chrono" ,rust-chrono-0.4)
("rust-env-logger" ,rust-env-logger-0.6))))))
+(define-public rust-prettyplease-0.1
+ (package
+ (name "rust-prettyplease")
+ (version "0.1.23")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "prettyplease" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0y2wbmflbkgp13ywd7qyq7hyi59x5zazmljnw8gg09wnfwak4zp9"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/dtolnay/prettyplease")
+ (synopsis "Minimal `syn` syntax tree pretty-printer")
+ (description
+ "This package provides a minimal `syn` syntax tree pretty-printer.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-prettytable-rs-0.8
(package
(name "rust-prettytable-rs")
@@ -42910,15 +43565,15 @@ in your code.")
(define-public rust-proc-macro2-1
(package
(name "rust-proc-macro2")
- (version "1.0.43")
+ (version "1.0.47")
(source
(origin
(method url-fetch)
(uri (crate-uri "proc-macro2" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1avvpf4qki8mg2na60yr3afbsfl5p6vllac6516xgwy93g3a4b0a"))))
+ "09g7alc7mlbycsadfh7lwskr1qfxbiic9qp9z751cqz3n04dk8sy"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-test-flags '("--lib")
@@ -43788,19 +44443,17 @@ ecosystem.")
(package
(inherit rust-pyo3-build-config-0.16)
(name "rust-pyo3-build-config")
- (version "0.15.1")
+ (version "0.15.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3-build-config" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0aw5zfqwzj5rzfxjyqvrqfam138d1009jh6kia4xrgdz538y9yfv"))))
+ (base32 "0414biclhrxv6y0bjm6s9fq9z6yah393ffkd8748pqdq83y3k4kp"))))
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-once-cell" ,rust-once-cell-1))))
- (native-inputs '())))
+ `(#:cargo-inputs
+ (("rust-once-cell" ,rust-once-cell-1))))))
(define-public rust-pyo3-ffi-0.16
(package
@@ -43854,22 +44507,21 @@ ecosystem.")
(package
(inherit rust-pyo3-macros-backend-0.16)
(name "rust-pyo3-macros-backend")
- (version "0.15.1")
+ (version "0.15.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3-macros-backend" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "12i1n1j8l4q4lzalsvvlw2pak1h8wnz3xcn7y82s2jgf4pl0jkzl"))))
- (build-system cargo-build-system)
+ (base32 "15bhc1xib9yz4l1sd2lk3nc7scbqsjfvgvlr3mj0xq0jqh92i32s"))))
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-pyo3-build-config" ,rust-pyo3-build-config-0.15)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))))
+ ("rust-syn" ,rust-syn-1))))
+ (native-inputs (list python))))
(define-public rust-pyo3-macros-0.16
(package
@@ -43918,21 +44570,20 @@ ecosystem.")
(package
(inherit rust-pyo3-macros-0.16)
(name "rust-pyo3-macros")
- (version "0.15.1")
+ (version "0.15.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3-macros" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0mfp3yz6743vrsp2vh8is3gbyzlxzx4bam5wnhi9g6hz5friww37"))))
- (build-system cargo-build-system)
+ (base32 "0fmrzl185i00c6kdvy7icmhhc99c51pyha46incqggk4qvl4gch0"))))
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
- (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15)
- ("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))))
+ `(#:cargo-inputs
+ (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.15)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (native-inputs (list python))))
(define-public rust-pyo3-0.16
(package
@@ -43952,7 +44603,7 @@ ecosystem.")
("rust-cfg-if" ,rust-cfg-if-1)
("rust-eyre" ,rust-eyre-0.6)
("rust-hashbrown" ,rust-hashbrown-0.11)
- ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-indexmap" ,rust-indexmap-1.7)
("rust-indoc" ,rust-indoc-1)
("rust-inventory" ,rust-inventory-0.2)
("rust-libc" ,rust-libc-0.2)
@@ -44010,29 +44661,26 @@ Python code from a Rust binary is also supported.")
(package
(inherit rust-pyo3-0.16)
(name "rust-pyo3")
- (version "0.15.1")
+ (version "0.15.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "pyo3" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "082p014xd8ipwnfsq1ln871wkslxmbrxd7kpqwa0mbq53jzivw3w"))
+ (base32 "0ljp3m1frg8y50al4cbadwxfwwrgsvslmljclp4cf20y4ykm07fl"))
(modules '((guix build utils)))
(snippet
- ;; XXX: Relax "dev-dependencies.criterion"; this must match the
- ;; version of RUST-CRITERION-0.3.
- '(substitute* "Cargo.toml"
- (("\"=0\\.3\\.4\"")
- "\"^0.3.4\"")))))
- (build-system cargo-build-system)
+ '(begin (substitute* "Cargo.toml"
+ (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version)
+ (string-append "\"^" version)))))))
(arguments
`(#:cargo-inputs
(("rust-anyhow" ,rust-anyhow-1)
("rust-cfg-if" ,rust-cfg-if-1)
("rust-eyre" ,rust-eyre-0.6)
("rust-hashbrown" ,rust-hashbrown-0.11)
- ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-indexmap" ,rust-indexmap-1.7)
("rust-indoc" ,rust-indoc-0.3)
("rust-inventory" ,rust-inventory-0.1)
("rust-libc" ,rust-libc-0.2)
@@ -44046,7 +44694,8 @@ Python code from a Rust binary is also supported.")
("rust-unindent" ,rust-unindent-0.1))
#:cargo-development-inputs
(("rust-assert-approx-eq" ,rust-assert-approx-eq-1)
- ("rust-bitflags" ,rust-bitflags-1.2)
+ ("rust-bitflags" ,rust-bitflags-1)
+ ("rust-clap" ,rust-clap-2)
("rust-criterion" ,rust-criterion-0.3)
("rust-half" ,rust-half-1)
("rust-proptest" ,rust-proptest-0.10)
@@ -44866,25 +45515,26 @@ learnt from TrieMap and Sequence Trie.")
(define-public rust-rand-0.8
(package
(name "rust-rand")
- (version "0.8.4")
+ (version "0.8.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "rand" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1n5wska2fbfj4dsfz8mc0pd0dgjlrb6c9anpk5mwym345rip6x9f"))))
+ (base32 "013l6931nn7gkc23jz5mm3qdhf93jjf0fg64nz2lp4i51qd8vbrl"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2)
("rust-log" ,rust-log-0.4)
("rust-packed-simd-2" ,rust-packed-simd-2-0.3)
("rust-rand-chacha" ,rust-rand-chacha-0.3)
("rust-rand-core" ,rust-rand-core-0.6)
- ("rust-rand-hc" ,rust-rand-hc-0.3)
- ("rust-serde" ,rust-serde-1))))
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-bincode" ,rust-bincode-1)
+ ("rust-rand-pcg" ,rust-rand-pcg-0.3))))
(home-page "https://crates.io/crates/rand")
(synopsis "Random number generators and other randomness functionality")
(description
@@ -45022,20 +45672,22 @@ useful types and distributions, and some randomness-related algorithms.")
(define-public rust-rand-chacha-0.3
(package
(name "rust-rand-chacha")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "rand_chacha" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "03df2xh5nbdvwr17qm3sviaxa95r8yhm1nil2pr0pqf90p7ka9z1"))))
+ (base32 "123x2adin558xbhvqb8w4f6syjsdkmqff8cxwhmjacpsl1ihmhg6"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-ppv-lite86" ,rust-ppv-lite86-0.2)
- ("rust-rand-core" ,rust-rand-core-0.6))))
+ ("rust-rand-core" ,rust-rand-core-0.6)
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://crates.io/crates/rand_chacha")
(synopsis "ChaCha random number generator")
(description
@@ -45083,18 +45735,17 @@ useful types and distributions, and some randomness-related algorithms.")
(define-public rust-rand-core-0.6
(package
(name "rust-rand-core")
- (version "0.6.2")
+ (version "0.6.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "rand_core" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1rvas1afjvd2827b8mf2ilg78h3ksl9npkrdds3wbw9x33mndkrl"))))
+ (base32 "0b4j2v4cb5krak1pv6kakv4sz6xcwbrmy2zckc32hsigbrwy82zc"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-getrandom" ,rust-getrandom-0.2)
("rust-serde" ,rust-serde-1))))
(home-page "https://rust-random.github.io/book")
@@ -45181,30 +45832,25 @@ tools for implementation.")
(define-public rust-rand-distr-0.4
(package
(name "rust-rand-distr")
- (version "0.4.2")
+ (version "0.4.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "rand_distr" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0brd2946xfapm2bmhmczfbwck041x7khsfhqxw1f24kxis7m8kcn"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (substitute* "Cargo.toml"
- ;; The resolver feature is not supported by our versions of Cargo.
- (("resolver = \"2\".*") ""))))))
+ (base32 "0cgfwg3z0pkqhrl0x90c77kx70r6g9z4m6fxq9v0h2ibr2dhpjrj"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-average" ,rust-average-0.13)
- ("rust-num-traits" ,rust-num-traits-0.2)
+ (("rust-num-traits" ,rust-num-traits-0.2)
("rust-rand" ,rust-rand-0.8)
- ("rust-serde" ,rust-serde-1)
- ("rust-special" ,rust-special-0.8))
+ ("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (("rust-rand-pcg" ,rust-rand-pcg-0.3))))
+ (("rust-average" ,rust-average-0.13)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rand-pcg" ,rust-rand-pcg-0.3)
+ ("rust-special" ,rust-special-0.8))))
(home-page "https://rust-random.github.io/book/")
(synopsis "Sampling from random number distributions")
(description "This package provides tool for sampling from random number
@@ -45261,19 +45907,18 @@ distributions.")
(define-public rust-rand-hc-0.3
(package
(name "rust-rand-hc")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "rand_hc" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0wra6ar22zdjkry9dsq1mg620m4h3qb9s8rfykkz4im4crqfz41i"))))
+ (base32 "1rwpykyvhkxs4jvqdja3mzp9dqaqamzn113cxaigs9z2dmcry7nm"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-rand-core" ,rust-rand-core-0.6))))
(home-page "https://crates.io/crates/rand_hc")
(synopsis "HC128 random number generator")
@@ -45466,15 +46111,15 @@ generator based on timing jitter.")
(define-public rust-rand-pcg-0.3
(package
(name "rust-rand-pcg")
- (version "0.3.0")
+ (version "0.3.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "rand_pcg" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1w47awndfhgcc31zbji66pwndqmc6lsyairqi9b17f82f19riqbx"))))
+ "0gn79wzs5b19iivybwa09wv4lhi4kbcqciasiqqynggnr8cd1jjr"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -45868,27 +46513,23 @@ accessors.")
(define-public rust-rayon-1
(package
(name "rust-rayon")
- (version "1.5.1")
+ (version "1.6.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "rayon" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "143dl2453bazgk7rwjrickmyqd0ks3q69nfz8axcins19n0clsn0"))))
+ (base32 "1dsr0yyfgdsg8ggh37kq678mfa5j3js6p16ksb7knazhml9s5cvd"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-autocfg" ,rust-autocfg-1)
- ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
- ("rust-either" ,rust-either-1)
+ (("rust-either" ,rust-either-1)
("rust-rayon-core" ,rust-rayon-core-1))
#:cargo-development-inputs
- (("rust-docopt" ,rust-docopt-1)
- ("rust-lazy-static" ,rust-lazy-static-1)
+ (("rust-lazy-static" ,rust-lazy-static-1)
("rust-rand" ,rust-rand-0.8)
- ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
- ("rust-serde" ,rust-serde-1))))
+ ("rust-rand-xorshift" ,rust-rand-xorshift-0.3))))
(home-page "https://github.com/rayon-rs/rayon")
(synopsis "Simple work-stealing parallelism for Rust")
(description
@@ -45947,29 +46588,28 @@ Rust.")
(define-public rust-rayon-core-1
(package
(name "rust-rayon-core")
- (version "1.9.1")
+ (version "1.10.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "rayon-core" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "13kdcnqp2p1a5a3amamfjpnm7ay463vq4dfxy4rrh9shr3i210fp"))))
+ (base32 "1lvavqk42lmll47q008j8y6nw54f3sfvcjlbaa26iaq0bnpi1i6a"))))
(build-system cargo-build-system)
(arguments
;; One of the tests attempts to overflow the stack, but the compiler has
;; since gotten smarter and the test became defective.
`(#:tests? #f
#:cargo-inputs
(("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
- ("rust-lazy-static" ,rust-lazy-static-1)
("rust-num-cpus" ,rust-num-cpus-1))
#:cargo-development-inputs
(("rust-libc" ,rust-libc-0.2)
- ("rust-rand" ,rust-rand-0.7)
- ("rust-rand-xorshift" ,rust-rand-xorshift-0.2)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)
("rust-scoped-tls" ,rust-scoped-tls-1))))
(home-page "https://github.com/rayon-rs/rayon")
(synopsis "Core APIs for Rayon")
@@ -46322,14 +46962,14 @@ memory to speed up reallocation.")
(define-public rust-regex-1
(package
(name "rust-regex")
- (version "1.6.0")
+ (version "1.7.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "regex" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "12wqvyh4i75j7pc8sgvmqh4yy3qaj4inc4alyv1cdf3lf4kb6kjc"))))
+ (base32 "0czp6hxg02lm02hvlhp9xjkd65cjcagw119crnaznwd5idsabaj8"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -46653,6 +47293,26 @@ uses finite automata and guarantees linear time matching on all inputs.")
#:cargo-development-inputs
(("rust-doc-comment" ,rust-doc-comment-0.3))))))
+(define-public rust-rend-0.3
+ (package
+ (name "rust-rend")
+ (version "0.3.6")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rend" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "15fz3rw8c74586kxl6dcdn4s864ph884wfpg9shgnbrnnss69bvr"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-bytecheck" ,rust-bytecheck-0.6))))
+ (home-page "https://github.com/rkyv/rend")
+ (synopsis "Endian-aware primitives for Rust")
+ (description
+ "This package provides endian-aware primitives for Rust.")
+ (license license:expat)))
+
(define-public rust-reopen-0.3
(package
(name "rust-reopen")
@@ -47553,6 +48213,27 @@ rust.")
and table-based tests.")
(license (list license:expat license:asl2.0))))
+(define-public rust-rstest-0.11
+ (package
+ (inherit rust-rstest-0.15)
+ (name "rust-rstest")
+ (version "0.11.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rstest" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "02nh4kpfg1j4v95fhc0bxx9ak3wnz5jg70f94z92wfzyx9mcd212"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)
+ ("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-rustc-version" ,rust-rustc-version-0.4)
+ ("rust-syn" ,rust-syn-1))))))
+
(define-public rust-rstest-0.10
(package
(inherit rust-rstest-0.15)
@@ -48502,8 +49183,41 @@ hex conversion traits.")
(sha256
(base32 "07pff94vqc1mhrqp9i06xzayiad4xfx7588zkqsdw875lpkqrsqc"))))))
+(define-public rust-rustc-rayon-0.4
+ (package
+ (name "rust-rustc-rayon")
+ (version "0.4.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rustc-rayon" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0ykjr1i56jmi8ykkcr7x555wnxki1vsi703mz6n2x7k0naqg0y8s"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ;XXX can not find rayon?
+ #:cargo-inputs
+ (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.7)
+ ("rust-either" ,rust-either-1)
+ ("rust-rustc-rayon-core" ,rust-rustc-rayon-core-0.4))
+ #:cargo-development-inputs
+ (("rust-docopt" ,rust-docopt-1))))
+ (home-page "https://github.com/rust-lang/rustc-rayon")
+ (synopsis
+ "Simple work-stealing parallelism for Rust - fork for rustc")
+ (description
+ "Rustc-rayon is a fork of the Rayon crate. It adds a few \"in progress\"
+features that rustc is using, mostly around deadlock detection. These features
+are not stable and should not be used by others -- though they may find their
+way into rayon proper at some point. In general, if you are not rustc, you
+should be using the real rayon crate, not rustc-rayon.")
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-rustc-rayon-0.3
(package
+ (inherit rust-rustc-rayon-0.4)
(name "rust-rustc-rayon")
(version "0.3.0")
(source
@@ -48515,7 +49229,6 @@ hex conversion traits.")
(sha256
(base32
"0fjvy8bf0hd1zq9d3fdxbdp4z4p1k8jfyx51k5qip3wk1pwnf9zk"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f
#:cargo-inputs
@@ -48529,20 +49242,39 @@ hex conversion traits.")
("rust-rand" ,rust-rand-0.6)
("rust-rand-xorshift" ,rust-rand-xorshift-0.1)
("rust-serde" ,rust-serde-1)
- ("rust-serde-derive" ,rust-serde-derive-1))))
+ ("rust-serde-derive" ,rust-serde-derive-1))))))
+
+(define-public rust-rustc-rayon-core-0.4
+ (package
+ (name "rust-rustc-rayon-core")
+ (version "0.4.1")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rustc-rayon-core" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0c4cf58056ya3282c24bnyq39cwm1rd1m96lymfbb6yvl12929h2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:tests? #f ;XXX cannot find rayon_core?
+ #:cargo-inputs
+ (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
+ ("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8)
+ ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)
+ ("rust-num-cpus" ,rust-num-cpus-1))))
(home-page "https://github.com/rust-lang/rustc-rayon")
- (synopsis
- "Simple work-stealing parallelism for Rust - fork for rustc")
+ (synopsis "Core APIs for Rayon - fork for rustc")
(description
- "Rustc-rayon is a fork of the Rayon crate. It adds a few \"in progress\"
-features that rustc is using, mostly around deadlock detection. These features
-are not stable and should not be used by others -- though they may find their
-way into rayon proper at some point. In general, if you are not rustc, you
-should be using the real rayon crate, not rustc-rayon.")
+ "Note: This package is an unstable fork made for use in rustc
+
+Rayon-core represents the \"core, stable\" APIs of Rayon: join, scope, and so
+forth, as well as the ability to create custom thread-pools with ThreadPool.")
(license (list license:asl2.0 license:expat))))
(define-public rust-rustc-rayon-core-0.3
(package
+ (inherit rust-rustc-rayon-core-0.4)
(name "rust-rustc-rayon-core")
(version "0.3.0")
(source
@@ -48554,7 +49286,6 @@ should be using the real rayon crate, not rustc-rayon.")
(sha256
(base32
"1cwc50mcclzfmhmi87953fjk6cc9ppmchn9mlwzfllq03y1jf97a"))))
- (build-system cargo-build-system)
(arguments
`(#:tests? #f
#:cargo-inputs
@@ -48567,15 +49298,7 @@ should be using the real rayon crate, not rustc-rayon.")
(("rust-libc" ,rust-libc-0.2)
("rust-rand" ,rust-rand-0.6)
("rust-rand-xorshift" ,rust-rand-xorshift-0.1)
- ("rust-scoped-tls" ,rust-scoped-tls-1))))
- (home-page "https://github.com/rust-lang/rustc-rayon")
- (synopsis "Core APIs for Rayon - fork for rustc")
- (description
- "Note: This package is an unstable fork made for use in rustc
-
-Rayon-core represents the \"core, stable\" APIs of Rayon: join, scope, and so
-forth, as well as the ability to create custom thread-pools with ThreadPool.")
- (license (list license:asl2.0 license:expat))))
+ ("rust-scoped-tls" ,rust-scoped-tls-1))))))
(define-public rust-rustc-serialize-0.3
(package
@@ -48812,8 +49535,28 @@ rustc compiler.")
"This package provides a tool to manipulate rustdoc comments.")
(license license:asl2.0)))
+(define-public rust-rustfix-0.6
+ (package
+ (name "rust-rustfix")
+ (version "0.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "rustfix" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0apkjxv3z70vhnyz2kpwsivvndk6qk7kkp0rf7sg8pk7q1gy02vg"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/rust-lang/rustfix")
+ (synopsis "Automatically apply the suggestions made by rustc")
+ (description "Automatically apply the suggestions made by rustc.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-rustfix-0.5
(package
+ (inherit rust-rustfix-0.6)
(name "rust-rustfix")
(version "0.5.1")
(source
@@ -48839,12 +49582,7 @@ rustc compiler.")
("rust-env-logger" ,rust-env-logger-0.6)
("rust-log" ,rust-log-0.4)
("rust-proptest" ,rust-proptest-0.9)
- ("rust-tempdir" ,rust-tempdir-0.3))))
- (home-page "https://github.com/rust-lang/rustfix")
- (synopsis "Automatically apply the suggestions made by rustc")
- (description
- "Automatically apply the suggestions made by rustc.")
- (license (list license:expat license:asl2.0))))
+ ("rust-tempdir" ,rust-tempdir-0.3))))))
(define-public rust-rustfix-0.4
(package/inherit rust-rustfix-0.5
@@ -48865,18 +49603,60 @@ rustc compiler.")
`(("rust-failure" ,rust-failure-0.1)
,@(alist-delete "rust-anyhow" cargo-inputs)))))))
+(define-public rust-rustix-0.36
+ (package
+ (name "rust-rustix")
+ (version "0.36.4")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rustix" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "08vwnvf76nkgb2bbxf8cn51c43x6sc9k462khrwbb2z0g19fi4yb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-criterion" ,rust-criterion-0.4)
+ ("rust-ctor" ,rust-ctor-0.1)
+ ("rust-errno" ,rust-errno-0.2)
+ ("rust-flate2" ,rust-flate2-1)
+ ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-memoffset" ,rust-memoffset-0.7)
+ ("rust-serial-test" ,rust-serial-test-0.6))
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-cc" ,rust-cc-1)
+ ("rust-compiler-builtins" ,rust-compiler-builtins-0.1)
+ ("rust-errno" ,rust-errno-0.2)
+ ("rust-io-lifetimes" ,rust-io-lifetimes-1)
+ ("rust-itoa" ,rust-itoa-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1)
+ ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)
+ ("rust-windows-sys" ,rust-windows-sys-0.42))))
+ (home-page "https://github.com/bytecodealliance/rustix")
+ (synopsis "Safe Rust bindings to POSIX syscalls")
+ (description
+ "This package provides safe Rust bindings to POSIX syscalls.")
+ ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-rustix-0.35
(package
+ (inherit rust-rustix-0.36)
(name "rust-rustix")
(version "0.35.13")
(source (origin
(method url-fetch)
(uri (crate-uri "rustix" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1yfmkj5nwghxd3nha5ywf1cj6zqh44qwm0cavwifr1ppcmnilykj"))))
- (build-system cargo-build-system)
(arguments
(list #:cargo-inputs
`(("rust-bitflags" ,rust-bitflags-1)
@@ -48901,14 +49681,7 @@ rustc compiler.")
("rust-libc" ,rust-libc-0.2)
("rust-memoffset" ,rust-memoffset-0.6)
("rust-serial-test" ,rust-serial-test-0.6)
- ("rust-tempfile" ,rust-tempfile-3))))
- (home-page "https://github.com/bytecodealliance/rustix")
- (synopsis "Safe Rust bindings to POSIX syscalls")
- (description
- "This package provides safe Rust bindings to POSIX syscalls.")
- ;; Apache 2.0, Apache 2.0 with LLVM exception, or Expat.
- (license (list license:asl2.0
- license:expat))))
+ ("rust-tempfile" ,rust-tempfile-3))))))
(define-public rust-rustls-0.20
(package
@@ -49622,75 +50395,118 @@ sub-processes using a fork-like interface.")
(base32
"1n3iw9kaq70dw1rvvma0gjwydbj0f2mvvqvrva69f5cl6yv1dnd0"))))))
+(define-public rust-rkyv-0.7
+ (package
+ (name "rust-rkyv")
+ (version "0.7.39")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rkyv" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "05gdspzw03hq6l58si4ixfj5xd27ljw6fiqksggnvn87bd4b7hnf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-bytecheck" ,rust-bytecheck-0.6)
+ ("rust-hashbrown" ,rust-hashbrown-0.12)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-ptr-meta" ,rust-ptr-meta-0.1)
+ ("rust-rend" ,rust-rend-0.3)
+ ("rust-rkyv-derive" ,rust-rkyv-derive-0.7)
+ ("rust-seahash" ,rust-seahash-4)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-tinyvec" ,rust-tinyvec-1)
+ ("rust-uuid" ,rust-uuid-1))))
+ (home-page "https://github.com/rkyv/rkyv")
+ (synopsis "Zero-copy deserialization framework for Rust")
+ (description "Rkyv is a zero-copy deserialization framework for Rust.")
+ (license license:expat)))
+
(define-public rust-rkyv-0.6
(package
+ (inherit rust-rkyv-0.7)
(name "rust-rkyv")
(version "0.6.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "rkyv" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "01wsn0i8gsw958j892w8i4fyzjdsyhrh7c5zajig049kbqz5n4yb"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-bytecheck" ,rust-bytecheck-0.5)
("rust-memoffset" ,rust-memoffset-0.6)
("rust-ptr-meta" ,rust-ptr-meta-0.1)
("rust-rkyv-derive" ,rust-rkyv-derive-0.6)
- ("rust-seahash" ,rust-seahash-4))))
+ ("rust-seahash" ,rust-seahash-4))))))
+
+
+(define-public rust-rkyv-derive-0.7
+ (package
+ (name "rust-rkyv-derive")
+ (version "0.7.39")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "rkyv_derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1i1lmir3lm8zj8k1an7j2rchv1admqhysh6r6bfkcgmmi3fdmbkf"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(;#:skip-build? #t
+ #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
(home-page "https://github.com/rkyv/rkyv")
- (synopsis "Zero-copy deserialization framework for Rust")
- (description "Rkyv is a zero-copy deserialization framework for Rust.")
+ (synopsis "Derive macro for zero-copy deserialization framework")
+ (description "This package provides a Derive macro for the rkyv
+deserialization framework.")
(license license:expat)))
(define-public rust-rkyv-derive-0.6
(package
+ (inherit rust-rkyv-derive-0.7)
(name "rust-rkyv-derive")
(version "0.6.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "rkyv_derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1mc7rnps41gdywahsffqlypsp9jqmp0r6hlh2nxm31bddfgli3xs"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
- (home-page "https://github.com/rkyv/rkyv")
- (synopsis "Derive macro for zero-copy deserialization framework")
- (description "This package provides a Derive macro for the rkyv
-deserialization framework.")
- (license license:expat)))
+ ("rust-syn" ,rust-syn-1))))))
(define-public rust-ryu-1
(package
(name "rust-ryu")
- (version "1.0.3")
+ (version "1.0.12")
(source
(origin
(method url-fetch)
(uri (crate-uri "ryu" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0xlx9ybzncrb7d6r9533g8ydlg6mr252pfzl4g9cqaqkpvk24mjk"))))
+ "1ppcgnyfs12p545bl7762jp9b11rlzmgb7yzrr5lnzb8xm1rfjvv"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-no-panic" ,rust-no-panic-0.1))
#:cargo-development-inputs
(("rust-num-cpus" ,rust-num-cpus-1)
- ("rust-rand" ,rust-rand-0.7)
- ("rust-rand-xorshift" ,rust-rand-xorshift-0.2))))
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-rand-xorshift" ,rust-rand-xorshift-0.3))))
(home-page "https://github.com/dtolnay/ryu")
(synopsis "Fast floating point to string conversion")
(description
@@ -51121,18 +51937,17 @@ macOS and iOS.")
(define-public rust-semver-1
(package
(name "rust-semver")
- (version "1.0.3")
+ (version "1.0.16")
(source
(origin
(method url-fetch)
(uri (crate-uri "semver" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1gna1p10i86sf1pqfqndkwl0wks35x84yvjw77c74ckzxrbsqfjz"))))
+ (base32 "0amsbj3572r1kx5wdcpcgfhfwbmcc17axp9adc6nkiwg6xkrbg2q"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-serde" ,rust-serde-1))))
(home-page "https://docs.rs/crate/semver")
(synopsis "Semantic version parsing and comparison")
@@ -51412,14 +52227,14 @@ fragment of code.")
(define-public rust-serde-1
(package
(name "rust-serde")
- (version "1.0.133")
+ (version "1.0.152")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "16lq33l09nkm0hxdhfjjmh3yjv83rrcqw9lbxb8y4q3va5km0mlp"))))
+ (base32 "1ysykpc4a9f1yn7zikdwhyfs0bpa7mlc8vsm7sl4glr1606iyzdv"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -51479,21 +52294,21 @@ fragment of code.")
(define-public rust-serde-big-array-0.3
(package
(name "rust-serde-big-array")
- (version "0.3.2")
+ (version "0.3.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-big-array" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0qpy3nk3dpxrrmcfmcnsijad10yi0jxy1x6gc6bbwywma9vhxchq"))))
+ (base32 "190hrlbilvarn5almh3n2s4di9qagxnz3chv6xaw1c72dygzacfd"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-serde" ,rust-serde-1)
- ("rust-serde-derive" ,rust-serde-derive-1))
+ (("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (("rust-serde-json" ,rust-serde-json-1))))
+ (("rust-serde-derive" ,rust-serde-derive-1)
+ ("rust-serde-json" ,rust-serde-json-1))))
(home-page "https://github.com/est31/serde-big-array")
(synopsis "Big array helper for serde")
(description "This package provides a big array helper for serde.")
@@ -51542,19 +52357,18 @@ fragment of code.")
(define-public rust-serde-bytes-0.11
(package
(name "rust-serde-bytes")
- (version "0.11.5")
+ (version "0.11.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde_bytes" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1fcb6sw8wkrj4ylm118wkb31hw124nkjnqyhbgqnd8w85zfhgbhn"))))
+ (base32 "06a8lv3x1zm1ynzq6xri4k46zklnzh62i6y47w4rjvxkypzwb3bi"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-bincode" ,rust-bincode-1)
@@ -51767,22 +52581,21 @@ TOML/JSON/MessagePack strings and serializable values.")
(define-public rust-serde-derive-1
(package
(name "rust-serde-derive")
- (version "1.0.133")
+ (version "1.0.152")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-derive" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0dym0l8a0pch0mkqnhrf89n4wngzwf0d1z88hb8dhs456acic87d"))))
+ (base32 "07jlbk3khspawlqayr5lhzgqirv031ap4p8asw199l7ciq8psj5g"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:skip-build? #t
+ #:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))
- #:cargo-development-inputs
- (("rust-serde" ,rust-serde-1))))
+ ("rust-syn" ,rust-syn-1))))
(home-page "https://serde.rs")
(synopsis
"Macros 1.1 implementation of #[derive(Serialize, Deserialize)]")
@@ -51844,16 +52657,16 @@ derive macros.")
(define-public rust-serde-ignored-0.1
(package
(name "rust-serde-ignored")
- (version "0.1.2")
+ (version "0.1.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde_ignored" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0bzz3546g3p01hgwh6jh0gyqdwc28xcp3pir4al2wbsgs4wpsb0w"))))
+ "19j5mrngznhxa7yfvxwmc4dc0mdzvm7w92i0m4adz2xshx04mswl"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -51871,24 +52684,27 @@ data. This crate provides a wrapper that works with any existing Serde
(define-public rust-serde-json-1
(package
(name "rust-serde-json")
- (version "1.0.74")
+ (version "1.0.91")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-json" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0hiixjnrnrvvpyh58av73ds924zgzi4wl0mv8p9nan0w0v6vjazf"))))
+ (base32 "10v8vb4959ayycw1zmqvxxi758djqkskchj6qal0fjbi6daj6z47"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-indexmap" ,rust-indexmap-1)
("rust-itoa" ,rust-itoa-1)
("rust-ryu" ,rust-ryu-1)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-automod" ,rust-automod-1)
+ ("rust-indoc" ,rust-indoc-1)
+ ("rust-ref-cast" ,rust-ref-cast-1)
("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde" ,rust-serde-1)
("rust-serde-bytes" ,rust-serde-bytes-0.11)
("rust-serde-derive" ,rust-serde-derive-1)
("rust-serde-stacker" ,rust-serde-stacker-0.1)
@@ -51927,20 +52743,18 @@ data. This crate provides a wrapper that works with any existing Serde
(define-public rust-serde-path-to-error-0.1
(package
(name "rust-serde-path-to-error")
- (version "0.1.4")
+ (version "0.1.9")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-path-to-error" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "0n5ilbsxvi174m2fd506ivd43kws0yh523li1xz0zqh60ngi1xj2"))))
+ (base32 "0hbkdhmz82hwx5bxasym776f74jlvnivsx00l4qi7jb3nli4zc16"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-serde-derive" ,rust-serde-derive-1)
@@ -51991,21 +52805,25 @@ commonly used by Ruby on Rails via Rack.")
(define-public rust-serde-repr-0.1
(package
(name "rust-serde-repr")
- (version "0.1.6")
+ (version "0.1.10")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde_repr" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0xhwamlb1ax3w87mpq0awcphwchprh93y1hb47rm3c0p3favgiid"))))
+ (base32 "0knbzc87nlrfnm1jh3zmx77hxflnzk0xl8xcv7jvn3m2fkxcjpls"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1)
- ("rust-syn" ,rust-syn-1))))
+ ("rust-syn" ,rust-syn-1))
+ #:cargo-development-inputs
+ (("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-json" ,rust-serde-json-1)
+ ("rust-trybuild" ,rust-trybuild-1))))
(home-page "https://github.com/dtolnay/serde-repr")
(synopsis "Serialize and deserialize C-like enum as underlying repr")
(description
@@ -52017,16 +52835,16 @@ of a C-like enum.")
(define-public rust-serde-stacker-0.1
(package
(name "rust-serde-stacker")
- (version "0.1.4")
+ (version "0.1.7")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde-stacker" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1qlfpy0nmxrvahz4hs9p1y84rb0vy6mbxn1lfgvq6fryls8j7jgl"))))
+ "1zgwd22cswfsjsxmnpf97nw5fzyv0s6mif5blbb948q7qgskvxrm"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -52044,19 +52862,20 @@ by dynamically growing the stack.")
(define-public rust-serde-test-1
(package
(name "rust-serde-test")
- (version "1.0.113")
+ (version "1.0.152")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde_test" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "02s7zjs12m5abk13j5farc00rzissk1anpl015vawpzz914jsan3"))))
+ "17pdigm0w1wvch7vpnk13199wn3gmkb0883l0hr53qv75l6j249n"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:tests? #f ; Requires a newer rust
+ #:cargo-inputs
(("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
(("rust-serde" ,rust-serde-1)
@@ -52118,21 +52937,23 @@ by dynamically growing the stack.")
(define-public rust-serde-urlencoded-0.7
(package
(name "rust-serde-urlencoded")
- (version "0.7.0")
+ (version "0.7.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde_urlencoded" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "1s9wnjrak5a0igfhcghhz51kvi7n010j5rs9lmhd5hfrz2kmgypd"))))
+ (base32 "1zgklbdaysj3230xivihs30qi5vkhigg323a9m62k8jwf4a1qjfk"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-form-urlencoded" ,rust-form-urlencoded-1)
- ("rust-itoa" ,rust-itoa-0.4)
+ ("rust-itoa" ,rust-itoa-1)
("rust-ryu" ,rust-ryu-1)
- ("rust-serde" ,rust-serde-1))))
+ ("rust-serde" ,rust-serde-1))
+ #:cargo-development-inputs
+ (("rust-serde-derive" ,rust-serde-derive-1))))
(home-page "https://github.com/nox/serde_urlencoded")
(synopsis "`x-www-form-urlencoded` meets Serde")
(description
@@ -52214,23 +53035,24 @@ for later processing.")
(define-public rust-serde-yaml-0.8
(package
(name "rust-serde-yaml")
- (version "0.8.17")
+ (version "0.8.26")
(source
(origin
(method url-fetch)
(uri (crate-uri "serde_yaml" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "08xvb5zxz3x5dgx0fy1q0aq9aa9fibcvi75333wnnwk1mga4wr8m"))))
+ (base32 "06y7gxy312mink8nsnmci9cw0ykpgsdcxmayg0snmdbnnwrp92jp"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-dtoa" ,rust-dtoa-0.4)
- ("rust-linked-hash-map" ,rust-linked-hash-map-0.5)
+ (("rust-indexmap" ,rust-indexmap-1)
+ ("rust-ryu" ,rust-ryu-1)
("rust-serde" ,rust-serde-1)
("rust-yaml-rust" ,rust-yaml-rust-0.4))
#:cargo-development-inputs
- (("rust-indoc" ,rust-indoc-1)
+ (("rust-anyhow" ,rust-anyhow-1)
+ ("rust-indoc" ,rust-indoc-1)
("rust-serde-derive" ,rust-serde-derive-1))))
(home-page "https://github.com/dtolnay/serde-yaml")
(synopsis "YAML support for Serde")
@@ -53763,16 +54585,25 @@ designed for @code{immutable.rs}.")
(define-public rust-slab-0.4
(package
(name "rust-slab")
- (version "0.4.2")
+ (version "0.4.8")
(source
(origin
(method url-fetch)
(uri (crate-uri "slab" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1y59xsa27jk84sxzswjk60xcjf8b4fm5960jwpznrrcmasyva4f1"))))
+ "0bgwxig8gkqp6gz8rvrpdj6qwa10karnsxwx7wsj5ay8kcf3aa35"))))
(build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-rustversion" ,rust-rustversion-1)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-serde-test" ,rust-serde-test-1))
+ #:cargo-inputs (("rust-autocfg" ,rust-autocfg-1)
+ ("rust-serde" ,rust-serde-1))))
+ (native-inputs
+ (list rust-autocfg-1))
(home-page "https://github.com/carllerche/slab")
(synopsis "Pre-allocated storage for a uniform data type")
(description "This create provides a pre-allocated storage for a uniform
@@ -54083,14 +54914,14 @@ implementations.")
(define-public rust-slog-stdlog-4
(package
(name "rust-slog-stdlog")
- (version "4.1.0")
+ (version "4.1.1")
(source
(origin
(method url-fetch)
(uri (crate-uri "slog-stdlog" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0nhg9mwaf5y1gs2f7nbz3r9fngq0g3d3qvz66z5lzgxd09rsna42"))))
+ (base32 "0gpsf62ckblpc6a70dnhsz677c7s5cz4glpqsf8p5bmvwnnb41k7"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -54258,23 +55089,25 @@ inline storage.")
(define-public rust-smallvec-1
(package
(name "rust-smallvec")
- (version "1.9.0")
+ (version "1.10.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "smallvec" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1lfss4vs5z5njm3ac9c499s5m1gphzm5a7gxcbw1zncpjmsdpl1g"))))
+ "1q2k15fzxgwjpcdv3f323w24rbbfyv711ayz85ila12lg7zbw1x5"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-arbitrary" ,rust-arbitrary-1)
("rust-serde" ,rust-serde-1))
#:cargo-development-inputs
- (("rust-bincode" ,rust-bincode-1))))
+ (("rust-bincode" ,rust-bincode-1)
+ ("rust-debugger-test" ,rust-debugger-test-0.1)
+ ("rust-debugger-test-parser" ,rust-debugger-test-parser-0.1))))
(home-page "https://github.com/servo/rust-smallvec")
(synopsis "Small vector optimization")
(description
@@ -54898,6 +55731,57 @@ maximal amount of configuration possible intended.")
"An RSpec inspired minimal testing framework for Rust.")
(license license:expat)))
+(define-public rust-speedy-0.8
+ (package
+ (name "rust-speedy")
+ (version "0.8.5")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "speedy" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "02crzzdlaadz2ya2ij86wamsixbklhp6lbbnji6wz46rkdhqdmip"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)
+ ("rust-glam" ,rust-glam-0.17)
+ ("rust-indexmap" ,rust-indexmap-1)
+ ("rust-memoffset" ,rust-memoffset-0.7)
+ ("rust-regex" ,rust-regex-1)
+ ("rust-smallvec" ,rust-smallvec-1)
+ ("rust-speedy-derive" ,rust-speedy-derive-0.8)
+ ("rust-uuid" ,rust-uuid-1))))
+ (home-page "https://github.com/koute/speedy")
+ (synopsis "Binary serialization framework")
+ (description
+ "This package provides a fast binary serialization framework for Rust.")
+ ;; The user can choose either license.
+ (license (list license:expat license:asl2.0))))
+
+(define-public rust-speedy-derive-0.8
+ (package
+ (name "rust-speedy-derive")
+ (version "0.8.5")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "speedy-derive" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1xx4v0h2i6ncnvi7v5y5l44xh12v4pjfkakahk6f27c0c084lazb"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/koute/speedy")
+ (synopsis "Binary serialization framework")
+ (description
+ "This package provides a fast binary serialization framework,
+@code{#[derive(Readable, Writable)]} support")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-spin-0.9
(package
(name "rust-spin")
@@ -55235,6 +56119,22 @@ service.")
"This package provides a single-producer single-consumer lock-free buffer.")
(license license:expat)))
+(define-public rust-sptr-0.3
+ (package
+ (name "rust-sptr")
+ (version "0.3.2")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "sptr" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0shddkys046nnrng929mrnjjrh31mlxl95ky7dgxd6i4kclkk6rv"))))
+ (build-system cargo-build-system)
+ (home-page "https://github.com/Gankra/sptr")
+ (synopsis "The Strict Provenance Polyfill")
+ (description "This package provides sptr, The Strict Provenance Polyfill.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-sqlite-0.26
(package
(name "rust-sqlite")
@@ -56087,22 +56987,23 @@ configurable byte storage.")
(define-public rust-string-cache-0.8
(package
(name "rust-string-cache")
- (version "0.8.0")
+ (version "0.8.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "string-cache" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "12i0synp8l0qpnzi5qki4pjq3jx28ykikyffjjjg6fsfxddwfh19"))))
+ "020ahbx93gp85s3k3k5c342j10ml0b77i4q4hri180xmlavr8d11"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-lazy-static" ,rust-lazy-static-1)
- ("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1)
- ("rust-phf-shared" ,rust-phf-shared-0.8)
+ (("rust-new-debug-unreachable" ,rust-new-debug-unreachable-1)
+ ("rust-once-cell" ,rust-once-cell-1)
+ ("rust-parking-lot" ,rust-parking-lot-0.12)
+ ("rust-phf-shared" ,rust-phf-shared-0.10)
("rust-precomputed-hash" ,rust-precomputed-hash-0.1)
("rust-serde" ,rust-serde-1))))
(home-page "https://github.com/servo/string-cache")
@@ -56142,21 +57043,21 @@ developed as part of the Servo project.")
(define-public rust-string-cache-codegen-0.5
(package
(name "rust-string-cache-codegen")
- (version "0.5.1")
+ (version "0.5.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "string-cache-codegen" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "15vbk5i7kkj5bbx7f0fi477js4svw5py39gi4rk74anj35g8wk7j"))))
+ "1249fafaa7r3m67zxcbcw1bddanygv13r3209bvlzgi2ny4h5cvb"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-phf-generator" ,rust-phf-generator-0.8)
- ("rust-phf-shared" ,rust-phf-shared-0.8)
+ (("rust-phf-generator" ,rust-phf-generator-0.10)
+ ("rust-phf-shared" ,rust-phf-shared-0.10)
("rust-proc-macro2" ,rust-proc-macro2-1)
("rust-quote" ,rust-quote-1))))
(home-page "https://github.com/servo/string-cache")
@@ -57040,15 +57941,15 @@ interface")
(define-public rust-syn-1
(package
(name "rust-syn")
- (version "1.0.99")
+ (version "1.0.105")
(source
(origin
(method url-fetch)
(uri (crate-uri "syn" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "04xba78p559nl737llv7nqcwm723dp6ah5bbp0h5w1amqrpfznsq"))))
+ "0279ivl07g0y5fs5bwmglhkdvi99ypcm36yb774f8bbh8lyv9fb0"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
@@ -57911,15 +58812,15 @@ without a mutable reference.")
(define-public rust-tar-0.4
(package
(name "rust-tar")
- (version "0.4.26")
+ (version "0.4.36")
(source
(origin
(method url-fetch)
(uri (crate-uri "tar" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk"))))
+ "0iz40bd47xr69dsbckd6rv5ry2nqb2dp3z850q41pvpnmk6xk441"))))
(build-system cargo-build-system)
(arguments
`(#:tests? #f ; Test tarballs not included in crate.
@@ -58777,20 +59678,19 @@ directories.")
(define-public rust-tendril-0.4
(package
(name "rust-tendril")
- (version "0.4.1")
+ (version "0.4.3")
(source
(origin
(method url-fetch)
(uri (crate-uri "tendril" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0fsx7blrrzgca8aa2yqy8zxyi8s7amskhgkk1ml5sbaqyalyszvh"))))
+ "1c3vip59sqwxn148i714nmkrvjzbk7105vj0h92s6r64bw614jnj"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-encoding" ,rust-encoding-0.2)
("rust-encoding-rs" ,rust-encoding-rs-0.8)
("rust-futf" ,rust-futf-0.1)
@@ -60266,19 +61166,20 @@ C library.")
(define-public rust-tinyvec-1
(package
(name "rust-tinyvec")
- (version "1.2.0")
+ (version "1.6.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "tinyvec" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0hn3fkpb9nca9nf9znz2dxlp4ccv37hnbh67aczpzpmpbgq20ljv"))))
+ (base32 "0l6bl2h62a5m44jdnpn7lmj14rd44via8180i7121fvm73mmrk47"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
- (("rust-serde" ,rust-serde-1)
+ (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-serde" ,rust-serde-1)
("rust-tinyvec-macros" ,rust-tinyvec-macros-0.1))))
(home-page "https://crates.io/crates/tinyvec")
(synopsis "Safe vec-like data structures")
@@ -61918,36 +62819,62 @@ stream-based WebSocket implementation.")
(description "Unix Domain sockets for Tokio.")
(license license:expat)))
-(define-public rust-tokio-util-0.6
+(define-public rust-tokio-util-0.7
(package
(name "rust-tokio-util")
- (version "0.6.4")
+ (version "0.7.4")
(source
(origin
(method url-fetch)
(uri (crate-uri "tokio-util" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0agvfvvgh225vgb2z9w83lwqcqsy3pvkcbvnaz7m7rj6dg6facgc"))))
+ (base32 "0h67jb56bsxy4pi1a41pda8d52569ci5clvqv3c6cg9vy1sy1chb"))))
(build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-bytes" ,rust-bytes-1)
("rust-futures-core" ,rust-futures-core-0.3)
("rust-futures-io" ,rust-futures-io-0.3)
("rust-futures-sink" ,rust-futures-sink-0.3)
("rust-futures-util" ,rust-futures-util-0.3)
- ("rust-log" ,rust-log-0.4)
+ ("rust-hashbrown" ,rust-hashbrown-0.12)
("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
("rust-slab" ,rust-slab-0.4)
- ("rust-tokio" ,rust-tokio-1))))
+ ("rust-tokio" ,rust-tokio-1)
+ ("rust-tracing" ,rust-tracing-0.1))))
(home-page "https://tokio.rs")
(synopsis "Additional utilities for working with Tokio")
(description
"This package provides additional utilities for working with Tokio.")
(license license:expat)))
+(define-public rust-tokio-util-0.6
+ (package
+ (inherit rust-tokio-util-0.7)
+ (name "rust-tokio-util")
+ (version "0.6.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "tokio-util" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0agvfvvgh225vgb2z9w83lwqcqsy3pvkcbvnaz7m7rj6dg6facgc"))))
+ (arguments
+ `(#:skip-build? #t
+ #:cargo-inputs
+ (("rust-bytes" ,rust-bytes-1)
+ ("rust-futures-core" ,rust-futures-core-0.3)
+ ("rust-futures-io" ,rust-futures-io-0.3)
+ ("rust-futures-sink" ,rust-futures-sink-0.3)
+ ("rust-futures-util" ,rust-futures-util-0.3)
+ ("rust-log" ,rust-log-0.4)
+ ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+ ("rust-slab" ,rust-slab-0.4)
+ ("rust-tokio" ,rust-tokio-1))))))
+
(define-public rust-tokio-util-0.4
(package
(inherit rust-tokio-util-0.6)
@@ -62106,6 +63033,27 @@ serializing Rust structures.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-toml-datetime-0.5
+ (package
+ (name "rust-toml-datetime")
+ (version "0.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "toml_datetime" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1zcjvygkix0hm7nv7i6ag4fd0l1pglga1wyq2l8zgy0fgpjm32w0"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-serde" ,rust-serde-1))))
+ (home-page "https://github.com/toml-rs/toml")
+ (synopsis "TOML-compatible datetime type")
+ (description
+ "This package provides a TOML-compatible datetime type for Rust.")
+ ;; The user can choose either license.
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-toml-edit-0.14
(package
(name "rust-toml-edit")
@@ -63658,14 +64606,14 @@ the Trust-DNS client to use rustls for TLS.")
(define-public rust-trybuild-1
(package
(name "rust-trybuild")
- (version "1.0.54")
+ (version "1.0.75")
(source
(origin
(method url-fetch)
(uri (crate-uri "trybuild" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32 "0gzxbal0zdjnwilsisgbm59c242gvym8dafwsl5s8b5nhvzl6hzh"))))
+ (base32 "1wylxysdpbjz3cddaxvjnfk8vadi05chdivwg9l878c7b8hjq8gi"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -64092,16 +65040,18 @@ deserialization.")
(define-public rust-typenum-1
(package
(name "rust-typenum")
- (version "1.12.0")
+ (version "1.15.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "typenum" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0cvbksljz61ian21fnn0h51kphl0pwpzb932bv4s0rwy1wh8lg1p"))))
+ "11yrvz1vd43gqv738yw1v75rzngjbs7iwcgzjy3cq5ywkv2imy6w"))))
(build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs (("rust-scale-info" ,rust-scale-info-1))))
(home-page "https://github.com/paholg/typenum")
(synopsis "Rust library for type-level numbers evaluated at compile time")
(description "Typenum is a Rust library for type-level numbers evaluated at
@@ -64140,19 +65090,18 @@ Unicode character database.")
(define-public rust-ucd-trie-0.1
(package
(name "rust-ucd-trie")
- (version "0.1.2")
+ (version "0.1.5")
(source
(origin
(method url-fetch)
(uri (crate-uri "ucd-trie" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
- (base32
- "1hh6kyzh5xygwy96wfmsf8v8czlzhps2lgbcyhj1xzy1w1xys04g"))))
+ (base32 "10ggllapxq99cxxy179wbklmabj5fikm02233v4idf7djvcw8ycy"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-development-inputs
- (("rust-lazy-static" ,rust-lazy-static-1))))
+ (("rust-once-cell" ,rust-once-cell-1))))
(home-page "https://github.com/BurntSushi/ucd-generate")
(synopsis "Trie for storing Unicode codepoint sets and maps")
(description
@@ -65293,16 +66242,16 @@ Unix users and groups.")
(define-public rust-utf-8-0.7
(package
(name "rust-utf-8")
- (version "0.7.5")
+ (version "0.7.6")
(source
(origin
(method url-fetch)
(uri (crate-uri "utf-8" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1iw5rp4i3mfi9k51picbr5bgjqhjcmnxx7001clh5ydq31y2zr05"))))
+ "1a9ns3fvgird0snjkd3wbdhwd3zdpc2h5gpyybrfr6ra5pkqxk09"))))
(build-system cargo-build-system)
(arguments `(#:skip-build? #t))
(home-page "https://github.com/SimonSapin/rust-utf8")
@@ -65409,8 +66358,47 @@ first byte.")
(base32
"0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7"))))))
+(define-public rust-uuid-1
+ (package
+ (name "rust-uuid")
+ (version "1.2.2")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "uuid" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0k6fchay62ryjhkxsbbj38030lm3797c13vsp54bkd9ij3gf0bj2"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-development-inputs
+ (("rust-bincode" ,rust-bincode-1)
+ ("rust-trybuild" ,rust-trybuild-1)
+ ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)
+ ("rust-windows-sys" ,rust-windows-sys-0.42))
+ #:cargo-inputs
+ (("rust-arbitrary" ,rust-arbitrary-1)
+ ("rust-atomic" ,rust-atomic-0.5)
+ ("rust-getrandom" ,rust-getrandom-0.2)
+ ("rust-md-5" ,rust-md-5-0.10)
+ ("rust-rand" ,rust-rand-0.8)
+ ("rust-serde" ,rust-serde-1)
+ ("rust-sha1-smol" ,rust-sha1-smol-1)
+ ("rust-slog" ,rust-slog-2)
+ ("rust-uuid-macro-internal" ,rust-uuid-macro-internal-1)
+ ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)
+ ("rust-zerocopy" ,rust-zerocopy-0.6))))
+ (home-page "https://github.com/uuid-rs/uuid")
+ (synopsis "Library to generate and parse UUIDs")
+ (description
+ "This package provides a library to generate and parse UUIDs.")
+ ;; The user can choose either license.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-uuid-0.8
(package
+ (inherit rust-uuid-1)
(name "rust-uuid")
(version "0.8.2")
(source
@@ -65422,21 +66410,15 @@ first byte.")
(sha256
(base32
"1dy4ldcp7rnzjy56dxh7d2sgrcvn4q77y0a8r0a48946h66zjp5w"))))
- (build-system cargo-build-system)
(arguments
`(#:skip-build? #t
#:cargo-inputs
(("rust-getrandom" ,rust-getrandom-0.2)
("rust-md5" ,rust-md5-0.7)
("rust-serde" ,rust-serde-1)
("rust-sha1" ,rust-sha1-0.6)
("rust-slog" ,rust-slog-2)
- ("rust-winapi" ,rust-winapi-0.3))))
- (home-page "https://github.com/uuid-rs/uuid")
- (synopsis "Library to generate and parse UUIDs")
- (description
- "This package provides a library to generate and parse UUIDs.")
- (license (list license:asl2.0 license:expat))))
+ ("rust-winapi" ,rust-winapi-0.3))))))
(define-public rust-uuid-0.7
(package
@@ -65495,6 +66477,31 @@ first byte.")
("rust-serde" ,rust-serde-1)
("rust-sha1" ,rust-sha1-0.2))))))
+(define-public rust-uuid-macro-internal-1
+ (package
+ (name "rust-uuid-macro-internal")
+ (version "1.2.2")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "uuid-macro-internal" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1n3nw8vydhm5l3d32j3wgdwfd68rg71m400y4ijyd4s5i7r8kg3k"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-proc-macro2" ,rust-proc-macro2-1)
+ ("rust-quote" ,rust-quote-1)
+ ("rust-syn" ,rust-syn-1))))
+ (home-page "https://github.com/uuid-rs/uuid")
+ (synopsis "@code{uuid!} macro implementation details")
+ (description
+ "This package contains private implementation details of the
+@code{uuid!} macro. It is not intended for direct usage.")
+ ;; The user can choose either license.
+ (license (list license:asl2.0 license:expat))))
+
(define-public rust-v-frame-0.2
(package
(name "rust-v-frame")
@@ -67996,8 +69003,43 @@ extended attributes.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-xcb-1
+ (package
+ (name "rust-xcb")
+ (version "1.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "xcb" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ifnchjzf9xlwy6pfa90mwa6j43bx2bi5xl40m5gykymwbbv9bhg"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-build-flags '("--all-features")
+ #:cargo-test-flags '("--all-features")
+ #:cargo-development-inputs
+ (("rust-gl" ,rust-gl-0.14)
+ ("rust-png" ,rust-png-0.17)
+ ("rust-x11" ,rust-x11-2))
+ #:cargo-inputs
+ (("rust-bitflags" ,rust-bitflags-1)
+ ("rust-libc" ,rust-libc-0.2)
+ ("rust-quick-xml" ,rust-quick-xml-0.22)
+ ("rust-x11" ,rust-x11-2))))
+ (inputs
+ (list mesa)) ;required by rust-x11-2
+ (native-inputs
+ (list pkg-config))
+ (home-page "https://github.com/rust-x-bindings/rust-xcb")
+ (synopsis "Rust bindings and wrappers for XCB")
+ (description
+ "This package provides Rust bindings and wrappers for XCB.")
+ (license license:expat)))
+
(define-public rust-xcb-0.9
(package
+ (inherit rust-xcb-1)
(name "rust-xcb")
(version "0.9.0")
(source
@@ -68020,12 +69062,7 @@ extended attributes.")
(inputs
(list libx11 libxcb xcb-proto))
(native-inputs
- (list pkg-config python))
- (home-page "https://github.com/rtbo/rust-xcb")
- (synopsis "Rust bindings and wrappers for XCB")
- (description
- "This package provides Rust bindings and wrappers for XCB.")
- (license license:expat)))
+ (list pkg-config python))))
(define-public rust-xcursor-0.3
(package
@@ -68199,16 +69236,16 @@ including a line breaking iterator.")
(define-public rust-xml5ever-0.16
(package
(name "rust-xml5ever")
- (version "0.16.1")
+ (version "0.16.2")
(source
(origin
(method url-fetch)
(uri (crate-uri "xml5ever" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0nbapmdrn4zqry5p01l2mmbb48fcq0gga377p1c4lkb1x3k546qb"))))
+ "0rfqys8yyigkzrqcrn5c6r10v42pwxahccyyzhc293px30w1cd4j"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 5f1fbb8..0f2dce0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -133,6 +133,7 @@
#:use-module (gnu packages perl-web)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt)
+ #:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
@@ -900,29 +901,19 @@ Language.")
(define-public mariadb
(package
(name "mariadb")
- (version "10.5.12")
+ (version "10.10.2")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.mariadb.com/MariaDB"
"/mariadb-" version "/source/mariadb-"
version ".tar.gz"))
(sha256
(base32
- "1gg4h9ahmk78cx01zyw0fqr6hhd78fsyhs0s34p3gi9hkak1qkxb"))
+ "1ciw7y08wms9g3hzhyria49r1b9n5wpbhkndazv95d925c8x1jsp"))
(modules '((guix build utils)))
(snippet
'(begin
- ;; Delete bundled snappy and xz.
- (delete-file-recursively "storage/tokudb/PerconaFT/third_party")
- (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt"
- ;; This file checks that the bundled sources are present and
- ;; declares build procedures for them.
- (("^include\\(TokuThirdParty\\)") ""))
- (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt"
- ;; Don't attempt to use the procedures we just removed.
- ((" build_lzma build_snappy") ""))
-
- ;; Preserve CMakeLists.txt for these.
+ ;; Delete bundled libraries, but preserve CMakeLists.txt.
(for-each (lambda (file)
(unless (string-suffix? "CMakeLists.txt" file)
(delete-file file)))
@@ -934,21 +925,10 @@ Language.")
`(#:configure-flags
(list
"-DBUILD_CONFIG=mysql_release"
- ;; Linking with libarchive fails, like this:
-
- ;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o):
- ;; relocation R_X86_64_32 against `.bss' can not be used when
- ;; making a shared object; recompile with -fPIC
-
- ;; For now, disable the features that that use libarchive (xtrabackup).
- "-DWITH_LIBARCHIVE=OFF"
-
- ;; Disable the TokuDB engine, because its test suite frequently fails,
- ;; and loading it crashes the server: <https://bugs.gnu.org/35521>.
- "-DTOKUDB_OK=OFF"
;; Ensure the system libraries are used.
"-DWITH_JEMALLOC=yes"
+ "-DWITH_LIBFMT=system"
"-DWITH_PCRE=system"
"-DWITH_SSL=system"
"-DWITH_ZLIB=system"
@@ -988,14 +968,6 @@ Language.")
#:parallel-tests? ,(target-x86-64?)
#:phases
(modify-phases %standard-phases
- ,@(if (target-ppc32?)
- `((add-after 'unpack 'apply-libatomics-patch
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((patch-file
- (assoc-ref inputs
- "mariadb-link-libatomic.patch")))
- (invoke "patch" "-p1" "-i" patch-file)))))
- '())
(add-after 'unpack 'adjust-output-references
(lambda _
;; The build system invariably prepends $CMAKE_INSTALL_PREFIX
@@ -1031,6 +1003,9 @@ Language.")
"main.explain_non_select"
"main.upgrade_MDEV-19650"
"roles.acl_statistics"
+ "main.stat_tables_innodb"
+ "main.stat_tables"
+ "main.mysql_upgrade"
;; Probably same as above, test failure reported upstream:
;; <https://jira.mariadb.org/browse/MDEV-26320>.
@@ -1057,36 +1032,19 @@ Language.")
disabled-tests)
(close-port unstable-tests)
- ;; XXX: These fail because they expect a latin1 charset and
- ;; collation. See <https://jira.mariadb.org/browse/MDEV-21264>.
- (substitute* '("mysql-test/main/gis_notembedded.result"
- "mysql-test/main/system_mysql_db.result")
- (("latin1_swedish_ci") "utf8_general_ci")
- (("\tlatin1") "\tutf8"))
-
(substitute* "mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test"
(("/bin/bash")
(which "bash")))
- (substitute* "mysql-test/mysql-test-run.pl"
+ (substitute* "mysql-test/mariadb-test-run.pl"
(("/bin/ls") (which "ls"))
(("/bin/sh") (which "sh"))))))
- (add-before 'configure 'disable-plugins
- (lambda _
- (let ((disable-plugin (lambda (name)
- (call-with-output-file
- (string-append "plugin/" name
- "/CMakeLists.txt")
- (lambda (port)
- (format port "\n")))))
- (disabled-plugins '(;; XXX: Causes a test failure.
- "disks")))
- (for-each disable-plugin disabled-plugins))))
(replace 'check
(lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys)
(if tests?
(with-directory-excursion "mysql-test"
- (invoke "./mtr" "--verbose"
+ (invoke "./mariadb-test-run"
+ "--verbose"
"--retry=3"
"--suite=main"
"--testcase-timeout=40"
@@ -1100,13 +1058,12 @@ Language.")
"--skip-rpl"
"--skip-test-list=unstable-tests"))
(format #t "test suite not run~%"))))
- (add-after
- 'install 'post-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
+ (add-after 'install 'post-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
(dev (assoc-ref outputs "dev"))
(lib (assoc-ref outputs "lib"))
- (openssl (assoc-ref inputs "openssl")))
+ (openssl (dirname (search-input-file inputs "lib/libssl.so"))))
(substitute* (list (string-append out "/bin/mariadb-install-db")
(string-append out "/bin/mysql_install_db"))
(("basedir=\"\"")
@@ -1133,7 +1090,7 @@ Language.")
(mkdir-p (string-append dev "/lib"))
(rename-file (string-append lib "/lib/pkgconfig")
(string-append dev "/lib/pkgconfig"))
- (rename-file (string-append lib "/bin/mariadb_config")
+ (rename-file (string-append out "/bin/mariadb_config")
(string-append dev "/bin/mariadb_config"))
(rename-file (string-append out "/bin/mysql_config")
(string-append dev "/bin/mysql_config"))
@@ -1144,25 +1101,20 @@ Language.")
(substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev "/lib/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all)
- (string-append "-L" openssl "/lib " all)))))))))
+ (string-append "-L" openssl " " all)))))))))
(native-inputs
- (if (target-ppc32?)
- `(("mariadb-link-libatomic.patch"
- ,(search-patch "mariadb-link-libatomic.patch"))
- ("patch" ,patch)
- ("bison" ,bison)
- ("perl" ,perl))
- (list bison perl)))
+ (list bison perl))
(inputs
- `(("jemalloc" ,jemalloc)
- ("libaio" ,libaio)
- ("libxml2" ,libxml2)
- ("ncurses" ,ncurses)
- ("openssl" ,openssl-1.1)
- ("pam" ,linux-pam)
- ("pcre2" ,pcre2)
- ("xz" ,xz)
- ("zlib" ,zlib)))
+ (list fmt
+ jemalloc
+ libaio
+ libxml2
+ ncurses
+ openssl
+ linux-pam
+ pcre2
+ xz
+ zlib))
;; The test suite is very resource intensive and can take more than three
;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours
@@ -1288,14 +1240,14 @@ pictures, sounds, or video.")
(package
(inherit postgresql-15)
(name "postgresql")
- (version "14.4")
+ (version "14.6")
(source (origin
(inherit (package-source postgresql-15))
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2"))
(sha256
(base32
- "0slg7ld5mldmv3pn1wxxwglm4s3xc6c91ixx24apj713qlvn4fy2"))))))
+ "08nzkq321fzfi8ba8gck9zxxg7xvv8vz3mbl4avrmlq933y4122h"))))))
(define-public postgresql-13
(package
@@ -4106,7 +4058,7 @@ reasonable substitute.")
(define-public python-redis
(package
(name "python-redis")
- (version "4.5.2")
+ (version "4.5.4")
(source (origin
;; The PyPI archive lacks some test resources such as the TLS
;; certificates under docker/stunnel/keys.
@@ -4117,7 +4069,7 @@ reasonable substitute.")
(file-name (git-file-name name version))
(sha256
(base32
- "0cz3gji3rb1h5dczyl11hm42wgsbz5v896cgbi14dij160b7m35i"))))
+ "0s5pswykjcyqbx471ib3gwy29xxa5ckgch9hy476x2s4pvhkbgmr"))))
(build-system pyproject-build-system)
(arguments
(list
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 98b71e0..e1ab054 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -252,7 +252,7 @@ supported devices, as well as input/output file format support.")
(define-public openboardview
(package
(name "openboardview")
- (version "8.95.2")
+ (version "9.95.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -271,10 +271,10 @@ supported devices, as well as input/output file format support.")
(scandir "." (negate (cut member <> keep))))))
(patches
(search-patches "openboardview-use-system-imgui.patch"
- "openboardview-use-system-utf8.patch"))
+ "openboardview-use-system-mpc.patch"))
(sha256
(base32
- "1n2yfi8wpky0y231kq2zdgwn7f7kff8m53m904hxi5ppmwhx1d6q"))))
+ "1safjd729a7591rigkiy3c678bivrj5q1qwg1f18sijhlsfkf5b3"))))
(build-system cmake-build-system)
(arguments
(list
@@ -298,13 +298,6 @@ supported devices, as well as input/output file format support.")
"add_subdirectory("
(search-input-directory inputs "share/glad") ;source_dir
" src/glad)\n"))))) ;binary dir
- (add-before 'configure 'fix-utf8-include-directive
- ;; Our utf8-h package makes the header available as "utf8.h"
- ;; directly rather than "utf8/utf8.h".
- (lambda _
- (substitute* '("src/openboardview/FileFormats/BRDFile.cpp"
- "src/openboardview/BoardView.cpp")
- (("utf8/utf8.h") "utf8.h"))))
(add-before 'configure 'dynamically-load-gtk-via-absolute-path
;; The GTK library is not linked thus not present in the RUNPATH of
;; the produced binary; the absolute path of the libraries must to
@@ -327,11 +320,14 @@ supported devices, as well as input/output file format support.")
(inputs
(list fontconfig
gtk+
- imgui
+ ;; OpenBoardView can build with Dear ImGui 1.88, but there are some
+ ;; usability problems such as the difficulty to register clicks.
+ imgui-1.87
+ orangeduck-mpc
sdl2
sqlite
zlib))
- (home-page "https://openboardview.org/")
+ (home-page "https://github.com/OpenBoardView/OpenBoardView")
(synopsis "Viewer for BoardView files")
(description "OpenBoardView is a viewer for BoardView files, which present
the details of a printed circuit board (PCB). It comes with features
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 7e73b21..fa1f07e 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
+;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2539,7 +2540,7 @@ on a Commodore C64, C128 etc.")
(license license:zlib)))
(define-public uxn
- (let ((commit "1b2049e238df96f32335edf1c6db35bd09f8b42d")
+ (let ((commit "83237c9641490d303a42c81ca247314d11055dea")
(revision "1"))
(package
(name "uxn")
@@ -2552,7 +2553,7 @@ on a Commodore C64, C128 etc.")
(file-name (string-append name "-" version))
(sha256
(base32
- "0d3hy1db1mfk2l7q7wdxvp1z0vkmyyb9pdp81d9zm58ylpxaq2cp"))))
+ "159qfz66k1jc43jhyl8by3yiphsr2dyiyclw1x7mkr3zciwc29z3"))))
(build-system gnu-build-system)
(arguments
(list #:tests? #f ;no tests
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 6ef3cd8..4aa143a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -260,37 +260,41 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
(license license:cc0)))
(define-public font-abattis-cantarell
- (package
- (name "font-abattis-cantarell")
- (version "0.303")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.gnome.org/GNOME/cantarell-fonts")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1d1ay0fdqchk0wa5yqxis2c98imvzsbbd2kjv0x8sk4fm419847b"))))
- (build-system meson-build-system)
- (arguments
- (list #:configure-flags #~(list "-Dbuildstatics=true")))
- (native-inputs
- (list gettext-minimal
- psautohint
- python
- python-cffsubr
- python-fontmath
- python-statmake
- python-ufo2ft))
- (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
- (synopsis "Cantarell sans-serif typeface")
- (description "The Cantarell font family is a contemporary Humanist
+ ;; Use the latest commit, as the last released version, 0.303, has problems
+ ;; with the newer statmake. The dependency has been removed in the latest
+ ;; code base.
+ (let ((commit "e049149faf0c15b0711e8d790e2333be923f0486")
+ (revision "0"))
+ (package
+ (name "font-abattis-cantarell")
+ (version (git-version "0.303" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/GNOME/cantarell-fonts")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "032csq99bkmmgh9mmmbrgg4fzxgkcsvxv4wy595qms72mmlgmcc7"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:configure-flags #~(list "-Dbuildstatics=true")))
+ (native-inputs
+ (list gettext-minimal
+ psautohint
+ python
+ python-cffsubr
+ python-fontmath
+ python-ufo2ft))
+ (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
+ (synopsis "Cantarell sans-serif typeface")
+ (description "The Cantarell font family is a contemporary Humanist
sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.
This package contains both the non-variable as well as the variable versions
of the font.")
- (license license:silofl1.1)))
+ (license license:silofl1.1))))
(define-public font-lato
(package
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 5638560..fd1784a 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
;;;
@@ -34,6 +34,7 @@
(define-module (gnu packages fontutils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -139,14 +140,13 @@ them as it goes.")
(define-public python-afdko
(package
(name "python-afdko")
- (version "3.9.1")
+ (version "3.9.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "afdko" version))
(sha256
- (base32 "0k1204vykgx32saa495s1lgmz1dixcp8bjiv486imx77killvm02"))
- (patches (search-patches "python-afdko-suppress-copyright-test.patch"))
+ (base32 "1d3b1590gxlindh1sjhwvxnryn5zil98hgdwbgsr76fd657r3f99"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -172,27 +172,13 @@ them as it goes.")
(substitute* "CMakeLists.txt"
(("CMAKE_CXX_STANDARD 11")
"CMAKE_CXX_STANDARD 17"))))
- (add-after 'unpack 'use-system-libxml2
- (lambda _
- ;; XXX: These horrifying substitutions revert this upstream
- ;; PR: <https://github.com/adobe-type-tools/afdko/pull/1527>.
- ;; Hopefully it's only temporary..!
- (substitute* (find-files "." "^CMakeLists.txt$")
- (("\\(\\(NOT \\$\\{LibXml2_FOUND\\}\\) OR \
-\"\\$\\{CMAKE_SYSTEM\\}\" MATCHES \"Linux\"\\)")
- "(NOT ${LibXml2_FOUND})")
- (("\\(\\(\\$\\{LibXml2_FOUND\\}\\) AND \
-\\(NOT \"\\$\\{CMAKE_SYSTEM\\}\" MATCHES \"Linux\"\\)\\)")
- "(${LibXml2_FOUND})"))
- (substitute* "cmake/ExternalLibXML2.cmake"
- (("set\\(LIBXML2_STATIC_INCLUDE_DIR")
- "set(LIBXML2_INCLUDE_DIR)"))))
(add-after 'unpack 'patch-problematic-requirements
(lambda _
(substitute* "requirements.txt"
;; Remove lxml because the version requested here is different
;; than the one propagated by the python-fonttools package.
- (("^lxml==.*") ""))))
+ (("^lxml==.*") "")
+ (("<=4.38.0") ">=4.38.0"))))
(add-after 'unpack 'patch-setup.py
(lambda _
;; There is no use for Python-provided CMake nor Ninja binaries.
@@ -232,7 +218,14 @@ them as it goes.")
(number->string (parallel-job-count))
;; This test is known to fail on multiple architectures.
;; https://github.com/adobe-type-tools/afdko/issues/1163
- "-k not test_type1mm_inputs"))))
+ "-k"
+ (string-append
+ "not test_type1mm_inputs "
+ ;; These tests fail for unknown reasons (see:
+ ;; https://github.com/adobe-type-tools/afdko/issues/1635).
+ "and not test_rvrn_vf "
+ "and not test_cjk_vf "
+ "and not test_sparse_cjk_vf")))))
(add-after 'check 'wrap
(assoc-ref %standard-phases 'wrap))
(add-before 'wrap 'wrap-PATH
@@ -257,7 +250,8 @@ them as it goes.")
python-setuptools-scm
python-wheel))
(inputs
- (list java-antlr4-runtime-cpp
+ (list bash-minimal
+ java-antlr4-runtime-cpp
libxml2
`(,util-linux "lib")))
(propagated-inputs
@@ -444,23 +438,15 @@ converts any cubic curves to quadratic. The most useful function is probably
(define-public python-ufo2ft
(package
(name "python-ufo2ft")
- (version "2.28.0")
+ (version "2.31.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "ufo2ft" version))
(sha256
- (base32 "068hm62s1iphyg66w96vgiif6ahpcsaf8fr44rk6jdf71f6fyqd5"))))
- (build-system python-build-system)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
- (native-inputs
- (list python-pytest python-setuptools-scm))
+ (base32 "1rg2997af8blvswlwif0kpz2vxrlh555gzqslz6yv9y7i7v8lphl"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-pytest python-setuptools-scm))
(propagated-inputs
(list python-booleanoperations
python-cffsubr
@@ -482,13 +468,13 @@ to generate OpenType font binaries from Unified Font Objects (UFOs).")
(define-public python-fontmath
(package
(name "python-fontmath")
- (version "0.9.2")
+ (version "0.9.3")
(source
(origin
(method url-fetch)
(uri (pypi-uri "fontMath" version ".zip"))
(sha256
- (base32 "014407hpvqdx123g06i664qrfq86bf9l621x7jllpgqw3rqir2sc"))))
+ (base32 "070v1jz5f18g15if459ppwswq4w5hzffwp1gvdc5j47bgz5qflva"))))
(build-system python-build-system)
(propagated-inputs (list python-fonttools))
(native-inputs
@@ -555,13 +541,13 @@ implementing the pen protocol for manipulating glyphs.")
(hidden-package
(package
(name "python-fontparts-bootstrap")
- (version "0.10.8")
+ (version "0.11.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "fontParts" version ".zip"))
(sha256
- (base32 "0i5ww6yl9m74wnjd7gyvjkdh7m56haql4gv7lasmppdipay2209g"))))
+ (base32 "0j4h8hszky639gmfy1avmw670y80ya49kca8yc635h5ihl0c3v8x"))))
(build-system python-build-system)
(propagated-inputs
(list python-booleanoperations
@@ -754,23 +740,22 @@ suite of the @code{psautohint} package.")
(uri (pypi-uri "psautohint" version))
(sha256
(base32 "0zzz7hy1kkkjfrrm9ly2di3xv2x1ywdqhbyqy21k670jysldw3nm"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
(list
+ ;; The CJKSparseVar.subset.hinted.otf test fails with slightly different
+ ;; output caused by the newer fonttools version used in Guix.
+ #:test-flags #~(list "-k" "not CJKSparseVar.subset.hinted.otf")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'copy-font-data
;; The data is copied as it needs to be writable for the tests.
(lambda _
(copy-recursively
#$(this-package-native-input "psautohint-font-data")
"tests/integration/data")
(for-each make-file-writable
- (find-files "tests/integration/data"))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
+ (find-files "tests/integration/data")))))))
(propagated-inputs (list python-fonttools-next))
(native-inputs
(list psautohint-font-data
@@ -1554,16 +1539,16 @@ generate bitmaps.")
(define-public python-statmake
(package
(name "python-statmake")
- (version "0.5.1")
+ (version "0.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/daltonmaag/statmake")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0qavzspxhwnaayj5mxq6ncjjziggabxj157ls04h2rdrpq167706"))))
+ "1k6fkzyhsfkgi599sb017wzf4jzbnp5wjg1kla1b33vgjpa7n5nw"))))
(build-system pyproject-build-system)
(arguments
(list
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index d63faed..8eb1a20 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -27,7 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
-;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@@ -225,73 +225,75 @@ application-centers for distributions.")
(sha256
(base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk"))
(patches
- (search-patches
- "farstream-gupnp.patch" ;for test 'transmitter/rawudp'
- "farstream-make.patch"))))
+ (search-patches "farstream-gupnp.patch" ;for test 'transmitter/rawudp'
+ "farstream-make.patch"))))
(build-system glib-or-gtk-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- (list
- "--enable-gtk-doc"
- "--enable-glib-asserts"
- (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'copy-common
- (lambda _
- (delete-file "autogen.sh")
- (copy-recursively
- (assoc-ref %build-inputs "common")
- "common")
- #t))
- (add-after 'unpack 'disable-timeout-tests
- (lambda _
- (substitute* "tests/check/Makefile.am"
- ;; This test timeouts despite changing
- ;; the value of 'CK_DEFAULT_TIMEOUT' to 600,
- ;; as per %common-gstreamer-phases.
- ;; Reported to upstream:
- ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20
- (("[ \t]*transmitter/nice.*$") ""))))
- (add-after 'unpack 'patch-docbook-xml
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "docs"
- (substitute* '("libs/farstream-libs-docs.sgml"
- "plugins/farstream-plugins-docs.sgml")
- (("http://www.oasis-open.org/docbook/xml/4.1.2/")
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/"))))
- #t)))))
+ (list
+ #:configure-flags
+ #~(list "--enable-gtk-doc"
+ "--enable-glib-asserts"
+ (string-append "--with-html-dir=" #$output
+ "/share/gtk-doc/html"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'copy-common
+ (lambda _
+ (delete-file "autogen.sh")
+ (copy-recursively
+ #$(origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://gitlab.freedesktop.org/gstreamer/common.git")
+ (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e")))
+ (file-name (git-file-name "common" "latest.52adcdb"))
+ (sha256
+ (base32
+ "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))
+ "common")))
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ (substitute* "tests/check/Makefile.am"
+ ;; This test fails since updating gstreamer to version 1.22.1
+ ;; (see:
+ ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25).
+ (("^\trtp/recvcodecs.*") "")
+ ;; This test timeouts despite changing the value of
+ ;; 'CK_DEFAULT_TIMEOUT' to 600 (see:
+ ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20).
+ (("^\ttransmitter/nice.*") ""))))
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* '("libs/farstream-libs-docs.sgml"
+ "plugins/farstream-plugins-docs.sgml")
+ (("http://www.oasis-open.org/docbook/xml/4.1.2/")
+ (search-input-directory (or native-inputs inputs)
+ "xml/dtd/docbook/")))))))))
(native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("common"
- ,(origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://gitlab.freedesktop.org/gstreamer/common.git")
- (commit "88e512ca7197a45c4114f7fa993108f23245bf50")))
- (file-name
- (git-file-name "common" "latest.88e512c"))
- (sha256
- (base32 "1nk94pnskjyngqcfb9p32g4yvf4nzpjszisw24r9azl0pawqpsn6"))))
- ("docbook-xml" ,docbook-xml-4.1.2)
- ("docbook-xsl" ,docbook-xsl)
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
- ("libtool" ,libtool)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("xsltproc" ,libxslt)))
+ (list autoconf
+ automake
+ docbook-xml-4.1.2
+ docbook-xsl
+ gobject-introspection
+ gtk-doc/stable
+ libtool
+ libxslt
+ perl
+ pkg-config
+ python-wrapper))
(inputs
- (list glib gtk+ gupnp-igd libnice))
+ (list glib
+ gtk+
+ gupnp-igd
+ libnice))
(propagated-inputs
- (list gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good))
+ (list gstreamer
+ gst-plugins-bad
+ gst-plugins-base
+ gst-plugins-good))
(synopsis "The Farstream VVoIP framework")
(description "Farstream is a collection of GStreamer modules and libraries
for videoconferencing.")
@@ -474,112 +476,82 @@ display servers. It supports many different languages and emoji.")
(name "xdg-utils")
(version "1.1.3")
(source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://portland.freedesktop.org/download/xdg-utils-"
- version ".tar.gz"))
- (sha256
- (base32
- "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://portland.freedesktop.org/download/xdg-utils-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"))))
(build-system gnu-build-system)
(native-inputs
(list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto))
(inputs
- `(("awk" ,gawk)
- ;; TODO(staging): Make this unconditional, to avoid canonical packages,
- ;; see <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00148.html>.
- ,@(if (%current-target-system)
- `(("bash-minimal" ,bash-minimal)) ; for 'wrap-program'
- '())
- ("coreutils" ,coreutils)
- ,@(if (%current-target-system)
- `(("file" ,file))
- '())
- ("grep" ,grep)
- ("inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
- ("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
- ("sed" ,sed)
- ("xprop" ,xprop) ; for Xfce detecting
- ("xset" ,xset))) ; for xdg-screensaver
+ (list bash-minimal ;for 'wrap-program'
+ coreutils
+ file
+ gawk
+ grep
+ inetutils ;xdg-screensaver uses `hostname'
+ perl-file-mimeinfo ;for mimeopen fallback
+ sed
+ xprop ;for Xfce detecting
+ xset)) ;for xdg-screensaver
(arguments
- `(#:tests? #f ; no check target
- #:modules ((srfi srfi-26)
+ (list
+ #:tests? #f ;no check target
+ #:modules `((srfi srfi-26)
,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-hardcoded-paths
- ;; TODO(staging): make unconditional
- (,@(if (%current-target-system)
- '(lambda* (#:key inputs #:allow-other-keys))
- '(lambda _))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-hardcoded-paths
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "scripts/xdg-mime.in"
(("/usr/bin/file")
- (,@(if (%current-target-system)
- '(search-input-file inputs "bin/file")
- '(which "file")))))
+ (search-input-file inputs "bin/file")))
(substitute* "scripts/xdg-open.in"
(("/usr/bin/printf")
- (,@(if (%current-target-system)
- '(search-input-file inputs "bin/printf")
- '(which "printf")))))
- #t))
- (add-before 'build 'locate-catalog-files
- ;; TODO(staging): Make unconditional for simplicity.
- (lambda* (#:key inputs ,@(if (%current-target-system)
- '(native-inputs)
- '()) #:allow-other-keys)
- ;; TODO(staging): Make unconditional for simplicity and
- ;; to avoid depending on input labels.
- (let ,(if (%current-target-system)
- `((native-inputs (or native-inputs inputs))
- (xmldoc (search-input-directory native-inputs
- "xml/dtd/docbook"))
- (xsldoc
- (search-input-directory
- native-inputs
- (string-append "xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)))))
- `((xmldoc
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook"))
- (xsldoc
- (string-append (assoc-ref inputs "docbook-xsl")
- "/xml/xsl/docbook-xsl-"
- ,(package-version docbook-xsl)))))
- (for-each (lambda (file)
- (substitute* file
- (("http://.*/docbookx\\.dtd")
- (string-append xmldoc "/docbookx.dtd"))))
- (find-files "scripts/desc" "\\.xml$"))
- (substitute* "scripts/Makefile"
- ;; Apparently `xmlto' does not bother to looks up the stylesheets
- ;; specified in the XML, unlike the above substitition. Instead it
- ;; uses a hard-coded URL. Work around it here, but if this is
- ;; common perhaps we should hardcode this path in xmlto itself.
- (("\\$\\(XMLTO\\) man")
- (string-append "$(XMLTO) -x " xsldoc
- "/manpages/docbook.xsl man")))
- (setenv "STYLESHEET"
- (string-append xsldoc "/html/docbook.xsl"))
- ;; TODO(staging): Might as well remove the #t while we are at
- ;; it.
- #t)))
- (add-after 'install 'wrap-executables
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (with-directory-excursion (string-append out "/bin")
- (let ((path-ext
- (map (cute string-append <> "/bin")
- (cons out
- (map (cute assoc-ref inputs <>)
- '("awk" "coreutils" "grep" "inetutils"
- "perl-file-mimeinfo" "sed" "xprop"
- "xset"))))))
- (for-each (cute wrap-program <>
- `("PATH" ":" prefix ,path-ext))
- (find-files "."))))
- #t))))))
+ (search-input-file inputs "bin/printf")))))
+ (add-before 'build 'locate-catalog-files
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let* ((native (or native-inputs inputs))
+ (xmldoc (search-input-directory native
+ "xml/dtd/docbook"))
+ (xsldoc (search-input-directory
+ native
+ (string-append "xml/xsl/docbook-xsl-"
+ #$(package-version
+ (this-package-native-input
+ "docbook-xsl"))))))
+ (for-each (lambda (file)
+ (substitute* file
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd"))))
+ (find-files "scripts/desc" "\\.xml$"))
+ (substitute* "scripts/Makefile"
+ ;; Apparently `xmlto' does not bother to looks up the stylesheets
+ ;; specified in the XML, unlike the above substitition. Instead it
+ ;; uses a hard-coded URL. Work around it here, but if this is
+ ;; common perhaps we should hardcode this path in xmlto itself.
+ (("\\$\\(XMLTO\\) man")
+ (string-append "$(XMLTO) -x " xsldoc
+ "/manpages/docbook.xsl man")))
+ (setenv "STYLESHEET"
+ (string-append xsldoc "/html/docbook.xsl")))))
+ (add-after 'install 'wrap-executables
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
+ "sed" "xprop" "xset"))
+ (pkgs (map (lambda (cmd)
+ (search-input-file inputs
+ (string-append "bin/" cmd)))
+ dependencies))
+ (bindirs (map dirname pkgs)))
+ (with-directory-excursion (string-append #$output "/bin")
+ (for-each (cute wrap-program <>
+ `("PATH" ":" prefix ,bindirs))
+ (find-files ".")))))))))
(home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/")
(synopsis "Freedesktop.org scripts for desktop integration")
(description "The xdg-utils package is a set of simple scripts that
@@ -1802,15 +1774,15 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(define-public modem-manager
(package
(name "modem-manager")
- (version "1.18.10")
+ (version "1.18.12")
(source (origin
(method url-fetch)
(uri (string-append
"https://www.freedesktop.org/software/ModemManager/"
"ModemManager-" version ".tar.xz"))
(sha256
(base32
- "1sv53lvz9nfbq6jzprl5xhai0vylc01kglcdrgz2vszf5615y98n"))))
+ "0c74n5jl1qvq2qlbwzfkgxny8smjcgkid1nhdnl6qnlmbn9f8r5l"))))
(build-system gnu-build-system)
(arguments
(list
@@ -1961,32 +1933,32 @@ different sorts of messages in different formats.")
(license license:lgpl2.1+)))
(define-public telepathy-idle
- (package
- (name "telepathy-idle")
- (version "0.2.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/TelepathyIM/telepathy-idle")
- (commit (string-append "telepathy-idle-" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1pfw4g2cicw3ykxhsy743r0fc1yqbdrqxh2c5ha6am19dajcr95l"))))
- (build-system gnu-build-system)
- (native-inputs
- (list autoconf automake libtool pkg-config))
- (inputs
- (list libxslt python-2 python2-dbus))
- (propagated-inputs
- (list telepathy-glib))
- (home-page "https://telepathy.freedesktop.org/")
- (synopsis "Telepathy IRC connection manager")
- (description
- "Idle is an IRC connection manager for the Telepathy framework. This
+ ;; Use the latest commit, as the latest release does not support Python 3.
+ (let ((commit "b516eab0f2b92e078e0f5cab4224214d215b2ea5")
+ (revision "0"))
+ (package
+ (name "telepathy-idle")
+ (version (git-version "0.2.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/TelepathyIM/telepathy-idle")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "02wb61h2k3hhis5y2xi5rhc6pmikd13x722hk620sqb9b3m5pn3s"))))
+ (build-system gnu-build-system)
+ (native-inputs (list autoconf automake libtool pkg-config))
+ (inputs (list libxslt python-wrapper python-dbus))
+ (propagated-inputs (list telepathy-glib))
+ (home-page "https://telepathy.freedesktop.org/")
+ (synopsis "Telepathy IRC connection manager")
+ (description
+ "Idle is an IRC connection manager for the Telepathy framework. This
package enables usage of IRC channels and private messages in Telepathy instant
messaging clients such as Empathy, GNOME Shell or KDE Telepathy.")
- (license (list license:lgpl2.1 license:lgpl2.1+))))
+ (license (list license:lgpl2.1 license:lgpl2.1+)))))
(define-public telepathy-mission-control
(package
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 643e49b..0fba4f5 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3637,17 +3637,17 @@ for common mesh file formats, and collision detection.")
(package
(inherit irrlicht)
(name "irrlicht-for-minetest")
- (version "1.9.0mt8")
+ (version "1.9.0mt10")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minetest/irrlicht")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1646pj40dqkzbbc2lxzbmq2pjyrkgggbi2lah6pa5mv420p402kg"))))
+ "0y5vchz91khs8dmrkpgc7sqmvzx2yjj6svivvm80r4yppv7s03rw"))))
(build-system cmake-build-system)
(arguments
;; No check target.
@@ -6015,7 +6015,7 @@ for Un*x systems with X11.")
(define-public freeciv
(package
(name "freeciv")
- (version "3.0.6")
+ (version "3.0.7")
(source
(origin
(method url-fetch)
@@ -6027,7 +6027,7 @@ for Un*x systems with X11.")
(version-major+minor version) "/" version
"/freeciv-" version ".tar.xz")))
(sha256
- (base32 "0hp4mkbcf5sipqkfjynls4m1qlh6kn0mp3jlqjrjwylmgcah3rs0"))))
+ (base32 "1i6sm2ich9bazbg8wjzn8z1c5hgmg541lgw8f899fgfhgvqhdrpn"))))
(build-system gnu-build-system)
(inputs
(list curl cyrus-sasl gtk+ sdl-mixer zlib))
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 4ae9603..fd69e6d 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -110,15 +110,15 @@ as ASCII text.")
(define-public freeglut
(package
(name "freeglut")
- (version "3.2.2")
+ (version "3.4.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/FreeGLUTProject/freeglut/releases"
"/download/v" version "/freeglut-" version ".tar.gz"))
(sha256
(base32
- "0l3s57zw51fy3mn5qfdm4z775kfhflgxppanaxmskfzh5l44m565"))))
+ "1v7ayg3a03mv8b6lsr1qm21lbr8xg8dh3gdfxnbhl64vbn8wn2rw"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ;no test target
@@ -615,29 +615,32 @@ glxdemo, glxgears, glxheads, and glxinfo.")
(define-public glew
(package
(name "glew")
- (version "2.1.0")
+ (version "2.2.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/glew/glew/" version
"/glew-" version ".tgz"))
(sha256
(base32
- "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"))
+ "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "config/Makefile.linux"
(("= cc") "= gcc")
(("/lib64") "/lib"))
#t))))
(build-system gnu-build-system)
(arguments
- '(#:phases (modify-phases %standard-phases (delete 'configure))
- #:make-flags (list (string-append "GLEW_PREFIX="
- (assoc-ref %outputs "out"))
- (string-append "GLEW_DEST="
- (assoc-ref %outputs "out")))
- #:tests? #f)) ;no 'check' target
+ (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output)
+ (string-append "GLEW_DEST=" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-after 'install 'delete-static
+ (lambda _
+ (delete-file (string-append #$output "/lib/libGLEW.a")))))
+ #:tests? #f)) ;no 'check' target
(inputs
(list libxi libxmu libx11 mesa))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 725471c..9eb60c5 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2019 Jelle Licht <jlicht@fsfe.org>
;;; Copyright © 2019 Jonathan Frederickson <jonathan@terracrypt.net>
-;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2019 David Wilson <david@daviwil.com>
;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
@@ -2670,13 +2670,13 @@ forgotten when the session ends.")
(define-public evince
(package
(name "evince")
- (version "42.3")
+ (version "44.1")
(source (origin
(method url-fetch)
- (uri "mirror://gnome/sources/evince/42/evince-42.3.tar.xz")
+ (uri "mirror://gnome/sources/evince/44/evince-44.1.tar.xz")
(sha256
(base32
- "0pk42icnf4kdcaqaj17mcf4sxi82h1fdg2ds2zdrcv4lbj2czbj9"))))
+ "0523lzk7xpfr6gir8nx80fmp1lhajm837hilmgn8zczz2nxx7bqm"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
@@ -2687,8 +2687,10 @@ forgotten when the session ends.")
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
- (substitute* "meson_post_install.py"
- (("gtk-update-icon-cache") "true")))))))
+ (substitute* "meson.build"
+ (("(glib_compile_schemas|gtk_update_icon_cache|\
+update_desktop_database): true" _ tool)
+ (string-append tool ": false"))))))))
(inputs
(list libarchive
libgxps
@@ -5443,19 +5445,19 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.")
(define-public gi-docgen
(package
(name "gi-docgen")
- (version "2022.1")
+ (version "2023.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "gi-docgen" version))
(sha256
(base32
- "1v2wspm2ld27lq1n5v5pzrmkhchfa7p7ahp8rmjm4zcdyagqf7gr"))))
+ "18vzbw1k531qxi9qcwlxl97xk9dg16has7khg6a5d0pqrflyvbc8"))))
(build-system python-build-system)
(propagated-inputs (list python-jinja2
python-markdown
python-markupsafe
python-pygments
- python-toml
+ python-tomli
python-typogrify))
(home-page "https://gitlab.gnome.org/GNOME/gi-docgen")
(synopsis "Documentation tool for GObject-based libraries")
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 4d662d7..f080d72 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>
+;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,6 +32,7 @@
(define-module (gnu packages gnunet)
#:use-module (gnu packages)
+ #:use-module (gnu packages base)
#:use-module (gnu packages file)
#:use-module (gnu packages aidc)
#:use-module (gnu packages autotools)
@@ -259,82 +261,93 @@ supports HTTP, HTTPS and GnuTLS.")
(define-public gnunet
(package
- (name "gnunet")
- (version "0.19.3")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/gnunet/gnunet-" version
- ".tar.gz"))
- (sha256
- (base32
- "09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- ;; This is fixed in the upstream repository but the fix
- ;; has not been released.
- (substitute* "src/gns/test_proxy.sh"
- (("test_gnunet_proxy.conf") "test_gns_proxy.conf"))))))
- (build-system gnu-build-system)
- (inputs
- (list bluez
- glpk
- curl
- gnutls/dane
- gstreamer
- jansson
- libextractor
- libidn2
- libgcrypt
- libjpeg-turbo
- libltdl
- libmicrohttpd
- libogg
- libsodium
- libunistring
- miniupnpc
- opus
- pulseaudio
- sqlite
- zbar
- zlib))
- (native-inputs
- (list curl
- openssl
- pkg-config
- python
- python-sphinx
- python-sphinx-rtd-theme
- xxd
- (@ (gnu packages base) which)))
- (arguments
- '(#:parallel-tests? #f ; Parallel tests aren't supported.
+ (name "gnunet")
+ (version "0.19.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gnunet/gnunet-" version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "16q0mkkr9b33wlm307ignfgvv0kilzr42155m5dpz66m13s3v9h0"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; This is fixed in the upstream repository but the fix
+ ;; has not been released.
+ (substitute* "src/gns/test_proxy.sh"
+ (("test_gnunet_proxy.conf") "test_gns_proxy.conf"))))))
+ (build-system gnu-build-system)
+ (inputs
+ (list bluez
+ glpk
+ curl
+ gnutls/dane
+ gstreamer
+ jansson
+ libextractor
+ libidn2
+ libgcrypt
+ libjpeg-turbo
+ libltdl
+ libmicrohttpd
+ libogg
+ libsodium
+ libunistring
+ miniupnpc
+ opus
+ pulseaudio
+ sqlite
+ zbar
+ zlib))
+ (native-inputs
+ (list curl
+ openssl
+ pkg-config
+ python
+ python-sphinx
+ python-sphinx-rtd-theme
+ xxd
+ which))
+ (arguments
+ (list
+ #:parallel-tests? #f ;parallel tests aren't supported
#:phases
- (modify-phases %standard-phases
- (add-before 'check 'set-env-var-for-tests
- (lambda _
- (setenv "LANG" "en_US.UTF-8")))
- ;; Swap 'check and 'install phases and add installed binaries to $PATH.
- (add-before 'check 'set-path-for-check
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (setenv "GNUNET_PREFIX" (string-append out "/lib"))
- (setenv "PATH" (string-append (getenv "PATH") ":" out "/bin")))
- #t))
- (delete 'check)
- (add-after 'install 'check
- (assoc-ref %standard-phases 'check)))))
- (synopsis "Secure, decentralized, peer-to-peer networking framework")
- (description
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ (substitute* "src/cadet/Makefile.in"
+ ;; The speed_reliable tests appear to be unreliable (see:
+ ;; https://bugs.gnunet.org/view.php?id=7787).
+ (("test_cadet_[0-9]+_speed_reliable\\$\\(EXEEXT)")
+ ""))
+ (substitute* "src/core/Makefile.in"
+ ;; The 'test_core_api' test fails non-deterministically (see:
+ ;; https://bugs.gnunet.org/view.php?id=7784).
+ (("test_core_api\\$\\(EXEEXT) ") ""))))
+ (add-before 'check 'set-env-var-for-tests
+ (lambda _
+ (setenv "LANG" "en_US.UTF-8")))
+ ;; Swap 'check and 'install phases and add installed binaries to $PATH.
+ (add-before 'check 'set-path-for-check
+ (lambda _
+ (setenv "GNUNET_PREFIX" (string-append #$output "/lib"))
+ (setenv "PATH" (string-append (getenv "PATH") ":"
+ #$output "/bin"))))
+ (delete 'check)
+ (add-after 'install 'check
+ (assoc-ref %standard-phases 'check)))))
+ (synopsis "Secure, decentralized, peer-to-peer networking framework")
+ (description
"GNUnet is a framework for secure peer-to-peer networking. The
high-level goal is to provide a strong foundation of free software for a
global, distributed network that provides security and privacy. GNUnet in
that sense aims to replace the current internet protocol stack. Along with
an application for secure publication of files, it has grown to include all
kinds of basic applications for the foundation of a GNU internet.")
- (license license:agpl3+)
- (home-page "https://gnunet.org/en/")))
+ (license license:agpl3+)
+ (home-page "https://www.gnunet.org/en/")))
(define-public guile-gnunet ;GSoC 2015!
(let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602")
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 932c0f9..c17ce27 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -704,9 +704,11 @@ variable defined below. It requires guile-json to be installed."
libxcomposite
libxt
libffi
- ffmpeg
+ ;; Support for FFmpeg 6 was only added in version 112 (see:
+ ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
+ ffmpeg-5
libvpx
- icu4c-71 ; TODO: Change to 'icu4c' when its version is >= 71.
+ icu4c-71 ;TODO: Change to 'icu4c' when its version is >= 71.
pixman
pulseaudio
mesa
@@ -962,7 +964,7 @@ variable defined below. It requires guile-json to be installed."
;; complain that it's not able to change Cargo.lock.
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
(substitute* "build/RunCbindgen.py"
- (("\"--frozen\",") ""))))
+ (("\"--frozen\",") ""))))
(delete 'bootstrap)
(replace 'configure
;; configure does not work followed by both "SHELL=..." and
@@ -1116,6 +1118,176 @@ standards of the IceCat project.")
"ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl"
"tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
+(define icecat-102.9.0-source
+ (let* ((base-version "102.9.0")
+ (version "102.9.0-guix0-preview1")
+ (major-version (first (string-split base-version #\.)))
+ (minor-version (second (string-split base-version #\.)))
+ (sub-version (third (string-split base-version #\.)))
+
+ (upstream-firefox-version (string-append base-version "esr"))
+ (upstream-firefox-source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://ftp.mozilla.org/pub/firefox/releases/"
+ upstream-firefox-version "/source/"
+ "firefox-" upstream-firefox-version ".source.tar.xz"))
+ (sha256
+ (base32
+ "1l8xlbba8sa9dg132k96ch8mz97i5lyhpvkxi8d85jh97xi79c1i"))))
+
+ ;; The upstream-icecat-base-version may be older than the
+ ;; base-version.
+ (upstream-icecat-base-version base-version)
+ (gnuzilla-commit "f55ede39713d1533734f37e39927cbb78abe1604")
+ (gnuzilla-source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://git.savannah.gnu.org/gnuzilla.git")
+ (commit gnuzilla-commit)))
+ (file-name (git-file-name "gnuzilla"
+ ;;upstream-icecat-base-version
+ (string-take gnuzilla-commit 8)))
+ (sha256
+ (base32
+ "0z15h3lxfn9pmj5bj62qim3h320dcd2v69xrg1phb7lh5gq0bylf"))))
+
+ ;; 'search-patch' returns either a valid file name or #f, so wrap it
+ ;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
+ (makeicecat-patch
+ (local-file (assume-valid-file-name
+ (search-patch "icecat-makeicecat.patch")))))
+
+ (origin
+ (method computed-origin-method)
+ (file-name (string-append "icecat-" version ".tar.xz"))
+ (sha256 #f)
+ (uri
+ (delay
+ (with-imported-modules '((guix build utils))
+ #~(begin
+ (use-modules (guix build utils))
+ (let ((firefox-dir
+ (string-append "firefox-" #$base-version))
+ (icecat-dir
+ (string-append "icecat-" #$version)))
+
+ (set-path-environment-variable
+ "PATH" '("bin")
+ (list #+python
+ #+(canonical-package bash)
+ #+(canonical-package coreutils)
+ #+(canonical-package findutils)
+ #+(canonical-package patch)
+ #+(canonical-package xz)
+ #+(canonical-package sed)
+ #+(canonical-package grep)
+ #+(canonical-package bzip2)
+ #+(canonical-package gzip)
+ #+(canonical-package tar)))
+
+ (set-path-environment-variable
+ "PYTHONPATH"
+ (list #+(format #f "lib/python~a/site-packages"
+ (version-major+minor
+ (package-version python))))
+ '#+(cons python-jsonschema
+ (map second
+ (package-transitive-propagated-inputs
+ python-jsonschema))))
+
+ ;; Needed by the 'makeicecat' script.
+ (setenv "RENAME_CMD" "rename")
+
+ ;; We copy the gnuzilla source directory because it is
+ ;; read-only in 'gnuzilla-source', and the makeicecat script
+ ;; uses "cp -a" to copy parts of it and assumes that the
+ ;; copies will be writable.
+ (copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
+ #:log (%make-void-port "w"))
+
+ (with-directory-excursion "/tmp/gnuzilla"
+ (make-file-writable "makeicecat")
+ (invoke "patch" "--force" "--no-backup-if-mismatch"
+ "-p1" "--input" #+makeicecat-patch)
+ (patch-shebang "makeicecat")
+ (substitute* "makeicecat"
+ (("^readonly FFMAJOR=(.*)" all ffmajor)
+ (unless (string=? #$major-version
+ (string-trim-both ffmajor))
+ ;; The makeicecat script cannot be expected to work
+ ;; properly on a different version of Firefox, even if
+ ;; no errors occur during execution.
+ (error "makeicecat major version mismatch"))
+ (string-append "readonly FFMAJOR=" #$major-version "\n"))
+ (("^readonly FFMINOR=.*")
+ (string-append "readonly FFMINOR=" #$minor-version "\n"))
+ (("^readonly FFSUB=.*")
+ (string-append "readonly FFSUB=" #$sub-version "\n"))
+ (("^readonly DATADIR=.*")
+ "readonly DATADIR=/tmp/gnuzilla/data\n")
+ (("^readonly SOURCEDIR=.*")
+ (string-append "readonly SOURCEDIR=" icecat-dir "\n"))
+ (("/bin/sed")
+ #+(file-append (canonical-package sed) "/bin/sed"))))
+
+ (format #t "Unpacking upstream firefox tarball...~%")
+ (force-output)
+ (invoke "tar" "xf" #+upstream-firefox-source)
+ (rename-file firefox-dir icecat-dir)
+
+ (with-directory-excursion icecat-dir
+ (format #t "Populating l10n directory...~%")
+ (force-output)
+ (mkdir "l10n")
+ (with-directory-excursion "l10n"
+ (for-each
+ (lambda (locale-dir)
+ (let ((locale
+ (string-drop (basename locale-dir)
+ (+ 32 ; length of hash
+ (string-length "-mozilla-locale-")))))
+ (format #t " ~a~%" locale)
+ (force-output)
+ (copy-recursively locale-dir locale
+ #:log (%make-void-port "w"))
+ (for-each make-file-writable (find-files locale))
+ (with-directory-excursion locale
+ (when (file-exists? ".hgtags")
+ (delete-file ".hgtags"))
+ (mkdir-p "browser/chrome/browser/preferences")
+ (call-with-output-file
+ "browser/chrome/browser/preferences/advanced-scripts.dtd"
+ (lambda (port) #f)))))
+ '#+all-mozilla-locales)
+ (copy-recursively #+mozilla-compare-locales
+ "compare-locales"
+ #:log (%make-void-port "w"))
+ (delete-file "compare-locales/.gitignore")
+ (delete-file "compare-locales/.hgignore")
+ (delete-file "compare-locales/.hgtags")))
+
+ (format #t "Running makeicecat script...~%")
+ (force-output)
+ (invoke "bash" "/tmp/gnuzilla/makeicecat")
+
+ (format #t "Packing IceCat source tarball...~%")
+ (force-output)
+ (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args)))
+ (invoke "tar" "cfa" #$output
+ ;; Avoid non-determinism in the archive. We set the
+ ;; mtime of files in the archive to early 1980 because
+ ;; the build process fails if the mtime of source
+ ;; files is pre-1980, due to the creation of zip
+ ;; archives.
+ "--mtime=@315619200" ; 1980-01-02 UTC
+ "--owner=root:0"
+ "--group=root:0"
+ "--sort=name"
+ icecat-dir)))))))))
+
(define %icedove-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-version "102.10.0")
@@ -1191,7 +1363,7 @@ list of languages supported as well as the currently used changeset."
;; Extract the base Icecat tarball, renaming its top-level
;; directory.
(invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
- "-xf" #$icecat-source)
+ "-xf" #$icecat-102.9.0-source)
(chdir #$name)
;; Merge the Thunderdbird localization data.
@@ -1494,7 +1666,8 @@ ca495991b7852b855"))
cairo
cups
dbus-glib
- ffmpeg
+ ;; Support for FFmpeg 6 was only added in version 112 (see:
+ ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
freetype
gdk-pixbuf
glib
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7709053..24dae34 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -244,7 +244,7 @@
(native-inputs
(list pkg-config which net-base perl))
- (home-page "https://golang.org/")
+ (home-page "https://go.dev/")
(synopsis "Compiler and libraries for Go, a statically-typed language")
(description "Go, also commonly referred to as golang, is an imperative
programming language designed primarily for systems programming. Go is a
@@ -631,17 +631,17 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(package
(inherit go-1.16)
(name "go")
- (version "1.17.11")
+ (version "1.17.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/golang/go")
(commit (string-append "go" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "11wy6092qm7v0n10cjkyp49sbchqazi3vnij8k2sq7k7jaj63z5p"))))
+ "05m8gr050kagvn22lfnjrgms03l5iphd1m4v6z7yqlhn9gdp912d"))))
(outputs '("out" "tests")) ; 'tests' contains distribution tests.
(arguments
`(#:modules ((ice-9 match)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 336f1dd..e84ae9b 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -480,100 +480,95 @@ typically encountered in feature film production.")
(define-public blender
(package
(name "blender")
- (version "3.3.1")
+ (version "3.3.5") ;3.3.x is the current LTS version
(source (origin
(method url-fetch)
(uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz"))
(sha256
(base32
- "1jlc26axbhh97d2j6kfg9brgiq8j412mgmw7p41ah34apzq4inia"))))
+ "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502"))))
(build-system cmake-build-system)
(arguments
+ (list
+ ;; Test files are very large and not included in the release tarball.
+ #:tests? #f
+ #:configure-flags
(let ((python-version (version-major+minor (package-version python))))
- `(;; Test files are very large and not included in the release tarball.
- #:tests? #f
- #:configure-flags
- (list "-DWITH_CODEC_FFMPEG=ON"
- "-DWITH_CODEC_SNDFILE=ON"
- "-DWITH_CYCLES=ON"
- "-DWITH_DOC_MANPAGE=ON"
- "-DWITH_FFTW3=ON"
- "-DWITH_IMAGE_OPENJPEG=ON"
- "-DWITH_INPUT_NDOF=ON"
- "-DWITH_INSTALL_PORTABLE=OFF"
- "-DWITH_JACK=ON"
- "-DWITH_MOD_OCEANSIM=ON"
- "-DWITH_OPENVDB=ON"
- "-DWITH_OPENSUBDIV=ON"
- "-DWITH_PYTHON_INSTALL=OFF"
- (string-append "-DPYTHON_LIBRARY=python" ,python-version)
- (string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python")
- "/lib")
- (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python")
- "/include/python" ,python-version)
- (string-append "-DPYTHON_VERSION=" ,python-version)
- (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS="
- (assoc-ref %build-inputs "python-numpy")
- "/lib/python" ,python-version "/site-packages/numpy/core/include/")
- (string-append "-DPYTHON_NUMPY_PATH="
- (assoc-ref %build-inputs "python-numpy")
- "/lib/python" ,python-version "/site-packages/"))
- #:phases
- (modify-phases %standard-phases
- ;; XXX This file doesn't exist in the Git sources but will probably
- ;; exist in the eventual 2.80 source tarball.
- (add-after 'unpack 'fix-broken-import
- (lambda _
- (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
- (("import encode_bin") "from . import encode_bin"))
- #t))
- (add-after 'set-paths 'add-ilmbase-include-path
- (lambda* (#:key inputs #:allow-other-keys)
- ;; OpenEXR propagates ilmbase, but its include files do not
- ;; appear in the C_INCLUDE_PATH, so we need to add
- ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy
- ;; the dependency on "half.h" and "Iex.h".
- (let ((headers (string-append
- (assoc-ref inputs "ilmbase")
- "/include/OpenEXR")))
- (setenv "C_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "C_INCLUDE_PATH") "")))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-append headers ":"
- (or (getenv "CPLUS_INCLUDE_PATH") ""))))))))))
+ #~(list "-DWITH_CODEC_FFMPEG=ON"
+ "-DWITH_CODEC_SNDFILE=ON"
+ "-DWITH_CYCLES=ON"
+ "-DWITH_DOC_MANPAGE=ON"
+ "-DWITH_FFTW3=ON"
+ "-DWITH_IMAGE_OPENJPEG=ON"
+ "-DWITH_INPUT_NDOF=ON"
+ "-DWITH_INSTALL_PORTABLE=OFF"
+ "-DWITH_JACK=ON"
+ "-DWITH_MOD_OCEANSIM=ON"
+ "-DWITH_OPENVDB=ON"
+ "-DWITH_OPENSUBDIV=ON"
+ "-DWITH_PYTHON_INSTALL=OFF"
+ (string-append "-DPYTHON_LIBRARY=python" #$python-version)
+ (string-append "-DPYTHON_LIBPATH="
+ (assoc-ref %build-inputs "python")
+ "/lib")
+ (string-append "-DPYTHON_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python")
+ "/include/python" #$python-version)
+ (string-append "-DPYTHON_VERSION=" #$python-version)
+ (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS="
+ (assoc-ref %build-inputs "python-numpy")
+ "/lib/python" #$python-version
+ "/site-packages/numpy/core/include/")
+ (string-append "-DPYTHON_NUMPY_PATH="
+ (assoc-ref %build-inputs "python-numpy")
+ "/lib/python" #$python-version
+ "/site-packages/")
+ ;; OpenEXR propagates ilmbase, but its include files do not
+ ;; appear in the C_INCLUDE_PATH, so we need to add
+ ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to
+ ;; satisfy the dependency on "half.h" and "Iex.h".
+ (string-append "-DCMAKE_CXX_FLAGS=-I"
+ (search-input-directory %build-inputs
+ "include/OpenEXR"))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-broken-import
+ (lambda _
+ (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
+ (("import encode_bin")
+ "from . import encode_bin")))))))
(inputs
- `(("boost" ,boost)
- ("jemalloc" ,jemalloc)
- ("libx11" ,libx11)
- ("libxi" ,libxi)
- ("libxrender" ,libxrender)
- ("opencolorio" ,opencolorio)
- ("openimageio" ,openimageio)
- ("openexr" ,openexr-2)
- ("opensubdiv" ,opensubdiv)
- ("ilmbase" ,ilmbase)
- ("openjpeg" ,openjpeg)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)
- ("ffmpeg" ,ffmpeg)
- ("fftw" ,fftw)
- ("gmp" ,gmp) ;; needed for boolean operations on meshes
- ("jack" ,jack-1)
- ("libsndfile" ,libsndfile)
- ("freetype" ,freetype)
- ("glew" ,glew)
- ("openal" ,openal)
- ("pugixml" ,pugixml)
- ("python" ,python)
- ("python-numpy" ,python-numpy)
- ("openvdb" ,openvdb)
- ("tbb" ,tbb)
- ("zlib" ,zlib)
- ("zstd" ,zstd "lib")
- ("embree" ,embree)))
+ (list boost
+ embree
+ ffmpeg-5
+ fftw
+ freetype
+ glew
+ gmp ;needed for boolean operations on meshes
+ ilmbase
+ jack-1
+ jemalloc
+ libjpeg-turbo
+ libpng
+ libsndfile
+ libtiff
+ libx11
+ libxi
+ libxrender
+ openal
+ opencolorio
+ openexr-2
+ openimageio
+ openjpeg
+ opensubdiv
+ openvdb
+ pugixml
+ python
+ python-numpy
+ tbb
+ zlib
+ `(,zstd "lib")))
(home-page "https://blender.org/")
(synopsis "3D graphics creation suite")
(description
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index f33a30a..0d05143 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -44,6 +44,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages cdrom)
#:use-module (gnu packages curl)
#:use-module (gnu packages compression)
@@ -403,15 +404,15 @@ arrays of data.")
(define-public gstreamer-docs
(package
(name "gstreamer-docs")
- (version "1.20.3")
+ (version "1.22.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://gstreamer.freedesktop.org/src/gstreamer-docs"
"/gstreamer-docs-" version ".tar.xz"))
(sha256
(base32
- "1gziccq5f4fy23q6dm8nwbmzh68gn9rfbqw0xcn4r8yn82545z3k"))))
+ "1fljaydlinzw9jf5nkhwf7ihfzd5250k2cv220mi8dxxf7rgn18y"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
@@ -463,19 +464,21 @@ the GStreamer multimedia framework.")
(define-public gstreamer
(package
(name "gstreamer")
- (version "1.20.3")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri (string-append
"https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-"
version ".tar.xz"))
(sha256
(base32
- "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0"))))
+ "08cfz2vkf494rsg0bn75px26fxs3syvxnsc9lj5n074j0cvfgbxj"))))
(build-system meson-build-system)
(arguments
- (list #:phases
+ (list #:disallowed-references (list python)
+ #:meson meson-0.63
+ #:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
#$@(if (string-prefix? "i686" (or (%current-target-system)
@@ -491,22 +494,32 @@ test_stress_cleanup_unschedule.*")
(("tcase_add_test \\(tc_chain, \
test_stress_reschedule.*")
"")))))
- '()))))
+ '())
+ (add-after 'patch-shebangs 'do-not-capture-python
+ (lambda _
+ ;; The patch-source-shebangs phase causes the following build
+ ;; script to reference Python in its shebang, which is
+ ;; unnecessary.
+ (substitute* (string-append
+ #$output "/libexec/gstreamer-1.0/"
+ "gst-plugins-doc-cache-generator")
+ (((which "python3"))
+ "/usr/bin/env python3")))))))
(propagated-inputs
;; In gstreamer-1.0.pc:
;; Requires: glib-2.0, gobject-2.0
;; Requires.private: gmodule-no-export-2.0 libunwind libdw
- (list elfutils ; libdw
+ (list elfutils ;libdw
glib libunwind))
(native-inputs
(list bash-completion
bison flex
gettext-minimal
`(,glib "bin")
gobject-introspection
perl
pkg-config
- python-wrapper))
+ python))
(inputs
(list gmp libcap
;; For tests.
@@ -533,15 +546,15 @@ This package provides the core library and elements.")
(define-public gst-plugins-base
(package
(name "gst-plugins-base")
- (version "1.20.3")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y"))))
+ "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))))
(build-system meson-build-system)
(propagated-inputs
(list glib ;required by gstreamer-sdp-1.0.pc
@@ -580,6 +593,7 @@ This package provides the core library and elements.")
xorg-server-for-tests))
(arguments
(list
+ #:meson meson-0.63
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
@@ -632,19 +646,20 @@ for the GStreamer multimedia library.")
(define-public gst-plugins-good
(package
(name "gst-plugins-good")
- (version "1.20.3")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri
(string-append
"https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq"))))
+ (base32 "1p8cpkk4dynglw0xswqyf57xl5fnxmb3xld71kv35cpj4nacb33w"))))
(build-system meson-build-system)
(arguments
(list
+ #:meson meson-0.63
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
#~(modify-phases %standard-phases
@@ -659,6 +674,11 @@ for the GStreamer multimedia library.")
(string-append prefix "\"" libsoup "\"\n")))))
(add-after 'unpack 'skip-failing-tests
(lambda _
+ (substitute* "tests/check/elements/flvmux.c"
+ ;; This test randomly times out (see:
+ ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/786).
+ ((".*tcase_add_test.*test_video_caps_late.*")
+ ""))
(substitute* "tests/check/meson.build"
;; Reported as shaky upstream, see
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785>
@@ -746,37 +766,28 @@ model to base your own plug-in on, here it is.")
(define-public gst-plugins-bad
(package
(name "gst-plugins-bad")
- (version "1.20.3")
+ (version "1.22.2")
(source (origin
(method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz"))
(sha256
(base32
- "0kys6m5hg5bc30wfg8qa3s7dmkdz3kj1j8lhvn3267fxalxw24bs"))
+ "03rd09wsrf9xjianpnnvamb4n3lndhd4x31srqsqab20wcfaz3rx"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete bundled copy of usrsctp.
(delete-file-recursively "ext/sctp/usrsctp")))))
(build-system meson-build-system)
(arguments
(list
+ #:meson meson-0.63
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled")
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
- #$@(if (string-prefix? "arm" (or (%current-target-system)
- (%current-system)))
- ;; Disable test that fails on ARMv7.
- ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188
- `((add-after 'unpack 'disable-asfmux-test
- (lambda _
- (substitute* "tests/check/meson.build"
- (("\\[\\['elements/asfmux\\.c'\\]\\],")
- "")))))
- '())
(add-after 'unpack 'adjust-tests
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
@@ -788,29 +799,19 @@ model to base your own plug-in on, here it is.")
(string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
gst-plugins-good "/lib/gstreamer-1.0'"))
- ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136
- ((".*elements/msdkh264enc\\.c.*") "")
- ((".*elements/svthevcenc\\.c.*") "")
-
;; The 'elements_shm.test_shm_live' test sometimes times out
;; (see:
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
((".*'elements/shm\\.c'.*") "")
- ;; FIXME: Why is this failing.
- ((".*elements/dash_mpd\\.c.*") "")
-
;; This test is flaky on at least some architectures.
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
#$@(if (member (%current-system)
'("i686-linux" "aarch64-linux" "riscv64-linux"))
`((("'elements/camerabin\\.c'\\]\\],")
"'elements/camerabin.c'], true, ],"))
'())
- ;; These tests are flaky and occasionally time out:
- ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
- ((".*elements/curlhttpsrc\\.c.*") "")
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
((".*elements/dtls\\.c.*") ""))
(substitute* "tests/check/elements/zxing.c"
@@ -949,18 +950,19 @@ par compared to the rest.")
(define-public gst-plugins-ugly
(package
(name "gst-plugins-ugly")
- (version "1.20.3")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1zdfsq0zm1d3wj3w3z44bf3v28clr8yd6qzmkjs09hq9k9w21alc"))))
+ (base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g"))))
(build-system meson-build-system)
(arguments
- (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ (list #:meson meson-0.63
+ #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
@@ -1006,17 +1008,18 @@ think twice about shipping them.")
(define-public gst-libav
(package
(name "gst-libav")
- (version "1.20.3")
+ (version "1.22.2")
(source
(origin
(method url-fetch)
(uri
(string-append
"https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1zkxybdzdkn07wwmj0rrgxyvbry472dggjv2chdsmpzwc02x3v9z"))))
+ (base32 "1zfg7giwampmjxkqr5pqy66vck42b0akmwby661brwz8iy3zkapw"))))
(build-system meson-build-system)
+ (arguments (list #:meson meson-0.63))
(native-inputs
(list perl pkg-config python-wrapper ruby))
(inputs
@@ -1032,18 +1035,19 @@ decoders, muxers, and demuxers provided by FFmpeg.")
(define-public gst-editing-services
(package
(name "gst-editing-services")
- (version "1.20.3")
+ (version "1.22.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://gstreamer.freedesktop.org/src/" name "/"
"gst-editing-services-" version ".tar.xz"))
(sha256
(base32
- "18msiadg6wi1636ylp02yfiwphxlz39gh3vbxchl9qpvd7g9dn2z"))))
+ "1gyfw11ns2la1cm6gvvvv5qj3q5gcvcypc3wk8kdwmrqzij18fs5"))))
(build-system meson-build-system)
(arguments
(list
+ #:meson meson-0.63
#:tests? #f ; FIXME: 16/23 failing tests.
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #~(modify-phases %standard-phases
@@ -1100,18 +1104,19 @@ binary, but none of the actual plugins.")))
(define-public python-gst
(package
(name "python-gst")
- (version "1.20.3")
+ (version "1.22.2")
(source (origin
(method url-fetch)
(uri (string-append
"https://gstreamer.freedesktop.org/src/gst-python/"
"gst-python-" version ".tar.xz"))
(sha256
(base32
- "1p6g05k88nbbv5x9madsvphxcdkfl1z0lmp39p6bhmg9x8h82d6v"))))
+ "1bak46bj92gyz613m99mnl0yw0qhbhq5dfxifnvldgp45kcb7wmy"))))
(build-system meson-build-system)
(arguments
(list
+ #:meson meson-0.63
#:modules `((guix build meson-build-system)
(guix build utils)
((guix build python-build-system) #:prefix python:))
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 2bcad54..a1d9e3f 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -91,7 +91,7 @@
(outputs '("out" "doc"))
(arguments
(list
- #:configure-flags #~(list "--enable-python-library"
+ #:configure-flags #~(list "--disable-gtk2"
"--enable-gtk-doc"
"--enable-memconf"
(string-append
@@ -186,29 +186,23 @@
(string-append #$output:doc "/share/gtk-doc"))))
(add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
- ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
- ;; GI_TYPELIB_PATH.
+ ;; Make sure 'ibus-setup' runs with the correct GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup")
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0")))))))))
(inputs
(list bash-minimal
dbus
dconf
glib
- gtk+-2
gtk+
iso-codes
json-glib
libnotify
libx11
libxkbcommon
libxtst
- python-pygobject
- python
- python-dbus
setxkbmap
ucd
unicode-cldr-common
@@ -244,9 +238,23 @@ may also simplify input method development.")
(define-public ibus
(package/inherit ibus-minimal
- (arguments (substitute-keyword-arguments (package-arguments ibus-minimal)
- ((#:configure-flags flags)
- #~(cons* "--enable-gtk4" #$flags))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ibus-minimal)
+ ((#:configure-flags flags)
+ #~(cons* "--enable-gtk4"
+ "--enable-python-library"
+ #$flags))
+ ((#:phases phases '%standard-phases)
+ #~(modify-phases #$phases
+ (replace 'wrap-with-additional-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Make sure 'ibus-setup' runs with the correct
+ ;; GUIX_PYTHONPATH and GI_TYPELIB_PATH.
+ (wrap-program (search-input-file outputs "bin/ibus-setup")
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+ `("GI_TYPELIB_PATH" ":" prefix
+ (,(getenv "GI_TYPELIB_PATH")
+ ,(string-append #$output "/lib/girepository-1.0"))))))))))
(inputs (modify-inputs (package-inputs ibus-minimal)
(prepend gtk)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a236ff7..ceb33df 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1303,7 +1303,7 @@ language bindings to VIGRA.")
(define-public libwebp
(package
(name "libwebp")
- (version "1.2.2")
+ (version "1.2.4")
(source
(origin
;; No tarballs are provided for >0.6.1.
@@ -1314,7 +1314,7 @@ language bindings to VIGRA.")
(file-name (git-file-name name version))
(sha256
(base32
- "1khqkm5j9aiii9jfsbxzzyz3x33sifzcx537cyjyb3a2g2rl969k"))))
+ "1jndbc99dd19a6d7h4ds51xyak7gfddkbi41nxdm8n23w7ks35r8"))))
(build-system gnu-build-system)
(inputs
(list freeglut
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index acf57c2..db120f2 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -68,7 +68,7 @@
#:use-module (guix packages)
#:use-module (guix utils))
-(define %jami-version "20230206.0")
+(define %jami-version "20230323.0")
(define %jami-sources
;; Return an origin object of the tarball release sources archive of the
@@ -85,7 +85,7 @@
'(delete-file-recursively "daemon/contrib/tarballs"))
(sha256
(base32
- "1fx7c6q8j0x3q8cgzzd4kpsw3npqggsi1n493cv1jg7v5d01d3jz"))
+ "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2"))
(patches (search-patches "jami-disable-integration-tests.patch"
"jami-libjami-headers-search.patch"))))
@@ -107,8 +107,8 @@
patches))))
(define-public pjproject-jami
- (let ((commit "20e00fcdd16459444bae2bae9c0611b63cf87297")
- (revision "2"))
+ (let ((commit "e4b83585a0bdf1523e808a4fc1946ec82ac733d0")
+ (revision "3"))
(package
(inherit pjproject)
(name "pjproject-jami")
@@ -127,7 +127,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "1g8nkb5ln5y208k2hhmlcddv2dzf6plfrsvi4x8sa7iwgb4prgb8"))))
+ "0gky5idyyqxhqk959lzys5l7x1i925db773lfdpvxxmkmfizdq21"))))
(arguments
(substitute-keyword-arguments (package-arguments pjproject)
((#:phases phases '%standard-phases)
@@ -179,6 +179,7 @@
"--enable-muxer=h264"
"--enable-muxer=hevc"
"--enable-muxer=matroska"
+ "--enable-muxer=wav"
"--enable-muxer=webm"
"--enable-muxer=ogg"
"--enable-muxer=pcm_s16be"
@@ -257,40 +258,30 @@
"--enable-encoder=libopus"
"--enable-decoder=libopus"
- ;; Decoders for ringtones and audio streaming.
+ ;; Encoders/decoders for ringtones and audio streaming.
"--enable-decoder=flac"
"--enable-decoder=vorbis"
"--enable-decoder=aac"
"--enable-decoder=ac3"
"--enable-decoder=eac3"
"--enable-decoder=mp3"
- "--enable-decoder=pcm_u24be"
"--enable-decoder=pcm_u24le"
- "--enable-decoder=pcm_u32be"
"--enable-decoder=pcm_u32le"
"--enable-decoder=pcm_u8"
"--enable-decoder=pcm_f16le"
- "--enable-decoder=pcm_f24le"
- "--enable-decoder=pcm_f32be"
"--enable-decoder=pcm_f32le"
- "--enable-decoder=pcm_f64be"
"--enable-decoder=pcm_f64le"
- "--enable-decoder=pcm_s16be"
- "--enable-decoder=pcm_s16be_planar"
"--enable-decoder=pcm_s16le"
- "--enable-decoder=pcm_s16le_planar"
- "--enable-decoder=pcm_s24be"
"--enable-decoder=pcm_s24le"
- "--enable-decoder=pcm_s24le_planar"
- "--enable-decoder=pcm_s32be"
"--enable-decoder=pcm_s32le"
- "--enable-decoder=pcm_s32le_planar"
- "--enable-decoder=pcm_s64be"
"--enable-decoder=pcm_s64le"
- "--enable-decoder=pcm_s8"
- "--enable-decoder=pcm_s8_planar"
- "--enable-decoder=pcm_u16be"
"--enable-decoder=pcm_u16le"
+ "--enable-encoder=pcm_u8"
+ "--enable-encoder=pcm_f32le"
+ "--enable-encoder=pcm_f64le"
+ "--enable-encoder=pcm_s16le"
+ "--enable-encoder=pcm_s32le"
+ "--enable-encoder=pcm_s64le"
;; Encoders/decoders for images.
"--enable-encoder=gif"
@@ -349,21 +340,10 @@
(define-public ffmpeg-jami
(package
- (inherit ffmpeg-5)
+ (inherit ffmpeg)
(name "ffmpeg-jami")
- ;; XXX: Use a slightly older version, otherwise the
- ;; 'libopusdec-enable-FEC' patch doesn't apply.
- (version "5.0.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
- version ".tar.xz"))
- (sha256
- (base32
- "0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg"))))
- (outputs '("out" "debug"))
(arguments
- (substitute-keyword-arguments (package-arguments ffmpeg-5)
+ (substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags _ '())
#~(cons* "--disable-static"
"--enable-shared"
@@ -382,19 +362,7 @@
"rtp_ext_abs_send_time"
"libopusdec-enable-FEC"
"libopusenc-reload-packet-loss-at-encode"
- "screen-sharing-x11-fix"))))
- (add-after 'apply-patches 'disable-problematic-tests
- (lambda _
- ;; The "rtp_ext_abs_send_time" patch causes the 'lavf-mov_rtphint'
- ;; test to fail (see:
- ;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/685).
- (substitute* "tests/fate/lavf-container.mak"
- (("mov mov_rtphint ismv")
- "mov ismv")
- (("fate-lavf-mov_rtphint:.*") ""))))))))
- (inputs (modify-inputs (package-inputs ffmpeg-5)
- (replace "libvpx" libvpx-next)
- (replace "libx264" libx264-next)))))
+ "screen-sharing-x11-fix"))))))))))
(define-public libjami
(package
@@ -570,8 +538,8 @@ P2P-DHT.")
(define-public jami-docs
;; There aren't any tags, so use the latest commit.
- (let ((revision "0")
- (commit "b00574bcc46538c4b405b5edb3b43bf5404ff511"))
+ (let ((revision "1")
+ (commit "ff466ebadb9b99a1672a814126793de670c3099b"))
(package
(name "jami-docs")
(version (git-version "0.0.0" revision commit))
@@ -583,7 +551,7 @@ P2P-DHT.")
(file-name (git-file-name name version))
(sha256
(base32
- "0iayi6yrb6djk0l2dwdxzlsga9c18ra8adplh8dad3zjdi75wnsq"))))
+ "1n8a9dk8mi617rk3ycz5jrzbwv9ybfynlci5faz1klckx0aqdf6q"))))
(build-system copy-build-system)
(arguments
(list
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 10b8ac0..3dbce00 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -97,16 +97,16 @@
(define-public extra-cmake-modules
(package
(name "extra-cmake-modules")
- (version "5.98.0")
+ (version "5.104.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kde/stable/frameworks/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w"))))
+ "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4"))))
(build-system cmake-build-system)
(native-inputs
;; Add test dependency, except on armhf where building it is too
@@ -523,21 +523,19 @@ and the older vCalendar.")
(define-public kcodecs
(package
(name "kcodecs")
- (version "5.98.0")
+ (version "5.104.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kde/stable/frameworks/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32
- "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz"))))
+ "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby"))))
(build-system cmake-build-system)
- (native-inputs
- (list extra-cmake-modules gperf qttools-5))
- (inputs
- (list qtbase-5))
+ (native-inputs (list extra-cmake-modules gperf qttools-5))
+ (inputs (list qtbase-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "String encoding and manipulating library")
(description "KCodecs provide a collection of methods to manipulate
diff --git a/gnu/packages/less.scm b/gnu/packages/less.scm
index 99bcb04..1ac15c3 100644
--- a/gnu/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,17 +37,17 @@
(define-public less
(package
(name "less")
- (version "590")
+ (version "608")
(source
(origin
(method url-fetch)
(uri (list (string-append "mirror://gnu/less/less-"
version ".tar.gz")
(string-append "http://www.greenwoodsoftware.com/less/less-"
version ".tar.gz")))
(patches (search-patches "less-hurd-path-max.patch"))
(sha256
- (base32 "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba"))))
+ (base32 "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6"))))
(build-system gnu-build-system)
(inputs (list ncurses))
(home-page "https://www.gnu.org/software/less/")
diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm
index 86e77b0..c0ec47a 100644
--- a/gnu/packages/libcanberra.scm
+++ b/gnu/packages/libcanberra.scm
@@ -104,12 +104,6 @@ GNOME. It comes with several backends (ALSA, PulseAudio, OSS, GStreamer,
null) and is designed to be portable.")
(license lgpl2.1+)))
-(define-public libcanberra/gtk+-2
- (package/inherit libcanberra
- (name "libcanberra-gtk2")
- (inputs `(,@(alist-delete "gtk+" (package-inputs libcanberra))
- ("gtk+" ,gtk+-2)))))
-
(define-public sound-theme-freedesktop
(package
(name "sound-theme-freedesktop")
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9df451e..36b3544 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -484,50 +484,50 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
;; The current "stable" kernels. That is, the most recently released major
;; versions that are still supported upstream.
-(define-public linux-libre-6.2-version "6.2.10")
+(define-public linux-libre-6.2-version "6.2.11")
(define-public linux-libre-6.2-gnu-revision "gnu")
(define deblob-scripts-6.2
(linux-libre-deblob-scripts
linux-libre-6.2-version
linux-libre-6.2-gnu-revision
(base32 "15wrksnimwb099qgqc631rp8dgv5b61l6s5kknk23frqdwkp4shp")
(base32 "0ir5vvbdh6dly5ld8mfp7285g8k88w5bb32hj4wmgyqsbfqc6rf2")))
(define-public linux-libre-6.2-pristine-source
(let ((version linux-libre-6.2-version)
- (hash (base32 "1zm4xvxdy6sqqwcich46mr4dh3kpmp40bawwahrg4lr7rp1n5iap")))
+ (hash (base32 "0iyx03z58pv1d5nrryjx94k3nxwyvm4b3bim6nawg1qbws26f8qd")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.2)))
-(define-public linux-libre-6.1-version "6.1.23")
+(define-public linux-libre-6.1-version "6.1.24")
(define-public linux-libre-6.1-gnu-revision "gnu")
(define deblob-scripts-6.1
(linux-libre-deblob-scripts
linux-libre-6.1-version
linux-libre-6.1-gnu-revision
(base32 "10igxhqvlh5ar98i68xf5w9ywfb9l05vg20s8yxmgc62pj72h0yi")
(base32 "0cchdhjra74zanyk14brv2l2dvxpg8dn58rn477lgfb44mcnhq33")))
(define-public linux-libre-6.1-pristine-source
(let ((version linux-libre-6.1-version)
- (hash (base32 "1szblfmm8gx0am017y30ywc60b1gqarplgmcs5zy7bshhwp3fn3l")))
+ (hash (base32 "0135aj8asplpxqr48hwdmwynx8n8hzhdgh55yl8r0n1kivisgrma")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-6.1)))
;; The "longterm" kernels — the older releases with long-term upstream support.
;; Here are the support timelines:
;; <https://www.kernel.org/category/releases.html>
-(define-public linux-libre-5.15-version "5.15.106")
+(define-public linux-libre-5.15-version "5.15.107")
(define-public linux-libre-5.15-gnu-revision "gnu")
(define deblob-scripts-5.15
(linux-libre-deblob-scripts
linux-libre-5.15-version
linux-libre-5.15-gnu-revision
(base32 "0vj60bra81fmbx3lz924czbhxs4dmvd4d584g9mcs80b7c4q52kg")
(base32 "03hwhwbcicwyx5i30d6m715kwgrxz4h21xhk55wnawlk8zhx3r35")))
(define-public linux-libre-5.15-pristine-source
(let ((version linux-libre-5.15-version)
- (hash (base32 "1r4g7ipcmj7k9dpwd5p2kd0f3iidnzl6z9g2cq4mfcw0h97r7rl4")))
+ (hash (base32 "1a5gqpxmzls5mp4a0cw10ldrps4pvbn19nzfri91ys25j1v0wdqr")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.15)))
@@ -5727,15 +5727,15 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez
(package
(name "bluez")
- (version "5.64")
+ (version "5.66")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://kernel.org/linux/bluetooth/bluez-"
version ".tar.xz"))
(sha256
(base32
- "0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf"))))
+ "0x5mn9x6g626izxnw236933wvq83qagsh9qc9ac9550cb55sdzir"))))
(build-system gnu-build-system)
(arguments
(list
@@ -7146,15 +7146,15 @@ of flash storage.")
(define-public libseccomp
(package
(name "libseccomp")
- (version "2.5.3")
+ (version "2.5.4")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/seccomp/libseccomp/"
"releases/download/v" version
"/libseccomp-" version ".tar.gz"))
(sha256
(base32
- "0xhan73zn4p0n7s8vx6s47wjmidvk4x8r90vfbljairn6f3mq1jr"))))
+ "1nyb3lspc5bsirpsx89vah3n54pmwlgxrwsfaxl01kq50i004afq"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 13e9e5b..5f64809 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -11691,20 +11691,20 @@ be used with @code{cl-yacc}.")
(sbcl-package->ecl-package sbcl-cl-lex))
(define-public sbcl-cl-colors2
- (let ((commit "795aedee593b095fecde574bd999b520dd03ed24")
- (revision "1"))
+ (let ((commit "d620e7fb504bbec3ed48cc7cd03f60ce2bb3735d")
+ (revision "2"))
(package
(name "sbcl-cl-colors2")
- (version (git-version "0.2.1" revision commit))
+ (version (git-version "0.5.0" revision commit))
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://notabug.org/cage/cl-colors2.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
- (base32 "0hlyf4h5chkjdp9armla5w4kw5acikk159sym7y8c4jbjp9x47ih"))))
+ (base32 "14wx006lv4bhf86z68484kphm5jsh86ns60pb4i1bi8kl8lp03r0"))))
(build-system asdf-build-system/sbcl)
(native-inputs
(list sbcl-clunit2))
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index a8ee627..4f1243e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -435,7 +435,13 @@ an interpreter, a compiler, a debugger, and much more.")
(uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
version "-source.tar.bz2"))
(sha256
- (base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24"))))
+ (base32 "1ahyrc3p9cf7y5zbgzvb9yxa8a480ccis4ksijlajck3z8n1dk24"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Don't force ARMv5.
+ (substitute* "src/runtime/Config.arm-linux"
+ (("-march=armv5") ""))))))
(build-system gnu-build-system)
(outputs '("out" "doc"))
(native-inputs
@@ -481,13 +487,6 @@ an interpreter, a compiler, a debugger, and much more.")
(srfi srfi-1))
#:phases
(modify-phases %standard-phases
- ,@(if (target-arm32?)
- ;; TODO: Move to snippet in staging.
- `((add-after 'unpack 'dont-force-armv5
- (lambda _
- (substitute* "src/runtime/Config.arm-linux"
- (("-march=armv5") "")))))
- '())
(delete 'configure)
(add-after 'unpack 'fix-build-id
;; One of the build scripts makes a build id using the current date.
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index febcb5a..00efff0 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -107,15 +107,15 @@ textfiles to roff for terminal display, and also to HTML for the web.")
(define-public libpipeline
(package
(name "libpipeline")
- (version "1.5.3")
+ (version "1.5.6")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://savannah/libpipeline/libpipeline-"
version ".tar.gz"))
(sha256
(base32
- "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx"))))
+ "15xpx7kbzkn63ab8mkghv7jkzji8pdbsyxm7ygjji19rvkkvkyv0"))))
(build-system gnu-build-system)
(home-page "https://libpipeline.nongnu.org/")
(synopsis "C library for manipulating pipelines of subprocesses")
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c10fc80..ff3f1cf 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1387,7 +1387,7 @@ incompatible with HDF5.")
(define-public hdf5-1.8
(package
(name "hdf5")
- (version "1.8.22")
+ (version "1.8.23")
(source
(origin
(method url-fetch)
@@ -1402,7 +1402,7 @@ incompatible with HDF5.")
(string-append major minor)))
"/src/hdf5-" version ".tar.bz2")))
(sha256
- (base32 "194ki2s5jrgl4czkvy5nc9nwjyapah0fj72l0gb0aysplp38i6v8"))
+ (base32 "0km65mr6dgk4ia2dqr1b9dzw9qg15j5z35ymbys9cnny51z1zb39"))
(patches (search-patches "hdf5-config-date.patch"))))
(build-system gnu-build-system)
(inputs
@@ -1442,8 +1442,7 @@ incompatible with HDF5.")
(substitute* "hl/fortran/src/Makefile.in"
(("libhdf5hl_fortran_la_LDFLAGS =")
(string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath="
- (assoc-ref outputs "fortran") "/lib")))
- #t))
+ (assoc-ref outputs "fortran") "/lib")))))
(add-after 'configure 'patch-settings
(lambda _
;; libhdf5.settings contains the full path of the
@@ -1456,16 +1455,14 @@ incompatible with HDF5.")
;; Don't record the build-time kernel version to make the
;; settings file reproducible.
(("Uname information:.*")
- "Uname information: Linux\n"))
- #t))
+ "Uname information: Linux\n"))))
(add-after 'install 'patch-references
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin"))
(zlib (assoc-ref inputs "zlib")))
(substitute* (find-files bin "h5p?cc")
(("-lz" lib)
- (string-append "-L" zlib "/lib " lib)))
- #t)))
+ (string-append "-L" zlib "/lib " lib))))))
(add-after 'install 'split
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Move all fortran-related files
@@ -1500,8 +1497,7 @@ incompatible with HDF5.")
(rename-file file
(string-append fex "/" (basename file))))
(find-files ex ".*"))
- (delete-file-recursively ex))
- #t)))))
+ (delete-file-recursively ex)))))))
(home-page "https://www.hdfgroup.org")
(synopsis "Management suite for extremely large and complex data")
(description "HDF5 is a suite that makes possible the management of
@@ -1512,7 +1508,7 @@ extremely large and complex data collections.")
(define-public hdf5-1.10
(package
(inherit hdf5-1.8)
- (version "1.10.7")
+ (version "1.10.9")
(source
(origin
(method url-fetch)
@@ -1526,13 +1522,33 @@ extremely large and complex data collections.")
(take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2")))
(sha256
- (base32 "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082"))
+ (base32 "14gih7kmjx4h3lc7pg4fwcl28hf1qqkf2x7rljpxqvzkjrqbxi00"))
(patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf5-1.12
(package
(inherit hdf5-1.8)
- (version "1.12.1")
+ (version "1.12.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/"
+ "hdf5-" (version-major+minor version)
+ "/hdf5-" version "/src/hdf5-"
+ version ".tar.bz2")
+ (string-append "https://support.hdfgroup.org/ftp/HDF5/"
+ "current"
+ (apply string-append
+ (take (string-split version #\.) 2))
+ "/src/hdf5-" version ".tar.bz2")))
+ (sha256
+ (base32 "1zlawdzb0gsvcxif14fwr5ap2gk4b6j02wirr2hcx8hkcbivp20s"))
+ (patches (search-patches "hdf5-config-date.patch"))))))
+
+(define-public hdf5-1.14
+ (package
+ (inherit hdf5-1.8)
+ (version "1.14.0")
(source
(origin
(method url-fetch)
@@ -1546,7 +1562,7 @@ extremely large and complex data collections.")
(take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2")))
(sha256
- (base32 "074g3z504xf77ff38igs30i1aqxpm508p7yw78ykva7dncrgbyda"))
+ (base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4"))
(patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf5
diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm
index 4c14d94..bf0df31 100644
--- a/gnu/packages/minetest.scm
+++ b/gnu/packages/minetest.scm
@@ -52,16 +52,16 @@
(define-public minetest
(package
(name "minetest")
- (version "5.6.1")
+ (version "5.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/minetest/minetest")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "1bgk369n7r52vh3hdngrlf98k3v84ch2qp341xhs53ixrns2crfn"))
+ "008l44zwwsarwk4hn7wx2nj2m21b1iqsphl7g69rrlxj760zl0pl"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -106,7 +106,8 @@
"(void)0;"))
(setenv "MINETEST_SUBGAME_PATH" ; for check
(string-append (getcwd) "/games"))))
- (replace 'check
+ (delete 'check)
+ (add-after 'install 'check
(lambda* (#:key tests? #:allow-other-keys)
;; Thanks to our substitutions, the tests should also run
;; when invoked on the target outside of `guix build'.
@@ -165,7 +166,7 @@ in different ways.")
(file-name (git-file-name name version))
(sha256
(base32
- "1w0vdk6a1rhsfwyfviayfwsyqbzwikqazkgbrfl39anf3a50rvv1"))))
+ "02kbj1h6jsq6k8x4v2ir0njczdz7nyx6dbym85ixxp3mrqxiws61"))))
(build-system copy-build-system)
(arguments
(list #:install-plan
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index bcf587f..915c28f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -52,6 +52,7 @@
;;; Copyright © 2022 jgart <jgart@dismail.de>
;;; Copyright © 2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2023 Antero Mejr <antero@mailbox.org>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -69,44 +70,43 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages music)
- #:use-module (guix gexp)
- #:use-module (guix utils)
- #:use-module (guix packages)
- #:use-module (guix download)
- #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (guix build-system gnu)
#:use-module (guix build-system ant)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system glib-or-gtk)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system go)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix build-system qt)
#:use-module (guix build-system scons)
- #:use-module (guix build-system glib-or-gtk)
- #:use-module (guix build-system qt)
- #:use-module (guix build-system waf)
#:use-module (guix build-system trivial)
- #:use-module (guix build-system go)
- #:use-module (guix build-system qt)
+ #:use-module (guix build-system waf)
+ #:use-module (guix download)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages admin)
#:use-module (gnu packages algebra)
#:use-module (gnu packages apr)
+ #:use-module (gnu packages assembly)
#:use-module (gnu packages audio)
#:use-module (gnu packages autotools)
- #:use-module (gnu packages assembly)
#:use-module (gnu packages backup)
#:use-module (gnu packages base) ;libbdf
#:use-module (gnu packages bash)
#:use-module (gnu packages benchmark)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages cdrom)
- #:use-module (gnu packages code)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
+ #:use-module (gnu packages code)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages crypto)
@@ -125,13 +125,14 @@
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gcc)
- #:use-module (gnu packages gnupg)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnunet)
+ #:use-module (gnu packages gnupg)
+ #:use-module (gnu packages golang)
#:use-module (gnu packages gpodder)
#:use-module (gnu packages graphics)
#:use-module (gnu packages graphviz)
@@ -144,12 +145,13 @@
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages java)
#:use-module (gnu packages kde-frameworks)
- #:use-module (gnu packages libffi)
#:use-module (gnu packages libevent)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux) ; for alsa-utils
#:use-module (gnu packages lirc)
#:use-module (gnu packages llvm)
+ #:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages mp3)
#:use-module (gnu packages mpd)
@@ -182,8 +184,8 @@
#:use-module (gnu packages stb)
#:use-module (gnu packages tcl)
#:use-module (gnu packages terminals)
- #:use-module (gnu packages texinfo)
#:use-module (gnu packages tex)
+ #:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages version-control)
@@ -194,11 +196,9 @@
#:use-module (gnu packages wm)
#:use-module (gnu packages wxwidgets)
#:use-module (gnu packages xdisorg)
+ #:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
- #:use-module (gnu packages xiph)
- #:use-module (gnu packages golang)
- #:use-module (gnu packages lua)
#:use-module ((srfi srfi-1) #:select (last)))
(define-public audacious
@@ -1556,60 +1556,61 @@ listeners answer questions about music quickly and simply.")
(define-public abjad
(package
(name "abjad")
+ ;; XXX: The latest version which supports current Guix's Python 3.9.9.
(version "3.4")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/Abjad/abjad")
- (commit (string-append "v" version))))
+ (url "https://github.com/Abjad/abjad")
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32
- "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz"))))
- (build-system python-build-system)
+ (base32 "0s63vk9fifp0im9c31kb9ck39mbaxhrls993d8fvg0nkg41z1jnz"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'loosen-requirements
- (lambda _
- (substitute* "setup.py"
- ;; Permit newer versions of uqbar. Remove for >3.4.
- ((", <0\\.5\\.0")
- ""))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- ;; See: https://stackoverflow.com/a/34140498
- (invoke "python" "-m" "pytest" "tests")))))))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; XXX. Permit newer version of uqbar, remove for >3.4. Remove in
+ ;; the next update.
+ (add-after 'unpack 'loosen-requirements
+ (lambda _
+ (substitute* "setup.py"
+ ((", <0\\.5\\.0") ""))))
+ ;; FIXME: Check why it's failing with this: Note: compilation failed
+ ;; and \version outdated, did you update input syntax with
+ ;; convert-ly?
+ (add-before 'check 'disable-failing-tests
+ (lambda _
+ (substitute* "tests/test_ext_sphinx.py"
+ (("def test_ext_sphinx_01") "def __off_test_ext_sphinx_01")))))))
(inputs
(list lilypond))
- (propagated-inputs
- (list python-ply
- python-quicktions
- python-roman
- python-six
- python-uqbar
- ;; XXX: These test dependencies(?) are listed as install_requires
- ;; in setup.py. Propagate accordingly.
- python-black
- python-flake8
+ (native-inputs
+ (list python-flake8
python-isort
python-mypy
python-pytest
python-pytest-cov
python-pytest-helpers-namespace
+ python-six
python-sphinx-autodoc-typehints))
+ (propagated-inputs
+ (list python-quicktions
+ python-ply
+ python-roman
+ python-uqbar))
(home-page "https://abjad.github.io")
(synopsis "Python API for building LilyPond files")
(description
"Abjad helps composers build up complex pieces of music notation in iterative
and incremental ways. Use Abjad to create a symbolic representation of all the notes,
rests, chords, tuplets, beams and slurs in any score. Because Abjad extends the Python
programming language, you can use Abjad to make systematic changes to music as you work.
Because Abjad wraps the LilyPond music notation package, you can use Abjad to control the
typographic detail of symbols on the page.")
- (license license:expat)))
+ (license license:expat)))
(define-public abjad-ext-rmakers
(package
diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm
index 60247f3..056fdba 100644
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@ -40,15 +40,15 @@
(define-public nspr
(package
(name "nspr")
- (version "4.34")
+ (version "4.35")
(source (origin
(method url-fetch)
(uri (string-append
"https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v"
version "/src/nspr-" version ".tar.gz"))
(sha256
(base32
- "177rxcf3lglabs7sgwcvf72ww4v56qa71lc495wl13sxs4f03vxy"))))
+ "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy"))))
(build-system gnu-build-system)
(inputs
(list perl ;for 'compile-et.pl'
@@ -126,7 +126,7 @@ in the Mozilla clients.")
(replacement nss/fixed)
;; Also update and test the nss-certs package, which duplicates version and
;; source to avoid a top-level variable reference & module cycle.
- (version "3.81")
+ (version "3.85")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
@@ -137,7 +137,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz")))
(sha256
(base32
- "19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8"))
+ "15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg"))
;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch"
@@ -200,7 +200,7 @@ in the Mozilla clients.")
;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date.
- (invoke "faketime" "2022-06-01" "./nss/tests/all.sh"))
+ (invoke "faketime" "2022-11-01" "./nss/tests/all.sh"))
(format #t "test suite not run~%"))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 29cb481..f9032d6 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1377,8 +1377,8 @@ environments.")
"0k9zkdyyzir3fvlbcfcqy17k28b51i20rpbjwlx2i1mwd2pw9cxc")))))))
(define-public guix-build-coordinator
- (let ((commit "3c9354e1c0b0767e0121ecbd03abfe37c895e34b")
- (revision "76"))
+ (let ((commit "7f6db4b55411f79ab5f2639318dc5871c1452f00")
+ (revision "77"))
(package
(name "guix-build-coordinator")
(version (git-version "0" revision commit))
@@ -1389,7 +1389,7 @@ environments.")
(commit commit)))
(sha256
(base32
- "19gc4ya56inxnjpf1br2sdva0k4jyc1jn5q84qdfpiwn1ryb0jjd"))
+ "07pi5yjgagv0xyz9f5cnfz1c06gzx1mpi17h3a1w5h6lp3kwqrv9"))
(file-name (string-append name "-" version "-checkout"))))
(build-system gnu-build-system)
(arguments
diff --git a/gnu/packages/patches/glslang-install-static-libs.patch b/gnu/packages/patches/glslang-install-static-libs.patch
new file mode 100644
index 0000000..a155dde
--- /dev/null
+++ b/gnu/packages/patches/glslang-install-static-libs.patch
@@ -0,0 +1,61 @@
+Install OGLCompiler et.al. even when building shared libraries. Also fix
+CMake file locations.
+
+Patch taken from Gentoo:
+
+ https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
+
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(WIN32)
+ source_group("Source" FILES ${SOURCES})
+ endif(WIN32)
+
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OGLCompiler EXPORT glslang-targets)
+
+ # Backward compatibility
+@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+ message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+
+ if (NOT TARGET glslang::OGLCompiler)
+- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+ endif()
+
+ add_library(OGLCompiler ALIAS glslang::OGLCompiler)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ ################################################################################
+ if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS glslang EXPORT glslang-targets)
+- if(NOT BUILD_SHARED_LIBS)
++ if(BUILD_SHARED_LIBS)
+ install(TARGETS MachineIndependent EXPORT glslang-targets)
+ install(TARGETS GenericCodeGen EXPORT glslang-targets)
+
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -52,7 +52,7 @@ else()
+ target_link_libraries(OSDependent Threads::Threads)
+ endif()
+
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+ install(TARGETS OSDependent EXPORT glslang-targets)
+
+ # Backward compatibility
+@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+ message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+
+ if (NOT TARGET glslang::OSDependent)
+- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+ endif()
+
+ add_library(OSDependent ALIAS glslang::OSDependent)
diff --git a/gnu/packages/patches/jami-libjami-headers-search.patch b/gnu/packages/patches/jami-libjami-headers-search.patch
index b3384ba..92cc92a 100644
--- a/gnu/packages/patches/jami-libjami-headers-search.patch
+++ b/gnu/packages/patches/jami-libjami-headers-search.patch
@@ -1,48 +1,28 @@
-From 1168aba6181e30ee4c322e5f437bde22bece5698 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
-Date: Sat, 5 Nov 2022 23:18:13 -0400
-Subject: [PATCH 1/3] cmake: Simplify lookup logic for libjami headers.
-
-* extras/build/cmake/modules/FindLibJami.cmake: Rename
-LIBJAMI_INCLUDE_DIRS to LIBJAMI_INCLUDE_DIR. Use find_path to search
-for jami.h directory.
-* CMakeLists.txt: Adjust accordingly.
-* src/libclient/CMakeLists.txt: Likewise.
-* src/libclient/qtwrapper/CMakeLists.txt: Likewise.
-
-Change-Id: I494358f9bfafb41f000daeec4196747b2c184401
----
-Upstream status: https://review.jami.net/c/jami-client-qt/+/22973
-
- CMakeLists.txt | 2 +-
- extras/build/cmake/modules/FindLibJami.cmake | 21 ++++++--------------
- src/libclient/CMakeLists.txt | 2 +-
- src/libclient/qtwrapper/CMakeLists.txt | 2 +-
- 4 files changed, 9 insertions(+), 18 deletions(-)
+Upstream status: https://review.jami.net/c/jami-client-qt/+/24273.
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d0a8fd70..94ac6074 100644
+index 8d71b84b..36729698 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -118,7 +118,7 @@ set(CMAKE_MODULE_PATH
+@@ -136,7 +136,7 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
find_package(LibJami REQUIRED)
if(LIBJAMI_FOUND)
- include_directories(${LIBJAMI_INCLUDE_DIRS})
+ include_directories(${LIBJAMI_INCLUDE_DIR})
endif()
include(FindPython3)
diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake
-index ddb05319..9ad20d2b 100644
+index 5cce45fc..11746cd8 100644
--- a/extras/build/cmake/modules/FindLibJami.cmake
+++ b/extras/build/cmake/modules/FindLibJami.cmake
-@@ -20,28 +20,19 @@
+@@ -20,30 +20,19 @@
# Once done, this find module will set:
#
-# LIBJAMI_INCLUDE_DIRS - libjami include directories
-+# LIBJAMI_INCLUDE_DIR - libjami include directories
++# LIBJAMI_INCLUDE_DIR - libjami include directory
# LIBJAMI_FOUND - whether it was able to find the include directories
# LIBJAMI_LIB - path to libjami or libring library
@@ -62,24 +42,26 @@ index ddb05319..9ad20d2b 100644
- set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
+- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h)
+- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami)
- else()
+ find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
+ if(NOT LIBJAMI_INCLUDE_DIR)
message(STATUS "Jami daemon headers not found!
-Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
-+Set -DCMAKE_INSTALL_PREFIX or use -DWITH_DAEMON_SUBMODULE")
++To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE")
set(LIBJAMI_FOUND false)
endif()
endif()
-@@ -102,5 +93,5 @@ endif()
+@@ -115,5 +104,5 @@ endif()
# Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})
-message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIRS})
+message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
-index 2676c9c4..ac58ea2b 100644
+index 144efaf5..cb87fc2a 100644
--- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt
@@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
@@ -92,7 +74,7 @@ index 2676c9c4..ac58ea2b 100644
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt
-index acee0d0c..ba68aac4 100644
+index 46887051..a20658ad 100644
--- a/src/libclient/qtwrapper/CMakeLists.txt
+++ b/src/libclient/qtwrapper/CMakeLists.txt
@@ -46,7 +46,7 @@ else()
@@ -104,6 +86,3 @@ index acee0d0c..ba68aac4 100644
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)
---
-2.37.3
-
diff --git a/gnu/packages/patches/libcdio-glibc-compat.patch b/gnu/packages/patches/libcdio-glibc-compat.patch
new file mode 100644
index 0000000..1d325bc
--- /dev/null
+++ b/gnu/packages/patches/libcdio-glibc-compat.patch
@@ -0,0 +1,43 @@
+Fix test failure with glibc 2.36:
+
+ https://savannah.gnu.org/bugs/?62948
+
+Patch taken from upstream:
+
+ https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0
+
+diff --git a/test/driver/realpath.c b/test/driver/realpath.c
+index 289253e..cd46d62 100644
+--- a/test/driver/realpath.c
++++ b/test/driver/realpath.c
+@@ -1,5 +1,7 @@
+ /* -*- C -*-
+- Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
++
++ Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
++ <rocky@gnu.org>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
+ rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
+ "symlink", psz_symlink_file);
+ if (0 == rc) {
+- cdio_realpath(psz_symlink_file, psz_file_check);
+- if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
++ char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
++ if (0 != retvalue) {
++ if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
+ fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
+ psz_file_check, symlink_file);
+ rc = 5;
+ goto err_exit;
++ }
++ check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
+ }
+- check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
+ }
+-
+ }
+
+ check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);
diff --git a/gnu/packages/patches/mariadb-link-libatomic.patch b/gnu/packages/patches/mariadb-link-libatomic.patch
deleted file mode 100644
index f331067..0000000
--- a/gnu/packages/patches/mariadb-link-libatomic.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-https://github.com/MariaDB/server/commit/f502ccbcb5dfce29067434885a23db8d1bd5f134.patch
-This was apparently merged in 10.8.2.
-
-From f502ccbcb5dfce29067434885a23db8d1bd5f134 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <cvicentiu@gmail.com>
-Date: Fri, 15 Oct 2021 16:51:05 +0300
-Subject: [PATCH] Link with libatomic to enable C11 atomics support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some architectures (mips) require libatomic to support proper
-atomic operations. Check first if support is available without
-linking, otherwise use the library.
-
-Contributors:
-James Cowgill <jcowgill@debian.org>
-Jessica Clarke <jrtc27@debian.org>
-Vicențiu Ciorbaru <vicentiu@mariadb.org>
----
- configure.cmake | 20 +++++++++++++++++++-
- mysys/CMakeLists.txt | 4 ++++
- sql/CMakeLists.txt | 1 -
- 3 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/configure.cmake b/configure.cmake
-index 7a1369d77703f..db8742bb93b5a 100644
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -895,7 +895,25 @@ int main()
- long long int *ptr= &var;
- return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
- }"
--HAVE_GCC_C11_ATOMICS)
-+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
-+ SET(HAVE_GCC_C11_ATOMICS True)
-+ELSE()
-+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
-+ CHECK_CXX_SOURCE_COMPILES("
-+ int main()
-+ {
-+ long long int var= 1;
-+ long long int *ptr= &var;
-+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
-+ }"
-+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+ SET(HAVE_GCC_C11_ATOMICS True)
-+ ENDIF()
-+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
-+ENDIF()
-
- IF(WITH_VALGRIND)
- SET(HAVE_valgrind 1)
-diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
-index f97e3b4d3904c..09d3f726ffc74 100644
---- a/mysys/CMakeLists.txt
-+++ b/mysys/CMakeLists.txt
-@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
- ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
- DTRACE_INSTRUMENT(mysys)
-
-+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
-+ TARGET_LINK_LIBRARIES(mysys atomic)
-+ENDIF()
-+
- IF(HAVE_BFD_H)
- TARGET_LINK_LIBRARIES(mysys bfd)
- ENDIF(HAVE_BFD_H)
-diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
-index 5f5d7daf1a5bc..f574f1f20295d 100644
---- a/sql/CMakeLists.txt
-+++ b/sql/CMakeLists.txt
-@@ -307,7 +307,6 @@ IF(WITH_MYSQLD_LDFLAGS)
- "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
- ENDIF()
-
--
- FIND_PACKAGE(BISON 2.0)
-
-
diff --git a/gnu/packages/patches/openboardview-use-system-mpc.patch b/gnu/packages/patches/openboardview-use-system-mpc.patch
new file mode 100644
index 0000000..7726c55
--- /dev/null
+++ b/gnu/packages/patches/openboardview-use-system-mpc.patch
@@ -0,0 +1,42 @@
+Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 452dfa9..e30c3cf 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -206,13 +206,15 @@ endif()
+ add_definitions(-DSTBI_FAILURE_USERMSG)
+
+ ## mpc - Micro Parser Combinators ##
+-execute_process(
+- COMMAND git submodule update --init src/mpc
+- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-)
+-
+-add_library(mpc STATIC "mpc/mpc.c")
+-
++pkg_check_modules(MPC QUIET mpc)
++if(NOT MPC_FOUND)
++ execute_process(
++ COMMAND git submodule update --init src/mpc
++ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
++ )
++ add_library(mpc STATIC "mpc/mpc.c")
++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc)
++endif()
+
+ ## OpenBoardView ##
+ add_subdirectory(openboardview)
+diff --git a/src/openboardview/FileFormats/GenCADFile.h b/src/openboardview/FileFormats/GenCADFile.h
+index 1ccf8df..c57f7ff 100644
+--- a/src/openboardview/FileFormats/GenCADFile.h
++++ b/src/openboardview/FileFormats/GenCADFile.h
+@@ -5,7 +5,7 @@
+
+ #include "build-generated/GenCADFileGrammar.h"
+
+-#include "mpc/mpc.h"
++#include "mpc.h"
+
+ #include <map>
+ #include <string>
diff --git a/gnu/packages/patches/openboardview-use-system-utf8.patch b/gnu/packages/patches/openboardview-use-system-utf8.patch
deleted file mode 100644
index 25b5952..0000000
--- a/gnu/packages/patches/openboardview-use-system-utf8.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 251e23422f37c93a3f460fb660c5e5bfa8200d91 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
-Date: Sun, 2 Dec 2018 16:40:39 -0500
-Subject: [PATCH] build system: Allow using utf8.h from the system.
-
----
- src/CMakeLists.txt | 12 ++++++++----
- src/openboardview/CMakeLists.txt | 1 +
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 90442ed..26d4a69 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,10 +8,14 @@ if(NOT WIN32 OR MINGW)
- endif()
-
- ## utf8.h ##
--execute_process(
-- COMMAND git submodule update --init src/utf8
-- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
--)
-+FIND_PATH(UTF8_INCLUDE_DIR utf8.h)
-+if(NOT UTF8_INCLUDE_DIR)
-+ execute_process(
-+ COMMAND git submodule update --init src/utf8
-+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-+ )
-+ set(UTF8_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utf8)
-+endif()
-
- ## zlib ##
- find_package(ZLIB)
-diff --git a/src/openboardview/CMakeLists.txt b/src/openboardview/CMakeLists.txt
-index b0bdbe3..6c4564c 100644
---- a/src/openboardview/CMakeLists.txt
-+++ b/src/openboardview/CMakeLists.txt
-@@ -44,6 +44,7 @@ include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/..
- ${IMGUI_INCLUDE_DIRS}
-+ ${UTF8_INCLUDE_DIR}
- ${GLAD_INCLUDE_DIRS}
- ${GTK_INCLUDE_DIRS}
- ${OPENGL_INCLUDE_DIR}
---
-2.34.0
-
diff --git a/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch b/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch
new file mode 100644
index 0000000..f615551
--- /dev/null
+++ b/gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch
@@ -0,0 +1,25 @@
+Upstream status: https://github.com/orangeduck/mpc/pull/160
+
+diff --git a/Makefile b/Makefile
+index 7719acc..fe798c5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ EXAMPLESEXE = $(EXAMPLES:.c=)
+
+ .PHONY: all check clean libs $(DIST)/$(PROJ).pc
+
+-all: $(EXAMPLESEXE) check
++all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc
+
+ $(DIST):
+ $(MKDIR) $(DIST)
+@@ -65,7 +65,8 @@ install: all
+ install -m755 -t $(DESTDIR)$(PREFIX)/lib $(DIST)/lib*
+ install -m644 -t $(DESTDIR)$(PREFIX)/share/$(PROJ) $(PROJ).c $(PROJ).h
+ install -m644 $(PROJ).h $(DESTDIR)$(PREFIX)/include/$(PROJ).h
+- install -m644 $(PROJ).pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
++ install -m644 $(DIST)/$(PROJ).pc \
++ $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
+
+ uninstall:
+ rm -rf -- \
diff --git a/gnu/packages/patches/python-afdko-suppress-copyright-test.patch b/gnu/packages/patches/python-afdko-suppress-copyright-test.patch
deleted file mode 100644
index 94cd73d..0000000
--- a/gnu/packages/patches/python-afdko-suppress-copyright-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Supress copyright check in tests which can differ based on current year.
-
- https://github.com/adobe-type-tools/afdko/issues/1589
-
-Adapted from upstream:
-
- https://github.com/adobe-type-tools/afdko/commit/feebd77d9b6507a0b32f837535511be3c94d9c6f
-
-diff --git a/tests/tx_test.py b/tests/tx_test.py
---- a/tests/tx_test.py
-+++ b/tests/tx_test.py
-@@ -1246,7 +1246,7 @@ def test_ufo_fontinfo_parsing(file, msg, ret_code):
- if (ret_code == 0):
- expected_path = generate_ps_dump(expected_path)
- output_path = generate_ps_dump(output_path)
-- assert differ([expected_path, output_path])
-+ assert differ([expected_path, output_path, '-s'] + PFA_SKIP)
- else:
- arg = [TOOL, '-t1', '-f', ufo_input_path]
- assert subprocess.call(arg) == 6
diff --git a/gnu/packages/patches/python2-pyopenssl-openssl-compat.patch b/gnu/packages/patches/python2-pyopenssl-openssl-compat.patch
deleted file mode 100644
index a185f41..0000000
--- a/gnu/packages/patches/python2-pyopenssl-openssl-compat.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Adjust for OpenSSL 1.1.1:
-
- https://github.com/pyca/pyopenssl/issues/1043
-
-Taken from upstream:
-
- https://github.com/pyca/pyopenssl/commit/cc5c00ae5fd3c19d07fff79b5c4a08f5e58697ad
-
-diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
-index 59f21cec..fcdee047 100644
---- a/src/OpenSSL/SSL.py
-+++ b/src/OpenSSL/SSL.py
-@@ -1421,6 +1421,12 @@ def set_alpn_protos(self, protos):
- This list should be a Python list of bytestrings representing the
- protocols to offer, e.g. ``[b'http/1.1', b'spdy/2']``.
- """
-+ # Different versions of OpenSSL are inconsistent about how they handle empty
-+ # proto lists (see #1043), so we avoid the problem entirely by rejecting them
-+ # ourselves.
-+ if not protos:
-+ raise ValueError("at least one protocol must be specified")
-+
- # Take the list of protocols and join them together, prefixing them
- # with their lengths.
- protostr = b"".join(
-@@ -2449,6 +2455,12 @@ def set_alpn_protos(self, protos):
- This list should be a Python list of bytestrings representing the
- protocols to offer, e.g. ``[b'http/1.1', b'spdy/2']``.
- """
-+ # Different versions of OpenSSL are inconsistent about how they handle empty
-+ # proto lists (see #1043), so we avoid the problem entirely by rejecting them
-+ # ourselves.
-+ if not protos:
-+ raise ValueError("at least one protocol must be specified")
-+
- # Take the list of protocols and join them together, prefixing them
- # with their lengths.
- protostr = b"".join(
-diff --git a/tests/test_ssl.py b/tests/test_ssl.py
-index ffc505d8..ca363b45 100644
---- a/tests/test_ssl.py
-+++ b/tests/test_ssl.py
-@@ -1928,7 +1928,7 @@ def test_alpn_call_failure(self):
- protocols list. Ensure that we produce a user-visible error.
- """
- context = Context(SSLv23_METHOD)
-- with pytest.raises(Error):
-+ with pytest.raises(ValueError):
- context.set_alpn_protos([])
-
- def test_alpn_set_on_connection(self):
diff --git a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch
index 3e300ea..5872d4c 100644
--- a/gnu/packages/patches/rust-openssl-sys-no-vendor.patch
+++ b/gnu/packages/patches/rust-openssl-sys-no-vendor.patch
@@ -1,12 +1,17 @@
-https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch
-"MIT" licensed according to debian/copyright file
-slightly modified to only change the vendored openssl-src dependency
-
-Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3.0.
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -31,15 +31,12 @@
+--- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400
++++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400
+@@ -31,10 +31,6 @@
+ [package.metadata.pkg-config]
+ openssl = "1.0.1"
+
+-[dependencies.bssl-sys]
+-version = "0.1.0"
+-optional = true
+-
+ [dependencies.libc]
+ version = "0.2"
+
+@@ -46,16 +42,12 @@
[build-dependencies.cc]
version = "1.0"
@@ -18,9 +23,10 @@ Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3.
version = "0.3.9"
[features]
- vendored = ["openssl-src"]
-+openssl-src = []
+-unstable_boringssl = ["bssl-sys"]
+-vendored = ["openssl-src"]
++unstable_boringssl = []
++vendored = []
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
version = "0.2.8"
-
diff --git a/gnu/packages/patches/webkitgtk-libelogind.patch b/gnu/packages/patches/webkitgtk-libelogind.patch
new file mode 100644
index 0000000..fa1fbc8
--- /dev/null
+++ b/gnu/packages/patches/webkitgtk-libelogind.patch
@@ -0,0 +1,38 @@
+From 8d46803c09edc2b6d4e35c778a3d2f90e5baad0b Mon Sep 17 00:00:00 2001
+From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
+Date: Sat, 25 Mar 2023 22:55:16 -0400
+Subject: [PATCH] Fallback to elogind when systemd is unavailable at build time
+ https://bugs.webkit.org/show_bug.cgi?id=254475
+
+Reviewed by NOBODY (OOPS!).
+
+The build system supports elogind, but it only considers the
+'libsystemd' library name for the pkg-config lookup and not
+'libelogind'. This change makes the build system fallback to search
+for libelogind when libsystemd was not found.
+
+* Source/cmake/FindJournald.cmake [!PC_SYSTEMD_FOUND]: Search for libelogind.
+---
+ Source/cmake/FindJournald.cmake | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/cmake/FindJournald.cmake b/Source/cmake/FindJournald.cmake
+index 18dd6b50908c..e0dc9ce1d397 100644
+--- a/Source/cmake/FindJournald.cmake
++++ b/Source/cmake/FindJournald.cmake
+@@ -55,6 +55,10 @@ find_package(PkgConfig QUIET)
+
+ # libelogind provides compatible pc and header files
+ pkg_check_modules(PC_SYSTEMD QUIET libsystemd)
++if (NOT PC_SYSTEMD_FOUND)
++ pkg_check_modules(PC_SYSTEMD QUIET libelogind)
++endif ()
++
+ set(Journald_COMPILE_OPTIONS ${PC_SYSTEMD_CFLAGS_OTHER})
+ set(Journald_VERSION ${PC_SYSTEMD_VERSION})
+
+
+base-commit: 43ea8744bc6065aad7ae5988e32d31d253905e5f
+--
+2.39.2
+
diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm
index 6562390..7bf5883 100644
--- a/gnu/packages/perl-check.scm
+++ b/gnu/packages/perl-check.scm
@@ -546,15 +546,15 @@ Test::More and friends.")
(define-public perl-test-fatal
(package
(name "perl-test-fatal")
- (version "0.014")
+ (version "0.016")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/R/RJ/RJBS/"
"Test-Fatal-" version ".tar.gz"))
(sha256
(base32
- "1c6bs68mss4q7cyapkv2c0jn66i21050p0faxf3s3417gdffzp5w"))))
+ "13vqdyk95y89msk1r8g1vp1jw6rzkl1y76lprnw3085sy8qd90vj"))))
(build-system perl-build-system)
(propagated-inputs (list perl-try-tiny))
(home-page "https://metacpan.org/release/Test-Fatal")
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index 64089f9..335e08d 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -11318,15 +11318,15 @@ Tree::Simple::Visitor::* objects.")
(define-public perl-try-tiny
(package
(name "perl-try-tiny")
- (version "0.30")
+ (version "0.31")
(source
(origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/"
"Try-Tiny-" version ".tar.gz"))
(sha256
(base32
- "0szgvlz19yz3mq1lbzmwh8w5dh6agg5s16xv22zrnl83r7ax0nys"))))
+ "1ghidhh2wasxbmjsdsyfcy20wgli3m58dkj6ixnv4xa0i8fx601k"))))
(build-system perl-build-system)
(home-page "https://metacpan.org/release/Try-Tiny")
(synopsis "Minimal try/catch with proper preservation of $@@")
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 89a942b..c498703 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -207,7 +207,6 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).")
;; both two licensing modes for your changes/additions."
(license (list license:lgpl2.1 license:cddl1.0))))
-
(define-public libexif
(package
(name "libexif")
@@ -222,9 +221,8 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).")
(base32
"0zi5vvb0khlzc6xyfayk6mjx5lgkrj8r7s8lfv4j7wkcgndjga0j"))))
(build-system gnu-build-system)
- (native-inputs
- (list autoconf automake gettext-minimal libtool))
- (home-page "https://libexif.github.io/")
+ (native-inputs (list autoconf automake gettext-minimal libtool))
+ (home-page "https://github.com/libexif/libexif")
(synopsis "Read and manipulate EXIF data in digital photographs")
(description
"The libexif C library allows applications to read, edit, and save EXIF
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 41a6997..1046602 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020, 2022 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
@@ -941,24 +941,23 @@ in Pytest.")
(define-public python-pytest-subtests
(package
(name "python-pytest-subtests")
- (version "0.5.0")
+ (version "0.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pytest-subtests" version))
(sha256
- (base32 "087i03nmkmfnrpc7mmizvr40ijnjw4lfxc22rnk8jk6s1szy9lav"))))
+ (base32 "05zvnxx0hdrd9w4z51qhchg3nkz5s47agryw68g8q7krq5kim5nr"))))
(build-system python-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest")))))))
- (native-inputs
- (list python-pytest python-setuptools-scm))
+ (native-inputs (list python-pytest-7.1 python-setuptools-scm))
(home-page "https://github.com/pytest-dev/pytest-subtests")
(synopsis "Unittest subTest() support and subtests fixture")
(description "This Pytest plugin provides unittest @code{subTest()}
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index c483d68..f3530e5 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -342,20 +342,18 @@ Python strings.")
(define-public python-lz4
(package
(name "python-lz4")
- (version "4.0.2")
+ (version "4.3.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "lz4" version))
(sha256
(base32
- "16vj2bnhhdkcz2a2ai2mx2kf9ngx1cjr18636yp1514kq9r72fq8"))
+ "1nmc36j5xnk7mvwwpm0nb1sddjk5iv77h877fdkkxcngm621shz1"))
(modules '((guix build utils)))
- (snippet
- '(begin
- ;; Remove bundled copy of lz4.
- (delete-file-recursively "lz4libs")
- #t))))
+ (snippet '(begin
+ ;; Remove bundled copy of lz4.
+ (delete-file-recursively "lz4libs")))))
(build-system python-build-system)
(arguments
(list #:phases
@@ -510,13 +508,13 @@ wrapper. It provides a backport of the @code{Path} object.")
(define-public python-zopfli
(package
(name "python-zopfli")
- (version "0.2.1")
+ (version "0.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "zopfli" version ".zip"))
(sha256
- (base32 "1ipjkcgdbplsrhr31ypk48px8cax4cm9gcjj7yrcrhg20ql3s9p5"))))
+ (base32 "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d"))))
(build-system python-build-system)
(arguments
(list
diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index c3e36ff..220f2b9 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;;
@@ -60,6 +60,7 @@
#:use-module (gnu packages libffi)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages password-utils)
+ #:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
@@ -524,198 +525,146 @@ for example, for recording or replaying web content.")
is used by the Requests library to verify HTTPS requests.")
(license license:asl2.0)))
-(define-public python-cryptography-vectors-next
+(define-public python-cryptography-vectors
(package
(name "python-cryptography-vectors")
- (version "37.0.4")
+ (version "40.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32
- "1a1yi37ygw0jp72q280cmxd3qn9y9vmcch2bcnjkg2g2202l0qas"))))
+ "0hd0ppss5xg0kzf36q8cdaxh1xw8ry4k7jkianlf832xbdmp0q44"))))
(build-system python-build-system)
(home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package")
(description
"This package contains test vectors for the cryptography package.")
;; Distributed under either BSD-3 or ASL2.0
(license (list license:bsd-3 license:asl2.0))))
-(define-public python-cryptography-vectors
- (package
- (inherit python-cryptography-vectors-next)
- (version "3.4.8")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "cryptography_vectors" version))
- (sha256
- (base32 "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"))))))
-
-(define-public python-cryptography-next
+(define-public python-cryptography
(package
(name "python-cryptography")
- (version "37.0.4")
+ (version "40.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32
- "10haq7sn8mrdlhcfs791rczknnxm0wpww0lkpjzcqx141ryc3yb3"))))
- (build-system python-build-system)
+ "0wilrilfcyl78caxcpna2k3aya6qamppwv4j35262pz9n7wg40r8"))))
+ (build-system pyproject-build-system)
(arguments
(list
- #:imported-modules (append %cargo-build-system-modules
- %python-build-system-modules)
- #:modules `(((guix build cargo-build-system) #:prefix cargo:)
- ,@%python-build-system-modules
- (srfi srfi-1)
- (ice-9 match))
- #:phases
- #~(modify-phases (@ (guix build python-build-system) %standard-phases)
- (add-after 'unpack 'adjust-pyo3-requirement
- (lambda _
- ;; The package depends on 0.15.2, which is not on crates.io(!?).
- ;; Downgrade to 0.15.1...
- (substitute* "src/rust/Cargo.toml"
- (("pyo3 = \\{ version = \"0\\.15\\.2\"")
- "pyo3 = { version = \"0.15.1\""))))
- (add-before 'build 'configure-cargo
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Hide irrelevant inputs from cargo-build-system so it does
- ;; not try to unpack sanity-check.py, etc.
- (let ((cargo-inputs (filter (match-lambda
- ((name . path)
- (or (string-prefix? "rust-" name)
- (string=? "gcc" name))))
- inputs)))
- (with-directory-excursion "src/rust"
- ((assoc-ref cargo:%standard-phases 'unpack-rust-crates)
- #:inputs cargo-inputs
- #:vendor-dir "guix-vendor")
- ((assoc-ref cargo:%standard-phases 'configure)
- #:inputs cargo-inputs)
- ((assoc-ref cargo:%standard-phases 'patch-cargo-checksums)
- #:vendor-dir "guix-vendor"))
- (rename-file "src/rust/.cargo" ".cargo"))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv" "tests")))))))
- (inputs
- (list openssl
- ;; TODO: Most of these inputs are transitive dependencies of
- ;; the Rust requirements (see src/rust/cargo.toml). Surely
- ;; there is a better way than manually listing everything..?
- rust-aliasable-0.1
- rust-asn1-0.8
- rust-asn1-derive-0.8
- rust-autocfg-1
- rust-base64-0.13
- rust-bitflags-1
- rust-cfg-if-0.1
- rust-cfg-if-1
- rust-chrono-0.4
- rust-cloudabi-0.1
- rust-lazy-static-1
- rust-libc-0.2
- rust-indoc-0.3
- rust-indoc-impl-0.3
- rust-inflector-0.11
- rust-instant-0.1
- rust-lock-api-0.4
- rust-num-integer-0.1
- rust-num-traits-0.2
- rust-once-cell-1
- rust-ouroboros-0.15
- rust-ouroboros-macro-0.15
- rust-parking-lot-0.11
- rust-parking-lot-core-0.8
- rust-paste-0.1
- rust-paste-impl-0.1
- rust-pem-1
- rust-proc-macro-error-1
- rust-proc-macro-error-attr-1
- rust-proc-macro-hack-0.5
- rust-proc-macro2-1
- rust-pyo3-0.15
- rust-pyo3-build-config-0.15
- rust-pyo3-macros-0.15
- rust-pyo3-macros-backend-0.15
- rust-quote-1
- rust-redox-syscall-0.2
- rust-scopeguard-1
- rust-smallvec-1
- rust-stable-deref-trait-1
- rust-syn-1
- rust-unicode-xid-0.2
- rust-unindent-0.1
- rust-version-check-0.9
- rust-winapi-0.3))
- (propagated-inputs
- (list python-asn1crypto python-cffi python-six python-idna
- python-iso8601))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-rust-extension-build
+ (lambda _
+ ;; The Rust extension is built separately as
+ ;; 'python-cryptography-rust', so there's no need
+ ;; to build it here.
+ (substitute* "pyproject.toml"
+ ((".*setuptools-rust.*") ""))
+ (delete-file "setup.py")))
+ (add-before 'check 'symlink-rust-library
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (symlink (search-input-file
+ inputs "lib/libcryptography_rust.so")
+ (string-append (site-packages inputs outputs)
+ "/cryptography/hazmat/bindings/"
+ "_rust.abi3.so")))))))
+
(native-inputs
- (list python-cryptography-vectors-next
+ (list python-cryptography-vectors
python-hypothesis
+ python-iso8601
python-pretend
- python-pytz
- python-pytest
+ python-pytest-7.1 ;for subtests
python-pytest-benchmark
- python-pytest-subtests
- python-setuptools-rust
- rust
- `(,rust "cargo")))
+ python-pytest-subtests))
+ (inputs (list python-cryptography-rust))
+ (propagated-inputs (list python-cffi))
(home-page "https://github.com/pyca/cryptography")
(synopsis "Cryptographic recipes and primitives for Python")
(description
- "cryptography is a package which provides cryptographic recipes and
-primitives to Python developers. It aims to be the “cryptographic standard
-library” for Python. The package includes both high level recipes, and low
-level interfaces to common cryptographic algorithms such as symmetric ciphers,
-message digests and key derivation functions.")
+ "@code{cryptography} is a package which provides cryptographic recipes
+and primitives to Python developers. It aims to be the “cryptographic
+standard library” for Python. The package includes both high level recipes,
+and low level interfaces to common cryptographic algorithms such as symmetric
+ciphers, message digests and key derivation functions.")
;; Distributed under either BSD-3 or ASL2.0
(license (list license:bsd-3 license:asl2.0))))
-(define-public python-cryptography
+;;; This is the Rust component of the python-cryptography library, extracted
+;;; as a separate package to ease the Rust build.
+(define-public python-cryptography-rust
(package
- (inherit python-cryptography-next)
- (version "3.4.8")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "cryptography" version))
- (sha256
- (base32 "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"))))
+ (inherit python-cryptography)
+ (name "python-cryptography-rust")
+ (build-system cargo-build-system)
(arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'set-no-rust
- (lambda _
- (setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1"))))))
- (inputs (list openssl-1.1))
- (native-inputs
- (list python-cryptography-vectors
- python-hypothesis
- python-pretend
- python-pytz
- python-pytest
- python-setuptools-rust))))
+ (list
+ #:modules '((guix build cargo-build-system)
+ (guix build utils)
+ (srfi srfi-1)
+ (ice-9 match))
+ ;; XXX: Building the test objects appear to fail due to a missing link
+ ;; directive to Python's shared library (e.g.: "ld:
+ ;; cryptography_rust.c950d742-cgu.11:(.text._ZN3...+0x57): undefined
+ ;; reference to `PyLong_FromLong'").
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "src/rust")))
+ (replace 'unpack-rust-crates
+ ;; This is to avoid the non-crate source from being erroneously
+ ;; unpacked by this phase, causing an error.
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (apply (assoc-ref %standard-phases 'unpack-rust-crates)
+ (append args
+ (list #:inputs (alist-delete "source" inputs))))))
+ (replace 'configure
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (apply (assoc-ref %standard-phases 'configure)
+ (append args
+ (list #:inputs (alist-delete "source" inputs))))))
+ (add-after 'install 'install-shared-library
+ (lambda _
+ (install-file "target/release/libcryptography_rust.so"
+ (string-append #$output "/lib")))))
+ #:cargo-inputs
+ `(("rust-asn1-0.13" ,rust-asn1-0.13)
+ ("rust-chrono-0.4" ,rust-chrono-0.4)
+ ("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1)
+ ("rust-once-cell-1" ,rust-once-cell-1)
+ ("rust-openssl-0.10" ,rust-openssl-0.10)
+ ("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9)
+ ("rust-ouroboros-0.15" ,rust-ouroboros-0.15)
+ ("rust-pem-1" ,rust-pem-1)
+ ("rust-pyo3-0.15" ,rust-pyo3-0.15))
+ #:cargo-development-inputs
+ `(("rust-cc" ,rust-cc-1))))
+ (native-inputs (list pkg-config python python-cffi))
+ ;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs
+ ;; doesn't honor propagated-inputs.
+ (inputs (list python rust-openssl-sys-0.9))
+ (propagated-inputs '())
+ (synopsis "Core implementation of the Cryptography Python library")))
-;; This is the last version which is compatable with python-cryptography < 35.
(define-public python-pyopenssl
(package
(name "python-pyopenssl")
- (version "21.0.0")
+ (version "23.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyOpenSSL" version))
(sha256
(base32
- "1cqcc20fwl521z3fxsc1c98gbnhb14q55vrvjfp6bn6h8rg8qbay"))
- (patches (search-patches "python2-pyopenssl-openssl-compat.patch"))))
+ "1dxhip610zw1j2bz35g1w1h7vh374g0bnzn4nsqj65n6pswrh544"))))
(build-system python-build-system)
(arguments
(list
@@ -727,7 +676,7 @@ message digests and key derivation functions.")
;; PyOpenSSL runs tests against a certificate with a fixed
;; expiry time. To ensure successful builds in the future,
;; set the time to roughly the release date.
- (invoke "faketime" "2022-02-01" "py.test" "-v" "-k"
+ (invoke "faketime" "2023-03-25" "pytest" "-vv" "-k"
(string-append
;; This test tries to look up certificates from
;; the compiled-in default path in OpenSSL, which
@@ -739,17 +688,13 @@ message digests and key derivation functions.")
;; Fails on i686-linux and possibly other 32-bit platforms
;; https://github.com/pyca/pyopenssl/issues/974
"and not test_verify_with_time"))))))))
- (propagated-inputs
- (list python-cryptography python-six))
- (inputs
- (list openssl))
- (native-inputs
- (list libfaketime python-flaky python-pretend python-pytest))
+ (propagated-inputs (list python-cryptography))
+ (inputs (list openssl))
+ (native-inputs (list libfaketime python-flaky python-pretend python-pytest))
(home-page "https://github.com/pyca/pyopenssl")
(synopsis "Python wrapper module around the OpenSSL library")
- (description
- "PyOpenSSL is a high-level wrapper around a subset of the OpenSSL
-library.")
+ (description "PyOpenSSL is a high-level wrapper around a subset of the
+OpenSSL library.")
(license license:asl2.0)))
(define-public python-ed25519
@@ -1291,18 +1236,17 @@ derivation function.")
(define-public python-service-identity
(package
(name "python-service-identity")
- (version "18.1.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "service_identity" version))
- (sha256
- (base32
- "0b9f5qiqjy8ralzgwjgkhx82h6h8sa7532psmb8mkd65md5aan08"))))
- (build-system python-build-system)
- (propagated-inputs
- (list python-attrs python-pyasn1 python-pyasn1-modules
- python-pyopenssl))
+ (version "21.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "service-identity" version))
+ (sha256
+ (base32
+ "0d4x84crbz0a17d8gi90z6zlxwm9pslc65rx0cdw2797ra360v3f"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-idna python-pytest))
+ (propagated-inputs (list python-attrs python-cryptography python-pyasn1
+ python-pyasn1-modules python-six))
(home-page "https://service-identity.readthedocs.io/")
(synopsis "Service identity verification for PyOpenSSL")
(description
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 495e13a..d84b5ef 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -26,7 +26,7 @@
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2018, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2018, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
@@ -3765,13 +3765,13 @@ for the basic TCP/IP protocols.")
(define-public python-geventhttpclient
(package
(name "python-geventhttpclient")
- (version "1.5.3")
+ (version "2.0.9")
(source (origin
(method url-fetch)
(uri (pypi-uri "geventhttpclient" version))
(sha256
(base32
- "104p14p67xa5gch8dy2zqmzmjra31fflk1c1alrry8dp8bzwj3nq"))
+ "04qmcc7qpnif70ph61339dcld4g107fkhpa0gdmbs8z98v9kkg4a"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -3794,15 +3794,14 @@ for the basic TCP/IP protocols.")
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke "pytest" "src/geventhttpclient/tests" "-v"
+ (invoke "pytest" "src/geventhttpclient/tests" "-v"
;; Append the test modules to sys.path to avoid
;; namespace conflict which breaks SSL tests.
"--import-mode=append")))))))
- (native-inputs
- (list python-dpkt python-pytest))
- (propagated-inputs
- (list python-brotli python-certifi python-gevent python-six))
- (home-page "https://github.com/gwik/geventhttpclient")
+ (native-inputs (list python-dpkt python-pytest))
+ (propagated-inputs (list python-brotli python-certifi python-gevent
+ python-six python-urllib3))
+ (home-page "https://github.com/geventhttpclient/geventhttpclient")
(synopsis "HTTP client library for gevent")
(description "@code{python-geventhttpclient} is a high performance,
concurrent HTTP client library for python using @code{gevent}.")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 06eae3d..0147870 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -968,7 +968,7 @@ Markdown. All extensions are found under the module namespace of pymdownx.")
"0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q"))))
(build-system python-build-system)
(native-inputs
- (list python-pytest
+ (list python-pytest-7.1 ;for pytest-subtests
python-pytest-cov
python-pytest-mpl
python-pytest-subtests
@@ -3542,16 +3542,16 @@ and is not compatible with JSON.")
(define-public python-exceptiongroup
(package
(name "python-exceptiongroup")
- (version "1.0.0rc8")
+ (version "1.1.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/agronholm/exceptiongroup")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "0xsbpv22n51p6yvyvz231mf8zhbi1i88b4zmacaxxx31zrq5ifv4"))))
+ "0wcvzwgjs0xmggs6dh92jxdqi988gafzh10hrzvw10kasy0xakfj"))))
(build-system python-build-system)
(arguments
(list
@@ -12164,36 +12164,17 @@ the @code{sendfile(2)} system call.")
(define-public python-pyftpdlib
(package
(name "python-pyftpdlib")
- (version "1.5.6")
+ (version "1.5.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pyftpdlib" version))
(sha256
- (base32 "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px"))))
- (build-system python-build-system)
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke
- "pytest"
- ;; Deselect failing tests.
- "-k" (string-append
- ;; Using Pytest instead of the Makefile causes the
- ;; command line tests to fail on unknown Pytest
- ;; arguments.
- "not TestCommandLineParser "
- ;; https://github.com/giampaolo/pyftpdlib/issues/478
- "and not test_use_gmt_times "
- ;; https://github.com/giampaolo/pyftpdlib/issues/550
- "and not test_masquerade_address "
- ;; https://github.com/giampaolo/pyftpdlib/issues/500
- "and not test_rest_on_stor "
- "and not test_stor_ascii"))))))))
+ (base32 "0vk5gcx4svjrpm014ykwxmijqihgb4ha17kb3yphk0nv6x0wx8vy"))))
+ (build-system pyproject-build-system)
+ ;; Using Pytest instead of the Makefile causes the command line tests to
+ ;; fail on unknown Pytest arguments.
+ (arguments (list #:test-flags #~(list "-k" "not TestCommandLineParser")))
(native-inputs (list python-psutil python-pytest))
(propagated-inputs (list python-pyopenssl python-pysendfile))
(home-page "https://github.com/giampaolo/pyftpdlib/")
@@ -12302,7 +12283,12 @@ from an XML-based format.")
"test_read_fontdimens_mathex"
"test_read_fontdimens_vanilla"
"test_read_boundary_char"
- "fontTools.tfmLib")
+ "fontTools.tfmLib"
+ ;; The MtiTest tests fail for unknown
+ ;; reasons (see:
+ ;; https://github.com/fonttools/
+ ;; fonttools/issues/3078)
+ "MtiTest")
" and not "))))))))))
(native-inputs
(modify-inputs (package-native-inputs python-fonttools)
@@ -12320,14 +12306,14 @@ from an XML-based format.")
(define-public python-fonttools-next
(package
(inherit python-fonttools-full)
- (version "4.37.1")
+ (version "4.39.3")
(source (origin
(inherit (package-source python-fonttools-full))
(method url-fetch)
(uri (pypi-uri "fonttools" version ".zip"))
(sha256
(base32
- "1ryc1wca2v92wn24baryj5fr32lspl8rbsig32fnkxp1islf21j6"))))))
+ "1msibi5cmi5znykkg66dq7xshl07lkqjxhrz5hcipqvlggsvjd4j"))))))
(define-public python-ly
(package
@@ -14608,26 +14594,24 @@ simulation, statistical modeling, machine learning and much more.")
(define-public python-chardet
(package
(name "python-chardet")
- (version "5.0.0")
+ (version "5.1.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "chardet" version))
(sha256
(base32
- "1amqmz8731ly6f9rkbk09w4jqgmmgyxykd1bawhgrdbqzlmxys03"))))
+ "1r9ixxnish9j3dq4h0z0cwlkr4f5lgi6d8mhbzw59hbbjlmp2qhd"))))
(native-inputs
(list python-pytest))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
- (list #:phases
+ (list #:test-flags
+ ;; Disable test that fails sporadically:
+ ;; https://github.com/chardet/chardet/issues/256
+ #~'("-k" "not test_detect_all_and_detect_one_should_agree")
+ #:phases
#~(modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "pytest" "-vv" "-k"
- ;; Disable test that fails sporadically:
- ;; https://github.com/chardet/chardet/issues/256
- "not test_detect_all_and_detect_one_should_agree")))
;; This package provides a 'chardetect' executable that only
;; depends on Python, so customize the wrap phase to avoid
;; adding pytest and friends in order to save size.
@@ -15750,13 +15734,13 @@ expression.")
(define-public python-unicodedata2
(package
(name "python-unicodedata2")
- (version "14.0.0")
+ (version "15.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "unicodedata2" version))
(sha256
- (base32 "110nnvh02ssp92xbmswy39aa186jrmb7m41x4220wigl8c0dzxs1"))))
+ (base32 "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"))))
(build-system python-build-system)
(home-page "https://github.com/fonttools/unicodedata2")
(synopsis "Python unicodedata backport")
@@ -16425,7 +16409,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
python-iniconfig
python-moto
python-msgpack
- python-pytest
+ python-pytest-7.1 ;for pytest-subtests
python-pytest-celery
python-pytest-subtests
python-pytest-timeout
@@ -18321,13 +18305,13 @@ parsing UK postcodes.")
(define-public python-faker
(package
(name "python-faker")
- (version "13.3.4")
+ (version "15.0.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "Faker" version))
(sha256
(base32
- "04855dqvvi2mr739l5x3qf82rxq0a7spc8gl76k8xixmbw36328q"))))
+ "1yx3gsivisf8ls43v0fgzy4n5q9625xrp9fr9cb5gp3h6k9cfpr4"))))
(build-system python-build-system)
(arguments
'(#:phases
@@ -24828,13 +24812,13 @@ project.")
(define-public python-trio
(package
(name "python-trio")
- (version "0.20.0")
+ (version "0.22.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "trio" version))
(sha256
- (base32 "0w30cwmdwfa8zq2agqv3h62jzwwsk7ms8f683ag8f3jx279m42k7"))))
+ (base32 "1kxa9v0cds0xnklvzppv4ix4xg81r73p5pm4qlvv2iqa832z2s6f"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -24860,7 +24844,8 @@ project.")
;; Assertion errors.
" and not test_guest_mode_ki"
" and not test_run_in_trio_thread_ki"
- " and not test_simple_cancel_scope_usage_doesnt_create_cyclic_garbage"
+ " and not test_simple_cancel_scope_usage_doesnt_create\
+_cyclic_garbage"
" and not test_nursery_cancel_doesnt_create_cyclic_garbage"
" and not test_cancel_scope_exit_doesnt_create_cyclic_garbage"
" and not test_locals_destroyed_promptly_on_cancel"
@@ -24890,6 +24875,8 @@ project.")
(propagated-inputs
(list python-async-generator
python-attrs
+ python-cffi
+ python-exceptiongroup
python-idna
python-outcome
python-sniffio
@@ -24906,22 +24893,15 @@ programs that do multiple things at the same time with parallelized I/O.")
(define-public python-trio-typing
(package
(name "python-trio-typing")
- (version "0.5.0")
+ (version "0.8.0")
(source
(origin
- (method url-fetch)
- (uri (pypi-uri "trio-typing" version))
- (sha256
- (base32 "1yvlj4vf3wyvp16dw6vyfm4i2idm8lvdc3fvjhi6mhm62zv7s07j"))))
- (build-system python-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "pytest" "-vv"))))))
- (native-inputs
- (list python-attrs python-pytest))
+ (method url-fetch)
+ (uri (pypi-uri "trio-typing" version))
+ (sha256
+ (base32 "15wa66cs165wawh4pi808ac43n67b8jqddi5ppdcbkj5gfi68hpi"))))
+ (build-system pyproject-build-system)
+ (native-inputs (list python-attrs python-pytest))
(propagated-inputs
(list python-mypy python-mypy-extensions python-trio
python-typing-extensions))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2e9cc3e..8cda634 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -337,13 +337,13 @@ system, and the core design of Django is reused in Grantlee.")
(define-public qtbase-5
(package
(name "qtbase")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "1p2fa94m1y8qzhdfi2d7dck93qh1lgsinibwl1wy92bwmacwfhhc"))
+ "175ynjndpzsw69vnsq4swykn9f48568ww9b4z3yw7azkqwk13cdz"))
;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch"
"qtbase-moc-ignore-gcc-macro.patch"
@@ -364,50 +364,50 @@ system, and the core design of Django is reused in Grantlee.")
;; Use which the package, not the function
(@ (gnu packages base) which)))
(inputs
- `(("alsa-lib" ,alsa-lib)
- ("cups" ,cups)
- ("dbus" ,dbus)
- ("double-conversion" ,double-conversion)
- ("eudev" ,eudev)
- ("expat" ,expat)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glib" ,glib)
- ("gtk+" ,gtk+) ;for GTK theme support
- ("harfbuzz" ,harfbuzz)
- ("icu4c" ,icu4c)
- ("libinput" ,libinput-minimal)
- ("libjpeg" ,libjpeg-turbo)
- ("libmng" ,libmng)
- ("libpng" ,libpng)
- ("libx11" ,libx11)
- ("libxcomposite" ,libxcomposite)
- ("libxcursor" ,libxcursor)
- ("libxfixes" ,libxfixes)
- ("libxi" ,libxi)
- ("libxinerama" ,libxinerama)
- ("libxkbcommon" ,libxkbcommon)
- ("libxml2" ,libxml2)
- ("libxrandr" ,libxrandr)
- ("libxrender" ,libxrender)
- ("libxslt" ,libxslt)
- ("libxtst" ,libxtst)
- ("mtdev" ,mtdev)
- ("mariadb-dev" ,mariadb "dev")
- ("nss" ,nss)
- ("openssl" ,openssl)
- ("pcre2" ,pcre2)
- ("postgresql" ,postgresql)
- ("pulseaudio" ,pulseaudio)
- ("sqlite" ,sqlite)
- ("unixodbc" ,unixodbc)
- ("xcb-util" ,xcb-util)
- ("xcb-util-image" ,xcb-util-image)
- ("xcb-util-keysyms" ,xcb-util-keysyms)
- ("xcb-util-renderutil" ,xcb-util-renderutil)
- ("xcb-util-wm" ,xcb-util-wm)
- ("xdg-utils" ,xdg-utils)
- ("zlib" ,zlib)))
+ (list alsa-lib
+ cups
+ dbus
+ double-conversion
+ eudev
+ expat
+ fontconfig
+ freetype
+ glib
+ gtk+ ;for GTK theme support
+ harfbuzz
+ icu4c
+ libinput-minimal
+ libjpeg-turbo
+ libmng
+ libpng
+ libx11
+ libxcomposite
+ libxcursor
+ libxfixes
+ libxi
+ libxinerama
+ libxkbcommon
+ libxml2
+ libxrandr
+ libxrender
+ libxslt
+ libxtst
+ mtdev
+ `(,mariadb "dev")
+ nss
+ openssl
+ pcre2
+ postgresql
+ pulseaudio
+ sqlite
+ unixodbc
+ xcb-util
+ xcb-util-image
+ xcb-util-keysyms
+ xcb-util-renderutil
+ xcb-util-wm
+ xdg-utils
+ zlib))
(native-inputs
(list bison
flex
@@ -772,6 +772,9 @@ developers using C++ or QML, a CSS & JavaScript like language.")
;; Actual (dt5.offsetFromUtc()): 0
;; Expected (46800) : 46800
"tst_qdatetime"
+ ;; The tst_QObjectRace::destroyRace is flaky (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-103489).
+ "tst_qobjectrace"
;; The 'tst_QSettings::fromFile' assumes the data
;; location to be relative to the root directory and
;; fails.
@@ -872,13 +875,13 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(package
(inherit qtbase-5)
(name "qt3d")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "1m3y7d58crn0qgfwkimxcggssn2pbs8nj5b9diwns6rwqg4aqk20"))))
+ "18hbv4l9w0czaxcch6af9130fgs4sf400xp0pfzl81c78fwrkfsb"))))
(propagated-inputs `())
(native-inputs (list perl))
(inputs (list mesa qtbase-5 vulkan-headers zlib))
@@ -964,13 +967,13 @@ came with the @{qtgraphicaleffects} Qt 5 package.")
(package
(inherit qtbase-5)
(name "qtsvg")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4"))))
+ "0qnmcvp5jap4qq9w7xak66g6fsb48q1lg02rn4lycvnhgwzblbww"))))
(propagated-inputs `())
(native-inputs (list perl))
(inputs
@@ -1063,13 +1066,13 @@ HostData=lib/qt5
(define-public qtimageformats
(package (inherit qtsvg-5)
(name "qtimageformats")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "1xjb2z2h1ajw7z9cwq8djpdvjwalpnmirwcwrlbjqv5r4ghmi82a"))
+ "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -1090,13 +1093,13 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras
(package (inherit qtsvg-5)
(name "qtx11extras")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn"))))
+ "1gzmf0y2byzrgfbing7xk3cwlbk1cyjlhqjbfh8n37y09gg65maf"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@ -1155,13 +1158,13 @@ XLSX document format.")
(define-public qtxmlpatterns
(package (inherit qtsvg-5)
(name "qtxmlpatterns")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5"))))
+ "1inf7ar32a557faqpwdsmafhz1p6k8hywpw3wbsdjlj74dkgdq35"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@ -1181,38 +1184,35 @@ XML and custom data models. It contains programs such as xmlpatterns and
xmlpatternsvalidator.")))
(define-public qtdeclarative-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtdeclarative")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'build 'fix-qt5core-install-prefix
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen
- ;; is provided by qtdeclarative-5.
- (substitute*
- "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
- (("\\$\\{_qt5Core_install_prefix\\}") out)))))
- ;; TODO: Add phase unconditionally.
- ,@(if (target-riscv64?)
- '((add-after 'unpack 'fix-linking-riscv64
- (lambda _
- (substitute* "src/qml/qml.pro"
- (("DEFINES \\+= QT_NO_FOREACH")
- (string-append
- "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n"
- "DEFINES += QT_NO_FOREACH"))))))
- '())))))
+ #~(modify-phases #$phases
+ (add-after 'build 'fix-qt5core-install-prefix
+ (lambda _
+ ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen
+ ;; is provided by qtdeclarative-5.
+ (substitute*
+ "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
+ (("\\$\\{_qt5Core_install_prefix\\}") #$output))))
+ (add-after 'unpack 'fix-linking-riscv64
+ (lambda _
+ (substitute* "src/qml/qml.pro"
+ (("DEFINES \\+= QT_NO_FOREACH")
+ (string-append
+ "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n"
+ "DEFINES += QT_NO_FOREACH")))))))))
(native-inputs
(list perl
pkg-config
@@ -1362,15 +1362,16 @@ integrate QML code with JavaScript and C++.")
(license (package-license qtbase))))
(define-public qtconnectivity
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtconnectivity")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc"))))
(native-inputs
(list perl pkg-config qtdeclarative-5))
(inputs
@@ -1382,13 +1383,13 @@ with Bluetooth and NFC.")))
(define-public qtwebsockets-5
(package (inherit qtsvg-5)
(name "qtwebsockets")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6"))))
+ "12h520lpj2pljgkyq36p1509mw4pxgb76n30d32kg52crjsk34pa"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@@ -1442,25 +1443,26 @@ consume data received from the server, or both.")
(license (package-license qtbase))))
(define-public qtsensors
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtsensors")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:parallel-tests? _ #f) #f) ; can lead to race condition
+ ((#:parallel-tests? _ #f) #f) ; can lead to race condition
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
- (("2000") "5000") ;lengthen test timeout
- (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test
+ (("2000") "5000") ;lengthen test timeout
+ (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test
(native-inputs
(list perl qtdeclarative-5))
(inputs (list qtbase-5))
@@ -1473,21 +1475,21 @@ recognition API for devices.")))
(package
(inherit qtsvg-5)
(name "qtmultimedia")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0q76iy1frcgm85mid17lh4p6gnn04n19n6zklgpv4w3md1ng97xw"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively
"examples/multimedia/spectrum/3rdparty")
- ;; We also prevent the spectrum example from being built.
- (substitute* "examples/multimedia/multimedia.pro"
- (("spectrum") "#"))))))
+ ;; We also prevent the spectrum example from being built.
+ (substitute* "examples/multimedia/multimedia.pro"
+ (("spectrum") "#"))))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@ -1609,38 +1611,38 @@ set of plugins for interacting with pulseaudio and GStreamer.")
(license (package-license qtbase))))
(define-public qtwayland-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtwayland")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (patches (search-patches "qtwayland-gcc-11.patch"
- "qtwayland-dont-recreate-callbacks.patch"
- "qtwayland-cleanup-callbacks.patch"))
- (sha256
- (base32
- "0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (patches (search-patches "qtwayland-gcc-11.patch"
+ "qtwayland-dont-recreate-callbacks.patch"
+ "qtwayland-cleanup-callbacks.patch"))
+ (sha256
+ (base32
+ "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'disable-failing-tests
- (lambda _
- ;; FIXME: tst_seatv4::animatedCursor() fails for no good
- ;; reason and breaks these two tests.
- (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
- (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
- "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
- "")
- (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
- ""))))
- (add-before 'check 'set-test-environment
- (lambda _
- ;; Do not fail just because /etc/machine-id is missing.
- (setenv "DBUS_FATAL_WARNINGS" "0")))))))
- (native-inputs
- (list glib perl pkg-config qtdeclarative-5))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ ;; FIXME: tst_seatv4::animatedCursor() fails for no good
+ ;; reason and breaks these two tests.
+ (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
+ (((string-append "QVERIFY\\(!cursorSurface\\(\\)->"
+ "m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
+ "")
+ (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
+ ""))))
+ (add-before 'check 'set-test-environment
+ (lambda _
+ ;; Do not fail just because /etc/machine-id is missing.
+ (setenv "DBUS_FATAL_WARNINGS" "0")))))))
+ (native-inputs (list glib perl pkg-config qtdeclarative-5))
(inputs
(list fontconfig
freetype
@@ -1709,75 +1711,75 @@ compositor libraries.")
(license (package-license qtbase))))
(define-public qtserialport
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtserialport")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v"))))
(native-inputs (list perl))
- (inputs
- (list qtbase-5 eudev))
+ (inputs (list qtbase-5 eudev))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'patch-dlopen-paths
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "src/serialport/qtudev_p.h"
- ;; Use the absolute paths for dynamically loaded libs,
- ;; otherwise the lib will be searched in LD_LIBRARY_PATH which
- ;; typically is not set in guix.
- (("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b)
- (string-append a (assoc-ref inputs "eudev") "/lib/lib" b)))))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'patch-dlopen-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/serialport/qtudev_p.h"
+ ;; Use the absolute paths for dynamically loaded libs,
+ ;; otherwise the lib will be searched in LD_LIBRARY_PATH which
+ ;; typically is not set in guix.
+ (("setFileNameAndVersion\\(QStringLiteral\\(\"udev\")")
+ (format #f "setFileNameAndVersion(QStringLiteral(~s))"
+ (string-append #$(this-package-input "eudev")
+ "/lib/libudev"))))))))))
(synopsis "Qt Serial Port module")
(description "The Qt Serial Port module provides the library for
interacting with serial ports from within Qt.")))
(define-public qtserialbus
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtserialbus")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (add-after 'unpack 'patch-libsocketcan-reference
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((libcansocket (assoc-ref inputs "libsocketcan"))
- (libcansocket.so (string-append libcansocket
- "/lib/libsocketcan.so")))
- (substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp"
- (("QStringLiteral\\(\"socketcan\"\\)")
- (format #f "QStringLiteral(~s)" libcansocket.so))))))))))
- (inputs
- (list libsocketcan qtbase-5 qtserialport))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'patch-libsocketcan-reference
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp"
+ (("QStringLiteral\\(\"socketcan\"\\)")
+ (format #f "QStringLiteral(~s)"
+ (search-input-file inputs
+ "lib/libsocketcan.so"))))))))))
+ (inputs (list libsocketcan qtbase-5 qtserialport))
(synopsis "Qt Serial Bus module")
(description "The Qt Serial Bus API provides classes and functions to
access the various industrial serial buses and protocols, such as CAN, ModBus,
and others.")))
(define-public qtwebchannel-5
(package (inherit qtsvg-5)
(name "qtwebchannel")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf"))))
- (native-inputs
- (list perl qtdeclarative-5 qtwebsockets-5))
+ "1pfmy6fqis47awjb590r63y13vvsfm0fq70an3ylsknhyq3firgn"))))
+ (native-inputs (list perl qtdeclarative-5 qtwebsockets-5))
(inputs (list qtbase-5))
(synopsis "Web communication library for Qt")
(description "The Qt WebChannel module enables peer-to-peer communication
@@ -1823,74 +1825,73 @@ application).")
(license (package-license qtbase))))
(define-public qtwebglplugin
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtwebglplugin")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'disable-network-tests
- (lambda _ (substitute* "tests/plugins/platforms/platforms.pro"
- (("webgl") "# webgl"))))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'disable-network-tests
+ (lambda _
+ (substitute* "tests/plugins/platforms/platforms.pro"
+ (("webgl") "# webgl"))))))))
(native-inputs '())
- (inputs
- (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
+ (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
(synopsis "QPA plugin for running applications via a browser using
streamed WebGL commands")
(description "Qt back end that uses WebGL for rendering. It allows Qt
applications (with some limitations) to run in a web browser that supports
WebGL. WebGL is a JavaScript API for rendering 2D and 3D graphics within any
compatible web browser without the use of plug-ins. The API is similar to
OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(define-public qtwebview
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtwebview")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0arwaky3jy5ql3z4d8f7k7diidzb1kncdans7pn50hsa1bzacfal"))))
- (native-inputs
- (list perl))
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj"))))
+ (native-inputs (list perl))
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Display web content in a QML application")
(description "Qt WebView provides a way to display web content in a QML
application without necessarily including a full web browser stack by using
native APIs where it makes sense.")))
(define-public qtlocation
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtlocation")
(version "5.15.5")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f) ; TODO: Enable the tests
+ ((#:tests? _ #f) #f) ; TODO: Enable the tests
((#:phases phases)
- `(modify-phases ,phases
- (add-before 'check 'pre-check
- (lambda _
- (setenv "HOME" "/tmp")))))))
- (native-inputs
- (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport))
- (inputs
- (list icu4c openssl qtbase-5 zlib))
+ #~(modify-phases #$phases
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" "/tmp")))))))
+ (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport))
+ (inputs (list icu4c openssl qtbase-5 zlib))
(synopsis "Qt Location and Positioning modules")
(description "The Qt Location module provides an interface for location,
positioning and geolocation plugins.")))
@@ -1928,22 +1929,21 @@ plugin for Adobe After Effects.")
(license (package-license qtbase))))
(define-public qttools-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qttools")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (native-inputs
- (list perl qtdeclarative-5 vulkan-headers))
- (inputs
- (list mesa qtbase-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (native-inputs (list perl qtdeclarative-5 vulkan-headers))
+ (inputs (list mesa qtbase-5))
(synopsis "Qt Tools and Designer modules")
(description "The Qt Tools module provides a set of applications to browse
the documentation, translate applications, generate help files and other stuff
@@ -2011,60 +2011,59 @@ the Qt community.")
(license (list license:gpl3))))
(define-public qtscript
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtscript")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm"))
- (patches (search-patches "qtscript-disable-tests.patch"))))
- (native-inputs
- (list perl qttools-5))
- (inputs
- (list qtbase-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs"))
+ (patches (search-patches "qtscript-disable-tests.patch"))))
+ (native-inputs (list perl qttools-5))
+ (inputs (list qtbase-5))
(synopsis "Qt Script module")
(description "Qt provides support for application scripting with ECMAScript.
The following guides and references cover aspects of programming with
ECMAScript and Qt.")))
(define-public qtquickcontrols-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtquickcontrols")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Quick Controls and other Quick modules")
(description "The QtScript module provides classes for making Qt
applications scriptable. This module provides a set of extra components that
can be used to build complete interfaces in Qt Quick.")))
(define-public qtquickcontrols2-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtquickcontrols2")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1cxg4ml07k1zcyi5m4lx06sz8f5l67isb5vhk7nakxm0wnn7p8y4"))))
- (arguments
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5"))))
+ (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Quick Controls 2 and other Quick 2 modules")
(description "The Qt Quick Controls 2 module contains the Qt Labs Platform
module that provides platform integration: native dialogs, menus and menu bars,
@@ -2078,40 +2077,40 @@ not available.")))
(deprecated-package "qtquickcontrols2" qtdeclarative))
(define-public qtgraphicaleffects
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtgraphicaleffects")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Graphical Effects module")
(description "The Qt Graphical Effects module provides a set of QML types
for adding visually impressive and configurable effects to user interfaces.
Effects are visual items that can be added to Qt Quick user interface as UI
components. The API consists of over 20 effects provided as separate QML
types. The effects cover functional areas such as blending, masking, blurring,
coloring, and many more.")))
(define-public qtgamepad
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtgamepad")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0wa4d8f025hlp4bmdzdy5wcahm9wjg6bkwig8dpw9nrsj3idz5b0"))))
- (native-inputs
- (list perl pkg-config))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
+ (native-inputs (list perl pkg-config))
(inputs
(list fontconfig
freetype
@@ -2127,27 +2126,26 @@ primary target audience are embedded devices with fullscreen user interfaces,
and mobile applications targeting TV-like form factors.")))
(define-public qtscxml
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtscxml")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0xf5mqsrw16h8xjglymgfc8qg2qa5bi4fgdl4j3dkhvvpr7vrphp"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "tests/3rdparty")
- ;; the scion test refers to the bundled 3rd party test code.
- (substitute* "tests/auto/auto.pro"
- (("scion") "#"))))))
- (arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "tests/3rdparty")
+ ;; the scion test refers to the bundled 3rd party test code.
+ (substitute* "tests/auto/auto.pro"
+ (("scion") "#"))))))
+ (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt SCXML module")
(description "The Qt SCXML module provides functionality to create state
machines from SCXML files. This includes both dynamically creating state
@@ -2186,65 +2184,64 @@ information and perform area based monitoring.")
(license (package-license qtbase))))
(define-public qtpurchasing
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtpurchasing")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7"))))
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Purchasing module")
(description "The Qt Purchasing module provides and in-app API for
purchasing goods and services.")))
(define-public qtcharts
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtcharts")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'remove-failing-test
- (lambda _
- (substitute* "tests/auto/auto.pro"
- (("qml") "# qml")
- (("qml-qtquicktest") "# qml-qtquicktest"))))))))
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'remove-failing-test
+ (lambda _
+ (substitute* "tests/auto/auto.pro"
+ (("qml") "# qml")
+ (("qml-qtquicktest") "# qml-qtquicktest"))))))))
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Charts module")
(description "The Qt Charts module provides a set of easy to use chart
components. It uses the Qt Graphics View Framework, therefore charts can be
easily integrated to modern user interfaces. Qt Charts can be used as QWidgets,
QGraphicsWidget, or QML types. Users can easily create impressive graphs by
selecting one of the charts themes.")
(license license:gpl3)))
(define-public qtdatavis3d
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtdatavis3d")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x"))))
- (arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh"))))
+ (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Data Visualization module")
(description "The Qt Data Visualization module provides a way to visualize
data in 3D as bar, scatter, and surface graphs. It is especially useful for
@@ -2256,15 +2253,14 @@ customized by using themes or by adding custom items and labels to them.")
(define-public qtnetworkauth-5
(package (inherit qtsvg-5)
(name "qtnetworkauth")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "0c7mz715rlpg0cqgs6s0aszmslyamkhnpamc1iij6i571sj5j2f1"))))
- (inputs
- (list qtbase-5))
+ "0fsmpjwkzzy3281shld7gs1gj217smb1f8ai63gdvnkp0jb2fhc5"))))
+ (inputs (list qtbase-5))
(synopsis "Qt Network Authorization module")
(description "The Qt Network Authorization module provides an
implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
@@ -2290,54 +2286,57 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
(license (package-license qtbase))))
(define-public qtremoteobjects
- (package (inherit qtsvg-5)
+ (package
(name "qtremoteobjects")
- (version "5.15.5")
+ (version "6.3.2")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"))))
+ (build-system cmake-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'remove-failing-test
- (lambda _
- ;; This test can't find its imports.
- (substitute* "tests/auto/qml/qml.pro"
- (("integration") "# integration")
- (("usertypes") "# usertypes"))
- ;; disable failing tests: they need network
- (substitute* "tests/auto/auto.pro"
- (("integration_multiprocess proxy_multiprocess integration_external restart")
- "integration_multiprocess"))))))))
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-display
+ (lambda _
+ ;; Make Qt render "offscreen", required for tests.
+ (setenv "QT_QPA_PLATFORM" "offscreen")))
+ (delete 'check) ;move after the install phase
+ (add-after 'install 'check
+ (assoc-ref %standard-phases 'check))
+ (add-before 'check 'prepare-for-tests
+ (lambda _
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH"))))))))
+ (native-inputs (list perl vulkan-headers))
+ (inputs (list libxkbcommon qtbase qtdeclarative))
(synopsis "Qt Remote Objects module")
(description "The Qt Remote Objects module is an @dfn{inter-process
communication} (IPC) module developed for Qt. The idea is to extend existing
Qt's functionalities to enable an easy exchange of information between
-processes or computers.")))
+processes or computers.")
+ (home-page (package-home-page qtbase))
+ (license (package-license qtbase))))
(define-public qtspeech
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtspeech")
- (version "5.15.5")
+ (version "5.15.8")
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4"))))
- (arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5))
- (native-inputs
- (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6"))))
+ (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (list qtbase-5))
+ (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
(synopsis "Qt Speech module")
(description "The Qt Speech module enables a Qt application to support
accessibility features such as text-to-speech, which is useful for end-users
@@ -2434,195 +2433,196 @@ using the Enchant spell-checking library.")
(package
(inherit qtsvg-5)
(name "qtwebengine")
- (version "5.15.5")
+ (version "5.15.8")
(source
(origin
(method url-fetch)
(uri (qt-urls name version))
(sha256
(base32
- "0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17"))
+ "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg"))
(modules '((ice-9 ftw)
(ice-9 match)
(srfi srfi-1)
(srfi srfi-26)
(guix build utils)))
(snippet
#~(begin
- (let ((preserved-third-party-files
- '("base/third_party/double_conversion"
- "base/third_party/cityhash"
- "base/third_party/cityhash_v103"
- "base/third_party/dynamic_annotations"
- "base/third_party/icu"
- "base/third_party/libevent"
- "base/third_party/nspr"
- "base/third_party/superfasthash"
- "base/third_party/symbolize"
- "base/third_party/xdg_mime"
- "base/third_party/xdg_user_dirs"
- "net/third_party/mozilla_security_manager"
- "net/third_party/nss"
- "net/third_party/quiche"
- "net/third_party/uri_template"
- "third_party/abseil-cpp"
- "third_party/angle"
- "third_party/angle/src/common/third_party/base"
- "third_party/angle/src/common/third_party/smhasher"
- "third_party/angle/src/common/third_party/xxhash"
- "third_party/angle/src/third_party/compiler"
- "third_party/axe-core"
- "third_party/blink"
- "third_party/boringssl"
- "third_party/boringssl/src/third_party/fiat"
- "third_party/breakpad"
- "third_party/brotli"
- "third_party/catapult/common/py_vulcanize/py_vulcanize"
- "third_party/catapult/common/py_vulcanize/third_party"
- "third_party/catapult/third_party/beautifulsoup4"
- "third_party/catapult/third_party/html5lib-python"
- "third_party/catapult/third_party/polymer/components"
- "third_party/catapult/tracing"
- "third_party/catapult/tracing/third_party"
- "third_party/ced"
- "third_party/cld_3"
- "third_party/closure_compiler"
- "third_party/crashpad"
- "third_party/crashpad/crashpad/third_party/lss"
- "third_party/crashpad/crashpad/third_party/zlib"
- "third_party/crc32c"
- "third_party/dav1d"
- "third_party/dawn"
- "third_party/devtools-frontend"
- "third_party/devtools-frontend/src/front_end/third_party"
- "third_party/devtools-frontend/src/third_party/typescript"
- "third_party/emoji-segmenter"
- "third_party/ffmpeg"
- "third_party/googletest"
- "third_party/harfbuzz-ng/utils"
- "third_party/hunspell"
- "third_party/iccjpeg"
- "third_party/icu"
- "third_party/inspector_protocol"
- "third_party/jinja2"
- "third_party/jsoncpp"
- "third_party/jstemplate"
- "third_party/khronos"
- "third_party/leveldatabase"
- "third_party/libaddressinput"
- "third_party/libavif"
- "third_party/libgifcodec"
- "third_party/libjingle_xmpp"
- "third_party/libjpeg_turbo"
- "third_party/libpng"
- "third_party/libsrtp"
- "third_party/libsync"
- "third_party/libudev"
- "third_party/libvpx"
- "third_party/libwebm"
- "third_party/libwebp"
- "third_party/libxml"
- "third_party/libxslt"
- "third_party/libyuv"
- "third_party/lottie"
- "third_party/lss"
- "third_party/mako"
- "third_party/markupsafe"
- "third_party/mesa_headers"
- "third_party/metrics_proto"
- "third_party/modp_b64"
- "third_party/nasm"
- "third_party/node"
- "third_party/one_euro_filter"
- "third_party/openh264/src/codec/api/svc"
- "third_party/opus"
- "third_party/ots"
- "third_party/pdfium"
- "third_party/pdfium/third_party/agg23"
- "third_party/pdfium/third_party/base"
- "third_party/pdfium/third_party/freetype"
- "third_party/pdfium/third_party/lcms"
- "third_party/pdfium/third_party/libopenjpeg20"
- "third_party/pdfium/third_party/skia_shared"
- "third_party/perfetto"
- "third_party/pffft"
- "third_party/ply"
- "third_party/polymer"
- "third_party/protobuf"
- "third_party/protobuf/third_party/six"
- "third_party/pyjson5"
- "third_party/re2"
- "third_party/rnnoise"
- "third_party/skia"
- "third_party/skia/include/third_party/skcms/skcms.h"
- "third_party/skia/include/third_party/vulkan"
- "third_party/skia/third_party/skcms"
- "third_party/smhasher"
- "third_party/snappy"
- "third_party/sqlite"
- "third_party/usb_ids"
- "third_party/usrsctp"
- "third_party/vulkan_memory_allocator"
- "third_party/web-animations-js"
- "third_party/webrtc"
- "third_party/webrtc/common_audio/third_party/ooura/fft_size_128"
- "third_party/webrtc/common_audio/third_party/ooura/fft_size_256"
- "third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
- "third_party/webrtc/modules/third_party/fft"
- "third_party/webrtc/modules/third_party/g711"
- "third_party/webrtc/modules/third_party/g722"
- "third_party/webrtc/rtc_base/third_party/base64"
- "third_party/webrtc/rtc_base/third_party/sigslot"
- "third_party/webrtc_overrides"
- "third_party/widevine/cdm/widevine_cdm_common.h"
- "third_party/widevine/cdm/widevine_cdm_version.h"
- "third_party/woff2"
- "third_party/xcbproto"
- "third_party/zlib"
- "url/third_party/mozilla"
- "v8/src/third_party/utf8-decoder"
- "v8/src/third_party/valgrind"
- "v8/src/third_party/siphash"
- "v8/third_party/v8/builtins"
- "v8/third_party/inspector_protocol")))
+ (let ((preserved-third-party-files
+ '("base/third_party/double_conversion"
+ "base/third_party/cityhash"
+ "base/third_party/cityhash_v103"
+ "base/third_party/dynamic_annotations"
+ "base/third_party/icu"
+ "base/third_party/libevent"
+ "base/third_party/nspr"
+ "base/third_party/superfasthash"
+ "base/third_party/symbolize"
+ "base/third_party/xdg_mime"
+ "base/third_party/xdg_user_dirs"
+ "net/third_party/mozilla_security_manager"
+ "net/third_party/nss"
+ "net/third_party/quiche"
+ "net/third_party/uri_template"
+ "third_party/abseil-cpp"
+ "third_party/angle"
+ "third_party/angle/src/common/third_party/base"
+ "third_party/angle/src/common/third_party/smhasher"
+ "third_party/angle/src/common/third_party/xxhash"
+ "third_party/angle/src/third_party/compiler"
+ "third_party/axe-core"
+ "third_party/blink"
+ "third_party/boringssl"
+ "third_party/boringssl/src/third_party/fiat"
+ "third_party/breakpad"
+ "third_party/brotli"
+ "third_party/catapult/common/py_vulcanize/py_vulcanize"
+ "third_party/catapult/common/py_vulcanize/third_party"
+ "third_party/catapult/third_party/beautifulsoup4"
+ "third_party/catapult/third_party/html5lib-python"
+ "third_party/catapult/third_party/polymer/components"
+ "third_party/catapult/tracing"
+ "third_party/catapult/tracing/third_party"
+ "third_party/ced"
+ "third_party/cld_3"
+ "third_party/closure_compiler"
+ "third_party/crashpad"
+ "third_party/crashpad/crashpad/third_party/lss"
+ "third_party/crashpad/crashpad/third_party/zlib"
+ "third_party/crc32c"
+ "third_party/dav1d"
+ "third_party/dawn"
+ "third_party/devtools-frontend"
+ "third_party/devtools-frontend/src/front_end/third_party"
+ "third_party/devtools-frontend/src/third_party/typescript"
+ "third_party/emoji-segmenter"
+ "third_party/ffmpeg"
+ "third_party/googletest"
+ "third_party/harfbuzz-ng/utils"
+ "third_party/hunspell"
+ "third_party/iccjpeg"
+ "third_party/icu"
+ "third_party/inspector_protocol"
+ "third_party/jinja2"
+ "third_party/jsoncpp"
+ "third_party/jstemplate"
+ "third_party/khronos"
+ "third_party/leveldatabase"
+ "third_party/libaddressinput"
+ "third_party/libavif"
+ "third_party/libgifcodec"
+ "third_party/libjingle_xmpp"
+ "third_party/libjpeg_turbo"
+ "third_party/libpng"
+ "third_party/libsrtp"
+ "third_party/libsync"
+ "third_party/libudev"
+ "third_party/libvpx"
+ "third_party/libwebm"
+ "third_party/libwebp"
+ "third_party/libxml"
+ "third_party/libxslt"
+ "third_party/libyuv"
+ "third_party/lottie"
+ "third_party/lss"
+ "third_party/mako"
+ "third_party/markupsafe"
+ "third_party/mesa_headers"
+ "third_party/metrics_proto"
+ "third_party/modp_b64"
+ "third_party/nasm"
+ "third_party/node"
+ "third_party/one_euro_filter"
+ "third_party/openh264/src/codec/api/svc"
+ "third_party/opus"
+ "third_party/ots"
+ "third_party/pdfium"
+ "third_party/pdfium/third_party/agg23"
+ "third_party/pdfium/third_party/base"
+ "third_party/pdfium/third_party/freetype"
+ "third_party/pdfium/third_party/lcms"
+ "third_party/pdfium/third_party/libopenjpeg20"
+ "third_party/pdfium/third_party/skia_shared"
+ "third_party/perfetto"
+ "third_party/pffft"
+ "third_party/ply"
+ "third_party/polymer"
+ "third_party/protobuf"
+ "third_party/protobuf/third_party/six"
+ "third_party/pyjson5"
+ "third_party/re2"
+ "third_party/rnnoise"
+ "third_party/skia"
+ "third_party/skia/include/third_party/skcms/skcms.h"
+ "third_party/skia/include/third_party/vulkan"
+ "third_party/skia/third_party/skcms"
+ "third_party/smhasher"
+ "third_party/snappy"
+ "third_party/sqlite"
+ "third_party/usb_ids"
+ "third_party/usrsctp"
+ "third_party/vulkan_memory_allocator"
+ "third_party/web-animations-js"
+ "third_party/webrtc"
+ "third_party/webrtc/common_audio/third_party/ooura/fft_size_128"
+ "third_party/webrtc/common_audio/third_party/ooura/fft_size_256"
+ "third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
+ "third_party/webrtc/modules/third_party/fft"
+ "third_party/webrtc/modules/third_party/g711"
+ "third_party/webrtc/modules/third_party/g722"
+ "third_party/webrtc/rtc_base/third_party/base64"
+ "third_party/webrtc/rtc_base/third_party/sigslot"
+ "third_party/webrtc_overrides"
+ "third_party/widevine/cdm/widevine_cdm_common.h"
+ "third_party/widevine/cdm/widevine_cdm_version.h"
+ "third_party/woff2"
+ "third_party/xcbproto"
+ "third_party/zlib"
+ "url/third_party/mozilla"
+ "v8/src/third_party/utf8-decoder"
+ "v8/src/third_party/valgrind"
+ "v8/src/third_party/siphash"
+ "v8/third_party/v8/builtins"
+ "v8/third_party/inspector_protocol")))
- (with-directory-excursion "src/3rdparty"
- ;; TODO: Try removing "gn" too for future versions of qtwebengine-5.
- (delete-file-recursively "ninja")
+ (with-directory-excursion "src/3rdparty"
+ ;; TODO: Try removing "gn" too for future versions of qtwebengine-5.
+ (delete-file-recursively "ninja")
- (with-directory-excursion "chromium"
- ;; Delete bundled software and binaries that were not explicitly
- ;; preserved above.
- #$remove-third-party-files
+ (with-directory-excursion "chromium"
+ ;; Delete bundled software and binaries that were not explicitly
+ ;; preserved above.
+ #$remove-third-party-files
- ;; Use relative header locations instead of hard coded ones.
- (substitute*
- "base/third_party/dynamic_annotations/dynamic_annotations.c"
- (("base/third_party/valgrind") "valgrind"))
- (substitute*
- '("third_party/breakpad/breakpad/src/common/linux/http_upload.cc"
- "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h")
- (("third_party/curl") "curl"))
- (substitute*
- '("components/viz/common/gpu/vulkan_context_provider.h"
- "components/viz/common/resources/resource_format_utils.h"
- "gpu/config/gpu_info_collector_win.cc"
- "gpu/config/gpu_util.cc"
- "gpu/config/vulkan_info.h")
- (("third_party/vulkan_headers/include/")
- ""))
+ ;; Use relative header locations instead of hard coded ones.
+ (substitute*
+ "base/third_party/dynamic_annotations/dynamic_annotations.c"
+ (("base/third_party/valgrind") "valgrind"))
+ (substitute* '("third_party/breakpad/breakpad/src/common\
+/linux/http_upload.cc"
+ "third_party/breakpad/breakpad/src/common/\
+linux/libcurl_wrapper.h")
+ (("third_party/curl") "curl"))
+ (substitute*
+ '("components/viz/common/gpu/vulkan_context_provider.h"
+ "components/viz/common/resources/resource_format_utils.h"
+ "gpu/config/gpu_info_collector_win.cc"
+ "gpu/config/gpu_util.cc"
+ "gpu/config/vulkan_info.h")
+ (("third_party/vulkan_headers/include/")
+ ""))
- ;; Replace Google Analytics bundle with an empty file and hope
- ;; no one notices.
- (mkdir-p "third_party/analytics")
- (call-with-output-file
- "third_party/analytics/google-analytics-bundle.js"
- (lambda (port)
- (const #t)))))
- ;; Do not enable support for loading the Widevine DRM plugin.
- (substitute* "src/buildtools/config/common.pri"
- (("enable_widevine=true")
- "enable_widevine=false")))))))
+ ;; Replace Google Analytics bundle with an empty file and hope
+ ;; no one notices.
+ (mkdir-p "third_party/analytics")
+ (call-with-output-file
+ "third_party/analytics/google-analytics-bundle.js"
+ (lambda (port)
+ (const #t)))))
+ ;; Do not enable support for loading the Widevine DRM plugin.
+ (substitute* "src/buildtools/config/common.pri"
+ (("enable_widevine=true")
+ "enable_widevine=false")))))))
(build-system gnu-build-system)
(native-inputs
(list bison
@@ -2693,53 +2693,54 @@ using the Enchant spell-checking library.")
(guix build utils)
(ice-9 textual-ports)))
((#:phases phases)
- `(modify-phases ,phases
- (add-before 'configure 'substitute-source
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (with-atomic-file-replacement
- "src/buildtools/config/linux.pri"
- (lambda (in out)
- (display (get-string-all in) out)
- (display "\ngn_args += use_system_openh264=true\n" out)
- (display "\ngn_args += link_pulseaudio = true\n" out)))
- ;; Qtwebengine is not installed into the same prefix as
- ;; qtbase. Some qtbase QTLibraryInfo constants will not
- ;; work. Replace with the full path to the qtwebengine-5
- ;; translations and locales in the store.
- (substitute* "src/core/web_engine_library_info.cpp"
- (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
- (string-append "QLatin1String(\"" out "/share/qt5/translations\")"))
- (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)")
- (string-append "QLatin1String(\"" out "/share/qt5\")")))
- ;; Substitute full dynamic library path for nss.
- (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
- (("libnssckbi.so")
- (search-input-file inputs "lib/nss/libnssckbi.so")))
- ;; Substitute full dynamic library path for udev.
- (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
- (("libudev.so.1")
- (search-input-file inputs "lib/libudev.so.1"))))))
- (add-before 'configure 'set-env
- (lambda _
- ;; Avoids potential race conditions.
- (setenv "PYTHONDONTWRITEBYTECODE" "1")
- (setenv "NINJAFLAGS"
- (string-append "-k1" ;less verbose build output
- ;; Respect the '--cores' option of 'guix build'.
- " -j" (number->string (parallel-job-count))))))
- (replace 'configure
- (lambda _
- ;; Valid QT_BUILD_PARTS variables are:
- ;; libs tools tests examples demos docs translations
- (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--"
- "--webengine-printing-and-pdf=no"
- "--webengine-ffmpeg=system"
+ #~(modify-phases #$phases
+ (add-before 'configure 'substitute-source
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-atomic-file-replacement
+ "src/buildtools/config/linux.pri"
+ (lambda (in out)
+ (display (get-string-all in) out)
+ (display "\ngn_args += use_system_openh264=true\n" out)
+ (display "\ngn_args += link_pulseaudio = true\n" out)))
+ ;; Qtwebengine is not installed into the same prefix as
+ ;; qtbase. Some qtbase QTLibraryInfo constants will not
+ ;; work. Replace with the full path to the qtwebengine-5
+ ;; translations and locales in the store.
+ (substitute* "src/core/web_engine_library_info.cpp"
+ (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
+ (string-append "QLatin1String(\"" #$output
+ "/share/qt5/translations\")"))
+ (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)")
+ (string-append "QLatin1String(\"" #$output
+ "/share/qt5\")")))
+ ;; Substitute full dynamic library path for nss.
+ (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
+ (("libnssckbi.so")
+ (search-input-file inputs "lib/nss/libnssckbi.so")))
+ ;; Substitute full dynamic library path for udev.
+ (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
+ (("libudev.so.1")
+ (search-input-file inputs "lib/libudev.so.1")))))
+ (add-before 'configure 'set-env
+ (lambda _
+ ;; Avoids potential race conditions.
+ (setenv "PYTHONDONTWRITEBYTECODE" "1")
+ (setenv "NINJAFLAGS"
+ (string-append "-k1" ;less verbose build output
+ ;; Respect the '--cores' option of 'guix build'.
+ " -j" (number->string (parallel-job-count))))))
+ (replace 'configure
+ (lambda _
+ ;; Valid QT_BUILD_PARTS variables are:
+ ;; libs tools tests examples demos docs translations
+ (invoke "qmake" "QT_BUILD_PARTS = libs tools" "--"
+ "--webengine-printing-and-pdf=no"
+ "--webengine-ffmpeg=system"
;; FIXME: Building qtwebengine-5 5.12.2 with
;; icu4c >= 68 fails.
;;"--webengine-icu=system"
- "--webengine-pepper-plugins=no"
- "-webengine-proprietary-codecs")))))
+ "--webengine-pepper-plugins=no"
+ "-webengine-proprietary-codecs")))))
;; Tests are disabled due to "Could not find QtWebEngineProcess error"
;; It's possible this can be fixed by setting QTWEBENGINEPROCESS_PATH
;; before running tests.
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index c589f95..8192aef 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2022 Sheng Yang <styang@fastmail.com>
;;; Copyright © 2022 Greg Hogan <code@greghogan.com>
;;; Copyright © 2022 Ryan Tolboom <ryan@using.tech>
+;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1591,7 +1592,6 @@ focused on DXing and being shaped by community of DXers.JTDX")
(define-public js8call
(package
- (inherit wsjtx)
(name "js8call")
(version "2.2.0")
(source
@@ -1603,49 +1603,63 @@ focused on DXing and being shaped by community of DXers.JTDX")
(base32 "149sjwc4zg6ckgq26af93p4fxappa4k9dh7rdy67g8ajfjad4cd8"))
(modules '((guix build utils)))
(snippet
- '(begin
- ;; Delete bundled boost to use the shared one.
- (delete-file-recursively "boost")
- #t))))
+ #~(begin
+ ;; Delete bundled boost to use the shared one.
+ (delete-file-recursively "boost")))))
(build-system qt-build-system)
- (native-inputs
- (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor))
- (inputs
- `(("boost" ,boost)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
- ("hamlib" ,wsjtx-hamlib)
- ("libusb" ,libusb)
- ("qtbase" ,qtbase-5)
- ("qtmultimedia-5" ,qtmultimedia-5)
- ("qtserialport" ,qtserialport)))
(arguments
- `(#:tests? #f ; No test suite
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "CMakeLists.txt"
- (("DESTINATION /usr/share")
- (string-append "DESTINATION "
- (assoc-ref outputs "out")
- "/share")))))
- (add-after 'unpack 'fix-hamlib
- (lambda _
- (substitute* "CMake/Modules/Findhamlib.cmake"
- (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)")
- "set (__pc_path $ENV{PKG_CONFIG_PATH})
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+ (lambda _
+ ;; XXX: How to get the /tmp/<build-name>.drv-<num> path? Use
+ ;; output path for after install check phase instead.
+ (substitute* "media/tests/test"
+ (("~/js8call-prefix/build/js8")
+ (string-append #$output "/bin/js8"))
+ (("/opt/js8call/bin/js8")
+ (string-append #$output "/bin/js8")))
+ (substitute* "CMakeLists.txt"
+ (("DESTINATION /usr/share")
+ (string-append "DESTINATION " #$output "/share")))))
+ (add-after 'unpack 'fix-hamlib
+ (lambda _
+ (substitute* "CMake/Modules/Findhamlib.cmake"
+ (("set \\(ENV\\{PKG_CONFIG_PATH\\}.*\\)")
+ "set (__pc_path $ENV{PKG_CONFIG_PATH})
list (APPEND __pc_path \"${__hamlib_pc_path}\")
set (ENV{PKG_CONFIG_PATH} \"${__pc_path}\")"))
- (substitute* "HamlibTransceiver.hpp"
- (("#ifdef JS8_USE_LEGACY_HAMLIB")
- "#if 1")))))))
+ (substitute* "HamlibTransceiver.hpp"
+ (("#ifdef JS8_USE_LEGACY_HAMLIB")
+ "#if 1"))))
+ (delete 'check)
+ (add-after 'install 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "../js8call/media/tests"
+ (invoke "./test"))))))))
+ (native-inputs
+ (list asciidoc
+ gfortran
+ pkg-config
+ qttools-5
+ ruby-asciidoctor))
+ (inputs
+ (list boost
+ fftw
+ fftwf
+ libusb
+ qtbase-5
+ qtmultimedia-5
+ qtserialport
+ wsjtx-hamlib))
+ (home-page "http://js8call.com/")
(synopsis "Weak-signal ham radio communication program")
(description
"JS8Call is a software using the JS8 digital mode (a derivative of the FT8
mode) providing weak signal keyboard to keyboard messaging to amateur radio
operators.")
- (home-page "http://js8call.com/")
(license license:gpl3)))
(define-public xnec2c
diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm
index c830620..b1abb65 100644
--- a/gnu/packages/rails.scm
+++ b/gnu/packages/rails.scm
@@ -81,6 +81,12 @@
"")
((".*behaviors/encoded_key_cache_behavior.*")
""))
+ (when #$(target-x86-32?)
+ ;; This test fails on i686 (see:
+ ;; https://github.com/rails/rails/issues/47832).
+ (substitute* "test/core_ext/duration_test.rb"
+ (("def test_iso8601_output_and_reparsing.*" all)
+ (string-append all " skip('fails on i686')\n"))))
(delete-file "test/evented_file_update_checker_test.rb")
;; These tests require cache_store_behavior, disabled above.
(delete-file "test/cache/stores/file_store_test.rb")
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 6c212b9..834c0df 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -6243,8 +6243,9 @@ to reproduce user environments.")
#~(modify-phases %standard-phases
(add-after 'install 'delete-mkmf.log
(lambda _
- ;; This build log captures non-deterministic file names (see:
- ;; https://github.com/sparklemotion/nokogiri/issues/2755).
+ ;; Rubygems installs build log files that embed volatile file
+ ;; names (see:
+ ;; https://github.com/rubygems/rubygems/issues/6259).
(for-each delete-file (find-files #$output "^mkmf\\.log$")))))))
(native-inputs (list ruby-hoe))
(inputs (list zlib libxml2 libxslt))
@@ -7818,10 +7819,8 @@ alternative to Marshal for Object serialization.")
(string-append (getenv "GEM_PATH") ":" new-gem))
(when tests?
(invoke "rspec"))))))))
- (native-inputs
- (list ruby-rake-compiler ruby-hoe ruby-rspec))
- (inputs
- (list postgresql))
+ (native-inputs (list ruby-rake-compiler ruby-hoe ruby-rspec))
+ (inputs (list postgresql))
(synopsis "Ruby interface to PostgreSQL")
(description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works
with PostgreSQL 9.3 and later.")
@@ -11526,17 +11525,17 @@ part of the Prawn PDF generator.")
(define-public ruby-puma
(package
(name "ruby-puma")
- (version "6.1.1")
+ (version "6.2.0")
(source
(origin
(method git-fetch) ;for tests
(uri (git-reference
(url "https://github.com/puma/puma")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0v4nn3z0bj0ry0gpx1hsf5mzkinsx9sv716j4jf2nb1x6hcwv993"))))
+ "0d71h5ggvfgnxq9msd1hmcz3s8mspzf7kqas1hzr0w9pfafddyv3"))))
(build-system ruby-build-system)
(arguments
(list
@@ -11572,6 +11571,12 @@ part of the Prawn PDF generator.")
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "bundle" "exec" "rake" "test"))))
+ (add-after 'install 'delete-mkmf.log
+ (lambda _
+ ;; Rubygems installs build log files that embed volatile file
+ ;; names (see:
+ ;; https://github.com/rubygems/rubygems/issues/6259).
+ (for-each delete-file (find-files #$output "^mkmf\\.log$"))))
(add-before 'check 'disable-problematic-tests
(lambda _
(let-syntax ((skip-tests
@@ -11594,6 +11599,7 @@ part of the Prawn PDF generator.")
"test_off_tls1_2")
(skip-tests "test/test_integration_cluster.rb"
"test_fork_worker_on_refork"
+ "test_hot_restart_does_not_drop_connections"
"test_culling_strategy_oldest_fork_worker"
"test_usr1_fork_worker")
(skip-tests "test/test_integration_pumactl.rb"
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 73ed31c..ba32757 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -12,7 +12,7 @@
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Nicolas Graves <ngraves@ngraves.fr>
@@ -1075,6 +1075,19 @@ rebase.")
(base32
"006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))
+(define-public rust-cbindgen-0.20
+ (package
+ (inherit rust-cbindgen-0.24)
+ (name "rust-cbindgen")
+ (version "0.20.0")
+ (source (origin
+ (method url-fetch)
+ (uri (crate-uri "cbindgen" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1p67vvjkxh07yfizfkvm6bjlv2bywrnl57hshcsz9h2x2qxrgqsi"))))))
+
(define-public rust-cbindgen-0.19
(package
(inherit rust-cbindgen)
@@ -1823,24 +1836,25 @@ language. It is a part of a larger rls-2.0 effort to create excellent IDE
support for Rust.")
(license (list license:expat license:asl2.0))))
+;;; Note: keep in sync with our current Rust/Cargo version.
(define-public rust-cargo-c
(package
(name "rust-cargo-c")
- (version "0.8.1+cargo-0.53")
+ (version "0.9.8+cargo-0.60")
(source
(origin
(method url-fetch)
(uri (crate-uri "cargo-c" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0fwdxhdj2963xr6xfqr56i7hikhsdv562vgxq2dj3h2mi3dil1k6"))))
+ "1zdzs3drjr9p6chg32inyi05rfv1c12nkk4bi7qpha12m6rsn26d"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
- (("rust-cbindgen" ,rust-cbindgen-0.19)
- ("rust-cargo" ,rust-cargo-0.53) ;
+ (("rust-cbindgen" ,rust-cbindgen-0.20)
+ ("rust-cargo" ,rust-cargo-0.60)
("rust-anyhow" ,rust-anyhow-1)
("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
("rust-structopt" ,rust-structopt-0.3)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index b37ab08..a373f20 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -9,7 +9,7 @@
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -115,15 +115,15 @@ joystick, and graphics hardware.")
(package
(inherit sdl)
(name "sdl2")
- (version "2.24.0")
+ (version "2.26.2")
(source (origin
(method url-fetch)
(uri
(string-append "https://libsdl.org/release/SDL2-"
version ".tar.gz"))
(sha256
(base32
- "15vd9najhjh6s9z9hhx7zp51iby690a1g3h7kcwjvyb82x5w7r4i"))))
+ "1q4r1camsr17mnpv00d6h3qy93b481rp68r6fbxbszq3vv1rplwm"))))
(arguments
(substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags)
@@ -468,22 +468,23 @@ directory.")
(define-public sdl2-image
(package (inherit sdl-image)
(name "sdl2-image")
- (version "2.0.5")
+ (version "2.6.2")
(source
(origin
(method url-fetch)
(uri
(string-append "https://www.libsdl.org/projects/SDL_image/release/"
"SDL2_image-" version ".tar.gz"))
(sha256
- (base32 "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx"))))
+ (base32 "0xs7h5cp0sz082rn1bqjqbrgwjhwcskz9i6ikiisq2yhv2s5yda8"))))
(propagated-inputs
- (propagated-inputs-with-sdl2 sdl-image))))
+ (propagated-inputs-with-sdl2 sdl-image))
+ (properties '((upstream-name . "SDL2_image")))))
(define-public sdl2-mixer
(package (inherit sdl-mixer)
(name "sdl2-mixer")
- (version "2.0.4")
+ (version "2.6.2")
(source
(origin
(method url-fetch)
@@ -496,63 +497,74 @@ directory.")
(delete-file-recursively "external")
#t))
(sha256
- (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"))))
+ (base32 "0wd35a9fcj1bv534k9cr4jdk076dpiqq0ayk6cybmv3d6q8aiplc"))))
(arguments
- (substitute-keyword-arguments (package-arguments sdl-mixer)
- ((#:configure-flags flags)
- `(cons*
- "--disable-music-opus-shared"
- ;; These options were renamed in SDL2 mixer. Keeping the inherited
- ;; variants produces a harmless warning.
- "--disable-music-mod-modplug-shared"
- "--disable-music-midi-fluidsynth-shared"
- ,flags))))
- (inputs
- (modify-inputs (package-inputs sdl-mixer)
- (delete "libmikmod")
- (prepend opusfile
- ;; The default MOD library changed in SDL2 mixer.
- libmodplug)))
+ (list #:tests? #f ;no tests
+ #:configure-flags
+ #~'(;; Prefer system libraries to bundled codecs.
+ "--enable-music-flac-libflac"
+ "--enable-music-midi-fluidsynth"
+ "--enable-music-mod-modplug"
+ "--enable-music-mp3-mpg123"
+ "--enable-music-ogg-vorbis"
+ "--enable-music-opus"
+ ;; Link the libraries instead of dlopening them.
+ "--enable-music-flac-libflac-shared=no"
+ "--enable-music-midi-fluidsynth-shared=no"
+ "--enable-music-mod-modplug-shared=no"
+ "--enable-music-mp3-mpg123-shared=no"
+ "--enable-music-ogg-vorbis-shared=no"
+ "--enable-music-opus-shared=no")))
(native-inputs
- `(("pkgconfig" ,pkg-config))) ; Needed to find the opus library.
+ (list pkg-config))
+ (inputs '())
(propagated-inputs
- (propagated-inputs-with-sdl2 sdl-mixer))))
+ (modify-inputs (propagated-inputs-with-sdl2 sdl-mixer)
+ ;; In Requires.private of SDL2_mixer.pc.
+ (append flac fluidsynth libmodplug libvorbis mpg123 opusfile)))
+ (properties '((upstream-name . "SDL2_mixer")))))
(define-public sdl2-net
(package (inherit sdl-net)
(name "sdl2-net")
- (version "2.0.1")
+ (version "2.2.0")
(source
(origin
(method url-fetch)
(uri
(string-append "http://www.libsdl.org/projects/SDL_net/release/"
"SDL2_net-" version ".tar.gz"))
(sha256
(base32
- "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"))))
+ "1svzhpf7k48jfga8ph127l99lwpgs5g5isgl9ybp2qiii0cqjjjf"))))
(propagated-inputs
- (propagated-inputs-with-sdl2 sdl-net))))
+ (propagated-inputs-with-sdl2 sdl-net))
+ (properties '((upstream-name . "SDL2_net")))))
(define-public sdl2-ttf
(package (inherit sdl-ttf)
(name "sdl2-ttf")
- (version "2.0.15")
+ (version "2.20.1")
(source (origin
(method url-fetch)
(uri
(string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-"
version ".tar.gz"))
(modules '((guix build utils)))
- (snippet (begin
- ;; Remove bundled libraries.
- '(delete-file-recursively "external")
- #t))
+ (snippet
+ ;; Remove bundled libraries.
+ '(delete-file-recursively "external"))
(sha256
(base32
- "0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59"))))
+ "0mqcgpcvzp927xv1gs51f2wqly9k9f8nxfxi69lxlfncyd8svkbq"))))
+ (arguments
+ (list #:configure-flags #~'("--enable-freetype-builtin=no"
+ "--enable-harfbuzz-builtin=no")))
(propagated-inputs
- (propagated-inputs-with-sdl2 sdl-ttf))))
+ (modify-inputs (propagated-inputs-with-sdl2 sdl-ttf)
+ ;; In Requires.private of SDL2_ttf.pc.
+ (prepend harfbuzz freetype)))
+ (properties '((upstream-name . "SDL2_ttf")))))
(define-public guile-sdl
(package
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index addf439..40633b7 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -804,18 +804,27 @@ scientific documentation.")
(define-public python-breathe
(package
(name "python-breathe")
- (version "4.34.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "breathe" version))
- (sha256
- (base32
- "18fvphs1cb2cns9q82195fx7lmlwfikzwa10cczavpaax2jnh1xc"))))
+ (version "4.35.0")
+ (source (origin
+ (method git-fetch) ;git repo has tests
+ (uri (git-reference
+ (url "https://github.com/breathe-doc/breathe")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hlcrhr533yjkz9ds83xnmn8h6z3r6vfzz7qrpy14n9j4ysyz59c"))))
(build-system python-build-system)
- (propagated-inputs
- (list python-docutils python-sphinx))
- (home-page "https://github.com/michaeljones/breathe")
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "tests"
+ (invoke "python" "-m" "pytest" "-v"))))))))
+ (native-inputs (list python-pytest))
+ (propagated-inputs (list python-docutils python-sphinx))
+ (home-page "https://www.breathe-doc.org")
(synopsis "ReStructuredText and Sphinx bridge to Doxygen")
(description "This package is an extension to reStructuredText and Sphinx
to be able to read and render the Doxygen xml output.")
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 769cc85..55c9d87 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
@@ -223,14 +223,14 @@ cards.")
(define-public newsboat
(package
(name "newsboat")
- (version "2.29")
+ (version "2.30.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://newsboat.org/releases/" version
"/newsboat-" version ".tar.xz"))
(sha256
- (base32 "0szx4pivkaja8v399m6v7ycp1xprm4cz7n5z929g4j191hg81f8q"))))
+ (base32 "0bv0al3inay6jsggaz2zja4j9jp1ffn8bp4i4jr8wd1c9asgsgs1"))))
(build-system cargo-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 81621e9..c921507 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
-;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -729,17 +729,17 @@ your calls and messages.")
(define-public pjproject
(package
(name "pjproject")
- (version "2.12.1")
+ (version "2.13")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/pjsip/pjproject")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "0xrj4sznbaip22y9hclff6y81l285bzkkj1smzifskpk3kiwp00w"))
+ "0ld0adp9y2ydnz2ldwdzig3hpk4ayx1va6aqc3nja8zfdnd36fyb"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -820,7 +820,10 @@ your calls and messages.")
"#define INCLUDE_TCP_TEST 0\n")
;; The TSX tests takes a very long time to run; skip them.
(("#define INCLUDE_TSX_GROUP.*")
- "#define INCLUDE_TSX_GROUP 0\n"))
+ "#define INCLUDE_TSX_GROUP 0\n")
+ ;; The resolve test requires a working domain name resolver.
+ (("#define INCLUDE_RESOLVE_TEST.*")
+ "#define INCLUDE_RESOLVE_TEST 0\n"))
(substitute* "pjsip/src/test/dns_test.c"
;; The round_robin_test fails non-deterministically (depending
;; on load); skip it (see:
diff --git a/gnu/packages/toolkits.scm b/gnu/packages/toolkits.scm
index 3030e3a..aee6c22 100644
--- a/gnu/packages/toolkits.scm
+++ b/gnu/packages/toolkits.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;;
@@ -32,16 +32,16 @@
(define-public imgui
(package
(name "imgui")
- (version "1.88")
+ (version "1.89.4")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/ocornut/imgui")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "13cw4hx55y5z678r558hv7znfz666wh0w849c5padnj4nkpbihdi"))
+ "1j79gsg9i969slygrwm0dp5mkzagglawxxagjpi3009wyp6lj6l8"))
(modules '((guix build utils)))
(snippet
;; Remove bundled fonts.
@@ -66,7 +66,12 @@
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
;; Build main library.
- (apply invoke #$(cc-for-target) "-I" (getcwd)
+ (apply invoke #$(cc-for-target)
+ ;; This option is necessary at least for OpenBoardView,
+ ;; otherwise it would fail with the "Too many vertices in
+ ;; ImDrawList using 16-bit indices".
+ "-DImDrawIdx=unsigned int"
+ "-I" (getcwd)
"-I" (search-input-directory inputs "include/freetype2")
"-g" "-O2" "-fPIC" "-shared"
"-lGL" "-lSDL2" "-lglfw"
@@ -77,39 +82,42 @@
"imgui_widgets.cpp"
;; Include the supported backends.
"backends/imgui_impl_glfw.cpp"
- "backends/imgui_impl_sdl.cpp"
+ (if (file-exists? "backends/imgui_impl_sdl2.cpp")
+ "backends/imgui_impl_sdl2.cpp"
+ "backends/imgui_impl_sdl.cpp")
"backends/imgui_impl_opengl2.cpp"
"backends/imgui_impl_opengl3.cpp"
;; Include wrappers for C++ standard library (STL) and
;; fontconfig.
(find-files "misc" "\\.cpp$"))))
(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc"))
- (header? (cut string-suffix? ".h" <>))
+ (lambda _
+ (let* ((header? (cut string-suffix? ".h" <>))
(imgui-headers (scandir "." header?))
(backend-headers (find-files
"backends"
"(glfw|opengl|sdl|vulkan).*\\.h$"))
(misc-headers (find-files "misc" "\\.h$")))
- (install-file "libimgui.so" (string-append out "/lib"))
+ (install-file "libimgui.so" (string-append #$output "/lib"))
;; Install headers.
(for-each (lambda (f)
- (install-file f (string-append out "/include/imgui")))
+ (install-file f (string-append #$output
+ "/include/imgui")))
imgui-headers)
(for-each (lambda (f)
(install-file f (string-append
- out "/include/imgui/backends")))
+ #$output
+ "/include/imgui/backends")))
backend-headers)
(for-each (lambda (f)
- (install-file f (string-append
- out "/include/imgui/" (dirname f))))
+ (install-file f (string-append #$output
+ "/include/imgui/"
+ (dirname f))))
misc-headers)
;; Install examples.
- (copy-recursively
- "examples" (string-append
- doc "/share/imgui/examples"))))))))
+ (copy-recursively "examples"
+ (string-append #$output:doc
+ "/share/imgui/examples"))))))))
(inputs (list fontconfig glfw mesa sdl2))
(home-page "https://github.com/ocornut/imgui")
(synopsis "Immediate-mode C++ GUI library with minimal dependencies")
@@ -126,6 +134,22 @@ applications, full-screen applications, and embedded platforms without
standard operating system features.")
(license license:expat)))
+(define-public imgui-1.87
+ (package
+ (inherit imgui)
+ (name "imgui")
+ (version "1.87")
+ (source (origin
+ (inherit (package-source imgui))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocornut/imgui")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10qil22s5qak3as41787iz273sibpq1bq66bakgn7yvhj5fym6hz"))))))
+
(define-public imgui-1.86
(package
(inherit imgui)
diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm
index afb9546..23f08a2 100644
--- a/gnu/packages/unicode.scm
+++ b/gnu/packages/unicode.scm
@@ -77,14 +77,14 @@ renderer.")
(define-public ucd
(package
(name "ucd")
- (version "14.0.0")
+ (version "15.0.0")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://www.unicode.org/Public/zipped/" version
"/UCD.zip"))
(sha256
- (base32 "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3"))))
+ (base32 "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz"))))
(build-system copy-build-system)
(arguments
'(#:install-plan
@@ -97,20 +97,6 @@ files listing Unicode character properties and related data. It also includes
test data for conformance to several important Unicode algorithms.")
(license unicode)))
-(define-public ucd-next
- (package
- (inherit ucd)
- (name "ucd")
- (version "15.0.0")
- (source
- (origin
- (method url-fetch/zipbomb)
- (uri (string-append "https://www.unicode.org/Public/zipped/" version
- "/UCD.zip"))
- (sha256
- (base32
- "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz"))))))
-
(define (unicode-emoji-file name version hash)
(origin
(method url-fetch)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 844532c..302f7c9 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2020,6 +2020,10 @@ following features:
(build-system gnu-build-system)
(arguments
(list
+ ;; Running the tests in parallel causes test failures on i686-linux.
+ ;; The issue was reported to users@subversion.apache.org, as suggested
+ ;; at https://subversion.apache.org/reporting-issues.
+ #:parallel-tests? #f
#:configure-flags #~(list "--enable-static=no")
#:phases
#~(modify-phases %standard-phases
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 72f3813..8013d41 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -849,24 +849,23 @@ television and DVD. It is also known as AC-3.")
(define-public libaom
(package
(name "libaom")
- (version "3.3.0")
+ (version "3.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://aomedia.googlesource.com/aom/")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "024vhsx7bw9kajk65hhh5vmqrja0h33rmlcpngsj3yg4p8l29943"))))
+ "0arn8a88jz4mj69n8cs4qmrdjwhbvzsqgnx20wr9mq01b06kqich"))))
(build-system cmake-build-system)
(native-inputs
(list perl pkg-config python)) ; to detect the version
(arguments
`(#:tests? #f ; downloads many video clips
#:configure-flags
(list "-DBUILD_SHARED_LIBS=YES"
- "-DENABLE_PIC=TRUE"
"-DAOM_TARGET_CPU=generic"
(string-append "-DCMAKE_INSTALL_PREFIX="
(assoc-ref %outputs "out")))
@@ -916,8 +915,8 @@ shared library and encoder and decoder command-line executables.")
(define-public libx264
;; There are no tags in the repository, so we take the version number from
;; the X264_BUILD variable defined in x264.h.
- (let ((version "161")
- (commit "4c2aafd864dd201832ec2be0fef4484925146650")
+ (let ((version "164")
+ (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
(revision "0"))
(package
(name "libx264")
@@ -930,7 +929,7 @@ shared library and encoder and decoder command-line executables.")
(file-name (git-file-name name version))
(sha256
(base32
- "1i6v9h3xx9pi0zmlj3anwwjxqa63sbhy9crrif8dphipwfn9hyg5"))))
+ "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config nasm))
@@ -980,27 +979,6 @@ H.264 (MPEG-4 AVC) video streams.")
"file://extras/cl.h"
"See extras/cl.h in the distribution."))))))
-;;; TODO: Merge into libx264 on staging.
-(define-public libx264-next
- ;; There are no tags in the repository, so we take the version number from
- ;; the X264_BUILD variable defined in x264.h.
- (let ((version "164")
- (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
- (revision "0"))
- (package
- (inherit libx264)
- (name "libx264")
- (version (git-version version revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://code.videolan.org/videolan/x264.git")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq")))))))
-
(define-public mkvtoolnix
(package
(name "mkvtoolnix")
@@ -1523,14 +1501,14 @@ quality and performance.")
(define-public libva
(package
(name "libva")
- (version "2.15.0")
+ (version "2.16.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/intel/libva/releases/download/"
version "/libva-" version ".tar.bz2"))
(sha256
- (base32 "1jhy8qzfp4ydbxs9qd9km7k5wq8r4s2vq20r1q07lgld8l4x93i5"))))
+ (base32 "070aj9nw681a4m7f5xb662hhyib0w9q0i0s9v8vplh9cvfhaqpqi"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@@ -1598,17 +1576,18 @@ These tools require a supported graphics chip, driver, and VA-API back end to
operate properly.")
(license license:expat)))
-(define-public ffmpeg-5
+(define-public ffmpeg
(package
(name "ffmpeg")
- (version "5.1.2")
+ (version "6.0")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
- "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1"))))
+ "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp"))))
+ (outputs '("out" "debug"))
(build-system gnu-build-system)
(inputs
(append
@@ -1749,9 +1728,11 @@ operate properly.")
;; The static libraries are 23 MiB
"--disable-static"
+ "--disable-stripping"
+
#$@(if (target-riscv64?)
- '("--extra-cflags=-fPIC")
- '())
+ '("--extra-cflags=-fPIC")
+ '())
;; Runtime cpu detection is not implemented on
;; MIPS, so we disable some features.
@@ -1792,6 +1773,18 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.")
(license license:gpl2+)))
+(define-public ffmpeg-5
+ (package
+ (inherit ffmpeg)
+ (version "5.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1"))))))
+
(define-public ffmpeg-4
(package
(inherit ffmpeg-5)
@@ -1803,10 +1796,10 @@ audio/video codec library.")
(sha256
(base32
"14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg"))))
- (inputs (modify-inputs (package-inputs ffmpeg-5)
+ (inputs (modify-inputs (package-inputs ffmpeg)
(replace "sdl2" sdl2-2.0)))
(arguments
- (substitute-keyword-arguments (package-arguments ffmpeg-5)
+ (substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags ''())
#~(cons "--enable-avresample" #$flags))))))
@@ -1885,8 +1878,6 @@ audio/video codec library.")
(inputs (modify-inputs (package-inputs ffmpeg-3.4)
(delete "libwebp")))))
-(define-public ffmpeg ffmpeg-5)
-
(define-public ffmpeg-for-stepmania
(hidden-package
(package
@@ -2395,16 +2386,16 @@ To load this plugin, specify the following option when starting mpv:
(define-public libvpx
(package
(name "libvpx")
- (version "1.11.0")
+ (version "1.12.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://chromium.googlesource.com/webm/libvpx")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "00f1jrclai2b6ys78dpsg6r1mvcyxlna93vxcz8zjyia24c2pjsb"))
+ "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))
(patches (search-patches "libvpx-CVE-2016-2818.patch"))))
(build-system gnu-build-system)
(arguments
@@ -2434,22 +2425,6 @@ To load this plugin, specify the following option when starting mpv:
(license license:bsd-3)
(home-page "https://www.webmproject.org/")))
-;;; TODO: Merge into libvpx on staging.
-(define-public libvpx-next
- (package
- (inherit libvpx)
- (name "libvpx")
- (version "1.12.0")
- (source (origin
- (inherit (package-source libvpx))
- (uri (git-reference
- (url "https://chromium.googlesource.com/webm/libvpx")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))))))
-
(define-public orf-dl
(let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999")
(revision "1"))
@@ -5324,12 +5299,7 @@ result in several formats:
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))
- (modules '((guix build utils)))
- (snippet
- '(substitute* "Cargo.toml"
- (("\\[package\\]" m)
- (string-append "cargo-features = [\"rust-version\"]\n" m))))))
+ "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))))
(build-system cargo-build-system)
(arguments
`(;; Strip the '--release' flag to work around the doctest failures with
@@ -5392,14 +5362,8 @@ result in several formats:
(add-after 'unpack 'relax-versions
(lambda _
(substitute* "Cargo.toml"
- ;; Allow using more recent versions of
+ ;; Allow using more recent versions of system-deps.
(("~3.1.2") "~3"))))
- (add-after 'configure 'force-rust-edition-2018
- (lambda* (#:key vendor-dir #:allow-other-keys)
- ;; Force all the dependencies to not be higher than edition 2018.
- (with-fluids ((%default-port-encoding #f))
- (substitute* (find-files vendor-dir "Cargo.toml")
- (("edition = \\\"2021\\\"") "edition = \"2018\"")))))
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index 9203731..dfc073b 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -2,8 +2,10 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
+;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
+;;; Copyright © 2022 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -41,19 +43,22 @@
#:use-module (gnu packages wine)
#:use-module (gnu packages xorg))
+;; Note: Remember to change vulkan-loader version when bumping this.
+(define %vulkan-sdk-version "sdk-1.3.231.1")
+
(define-public spirv-headers
(package
(name "spirv-headers")
- (version "1.5.3")
+ (version %vulkan-sdk-version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/SPIRV-Headers")
(commit version)))
(sha256
(base32
- "069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj"))
+ "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
@@ -76,19 +81,22 @@ and for the GLSL.std.450 extended instruction set.
(define-public spirv-tools
(package
(name "spirv-tools")
- (version "2020.2")
+ (version %vulkan-sdk-version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/SPIRV-Tools")
- (commit (string-append "v" version))))
+ (commit version)))
(sha256
- (base32 "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6"))
+ (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
+ ;; Some packages like mpv fail to link
+ ;; when the static libraries are built.
+ "-DSPIRV_TOOLS_BUILD_STATIC=OFF"
(string-append
"-DSPIRV-Headers_SOURCE_DIR="
(assoc-ref %build-inputs "spirv-headers")))))
@@ -105,15 +113,15 @@ parser,disassembler, validator, and optimizer for SPIR-V.")
(define-public spirv-cross
(package
(name "spirv-cross")
- (version "2020-05-19")
+ (version %vulkan-sdk-version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/SPIRV-Cross")
(commit version)))
(sha256
- (base32 "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd"))
+ (base32 "1ypbc1krkr0yywa1m976g3sjyb80l7hxwrnh6gp70w6va1dlnnn9"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
@@ -146,19 +154,18 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.")
(define-public glslang
(package
(name "glslang")
- (version "10-11.0.0")
+ (version %vulkan-sdk-version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/glslang")
- ;; Tag "10-11.0.0" was moved to "11.0.0".
- ;; FIXME: Use (commit version) on next update.
- (commit "11.0.0")))
+ (commit version)))
+ (patches (search-patches "glslang-install-static-libs.patch"))
(sha256
(base32
- "14mn2awswl022ls75mfpsnpsl0ai0jgfbqj3sxcsqawyj5f432py"))
- (file-name (string-append name "-" version "-checkout"))))
+ "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6"))
+ (file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ;FIXME: requires bundled SPIRV-Tools
@@ -180,17 +187,17 @@ interpretation of the specifications for these languages.")
(define-public vulkan-headers
(package
(name "vulkan-headers")
- (version "1.2.164")
+ (version %vulkan-sdk-version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Headers")
- (commit (string-append "v" version))))
+ (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "11wzxvwim4jna1yssbmprl211dhmz8vmrd498zww3bghzlj7bljv"))))
+ "167zdank6pn66mzjdwgrdlmhmsy4v2k0nhw0nwg649k863rgi00j"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ; No tests.
@@ -204,48 +211,55 @@ interpretation of the specifications for these languages.")
(define-public vulkan-loader
(package
(name "vulkan-loader")
- (version "1.2.162")
+ ;; XXX: Take a slightly newer commit to fix a test failure on i686:
+ ;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036
+ (version "sdk-1.3.232")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Loader")
- (commit (string-append "v" version))))
+ (commit "v1.3.232")))
(file-name (git-file-name name version))
(sha256
(base32
- "15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv"))))
+ "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags
- ,#~(list
- (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
- #$(this-package-input "vulkan-headers"))
- (string-append "-DCMAKE_INSTALL_INCLUDEDIR="
- #$(this-package-input "vulkan-headers")
- "/include"))
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'unpack-googletest
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gtest (assoc-ref inputs "googletest:source")))
- (when gtest
- (copy-recursively gtest "external/googletest"))
- #t)))
- (add-after 'unpack 'disable-loader-tests
- (lambda _
- ;; Many tests require a Vulkan driver. Skip those.
- (substitute* "tests/loader_validation_tests.cpp"
- ((".*= vkCreateInstance.*" all)
- (string-append "GTEST_SKIP();\n" all))
- (("TEST_F.*InstanceExtensionEnumerated.*" all)
- (string-append all "\nGTEST_SKIP();\n")))
- #t)))))
+ (list
+ #:configure-flags
+ #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs "include/vulkan"))))
+ "-DBUILD_TESTS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-pkg-config-file
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((vulkan-headers (dirname (search-input-directory
+ inputs "include/vulkan"))))
+ ;; Ensure the pkg-config file refers to vulkan-headers.
+ (substitute* "loader/vulkan.pc.in"
+ (("^includedir=.*")
+ (string-append "includedir=" vulkan-headers "\n"))))))
+ (add-after 'unpack 'use-system-googletest
+ (lambda _
+ ;; Inform the build system that googletest is already built.
+ (substitute* "CMakeLists.txt"
+ ((".*if\\(TARGET gtest\\)")
+ (string-append " find_package(GTest REQUIRED)\n"
+ " if(true)")))
+ ;; Use the namespaced variable.
+ (substitute* "tests/framework/CMakeLists.txt"
+ (("PUBLIC gtest ")
+ "PUBLIC GTest::gtest ")))))))
(native-inputs
- `(("googletest:source" ,(package-source googletest))
- ("libxrandr" ,libxrandr)
- ("pkg-config" ,pkg-config)
- ("python" ,python)
- ("wayland" ,wayland)))
+ (list googletest
+ libxrandr
+ pkg-config
+ python
+ wayland))
(inputs
(list vulkan-headers))
(home-page
@@ -266,20 +280,20 @@ and the ICD.")
(define-public vulkan-tools
(package
(name "vulkan-tools")
- (version "1.2.162")
+ (version %vulkan-sdk-version)
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Tools")
- (commit (string-append "v" version))))
+ (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
- "129wzk7xj3vn3c8b4p7fzkd0npl58118s2i1d88gsfnlix54nagq"))))
+ "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a"))))
(build-system cmake-build-system)
(inputs
- (list glslang libxrandr vulkan-loader wayland))
+ (list glslang libxrandr vulkan-loader wayland wayland-protocols))
(native-inputs
(list pkg-config python vulkan-headers))
(arguments
@@ -298,17 +312,18 @@ API.")
(define-public shaderc
(package
(name "shaderc")
- (version "2020.4")
+ ;; shaderc doesn't follow the versioning scheme of vulkan sdk
+ (version "2022.3")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/google/shaderc")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "07h78nd964h2bdm4drzws8i1gvyal8a3wlhbcm5qxqk6vknv8hrk"))))
+ "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d"))))
(build-system cmake-build-system)
(arguments
`(;; FIXME: Skip most of the tests, because enabling system gtest breaks
@@ -340,7 +355,16 @@ API.")
,version
,(package-version spirv-tools)
,(package-version glslang))))
- #t)))))
+ #t))
+ ;; see: https://github.com/google/shaderc/pull/1276
+ (add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps
+ (lambda _
+ (substitute* "glslc/CMakeLists.txt"
+ (("OSDependent OGLCompiler") ""))
+ (substitute* "libshaderc/CMakeLists.txt"
+ (("OSDependent OGLCompiler") ""))
+ (substitute* "libshaderc_util/CMakeLists.txt"
+ (("OSDependent OGLCompiler") "")))))))
(inputs
(list glslang python spirv-headers spirv-tools))
(native-inputs
@@ -399,3 +423,127 @@ shader compilation.")
(synopsis "Direct3D 12 to Vulkan translation library")
(description "vkd3d is a library for translating Direct3D 12 to Vulkan.")
(license license:lgpl2.1))))
+
+(define-public vulkan-validationlayers
+ (package
+ (name "vulkan-validationlayers")
+ (version %vulkan-sdk-version)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url
+ "https://github.com/KhronosGroup/Vulkan-ValidationLayers")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75"))))
+ (build-system cmake-build-system)
+ (inputs (list glslang
+ libxrandr
+ mesa
+ shaderc
+ spirv-tools
+ vulkan-loader
+ wayland))
+ (native-inputs (list pkg-config python spirv-headers vulkan-headers))
+ (arguments
+ (list #:tests? #f ;no tests
+ #:configure-flags
+ #~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
+ (string-append "-DGLSLANG_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs
+ "include/glslang"))))
+ (string-append "-DSPIRV_HEADERS_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs
+ "include/spirv"))))
+ (string-append "-DSPIRV_TOOLS_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs
+ "include/spirv-tools"))))
+ (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
+ (dirname (dirname
+ (search-input-directory
+ %build-inputs
+ "include/vulkan"))))
+ "-Wno-dev")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'set-layer-path-in-manifest
+ (lambda _
+ (let ((manifest (string-append #$output
+ "/share/vulkan/explicit_layer.d"
+ "/VkLayer_khronos_validation.json")))
+ (substitute* manifest
+ (("\"libVkLayer_khronos_validation.so\"")
+ (string-append "\"" #$output
+ "/lib/libVkLayer_khronos_validation.so\"")))))))))
+ (home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers")
+ (synopsis "Khronos official validation layers for Vulkan")
+ (description
+ "Vulkan-ValidationLayers provides the Khronos official validation layers that
+can assist development by enabling developers to verify their applications correctly
+use the Vulkan API.")
+ (license license:asl2.0)))
+
+(define-public volk
+ (package
+ (name "volk")
+ (version %vulkan-sdk-version)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/zeux/volk")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0xaw3kg754mknx8lfj1p74a9npjfvdvlpicvn0hla4495zpc10rq"))))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:tests? #f ;no test
+ #:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON")))
+ (inputs (list vulkan-headers))
+ (synopsis "Meta loader for Vulkan API")
+ (description
+ "Volk is a meta-loader for Vulkan. It allows you to dynamically load
+entrypoints required to use Vulkan without linking the Vulkan loader.
+Additionally, volk simplifies the use of Vulkan extensions by automatically
+loading all associated entrypoints. Finally, volk enables loading Vulkan
+entrypoints directly from the driver which can increase performance by
+skipping loader dispatch overhead.")
+ (home-page "https://github.com/zeux/volk")
+ (license license:expat)))
+
+(define-public vulkan-memory-allocator
+ (package
+ (name "vulkan-memory-allocator")
+ (version "3.0.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1hpzjwl5bgqv9hmf1fdldihfllcbdg515f391a200klg0rnixdds"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; no test
+ `(#:tests? #f))
+ (inputs (list vulkan-loader vulkan-headers))
+ (synopsis "Vulkan memory allocation library")
+ (description
+ "The Vulkan Memory Allocator (VMA) library provides a simple and easy to
+integrate API to help users allocate memory for Vulkan buffer and image
+storage.")
+ (home-page
+ "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator")
+ (license license:expat)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 90337b8..d6648d4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3535,16 +3535,18 @@ object knows about.")
(define-public perl-http-daemon
(package
(name "perl-http-daemon")
- (version "6.01")
+ (version "6.14")
(source (origin
(method url-fetch)
(uri (string-append
- "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-"
+ "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-"
version ".tar.gz"))
(sha256
(base32
- "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"))))
+ "079fkcq2vdrzdf0bml52kz73n9gdv1xg0qf72c9v505v7izpwxph"))))
(build-system perl-build-system)
+ (native-inputs
+ (list perl-module-build perl-test-needs))
(propagated-inputs
(list perl-http-message perl-lwp-mediatypes))
(license license:perl-license)
@@ -3607,18 +3609,18 @@ processing of request data as it arrives.")
(define-public perl-http-message
(package
(name "perl-http-message")
- (version "6.18")
+ (version "6.37")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-"
version ".tar.gz"))
(sha256
(base32
- "04lih0fn89jpyk74c4aq1rzq18h8v4zd3x0lik2r9dl8sdqd2q6h"))))
+ "00nq0xnpdba4valzgvzy3fgvck1ijrksdyzb4w9q6j72hl5dln8f"))))
(build-system perl-build-system)
(native-inputs
- (list perl-try-tiny))
+ (list perl-test-needs perl-try-tiny))
(propagated-inputs
(list perl-encode-locale perl-http-date perl-io-html
perl-lwp-mediatypes perl-uri))
@@ -3846,14 +3848,14 @@ and IPv6 sockets, intended as a replacement for IO::Socket::INET.")
(define-public perl-io-socket-ssl
(package
(name "perl-io-socket-ssl")
- (version "2.068")
+ (version "2.081")
(source (origin
(method url-fetch)
(uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/"
"IO-Socket-SSL-" version ".tar.gz"))
(sha256
(base32
- "1ycgzg1l7p07y5wc0vzgnj122vm51p5aqpi4s56pp0piaq0gq824"))))
+ "0hw4c62abq0cs3ixi0ws96i2y0fij3452514dlqn7d6nm0kgig87"))))
(build-system perl-build-system)
(propagated-inputs
(list perl-net-ssleay
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 8ef95ce..5dba798 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
@@ -36,6 +36,7 @@
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages c)
#:use-module (gnu packages compression)
#:use-module (gnu packages docbook)
#:use-module (gnu packages enchant)
@@ -123,20 +124,19 @@ the WPE-flavored port of WebKit.")
engine that uses Wayland for graphics output.")
(license license:bsd-2)))
-(define %webkit-version "2.38.5")
-
(define-public webkitgtk
(package
(name "webkitgtk") ; webkit2gtk4
- (version %webkit-version)
+ (version "2.40.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
- (base32 "19y1n05mp370mq4bp2bk0pm3wk49z9a10azjjdcdyx12091hrhj0"))
+ (base32 "14xkgamqlshxqw6fcslvw0yzj4y5mvx66b6bn64rwrl9pyhpwq54"))
(patches (search-patches
- "webkitgtk-adjust-bubblewrap-paths.patch"))))
+ "webkitgtk-adjust-bubblewrap-paths.patch"
+ "webkitgtk-libelogind.patch"))))
(build-system cmake-build-system)
(outputs '("out" "doc" "debug"))
(arguments
@@ -148,18 +148,26 @@ engine that uses Wayland for graphics output.")
;; binaries require 20 GiB of memory to link (even with ld.gold or lld)
;; and produce 4.6 GiB of debug symbols.
#:build-type "Release"
- #:configure-flags #~(list
- "-DPORT=GTK"
- ;; GTKDOC will be removed upstream soon in favor of
- ;; gi-docgen; it is normally disabled because the
- ;; doc is rather expensive to build.
- "-DENABLE_GTKDOC=ON"
- ;; The minibrowser, not built by default, is a good
- ;; tool to validate the good operation of
- ;; webkitgtk.
- "-DENABLE_MINIBROWSER=ON"
- ;; The default lib installation prefix is lib64.
- (string-append "-DLIB_INSTALL_DIR=" #$output "/lib"))
+ #:configure-flags
+ #~(list "-DPORT=GTK"
+ ;; GTKDOC will be removed upstream soon in favor of
+ ;; gi-docgen; it is normally disabled because the
+ ;; doc is rather expensive to build.
+ "-DENABLE_GTKDOC=ON"
+ ;; The minibrowser, not built by default, is a good
+ ;; tool to validate the good operation of
+ ;; webkitgtk.
+ "-DENABLE_MINIBROWSER=ON"
+ ;; The default lib installation prefix is lib64.
+ (string-append "-DLIB_INSTALL_DIR=" #$output "/lib")
+ ;; XXX: WebKitGTK makes use of elogind's systemd-compatible
+ ;; headers, which are under the include/elogind prefix. The WTF
+ ;; component doesn't propagate the Journald header correctly
+ ;; detected (stubs from elogind), hence the following hack (see:
+ ;; https://bugs.webkit.org/show_bug.cgi?id=254495).
+ (string-append "-DCMAKE_CXX_FLAGS=-I"
+ (search-input-directory
+ %build-inputs "include/elogind")))
;; The build may fail with -j1 (see:
;; https://bugs.webkit.org/show_bug.cgi?id=195251).
#:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count))))
@@ -186,13 +194,6 @@ engine that uses Wayland for graphics output.")
(substitute* "Source/cmake/OptionsCommon.cmake"
(("if \\(LD_SUPPORTS_DISABLE_NEW_DTAGS\\)")
"if (FALSE)"))))
- (add-after 'unpack 'help-cmake-find-elogind
- (lambda _
- (substitute* "Source/cmake/FindJournald.cmake"
- ;; Otherwise, CMake would throw an error because it relies on
- ;; the pkg-config search to locate headers.
- (("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd")
- "pkg_check_modules(PC_SYSTEMD QUIET libelogind"))))
(add-after 'unpack 'embed-absolute-wpebackend-reference
(lambda* (#:key inputs #:allow-other-keys)
(let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo")))
@@ -222,7 +223,8 @@ engine that uses Wayland for graphics output.")
pkg-config
python-wrapper
gi-docgen
- ruby))
+ ruby
+ unifdef))
(propagated-inputs
(list gtk+ libsoup))
(inputs
@@ -233,11 +235,11 @@ engine that uses Wayland for graphics output.")
geoclue
gst-plugins-base
gst-plugins-bad-minimal
- gtk+-2
harfbuzz
hyphen
icu4c
lcms
+ libavif
libgcrypt
libgudev
libjpeg-turbo
@@ -309,13 +311,13 @@ propagated by default) such as @code{gst-plugins-good} and
(package
(inherit webkitgtk)
(name "wpewebkit")
- (version %webkit-version)
+ (version "2.40.0")
(source (origin
(inherit (package-source webkitgtk))
(uri (string-append "https://wpewebkit.org/releases/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0q8nmk9l6bqv2bhljm9wv7mvgdl393z7v2m7a0c5avac18yzs07z"))))
+ (base32 "1dl663nbm011sx099x9gdhk3aj119yn5rxp77jmnhdv1l77jpv58"))))
(arguments
(substitute-keyword-arguments (package-arguments webkitgtk)
((#:configure-flags flags)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 330ec46..31770ac 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -42,7 +42,7 @@
;;; Copyright © 2020 James Smith <jsubuntuxp@disroot.org>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
;;; Copyright © 2021 Renzo Poddighe <renzo@poddighe.nl>
@@ -363,16 +363,16 @@ with X11 or Wayland, or in a text terminal with ncurses.")
(define-public copyq
(package
(name "copyq")
- (version "6.3.2")
+ (version "7.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hluk/CopyQ")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0qdf7lr6bdmsnz1k5nnzmbv4h0xj8jqg92x6089qdaz5s87x7vqr"))))
+ "0h8jz7v5xvpq23dh1sr600q5jlrfzm6wsnp7sln8hbgsn96n8kas"))))
(build-system cmake-build-system)
(arguments
(list
@@ -2814,52 +2814,19 @@ Xwrits hides itself until you should take another break.")
(file-name (git-file-name name version))
(sha256
(base32 "14gnkz18dipsa2v24f4nm9syxaa7g21iqjm7y65jn849ka2jr1h8"))))
- (build-system scons-build-system)
- (inputs
- (list libx11))
- (native-inputs
- `(("pkg-config" ,pkg-config)
- ("googletest" ,googletest)
- ("googletest-source" ,(package-source googletest))))
+ (build-system cmake-build-system)
(arguments
- `(#:scons ,scons-python2
- #:scons-flags
- (list ,(string-append "CC=" (cc-for-target)))
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'patch-sconstruct
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "SConstruct"
- ;; scons doesn't pick up environment variables automatically
- ;; so it needs help to find path variables
- (("env = Environment\\(")
- "env = Environment(
- ENV = {
- 'PATH': os.environ['PATH'],
- 'CPATH': os.environ['C_INCLUDE_PATH'],
- 'LIBRARY_PATH': os.environ['LIBRARY_PATH'],
- 'PKG_CONFIG_PATH': os.environ['PKG_CONFIG_PATH']
- },")
- ;; Update path to gtest source files used in tests
- (("/usr/src/gtest") (string-append
- (assoc-ref inputs "googletest-source")
- "/googletest"))
- ;; Exclude one warning that causes a build error
- (("-Werror") "-Werror -Wno-error=sign-compare"))
- #t))
- ;; The SConstruct script doesn't configure installation so
- ;; binaries must be copied to the output path directly
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin"))
- (man (string-append out "/share/man/man1")))
- (mkdir-p bin)
- (install-file "xsettingsd" bin)
- (install-file "dump_xsettings" bin)
- (install-file "xsettingsd.1" man)
- (install-file "dump_xsettings.1" man)
- #t))))))
+ (list #:configure-flags #~(list "-DBUILD_TESTING=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-problematic-tests
+ (lambda _
+ (substitute* "config_parser_test.cc"
+ ;; This test fails for unknown reasons (see:
+ ;; https://github.com/derat/xsettingsd/issues/30).
+ (("TEST\\(CharStreamTest, Basic")
+ "TEST(CharStreamTest, DISABLED_Basic")))))))
+ (inputs (list libx11))
+ (native-inputs (list pkg-config googletest))
(home-page "https://github.com/derat/xsettingsd")
(synopsis "Xorg settings daemon")
(description "@command{xsettingsd} is a lightweight daemon that provides settings to
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index dffad29..42bf5d5 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -130,15 +130,15 @@ compressed video format.")
(define-public speex
(package
(name "speex")
- (version "1.2.0")
+ (version "1.2.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://downloads.xiph.org/releases/speex/speex-"
version ".tar.gz"))
(sha256
(base32
- "150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa"))))
+ "1spy51kaxfhpj8171gn1s69wz82nzkz2k0x7k0nhldwangrd8i2b"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))
@@ -160,14 +160,14 @@ stereo encoding, and voice activity detection.")
(define-public speexdsp
(package
(name "speexdsp")
- (version "1.2.0")
+ (version "1.2.1")
(source (origin
(method url-fetch)
(uri (string-append "https://downloads.xiph.org/releases/speex/"
"speexdsp-" version ".tar.gz"))
(sha256
(base32
- "0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838"))))
+ "0gadnnpg9994cindpnw35j45dnr4bflkig1aqxlrafd6wi1p6xwc"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-static"
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 1a8ae72..203d6d8 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -24,7 +24,7 @@
;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
-;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
@@ -6041,114 +6041,114 @@ basic eye-candy effects.")
(patches (search-patches "xpra-4.2-systemd-run.patch"
"xpra-4.2-install_libs.patch"))))
(build-system python-build-system)
- ;; see also http://xpra.org/trac/wiki/Dependencies
- (inputs `(("bash-minimal" ,bash-minimal) ; for wrap-program
- ;; Essential dependencies.
- ("libjpeg" ,libjpeg-turbo)
- ("libwebp" ,libwebp)
- ("ffmpeg" ,ffmpeg)
- ("libx11" ,libx11)
- ("libxrandr" ,libxrandr)
- ("libxtst" ,libxtst)
- ("libxfixes" ,libxfixes)
- ("libxkbfile" ,libxkbfile)
- ("libxcomposite" ,libxcomposite)
- ("libxdamage" ,libxdamage)
- ("libxext" ,libxext)
- ("libxres" ,libxres)
- ("lz4" ,lz4)
- ("gtk+" ,gtk+)
- ("python-pycairo" ,python-pycairo)
- ("python-pygobject" ,python-pygobject)
- ("xauth" ,xauth)
- ("xorg-server" ,xorg-server)
- ("xf86-video-dummy" ,xf86-video-dummy)
- ("xf86-input-mouse" ,xf86-input-mouse)
- ("xf86-input-keyboard" ,xf86-input-keyboard)
- ("python-pillow" ,python-pillow)
- ;; Optional dependencies.
- ("libx264" ,libx264)
- ("x265" ,x265)
- ("libvpx" ,libvpx)
- ("python-rencode" ,python-rencode) ; For speed.
- ("python-numpy" ,python-numpy)
- ("python-pyopengl" ,python-pyopengl) ; Drawing acceleration.
- ("python-pyopengl-accelerate" ,python-pyopengl-accelerate) ; Same.
- ("python-paramiko" ,python-paramiko) ; Tunneling over SSH.
- ("python-dbus" ,python-dbus) ; For desktop notifications.
- ("dbus" ,dbus) ; For dbus-launch command.
- ("python-lz4" ,python-lz4) ; Faster compression than zlib.
- ("python-netifaces" ,python-netifaces)))
+ (inputs
+ (list bash-minimal ; for wrap-program
+ ;; Essential dependencies.
+ libjpeg-turbo
+ libwebp
+ ffmpeg
+ libx11
+ libxrandr
+ libxtst
+ libxfixes
+ libxkbfile
+ libxcomposite
+ libxdamage
+ libxext
+ libxres
+ lz4
+ gtk+
+ python-pycairo
+ python-pygobject
+ xauth
+ xorg-server
+ xf86-video-dummy
+ xf86-input-mouse
+ xf86-input-keyboard
+ python-pillow
+ ;; Optional dependencies.
+ libx264
+ x265
+ libvpx
+ python-rencode ; For speed.
+ python-numpy
+ python-pyopengl ; Drawing acceleration.
+ python-pyopengl-accelerate ; Same.
+ python-paramiko ; Tunneling over SSH.
+ python-dbus ; For desktop notifications.
+ dbus ; For dbus-launch command.
+ python-lz4 ; Faster compression than zlib.
+ python-netifaces))
(native-inputs (list pkg-config pandoc python-cython))
(arguments
- `(#:configure-flags '("--without-Xdummy"
- "--without-Xdummy_wrapper"
- "--with-opengl"
- "--without-debug"
- "--without-strict") ; Ignore compiler warnings.
- #:modules ((guix build python-build-system)
+ (list
+ #:configure-flags #~(list "--without-Xdummy"
+ "--without-Xdummy_wrapper"
+ "--with-opengl"
+ "--without-debug"
+ "--without-strict") ; Ignore compiler warnings.
+ #:modules '((guix build python-build-system)
(guix build utils))
- #:tests? #f ; Do not run test-cases. This would rebuild all modules and
- ; they seem to require python2.
- #:phases
- (modify-phases %standard-phases
- ;; Must pass the same flags as 'install, otherwise enabled modules may
- ;; not be built.
- (replace 'build
- (lambda* (#:key configure-flags #:allow-other-keys)
- (apply invoke (append (list "python" "setup.py" "build")
- configure-flags))))
- (add-before 'install 'fix-paths
- (lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Fix binary paths.
- (substitute* '("xpra/scripts/config.py" "xpra/x11/vfb_util.py")
- (("\"Xvfb\"")
- (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xvfb\""))
- (("\"Xorg\"")
- (string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xorg\""))
- (("\"xauth\"")
- (string-append "\"" (assoc-ref inputs "xauth") "/bin/xauth\"")))
- ;; Fix directory of config files.
- (substitute* '("xpra/scripts/config.py" "xpra/platform/xposix/paths.py")
- (("\"/etc/xpra/?\"")
- (string-append "\"" (assoc-ref outputs "out") "/etc/xpra/\"")))
- ;; XXX: Stolen from (gnu packages linux)
- (define (append-to-file name body)
- (let ((file (open-file name "a")))
- (display body file)
- (close-port file)))
- ;; Add Xorg module paths.
- (append-to-file
- "fs/etc/xpra/xorg.conf"
- (string-append "\nSection \"Files\"\nModulePath \""
- (assoc-ref inputs "xf86-video-dummy") "/lib/xorg/modules,"
- (assoc-ref inputs "xf86-input-mouse") "/lib/xorg/modules,"
- (assoc-ref inputs "xf86-input-keyboard") "/lib/xorg/modules,"
- (assoc-ref inputs "xorg-server") "/lib/xorg/modules\"\n"
- "EndSection\n\n"))
- (substitute* '("xpra/scripts/config.py"
- "fs/etc/xpra/conf.d/60_server.conf.in"
- "tests/unittests/unit/server/mixins/notification_test.py")
- ;; The trailing -- is intentional, so we only replace it inside
- ;; a command line.
- (("dbus-launch --")
- (string-append (search-input-file inputs "/bin/dbus-launch")
- " --")))
- ;; /run/user does not exist on guix system
- (substitute* "./xpra/scripts/config.py"
- (("socket-dir.*: \"\",")
- "socket-dir\" : \"~/.xpra\","))
- #t))
- ;; GTK3 will not be found, if GI can’t find its typelibs.
- (add-after
- 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((prog (string-append (assoc-ref outputs "out")
- "/bin/xpra")))
- ;; XXX: only export typelibs in inputs
- (wrap-program prog
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
- #t))))))
+ ;; Do not run test-cases. This would rebuild all modules and they seem
+ ;; to require python2.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Must pass the same flags as 'install, otherwise enabled modules may
+ ;; not be built.
+ (replace 'build
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ (apply invoke (append (list "python" "setup.py" "build")
+ configure-flags))))
+ (add-before 'install 'fix-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Fix binary paths.
+ (substitute* '("xpra/scripts/config.py"
+ "xpra/x11/vfb_util.py")
+ (("\"Xvfb\"")
+ (format #f "~s" (search-input-file inputs "bin/Xvfb")))
+ (("\"Xorg\"")
+ (format #f "~s" (search-input-file inputs "bin/Xorg")))
+ (("\"xauth\"")
+ (format #f "~s" (search-input-file inputs "bin/xauth"))))
+ ;; Fix directory of config files.
+ (substitute* '("xpra/scripts/config.py"
+ "xpra/platform/xposix/paths.py")
+ (("\"/etc/xpra/?\"")
+ (string-append "\"" #$output "/etc/xpra/\"")))
+ ;; XXX: Stolen from (gnu packages linux)
+ (define (append-to-file name body)
+ (let ((file (open-file name "a")))
+ (display body file)
+ (close-port file)))
+ ;; Add Xorg module paths.
+ (append-to-file
+ "fs/etc/xpra/xorg.conf"
+ (string-append
+ "\nSection \"Files\"\nModulePath \""
+ #$(this-package-input "xf86-video-dummy") "/lib/xorg/modules,"
+ #$(this-package-input "xf86-input-mouse") "/lib/xorg/modules,"
+ #$(this-package-input "xf86-input-keyboard") "/lib/xorg/modules,"
+ #$(this-package-input "xorg-server") "/lib/xorg/modules\"\n"
+ "EndSection\n\n"))
+ (substitute* '("xpra/scripts/config.py"
+ "fs/etc/xpra/conf.d/60_server.conf.in"
+ "tests/unittests/unit/server/mixins/notification_test.py")
+ ;; The trailing -- is intentional, so we only replace it inside
+ ;; a command line.
+ (("dbus-launch --")
+ (string-append (search-input-file inputs "/bin/dbus-launch")
+ " --")))
+ ;; /run/user does not exist on guix system.
+ (substitute* "./xpra/scripts/config.py"
+ (("socket-dir.*: \"\",")
+ "socket-dir\" : \"~/.xpra\","))))
+ ;; GTK3 will not be found, if GI can’t find its typelibs.
+ (add-after 'install 'wrap-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; XXX: only export typelibs in inputs
+ (wrap-program (search-input-file outputs "bin/xpra")
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://www.xpra.org/")
(synopsis "Remote access to individual applications or full desktops")
(description "Xpra is a persistent remote display server and client for
diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm
index 2ca1357..92be1a8 100644
--- a/gnu/tests/databases.scm
+++ b/gnu/tests/databases.scm
@@ -389,7 +389,11 @@ data double PRECISION NULL
(define %mysql-os
(simple-operating-system
- (service mysql-service-type)))
+ (service mysql-service-type
+ (mysql-configuration
+ ;; Disable O_DIRECT since it's not supported on overlayfs.
+ ;; See <https://jira.mariadb.org/browse/MDEV-28751>.
+ (extra-content "innodb-flush-method = fsync")))))
(define* (run-mysql-test)
"Run tests in %MYSQL-OS."
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 2e47f1b..7f50332 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
@@ -87,9 +88,7 @@
"/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
"/mime" "/sounds" "/themes" "/wallpapers")
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
- ;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which
- ;; would cause warnings, perhaps problems.
- `("QT_PLUGIN_PATH" = directory
+ `("QT_PLUGIN_PATH" prefix directory
,(format #f "/lib/qt~a/plugins" qt-major-version))
`("QML2_IMPORT_PATH" = directory
,(format #f "/lib/qt~a/qml" qt-major-version))
--
libgit2 1.5.1
^ permalink raw reply related [relevance 16%]
* [bug#52997] [PATCH-v2] gnu: Add python-facebook-sdk.
@ 2023-04-12 21:30 70% ` Giacomo Leidi via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2023-04-12 21:30 UTC (permalink / raw)
To: 52997; +Cc: Giacomo Leidi, lars
* gnu/packages/python-web.scm (python-facebook-sdk): New variable.
---
gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 495e13acfe..9eae6d7616 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7844,6 +7844,35 @@ (define-public python-tweepy
library for accessing the Twitter API.")
(license license:expat)))
+(define-public python-facebook-sdk
+ (package
+ (name "python-facebook-sdk")
+ (version "3.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/mobolic/facebook-sdk")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0p7p0wvcspd9p8d6r25bgjbf0ihdw5g1jw3dylwngrazdmc3g36b"))))
+ (build-system python-build-system)
+ (arguments
+ ;; Tests require network access.
+ `(#:tests? #f))
+ (propagated-inputs `(("python-requests" ,python-requests)))
+ (home-page "https://facebook-sdk.readthedocs.io")
+ (synopsis
+ "Facebook Graph API client in Python")
+ (description
+ "This client library is designed to support the Facebook Graph API and
+the official Facebook JavaScript SDK, which is the canonical way to implement
+Facebook authentication.")
+ (license license:asl2.0)))
+
(define-public python-quart
(package
(name "python-quart")
base-commit: dd3e5e71104a2bcbad80e52e062a144ea96b8c6a
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#60493] [v2 2/3] gnu: Update python-oauthlib to 3.2.2.
@ 2023-04-12 20:52 70% ` Giacomo Leidi via Guix-patches via
2023-04-12 20:52 69% ` [bug#60493] [v2 3/3] gnu: Update python-tweepy to 4.12.1 Giacomo Leidi via Guix-patches via
1 sibling, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2023-04-12 20:52 UTC (permalink / raw)
To: 60493; +Cc: Giacomo Leidi, lars
* gnu/packages/python-web.scm (python-oauthlib): Update to 3.2.2.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 495e13acfe..93bc7a0c0f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3320,13 +3320,13 @@ (define-public oauth2ms
(define-public python-oauthlib
(package
(name "python-oauthlib")
- (version "3.1.0")
+ (version "3.2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "oauthlib" version))
(sha256
(base32
- "12gqnabwck30gdlpwm6af3s28qm9p2yc7b1w8s4fk9ncbz1irr5y"))))
+ "066r7mimlpb5q1fr2f1z59l4jc89kv4h2kgkcifyqav6544w8ncq"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#60493] [v2 3/3] gnu: Update python-tweepy to 4.12.1.
2023-04-12 20:52 70% ` [bug#60493] [v2 2/3] gnu: Update python-oauthlib to 3.2.2 Giacomo Leidi via Guix-patches via
@ 2023-04-12 20:52 69% ` Giacomo Leidi via Guix-patches via
1 sibling, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2023-04-12 20:52 UTC (permalink / raw)
To: 60493; +Cc: Giacomo Leidi, lars
* gnu/packages/python-web.scm (python-tweepy): Update to 4.12.1.
---
gnu/packages/python-web.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 93bc7a0c0f..3d3662f1f2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
-;;; Copyright © 2020, 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020, 2022, 2023 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -7814,7 +7814,7 @@ (define-public python-mwparserfromhell
(define-public python-tweepy
(package
(name "python-tweepy")
- (version "4.4.0")
+ (version "4.12.1")
(source
(origin
(method git-fetch)
@@ -7825,7 +7825,7 @@ (define-public python-tweepy
(file-name (git-file-name name version))
(sha256
(base32
- "0jl3j20iqvzqqw5q5ldval5wrc2pdx94zff3b6b87j51yjx3qjhr"))))
+ "0c2zypsfspbjd1f5rgn2jnj05qxsmxh9gb93ciqf65hmkalgc8cg"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -7835,7 +7835,11 @@ (define-public python-tweepy
(when tests?
(invoke "python" "-m" "unittest" "discover" "tests")))))))
(propagated-inputs
- (list python-aiohttp python-requests python-requests-oauthlib))
+ (list python-aiohttp
+ python-async-lru
+ python-requests
+ python-requests-oauthlib
+ python-oauthlib))
(native-inputs
(list python-vcrpy))
(home-page "https://www.tweepy.org/")
--
2.39.2
^ permalink raw reply related [relevance 69%]
* [bug#62773] gnu: python-requests_ntlm: Update to 1.2.0.
[not found] <877cuin3g0.fsf@VM-0-5-ubuntu.mail-host-address-is-not-set>
@ 2023-04-11 9:58 89% ` c4droid
2023-09-14 9:42 70% ` [bug#62773] [PATCH] " c4droid
1 sibling, 0 replies; 200+ results
From: c4droid @ 2023-04-11 9:58 UTC (permalink / raw)
To: 62773
[-- Attachment #1: 0001-gnu-python-requests_ntlm-Update-to-1.2.0.patch --]
[-- Type: text/x-diff, Size: 1436 bytes --]
From 87156d03abe4112208845181b56d00bef2213b4d Mon Sep 17 00:00:00 2001
From: c4droid <c4droid@foxmail.com>
Date: Tue, 11 Apr 2023 17:50:48 +0800
Subject: [PATCH 1/2] gnu: python-requests_ntlm: Update to 1.2.0.
---
gnu/packages/python-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 495e13a..34dc141 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -58,6 +58,7 @@
;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3109,14 +3110,14 @@ (define-public python-requests-unixsocket
(define-public python-requests_ntlm
(package
(name "python-requests_ntlm")
- (version "1.1.0")
+ (version "1.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "requests_ntlm" version))
(sha256
(base32
- "0wgbqzaq9w7bas16b7brdb75f91bh3275fb459093bk1ihpck2ci"))))
+ "1a0np7lk8ma1plv1s4aw5q9h2z3aljprkl9qsfypqcaf0zsqbhik"))))
(build-system python-build-system)
(propagated-inputs
(list python-cryptography python-ntlm-auth python-requests))
--
2.39.2
^ permalink raw reply related [relevance 89%]
* [bug#62688] [PATCH] gnu: python-websockets: Update to 11.0.1.
@ 2023-04-06 5:47 70% jgart via Guix-patches via
0 siblings, 0 replies; 200+ results
From: jgart via Guix-patches via @ 2023-04-06 5:47 UTC (permalink / raw)
To: 62688; +Cc: Lars-Dominik Braun, jgart
* gnu/packages/python-web.scm (python-websockets): Update to 11.0.1.
[build-system]: Use pyproject-build-system.
---
Hi,
Here's a patch updating python-websockets to the latest release. Tests are passing.
all best,
jgart
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 495e13acfe..d9475e9350 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6089,7 +6089,7 @@ (define-public python-warcio
(define-public python-websockets
(package
(name "python-websockets")
- (version "10.3")
+ (version "11.0.1")
(source
(origin
(method git-fetch)
@@ -6099,8 +6099,8 @@ (define-public python-websockets
(file-name (git-file-name name version))
(sha256
(base32
- "1vk7g5z977mi89hamwiqawpmibwvv9ghrf3pqva1waxmyc7gyjb5"))))
- (build-system python-build-system)
+ "1pbkm9hd0lfkd6j25vyd3dgj6bsyrpc5bd1i0ay68f7np45jjgvh"))))
+ (build-system pyproject-build-system)
(arguments
(list #:phases
#~(modify-phases %standard-phases
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#60838] [PATCH v3 4/9] gnu: Add python-asgi-lifespan.
@ 2023-03-26 19:43 62% ` Felix Gruber
2023-03-26 19:43 69% ` [bug#60838] [PATCH v3 5/9] gnu: Add python-asgi-csrf Felix Gruber
1 sibling, 0 replies; 200+ results
From: Felix Gruber @ 2023-03-26 19:43 UTC (permalink / raw)
To: 60838, Maxim Cournoyer; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-asgi-lifespan): New variable.
---
gnu/packages/python-web.scm | 52 ++++++++++++++++++++++++++++++++++++-
1 file changed, 51 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 072d160c26..8e3f778919 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2021 Alice Brenon <alice.brenon@ens-lyon.fr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2022, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
@@ -570,6 +570,56 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgi-lifespan
+ (package
+ (name "python-asgi-lifespan")
+ (version "1.0.1")
+ (source (origin
+ (method git-fetch) ; for tests
+ (uri (git-reference
+ (url "https://github.com/florimondmanca/asgi-lifespan")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "10a5ci9ddr8wnjf3wai7xifbbplirhyrgvw4p28q0ha63cvhb2j2"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; disable failing tests
+ '(list "-k"
+ (string-append
+ "not test_lifespan_manager[asyncio-None-ValueError-None]"
+ " and not test_lifespan_manager[asyncio-ValueError-None-None]"
+ " and not test_lifespan_manager[asyncio-ValueError-ValueError-None]"
+ " and not test_lifespan_manager[trio-None-ValueError-None]"
+ " and not test_lifespan_manager[trio-ValueError-None-None]"
+ " and not test_lifespan_manager[trio-ValueError-ValueError-None]"))
+ #:phases
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'lower-coverage-requirement
+ ;; after disabling the failing tests, the coverage
+ ;; dropped slightly below 100%.
+ (lambda _
+ (substitute* "setup.cfg"
+ (("(--cov-fail-under=)[0-9]+" _ cov)
+ (string-append cov "90"))))))))
+ (native-inputs (list python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-pytest-trio
+ python-starlette))
+ (propagated-inputs (list python-sniffio))
+ (home-page "https://github.com/florimondmanca/asgi-lifespan")
+ (synopsis "Programmatic startup/shutdown of ASGI apps")
+ (description "Programmatically send startup/shutdown lifespan events
+into Asynchronous Server Gateway Interface (ASGI) applications. When
+used in combination with an ASGI-capable HTTP client such as HTTPX, this
+allows mocking or testing ASGI applications without having to spin up an
+ASGI server.")
+ (license license:expat)))
+
(define-public python-css-html-js-minify
(package
(name "python-css-html-js-minify")
--
2.39.2
^ permalink raw reply related [relevance 62%]
* [bug#60838] [PATCH v3 5/9] gnu: Add python-asgi-csrf.
2023-03-26 19:43 62% ` [bug#60838] [PATCH v3 4/9] gnu: Add python-asgi-lifespan Felix Gruber
@ 2023-03-26 19:43 69% ` Felix Gruber
1 sibling, 0 replies; 200+ results
From: Felix Gruber @ 2023-03-26 19:43 UTC (permalink / raw)
To: 60838, Maxim Cournoyer; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-asgi-csrf): New variable.
---
gnu/packages/python-web.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8e3f778919..0be4078513 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -570,6 +570,33 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgi-csrf
+ (package
+ (name "python-asgi-csrf")
+ (version "0.9")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgi-csrf" version))
+ (sha256
+ (base32
+ "06klgxfxzjfkyjky3rkvmf2r07r7r2my53qq7g9qy6mcmvfkp7bf"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-itsdangerous python-multipart))
+ (native-inputs (list python-asgi-lifespan
+ python-httpx
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-starlette))
+ (home-page "https://github.com/simonw/asgi-csrf")
+ (synopsis "ASGI middleware for protecting against CSRF attacks")
+ (description "This Asynchronous Server Gateway Interface (ASGI)
+middleware protects against Cross-site request forgery (CSRF) attacks.
+It implements the Double Submit Cookie pattern, where a cookie is set
+that is then compared to a @code{csrftoken} hidden form field or a
+@code{x-csrftoken} HTTP header.")
+ (license license:asl2.0)))
+
(define-public python-asgi-lifespan
(package
(name "python-asgi-lifespan")
--
2.39.2
^ permalink raw reply related [relevance 69%]
* [bug#62252] [PATCH v3 18/19] gnu: Add python-fastapi.
` (4 preceding siblings ...)
2023-03-18 8:59 67% ` [bug#62252] [PATCH v2 " Liliana Marie Prikler
@ 2023-03-18 8:59 67% ` Liliana Marie Prikler
5 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-03-18 8:59 UTC (permalink / raw)
To: 62252
* gnu/packages/python-web.scm (python-fastapi): New variable.
---
gnu/packages/python-web.scm | 62 +++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 14fc4763f5..1e5cd6220a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8226,6 +8226,68 @@ (define-public python-starlette
Interface) framework/toolkit for building async web services in Python.")
(license license:bsd-3)))
+(define-public python-fastapi
+ (package
+ (name "python-fastapi")
+ (version "0.92.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "fastapi" version))
+ (sha256
+ (base32
+ "1pm4p5i9h732f0qag85yd9ngjz8x9bhs3fyk2j861cn8s9dhyfh2"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'drop-orjson
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("\"orjson.*\",") ""))))
+ (add-after 'unpack 'delete-failing-tests
+ (lambda _
+ (for-each
+ delete-file
+ (append
+ '("docs_src/app_testing/app_b_py310/test_main.py"
+ "tests/test_tutorial/test_templates/test_tutorial001.py")
+ (find-files "docs_src/sql_databases/"
+ "test_sql_app\\.py$")
+ (find-files "tests"
+ "test_(default|orjson)_response_class\\.py$")
+ (find-files "tests/test_tutorial"
+ "test_tutorial00(1b|9c)\\.py$")
+ (find-files "tests/test_tutorial"
+ "test_testing_databases.*\\.py$"))))))))
+ (propagated-inputs (list python-email-validator
+ python-httpx
+ python-itsdangerous
+ python-jinja2
+ python-multipart
+ python-starlette
+ python-pydantic
+ python-pyyaml
+ python-uvicorn
+ python-ujson))
+ (native-inputs (list python-databases
+ python-flask
+ python-hatchling
+ python-isort
+ python-jose
+ python-mypy
+ python-passlib
+ python-peewee
+ python-pytest
+ python-sqlalchemy
+ python-types-orjson
+ python-types-ujson))
+ (home-page "https://github.com/tiangolo/fastapi")
+ (synopsis "Web framework based on type hints")
+ (description "FastAPI provides a web API framework based on pydantic and
+starlette.")
+ (license license:expat)))
+
(define-public python-pyactiveresource
(package
(name "python-pyactiveresource")
--
2.39.2
^ permalink raw reply related [relevance 67%]
* [bug#62252] [PATCH v3 11/19] gnu: python-starlette: Update to 0.25.0.
@ 2023-03-18 7:48 70% ` Liliana Marie Prikler
2023-03-18 7:48 70% ` [bug#62252] [PATCH v2 " Liliana Marie Prikler
` (4 subsequent siblings)
5 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-03-18 7:48 UTC (permalink / raw)
To: 62252
* gnu/packages/python-web.scm (python-starlette): Update to 0.25.0.
[source]: Switch to git-fetch and git-reference.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-hatchling, python-httpx, python-pytest, and
python-typing-extensions-next.
---
gnu/packages/python-web.scm | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 072d160c26..14fc4763f5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8196,14 +8196,17 @@ (define-public python-sendgrid
(define-public python-starlette
(package
(name "python-starlette")
- (version "0.20.4")
+ (version "0.25.0")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "starlette" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/encode/starlette")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "112hmwk4fh4dl21nlr2xd37h43xzxpjxfnic7v7fz3wr5w9g7z22"))))
- (build-system python-build-system)
+ "1mkkj15lphgycnp51dnrfxbyrx3dicjdcpsqvwc7yw55zyih6h5k"))))
+ (build-system pyproject-build-system)
(propagated-inputs (list python-anyio
python-typing-extensions
;; [all] extra dependencies:
@@ -8212,6 +8215,10 @@ (define-public python-starlette
python-multipart
python-pyyaml
python-requests))
+ (native-inputs (list python-hatchling
+ python-httpx
+ python-pytest
+ python-typing-extensions-next))
(home-page "https://github.com/encode/starlette")
(synopsis "Little ASGI library")
(description
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#62389] [PATCH 05/12] gnu: python-treq: Update to 20.9.0.
2023-03-22 17:31 70% ` [bug#62389] [PATCH 04/12] gnu: python-urllib3: Move to python-cryptography-next conses
@ 2023-03-22 17:31 70% ` conses
1 sibling, 0 replies; 200+ results
From: conses @ 2023-03-22 17:31 UTC (permalink / raw)
To: 62389
* gnu/packages/python-web.scm (python-treq): Update to 20.9.0.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e893f1bd5f..8155a6d898 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4976,14 +4976,14 @@ (define-public python-hyperlink
(define-public python-treq
(package
(name "python-treq")
- (version "18.6.0")
+ (version "20.9.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "treq" version))
(sha256
(base32
- "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+ "18kdk11d84lyxj6dz183nblc6c6r4rj1hk0lpsyiykzgbakjrkc3"))))
(build-system python-build-system)
(propagated-inputs
(list python-attrs
--
2.39.1
--
Best regards,
conses
^ permalink raw reply related [relevance 70%]
* [bug#62389] [PATCH 04/12] gnu: python-urllib3: Move to python-cryptography-next.
@ 2023-03-22 17:31 70% ` conses
2023-03-22 17:31 70% ` [bug#62389] [PATCH 05/12] gnu: python-treq: Update to 20.9.0 conses
1 sibling, 0 replies; 200+ results
From: conses @ 2023-03-22 17:31 UTC (permalink / raw)
To: 62389
* gnu/packages/python-web.scm (python-urllib3):
[propagated-inputs]: Move to python-cryptography-next.
---
gnu/packages/python-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8a73c929a1..e893f1bd5f 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3310,7 +3310,7 @@ (define-public python-urllib3
(propagated-inputs
(list ;; These 5 inputs are used to build urrlib3[secure]
python-certifi
- python-cryptography
+ python-cryptography-next
python-idna
python-pyopenssl
python-pysocks))
--
2.39.1
--
Best regards,
conses
^ permalink raw reply related [relevance 70%]
* [bug#62252] [PATCH v2 11/19] gnu: python-starlette: Update to 0.25.0.
2023-03-18 7:48 70% ` [bug#62252] [PATCH v3 11/19] gnu: python-starlette: Update to 0.25.0 Liliana Marie Prikler
@ 2023-03-18 7:48 70% ` Liliana Marie Prikler
2023-03-18 7:48 70% ` [bug#62252] [PATCH " Liliana Marie Prikler
` (3 subsequent siblings)
5 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-03-18 7:48 UTC (permalink / raw)
To: 62252
* gnu/packages/python-web.scm (python-starlette): Update to 0.25.0.
[source]: Switch to git-fetch and git-reference.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-hatchling, python-httpx, python-pytest, and
python-typing-extensions-next.
---
gnu/packages/python-web.scm | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 072d160c26..14fc4763f5 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8196,14 +8196,17 @@ (define-public python-sendgrid
(define-public python-starlette
(package
(name "python-starlette")
- (version "0.20.4")
+ (version "0.25.0")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "starlette" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/encode/starlette")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "112hmwk4fh4dl21nlr2xd37h43xzxpjxfnic7v7fz3wr5w9g7z22"))))
- (build-system python-build-system)
+ "1mkkj15lphgycnp51dnrfxbyrx3dicjdcpsqvwc7yw55zyih6h5k"))))
+ (build-system pyproject-build-system)
(propagated-inputs (list python-anyio
python-typing-extensions
;; [all] extra dependencies:
@@ -8212,6 +8215,10 @@ (define-public python-starlette
python-multipart
python-pyyaml
python-requests))
+ (native-inputs (list python-hatchling
+ python-httpx
+ python-pytest
+ python-typing-extensions-next))
(home-page "https://github.com/encode/starlette")
(synopsis "Little ASGI library")
(description
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#62252] [PATCH v2 18/19] gnu: Add python-fastapi.
` (3 preceding siblings ...)
2023-03-18 8:59 67% ` [bug#62252] [PATCH 18/19] gnu: Add python-fastapi Liliana Marie Prikler
@ 2023-03-18 8:59 67% ` Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH v3 " Liliana Marie Prikler
5 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-03-18 8:59 UTC (permalink / raw)
To: 62252
* gnu/packages/python-web.scm (python-fastapi): New variable.
---
gnu/packages/python-web.scm | 62 +++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 14fc4763f5..1e5cd6220a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8226,6 +8226,68 @@ (define-public python-starlette
Interface) framework/toolkit for building async web services in Python.")
(license license:bsd-3)))
+(define-public python-fastapi
+ (package
+ (name "python-fastapi")
+ (version "0.92.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "fastapi" version))
+ (sha256
+ (base32
+ "1pm4p5i9h732f0qag85yd9ngjz8x9bhs3fyk2j861cn8s9dhyfh2"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'drop-orjson
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("\"orjson.*\",") ""))))
+ (add-after 'unpack 'delete-failing-tests
+ (lambda _
+ (for-each
+ delete-file
+ (append
+ '("docs_src/app_testing/app_b_py310/test_main.py"
+ "tests/test_tutorial/test_templates/test_tutorial001.py")
+ (find-files "docs_src/sql_databases/"
+ "test_sql_app\\.py$")
+ (find-files "tests"
+ "test_(default|orjson)_response_class\\.py$")
+ (find-files "tests/test_tutorial"
+ "test_tutorial00(1b|9c)\\.py$")
+ (find-files "tests/test_tutorial"
+ "test_testing_databases.*\\.py$"))))))))
+ (propagated-inputs (list python-email-validator
+ python-httpx
+ python-itsdangerous
+ python-jinja2
+ python-multipart
+ python-starlette
+ python-pydantic
+ python-pyyaml
+ python-uvicorn
+ python-ujson))
+ (native-inputs (list python-databases
+ python-flask
+ python-hatchling
+ python-isort
+ python-jose
+ python-mypy
+ python-passlib
+ python-peewee
+ python-pytest
+ python-sqlalchemy
+ python-types-orjson
+ python-types-ujson))
+ (home-page "https://github.com/tiangolo/fastapi")
+ (synopsis "Web framework based on type hints")
+ (description "FastAPI provides a web API framework based on pydantic and
+starlette.")
+ (license license:expat)))
+
(define-public python-pyactiveresource
(package
(name "python-pyactiveresource")
--
2.39.2
^ permalink raw reply related [relevance 67%]
* [bug#62252] [PATCH 18/19] gnu: Add python-fastapi.
` (2 preceding siblings ...)
2023-03-18 7:48 70% ` [bug#62252] [PATCH " Liliana Marie Prikler
@ 2023-03-18 8:59 67% ` Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH v2 " Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH v3 " Liliana Marie Prikler
5 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-03-18 8:59 UTC (permalink / raw)
To: 62252
* gnu/packages/python-web.scm (python-fastapi): New variable.
---
gnu/packages/python-web.scm | 62 +++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2df8fbc523..f2f7618f13 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8094,6 +8094,68 @@ (define-public python-starlette
Interface) framework/toolkit for building async web services in Python.")
(license license:bsd-3)))
+(define-public python-fastapi
+ (package
+ (name "python-fastapi")
+ (version "0.92.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "fastapi" version))
+ (sha256
+ (base32
+ "1pm4p5i9h732f0qag85yd9ngjz8x9bhs3fyk2j861cn8s9dhyfh2"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'drop-orjson
+ (lambda _
+ (substitute* "pyproject.toml"
+ (("\"orjson.*\",") ""))))
+ (add-after 'unpack 'delete-failing-tests
+ (lambda _
+ (for-each
+ delete-file
+ (append
+ '("docs_src/app_testing/app_b_py310/test_main.py"
+ "tests/test_tutorial/test_templates/test_tutorial001.py")
+ (find-files "docs_src/sql_databases/"
+ "test_sql_app\\.py$")
+ (find-files "tests"
+ "test_(default|orjson)_response_class\\.py$")
+ (find-files "tests/test_tutorial"
+ "test_tutorial00(1b|9c)\\.py$")
+ (find-files "tests/test_tutorial"
+ "test_testing_databases.*\\.py$"))))))))
+ (propagated-inputs (list python-email-validator
+ python-httpx
+ python-itsdangerous
+ python-jinja2
+ python-multipart
+ python-starlette
+ python-pydantic
+ python-pyyaml
+ python-uvicorn
+ python-ujson))
+ (native-inputs (list python-databases
+ python-flask
+ python-hatchling
+ python-isort
+ python-jose
+ python-mypy
+ python-passlib
+ python-peewee
+ python-pytest
+ python-sqlalchemy
+ python-types-orjson
+ python-types-ujson))
+ (home-page "https://github.com/tiangolo/fastapi")
+ (synopsis "Web framework based on type hints")
+ (description "FastAPI provides a web API framework based on pydantic and
+starlette.")
+ (license license:expat)))
+
(define-public python-pyactiveresource
(package
(name "python-pyactiveresource")
--
2.39.2
^ permalink raw reply related [relevance 67%]
* [bug#62252] [PATCH 11/19] gnu: python-starlette: Update to 0.25.0.
2023-03-18 7:48 70% ` [bug#62252] [PATCH v3 11/19] gnu: python-starlette: Update to 0.25.0 Liliana Marie Prikler
2023-03-18 7:48 70% ` [bug#62252] [PATCH v2 " Liliana Marie Prikler
@ 2023-03-18 7:48 70% ` Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH 18/19] gnu: Add python-fastapi Liliana Marie Prikler
` (2 subsequent siblings)
5 siblings, 0 replies; 200+ results
From: Liliana Marie Prikler @ 2023-03-18 7:48 UTC (permalink / raw)
To: 62252
* gnu/packages/python-web.scm (python-starlette): Update to 0.25.0.
[source]: Switch to git-fetch and git-reference.
[build-system]: Use pyproject-build-system.
[native-inputs]: Add python-hatchling, python-httpx, python-pytest, and
python-typing-extensions-next.
---
gnu/packages/python-web.scm | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8a73c929a1..2df8fbc523 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -8064,14 +8064,17 @@ (define-public python-sendgrid
(define-public python-starlette
(package
(name "python-starlette")
- (version "0.20.4")
+ (version "0.25.0")
(source (origin
- (method url-fetch)
- (uri (pypi-uri "starlette" version))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/encode/starlette")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "112hmwk4fh4dl21nlr2xd37h43xzxpjxfnic7v7fz3wr5w9g7z22"))))
- (build-system python-build-system)
+ "1mkkj15lphgycnp51dnrfxbyrx3dicjdcpsqvwc7yw55zyih6h5k"))))
+ (build-system pyproject-build-system)
(propagated-inputs (list python-anyio
python-typing-extensions
;; [all] extra dependencies:
@@ -8080,6 +8083,10 @@ (define-public python-starlette
python-multipart
python-pyyaml
python-requests))
+ (native-inputs (list python-hatchling
+ python-httpx
+ python-pytest
+ python-typing-extensions-next))
(home-page "https://github.com/encode/starlette")
(synopsis "Little ASGI library")
(description
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#60838] [PATCH v2 6/7] gnu: Add python-asgi-csrf.
2023-03-17 19:19 67% ` [bug#60838] [PATCH v2 5/7] gnu: Add python-asgi-lifespan Felix Gruber
@ 2023-03-17 19:19 70% ` Felix Gruber
1 sibling, 0 replies; 200+ results
From: Felix Gruber @ 2023-03-17 19:19 UTC (permalink / raw)
To: 60838; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-asgi-csrf): New variable.
---
gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 83e7d77da8..8c172d64c9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -570,6 +570,31 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgi-csrf
+ (package
+ (name "python-asgi-csrf")
+ (version "0.9")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgi-csrf" version))
+ (sha256
+ (base32
+ "06klgxfxzjfkyjky3rkvmf2r07r7r2my53qq7g9qy6mcmvfkp7bf"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-itsdangerous python-multipart))
+ (native-inputs (list python-asgi-lifespan
+ python-httpx
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-starlette))
+ (home-page "https://github.com/simonw/asgi-csrf")
+ (synopsis "ASGI middleware for protecting against CSRF attacks")
+ (description "This middleware implements the Double Submit Cookie
+pattern, where a cookie is set that is then compared to a csrftoken
+hidden form field or a x-csrftoken HTTP header.")
+ (license license:asl2.0)))
+
(define-public python-asgi-lifespan
(package
(name "python-asgi-lifespan")
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#60838] [PATCH v2 5/7] gnu: Add python-asgi-lifespan.
@ 2023-03-17 19:19 67% ` Felix Gruber
2023-03-17 19:19 70% ` [bug#60838] [PATCH v2 6/7] gnu: Add python-asgi-csrf Felix Gruber
1 sibling, 0 replies; 200+ results
From: Felix Gruber @ 2023-03-17 19:19 UTC (permalink / raw)
To: 60838; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-asgi-lifespan): New variable.
---
gnu/packages/python-web.scm | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8a73c929a1..83e7d77da8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2021 Alice Brenon <alice.brenon@ens-lyon.fr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2022, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
@@ -570,6 +570,29 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgi-lifespan
+ (package
+ (name "python-asgi-lifespan")
+ (version "1.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgi-lifespan" version))
+ (sha256
+ (base32
+ "0zyvx8i43s1m2akqn5njwdh2zi6n05ji7mlvqx5pdi3k43dffcws"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:tests? #f)) ; The pypi package does not contain the tests folder.
+ (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov))
+ (propagated-inputs (list python-sniffio))
+ (home-page "https://github.com/florimondmanca/asgi-lifespan")
+ (synopsis "Programmatic startup/shutdown of ASGI apps")
+ (description "Programmatically send startup/shutdown lifespan events
+into ASGI applications. When used in combination with an ASGI-capable
+HTTP client such as HTTPX, this allows mocking or testing ASGI
+applications without having to spin up an ASGI server.")
+ (license license:expat)))
+
(define-public python-css-html-js-minify
(package
(name "python-css-html-js-minify")
--
2.39.2
^ permalink raw reply related [relevance 67%]
* [bug#62085] [PATCH] gnu: Add python-mohawk.
@ 2023-03-09 17:27 70% Adam Faiz via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Adam Faiz via Guix-patches via @ 2023-03-09 17:27 UTC (permalink / raw)
To: 62085
From 705c878397db8683c40ba8b9f37be525e8208d88 Mon Sep 17 00:00:00 2001
Message-Id: <705c878397db8683c40ba8b9f37be525e8208d88.1678382603.git.adam.faiz@disroot.org>
In-Reply-To: <f788ce8ebc205a6e05bcc270865d793d94bf51e9.1678382602.git.adam.faiz@disroot.org>
References: <f788ce8ebc205a6e05bcc270865d793d94bf51e9.1678382602.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Fri, 10 Mar 2023 00:35:43 +0800
Subject: [PATCH] gnu: Add python-mohawk.
* gnu/packages/python-web.scm (python-mohawk): New variable.
---
gnu/packages/python-web.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 8a73c929a1..b8354f9799 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1588,6 +1588,28 @@ (define-public python-minio
Amazon S3 compatible object storage server.")
(license license:asl2.0)))
+(define-public python-mohawk
+ (package
+ (name "python-mohawk")
+ (version "1.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "mohawk" version))
+ (sha256
+ (base32
+ "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"))))
+ (build-system python-build-system)
+ (native-inputs
+ (list python-mock
+ python-nose))
+ (propagated-inputs
+ (list python-six))
+ (home-page "https://github.com/kumar303/mohawk")
+ (synopsis "Library for Hawk HTTP authorization")
+ (description "Mohawk is an alternate Python implementation
+of the Hawk HTTP authorization scheme.")
+ (license license:bsd-3)))
+
(define-public python-pycurl
(package
(name "python-pycurl")
--
2.39.2
^ permalink raw reply related [relevance 70%]
* [bug#61657] [PATCH] gnu: python-paste: Update to 3.5.2.
@ 2023-02-20 16:13 68% Jake Leporte
0 siblings, 0 replies; 200+ results
From: Jake Leporte @ 2023-02-20 16:13 UTC (permalink / raw)
To: 61657; +Cc: Jake Leporte
* gnu/packages/python-web.scm (python-paste): Update to 3.5.2.
---
This patch also fixes the failing build for python-paste. I wasn't
able to determine why exactly the package won't build with
`python-build-system' vs. `pyproject-build-system', only that it
doesn't- it produces a traceback with a TypeError deep in the
setuptools code. Switching to pyproject fixed the issue.
gnu/packages/python-web.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 758cd91..b12f86b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4599,23 +4599,23 @@ (define-public python-wtforms
(define-public python-paste
(package
(name "python-paste")
- (version "3.0.6")
+ (version "3.5.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Paste" version))
(sha256
(base32
- "14lbi9asn5agsdf7r97prkjpz7amgmp529lbvfhf0nv881xczah6"))
+ "1xjakxrdvy4kgfy170gb9bl8zp9hqjjwh1h1vlik1pxw606399ym"))
(patches (search-patches "python-paste-remove-timing-test.patch"))
(modules '((guix build utils)))
(snippet
'(begin
;; This test calls out to the internet.
(delete-file "tests/test_proxy.py") #t))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(native-inputs
- (list python-pytest python-pytest-runner python-nose))
+ (list python-pytest python-nose))
(propagated-inputs
(list python-six))
(home-page "https://pythonpaste.readthedocs.io/")
base-commit: 6dce27abbba01cb4e249c9bdb3c132cecc0a5c51
prerequisite-patch-id: 55ebfdbee35b36ac06da23b716337ecfef350452
prerequisite-patch-id: cc81d1d3eb9c0687793c8baf949901cd49c42650
prerequisite-patch-id: 52c97b6e4d8d4b78217423a3f1323d95a609de8c
prerequisite-patch-id: 90b350ab4778843697da28bb10344a84ccacc70c
prerequisite-patch-id: 0d5a1f7cfe93822a3f3b11c19f4b2662a79cda17
prerequisite-patch-id: f6dd89498a48185e628f547b7f023a30547d8933
prerequisite-patch-id: 1a1a441a49fc8cad10ad161ab39b0fb73b19f42d
--
2.39.1
^ permalink raw reply related [relevance 68%]
* [bug#61543] [PATCH] gnu: python-asgiref: Update to 3.6.0.
@ 2023-02-15 23:22 70% Nicolas Graves via Guix-patches via
0 siblings, 0 replies; 200+ results
From: Nicolas Graves via Guix-patches via @ 2023-02-15 23:22 UTC (permalink / raw)
To: 61543; +Cc: ngraves
* gnu/packages/python-web.scm (python-asgiref): Update to 3.6.0.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 758cd9124c..b7e4f30135 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -546,12 +546,12 @@ (define-public python-aiostream
(define-public python-asgiref
(package
(name "python-asgiref")
- (version "3.4.1")
+ (version "3.6.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "asgiref" version))
(sha256
- (base32 "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf"))))
+ (base32 "01lmjidadid0czd32d2c21lb6q78ri0pr0i74a4qqg4dppkxyrwm"))))
(build-system python-build-system)
(arguments
'(#:phases
--
2.39.1
^ permalink raw reply related [relevance 70%]
* [bug#60238] [PATCH v2 6/7] gnu: Add python-cheroot.
@ 2023-02-02 16:58 70% ` dan
0 siblings, 0 replies; 200+ results
From: dan @ 2023-02-02 16:58 UTC (permalink / raw)
To: 60238
* gnu/packages/python-web.scm (python-cheroot): New variable.
---
gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e7134677a9..bcdf3658ee 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -58,6 +58,7 @@
;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2023 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -980,6 +981,34 @@ (define-public python-httplib2
other HTTP libraries.")
(license license:expat)))
+(define-public python-cheroot
+ (package
+ (name "python-cheroot")
+ (version "8.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "cheroot" version))
+ (sha256
+ (base32
+ "09cfy2iwqs1j8k0mailcdzzjw0lkg4lyc6rddi45b5dcgipdysin"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-importlib-metadata python-jaraco-functools
+ python-more-itertools))
+ (native-inputs (list python-pytest
+ python-requests
+ python-requests-unixsocket
+ python-requests-toolbelt
+ python-pypytools
+ python-trustme
+ python-pyopenssl
+ python-jaraco-text
+ python-portend
+ python-setuptools-scm-git-archive))
+ (home-page "https://cheroot.cherrypy.dev")
+ (synopsis "Highly-optimized, pure-python HTTP server")
+ (description "Cheroot is a high-performance, pure-Python HTTP server.")
+ (license license:bsd-3)))
+
(define-public httpie
(package
(name "httpie")
--
2.39.1
^ permalink raw reply related [relevance 70%]
* [bug#61141] [PATCH] gnu: whoogle-search: Update to 0.8.1.
@ 2023-01-29 2:41 70% Spencer Skylar Chan
0 siblings, 0 replies; 200+ results
From: Spencer Skylar Chan @ 2023-01-29 2:41 UTC (permalink / raw)
To: 61141
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-whoogle-search-Update-to-0.8.1.patch --]
[-- Type: text/x-patch, Size: 1191 bytes --]
From d487a30be47ebb8e6d10e24e5deff82f4d2bde6c Mon Sep 17 00:00:00 2001
From: Skylar Chan <schan12@umd.edu>
Date: Sat, 28 Jan 2023 19:05:15 -0500
Subject: [PATCH] gnu: whoogle-search: Update to 0.8.1.
* gnu/packages/python-web.scm (whoogle-search): Update to 0.8.1.
---
gnu/packages/python-web.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index ac0fb6f8a7..58b3d6628e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4823,14 +4823,14 @@ (define-public python-google-api-client
(define-public whoogle-search
(package
(name "whoogle-search")
- (version "0.8.0")
+ (version "0.8.1")
(source (origin
(method url-fetch)
(uri (pypi-uri "whoogle-search" version))
(sha256
(base32
- "0h8cl9bkd3vx17kbvcnmc8cy6pc29lxr0drxm84kj37ka788cj2g"))))
- (build-system python-build-system)
+ "1kqkb23wb9a4a8zdky2066887vgv7ywhivhxi5nipkx07mf8v01k"))))
+ (build-system pyproject-build-system)
(arguments
(list
;; The tests need network access
--
2.39.1
^ permalink raw reply related [relevance 70%]
* bug#60239: [PATCH] gnu: Add python-pysimplesoap.
2022-12-21 14:48 70% [bug#60239] [PATCH] gnu: Add python-pysimplesoap Felix Lechner via Guix-patches via
@ 2023-01-26 10:06 70% ` Ludovic Courtès
0 siblings, 0 replies; 200+ results
From: Ludovic Courtès @ 2023-01-26 10:06 UTC (permalink / raw)
To: Felix Lechner; +Cc: 60239-done
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
Hi,
Felix Lechner <felix.lechner@lease-up.com> skribis:
> * gnu/packages/python-web.scm (python-pysimplesoap): New variable.
Applied with the cosmetic changes below.
Thanks,
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1194 bytes --]
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 5597862a5b..ac0fb6f8a7 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7999,12 +7999,13 @@ (define-public python-pysimplesoap
"1qb7dn8m1cjwzql7vqj9i1hsscb7nyhimmlp45jrpzxds38g9fxi"))))
(build-system python-build-system)
(arguments
- (list #:tests? #f)) ; tests fail due to attempted web access
+ (list #:tests? #f)) ;tests fail due to attempted web access
(home-page "https://github.com/pysimplesoap/pysimplesoap")
- (synopsis "Python simple and lightweight SOAP Library")
- (description "Python simple and lightweight SOAP library for client and
-server webservices interfaces, aimed to be as small and easy as possible,
-supporting most common functionality.")
+ (synopsis "Simple and lightweight SOAP library for Python")
+ (description
+ "This package provides a simple and lightweight Python SOAP library for
+client and server webservices interfaces, aimed to be as small and easy as
+possible, supporting most common functionality.")
(license license:lgpl3+)))
(define-public python-http-client
^ permalink raw reply related [relevance 70%]
* [bug#60991] [PATCH] gnu: python-scrapy: Update to 2.7.1.
@ 2023-01-21 15:39 70% Felix Gruber
0 siblings, 0 replies; 200+ results
From: Felix Gruber @ 2023-01-21 15:39 UTC (permalink / raw)
To: 60991; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-scrapy): Update to 2.7.1.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 7daa1b636c..6f00f9867a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7731,13 +7731,13 @@ (define-public python-parsel
(define-public python-scrapy
(package
(name "python-scrapy")
- (version "2.6.1")
+ (version "2.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Scrapy" version))
(sha256
- (base32 "09rqalbwcz9ix8h0992mzjs50sssxsmmh8w9abkrqchgknjmbzan"))))
+ (base32 "0kpi3hg2ycs6s8cg41r2zc1axd0rpnps8bnzg7wisjyjaf1l1yih"))))
(build-system python-build-system)
(arguments
`(#:phases
--
2.39.0
^ permalink raw reply related [relevance 70%]
* [bug#60838] [PATCH 7/8] gnu: Add python-asgi-csrf.
2023-01-15 21:53 67% ` [bug#60838] [PATCH 6/8] gnu: Add python-asgi-lifespan Felix Gruber
@ 2023-01-15 21:53 70% ` Felix Gruber
2 siblings, 0 replies; 200+ results
From: Felix Gruber @ 2023-01-15 21:53 UTC (permalink / raw)
To: 60838; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-asgi-csrf): New variable.
---
gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b6ea8f385d..ee6d8a9f59 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -570,6 +570,31 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgi-csrf
+ (package
+ (name "python-asgi-csrf")
+ (version "0.9")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgi-csrf" version))
+ (sha256
+ (base32
+ "06klgxfxzjfkyjky3rkvmf2r07r7r2my53qq7g9qy6mcmvfkp7bf"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-itsdangerous python-multipart))
+ (native-inputs (list python-asgi-lifespan
+ python-httpx
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-starlette))
+ (home-page "https://github.com/simonw/asgi-csrf")
+ (synopsis "ASGI middleware for protecting against CSRF attacks")
+ (description "This middleware implements the Double Submit Cookie
+pattern, where a cookie is set that is then compared to a csrftoken
+hidden form field or a x-csrftoken HTTP header.")
+ (license license:asl2.0)))
+
(define-public python-asgi-lifespan
(package
(name "python-asgi-lifespan")
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#60838] [PATCH 6/8] gnu: Add python-asgi-lifespan.
@ 2023-01-15 21:53 67% ` Felix Gruber
2023-01-15 21:53 70% ` [bug#60838] [PATCH 7/8] gnu: Add python-asgi-csrf Felix Gruber
2 siblings, 0 replies; 200+ results
From: Felix Gruber @ 2023-01-15 21:53 UTC (permalink / raw)
To: 60838; +Cc: Felix Gruber
* gnu/packages/python-web.scm (python-asgi-lifespan): New variable.
---
gnu/packages/python-web.scm | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 7daa1b636c..b6ea8f385d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -49,7 +49,7 @@
;;; Copyright © 2021 Alice Brenon <alice.brenon@ens-lyon.fr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-;;; Copyright © 2022 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2022, 2023 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
@@ -570,6 +570,29 @@ (define-public python-asgiref
WSGI. This package includes libraries for implementing ASGI servers.")
(license license:bsd-3)))
+(define-public python-asgi-lifespan
+ (package
+ (name "python-asgi-lifespan")
+ (version "1.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "asgi-lifespan" version))
+ (sha256
+ (base32
+ "0zyvx8i43s1m2akqn5njwdh2zi6n05ji7mlvqx5pdi3k43dffcws"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:tests? #f)) ; The pypi package does not contain the tests folder.
+ (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov))
+ (propagated-inputs (list python-sniffio))
+ (home-page "https://github.com/florimondmanca/asgi-lifespan")
+ (synopsis "Programmatic startup/shutdown of ASGI apps")
+ (description "Programmatically send startup/shutdown lifespan events
+into ASGI applications. When used in combination with an ASGI-capable
+HTTP client such as HTTPX, this allows mocking or testing ASGI
+applications without having to spin up an ASGI server.")
+ (license license:expat)))
+
(define-public python-css-html-js-minify
(package
(name "python-css-html-js-minify")
--
2.38.1
^ permalink raw reply related [relevance 67%]
* [bug#60493] [PATCH 3/3] gnu: Update python-tweepy to 4.12.1.
2023-01-02 12:52 70% ` [bug#60493] [PATCH 2/3] gnu: Update python-oauthlib to 3.2.2 Giacomo Leidi via Guix-patches via
@ 2023-01-02 12:52 69% ` Giacomo Leidi via Guix-patches via
1 sibling, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2023-01-02 12:52 UTC (permalink / raw)
To: 60493; +Cc: Giacomo Leidi
* gnu/packages/python-web.scm (python-tweepy): Update to 4.12.1.
---
gnu/packages/python-web.scm | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 2b8dbfca73..a5896a0f13 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -39,7 +39,7 @@
;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020 Konrad Hinsen <konrad.hinsen@fastmail.net>
-;;; Copyright © 2020, 2022 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2020, 2022, 2023 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
@@ -7573,7 +7573,7 @@ (define-public python-mwparserfromhell
(define-public python-tweepy
(package
(name "python-tweepy")
- (version "4.4.0")
+ (version "4.12.1")
(source
(origin
(method git-fetch)
@@ -7584,7 +7584,7 @@ (define-public python-tweepy
(file-name (git-file-name name version))
(sha256
(base32
- "0jl3j20iqvzqqw5q5ldval5wrc2pdx94zff3b6b87j51yjx3qjhr"))))
+ "0c2zypsfspbjd1f5rgn2jnj05qxsmxh9gb93ciqf65hmkalgc8cg"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -7594,7 +7594,11 @@ (define-public python-tweepy
(when tests?
(invoke "python" "-m" "unittest" "discover" "tests")))))))
(propagated-inputs
- (list python-aiohttp python-requests python-requests-oauthlib))
+ (list python-aiohttp
+ python-async-lru
+ python-requests
+ python-requests-oauthlib
+ python-oauthlib))
(native-inputs
(list python-vcrpy))
(home-page "https://www.tweepy.org/")
--
2.38.1
^ permalink raw reply related [relevance 69%]
* [bug#60493] [PATCH 2/3] gnu: Update python-oauthlib to 3.2.2.
@ 2023-01-02 12:52 70% ` Giacomo Leidi via Guix-patches via
2023-01-02 12:52 69% ` [bug#60493] [PATCH 3/3] gnu: Update python-tweepy to 4.12.1 Giacomo Leidi via Guix-patches via
1 sibling, 0 replies; 200+ results
From: Giacomo Leidi via Guix-patches via @ 2023-01-02 12:52 UTC (permalink / raw)
To: 60493; +Cc: Giacomo Leidi
* gnu/packages/python-web.scm (python-oauthlib): Update to 3.2.2.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 25136c8448..2b8dbfca73 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3217,13 +3217,13 @@ (define-public oauth2ms
(define-public python-oauthlib
(package
(name "python-oauthlib")
- (version "3.1.0")
+ (version "3.2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "oauthlib" version))
(sha256
(base32
- "12gqnabwck30gdlpwm6af3s28qm9p2yc7b1w8s4fk9ncbz1irr5y"))))
+ "066r7mimlpb5q1fr2f1z59l4jc89kv4h2kgkcifyqav6544w8ncq"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#60316] [PATCH] WIP: Add homeassistant.
@ 2022-12-27 22:06 64% ` phodina via Guix-patches via
0 siblings, 0 replies; 200+ results
From: phodina via Guix-patches via @ 2022-12-27 22:06 UTC (permalink / raw)
To: Raghav Gururajan; +Cc: 60316, Marius Bakke
[-- Attachment #1: Type: text/plain, Size: 1212 bytes --]
>> > I'd love to add Home assistant to Guix to liberate our homes :-D
>
>
> Woah! Thanks so much for working on this. I've been eyeing at
> homeassitant for a while. :D
>
> > However, it has one nasty problem. There's one Python module 'orjson' which depends on rust package [1]. Since it would mean to add a lot of Rust packages I'd like to ask for help if there isn't a better way to build the package 'orjson'?
>
>
> I'd like to help. Let's see if we can avoid that dependency. If we
> can't, I'll aid this work with packing the related rust packages.
Here are the additional Python packages from the orjson module repo from various requirements.txt.
Please consider them more WIP as they build and allow you to have a look around the 'python-orjson'.
I also have the Rust modules, but packaging them is quite tedious as it's almost 3k lines of code :-/
Any ideas here?
>
> > Just out of curiosity have you been able to package the Home assistant?
>
>
> Darn! I forgot that I created that post. I must've working on that and
> lost the work because of SSD failure happened midst 2021. :(
Home the 'smartmontools' might save you from similar thing in future :-)
----
Petr
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-gnu-Add-python-pytest-random-order.patch --]
[-- Type: text/x-patch; name=0005-gnu-Add-python-pytest-random-order.patch, Size: 1457 bytes --]
From 5e1fa4cdebd127d37a19cc1f01098cea7d3ae2d4 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 22:58:46 +0100
Subject: [PATCH 05/10] gnu: Add python-pytest-random-order.
* gnu/packages/python-xyz.scm (python-pytest-random-order): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 985d36ba49..d98a442fde 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12729,6 +12729,26 @@ (define-public python-pytest-black
Python code formatter \"black\".")
(license license:expat)))
+(define-public python-pytest-random-order
+ (package
+ (name "python-pytest-random-order")
+ (version "1.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest-random-order" version))
+ (sha256
+ (base32
+ "01annkcqxxi17ngafa8mrjxlvpbp6pmxpvf99jcaz9skjfxxxrnv"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-pytest))
+ (home-page "https://github.com/jbasko/pytest-random-order")
+ (synopsis
+ "Randomise the order in which pytest tests are run with some control over the randomness")
+ (description
+ "Randomise the order in which pytest tests are run with some control over the
+randomness")
+ (license license:expat)))
+
(define-public python-geojson
(package
(name "python-geojson")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0007-gnu-Add-python-types-python-dateutil.patch --]
[-- Type: text/x-patch; name=0007-gnu-Add-python-types-python-dateutil.patch, Size: 1338 bytes --]
From 81bc7b36643300b9a67ffae7a4cb5f11fb9d3032 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 23:00:04 +0100
Subject: [PATCH 07/10] gnu: Add python-types-python-dateutil.
* gnu/packages/python-xyz.scm (python-types-python-dateutil): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2e08e6cf2b..48044a3ef3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30569,6 +30569,23 @@ (define-public python-types-protobuf
collection.")
(license license:asl2.0)))
+(define-public python-types-python-dateutil
+ (package
+ (name "python-types-python-dateutil")
+ (version "2.8.19.5")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "types-python-dateutil" version))
+ (sha256
+ (base32
+ "17bsv3j5lmq60px9q8zhaj5f7pv81i6xfg8dlpcpczazf5gzr4db"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/python/typeshed")
+ (synopsis "Typing stubs for python-dateutil")
+ (description "This package provides collection of library stubs for Python,
+with static types for python-dateutil.")
+ (license license:asl2.0)))
+
(define-public python-types-pytz
(package
(name "python-types-pytz")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-python-pytest-benchmark-Update-to-4.0.0.patch --]
[-- Type: text/x-patch; name=0003-gnu-python-pytest-benchmark-Update-to-4.0.0.patch, Size: 1229 bytes --]
From 4eafcd5a1d5ddaff75636122a7885b33a77d8b94 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 22:56:43 +0100
Subject: [PATCH 03/10] gnu: python-pytest-benchmark: Update to 4.0.0.
* gnu/packages/python-check.scm (python-pytest-benchmark): Update to 4.0.0.
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 8ab3b5641e..d7d1ccbaaf 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -1315,14 +1315,13 @@ (define-public python-pytest-pycodestyle
(define-public python-pytest-benchmark
(package
(name "python-pytest-benchmark")
- (version "3.4.1")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "pytest-benchmark" version))
- (sha256
- (base32
- "0ivvrnhax2xr62grlgw4hlyjmmjp6nc35431j7c82nny2bwn7qj0"))))
+ (version "4.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "pytest-benchmark" version))
+ (sha256
+ (base32
+ "1la802m5r49y1zqilmhqh0qvbnz139lw0qb3jmm9lngy7sw8a1zv"))))
(build-system python-build-system)
(arguments
'(#:test-target "check"))
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0006-gnu-Add-python-memory-profiler.patch --]
[-- Type: text/x-patch; name=0006-gnu-Add-python-memory-profiler.patch, Size: 1380 bytes --]
From 9fe93b8afdcf3149d19c05bf9077d5c38b4350b7 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 22:59:28 +0100
Subject: [PATCH 06/10] gnu: Add python-memory-profiler.
* gnu/packages/python-xyz.scm (python-memory-profiler): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d98a442fde..2e08e6cf2b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17613,6 +17613,25 @@ (define-public python-memcached
more, possibly remote, memcached servers.")
(license license:psfl)))
+(define-public python-memory-profiler
+ (package
+ (name "python-memory-profiler")
+ (version "0.61.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "memory_profiler" version))
+ (sha256
+ (base32
+ "1c3743d7dnnsv6caca38s0sgk3p7lf13x83nzf9147aahvbp6nsf"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-psutil))
+ (home-page "https://github.com/pythonprofilers/memory_profiler")
+ (synopsis "Monitor memory usage of a python program")
+ (description
+ "This package provides a module for monitoring memory usage of a python
+program")
+ (license license:bsd-3)))
+
(define-public python-mergedeep
(package
(name "python-mergedeep")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0001-gnu-system-settings-Add-phase-wrap-executable-and-ad.patch --]
[-- Type: text/x-patch; name=0001-gnu-system-settings-Add-phase-wrap-executable-and-ad.patch, Size: 3419 bytes --]
From 063ea2790d55780943a0bd07be64421106b22d4d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Mon, 26 Dec 2022 10:50:19 +0100
Subject: [PATCH] gnu: system-settings: Add phase 'wrap-executable and
additional inputs.
* gnu/packages/kde-plasma.scm (system-settings)[inputs]: Add qtquickcontrols-5.
[arguments]: Add phase 'wrap-executable.
[inputs]: Add kcoreaddons, kdeclarative, knewstuff, kuserfeedback,
qtgraphicaleffects and qtquickcontrols2-5.
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 89405bacaa..157ac3e1dd 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -2495,9 +2495,34 @@ (define-public system-settings
(base32
"0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl"))))
(build-system qt-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-executable
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((out #$output)
+ (qml "/lib/qt5/qml"))
+ (wrap-program (string-append out
+ "/bin/systemsettings5")
+ `("QML2_IMPORT_PATH" ":" prefix
+ (,(string-append out qml)
+ ,@(map (lambda (i)
+ (string-append
+ (assoc-ref inputs i) qml))
+ '("kirigami"
+ "kcoreaddons"
+ "kdeclarative"
+ "knewstuff"
+ "kuserfeedback"
+ "plasma-workspace"
+ "qtdeclarative"
+ "qtgraphicaleffects"
+ "qtquickcontrols"
+ "qtquickcontrols2")))))))))))
(native-inputs (list extra-cmake-modules))
(inputs (list kauth
kcrash
+ kcoreaddons
+ kdeclarative
kitemviews
kitemmodels
kcmutils
@@ -2511,14 +2536,19 @@ (define-public system-settings
kdbusaddons
kconfig
kpackage
+ knewstuff
kactivities
kactivities-stats
kguiaddons
kirigami
knotifications
krunner
+ kuserfeedback
plasma-workspace
- qtdeclarative-5))
+ qtdeclarative-5
+ qtgraphicaleffects
+ qtquickcontrols-5
+ qtquickcontrols2-5))
(synopsis "Control center to configure Plasma Desktop")
(description "This package provides configuration UI for Plasma Desktop.")
(home-page "https://invent.kde.org/plasma/systemsettings")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0002-gnu-Add-python-benchmark.patch --]
[-- Type: text/x-patch; name=0002-gnu-Add-python-benchmark.patch, Size: 1233 bytes --]
From 8212bbc5ecf66f73ecc95d477be4d12079cd6c4a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 22:55:54 +0100
Subject: [PATCH 02/10] gnu: Add python-benchmark.
* gnu/packages/python-check.scm (python-benchmark): New variable.
diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm
index 486abf1c13..8ab3b5641e 100644
--- a/gnu/packages/python-check.scm
+++ b/gnu/packages/python-check.scm
@@ -109,6 +109,22 @@ (define-public python-beartype
written in pure Python.")
(license license:expat)))
+(define-public python-benchmark
+ (package
+ (name "python-benchmark")
+ (version "0.1.5")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "benchmark" version))
+ (sha256
+ (base32
+ "08vwzlr5n2r0sf0niv1hvdk3n2wy93x2cs2yw7c2w7c3cmbb51qg"))))
+ (build-system python-build-system)
+ (home-page "http://jspi.es/benchmark")
+ (synopsis "Python benchmarker / benchmarking framework")
+ (description "Python benchmarker / benchmarking framework")
+ (license license:asl2.0)))
+
(define-public python-pytest-click
(package
(name "python-pytest-click")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0004-gnu-Add-python-statistics.patch --]
[-- Type: text/x-patch; name=0004-gnu-Add-python-statistics.patch, Size: 1299 bytes --]
From b12d61ec74fc8fe8e4782cb932b9393b99f26811 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 22:58:17 +0100
Subject: [PATCH 04/10] gnu: Add python-statistics.
* gnu/packages/python-xyz.scm (python-statistics): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 13b9129a3d..985d36ba49 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9543,6 +9543,25 @@ (define-public python-stack-data
than the default.")
(license license:expat)))
+(define-public python-statistics
+ (package
+ (name "python-statistics")
+ (version "1.0.3.5")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "statistics" version))
+ (sha256
+ (base32
+ "0f61hrj25p60kvf09nqysd6xlccm5dmx1jl8akfjvgq71fw7khrd"))))
+ (build-system python-build-system)
+ (arguments (list #:tests? #f))
+ (propagated-inputs (list python-docutils))
+ (home-page "UNKNOWN")
+ (synopsis "A Python 2.* port of 3.4 Statistics Module")
+ (description
+ "This package provides a Python 2.* port of 3.4 Statistics Module")
+ (license #f)))
+
(define-public python-ipython
(package
(name "python-ipython")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #9: 0009-gnu-Add-python-gunicorn.patch --]
[-- Type: text/x-patch; name=0009-gnu-Add-python-gunicorn.patch, Size: 1424 bytes --]
From 91ed56a730c40ea0d52e53e3bbbd42b24859efc5 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 23:01:03 +0100
Subject: [PATCH 09/10] gnu: Add python-gunicorn.
* gnu/packages/python-xyz.scm (python-gunicorn): New variable.
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 922be35c68..01cab6712b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3612,6 +3612,25 @@ (define-public python-grequests
@code{Requests} with @code{Gevent} to make asynchronous HTTP Requests easily")
(license license:bsd-2)))
+(define-public python-gunicorn
+ (package
+ (name "python-gunicorn")
+ (version "20.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "gunicorn" version))
+ (sha256
+ (base32
+ "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0"))))
+ (build-system python-build-system)
+ (arguments (list #:tests? #f)) ;; 1 failing test out of 223
+ (native-inputs (list python-pytest-cov python-aiohttp python-eventlet python-gevent))
+ (propagated-inputs (list python-setuptools))
+ (home-page "https://gunicorn.org")
+ (synopsis "WSGI HTTP Server for UNIX")
+ (description "WSGI HTTP Server for UNIX")
+ (license license:expat)))
+
(define-public python-dpkt
(package
(name "python-dpkt")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #10: 0010-gnu-Add-python-orjson.patch --]
[-- Type: text/x-patch; name=0010-gnu-Add-python-orjson.patch, Size: 5249 bytes --]
From eab6c1e8db569369c69f58af5906251dfde24245 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 23:01:30 +0100
Subject: [PATCH 10/10] gnu: Add python-orjson.
* gnu/packages/python-xyz.scm (python-orjson): New vairable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 91af772a4f..dd9fc64f3f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30047,6 +30047,113 @@ (define-public python-orgparse
"This package is a Python module for reading Emacs Org mode files.")
(license license:bsd-3)))
+(define-public python-orjson
+ (package
+ (name "python-orjson")
+ (version "3.8.3")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "orjson" version))
+ (sha256
+ (base32
+ "0y3ig7067n13m25hmh365nlbiaxipwf8c8hly8a8c5l9a95578gd"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ ; #:imported-modules (append %cargo-build-system-modules
+ ; %pyproject-build-system-modules)
+ ; #:modules `(((guix build cargo-build-system) #:prefix cargo:)
+ ; ,@%pyproject-build-system-modules
+ ; (srfi srfi-1)
+ ; (ice-9 match))
+ #:phases
+ #~(modify-phases (@ (guix build pyproject-build-system) %standard-phases)
+; (add-after 'unpack 'adjust-pyo3-requirement
+; (lambda _
+; ;; The package depends on 0.15.2, which is not on crates.io(!?).
+; ;; Downgrade to 0.15.1...
+; (substitute* "src/rust/Cargo.toml"
+; (("pyo3 = \\{ version = \"0\\.15\\.2\"")
+; "pyo3 = { version = \"0.15.1\""))))
+; (add-before 'build 'configure-cargo
+; (lambda* (#:key inputs #:allow-other-keys)
+; ;; Hide irrelevant inputs from cargo-build-system so it does
+; ;; not try to unpack sanity-check.py, etc.
+; (let ((cargo-inputs (filter (match-lambda
+; ((name . path)
+; (or (string-prefix? "rust-" name)
+; (string=? "gcc" name))))
+; inputs)))
+; (with-directory-excursion "src"
+; ((assoc-ref cargo:%standard-phases 'unpack-rust-crates)
+; #:inputs cargo-inputs
+; #:vendor-dir "guix-vendor")
+; ((assoc-ref cargo:%standard-phases 'configure)
+; #:inputs cargo-inputs)
+; ((assoc-ref cargo:%standard-phases 'patch-cargo-checksums)
+; #:vendor-dir "guix-vendor"))
+; (rename-file "src/.cargo" ".cargo"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vv" "tests")))))))
+ (home-page "https://github.com/ijl/orjson")
+; (native-inputs (list rust-cc-1
+; rust-pyo3-build-config-0.17
+; rust-version-check-0.9))
+; rust-maturin-0.14))
+ (inputs (list python-autoflake
+ python-black
+ python-isort
+ ;maturin
+ python-mypy
+ python-types-python-dateutil
+ python-types-pytz
+ python-types-simplejson
+ python-types-ujson
+ python-memory-profiler
+ python-pytest-benchmark
+ python-pytest-random-order
+ python-rapidjson
+ python-simplejson
+ python-tabulate
+ python-ujson
+ python-flask
+ python-gunicorn
+ python-httpx
+ python-psutil
+ python-pendulum
+ python-numpy
+ python-arrow
+ python-pytest
+ python-pytz
+ python-typing-extensions
+ python-xxhash
+ ; rust-maturin-0.14
+ ; rust-ahash-0.8
+ ; rust-arrayvec-0.7
+ ; rust-associative-cache-1
+ ; rust-beef-0.5
+ ; rust-bytecount-0.6
+ ; rust-chrono-0.4
+ ; rust-compact-str-0.6
+ ; rust-encoding-rs-0.8
+ ; rust-itoa-1
+ ; rust-once-cell-1
+ ; rust-pyo3-ffi-0.17
+ ; rust-ryu-1
+ ; rust-serde-1
+ ; rust-serde-json-1
+ ; rust-simdutf8-0.1
+ ; rust-smallvec-1
+ ))
+ (synopsis
+ "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy")
+ (description
+ "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy")
+ ;; Dual-licensed
+ (license (list license:expat license:asl2.0))))
+
(define-public dynaconf
(package
(name "dynaconf")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #11: 0008-gnu-Add-python-types-simplejson.patch --]
[-- Type: text/x-patch; name=0008-gnu-Add-python-types-simplejson.patch, Size: 1230 bytes --]
From 1898eda096589690a29f77679ae313701ee6ea4a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Tue, 27 Dec 2022 23:00:34 +0100
Subject: [PATCH 08/10] gnu: Add python-types-simplejson.
* gnu/packages/python-xyz.scm (python-types-simplejson): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 48044a3ef3..91af772a4f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -30604,6 +30604,22 @@ (define-public python-types-pytz
collection.")
(license license:asl2.0)))
+(define-public python-types-simplejson
+ (package
+ (name "python-types-simplejson")
+ (version "3.18.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "types-simplejson" version))
+ (sha256
+ (base32
+ "0lizf6aiiphvd3l02gk6qm16i6p7a98rdgh3s786bg8a349xnyl5"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/python/typeshed")
+ (synopsis "Typing stubs for simplejson")
+ (description "Typing stubs for simplejson")
+ (license license:asl2.0)))
+
(define-public python-types-toml
(package
(name "python-types-toml")
--
2.38.1
^ permalink raw reply related [relevance 64%]
* [bug#60316] [PATCH] WIP: Add homeassistant.
@ 2022-12-25 17:24 73% phodina via Guix-patches via
0 siblings, 1 reply; 200+ results
From: phodina via Guix-patches via @ 2022-12-25 17:24 UTC (permalink / raw)
To: marius, rg, 60316
[-- Attachment #1.1: Type: text/plain, Size: 2494 bytes --]
Hi,
I'd love to add Home assistant to Guix to liberate our homes :-D
However, it has one nasty problem. There's one Python module 'orjson' which depends on rust package [1]. Since it would mean to add a lot of Rust packages I'd like to ask for help if there isn't a better way to build the package 'orjson'? [2]
FIY Marius I saw you patch set where you mentioned module 'orjson' as test dependency [3]
Just out of curiosity have you been able to package the Home assistant? [4]
$ /gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/bin/hass
Traceback (most recent call last):
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/bin/.hass-real", line 5, in <module>
sys.exit (mod.main ())
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/__main__.py", line 169, in main
args = get_arguments()
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/__main__.py", line 69, in get_arguments
from . import config as config_util
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/config.py", line 20, in <module>
from . import auth
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/auth/__init__.py", line 12, in <module>
from homeassistant import data_entry_flow
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/data_entry_flow.py", line 16, in <module>
from .core import HomeAssistant, callback
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/core.py", line 46, in <module>
from . import block_async_io, loader, util
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/loader.py", line 34, in <module>
from .helpers.json import JSON_DECODE_EXCEPTIONS, json_loads
File "/gnu/store/8dgdzxj7vvawbd77q405fbjm4rnjdxld-homeassistant-2022.12.8/lib/python3.9/site-packages/homeassistant/helpers/json.py", line 7, in <module>
import orjsonModuleNotFoundError: No module named 'orjson'
1 https://github.com/PyO3/maturin
2 https://github.com/ijl/orjson/blob/master/pyproject.toml3 https://issues.guix.gnu.org/58587
4 https://community.home-assistant.io/t/packaging-home-assistant-into-guix/264117
----
Petr
[-- Attachment #1.2: Type: text/html, Size: 3841 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-python-lru-dict.patch --]
[-- Type: text/x-patch; name=0002-gnu-Add-python-lru-dict.patch, Size: 1386 bytes --]
From ca6bdd2758e02c239e2c31a64997b8022f7c43bf Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 16:56:06 +0100
Subject: [PATCH 02/11] gnu: Add python-lru-dict.
* gnu/packages/python-xyz.scm (python-lru-dict): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3ea2763b49..b1b0bb46fb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5704,6 +5704,24 @@ (define-public python-feedgenerator
which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
(license license:bsd-3)))
+(define-public python-lru-dict
+ (package
+ (name "python-lru-dict")
+ (version "1.1.8")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "lru-dict" version))
+ (sha256
+ (base32
+ "059i1c6yw02dwfynl4602jwfhhfvhm2wzhfzafwwzrbk83pwi2w7"))))
+ (build-system python-build-system)
+ (native-inputs (list python-pytest))
+ (home-page "https://github.com/amitdev/lru-dict")
+ (synopsis "Fixed size dict like container")
+ (description "This package provides fixed size dict like container which
+evicts Least Recently Used (LRU) items once size limit is exceeded.")
+ (license license:expat)))
+
(define-public python-lsp-jsonrpc
(package
(name "python-lsp-jsonrpc")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0011-gnu-Add-homeassistant.patch --]
[-- Type: text/x-patch; name=0011-gnu-Add-homeassistant.patch, Size: 4065 bytes --]
From 65217ed1fb1d4cf3667a6ce1ca270504dc7fa585 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 17:04:43 +0100
Subject: [PATCH 11/11] ! gnu: Add homeassistant.
* gnu/packages/engineering.scm (homeassistant): New variable.
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index ee224ad173..ab225f398f 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -69,9 +69,11 @@ (define-module (gnu packages engineering)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system qt)
#:use-module (gnu packages)
#:use-module (gnu packages algebra)
+ #:use-module (gnu packages astronomy)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
@@ -130,6 +132,7 @@ (define-module (gnu packages engineering)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
@@ -146,6 +149,7 @@ (define-module (gnu packages engineering)
#:use-module (gnu packages tcl)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages text-editors)
+ #:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages tex)
#:use-module (gnu packages version-control)
@@ -1440,6 +1444,57 @@ (define-public harminv
determines the frequencies, decay constants, amplitudes, and phases of those sinusoids.")
(license license:gpl2+)))
+(define-public homeassistant
+ (package
+ (name "homeassistant")
+ (version "2022.12.8")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/home-assistant/core")
+ (commit version)))
+ (sha256
+ (base32
+ "0cjw73i2ix6zpy6bagwbasyfphllqsq8hmzxkldh75hbh78h1750"))))
+ (build-system pyproject-build-system)
+ ;; TODO: Remove once python-orjson is packaged
+ (arguments
+ (list #:tests? #f ;missing orjson
+ #:phases #~(modify-phases %standard-phases
+ (delete 'sanity-check))))
+ (native-inputs (list python-pytest-socket python-requests-mock python-pip))
+ (propagated-inputs (list python-aiohttp
+ python-astral
+ python-async-timeout
+ python-atomicwrites
+ python-attrs
+ python-awesomeversion
+ python-bcrypt
+ python-certifi
+ python-ciso8601
+ python-cryptography
+ python-home-assistant-bluetooth
+ python-httpx
+ python-ifaddr
+ python-jinja2
+ python-lru-dict
+ python-freezegun
+ ;; python-orjson
+ python-pyjwt
+ python-pyyaml
+ python-requests
+ python-slugify-4
+ python-typing-extensions
+ python-voluptuous
+ python-voluptuous-serialize
+ python-yarl))
+ (home-page "https://www.home-assistant.io/")
+ (synopsis "home automation platform")
+ (description
+ "This package provides home automation that puts local control
+and privacy first.")
+ (license license:asl2.0)))
+
(define-public guile-libctl
(package
(name "guile-libctl")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-Add-python-awesomeversion.patch --]
[-- Type: text/x-patch; name=0003-gnu-Add-python-awesomeversion.patch, Size: 1293 bytes --]
From 65e2961c4af21ffac88871ce1d9a4c0944ce7b18 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 16:56:44 +0100
Subject: [PATCH 03/11] gnu: Add python-awesomeversion.
* gnu/pacakges/python-xyz.scm (python-awesomeversion): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b1b0bb46fb..3baa1b0b01 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9464,6 +9464,23 @@ (define-public python-asttokens
for automated refactoring or highlighting.")
(license license:asl2.0)))
+(define-public python-awesomeversion
+ (package
+ (name "python-awesomeversion")
+ (version "22.9.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "awesomeversion" version))
+ (sha256
+ (base32
+ "0zkzl6kpl19rp98rszm63pqzb5imvc6iamp1ljr107p86g9r0h9g"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/ludeeus/awesomeversion")
+ (synopsis "Version parsing and comparison")
+ (description "This package provides semantic version parsing and
+comparison.")
+ (license license:expat)))
+
(define-public python-littleutils
(package
(name "python-littleutils")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0008-gnu-Add-python-yarl-Update-to-1.8.1.patch --]
[-- Type: text/x-patch; name=0008-gnu-Add-python-yarl-Update-to-1.8.1.patch, Size: 968 bytes --]
From 341ab116cd6a697583a4a47e391d771c81439a90 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 17:02:03 +0100
Subject: [PATCH 08/11] gnu: Add python-yarl: Update to 1.8.1.
* gnu/packages/python-web.scm (python-yarl): Update to 1.8.1.
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 15f22925f6..922be35c68 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4685,14 +4685,14 @@ (define-public python-pycares
(define-public python-yarl
(package
(name "python-yarl")
- (version "1.6.3")
+ (version "1.8.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "yarl" version))
(sha256
(base32
- "045z4ssg8g5h0qhz8hnx74hswgkndaldqq1xi5l1n5s0j996d44a"))
+ "1gxba93lyccxv0zkfy8kfrxananxyav75zq5avmn1q62p12pi25g"))
(modules '((guix build utils)))
(snippet
#~(begin
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0006-gnu-python-voluptuous-Update-to-0.13.1.patch --]
[-- Type: text/x-patch; name=0006-gnu-python-voluptuous-Update-to-0.13.1.patch, Size: 1019 bytes --]
From 9d91f8ecb760e115a77e6de2f552900aee4820ec Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 17:00:11 +0100
Subject: [PATCH 06/11] gnu: python-voluptuous: Update to 0.13.1.
* gnu/packages/python-xyz.scm (python-voluptuous): Update 0.13.1.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 5bf30c0184..be971d3bc1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27119,14 +27119,14 @@ (define-public python-osc
(define-public python-voluptuous
(package
(name "python-voluptuous")
- (version "0.11.7")
+ (version "0.13.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "voluptuous" version))
(sha256
(base32
- "0mplkcpb5d8wjf8vk195fys4y6a3wbibiyf708imw33lphfk9g1a"))))
+ "08wp91dn1ibsmjd0660hpldq5ii9xqmg9h6l2k5p6rqxc0h1rlz8"))))
(build-system python-build-system)
(native-inputs
(list python-nose))
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0005-gnu-python-typing-extensions-next-Update-to-4.4.0.patch --]
[-- Type: text/x-patch; name=0005-gnu-python-typing-extensions-next-Update-to-4.4.0.patch, Size: 1376 bytes --]
From 2dc08ab845aef62453e2a5afa0975e64ee8d8e87 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 16:58:53 +0100
Subject: [PATCH 05/11] gnu: python-typing-extensions-next: Update to 4.4.0.
* gnu/packages/python-xyz.scm (python-typing-extensions-next): Update to
4.4.0.
[arguments]: Remove phase 'enter-source-directory.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 32e37b4eed..5bf30c0184 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -22510,7 +22510,7 @@ (define-public python-typing-extensions-next
(package
(inherit python-typing-extensions)
(name "python-typing-extensions")
- (version "4.2.0")
+ (version "4.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -22519,7 +22519,11 @@ (define-public python-typing-extensions-next
(file-name (git-file-name name version))
(sha256
(base32
- "1bbry1rg7q5ppkgzdk4nwl7q1w8bbhajm4q68wb9dm6rf7hg1023"))))))
+ "1al7634rq9zqw1s7d1nbry0l23c05s0wrc8jihcxvy1bp55l648m"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-typing-extensions)
+ ((#:phases phases)
+ (delete 'enter-source-directory))))))
(define-public bpython
(package
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0004-gnu-Add-python-dbus-fast.patch --]
[-- Type: text/x-patch; name=0004-gnu-Add-python-dbus-fast.patch, Size: 1280 bytes --]
From fbf092a0023c1dd7b570d41e254420cb2e048d10 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 16:57:17 +0100
Subject: [PATCH 04/11] gnu: Add python-dbus-fast.
* gnu/packages/python-xyz.scm (python-dbus-fast): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3baa1b0b01..32e37b4eed 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9912,6 +9912,23 @@ (define-public python-dbus-next
mobile environments.")
(license license:expat)))
+(define-public python-dbus-fast
+ (package
+ (name "python-dbus-fast")
+ (version "1.83.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "dbus_fast" version))
+ (sha256
+ (base32
+ "0cwdxs3sj4czcjy1x1yjxwacacxjdfqc1jpc034crcrhbpp9n9ij"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-async-timeout))
+ (home-page "https://github.com/bluetooth-devices/dbus-fast")
+ (synopsis "Faster version of dbus-next")
+ (description "This package provides a faster version of dbus-next")
+ (license license:expat)))
+
(define-public python-notify2
(package
(name "python-notify2")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #9: 0001-gnu-Add-python-slugify-4.patch --]
[-- Type: text/x-patch; name=0001-gnu-Add-python-slugify-4.patch, Size: 1046 bytes --]
From 62dbbb1af6b2817d1c5c1fbbcec441a6376121ec Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 16:46:09 +0100
Subject: [PATCH 01/11] gnu: Add python-slugify-4.
* gnu/package/python-web.scm (python-slugify-4): New variable.
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 18c0b47b67..15f22925f6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5060,6 +5060,18 @@ (define-public python-slugify
library to create slugs from unicode strings while keeping it DRY.")
(license license:expat)))
+(define-public python-slugify-4
+ (package
+ (inherit python-slugify)
+ (name "python-slugify")
+ (version "4.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "python-slugify" version))
+ (sha256
+ (base32
+ "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9"))))))
+
(define-public python-branca
(package
(name "python-branca")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #10: 0009-gnu-Add-python-bleak.patch --]
[-- Type: text/x-patch; name=0009-gnu-Add-python-bleak.patch, Size: 1474 bytes --]
From 0c9a3d85178c14cfa1aa9e3c85ce1968bafb4829 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 17:02:48 +0100
Subject: [PATCH 09/11] gnu: Add python-bleak.
* gnu/packages/python-xyz.scm (python-bleak): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 655724d95a..bb734ee6ea 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -13789,6 +13789,28 @@ (define-public python-bleach
(description "Bleach is an easy whitelist-based HTML-sanitizing tool.")
(license license:asl2.0)))
+(define-public python-bleak
+ (package
+ (name "python-bleak")
+ (version "0.19.5")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "bleak" version))
+ (sha256
+ (base32
+ "126dwfd9w4aflwxz5lxw6h2q0miigd548df7668c2n1w8nb5m147"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:tests? #f))
+ (propagated-inputs (list python-async-timeout
+ python-dbus-fast
+ python-typing-extensions))
+ (home-page "https://github.com/hbldh/bleak")
+ (synopsis "Bluetooth Low Energy platform Agnostic Klient")
+ (description "This package provides GATT client software using
+asyncio.")
+ (license license:expat)))
+
(define-public python-entrypoints
(package
(name "python-entrypoints")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #11: 0007-gnu-Add-python-voluptuous-serialize.patch --]
[-- Type: text/x-patch; name=0007-gnu-Add-python-voluptuous-serialize.patch, Size: 1862 bytes --]
From bff394cbce48b9e59b72b5b4c2bfefd2ede2d595 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 17:01:13 +0100
Subject: [PATCH 07/11] gnu: Add python-voluptuous-serialize.
* gnu/packages/python-xyz.scm (python-voluptuous-serialize): New variable.
[native-inputs]: Use python-pytest instead of python-nose.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index be971d3bc1..655724d95a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -27129,7 +27129,7 @@ (define-public python-voluptuous
"08wp91dn1ibsmjd0660hpldq5ii9xqmg9h6l2k5p6rqxc0h1rlz8"))))
(build-system python-build-system)
(native-inputs
- (list python-nose))
+ (list python-pytest))
(home-page "https://github.com/alecthomas/voluptuous")
(synopsis "Python data validation library")
(description
@@ -27137,6 +27137,24 @@ (define-public python-voluptuous
intended for validating data coming into Python as JSON, YAML, etc.")
(license license:bsd-3)))
+(define-public python-voluptuous-serialize
+ (package
+ (name "python-voluptuous-serialize")
+ (version "2.5.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "voluptuous-serialize" version))
+ (sha256
+ (base32
+ "0ys43byjwhsmzjj9q2dgn8k94p3my2s7f1vf0q1swwprlkhg4nak"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-voluptuous))
+ (home-page "https://github.com/home-assistant-libs/voluptuous-serialize")
+ (synopsis "Convert voluptuous schemas to dictionaries")
+ (description "This package provides library for converting
+voluptuous schemas to dictionaries")
+ (license license:asl2.0)))
+
(define-public python-cmd2
(package
(name "python-cmd2")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #12: 0010-gnu-Add-python-home-assistant-bluetooth.patch --]
[-- Type: text/x-patch; name=0010-gnu-Add-python-home-assistant-bluetooth.patch, Size: 1447 bytes --]
From 8859d65e8236009ebe605ab8089958ae2c1ef35a Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sun, 25 Dec 2022 17:04:06 +0100
Subject: [PATCH 10/11] gnu: Add python-home-assistant-bluetooth.
* gnu/packages/python-xyz.scm (python-home-assistant-bluetooth): New
variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index bb734ee6ea..c4eb7aaba6 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8479,6 +8479,25 @@ (define-public python-gridmap
cluster without needing to write any wrapper code yourself.")
(license license:gpl3+)))
+(define-public python-home-assistant-bluetooth
+ (package
+ (name "python-home-assistant-bluetooth")
+ (version "1.9.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "home_assistant_bluetooth" version))
+ (sha256
+ (base32
+ "0jcb7l8pn30dsh3rhkcmd5h9b7r7igpqi4kk9wz0lzlqi0568a45"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-bleak))
+ (home-page
+ "https://github.com/home-assistant-libs/home-assistant-bluetooth")
+ (synopsis "Home Assistant Bluetooth Models and Helpers")
+ (description "This package provides helpers for accessing Home
+Assistant Bluetooth models.")
+ (license license:asl2.0)))
+
(define-public python-honcho
(package
(name "python-honcho")
--
2.38.1
^ permalink raw reply related [relevance 73%]
* [bug#60239] [PATCH] gnu: Add python-pysimplesoap.
@ 2022-12-21 14:48 70% Felix Lechner via Guix-patches via
2023-01-26 10:06 70% ` bug#60239: " Ludovic Courtès
0 siblings, 1 reply; 200+ results
From: Felix Lechner via Guix-patches via @ 2022-12-21 14:48 UTC (permalink / raw)
To: 60239; +Cc: Felix Lechner
* gnu/packages/python-web.scm (python-pysimplesoap): New variable.
---
gnu/packages/python-web.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 18c0b47b67..6daf82fea1 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7964,6 +7964,26 @@ (define-public python-zeep
@end itemize")
(license license:expat)))
+(define-public python-pysimplesoap
+ (package
+ (name "python-pysimplesoap")
+ (version "1.16.2")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "PySimpleSOAP" version))
+ (sha256
+ (base32
+ "1qb7dn8m1cjwzql7vqj9i1hsscb7nyhimmlp45jrpzxds38g9fxi"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:tests? #f)) ; tests fail due to attempted web access
+ (home-page "https://github.com/pysimplesoap/pysimplesoap")
+ (synopsis "Python simple and lightweight SOAP Library")
+ (description "Python simple and lightweight SOAP library for client and
+server webservices interfaces, aimed to be as small and easy as possible,
+supporting most common functionality.")
+ (license license:lgpl3+)))
+
(define-public python-http-client
(package
(name "python-http-client")
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#60238] [PATCH 6/7] gnu: Add python-cheroot.
@ 2022-12-21 13:14 70% ` dan
0 siblings, 0 replies; 200+ results
From: dan @ 2022-12-21 13:14 UTC (permalink / raw)
To: 60238
* gnu/packages/python-web.scm (python-cheroot): New variable.
---
gnu/packages/python-web.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 18c0b47b67..65b445688c 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -58,6 +58,7 @@
;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2022 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -979,6 +980,34 @@ (define-public python-httplib2
other HTTP libraries.")
(license license:expat)))
+(define-public python-cheroot
+ (package
+ (name "python-cheroot")
+ (version "8.6.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "cheroot" version))
+ (sha256
+ (base32
+ "09cfy2iwqs1j8k0mailcdzzjw0lkg4lyc6rddi45b5dcgipdysin"))))
+ (build-system python-build-system)
+ (propagated-inputs (list python-importlib-metadata python-jaraco-functools
+ python-more-itertools))
+ (native-inputs (list python-pytest
+ python-requests
+ python-requests-unixsocket
+ python-requests-toolbelt
+ python-pypytools
+ python-trustme
+ python-pyopenssl
+ python-jaraco-text
+ python-portend
+ python-setuptools-scm-git-archive))
+ (home-page "https://cheroot.cherrypy.dev")
+ (synopsis "Highly-optimized, pure-python HTTP server")
+ (description "Highly-optimized, pure-python HTTP server")
+ (license license:bsd-3)))
+
(define-public httpie
(package
(name "httpie")
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#60009] [PATCH 12/18] gnu: python-flask-restful: Update to 0.3.9.
@ 2022-12-12 14:27 65% ` Ricardo Wurmus
0 siblings, 0 replies; 200+ results
From: Ricardo Wurmus @ 2022-12-12 14:27 UTC (permalink / raw)
To: 60009; +Cc: Ricardo Wurmus
* gnu/packages/python-web.scm (python-flask-restful): Update to 0.3.9.
[source]: Remove patch.
[build-system]: Use pyproject-build-system.
[arguments]: Disable "test_redirect" test; remove 'fix-imports phase.
[native-inputs]: Replace python-nose with python-pytest.
* gnu/local.mk (dist_patch_DATA): Remove patch.
* gnu/packages/patches/python-flask-restful-werkzeug-compat.patch: Remove file.
---
gnu/local.mk | 1 -
...python-flask-restful-werkzeug-compat.patch | 36 -------------------
gnu/packages/python-web.scm | 31 +++++++---------
3 files changed, 12 insertions(+), 56 deletions(-)
delete mode 100644 gnu/packages/patches/python-flask-restful-werkzeug-compat.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 295be3c67c..60a422fd7e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1728,7 +1728,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-docopt-pytest6-compat.patch \
%D%/packages/patches/python-execnet-read-only-fix.patch \
%D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
- %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \
%D%/packages/patches/python-ipython-documentation-chars.patch \
%D%/packages/patches/python-ipython-documentation-repro.patch \
%D%/packages/patches/python-keras-integration-test.patch \
diff --git a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch
deleted file mode 100644
index 0e928ef455..0000000000
--- a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-We need one patch on top of 0.3.8 for compatibility with Werkzeug 1.0.
-
-Taken from upstream:
-https://github.com/flask-restful/flask-restful/commit/73376a488907af3042b52678ac4c23f8a8911e5b
-
-diff --git a/tests/test_api.py b/tests/test_api.py
-index f7f8e661..6795d362 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -445,7 +445,9 @@ def test_handle_non_api_error(self):
-
- resp = app.get("/foo")
- self.assertEquals(resp.status_code, 404)
-- self.assertEquals('text/html', resp.headers['Content-Type'])
-+ # in newer versions of werkzeug this is `text/html; charset=utf8`
-+ content_type, _, _ = resp.headers['Content-Type'].partition(';')
-+ self.assertEquals('text/html', content_type)
-
- def test_non_api_error_404_catchall(self):
- app = Flask(__name__)
-diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py
-index 2f1fbedf..9776f17c 100644
---- a/tests/test_reqparse.py
-+++ b/tests/test_reqparse.py
-@@ -2,9 +2,9 @@
- import unittest
- from mock import Mock, patch
- from flask import Flask
--from werkzeug import exceptions, MultiDict
-+from werkzeug import exceptions
- from werkzeug.wrappers import Request
--from werkzeug.datastructures import FileStorage
-+from werkzeug.datastructures import FileStorage, MultiDict
- from flask_restful.reqparse import Argument, RequestParser, Namespace
- import six
- import decimal
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 7543e05f47..18c0b47b67 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3924,35 +3924,28 @@ (define-public python-flask-jwt
(define-public python-flask-restful
(package
(name "python-flask-restful")
- (version "0.3.8")
+ (version "0.3.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Flask-RESTful" version))
- (patches (search-patches "python-flask-restful-werkzeug-compat.patch"))
(sha256
(base32
- "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay"))))
- (build-system python-build-system)
+ "0gm5dz088v3d2k1dkcp9b3nnqpkk0fp2jly870hijj2xhc5nbv6c"))))
+ (build-system pyproject-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-imports
- (lambda _
- (substitute* "flask_restful/__init__.py"
- (("flask\\.helpers") "flask.scaffold")))))))
+ ;; This test fails because '/' is not 'http://localhost/'.
+ (list #:test-flags '(list "-k" "not test_redirect")))
(propagated-inputs
- (list python-aniso8601 python-flask python-pytz))
+ (list python-aniso8601 python-flask python-pytz))
(native-inputs
- (list ;; Optional dependency of Flask. Tests need it.
- python-blinker python-mock ; For tests
- python-nose)) ;for tests
- (home-page
- "https://www.github.com/flask-restful/flask-restful/")
- (synopsis
- "Flask module for creating REST APIs")
+ (list python-blinker
+ python-mock
+ python-pytest))
+ (home-page "https://www.github.com/flask-restful/flask-restful/")
+ (synopsis "Flask module for creating REST APIs")
(description
- "This package contains a Flask module for creating REST APIs.")
+ "This package contains a Flask module for creating REST APIs.")
(license license:bsd-3)))
(define-public python-flask-basicauth
--
2.36.1
^ permalink raw reply related [relevance 65%]
* [bug#51314] Test patches on Prusa i3 MK3S
@ 2022-12-10 12:24 72% ` phodina via Guix-patches via
0 siblings, 0 replies; 200+ results
From: phodina via Guix-patches via @ 2022-12-10 12:24 UTC (permalink / raw)
To: 51314@debbugs.gnu.org, Maxime Devos
[-- Attachment #1.1: Type: text/plain, Size: 541 bytes --]
Hi,
I've also been working on getting the Octoprint printer support into Guix. Since you've already reviewed the patches I used yours.
I had to rebase them on the lastest core-updates (6454208222d6e7760daa964b590f35ea75ffe0e5).
Unfortunately, some issues arise - there are several packages that don't pass tests: python-pytest-localserver, disable python-django, python-tornado-6, python-sgmllib3k, python-feedparser.
I just disabled the tests since I wanted to know if Octoprint works. And it does as shown on the screenshot.
----
Petr
[-- Attachment #1.2: Type: text/html, Size: 733 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0014-gnu-Add-octoprint-firmwarecheck.patch --]
[-- Type: text/x-patch; name=0014-gnu-Add-octoprint-firmwarecheck.patch, Size: 2170 bytes --]
From c49216d36c105fac2b749d2152267d23245b301d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:26:52 +0100
Subject: [PATCH 14/19] gnu: Add octoprint-firmwarecheck.
* gnu/packages/printers.scm (octoprint-firmwarecheck): New variable.
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 10bd86c1af..1010b73356 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -27,7 +27,8 @@ (define-module (gnu packages printers)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages libusb)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages qt))
+ #:use-module (gnu packages qt)
+ #:use-module (gnu packages python-web))
;; This is a module for packages related to printer-like devices, but not
;; related to CUPS.
@@ -55,6 +56,33 @@ (define-public octoprint-pisupport
observed on your Pi or if your Pi is unsupported.")
(license license:agpl3)))
+(define-public octoprint-firmwarecheck
+ (package
+ (name "octoprint-firmwarecheck")
+ (version "2021.10.11")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "OctoPrint-FirmwareCheck" version))
+ (sha256
+ (base32 "17prs0rmzglw75gkf6j7qypxisjvcfk2mbsyfqrjdbwg99i62s2h"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'sanity-check)))) ; checks for Octoprint
+ (propagated-inputs
+ (list python-flask))
+ (home-page "https://github.com/OctoPrint/OctoPrint-FirmwareCheck")
+ (synopsis "Plugin to check for unsafe or broken printer firmwares")
+ (description "The Firmware Check plugin tries to identify printers
+or rather printer firmware with known safety issues, such as disabled
+thermal runaway protection, or other kinds of severe issues, like known
+communication crippling bugs, and displays a warning box to logged in users
+on identification of such a firmware.")
+ (license license:agpl3)))
+
(define-public robocut
(package
(name "robocut")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-disable-python-django.patch --]
[-- Type: text/x-patch; name=0002-disable-python-django.patch, Size: 777 bytes --]
From 514a2abac129f47c058cfc011b6f8d212b09b48b Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 23:13:09 +0100
Subject: [PATCH 02/19] ! disable python-django
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index 0684ccf36f..a94d9c876a 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -64,7 +64,8 @@ (define-public python-django-4.0
"0qblhh7s7fcznqr79919yp2d7wiz3ixv39navmifb677dg9mlvcw"))))
(build-system python-build-system)
(arguments
- '(#:phases
+ '(#:tests? #f ; failing test test_custom_fields
+ #:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
(lambda* (#:key inputs #:allow-other-keys)
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0001-python-pytest-localserver-disable-tests.patch --]
[-- Type: text/x-patch; name=0001-python-pytest-localserver-disable-tests.patch, Size: 1019 bytes --]
From 4996bf476d38505447fa068a9f0c77c197870489 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 23:12:55 +0100
Subject: [PATCH 01/19] ! python-pytest-localserver disable tests
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 794a3f4c22..918e35f1c8 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1901,11 +1901,12 @@ (define-public python-pytest-localserver
"1hpgpxrpfq5c731ndnsay2lc0y9nh2wy9fn1f83s3z8xkn82fm1s"))))
(build-system python-build-system)
(arguments
- '(#:phases
- (modify-phases %standard-phases
- (replace 'check
- (lambda _
- (invoke "py.test" "-v"))))))
+ '(#:tests? #f)) ; 5 failing tests
+; #:phases
+; (modify-phases %standard-phases
+; (replace 'check
+; (lambda _
+; (invoke "py.test" "-v"))))))
(native-inputs
(list python-pytest python-requests python-six))
(propagated-inputs
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0018-python-feedparser-failing-tests.patch --]
[-- Type: text/x-patch; name=0018-python-feedparser-failing-tests.patch, Size: 701 bytes --]
From 16e9db6dab6bfefb99700d4dd2c2e3013696ad33 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sat, 10 Dec 2022 10:00:31 +0100
Subject: [PATCH 18/19] ! python-feedparser failing tests
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 6a60e65650..50b07751a2 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4650,7 +4650,8 @@ (define-public python-feedparser
(propagated-inputs
(list python-sgmllib3k))
(arguments
- `(#:phases
+ `(#:tests? #f ; failing test
+ #:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0005-gnu-Remove-python-zipstream-new.patch --]
[-- Type: text/x-patch; name=0005-gnu-Remove-python-zipstream-new.patch, Size: 1998 bytes --]
From ea0d29561027c7be14843c7f626fc8b3bfa7381f Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 14:46:00 +0100
Subject: [PATCH 05/19] gnu: Remove python-zipstream-new.
This package was apparently abandoned by upstream (last commit in 2020) and
replaced by zipstream-ng, which will be added in the next commit.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b21029c7de..38f43ecb3a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10373,33 +10373,6 @@ (define-public python-sarge
command pipeline functionality.")
(license license:bsd-3)))
-(define-public python-zipstream-new
- (package
- (name "python-zipstream-new")
- (version "1.1.8")
- (source
- (origin
- (method git-fetch) ; no tests in PyPI release
- (uri (git-reference
- (url "https://github.com/arjan-s/python-zipstream")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "14vhgg8mcjqi8cpzrw8qzbij2fr2a63l2a8fhil21k2r8vzv92cv"))))
- (build-system python-build-system)
- (native-inputs
- (list python-nose))
- (home-page "https://github.com/arjan-s/python-zipstream")
- (synopsis "Zipfile generator that takes input files as well as streams")
- (description "@code{zipstream.py} is a zip archive generator based on
-@code{zipfile.py}. It was created to generate a zip file generator for
-streaming. This is beneficial for when you want to provide a downloadable
-archive of a large collection of regular files, which would be infeasible
-to generate the archive prior to downloading or of a very large file that
-you do not want to store entirely on disk or on memory.")
- ;; No copyright headers in the source. The LICENSE file indicates GPL3.
- (license license:gpl3)))
-
(define-public python-sentry-sdk
(package
(name "python-sentry-sdk")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0004-gnu-python-frozendict-Update-to-2.3.2.patch --]
[-- Type: text/x-patch; name=0004-gnu-python-frozendict-Update-to-2.3.2.patch, Size: 1080 bytes --]
From 71f33e724638fb3a2a38dedbde13f6995588fb2c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 14:45:25 +0100
Subject: [PATCH 04/19] gnu: python-frozendict: Update to 2.3.2.
* gnu/packages/python-xyz.scm (python-frozendict): Update to 2.3.2.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3332eec474..b21029c7de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25756,13 +25756,13 @@ (define-public python-freetype-py
(define-public python-frozendict
(package
(name "python-frozendict")
- (version "1.2")
+ (version "2.3.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "frozendict" version))
(sha256
- (base32 "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"))))
+ (base32 "03cxl3vdyn9yjwjh044bmz2zxgrsp90jz55l9mqbwgx1y114bb3z"))))
(build-system python-build-system)
(home-page "https://github.com/slezica/python-frozendict")
(synopsis "Simple immutable mapping for Python")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0011-gnu-Add-python-sarge-0.1.6.patch --]
[-- Type: text/x-patch; name=0011-gnu-Add-python-sarge-0.1.6.patch, Size: 977 bytes --]
From a8fc39306214944f0b7280b8883ac6095e85376e Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:23:30 +0100
Subject: [PATCH 11/19] gnu: Add python-sarge-0.1.6.
* gnu/packages/python-xyz.scm (python-sarge-0.1.6): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 42dc0dbd69..db378ad377 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10373,6 +10373,18 @@ (define-public python-sarge
command pipeline functionality.")
(license license:bsd-3)))
+(define-public python-sarge-0.1.6
+ (package
+ (inherit python-sarge)
+ (name "python-sarge")
+ (version "0.1.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "sarge" version))
+ (sha256
+ (base32 "0r9jnpdsjdr6h92blr5b2fdzvb1n8ypjwhk2xxmss42gwq2bk3zl"))))))
+
(define-public python-zipstream-ng
(package
(name "python-zipstream-ng")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #9: 0006-gnu-Add-python-zipstream-ng.patch --]
[-- Type: text/x-patch; name=0006-gnu-Add-python-zipstream-ng.patch, Size: 1700 bytes --]
From 897fad9d5f5bc64be4fd768d51c17a5ab2048efd Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 14:46:27 +0100
Subject: [PATCH 06/19] gnu: Add python-zipstream-ng.
* gnu/packages/python-xyz.scm (python-zipstream-ng): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 38f43ecb3a..afc9bdbeca 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10373,6 +10373,29 @@ (define-public python-sarge
command pipeline functionality.")
(license license:bsd-3)))
+(define-public python-zipstream-ng
+ (package
+ (name "python-zipstream-ng")
+ (version "1.3.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "zipstream-ng" version))
+ (sha256
+ (base32 "1xzxizz4icdky2mc2yi971h9whmgsdi0m4riqsc7sncbx6p97zk9"))))
+ (build-system python-build-system)
+ (native-inputs (list python-pytest python-pytest-cov))
+ (home-page "https://github.com/pR0Ps/zipstream-ng")
+ (synopsis "Streamable zip file generator")
+ (description "This package provides a streamable zip file generator. It
+can package and stream many files and folders on the fly without needing
+temporary files or excessive memory. It Includes the ability to calculate the
+total size of the stream before any data is actually added (provided no
+compression is used). This makes it ideal for use in web applications since
+the total size can be used to set the @code{Content-Length} header without
+having to generate the entire file first.")
+ (license license:lgpl3)))
+
(define-public python-sentry-sdk
(package
(name "python-sentry-sdk")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #10: 0008-gnu-Add-python-cachelib-0.2.patch --]
[-- Type: text/x-patch; name=0008-gnu-Add-python-cachelib-0.2.patch, Size: 1014 bytes --]
From 548acb2ecff66c758342d2505d05570ebf01a7f0 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 14:49:38 +0100
Subject: [PATCH 08/19] gnu: Add python-cachelib-0.2.
* gnu/packages/python-xyz.scm (python-cachelib-0.2): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e4054a426f..d25d5a6658 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12228,6 +12228,18 @@ (define-public python-cachelib
provides a collection of cache libraries in the same API interface.")
(license license:bsd-3)))
+(define-public python-cachelib-0.2
+ (package
+ (inherit python-cachelib)
+ (name "python-cachelib")
+ (version "0.2.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "cachelib" version))
+ (sha256
+ (base32 "1npaxmxxn60nmpy1f7q45kvvpydvf0nv3b0cinm4lm3bdgzgmdfw"))))))
+
(define-public python-pylru
(package
(name "python-pylru")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #11: 0017-python-sgmllib3k-failing-tests.patch --]
[-- Type: text/x-patch; name=0017-python-sgmllib3k-failing-tests.patch, Size: 815 bytes --]
From 6b6769f25ce6f4b04562aaa20fec7c9a3da8b1fc Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sat, 10 Dec 2022 10:00:04 +0100
Subject: [PATCH 17/19] ! python-sgmllib3k failing tests
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index db378ad377..430f5db39a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -28359,6 +28359,7 @@ (define-public python-sgmllib3k
(base32
"0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr"))))
(build-system python-build-system)
+ (arguments (list #:tests? #f)) ; failing test
(home-page "https://github.com/hsoft/sgmllib")
(synopsis "Python 3 port of sgmllib")
(description "This package provides an unmaintained port of sgmllib to
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #12: 0015-gnu-Add-octoprint-filecheck.patch --]
[-- Type: text/x-patch; name=0015-gnu-Add-octoprint-filecheck.patch, Size: 1573 bytes --]
From ade7a0efa2843298cbad42feb13a1298ea93df9c Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:27:18 +0100
Subject: [PATCH 15/19] gnu: Add octoprint-filecheck.
* gnu/packages/printers.scm (octoprint-filecheck): New variable.
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 1010b73356..2bbe45e066 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -83,6 +83,29 @@ (define-public octoprint-firmwarecheck
on identification of such a firmware.")
(license license:agpl3)))
+(define-public octoprint-filecheck
+ (package
+ (name "octoprint-filecheck")
+ (version "2021.2.23")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "OctoPrint-FileCheck" version))
+ (sha256
+ (base32 "0bgvv6hvxa9qv0fs5dfr9wlbbjawxik8f2cid3h3czdhdhw46aqv"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'sanity-check)))) ; checks for Octoprint
+ (home-page "https://github.com/OctoPrint/OctoPrint-FileCheck")
+ (synopsis "Plugin to check for common issues in uploaded files")
+ (description "The File Check plugin tries to detect common issues in
+uploaded files that are known to cause issues while printing and which in
+the past have caused support requests on OctoPrint's Community Forums.")
+ (license license:agpl3)))
+
(define-public robocut
(package
(name "robocut")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #13: 0019-gnu-Add-octoprint.patch --]
[-- Type: text/x-patch; name=0019-gnu-Add-octoprint.patch, Size: 3988 bytes --]
From 276c8cfd7513643160fae38962a6208c97ebc8e4 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:28:04 +0100
Subject: [PATCH 19/19] gnu: Add octoprint.
* gnu/packages/printers.scm (octoprint): New variable.
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index 2bbe45e066..e3550f115c 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -25,10 +25,15 @@ (define-module (gnu packages printers)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages check)
#:use-module (gnu packages libusb)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-check)
+ #:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
- #:use-module (gnu packages python-web))
+ #:use-module (gnu packages web))
;; This is a module for packages related to printer-like devices, but not
;; related to CUPS.
@@ -106,6 +111,87 @@ (define-public octoprint-filecheck
the past have caused support requests on OctoPrint's Community Forums.")
(license license:agpl3)))
+(define-public octoprint
+ (package
+ (name "octoprint")
+ (version "1.8.1")
+ (source
+ (origin
+ (method git-fetch) ; no tests in the PyPI tarball.
+ (uri (git-reference
+ (url "https://github.com/OctoPrint/OctoPrint")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0yqbq4gbnzgbipv35z5b1i1f8x20p0gdz37721f163iyipsxppj6"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Remove bundled font-awesome.
+ (delete-file-recursively "src/octoprint/static/vendor")))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'set-home
+ (lambda _
+ (setenv "HOME" (getcwd)))) ; some tests need a writable home
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "tests")))))))
+ (native-inputs
+ (list python-ddt python-mock python-pytest python-pytest-doctest-custom))
+ (inputs
+ (list octoprint-filecheck
+ octoprint-firmwarecheck
+ octoprint-pisupport
+ python-appdirs
+ python-blinker
+ python-cachelib-0.2
+ python-click
+ python-colorlog
+ python-emoji
+ python-feedparser
+ python-filetype
+ python-flask
+ python-flask-assets
+ python-flask-babel
+ python-flask-login-0.5
+ python-frozendict
+ python-future
+ python-immutabledict
+ python-itsdangerous
+ python-jinja2
+ python-markdown
+ python-markupsafe
+ python-netaddr
+ python-netifaces
+ python-pathvalidate
+ python-pkginfo
+ python-psutil
+ python-pylru
+ python-pyserial
+ python-pyyaml-5
+ python-regex
+ python-requests
+ python-sarge-0.1.6
+ python-semantic-version
+ python-sentry-sdk
+ python-tornado-6
+ python-unidecode
+ python-watchdog-1
+ python-websocket-client
+ python-werkzeug
+ python-wrapt-1.13
+ python-zeroconf-0.33
+ python-zipstream-ng))
+ (home-page "https://octoprint.org")
+ (synopsis "Web interface for 3D printers")
+ (description "OctoPrint provides a snappy web interface for controlling
+consumer 3D printers.")
+ (license license:agpl3)))
+
(define-public robocut
(package
(name "robocut")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #14: 0010-gnu-Add-python-watchdog-1.patch --]
[-- Type: text/x-patch; name=0010-gnu-Add-python-watchdog-1.patch, Size: 1047 bytes --]
From 99c44197f14754114c98ef96f129470540f2ab80 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:21:54 +0100
Subject: [PATCH 10/19] gnu: Add python-watchdog-1.
* gnu/packages/python-xyz.scm (python-watchdog-1): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ed9beb9c0d..42dc0dbd69 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25317,6 +25317,20 @@ (define-public python-watchdog
but portable.")
(license license:asl2.0)))
+(define-public python-watchdog-1
+ (package
+ (inherit python-watchdog)
+ (name "python-watchdog")
+ (version "1.0.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "watchdog" version))
+ (sha256
+ (base32 "10l9r2nnk7gfh5asn4crvpa9kz83ng0zn5pzww7jnff06lmbqv1p"))))
+ (native-inputs
+ (list python-argh python-pytest-cov python-pytest-timeout))))
+
(define-public python-watchgod
(package
(name "python-watchgod")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #15: 0016-python-tornado-6-disable-tests.patch --]
[-- Type: text/x-patch; name=0016-python-tornado-6-disable-tests.patch, Size: 764 bytes --]
From 85580f38d83bff3d2a1363df2b04c5de4e229584 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Sat, 10 Dec 2022 09:59:25 +0100
Subject: [PATCH 16/19] ! python-tornado-6 disable tests
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index cde9aa41ee..353b7d0816 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2084,7 +2084,8 @@ (define-public python-tornado-6
"14cpzdv6p6qvk6vn02krdh5rcfdi174ifdbr5s6lcnymgcfyiiik"))))
(build-system python-build-system)
(arguments
- '(#:phases
+ '(#:tests? #f ; failing tests
+ #:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #16: 0007-gnu-Add-python-zeroconf-0.33.patch --]
[-- Type: text/x-patch; name=0007-gnu-Add-python-zeroconf-0.33.patch, Size: 1156 bytes --]
From 2e71103321314968bfbef11c8515c69aebab0f71 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 14:49:02 +0100
Subject: [PATCH 07/19] gnu: Add python-zeroconf-0.33.
* gnu/packages/python-xyz.scm (python-zeroconf-0.33): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index afc9bdbeca..e4054a426f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -24168,6 +24168,21 @@ (define-public python-zeroconf
(Bonjour/Avahi compatible).")
(license license:lgpl2.1+)))
+(define-public python-zeroconf-0.33
+ (package
+ (inherit python-zeroconf)
+ (name "python-zeroconf")
+ (version "0.33.4")
+ (source
+ (origin
+ (method git-fetch) ; no tests in PyPI release
+ (uri (git-reference
+ (url "https://github.com/jstasiak/python-zeroconf")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "01bv6xrhf5i7gckg3q53i249zxmhkkr65yib6par8z5risihrpwm"))))))
+
(define-public python-bsddb3
(package
(name "python-bsddb3")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #17: 0003-gnu-python-sentry-sdk-Update-to-1.5.12.patch --]
[-- Type: text/x-patch; name=0003-gnu-python-sentry-sdk-Update-to-1.5.12.patch, Size: 3727 bytes --]
From fbf9311a5ad89d3a1a7d4f6201ab921fefb3a87f Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 14:43:53 +0100
Subject: [PATCH 03/19] gnu: python-sentry-sdk: Update to 1.5.12.
* gnu/packages/python-xyz.scm (python-sentry-sdk): Update to 1.5.12.
[arguments]<#:phases>: In the custom 'check phase, remove a redundant test and
skip a new failing test.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a6b1c7e27e..3332eec474 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10403,7 +10403,7 @@ (define-public python-zipstream-new
(define-public python-sentry-sdk
(package
(name "python-sentry-sdk")
- (version "1.5.1")
+ (version "1.5.12")
(source
(origin
(method git-fetch) ; no tests in PyPI release
@@ -10412,10 +10412,11 @@ (define-public python-sentry-sdk
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "128bm136l5zprr3sqqb8j3d6k5i1fhz853mzvh3w8g0w1dw763mx"))))
+ (base32 "1lbykggyvxlpg4jx2rbnfdad94w8f9c2damz2pw9w6nszdchbkgh"))))
(build-system python-build-system)
(arguments
- `(#:phases
+ `(#:tests? #f ; to many failing tests
+ #:phases
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
@@ -10436,12 +10437,44 @@ (define-public python-sentry-sdk
" and not test_handled_exception"
;; Tests below require network.
" and not test_crumb_capture"
- " and not test_crumb_capture"
" and not test_crumb_capture_hint"
" and not test_httplib_misuse"
+ ;; New failing tests
+ ;; Giving up and disabling tests!
+ " and not test_leaks"
+ " and not test_basic"
+ " and not test_keyboard_interrupt_is_captured"
+ " and not test_transaction_with_error"
+ " and not test_transaction_no_error"
+ " and not test_start_span_to_start_transaction"
+ " and not test_tracestate_computation"
+ " and not test_adds_tracestate_to_transaction_when_getting_trace_context"
+ " and not test_tracestate_is_immutable_once_set"
+ " and not test_to_traceparent"
+ " and not test_to_tracestate"
+ " and not test_sentrytrace_extraction"
+ " and not test_adds_tracestate_to_transaction_when_to_traceparent_called"
+ " and not test_doesnt_add_new_tracestate_to_transaction_when_none_given"
+ " and not test_tracestate_extraction"
+ " and not test_iter_headers"
+ " and not test_tracestate_reinflation"
+ " and not test_continue_from_headers"
+ " and not test_memory_usage"
+ " and not test_span_trimming"
+ " and not test_start_transaction"
+ " and not test_finds_transaction_on_scope"
+ " and not test_finds_orphan_span_on_scope"
+ " and not test_finds_non_orphan_span_on_scope"
+
+ " and not test_finds_transaction_when_descendent_span_is_on_scope"
+ " and not test_transaction_naming"
+ " and not test_start_span_after_finish"
+ " and not test_transactions_do_not_go_through_before_send"
;; Fails with IndexError.
" and not test_session_mode_defaults_to"
- "_request_mode_in_wsgi_handler"))))))))
+ "_request_mode_in_wsgi_handler"
+ " and not test_auto_session_tracking_with"
+ "_aggregates"))))))))
(native-inputs
(list python-django
python-executing
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #18: 0012-gnu-Add-python-flask-login-0.5.patch --]
[-- Type: text/x-patch; name=0012-gnu-Add-python-flask-login-0.5.patch, Size: 2659 bytes --]
From 5361a369ed1b9147f4d41b85672bd37c9a6a4071 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:24:21 +0100
Subject: [PATCH 12/19] gnu: Add python-flask-login-0.5.
* gnu/packages/python-web.scm (python-flask-login-0.5): New variable.
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4136645d8d..cde9aa41ee 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3936,6 +3936,46 @@ (define-public python-flask-login
users' sessions over extended periods of time.")
(license license:expat)))
+(define-public python-flask-login-0.5
+ (package
+ (inherit python-flask-login)
+ (name "python-flask-login")
+ (version "0.5.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/maxcountryman/flask-login")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11ac924w0y4m0kf3mxnxdlidy88jfa7njw5yyrq16dvnx4iwd8gg"))))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vv" "-c" "/dev/null" "-k"
+ ;; All the tests below fail with an AssertionError
+ ;; because of a missing address, e.g.:
+ ;; E - /login?next=%2Fsecret
+ ;; E + http://foo.com/login?next=%2Fsecret
+ (string-append
+ "not test_redirects_to_refresh_view"
+ " and not test_refresh_with_next_in_session"
+" and not test_hashable"
+ " and not test_set_login_view_without_blueprints"
+ " and not test_unauthorized_redirects_to_login_view"
+ " and not test_unauthorized_uses_blueprint_login_view"
+ " and not test_unauthorized_with_next_in_session"
+ " and not test_unauthorized_with_next_in_strong_session"
+ " and not test_unauthorized_ignores_host_from_x_forwarded_for_header"
+ " and not test_unauthorized_uses_host_from_config_when_available"
+ " and not test_unauthorized_uses_host_from_next_url"
+ " and not test_unauthorized_uses_host_from_x_forwarded_for_header"))))))))))
+
(define-public python-oauth2client
(package
(name "python-oauth2client")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #19: 0009-gnu-Add-python-wrapt-1.13.patch --]
[-- Type: text/x-patch; name=0009-gnu-Add-python-wrapt-1.13.patch, Size: 977 bytes --]
From bb1ab7b80ce44f8e4bcf976d2740df7909c92ba1 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:20:51 +0100
Subject: [PATCH 09/19] gnu: Add python-wrapt-1.13.
* gnu/packages/python-xyz.scm (python-wrapt-1.13): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d25d5a6658..ed9beb9c0d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11685,6 +11685,18 @@ (define-public python-wrapt
wrappers and decorator functions.")
(license license:bsd-2)))
+(define-public python-wrapt-1.13
+ (package
+ (inherit python-wrapt)
+ (name "python-wrapt")
+ (version "1.13.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "wrapt" version))
+ (sha256
+ (base32 "11f13zqgbql26g5bkfkqalckcdlz394g6dhx4y16cvk873a9rshz"))))))
+
(define-public python-commentjson
(package
(name "python-commentjson")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #20: 0013-gnu-Add-octoprint-pisupport.patch --]
[-- Type: text/x-patch; name=0013-gnu-Add-octoprint-pisupport.patch, Size: 2257 bytes --]
From 2c2165cfb53025e1eee1e949b9a27dd1888ab3f8 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 9 Dec 2022 18:25:59 +0100
Subject: [PATCH 13/19] gnu: Add octoprint-pisupport.
* gnu/packages/printers.scm (octoprint-pisupport): New variable.
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index e7761070e0..10bd86c1af 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2022 Vinicius Monego <monego@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,8 +20,10 @@
(define-module (gnu packages printers)
#:use-module (guix packages)
+ #:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages libusb)
#:use-module (gnu packages pkg-config)
@@ -29,6 +32,29 @@ (define-module (gnu packages printers)
;; This is a module for packages related to printer-like devices, but not
;; related to CUPS.
+(define-public octoprint-pisupport
+ (package
+ (name "octoprint-pisupport")
+ (version "2022.3.28")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "OctoPrint-PiSupport" version))
+ (sha256
+ (base32 "11yzcyyia9dyiw428kjwysybxxh93dbc0sl7p59kda84iqwj1m5z"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'sanity-check)))) ; checks for Octoprint
+ (home-page "https://github.com/OctoPrint/OctoPrint-PiSupport")
+ (synopsis "Plugin to provide additional information about your Pi")
+ (description "The Pi Support plugin provides additional information about
+your Pi in the UI and also alerts you about undervoltage or overheating issues
+observed on your Pi or if your Pi is unsupported.")
+ (license license:agpl3)))
+
(define-public robocut
(package
(name "robocut")
--
2.38.1
[-- Attachment #21: octoprint.png --]
[-- Type: image/png, Size: 800540 bytes --]
^ permalink raw reply related [relevance 72%]
* [bug#59791] Add mitmproxy
@ 2022-12-03 4:18 66% phodina via Guix-patches via
0 siblings, 0 replies; 200+ results
From: phodina via Guix-patches via @ 2022-12-03 4:18 UTC (permalink / raw)
To: 59791
[-- Attachment #1.1: Type: text/plain, Size: 66 bytes --]
Hello,
this patch series adds man-in-the-middle proxy.
----
Petr
[-- Attachment #1.2: Type: text/html, Size: 232 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-Add-python-kaitaistruct.patch --]
[-- Type: text/x-patch; name=0003-gnu-Add-python-kaitaistruct.patch, Size: 1345 bytes --]
From 2b58b0d6d14893c7ecd9e80d94dd5a80d67e438d Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 22:29:22 +0100
Subject: [PATCH 3/7] gnu: Add python-kaitaistruct.
* gnu/pacakges/python-xyz.scm (python-kaitaistruct): New variable.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 17fbd9de9e..f19a89cf47 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -17112,6 +17112,26 @@ (define-public python-tabulate
data in Python.")
(license license:expat)))
+(define-public python-kaitaistruct
+ (package
+ (name "python-kaitaistruct")
+ (version "0.9")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "kaitaistruct" version))
+ (sha256
+ (base32
+ "1b97sfqqz34rq05mii29xr88h0qbayyi3k3r8d8db968gs0lan1x"))))
+ (build-system python-build-system)
+ (home-page "https://kaitai.io")
+ (synopsis
+ "Parsers for binary structure")
+ (description
+ "Kaitai Struct is a declarative language used to describe various
+binary data structures, laid out in files or in memory: i.e. binary file
+formats, network stream packet formats, etc.")
+ (license license:expat)))
+
(define-public python-kazoo
(package
(name "python-kazoo")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0006-gnu-python-ldap3-Update-to-2.8.patch --]
[-- Type: text/x-patch; name=0006-gnu-python-ldap3-Update-to-2.8.patch, Size: 1160 bytes --]
From ee0410728785aa21971a1224e7deaf7c33122bf0 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 22:30:16 +0100
Subject: [PATCH 6/7] gnu: python-ldap3: Update to 2.8.
* gnu/packages/python-xyz.scm (python-ldap3): Update to 2.8.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 41fecbf477..2e2e749225 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -26515,7 +26515,7 @@ (define-public python-pymacaroons
(define-public python-ldap3
(package
(name "python-ldap3")
- (version "2.7")
+ (version "2.8")
(home-page "https://github.com/cannatag/ldap3")
(source
(origin
@@ -26524,7 +26524,7 @@ (define-public python-ldap3
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0xw9fkqld21xsvdpaqir8ccc2l805xnn9gxahsnl70xzp3mwl0xv"))))
+ (base32 "12yyrz1hr7j14i65hrzbppmcfcwjvwnnjcpwh3ylqsqdsxd13d8g"))))
(build-system python-build-system)
(arguments
'(#:tests? #f ;TODO: Tests need a real LDAP server to run
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0007-gnu-Add-mitmproxy.patch --]
[-- Type: text/x-patch; name=0007-gnu-Add-mitmproxy.patch, Size: 3221 bytes --]
From a6bbd8712c70e132ddefaf2da34ce1ec959146ea Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 21:45:34 +0100
Subject: [PATCH 7/7] gnu: Add mitmproxy.
* gnu/packages/networking.scm (mitmproxy): New variable.
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index f5276e330e..b3705df538 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -142,7 +142,9 @@ (define-module (gnu packages networking)
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
+ #:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
@@ -161,6 +163,7 @@ (define-module (gnu packages networking)
#:use-module (gnu packages valgrind)
#:use-module (gnu packages web)
#:use-module (gnu packages wxwidgets)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xml)
#:use-module (ice-9 match))
@@ -1079,6 +1082,53 @@ (define-public miredo
residing in IPv4-only networks, even when they are behind a NAT device.")
(license license:gpl2+)))
+(define-public mitmproxy
+ (package
+ (name "mitmproxy")
+ (version "8.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/mitmproxy/mitmproxy/archive/refs/tags/v"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0al1d9x4b0lmrkxhcd6fkvki0k5rdsgvzg2xpcff8yf4mxlnm821"))))
+ (build-system python-build-system)
+ (native-inputs (list python-pytest))
+ (arguments
+ (list #:tests? #f)) ;Python error during test
+ (inputs (list python-publicsuffix2
+ python-wsproto-next
+ python-urwid
+ python-tornado-6
+ python-pyopenssl
+ python-protobuf
+ python-passlib
+ python-msgpack
+ python-ldap3
+ python-ruamel.yaml
+ python-pyperclip
+ python-pyopenssl
+ python-pyparsing
+ python-kaitaistruct
+ python-hyperframe
+ python-h2
+ python-flask
+ python-cryptography-next
+ python-brotli
+ python-blinker
+ python-typing-extensions-next
+ python-sortedcontainers
+ python-zstandard-0.15))
+ (home-page "https://mitmproxy.org/")
+ (synopsis "Interactive TLS-capable intercepting HTTP proxy")
+ (description "@code{mitmproxy} is your swiss-army knife for debugging,
+testing, privacy measurements, and penetration testing. It can be used to
+intercept, inspect, modify and replay web traffic such as HTTP/1, HTTP/2,
+WebSockets, or any other SSL/TLS-protected protocols.")
+ (license license:expat)))
+
(define-public ndisc6
(package
(name "ndisc6")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #5: 0002-gnu-Add-python-wsproto-next.patch --]
[-- Type: text/x-patch; name=0002-gnu-Add-python-wsproto-next.patch, Size: 2518 bytes --]
From a7b1cd2f9a8c3d0c52aec4e579710863b0bfb329 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 22:28:57 +0100
Subject: [PATCH 2/7] gnu: Add python-wsproto-next.
* gnu/packages/python-web.scm (python-wsproton-next): New variable.
(python-wsproto): Inherit from above.
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4f3a587c6a..4c1b187509 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1993,8 +1993,33 @@ (define-public python-priority
set out in RFC 7540 Section 5.3 (Stream Priority).")
(license license:expat)))
+(define-public python-wsproto-next
+ (package
+ (name "python-wsproto")
+ (version "1.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "wsproto" version))
+ (sha256
+ (base32
+ "0f4cghvmjiljgw5jjnqvfn9r3gkbfhmk5xr0jw6sv5v98pw7d1w6"))))
+ (build-system python-build-system)
+ (arguments (list #:tests? #f)) ;; Python error during test
+ ;; https://github.com/python-hyper/wsproto/issues/179
+ (native-inputs (list python-pytest))
+ (propagated-inputs (list python-h11))
+ (home-page "https://github.com/python-hyper/wsproto/")
+ (synopsis "WebSockets state-machine based protocol implementation")
+ (description
+ "@code{wsproto} is a pure-Python implementation of a WebSocket protocol
+stack. It's written from the ground up to be embeddable in whatever program you
+choose to use, ensuring that you can communicate via WebSockets, as defined in
+RFC6455, regardless of your programming paradigm.")
+ (license license:expat)))
+
(define-public python-wsproto
(package
+ (inherit python-wsproto-next)
(name "python-wsproto")
(version "0.15.0")
(source
@@ -2014,15 +2039,7 @@ (define-public python-wsproto
(native-inputs
(list python-pytest))
(propagated-inputs
- (list python-h11))
- (home-page "https://github.com/python-hyper/wsproto/")
- (synopsis "WebSockets state-machine based protocol implementation")
- (description
- "@code{wsproto} is a pure-Python implementation of a WebSocket protocol
-stack. It's written from the ground up to be embeddable in whatever program you
-choose to use, ensuring that you can communicate via WebSockets, as defined in
-RFC6455, regardless of your programming paradigm.")
- (license license:expat)))
+ (list python-h11))))
(define-public hypercorn
(package
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #6: 0004-gnu-python-typing-extensions-Update-to-4.3.0.patch --]
[-- Type: text/x-patch; name=0004-gnu-python-typing-extensions-Update-to-4.3.0.patch, Size: 1648 bytes --]
From 68b1839b55d5dfe410424e86cb0d18aafd13bdec Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 23:02:13 +0100
Subject: [PATCH 4/7] gnu: python-typing-extensions: Update to 4.3.0.
* gnu/packages/python-xyz.scm (python-typing-extensions): Update to 4.3.0.
[arguments]: Remove enter-source-directory phase.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f19a89cf47..ffd3d16bb5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -22324,16 +22324,21 @@ (define-public python-typing-extensions-next
(package
(inherit python-typing-extensions)
(name "python-typing-extensions")
- (version "4.2.0")
+ (version "4.3.0")
(source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/python/typing")
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/python/typing_extensions/archive/refs/tags/"
+ version ".tar.gz"))
(sha256
(base32
- "1bbry1rg7q5ppkgzdk4nwl7q1w8bbhajm4q68wb9dm6rf7hg1023"))))))
+ "0c6f8xd5hi6c3yc2py5vncx5ki5101vnj9h744ys4f98xn595g4x"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments
+ python-typing-extensions)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'enter-source-directory)))))))
(define-public bpython
(package
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #7: 0001-gnu-Add-python-zstandard.patch --]
[-- Type: text/x-patch; name=0001-gnu-Add-python-zstandard.patch, Size: 996 bytes --]
From 9a6346fa737e156dd80612adaa83232d1ee9bf36 Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 22:28:10 +0100
Subject: [PATCH 1/7] gnu: Add python-zstandard.
* gnu/packages/python-compression.scm (python-zstandard): New variable.
diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index c483d68b5f..6f179afb3d 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -561,6 +561,19 @@ (define-public python-zstandard
provided.")
(license license:bsd-3)))
+(define-public python-zstandard-0.15
+ (package
+ (inherit python-zstandard)
+ (name "python-zstandard")
+ (version "0.15.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "zstandard" version))
+ (sha256
+ (base32
+ "1mv80ai0vjain1p542sx3v7gyqnpkrrzizd4dlj25cpxpjbmwf92"))))))
+
(define-public python-pyzstd
(package
(name "python-pyzstd")
--
2.38.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #8: 0005-gnu-python-sortedcontainers-Update-to-2.3.0.-Remove-.patch --]
[-- Type: text/x-patch; name=0005-gnu-python-sortedcontainers-Update-to-2.3.0.-Remove-.patch, Size: 1688 bytes --]
From e9dfd4a0e194dcf59bd5b387bb5d510b44583cdf Mon Sep 17 00:00:00 2001
From: Petr Hodina <phodina@protonmail.com>
Date: Fri, 2 Dec 2022 22:29:59 +0100
Subject: [PATCH 5/7] gnu: python-sortedcontainers: Update to 2.3.0. Remove
input labels.
* gnu/packages/python-xyz.scm (python-sortedcontainers): Update to 2.3.0.
Remove input labels.
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ffd3d16bb5..41fecbf477 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23737,24 +23737,24 @@ (define-public python-sortedcollections
(define-public python-sortedcontainers
(package
(name "python-sortedcontainers")
- (version "2.1.0")
+ (version "2.3.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "sortedcontainers" version))
(sha256
(base32
- "0fm0w5id2yhqld95hg2m636vjgkz377rvgdfqaxc25vbylr9lklp"))))
+ "188h9d3f9qc6ixk1lz6g1656aq59i5y5jxb7q5vxcq6ga1v97k2r"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests require many extra dependencies, and would introduce
;; a circular dependency on hypothesis, which uses this package.
'(#:tests? #f))
(propagated-inputs
- `(("python-appdirs" ,python-appdirs)
- ("python-distlib" ,python-distlib)
- ("python-filelock" ,python-filelock)
- ("python-six" ,python-six-bootstrap)))
+ (list python-appdirs
+ python-distlib
+ python-filelock
+ python-six-bootstrap))
(home-page "http://www.grantjenks.com/docs/sortedcontainers/")
(synopsis "Sorted List, Sorted Dict, Sorted Set")
(description
--
2.38.1
^ permalink raw reply related [relevance 66%]
* [bug#59764] [PATCH 3/8] gnu: Add python-ephemeral-port-reserve.
@ 2022-12-02 5:59 70% ` kiasoc5 via Guix-patches via
2022-12-02 5:59 70% ` [bug#59764] [PATCH 4/8] gnu: python-flask: Update to 2.2.2 kiasoc5 via Guix-patches via
2022-12-02 5:59 69% ` [bug#59764] [PATCH 5/8] gnu: python-werkzeug: " kiasoc5 via Guix-patches via
2 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2022-12-02 5:59 UTC (permalink / raw)
To: 59764; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-ephemeral-port-reserve): New variable.
---
gnu/packages/python-web.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 4f3a587c6a..944fb4c781 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -5577,6 +5577,26 @@ (define-public python-port-for
association.")
(license license:expat)))
+(define-public python-ephemeral-port-reserve
+ (package
+ (name "python-ephemeral-port-reserve")
+ (version "1.1.4")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "ephemeral_port_reserve" version))
+ (sha256
+ (base32
+ "1chl9hil7ggz6l4sfhmp0l2j55qcskbc3pj9360b0309jwndmxxq"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/Yelp/ephemeral-port-reserve/")
+ (synopsis
+ "Find an unused port, reliably.")
+ (description
+ "@code{ephemeral-port-reserve} provides a reliable and race-free
+implementation of the ``port 0 trick'': bind to an ephemeral port, force it into
+the TIME_WAIT state, and unbind it.")
+ (license license:expat)))
+
(define-public python-livereload
(package
(name "python-livereload")
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#59764] [PATCH 5/8] gnu: python-werkzeug: Update to 2.2.2.
2022-12-02 5:59 70% ` [bug#59764] [PATCH 3/8] gnu: Add python-ephemeral-port-reserve kiasoc5 via Guix-patches via
2022-12-02 5:59 70% ` [bug#59764] [PATCH 4/8] gnu: python-flask: Update to 2.2.2 kiasoc5 via Guix-patches via
@ 2022-12-02 5:59 69% ` kiasoc5 via Guix-patches via
2 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2022-12-02 5:59 UTC (permalink / raw)
To: 59764; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-werkzeug): Update to 2.2.2.
[arguments](phases): Ignore failing test.
[propagated-inputs]: Remove python-requests; add python-markupsafe.
[native-inputs]: Add python-requests, python-ephemeral-port-reserve, python-greenlet,
python-watchdog, and python-cryptography.
---
gnu/packages/python-web.scm | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9164c2e096..268bba7ec4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4393,14 +4393,14 @@ (define-public python-publicsuffix2
(define-public python-werkzeug
(package
(name "python-werkzeug")
- (version "2.0.2")
+ (version "2.2.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Werkzeug" version))
(sha256
(base32
- "16nvv9dh37ssf5pkny9yj2li0n6wyzsygh8a9i86r3gfipybcaxa"))))
+ "13qbw3wwyv180sq1mqsh1dfxgdfpmczdfpi17a5hyz6c4a1x98ky"))))
(build-system python-build-system)
(arguments
'(#:phases
@@ -4410,12 +4410,21 @@ (define-public python-werkzeug
(when tests?
(add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest"
+ ;; Test fails for some reason
+ "-k not test_exclude_patterns"
;; Test tries to use the network.
"-k not test_reloader_sys_path")))))))
(propagated-inputs
- (list python-requests))
+ (list python-markupsafe))
(native-inputs
- (list python-pytest python-pytest-timeout python-pytest-xprocess))
+ (list python-pytest
+ python-pytest-timeout
+ python-pytest-xprocess
+ python-requests
+ python-ephemeral-port-reserve
+ python-greenlet
+ python-watchdog
+ python-cryptography))
(home-page "https://palletsprojects.com/p/werkzeug/")
(synopsis "Utilities for WSGI applications")
(description "One of the most advanced WSGI utility modules. It includes a
--
2.38.1
^ permalink raw reply related [relevance 69%]
* [bug#59764] [PATCH 4/8] gnu: python-flask: Update to 2.2.2.
2022-12-02 5:59 70% ` [bug#59764] [PATCH 3/8] gnu: Add python-ephemeral-port-reserve kiasoc5 via Guix-patches via
@ 2022-12-02 5:59 70% ` kiasoc5 via Guix-patches via
2022-12-02 5:59 69% ` [bug#59764] [PATCH 5/8] gnu: python-werkzeug: " kiasoc5 via Guix-patches via
2 siblings, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2022-12-02 5:59 UTC (permalink / raw)
To: 59764; +Cc: kiasoc5
* gnu/packages/python-web.scm (python-flask): Update to 2.2.2.
---
gnu/packages/python-web.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 944fb4c781..9164c2e096 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3435,13 +3435,13 @@ (define-public python-webtest
(define-public python-flask
(package
(name "python-flask")
- (version "2.1.1")
+ (version "2.2.2")
(source (origin
(method url-fetch)
(uri (pypi-uri "Flask" version))
(sha256
(base32
- "1j0rjly2yhbm566lq2s8543fs7fz86f77abps539djcfalzbvjd8"))))
+ "0ayadjqn8lky9rmly7r33sm589fkysld56vjjqplibf4346lab34"))))
(build-system python-build-system)
(arguments
'(#:phases
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#59526] [PATCH] gnu: Add whoogle-search.
@ 2022-11-23 23:00 68% conses
0 siblings, 0 replies; 200+ results
From: conses @ 2022-11-23 23:00 UTC (permalink / raw)
To: 59526
* gnu/packages/python-web.scm (whoogle-search): New variable.
---
gnu/packages/python-web.scm | 56 +++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 905d79886f..0178c21ee8 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -4743,6 +4743,62 @@ (define-public python-google-api-client
(description "Python client library for Google's discovery based APIs")
(license license:asl2.0)))
+(define-public whoogle-search
+ (package
+ (name "whoogle-search")
+ (version "0.8.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "whoogle-search" version))
+ (sha256
+ (base32
+ "0h8cl9bkd3vx17kbvcnmc8cy6pc29lxr0drxm84kj37ka788cj2g"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:tests? #f)) ;needs network
+ (propagated-inputs (list python-attrs
+ python-beautifulsoup4
+ python-cachelib
+ python-certifi
+ python-cffi
+ python-brotli
+ python-chardet
+ python-click
+ python-cryptography
+ python-cssutils
+ python-defusedxml
+ python-flask
+ python-flask-session
+ python-idna
+ python-itsdangerous
+ python-jinja2
+ python-markupsafe
+ python-more-itertools
+ python-packaging
+ python-pluggy
+ python-py
+ python-pycodestyle
+ python-pycparser
+ python-pyopenssl
+ python-pyparsing
+ python-pysocks
+ python-dateutil
+ python-requests
+ python-soupsieve
+ python-stem
+ python-urllib3
+ python-waitress
+ python-wcwidth
+ python-werkzeug
+ python-dotenv))
+ (home-page "https://github.com/benbusby/whoogle-search")
+ (synopsis "Self-hosted, ad-free, privacy-respecting metasearch engine")
+ (description
+ "Get Google results, but without any ads, javascript, AMP links,
+cookies, or IP address tracking. Quick and simple to implement as a primary search
+engine replacement on both desktop and mobile.")
+ (license license:expat)))
+
(define-public python-hawkauthlib
(package
(name "python-hawkauthlib")
--
2.38.1
--
Best regards,
conses
^ permalink raw reply related [relevance 68%]
* [bug#59294] [PATCH 1/2] gnu: httpie: Update to 3.2.1.
@ 2022-11-16 2:00 70% ` kiasoc5 via Guix-patches via
2022-11-16 2:00 70% ` [bug#59294] [PATCH 2/2] gnu: httpie: Use G-expressions kiasoc5 via Guix-patches via
1 sibling, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2022-11-16 2:00 UTC (permalink / raw)
To: 59294; +Cc: kiasoc5
* gnu/packages/python-web.scm (httpie): Update to 3.2.1.
[propagated-inputs]: Add python-rich.
---
gnu/packages/python-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f6b4faf692..00a848610e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -953,14 +953,14 @@ (define-public python-httplib2
(define-public httpie
(package
(name "httpie")
- (version "3.1.0")
+ (version "3.2.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "httpie" version))
(sha256
(base32
- "1npyfvrq0l56bil8rnpj78mav378mxx4zcqzq1jjx4aap1020jif"))))
+ "1v736y2h7lcyrnxs9y5sf4xwzgll7pc2s6r3ny929mm8lcn07h69"))))
(build-system python-build-system)
(arguments
;; The tests attempt to access external web servers, so we cannot run them.
@@ -973,6 +973,7 @@ (define-public httpie
python-pysocks
python-charset-normalizer
python-defusedxml
+ python-rich
python-multidict))
(home-page "https://httpie.io")
(synopsis "cURL-like tool for humans")
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#59294] [PATCH 2/2] gnu: httpie: Use G-expressions.
2022-11-16 2:00 70% ` [bug#59294] [PATCH 1/2] gnu: httpie: Update " kiasoc5 via Guix-patches via
@ 2022-11-16 2:00 70% ` kiasoc5 via Guix-patches via
1 sibling, 0 replies; 200+ results
From: kiasoc5 via Guix-patches via @ 2022-11-16 2:00 UTC (permalink / raw)
To: 59294; +Cc: kiasoc5
* gnu/packages/python-web.scm (httpie)[arguments]: Use G-expressions.
---
gnu/packages/python-web.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 00a848610e..6d9ebd928e 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -964,7 +964,7 @@ (define-public httpie
(build-system python-build-system)
(arguments
;; The tests attempt to access external web servers, so we cannot run them.
- '(#:tests? #f))
+ (list #:tests? #f))
(propagated-inputs
(list python-colorama
python-pygments
--
2.38.1
^ permalink raw reply related [relevance 70%]
* [bug#59112] [PATCH] gnu: add python-enoslib
@ 2022-11-07 22:52 64% matthieu.simonin
0 siblings, 0 replies; 200+ results
From: matthieu.simonin @ 2022-11-07 22:52 UTC (permalink / raw)
To: 59112; +Cc: Matthieu Simonin
From: Matthieu Simonin <matthieu.simonin@inria.fr>
---
gnu/packages/python-web.scm | 58 +++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 905ed6a327..65e511b7e9 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -84,6 +84,7 @@
#:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (gnu packages)
+ #:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
@@ -7889,3 +7890,60 @@ list, create, update, or delete resources (e.g. Order, Product, Collection).")
You can use it as a library in your python project or you can explore the
Grid5000 resources interactively using the embedded shell.")
(license license:gpl3+)))
+
+(define-public python-enoslib
+ (package
+ (name "python-enoslib")
+ (version "v8.0.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.inria.fr/discovery/enoslib")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ "0vs6b0bnlv95mzv0rjbxqwrhzkgjkn91gqipgwdf7y4ffpz8nybg")))
+ (build-system python-build-system)
+ (native-inputs
+ (list python-wheel
+ python-pytest
+ python-ddt
+ python-freezegun))
+ (propagated-inputs
+ (list ansible
+ python-cryptography
+ python-grid5000
+ python-jsonschema
+ python-netaddr
+ python-packaging
+ python-requests
+ python-rich
+ python-sshtunnel
+ python-pytz))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ ;; Otherwise Ansible fails to create its config directory.
+ (setenv "HOME" "/tmp")
+ ;; Ignoring the tests requiring an extra dependency (iotlabcli)
+ (invoke "pytest" "enoslib/tests/unit"
+ "--ignore" "enoslib/tests/unit/infra/test_utils.py"
+ "--ignore-glob" "enoslib/tests/unit/infra/enos_iotlab/*"))))
+ ;; Disable the sanity check, which fails with the following error:
+ ;;
+ ;; ContextualVersionConflict(rich 12.4.1
+ ;; (/gnu/store/...-python-rich-12.4.1/lib/python3.9/site-packages),
+ ;; Requirement.parse('rich[jupyter]~=12.0.0'), {'enoslib'})
+ ;;
+ ;; The optional jupyter dependency of rich isn't critical for
+ ;; EnOSlib to work
+ (delete 'sanity-check))))
+
+ (home-page "https://discovery.gitlabpages.inria.fr/enoslib/index.html")
+ (synopsis "EnOSlib")
+ (description "EnOSlib is a library to build experimental frameworks on various
+ scientific testbeds.")
+ (license license:gpl3+)))
base-commit: 8e54584d4448d37ddf8ae995bb545a181ba2493c
--
2.30.2
^ permalink raw reply related [relevance 64%]
* [bug#59041] [PATCH] gnu: python-bottle: Update to 0.12.23.
@ 2022-11-05 3:52 68% jgart via Guix-patches via
0 siblings, 0 replies; 200+ results
From: jgart via Guix-patches via @ 2022-11-05 3:52 UTC (permalink / raw)
To: 59041; +Cc: jgart
* gnu/packages/python-web.scm (python-bottle): Update to 0.12.23.
[native-inputs]: Add python-pytest..
[arguments]: Use pytest to call test suite.
---
gnu/packages/python-web.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 905ed6a327..484ab4cfeb 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -45,7 +45,6 @@
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021 Pradana Aumars <paumars@courrier.dev>
;;; Copyright © 2021, 2022 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Alice Brenon <alice.brenon@ens-lyon.fr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
@@ -58,6 +57,7 @@
;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr>
;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Baptiste Strazzulla <bstrazzull@hotmail.fr>
+;;; Copyright © 2021, 2022 jgart <jgart@dismail.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4371,14 +4371,23 @@ (define-public python-werkzeug-1.0
(define-public python-bottle
(package
(name "python-bottle")
- (version "0.12.21")
+ (version "0.12.23")
(source
(origin
(method url-fetch)
(uri (pypi-uri "bottle" version))
(sha256
- (base32 "0zl8sy4dhafyxqpavy7pjz0qzpakmhgh2qr6pwlw5f82rjv62z3q"))))
+ (base32 "0rs1w293gp5bhxip2cci8mfkhld6n5qcznvlna3nxclz76mf6gb8"))))
(build-system python-build-system)
+ (native-inputs (list python-pytest))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (with-directory-excursion "test"
+ (invoke "pytest" "-vvv"))))))))
(home-page "https://bottlepy.org/")
(synopsis "WSGI framework for small web-applications")
(description "@code{python-bottle} is a WSGI framework for small web-applications.")
--
2.38.1
^ permalink raw reply related [relevance 68%]
* [bug#58587] [PATCH v3 17/22] gnu: python-openapi-schema-validator: Use pyproject-build-system.
@ 2022-10-22 22:20 68% ` Marius Bakke
2022-10-22 22:20 67% ` [bug#58587] [PATCH v3 18/22] gnu: python-openapi-spec-validator: " Marius Bakke
1 sibling, 0 replies; 200+ results
From: Marius Bakke @ 2022-10-22 22:20 UTC (permalink / raw)
To: 58587
* gnu/packages/python-web.scm (python-openapi-schema-validator)[build-system]:
Set to PYPROJECT-BUILD-SYSTEM.
[arguments]: Remove redundant phases.
[native-inputs]: Remove PYTHON-PYPA-BUILD.
---
gnu/packages/python-web.scm | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f5625cc305..370245de3a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -79,6 +79,7 @@ (define-module (gnu packages python-web)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system copy)
+ #:use-module (guix build-system pyproject)
#:use-module (guix build-system python)
#:use-module (guix gexp)
#:use-module (guix utils)
@@ -1601,7 +1602,7 @@ (define-public python-openapi-schema-validator
(sha256
(base32
"1swm8h74nhg63nxk347blwq9f1qn6iiq3zisndcvm7axkq3pc2df"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
(list
#:phases
@@ -1609,21 +1610,8 @@ (define-public python-openapi-schema-validator
(add-after 'unpack 'remove-coverage-pytest-options
(lambda _
(substitute* "pyproject.toml"
- (("^--cov.*") ""))))
- ;; XXX: PEP 517 manual build copied from python-isort.
- (replace 'build
- (lambda _
- (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest"))))
- (replace 'install
- (lambda _
- (let ((whl (car (find-files "dist" "\\.whl$"))))
- (invoke "pip" "--no-cache-dir" "--no-input"
- "install" "--no-deps" "--prefix" #$output whl)))))))
- (native-inputs (list python-poetry-core python-pypa-build python-pytest))
+ (("^--cov.*") "")))))))
+ (native-inputs (list python-poetry-core python-pytest))
(propagated-inputs
(list python-isodate
python-jsonschema
--
2.38.0
^ permalink raw reply related [relevance 68%]
* [bug#58587] [PATCH v3 18/22] gnu: python-openapi-spec-validator: Use pyproject-build-system.
2022-10-22 22:20 68% ` [bug#58587] [PATCH v3 17/22] gnu: python-openapi-schema-validator: Use pyproject-build-system Marius Bakke
@ 2022-10-22 22:20 67% ` Marius Bakke
1 sibling, 0 replies; 200+ results
From: Marius Bakke @ 2022-10-22 22:20 UTC (permalink / raw)
To: 58587
* gnu/packages/python-web.scm (python-openapi-spec-validator)[build-system]:
Set to PYPROJECT-BUILD-SYSTEM.
[arguments]: Add #:test-flags. Remove obsolete phases.
[native-inputs]: Remove PYTHON-PYPA-BUILD.
---
gnu/packages/python-web.scm | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 370245de3a..cbc515fc64 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -1643,33 +1643,19 @@ (define-public python-openapi-spec-validator
(sha256
(base32
"1q09sjh4hsc0c8yqbd97h5mp6rwh427y6zyn8kv8wljk6sa0fs4q"))))
- (build-system python-build-system)
+ (build-system pyproject-build-system)
(arguments
(list
+ ;; The example tests attempt to fetch resources from the Internet
+ ;; (see: https://github.com/p1c2u/openapi-spec-validator/issues/151).
+ #:test-flags #~'("-vv" "-k" "not Example and not Exampe")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'remove-coverage-pytest-options
(lambda _
(substitute* "pyproject.toml"
- (("^--cov.*") ""))))
- ;; XXX: PEP 517 manual build copied from python-isort.
- (replace 'build
- (lambda _
- (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv"
- ;; The example tests attempt to fetch resources from
- ;; the Internet (see:
- ;; https://github.com/p1c2u/openapi-spec-validator/issues/151).
- "-k" "not Example and not Exampe"))))
- (replace 'install
- (lambda _
- (let ((whl (car (find-files "dist" "\\.whl$"))))
- (invoke "pip" "--no-cache-dir" "--no-input"
- "install" "--no-deps" "--prefix" #$output whl)))))))
- (native-inputs (list python-poetry-core python-pypa-build python-pytest))
+ (("^--cov.*") "")))))))
+ (native-inputs (list python-poetry-core python-pytest))
(propagated-inputs
(list python-jsonschema
python-openapi-schema-validator
--
2.38.0
^ permalink raw reply related [relevance 67%]
* [bug#58530] [PATCH 4/4]: gnu: Add parfive
2022-10-14 21:11 66% ` [bug#58530] [PATCH 1/4]: gnu: Add siosocks Sharlatan Hellseher
2022-10-14 21:11 65% ` [bug#58530] [PATCH 2/4]: gnu: Add aioftp Sharlatan Hellseher
@ 2022-10-14 21:12 65% ` Sharlatan Hellseher
2 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2022-10-14 21:12 UTC (permalink / raw)
To: 58530
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
--
… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.
[-- Attachment #2: 0004-gnu-Add-parfive.patch --]
[-- Type: text/x-patch, Size: 2715 bytes --]
From c51bba6b106a31f773d9dfe31dc4bc6d3c1050aa Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 14 Oct 2022 21:45:52 +0100
Subject: [PATCH 4/4] gnu: Add parfive
* gnu/packages/python-web.scm (parfive): Newv variable
---
gnu/packages/python-web.scm | 42 +++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3c4d179dcc..c29be41eff 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -983,6 +983,48 @@ (define-public httpie
(properties `((lint-hidden-cve . ("CVE-2019-10751"))))
(license license:bsd-3)))
+(define-public parfive
+ (package
+ (name "parfive")
+ (version "2.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "parfive" version))
+ (sha256
+ (base32
+ "19dcbb6g56l5s3ih0bhs3p4acgc0gf4zdzpj4w87m69li2nhmgpx"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'disable-test-requiring-network
+ (lambda _
+ (substitute* "parfive/tests/test_downloader.py"
+ (("def test_ftp")
+ "def __off_test_ftp"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "python" "-m" "pytest" "-vvv" "parfive")))))))
+ (propagated-inputs (list python-aiofiles python-aioftp python-aiohttp
+ python-tqdm))
+ (native-inputs (list python-pytest
+ python-pytest-asyncio
+ python-pytest-cov
+ python-pytest-localserver
+ python-pytest-socket
+ python-setuptools-scm))
+ (home-page "https://parfive.readthedocs.io/")
+ (synopsis "HTTP and FTP parallel file downloader")
+ (description
+ "This package provides CLI tool and Python library @code{parallel} file
+downloader using asyncio. parfive can handle downloading multiple files in
+parallel as well as downloading each file in a number of chunks.
+
+asciicast demo of parfive parfive works by creating a downloader object,
+appending files to it and then running the download. parfive has a synchronous
+API, but uses asyncio to paralellise downloading the files.")
+ (license license:expat)))
+
(define-public python-html2text
(package
(name "python-html2text")
--
2.37.3
^ permalink raw reply related [relevance 65%]
* [bug#58530] [PATCH 2/4]: gnu: Add aioftp
2022-10-14 21:11 66% ` [bug#58530] [PATCH 1/4]: gnu: Add siosocks Sharlatan Hellseher
@ 2022-10-14 21:11 65% ` Sharlatan Hellseher
2022-10-14 21:12 65% ` [bug#58530] [PATCH 4/4]: gnu: Add parfive Sharlatan Hellseher
2 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2022-10-14 21:11 UTC (permalink / raw)
To: 58530
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
--
… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.
[-- Attachment #2: 0002-gnu-Add-aioftp.patch --]
[-- Type: text/x-patch, Size: 2297 bytes --]
From 274047ed5622650a6e1d232cd5cec39cd9a4f516 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 14 Oct 2022 21:04:56 +0100
Subject: [PATCH 2/4] gnu: Add aioftp
* gnu/packages/python-web.scm (python-aioftp): New variable.
---
gnu/packages/python-web.scm | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a00c8b7683..3c4d179dcc 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3037,6 +3037,42 @@ (define-public python-requests-ftp
adapter for use with the Requests library.")
(license license:asl2.0)))
+(define-public python-aioftp
+ (package
+ (name "python-aioftp")
+ (version "0.21.4")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "aioftp" version))
+ (sha256
+ (base32
+ "1f8vql2j2b3ykqyh5bxzsp8x5f2if2c1ya232ld3hz3cc7a2dfr8"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vvv")))))))
+ (native-inputs (list python-async-timeout python-pytest
+ python-pytest-asyncio python-pytest-cov
+ python-trustme))
+ (propagated-inputs (list python-siosocks))
+ (home-page "https://aioftp.readthedocs.io/")
+ (synopsis "FTP client/server for asyncio in Python")
+ (description
+ "FTP client and server for asyncio (Python 3) Library implementing FTP
+protocol, both client and server for Python asyncio module.
+
+ Supported commands as client: USER, PASS, ACCT, PWD, CWD, CDUP, MKD, RMD,
+ MLSD, MLST, RNFR, RNTO, DELE, STOR, APPE, RETR, TYPE, PASV, ABOR, QUIT,
+ REST, LIST (as fallback).
+
+ Supported commands as server: USER, PASS, QUIT, PWD, CWD, CDUP, MKD, RMD,
+ MLSD, LIST (non-standard), MLST, RNFR, RNTO, DELE, STOR, RETR,
+ TYPE (\"I\" and \"A\"), PASV, ABOR, APPE, REST.")
+ (license license:asl2.0)))
+
(define-public python-msal
(package
(name "python-msal")
--
2.37.3
^ permalink raw reply related [relevance 65%]
* [bug#58530] [PATCH 1/4]: gnu: Add siosocks
@ 2022-10-14 21:11 66% ` Sharlatan Hellseher
2022-10-14 21:11 65% ` [bug#58530] [PATCH 2/4]: gnu: Add aioftp Sharlatan Hellseher
2022-10-14 21:12 65% ` [bug#58530] [PATCH 4/4]: gnu: Add parfive Sharlatan Hellseher
2 siblings, 0 replies; 200+ results
From: Sharlatan Hellseher @ 2022-10-14 21:11 UTC (permalink / raw)
To: 58530
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
--
… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.
[-- Attachment #2: 0001-gnu-Add-siosocks.patch --]
[-- Type: text/x-patch, Size: 2233 bytes --]
From ac31ebaf1111f89802a33ed1b0fe85e8a49299b3 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 14 Oct 2022 20:59:11 +0100
Subject: [PATCH 1/4] gnu: Add siosocks
* gnu/packages/python-web.scm (python-siosocks): New variable.
---
gnu/packages/python-web.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6a9d6ee61d..a00c8b7683 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -6674,6 +6674,43 @@ (define-public python-socksio
SOCKS protocols. It can be paired with any I/O library.")
(license license:expat)))
+(define-public python-siosocks
+ (package
+ (name "python-siosocks")
+ (version "0.3.0")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "siosocks" version))
+ (sha256
+ (base32
+ "0qqxy8wl5mrmlkblzjq9nsg0cbm5jwgj409mhnhq6gd1ypvbndms"))))
+ (build-system python-build-system)
+ (arguments
+ (list #:phases #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-vvv")))))))
+ (native-inputs (list python-pytest python-pytest-asyncio python-pytest-cov
+ python-pytest-trio))
+ (propagated-inputs (list python-trio))
+ (home-page "https://github.com/pohmelie/siosocks")
+ (synopsis "SOCKSv4 & SOCKSv5 TCP proxy protocol implementation in Python")
+ (description
+ "This package provides a Python module and framework for sans-io socks proxy
+client/server with couple io backends.
+
+Features:
+@itemize
+@item Only TCP connect (no BIND, no UDP)
+@item Both client and server
+@item SOCKS versions: 4, 4a, 5
+@item SOCKSv5 auth: no auth, username/password
+@item Couple io backends: @code{asyncio}, @code{trio}, @code{socketserver}
+@item One-shot socks server (@code{python -m siosocks})
+@end itemize")
+ (license license:expat)))
+
(define-public python-msrest
(package
(name "python-msrest")
--
2.37.3
^ permalink raw reply related [relevance 66%]
* [bug#58482] [PATCH] gnu: python-responses: Update to 0.22.0.
@ 2022-10-13 6:12 69% jgart via Guix-patches via
0 siblings, 0 replies; 200+ results
From: jgart via Guix-patches via @ 2022-10-13 6:12 UTC (permalink / raw)
To: 58482; +Cc: jgart
* gnu/packages/python-web.scm (python-responses): Update to 0.22.0.
[arguments]: Enable tests.
[native-inputs]: Add python-pytest, python-pytest-asyncio, and
python-pytest-httpserver.
[inputs]: Add python-types-toml.
---
gnu/packages/python-web.scm | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 6a9d6ee61d..7f6b8b3daf 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3461,22 +3461,31 @@ (define-public python-cookies
(define-public python-responses
(package
(name "python-responses")
- (version "0.10.6")
+ (version "0.22.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "responses" version))
(sha256
(base32
- "147pacwkkqy3qf3hr33fnl1xbzgw0zsm3qppvvy9qhq8h069qbah"))))
+ "0bhhffwl0zqin4xc89nc97ynzr7l3j4b8rjqk9w9flnj2cmcnsir"))))
(build-system python-build-system)
(arguments
- `(;; Test suite is not distributed:
- ;; https://github.com/getsentry/responses/issues/38
- #:tests? #f))
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "-v")))))))
(native-inputs
- (list python-mock))
+ (list python-mock
+ python-pytest
+ python-pytest-asyncio
+ python-pytest-httpserver))
(propagated-inputs
- (list python-requests python-cookies python-six))
+ (list python-requests
+ python-cookies
+ python-six
+ python-types-toml))
(home-page "https://github.com/getsentry/responses")
(synopsis "Utility for mocking out the `requests` Python library")
(description "A utility library for mocking out the `requests` Python
--
2.38.0
^ permalink raw reply related [relevance 69%]
* [bug#58211] [PATCH 2/4] gnu: python-aiohttp-socks: Update to 0.7.1.
@ 2022-10-01 4:27 70% ` Michael Rohleder
0 siblings, 0 replies; 200+ results
From: Michael Rohleder @ 2022-10-01 4:27 UTC (permalink / raw)
To: 58211; +Cc: Michael Rohleder
* gnu/packages/python-web.scm (python-aiohttp-socks): Update to 0.7.1.
---
gnu/packages/python-web.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index f1eb4fb7b5..2983381cc2 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -56,6 +56,7 @@
;;; Copyright © 2022 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
;;; Copyright © 2022 msimonin <matthieu.simonin@inria.fr>
+;;; Copyright © 2022 Michael Rohleder <mike@rohleder.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -432,14 +433,14 @@ (define-public python-aiohttp
(define-public python-aiohttp-socks
(package
(name "python-aiohttp-socks")
- (version "0.6.0")
+ (version "0.7.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiohttp_socks" version))
(sha256
(base32
- "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr"))))
+ "06il43dv6qm858af841vq9qadw6h7qsfs06nnwagmwqyi72cl592"))))
(build-system python-build-system)
(propagated-inputs
(list python-aiohttp python-attrs python-socks))
--
2.37.3
^ permalink raw reply related [relevance 70%]
Results 1-200 of ~600 next (older) | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-10-21 3:51 [bug#51314] [PATCH 00/29] Add Octoprint (web UI for 3d printers) Vinicius Monego
2022-12-10 12:24 72% ` [bug#51314] Test patches on Prusa i3 MK3S phodina via Guix-patches via
2022-01-04 0:30 [bug#52997] [PATCH] gnu: Add python-facebook-sdk Giacomo Leidi via Guix-patches via
2023-04-12 21:30 70% ` [bug#52997] [PATCH-v2] " Giacomo Leidi via Guix-patches via
2022-10-01 4:27 [bug#58211] [PATCH 0/4] gnu: pantalaimon: Update to 0.10.5 Michael Rohleder
2022-10-01 4:27 70% ` [bug#58211] [PATCH 2/4] gnu: python-aiohttp-socks: Update to 0.7.1 Michael Rohleder
2022-10-13 6:12 69% [bug#58482] [PATCH] gnu: python-responses: Update to 0.22.0 jgart via Guix-patches via
2022-10-14 21:08 [bug#58530] [PATCH 0/4]: gnu: Add parfive Sharlatan Hellseher
2022-10-14 21:11 66% ` [bug#58530] [PATCH 1/4]: gnu: Add siosocks Sharlatan Hellseher
2022-10-14 21:11 65% ` [bug#58530] [PATCH 2/4]: gnu: Add aioftp Sharlatan Hellseher
2022-10-14 21:12 65% ` [bug#58530] [PATCH 4/4]: gnu: Add parfive Sharlatan Hellseher
2022-10-22 19:06 [bug#58587] [PATCH 00/14] Introducing pyproject-build-system Marius Bakke
2022-10-22 22:20 ` [bug#58587] [PATCH v3 01/22] gnu: python-setuptools: Move to python-build Marius Bakke
2022-10-22 22:20 68% ` [bug#58587] [PATCH v3 17/22] gnu: python-openapi-schema-validator: Use pyproject-build-system Marius Bakke
2022-10-22 22:20 67% ` [bug#58587] [PATCH v3 18/22] gnu: python-openapi-spec-validator: " Marius Bakke
2022-11-05 3:52 68% [bug#59041] [PATCH] gnu: python-bottle: Update to 0.12.23 jgart via Guix-patches via
2022-11-07 22:52 64% [bug#59112] [PATCH] gnu: add python-enoslib matthieu.simonin
2022-11-16 1:56 [bug#59294] [PATCH 0/2] Update httpie to 3.2.1 kiasoc5 via Guix-patches via
2022-11-16 2:00 70% ` [bug#59294] [PATCH 1/2] gnu: httpie: Update " kiasoc5 via Guix-patches via
2022-11-16 2:00 70% ` [bug#59294] [PATCH 2/2] gnu: httpie: Use G-expressions kiasoc5 via Guix-patches via
2022-11-23 23:00 68% [bug#59526] [PATCH] gnu: Add whoogle-search conses
2022-12-02 5:59 [bug#59764] [PATCH 1/8] gnu: Add python-lxml-4.9 kiasoc5 via Guix-patches via
2022-12-02 5:59 70% ` [bug#59764] [PATCH 3/8] gnu: Add python-ephemeral-port-reserve kiasoc5 via Guix-patches via
2022-12-02 5:59 70% ` [bug#59764] [PATCH 4/8] gnu: python-flask: Update to 2.2.2 kiasoc5 via Guix-patches via
2022-12-02 5:59 69% ` [bug#59764] [PATCH 5/8] gnu: python-werkzeug: " kiasoc5 via Guix-patches via
2022-12-03 4:18 66% [bug#59791] Add mitmproxy phodina via Guix-patches via
2022-12-12 14:22 [bug#60009] Update python-graphviz and other Python updates Ricardo Wurmus
2022-12-12 14:26 ` [bug#60009] [PATCH 01/18] gnu: python-graphviz: Update to 0.20.1 Ricardo Wurmus
2022-12-12 14:27 65% ` [bug#60009] [PATCH 12/18] gnu: python-flask-restful: Update to 0.3.9 Ricardo Wurmus
2022-12-21 13:13 [bug#60238] [PATCH 1/7] gnu: Add python-markdown2 dan
2022-12-21 13:14 70% ` [bug#60238] [PATCH 6/7] gnu: Add python-cheroot dan
2022-12-21 14:48 70% [bug#60239] [PATCH] gnu: Add python-pysimplesoap Felix Lechner via Guix-patches via
2023-01-26 10:06 70% ` bug#60239: " Ludovic Courtès
2022-12-25 17:24 73% [bug#60316] [PATCH] WIP: Add homeassistant phodina via Guix-patches via
2022-12-26 5:11 ` Raghav Gururajan via Guix-patches via
2022-12-27 22:06 64% ` phodina via Guix-patches via
2023-01-02 12:52 [bug#60493] [PATCH 1/3] gnu: Add python-async-lru Giacomo Leidi via Guix-patches via
2023-01-02 12:52 70% ` [bug#60493] [PATCH 2/3] gnu: Update python-oauthlib to 3.2.2 Giacomo Leidi via Guix-patches via
2023-01-02 12:52 69% ` [bug#60493] [PATCH 3/3] gnu: Update python-tweepy to 4.12.1 Giacomo Leidi via Guix-patches via
2023-01-15 21:47 [bug#60838] [PATCH 0/8] Add datasette and python-sqlite-utils Felix Gruber
2023-01-15 21:53 67% ` [bug#60838] [PATCH 6/8] gnu: Add python-asgi-lifespan Felix Gruber
2023-01-15 21:53 70% ` [bug#60838] [PATCH 7/8] gnu: Add python-asgi-csrf Felix Gruber
2023-03-17 19:19 ` [bug#60838] [PATCH v2 0/7] Add datasette and python-sqlite-utils Felix Gruber
2023-03-17 19:19 67% ` [bug#60838] [PATCH v2 5/7] gnu: Add python-asgi-lifespan Felix Gruber
2023-03-17 19:19 70% ` [bug#60838] [PATCH v2 6/7] gnu: Add python-asgi-csrf Felix Gruber
2023-01-21 15:39 70% [bug#60991] [PATCH] gnu: python-scrapy: Update to 2.7.1 Felix Gruber
2023-01-29 2:41 70% [bug#61141] [PATCH] gnu: whoogle-search: Update to 0.8.1 Spencer Skylar Chan
2023-02-02 16:58 [bug#60238] [PATCH v2 1/7] gnu: Add python-markdown2 dan
2023-02-02 16:58 70% ` [bug#60238] [PATCH v2 6/7] gnu: Add python-cheroot dan
2023-02-15 23:22 70% [bug#61543] [PATCH] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-02-20 16:13 68% [bug#61657] [PATCH] gnu: python-paste: Update to 3.5.2 Jake Leporte
2023-03-09 17:27 70% [bug#62085] [PATCH] gnu: Add python-mohawk Adam Faiz via Guix-patches via
2023-03-18 9:24 [bug#62252] [PATCH 00/19] Add python-clinguin Liliana Marie Prikler
2023-03-18 7:48 70% ` [bug#62252] [PATCH v3 11/19] gnu: python-starlette: Update to 0.25.0 Liliana Marie Prikler
2023-03-18 7:48 70% ` [bug#62252] [PATCH v2 " Liliana Marie Prikler
2023-03-18 7:48 70% ` [bug#62252] [PATCH " Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH 18/19] gnu: Add python-fastapi Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH v2 " Liliana Marie Prikler
2023-03-18 8:59 67% ` [bug#62252] [PATCH v3 " Liliana Marie Prikler
2023-03-22 0:59 [bug#60838] [PATCH 0/8] Add datasette and python-sqlite-utils Maxim Cournoyer
2023-03-26 19:43 ` [bug#60838] [PATCH v3 0/9] " Felix Gruber
2023-03-26 19:43 62% ` [bug#60838] [PATCH v3 4/9] gnu: Add python-asgi-lifespan Felix Gruber
2023-03-26 19:43 69% ` [bug#60838] [PATCH v3 5/9] gnu: Add python-asgi-csrf Felix Gruber
2023-03-22 17:29 [bug#62389] [PATCH 00/12] gnu: synapse: Update to 1.67.0 conses
2023-03-22 17:31 70% ` [bug#62389] [PATCH 04/12] gnu: python-urllib3: Move to python-cryptography-next conses
2023-03-22 17:31 70% ` [bug#62389] [PATCH 05/12] gnu: python-treq: Update to 20.9.0 conses
2023-04-06 5:47 70% [bug#62688] [PATCH] gnu: python-websockets: Update to 11.0.1 jgart via Guix-patches via
[not found] <877cuin3g0.fsf@VM-0-5-ubuntu.mail-host-address-is-not-set>
2023-04-11 9:58 89% ` [bug#62773] gnu: python-requests_ntlm: Update to 1.2.0 c4droid
2023-09-14 9:42 70% ` [bug#62773] [PATCH] " c4droid
2023-04-12 20:52 [bug#60493] [v2 1/3] gnu: Add python-async-lru Giacomo Leidi via Guix-patches via
2023-04-12 20:52 70% ` [bug#60493] [v2 2/3] gnu: Update python-oauthlib to 3.2.2 Giacomo Leidi via Guix-patches via
2023-04-12 20:52 69% ` [bug#60493] [v2 3/3] gnu: Update python-tweepy to 4.12.1 Giacomo Leidi via Guix-patches via
2023-04-15 21:39 [bug#62873] [PATCH gnome-team 0/5] Merge master into gnome-team Liliana Marie Prikler
2023-04-15 21:30 16% ` [bug#62873] [PATCH] Merge branch 'master' " Liliana Marie Prikler
2023-04-18 8:12 64% [bug#62922] [PATCH] gnu: python-lazr-restfulclient: Add missing dependency Tom Willemse
2023-05-22 18:38 89% ` [bug#62922] [PATCH v2] gnu: python-lazr-restfulclient: Add missing dependencies Ivan Vilata i Balaguer
2023-04-29 5:24 [bug#63165] [PATCH 0/2] Add python-jaraco-test, update python-cssutils kiasoc5 via Guix-patches via
2023-04-29 5:43 68% ` [bug#63165] [PATCH v2] gnu: python-cssutils: Update to 2.6.0 kiasoc5 via Guix-patches via
2023-04-29 5:31 [bug#63165] [PATCH 1/2] gnu: Add python-jaraco-test kiasoc5 via Guix-patches via
2023-04-29 5:31 70% ` [bug#63165] [PATCH 2/2] gnu: python-cssutils: Update to 2.6.0 kiasoc5 via Guix-patches via
2023-05-19 20:49 70% [bug#63601] [PATCH] gnu: whoogle-search: Update to 0.8.2 Spencer Skylar Chan
2023-05-20 16:42 [bug#63612] [PATCH 0/6] Update searx and dependencies kiasoc5 via Guix-patches via
2023-05-20 16:44 70% ` [bug#63612] [PATCH 1/6] gnu: Add python-ephemeral-port-reserve kiasoc5 via Guix-patches via
2023-05-20 16:44 67% ` [bug#63612] [PATCH 4/6] gnu: python-werkzeug: Update to 2.2.3 kiasoc5 via Guix-patches via
2023-05-20 16:44 70% ` [bug#63612] [PATCH 5/6] gnu: python-flask: Update to 2.2.2 kiasoc5 via Guix-patches via
2023-06-07 17:29 [bug#62389] [PATCH v2 1/6] gnu: Add python-matrix-common Miguel Ángel Moreno
2023-06-07 17:31 89% ` [bug#62389] [PATCH v2 3/6] gnu: python-treq: Update to 20.9.0 Miguel Ángel Moreno
2023-06-25 16:57 [bug#55474] [PATCH v5 01/55] gnu: python-django-4.0: Update to 4.0.9 Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 02/55] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 03/55] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
2023-06-25 16:57 70% ` [bug#55474] [PATCH v5 30/55] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2023-06-30 20:02 [bug#64375] [PATCH 0/8] Add python-platformio plus dependency updates peter
2023-06-30 20:02 70% ` [bug#64382] [PATCH 2/8] gnu: python-sanic: Update to 21.12.2 peter
2023-06-30 20:02 68% ` [bug#64378] [PATCH 3/8] gnu: python-uvicorn: Update to 0.22.0 peter
2023-06-30 20:02 70% ` [bug#64383] [PATCH 4/8] gnu: python-starlette: Update to 0.26.0 peter
2023-07-05 11:02 [bug#64474] [PATCH 0/3] Update awscli to 1.28.0 Roman Scherer
2023-07-05 12:17 70% ` [bug#64474] [PATCH 2/3] gnu: python-s3transfer: Update to 0.6.1 Roman Scherer
2023-07-05 12:17 70% ` [bug#64474] [PATCH 3/3] gnu: awscli: Update to 1.28.0 Roman Scherer
2023-07-09 13:58 70% [bug#64542] [PATCH] gnu: Add python-ovh Liliana Marie Prikler
2023-07-20 17:13 70% [bug#64747] [PATCH] gnu: Add python-pynetbox Timotej Lazar
2023-08-02 10:37 28% [bug#65010] [PATCH 0/8] Misc Python build system improvements Lars-Dominik Braun
2023-08-06 15:31 [bug#65114] [PATCH 0/6] Update Scrapy Vinicius Monego
2023-08-06 15:33 66% ` [bug#65114] [PATCH 1/6] gnu: python-w3lib: Update to 2.1.2 Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 2/6] gnu: python-cssselect: Update to 1.2.0 Vinicius Monego
2023-08-06 15:33 70% ` [bug#65114] [PATCH 3/6] gnu: python-parsel: Update to 1.8.1 Vinicius Monego
2023-08-06 15:33 67% ` [bug#65114] [PATCH 6/6] gnu: python-scrapy: Update to 2.10.0 Vinicius Monego
2023-08-29 14:01 [bug#64375] [PATCH 1/4] gnu: python-semantic-version: " peter
2023-08-29 14:01 70% ` [bug#64375] [PATCH 2/4] gnu: python-sanic: Update to 21.12.2 peter
2023-08-29 14:01 70% ` [bug#64375] [PATCH 3/4] gnu: python-quart: Update to 0.18.4 peter
2023-09-05 16:30 [bug#65758] [PATCH v6 01/55] gnu: python-django-4.0: Update to 4.0.9 Nicolas Graves via Guix-patches via
2023-09-05 16:30 70% ` [bug#65758] [PATCH v6 02/55] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-09-05 16:30 70% ` [bug#65758] [PATCH v6 03/55] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
2023-09-05 16:31 70% ` [bug#65758] [PATCH v6 29/55] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2023-09-06 9:15 [bug#65758] [PATCH v7 01/57] gnu: python-django-4.0: Update to 4.0.9 Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 02/57] gnu: python-asgiref: Update to 3.6.0 Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 03/57] gnu: Add python-asgiref-3.4.1 Nicolas Graves via Guix-patches via
2023-09-06 9:15 70% ` [bug#65758] [PATCH v7 29/57] gnu: Remove python-pysolr Nicolas Graves via Guix-patches via
2023-10-09 7:12 [bug#66417] [PATCH 0/3] Bump python-google-api-client to version 2 Pierre-Evariste Dagand
2023-10-09 7:40 70% ` [bug#66417] [PATCH 1/3] gnu: Add python-google-auth-oauthlib Pierre-Evariste Dagand
2023-10-09 7:40 68% ` [bug#66417] [PATCH 2/3] gnu: python-google-api-client: Update to 2.102.0 Pierre-Evariste Dagand
2023-10-09 7:40 61% ` [bug#66417] [PATCH 3/3] gnu: Remove python-google-api-core-1 and its dependency python-google-auth-1 Pierre-Evariste Dagand
2023-11-01 12:00 65% [bug#66881] [PATCH] gnu: whoogle-search: Update to 0.8.3 Spencer Skylar Chan
2023-11-17 12:04 [bug#67237] [PATCH 00/32] gnu: Astronomy 2023/11 updates Sharlatan Hellseher
2023-11-17 12:16 70% ` [bug#67237] [PATCH 25/32] gnu: parfive: Update to 2.0.2 Sharlatan Hellseher
2023-11-17 12:16 69% ` [bug#67237] [PATCH 26/32] gnu: parfive: Improve package style Sharlatan Hellseher
2023-12-03 15:22 [bug#66886] [PATCH v3 1/6] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2023-12-03 15:22 68% ` [bug#66886] [PATCH v3 3/6] gnu: python-rich: Update to 13.7.0 Giacomo Leidi via Guix-patches via
2023-12-10 3:18 70% [bug#67737] [PATCH staging] gnu: python-requests: Update to 2.31.0 Jaeme Sifat via Guix-patches via
2024-01-01 17:53 87% [bug#68191] [PATCH] gnu: Add python-portend Troy Figiel
2024-01-01 18:52 88% [bug#68193] [PATCH] gnu: Add python-zc-lockfile Troy Figiel
2024-01-01 23:14 [bug#68197] [PATCH 0/5] gnu: yt-dlp: Update to 2023.12.30 Jaeme Sifat via Guix-patches via
2024-01-01 23:21 64% ` [bug#68197] [PATCH 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
2024-01-01 23:21 67% ` [bug#68197] [PATCH 2/5] gnu: Add python-requests-2.31 Jaeme Sifat via Guix-patches via
2024-01-01 23:21 66% ` [bug#68197] [PATCH 4/5] gnu: Add python-websockets-12 Jaeme Sifat via Guix-patches via
2024-01-02 1:25 63% ` [bug#68197] [PATCH v2REVISION 1/5] gnu: Add python-urllib3-2 Jaeme Sifat via Guix-patches via
2024-01-02 1:25 67% ` [bug#68197] [PATCH v2REVISION 2/5] gnu: Add python-requests-2.31 Jaeme Sifat via Guix-patches via
2024-01-02 1:25 66% ` [bug#68197] [PATCH v2REVISION 4/5] gnu: Add python-websockets-12 Jaeme Sifat via Guix-patches via
2024-01-13 11:52 [bug#68424] [PATCH 0/3] Fix python-hypercorn Troy Figiel
2024-01-13 11:26 70% ` [bug#68424] [PATCH 1/3] gnu: hypercorn: Add missing propagated-inputs Troy Figiel
2024-01-13 11:36 70% ` [bug#68424] [PATCH 2/3] gnu: hypercorn: Remove unnecessary native-input Troy Figiel
2024-01-13 11:40 69% ` [bug#68424] [PATCH 3/3] gnu: hypercorn: Reformat with guix style Troy Figiel
2024-01-13 18:09 [bug#68431] [PATCH 0/3] Fix python-requests-kerberos build Troy Figiel
2024-01-13 17:59 70% ` [bug#68431] [PATCH 2/3] gnu: python-requests-kerberos: Fix build Troy Figiel
2024-01-13 18:04 69% ` [bug#68431] [PATCH 3/3] gnu: python-requests-kerberos: Enable tests Troy Figiel
2024-01-14 23:56 [bug#68456] [PATCH v4 1/6] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2024-01-14 23:56 68% ` [bug#68459] [PATCH v4 3/6] gnu: python-rich: Update to 13.7.0 Giacomo Leidi via Guix-patches via
2024-01-14 23:59 [bug#66886] [PATCH v4 1/6] gnu: Add python-pygments-2.16 Giacomo Leidi via Guix-patches via
2024-01-14 23:59 68% ` [bug#66886] [PATCH v4 3/6] gnu: python-rich: Update to 13.7.0 Giacomo Leidi via Guix-patches via
2024-01-15 23:25 67% [bug#68492] [PATCH] gnu: Add python-fastapi-pagination Giacomo Leidi via Guix-patches via
2024-02-28 23:35 64% ` [bug#68492] [PATCH v2 1/2] gnu: Add python-fastapi-pagination-minimal Giacomo Leidi via Guix-patches via
2024-02-28 23:35 68% ` [bug#68492] [PATCH v2 2/2] gnu: Add python-fastapi-pagination Giacomo Leidi via Guix-patches via
2024-01-21 21:19 [bug#68649] [PATCH 0/3] gnu: Add python-zodb Troy Figiel
2024-01-21 21:12 67% ` [bug#68649] [PATCH 1/3] gnu: Add python-zconfig Troy Figiel
2024-01-21 21:12 70% ` [bug#68649] [PATCH 2/3] gnu: Add python-zodbpickle Troy Figiel
2024-01-21 21:13 66% ` [bug#68649] [PATCH 3/3] gnu: Add python-zodb Troy Figiel
2024-02-02 23:35 70% [bug#68901] [PATCH] gnu: whoogle-search: Update to 0.8.4 Skylar Chan
2024-02-11 4:35 69% [bug#69035] [PATCH] gnu: httpie: Update to 3.2.2 kiasoc5 via Guix-patches via
2024-02-11 19:53 [bug#62389] [PATCH v3 1/5] gnu: Add python-matrix-common Miguel Ángel Moreno
2024-02-11 19:54 89% ` [bug#62389] [PATCH v3 3/5] gnu: python-treq: Update to 20.9.0 Miguel Ángel Moreno
2024-02-20 23:41 [bug#69295] [PATCH 00/46] gnu: Astronomy 2024/02 updates Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 05/46] gnu: parfive: Update to 2.0.2 Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 06/46] gnu: parfive: Simplify package Sharlatan Hellseher
2024-02-20 23:43 70% ` [bug#69295] [PATCH 08/46] gnu: python-aioftp: Update to 0.22.3 Sharlatan Hellseher
2024-02-28 9:42 [bug#69449] [PATCH python-team 0/9] gnu: Add python-flask-3 Tanguy Le Carrour
2024-02-28 10:15 67% ` [bug#69449] [PATCH python-team 6/9] gnu: python-werkzeug: Rename variable to python-werkzeug-2 Tanguy Le Carrour
2024-02-28 10:15 66% ` [bug#69449] [PATCH python-team 7/9] gnu: Add python-werkzeug-3 Tanguy Le Carrour
2024-02-28 10:15 70% ` [bug#69449] [PATCH python-team 8/9] gnu: python-flask: Rename to python-flask-2 Tanguy Le Carrour
2024-02-28 10:15 67% ` [bug#69449] [PATCH python-team 9/9] gnu: Add python-flask-3 Tanguy Le Carrour
2024-03-13 1:11 70% [bug#69765] [PATCH 3/4] gnu: python-web: Update python-s3transfer to 0.10.0 Daniel Ziltener via Guix-patches via
2024-03-13 1:12 70% [bug#69768] [PATCH 4/4] gnu: python-web: Update awscli to 1.32.61 Daniel Ziltener via Guix-patches via
2024-03-17 17:08 [bug#60238] [PATCH v3 1/7] gnu: beancount: Adjust packages style Sharlatan Hellseher
2024-03-17 17:08 64% ` [bug#60238] [PATCH v3 6/7] gnu: Add python-cheroot Sharlatan Hellseher
2024-03-20 18:52 [bug#69867] [PATCH 0/2] gnu: magic-wormhole: Update to 0.13.0 normalmente
2024-03-20 18:55 69% ` [bug#69867] [PATCH 1/2] gnu: Add python-noiseprotocol normalmente
2024-03-24 13:38 [bug#69980] [PATCH 00/13] Update and cleanup pre-commit & friends Vinicius Monego
2024-03-24 13:40 70% ` [bug#69980] [PATCH 08/13] gnu: python-omnipath: Remove pre-commit from native-inputs Vinicius Monego
2024-04-07 22:13 68% [bug#70269] [PATCH] gnu: Add python-pybadges Giacomo Leidi via Guix-patches via
2024-05-13 17:05 68% ` [bug#70269] [PATCH v2] " Giacomo Leidi via Guix-patches via
2024-05-31 10:02 70% ` bug#70269: " Ludovic Courtès
2024-04-20 8:41 [bug#70483] [PATCH 1/1] gnu: Add python-robotframework-requests Markku Korkeala
2024-04-23 8:54 65% ` [bug#70483] [PATCH v2 " Markku Korkeala
2024-04-20 23:15 [bug#70488] [PATCH 00/47] Astronomy 2024/02 updates Sharlatan Hellseher
2024-04-20 23:21 70% ` [bug#70489] [PATCH 06/47] gnu: parfive: Update to 2.1.0 Sharlatan Hellseher
2024-05-03 16:55 [bug#70739] [PATCH 001/714] gnu: python-transient: Remove python-black native-input Nicolas Graves via Guix-patches via
2024-05-03 16:55 70% ` [bug#70736] [PATCH 002/714] gnu: python-ovh: " Nicolas Graves via Guix-patches via
2024-05-03 16:55 70% ` [bug#70747] [PATCH 009/714] gnu: python-openai: " Nicolas Graves via Guix-patches via
2024-05-03 16:55 70% ` [bug#70744] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 063/714] gnu: python-furl: " Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 064/714] gnu: python-httplib2: " Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 065/714] gnu: python-http-ece: " Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 066/714] gnu: python-woob: " Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: " Nicolas Graves via Guix-patches via
2024-05-03 16:56 70% ` [bug#70739] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
2024-05-03 22:18 [bug#70735] [PATCH 001/714] gnu: python-transient: Remove python-black native-input Nicolas Graves via Guix-patches via
2024-05-03 22:18 70% ` [bug#70735] [PATCH 002/714] gnu: python-ovh: " Nicolas Graves via Guix-patches via
2024-05-03 22:18 70% ` [bug#70735] [PATCH 009/714] gnu: python-openai: " Nicolas Graves via Guix-patches via
2024-05-03 22:18 70% ` [bug#70735] [PATCH 010/714] gnu: python-starsessions-for-pytorch-lightning: Remove python-black Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 062/714] gnu: python-ovh: Remove python-flake8 native-input Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 063/714] gnu: python-furl: " Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 064/714] gnu: python-httplib2: " Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 065/714] gnu: python-http-ece: " Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 066/714] gnu: python-woob: " Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 067/714] gnu: python-starsessions-for-pytorch-lightning: " Nicolas Graves via Guix-patches via
2024-05-03 22:19 70% ` [bug#70735] [PATCH 086/714] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
2024-05-09 14:46 [bug#69980] [PATCH v2 00/14] Update and cleanup pre-commit & friends Nicolas Graves via Guix-patches via
2024-05-09 14:47 70% ` [bug#69980] [PATCH v2 07/14] gnu: python-omnipath: Remove pre-commit from native-inputs Nicolas Graves via Guix-patches via
2024-05-09 22:52 [bug#70855] [PATCH 01/92] gnu: python-seaborn: Correct dependencies Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 07/92] gnu: python-http-ece: Update to 1.2.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 08/92] gnu: python-zope-i18nmessageid: Update to 5.1.1 Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 19/92] gnu: python-apiron: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53 61% ` [bug#70855] [PATCH 25/92] gnu: gunicorn: " Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 34/92] gnu: gunicorn: Update to 21.2.0 Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 36/92] gnu: python-cbor2: Move to pyproject-build-system Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 37/92] gnu: python-tinycss: " Nicolas Graves via Guix-patches via
2024-05-09 22:53 70% ` [bug#70855] [PATCH 40/92] gnu: python-flask-login: " Nicolas Graves via Guix-patches via
2024-05-09 22:54 70% ` [bug#70855] [PATCH 76/92] gnu: python-zope-i18nmessageid: " Nicolas Graves via Guix-patches via
2024-05-09 22:54 70% ` [bug#70855] [PATCH 85/92] gnu: python-warcio: " Nicolas Graves via Guix-patches via
2024-05-09 22:54 70% ` [bug#70855] [PATCH 90/92] gnu: python-cssselect2: " Nicolas Graves via Guix-patches via
2024-05-09 22:54 42% ` [bug#70855] [PATCH 92/92] build-system/pyproject: Add missing native-inputs Nicolas Graves via Guix-patches via
2024-05-10 7:55 [bug#70858] [PATCH 01/32] guix: import: pypi: Ignore pypi-ignored-inputs Nicolas Graves via Guix-patches via
2024-05-10 7:55 61% ` [bug#70858] [PATCH 03/32] build-system/pyproject: Remove python-black input Nicolas Graves via Guix-patches via
2024-05-10 7:55 42% ` [bug#70858] [PATCH 05/32] build-system/pyproject: Remove python-flake8 inputs Nicolas Graves via Guix-patches via
2024-05-10 7:55 49% ` [bug#70858] [PATCH 06/32] build-system/pyproject: Remove python-coverage input Nicolas Graves via Guix-patches via
2024-05-10 7:55 70% ` [bug#70858] [PATCH 10/32] gnu: python-openid: Remove python-coverage native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 72% ` [bug#70858] [PATCH 11/32] build-system/pyproject: Remove python-coveralls native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 61% ` [bug#70858] [PATCH 17/32] build-system/pyproject: Remove python-tox native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 62% ` [bug#70858] [PATCH 18/32] build-system/pyproject: Remove python-mypy native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 62% ` [bug#70858] [PATCH 20/32] build-system/pyproject: Remove python-isort native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 71% ` [bug#70858] [PATCH 21/32] build-system/pyproject: Remove python-twine native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 41% ` [bug#70858] [PATCH 22/32] build-system/pyproject: Remove python-pytest-cov native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 70% ` [bug#70858] [PATCH 23/32] gnu: python-tinycss2: " Nicolas Graves via Guix-patches via
2024-05-10 7:55 73% ` [bug#70858] [PATCH 26/32] build-system/pyproject: Remove python-pytest-isort native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 63% ` [bug#70858] [PATCH 27/32] build-system/pyproject: Remove python-pytest-black native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 67% ` [bug#70858] [PATCH 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input Nicolas Graves via Guix-patches via
2024-05-10 7:55 65% ` [bug#70858] [PATCH 29/32] build-system/pyproject: Remove python-pytest-mypy inputs Nicolas Graves via Guix-patches via
2024-05-10 7:55 69% ` [bug#70858] [PATCH 30/32] build-system/pyproject: Stop hiding options Nicolas Graves via Guix-patches via
2024-05-15 22:41 68% [bug#70970] [PATCH] gnu: Add python-simple-salesforce King, Spencer via Guix-patches via
2024-06-01 14:57 [bug#69980] [PATCH python-team v3 00/14] Update pre-commit and remove dependents Nicolas Graves via Guix-patches via
2024-06-01 14:57 70% ` [bug#69980] [PATCH python-team v3 05/14] gnu: python-omnipath: Remove pre-commit from native-inputs Nicolas Graves via Guix-patches via
2024-06-01 15:36 [bug#70858] [PATCH python-team v2 00/32] Remove unwanted native-inputs Nicolas Graves via Guix-patches via
2024-06-01 15:36 61% ` [bug#70858] [PATCH python-team v2 03/32] build-system/pyproject: Remove python-black input Nicolas Graves via Guix-patches via
2024-06-01 15:36 42% ` [bug#70858] [PATCH python-team v2 05/32] build-system/pyproject: Remove python-flake8 inputs Nicolas Graves via Guix-patches via
2024-06-01 15:36 50% ` [bug#70858] [PATCH python-team v2 06/32] build-system/pyproject: Remove python-coverage input Nicolas Graves via Guix-patches via
2024-06-01 15:36 70% ` [bug#70858] [PATCH python-team v2 10/32] gnu: python-openid: Remove python-coverage native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 72% ` [bug#70858] [PATCH python-team v2 11/32] build-system/pyproject: Remove python-coveralls native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 62% ` [bug#70858] [PATCH python-team v2 17/32] build-system/pyproject: Remove python-tox native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 63% ` [bug#70858] [PATCH python-team v2 18/32] build-system/pyproject: Remove python-mypy native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 62% ` [bug#70858] [PATCH python-team v2 20/32] build-system/pyproject: Remove python-isort native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 72% ` [bug#70858] [PATCH python-team v2 21/32] build-system/pyproject: Remove python-twine native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 41% ` [bug#70858] [PATCH python-team v2 22/32] build-system/pyproject: Remove python-pytest-cov native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 70% ` [bug#70858] [PATCH python-team v2 23/32] gnu: python-tinycss2: " Nicolas Graves via Guix-patches via
2024-06-01 15:36 73% ` [bug#70858] [PATCH python-team v2 26/32] build-system/pyproject: Remove python-pytest-isort native-input Nicolas Graves via Guix-patches via
2024-06-01 15:36 63% ` [bug#70858] [PATCH python-team v2 27/32] build-system/pyproject: Remove python-pytest-black native-input Nicolas Graves via Guix-patches via
2024-06-01 15:37 67% ` [bug#70858] [PATCH python-team v2 28/32] build-system/pyproject: Remove python-pytest-flake8 native-input Nicolas Graves via Guix-patches via
2024-06-01 15:37 65% ` [bug#70858] [PATCH python-team v2 29/32] build-system/pyproject: Remove python-pytest-mypy inputs Nicolas Graves via Guix-patches via
2024-06-01 15:37 69% ` [bug#70858] [PATCH python-team v2 30/32] build-system/pyproject: Stop hiding options Nicolas Graves via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).