[PATCH 0/8] Update searx and dependencies

  • Done
  • quality assurance status badge
Details
One participant
  • kiasoc5
Owner
unassigned
Submitted by
kiasoc5
Severity
normal

Debbugs page

kiasoc5 wrote 2 years ago
(address . guix-patches@gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
e0d356b1-1d18-801b-761b-0cc0ebbb50d1@disroot.org
New python-lxml version added, and a single failing test in
python-werkzeug is disabled for now (other distros disable the entire
file containing that test).

kiasoc5 (8):
gnu: Add python-lxml-4.9.
gnu: Add python-greenlet.
gnu: Add python-ephemeral-port-reserve.
gnu: python-flask: Update to 2.2.2.
gnu: python-werkzeug: Update to 2.2.2.
gnu: python-markupsafe: Update to 2.1.1.
gnu: python-jinja2: Update to 3.1.2.
gnu: searx: Update to 1.1.0.

gnu/packages/python-web.scm | 41 +++++++++++++++++++++++++++++++------
gnu/packages/python-xyz.scm | 30 +++++++++++++++++++++++----
gnu/packages/search.scm | 13 ++++++------
gnu/packages/xml.scm | 12 +++++++++++
4 files changed, 80 insertions(+), 16 deletions(-)


base-commit: 4781f0458de7419606b71bdf0fe56bca83ace910
--
2.38.1
kiasoc5 wrote 2 years ago
[PATCH 1/8] gnu: Add python-lxml-4.9.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-1-kiasoc5@disroot.org
* gnu/packages/xml.scm (python-lxml-4.9): New variable.
---
gnu/packages/xml.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)

