Some searx requirements

Some searx requirements

[contact.ng0]

These come from a branch so old I just had to start from from scratch again.
While I was at it, I saw some of them were being added to a new python branch, but I can't filter that out and rebase against a moving-target branch.

I'm trying to get searx to work again, patches should work on their own, though I need a comment on gunicorn and the one which adds pysocks as an input to some package. I never packaged a python based server (? gunicorn is a server right?) and lately I haven't been messing around with this branch so I don't know about the pysocks thing, except that searx needs this for the tor capability.

[PATCH 1/9] gnu: python-dateutils-2: Update to 2.5.3.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-dateutils-2): Update to 2.5.3.
---
 gnu/packages/python.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d53eea189..5b4d2b09c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@@ -1063,14 +1063,14 @@ Python file, so it can be easily copied into your project.")
 (define-public python-dateutil-2
   (package
     (name "python-dateutil")
-    (version "2.5.2")
+    (version "2.5.3")
     (source
      (origin
       (method url-fetch)
       (uri (pypi-uri "python-dateutil" version))
       (sha256
        (base32
-        "0jrfpcgvgya6hs45dhrd9yiqgdgz9qp9aa07zsw8gqgn8zphff86"))))
+        "1v9j9fmf8g911yg6k01xa2db6dx3wv73zkk7fncsj7vagjqgs20l"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-six" ,python-six)))
-- 
2.11.0

Re: [PATCH 1/9] gnu: python-dateutils-2: Update to 2.5.3.

[Danny Milosavljevic]

Hi ng0,

I've fixed the typo in the commit message (s/dateutils/dateutil/) and applied to master, commit 6bd9ad6942d29163b87ca732ce562a098147513b. It causes rebuild of 56 packages.

[PATCH 2/9] gnu: Add python-gunicorn.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/web.scm (python-gunicorn): New variable.
---
 gnu/packages/web.scm | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8cc80a2c4..1803f58e9 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
@@ -4018,3 +4018,29 @@ service for that request.  Requests are made using port numbers as identifiers
 and xinetd usually launches another daemon to handle the request.  It can be
 used to start services with both privileged and non-privileged port numbers.")
     (license (l:fsf-free "file://COPYRIGHT"))))
+
+(define-public python-gunicorn
+  (package
+    (name "python-gunicorn")
+    (version "19.6.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "gunicorn" version))
+       (sha256
+        (base32
+         "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1"))))
+    (build-system python-build-system)
+    (arguments
+     ;; XXX: Tests require older versions of pytest-cov and other packages.
+     `(#:tests? #f))
+    (inputs
+     `(("python-sphinx" ,python-sphinx)))
+    (home-page "http://gunicorn.org")
+    (synopsis "WSGI HTTP Server")
+    (description
+     "Gunicorn ('Green Unicorn') is a WSGI HTTP Server.")
+    (license l:expat)))
+
+(define-public python2-gunicorn
+  (package-with-python2 python-gunicorn))
-- 
2.11.0

Re: [PATCH 2/9] gnu: Add python-gunicorn.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 2210 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/web.scm (python-gunicorn): New variable.
> ---
>  gnu/packages/web.scm | 28 +++++++++++++++++++++++++++-
>  1 file changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 8cc80a2c4..1803f58e9 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -13,7 +13,7 @@
>  ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
>  ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
>  ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
> -;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
> +;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>  ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2016 Bake Timmons <b3timmons@speedymail.org>
> @@ -4018,3 +4018,29 @@ service for that request.  Requests are made using port numbers as identifiers
>  and xinetd usually launches another daemon to handle the request.  It can be
>  used to start services with both privileged and non-privileged port numbers.")
>      (license (l:fsf-free "file://COPYRIGHT"))))
> +
> +(define-public python-gunicorn
> +  (package
> +    (name "python-gunicorn")
> +    (version "19.6.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "gunicorn" version))
> +       (sha256
> +        (base32
> +         "065n5z91607q4l8wncqkz297cdcb60cz8wnyxy88wk4as4b6jgw1"))))
> +    (build-system python-build-system)
> +    (arguments
> +     ;; XXX: Tests require older versions of pytest-cov and other packages.
> +     `(#:tests? #f))
> +    (inputs
> +     `(("python-sphinx" ,python-sphinx)))

This should probably be a native-input (used at build-time to build the
documentation, I guess?).

> +    (home-page "http://gunicorn.org")
> +    (synopsis "WSGI HTTP Server")
> +    (description
> +     "Gunicorn ('Green Unicorn') is a WSGI HTTP Server.")
> +    (license l:expat)))
> +
> +(define-public python2-gunicorn
> +  (package-with-python2 python-gunicorn))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[PATCH 3/9] gnu: Add python-httpbin.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/web.scm (python-httpbin): New variable.
---
 gnu/packages/web.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1803f58e9..244672c9d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4044,3 +4044,37 @@ used to start services with both privileged and non-privileged port numbers.")
 
 (define-public python2-gunicorn
   (package-with-python2 python-gunicorn))
+
+(define-public python-httpbin
+  (package
+    (name "python-httpbin")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "httpbin" version))
+       (sha256
+        (base32
+         "1dc92lnk846hpilslrqnr63x55cxll4qx88gif8fm521gv9cbyvr"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-decorator" ,python-decorator)
+       ("python-flask" ,python-flask)
+       ("python-gevent" ,python-gevent)
+       ("python-greenlet" ,python-greenlet)
+       ("python-gunicorn" ,python-gunicorn)
+       ("python-itsdangerous" ,python-itsdangerous)
+       ("python-jinja2" ,python-jinja2)
+       ("python-markupsafe" ,python-markupsafe)
+       ("python-six" ,python-six)
+       ("python-werkzeug" ,python-werkzeug)))
+    (home-page "https://httpbin.org/")
+    (synopsis "HTTP Request and Response Service")
+    (description
+     "@code{httpbin} covers all kinds of HTTP scenarios for testing
+HTTP libraries.  Additional endpoints are being considered.
+All endpoint responses are JSON-encoded, it can be run as a WSGI App.")
+    (license l:expat)))
+
+(define-public python2-httpbin
+  (package-with-python2 python-httpbin))
-- 
2.11.0

Re: [PATCH 3/9] gnu: Add python-httpbin.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 2048 bytes --]