Toggle diff (25 lines)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 770bac3670..141c047b02 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -2536,6 +2536,18 @@ (define-public python-lxml-4.7
(base32
"090viyanaki4q7w7i000xl0qh4in52bkl3qal55sz2bbm8w3hqd1"))))))
+(define-public python-lxml-4.9
+ (package
+ (inherit python-lxml)
+ (version "4.9.1")
+ (source
+ (origin
+ (inherit (package-source python-lxml))
+ (uri (pypi-uri "lxml" version))
+ (sha256
+ (base32
+ "0grczyrrq2rbwhvpri15cyhv330s494vbz3js3jky8xp5c2rnx7y"))))))
+
(define-public python-untangle
;; The latest tagged release is from 2014; use the latest commit.
(let ((revision "1")
--
2.38.1
kiasoc5 wrote 2 years ago
[PATCH 2/8] gnu: Add python-greenlet.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-2-kiasoc5@disroot.org
* gnu/packages/python-xyz.scm (python-greenlet): New variable.
---
gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)

Toggle diff (35 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 17fbd9de9e..2e1db8a252 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -12370,6 +12370,28 @@ (define-public python-curio
tasks, sockets, files, locks, and queues.")
(license license:bsd-3)))
+(define-public python-greenlet
+(package
+ (name "python-greenlet")
+ (version "2.0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "greenlet" version))
+ (sha256
+ (base32
+ "0rqgxp1fai0fcyv46nd1389mxvk3ccixgdkwws70xnk08ib05rj2"))))
+ (build-system python-build-system)
+ (native-inputs (list python-objgraph python-psutil))
+ (home-page "https://greenlet.readthedocs.io/")
+ (synopsis "Lightweight in-process concurrent programming")
+ (description
+ "This package provides greenlets for Python. greenlets are lightweight
+coroutines for in-process sequential concurrent programming. They are
+frequently used with frameworks such as gevent to provide higher-level
+abstractions and asynchronous I/O. They are analagous to threads or Python's
+built-in coroutines.")
+ (license license:expat)))
+
(define-public python-tables
(package
(name "python-tables")
--
2.38.1
kiasoc5 wrote 2 years ago
[PATCH 3/8] gnu: Add python-ephemeral-port-reserve.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-3-kiasoc5@disroot.org
* gnu/packages/python-web.scm (python-ephemeral-port-reserve): New variable.
---
gnu/packages/python-web.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)

Toggle diff (33 lines)
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
kiasoc5 wrote 2 years ago
[PATCH 6/8] gnu: python-markupsafe: Update to 2.1.1.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-6-kiasoc5@disroot.org
* gnu/packages/python-xyz.scm (python-markupsafe): Update to 2.1.1.
---
gnu/packages/python-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2e1db8a252..e2da05c57f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4263,14 +4263,14 @@ (define-public python-markdown-it-py
(define-public python-markupsafe
(package
(name "python-markupsafe")
- (version "2.0.1")
+ (version "2.1.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "MarkupSafe" version))
(sha256
(base32
- "02k2ynmqvvd0z0gakkf8s4idyb606r7zgga41jrkhqmigy06fk2r"))))
+ "0jqxp5sfrc0byp6bk0gwdmildi4mck2gprp42afri3z4r5y1k4bz"))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
--
2.38.1
kiasoc5 wrote 2 years ago
[PATCH 4/8] gnu: python-flask: Update to 2.2.2.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-4-kiasoc5@disroot.org
* 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(-)

Toggle diff (22 lines)
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
kiasoc5 wrote 2 years ago
[PATCH 8/8] gnu: searx: Update to 1.1.0.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-8-kiasoc5@disroot.org
* gnu/packages/search.scm (searx): Update to 1.1.0.
[propagated-inputs]: Remove python-idna and python-lxml; add python-brotli,
python-lxml-4.9, and python-setproctitle.
---
gnu/packages/search.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 27dc9cd02e..b25903facc 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -259,16 +259,16 @@ (define-public tocc
(define-public searx
(package
(name "searx")
- (version "1.0.0")
+ (version "1.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/searx/searx")
- (commit version)))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0ghkx8g8jnh8yd46p4mlbjn2zm12nx27v7qflr4c8xhlgi0px0mh"))))
+ (base32 "070kxivn1nxn3klmnqarr2zldyfpyllpv5cnjdp5kqz19zb20szr"))))
(build-system python-build-system)
(arguments
`(#:tests? #f ;what tests do is make online requests to each engine
@@ -287,17 +287,18 @@ (define-public searx
(setenv "SEARX_DEBUG" "1"))))))
(propagated-inputs
(list python-babel
+ python-brotli
python-certifi
python-dateutil
python-flask
python-flask-babel
- python-idna
python-jinja2
python-langdetect
- python-lxml
+ python-lxml-4.9
python-pygments
python-pyyaml
- python-requests))
+ python-requests
+ python-setproctitle))
(home-page "https://searx.github.io/searx/")
(synopsis "Privacy-respecting metasearch engine")
(description "Searx is a privacy-respecting, hackable metasearch engine.")
--
2.38.1
kiasoc5 wrote 2 years ago
[PATCH 5/8] gnu: python-werkzeug: Update to 2.2.2.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-5-kiasoc5@disroot.org
* 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(-)

Toggle diff (47 lines)
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
kiasoc5 wrote 2 years ago
[PATCH 7/8] gnu: python-jinja2: Update to 3.1.2.
(address . 59764@debbugs.gnu.org)(name . kiasoc5)(address . kiasoc5@disroot.org)
20221202055919.58982-7-kiasoc5@disroot.org
* gnu/packages/python-xyz.scm (python-jinja2): Update to 3.1.2.
---
gnu/packages/python-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e2da05c57f..922c9a7591 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4291,14 +4291,14 @@ (define-public python-markupsafe
(define-public python-jinja2
(package
(name "python-jinja2")
- (version "3.1.1")
+ (version "3.1.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Jinja2" version))
(sha256
(base32
- "1saawzys14l1p4kafs7hkihmnvqjq8fwxjmkjiqx3jq1nm5ys2v4"))))
+ "0lp86yadzf8dph67f6g3yxmvnhrzzi863z58jmsrx2j059q1ld9i"))))
(build-system python-build-system)
(arguments
'(#:phases (modify-phases %standard-phases
--
2.38.1
kiasoc5 wrote 1 years ago
(no subject)
(name . Control)(address . control@debbugs.gnu.org)
1a3bd7b7e7e43e505f7ac758888484b7@disroot.org
close 59764
thanks

searx has been archived on Sep 7, 2023. It should be deprecated in favor
of searxng.
?
Your comment

This issue is archived.

To comment on this conversation send an email to 59764@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 59764
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help