Hi ng0,

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/web.scm (python-httpbin): New variable.
> ---
>  gnu/packages/web.scm | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
>
> diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
> index 1803f58e9..244672c9d 100644
> --- a/gnu/packages/web.scm
> +++ b/gnu/packages/web.scm
> @@ -4044,3 +4044,37 @@ used to start services with both privileged and non-privileged port numbers.")
>  
>  (define-public python2-gunicorn
>    (package-with-python2 python-gunicorn))
> +
> +(define-public python-httpbin
> +  (package
> +    (name "python-httpbin")
> +    (version "0.5.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "httpbin" version))
> +       (sha256
> +        (base32
> +         "1dc92lnk846hpilslrqnr63x55cxll4qx88gif8fm521gv9cbyvr"))))
> +    (build-system python-build-system)
> +    (inputs
> +     `(("python-decorator" ,python-decorator)
> +       ("python-flask" ,python-flask)
> +       ("python-gevent" ,python-gevent)
> +       ("python-greenlet" ,python-greenlet)
> +       ("python-gunicorn" ,python-gunicorn)
> +       ("python-itsdangerous" ,python-itsdangerous)
> +       ("python-jinja2" ,python-jinja2)
> +       ("python-markupsafe" ,python-markupsafe)
> +       ("python-six" ,python-six)
> +       ("python-werkzeug" ,python-werkzeug)))

Shouldn't those be propagated-inputs, as recommended in the guix texinfo
manual for the new python-build-system?

> +    (home-page "https://httpbin.org/")
> +    (synopsis "HTTP Request and Response Service")
> +    (description
> +     "@code{httpbin} covers all kinds of HTTP scenarios for testing
> +HTTP libraries.  Additional endpoints are being considered.
> +All endpoint responses are JSON-encoded, it can be run as a WSGI App.")
> +    (license l:expat)))
> +
> +(define-public python2-httpbin
> +  (package-with-python2 python-httpbin))

Regards,

Maxim

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[PATCH 4/9] gnu: Add python-pytest-httpbin.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-pytest-httpbin): New variable.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5b4d2b09c..e8d1c5697 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1946,6 +1946,35 @@ result back.")
 (define-public python2-pytest-xdist
   (package-with-python2 python-pytest-xdist))
 
+(define-public python-pytest-httpbin
+  (package
+    (name "python-pytest-httpbin")
+    (version "0.2.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-httpbin" version))
+       (sha256
+        (base32
+         "1y0v2v7xpzpyd4djwp7ad8ifnlxp8r1y6dfbxg5ckzvllkgridn5"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-flask" ,python-flask)
+       ("python-decorator" ,python-decorator)
+       ("python-httpbin" ,python-httpbin)
+       ("python-pytest" ,python-pytest)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/kevin1024/pytest-httpbin")
+    (synopsis "Test your HTTP library against a local copy of httpbin")
+    (description
+     "Pytest-httpbin creates a pytest fixture that is dependency-injected
+into your tests.  It automatically starts up a HTTP server in a separate
+thread running httpbin and provides your test with the URL in the fixture.")
+    (license license:expat)))
+
+(define-public python2-pytest-httpbin
+  (package-with-python2 python-pytest-httpbin))
+
 (define-public python-scripttest
   (package
     (name "python-scripttest")
-- 
2.11.0

[PATCH 5/9] gnu: Add python-pysocks.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-pysocks): New variable.
---
 gnu/packages/python.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e8d1c5697..9c3a031e1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3970,6 +3970,30 @@ as the original project seems to have been abandoned circa 2007.")
 (define-public python2-socksipy-branch
   (package-with-python2 python-socksipy-branch))
 
+(define-public python-pysocks
+  (package
+    (name "python-pysocks")
+    (version "1.5.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "PySocks" version))
+       (sha256
+        (base32
+         "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; Tests are optional and use a prebuilt mocks
+    (home-page "https://github.com/Anorov/PySocks")
+    (synopsis "Python SOCKS client module")
+    (description
+     "Semi-actively maintained SocksiPy fork which contains many
+improvements to the original.")
+    (license license:bsd-3)))
+
+(define-public python2-pysocks
+  (package-with-python2 python-pysocks))
+
 (define-public python-sqlalchemy
   (package
     (name "python-sqlalchemy")
-- 
2.11.0

[PATCH 6/9] gnu: Add python-pytest-httpbin-0.0.7.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-pytest-httpbin-0.0.7): New variable.
---
 gnu/packages/python.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9c3a031e1..7bdd371b5 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1975,6 +1975,29 @@ thread running httpbin and provides your test with the URL in the fixture.")
 (define-public python2-pytest-httpbin
   (package-with-python2 python-pytest-httpbin))
 
+;; Some packages like "searx" need this old version.
+(define-public python-pytest-httpbin-0.0.7
+  (package
+    (inherit python-pytest-httpbin)
+    (version "0.0.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest-httpbin" version))
+       (sha256
+        (base32
+         "08ghq923dn33rllip3vap2p9fb680g0i96jdn5lcpfy8amq8mbq3"))))))
+
+(define-public python2-pytest-httpbin-0.0.7
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-pytest-httpbin-0.0.7)))
+    (inputs
+     `(("python2-flask" ,python2-flask)
+       ("python2-decorator" ,python2-decorator)
+       ("python2-httpbin" ,python2-httpbin)
+       ("python2-six" ,python2-six)))))
+
 (define-public python-scripttest
   (package
     (name "python-scripttest")
-- 
2.11.0

Re: [PATCH 6/9] gnu: Add python-pytest-httpbin-0.0.7.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 1661 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/python.scm (python-pytest-httpbin-0.0.7): New variable.
> ---
>  gnu/packages/python.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 9c3a031e1..7bdd371b5 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1975,6 +1975,29 @@ thread running httpbin and provides your test with the URL in the fixture.")
>  (define-public python2-pytest-httpbin
>    (package-with-python2 python-pytest-httpbin))
>  
> +;; Some packages like "searx" need this old version.
> +(define-public python-pytest-httpbin-0.0.7
> +  (package
> +    (inherit python-pytest-httpbin)
> +    (version "0.0.7")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "pytest-httpbin" version))
> +       (sha256
> +        (base32
> +         "08ghq923dn33rllip3vap2p9fb680g0i96jdn5lcpfy8amq8mbq3"))))))
> +
> +(define-public python2-pytest-httpbin-0.0.7
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-pytest-httpbin-0.0.7)))
> +    (inputs
> +     `(("python2-flask" ,python2-flask)
> +       ("python2-decorator" ,python2-decorator)
> +       ("python2-httpbin" ,python2-httpbin)
> +       ("python2-six" ,python2-six)))))
> +

Again, shouldn't those be propagated-inputs? Unless I missed something
this was the recommendation going forward for Python runtime dependencies.

>  (define-public python-scripttest
>    (package
>      (name "python-scripttest")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 6/9] gnu: Add python-pytest-httpbin-0.0.7.

[ng0]

On 17-02-05 15:22:20, Maxim Cournoyer wrote:
> contact.ng0@cryptolab.net writes:
> 
> > From: ng0 <ng0@libertad.pw>
> >
> > * gnu/packages/python.scm (python-pytest-httpbin-0.0.7): New variable.
> > ---
> >  gnu/packages/python.scm | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index 9c3a031e1..7bdd371b5 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -1975,6 +1975,29 @@ thread running httpbin and provides your test with the URL in the fixture.")
> >  (define-public python2-pytest-httpbin
> >    (package-with-python2 python-pytest-httpbin))
> >  
> > +;; Some packages like "searx" need this old version.
> > +(define-public python-pytest-httpbin-0.0.7
> > +  (package
> > +    (inherit python-pytest-httpbin)
> > +    (version "0.0.7")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (pypi-uri "pytest-httpbin" version))
> > +       (sha256
> > +        (base32
> > +         "08ghq923dn33rllip3vap2p9fb680g0i96jdn5lcpfy8amq8mbq3"))))))
> > +
> > +(define-public python2-pytest-httpbin-0.0.7
> > +  (package
> > +    (inherit (package-with-python2
> > +              (strip-python2-variant python-pytest-httpbin-0.0.7)))
> > +    (inputs
> > +     `(("python2-flask" ,python2-flask)
> > +       ("python2-decorator" ,python2-decorator)
> > +       ("python2-httpbin" ,python2-httpbin)
> > +       ("python2-six" ,python2-six)))))
> > +
> 
> Again, shouldn't those be propagated-inputs? Unless I missed something
> this was the recommendation going forward for Python runtime dependencies.
> 
> >  (define-public python-scripttest
> >    (package
> >      (name "python-scripttest")

Definitely. These patches predate the proposed changes and I didn't
check all of them.

I don't have the time to apply changes this work week. I'll see to apply
changes on sunday or monday.

Any reviews etc in the next days are considered with the next patch
submission.

Thanks!
-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

[PATCH 7/9] gnu: python-pytest: Update to 3.0.5.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-pytest): Update to 3.0.5.
[source]: Use "pypi-uri".
---
 gnu/packages/python.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7bdd371b5..a4179a67a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1738,16 +1738,14 @@ code introspection, and logging.")
 (define-public python-pytest
   (package
     (name "python-pytest")
-    (version "2.7.3")
+    (version "3.0.5")
     (source
      (origin
        (method url-fetch)
-       (uri (string-append
-             "https://pypi.python.org/packages/source/p/pytest/pytest-"
-             version ".tar.gz"))
+       (uri (pypi-uri "pytest" version))
        (sha256
         (base32
-         "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"))
+         "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a"))
        (modules '((guix build utils)))
        (snippet
         ;; One of the tests involves the /usr directory, so it fails.
@@ -1758,6 +1756,7 @@ code introspection, and logging.")
     (propagated-inputs
      `(("python-py" ,python-py)))
     (native-inputs
+     ;; If we add python-hypothesis here, it creates an circular depedency.
      `(("python-nose" ,python-nose)
        ("python-mock" ,python-mock)))
     (home-page "http://pytest.org")
-- 
2.11.0

Re: [PATCH 7/9] gnu: python-pytest: Update to 3.0.5.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]

contact.ng0@cryptolab.net writes:

> From: ng0 <ng0@libertad.pw>
>
> * gnu/packages/python.scm (python-pytest): Update to 3.0.5.
> [source]: Use "pypi-uri".
> ---
>  gnu/packages/python.scm | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 7bdd371b5..a4179a67a 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1738,16 +1738,14 @@ code introspection, and logging.")
>  (define-public python-pytest
>    (package
>      (name "python-pytest")
> -    (version "2.7.3")
> +    (version "3.0.5")
>      (source
>       (origin
>         (method url-fetch)
> -       (uri (string-append
> -             "https://pypi.python.org/packages/source/p/pytest/pytest-"
> -             version ".tar.gz"))
> +       (uri (pypi-uri "pytest" version))
>         (sha256
>          (base32
> -         "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"))
> +         "1z9pj39w0r2gw5hsqndlmsqa80kgbrann5kfma8ww8zhaslkl02a"))
>         (modules '((guix build utils)))
>         (snippet
>          ;; One of the tests involves the /usr directory, so it fails.
> @@ -1758,6 +1756,7 @@ code introspection, and logging.")
>      (propagated-inputs
>       `(("python-py" ,python-py)))
>      (native-inputs
> +     ;; If we add python-hypothesis here, it creates an circular
> depedency.

s/depedency/dependency/

>       `(("python-nose" ,python-nose)
>         ("python-mock" ,python-mock)))
>      (home-page "http://pytest.org")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[PATCH 8/9] gnu: python-requests: Update to 2.12.4.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-requests): Update to 2.12.4.
---
 gnu/packages/python.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a4179a67a..6ad40dfde 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2492,19 +2492,20 @@ installed with a newer @code{pip} or with wheel's own command line utility.")
 (define-public python-requests
   (package
     (name "python-requests")
-    (version "2.9.1")
+    (version "2.12.4")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "requests" version))
              (sha256
               (base32
-               "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5"))))
+               "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-py" ,python-py)
        ("python-pytest" ,python-pytest)
        ("python-pytest-cov" ,python-pytest-cov)
-       ("python-wheel" ,python-wheel)))
+       ("python-wheel" ,python-wheel)
+       ("python-pytest-httpbin-0.0.7" ,python-pytest-httpbin-0.0.7)))
     (home-page "http://python-requests.org/")
     (synopsis "Python HTTP library")
     (description
-- 
2.11.0

[PATCH 9/9] gnu: python-requests: Add python-pysocks to propagated-inputs.

[contact.ng0]

From: ng0 <ng0@libertad.pw>

* gnu/packages/python.scm (python-requests)[propagated-inputs]: Add python-pysocks.
---
 gnu/packages/python.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6ad40dfde..4d3b5e997 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2506,6 +2506,8 @@ installed with a newer @code{pip} or with wheel's own command line utility.")
        ("python-pytest-cov" ,python-pytest-cov)
        ("python-wheel" ,python-wheel)
        ("python-pytest-httpbin-0.0.7" ,python-pytest-httpbin-0.0.7)))
+    (propagated-inputs
+     `(("python-pysocks" ,python-pysocks)))
     (home-page "http://python-requests.org/")
     (synopsis "Python HTTP library")
     (description
-- 
2.11.0

Re: Some searx requirements

[ng0]

On 17-02-04 16:34:57, contact.ng0@cryptolab.net wrote:
> These come from a branch so old I just had to start from from scratch again.
> While I was at it, I saw some of them were being added to a new python branch, but I can't filter that out and rebase against a moving-target branch.
> 
> I'm trying to get searx to work again, 

Of course I meant to say: I'm trying to get searx to work. If we already
had it, that would be great ;)

>patches should work on their own, though I need a comment on gunicorn and the one which adds pysocks as an input to some package. I never packaged a python based server (? gunicorn is a server right?) and lately I haven't been messing around with this branch so I don't know about the pysocks thing, except that searx needs this for the tor capability.
> 
> 

-- 
ng0 -- https://www.inventati.org/patternsinthechaos/