From 7deb0868645fcf64803a026750251258b2101bad Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Thu, 11 Jul 2019 15:42:10 -0500 Subject: gnu: Add python-urllib3-1.24. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-urllib3-1.24): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e441cbaa81..04f53740e4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1528,6 +1528,18 @@ (define-public python-urllib3 supports url redirection and retries, and also gzip and deflate decoding.") (license license:expat))) +;; Some software requires an older version of urllib3, notably Docker. +(define-public python-urllib3-1.24 + (package (inherit python-urllib3) + (version "1.24.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "urllib3" version)) + (sha256 + (base32 + "1x0slqrv6kixkbcdnxbglvjliwhc1payavxjvk8fvbqjrnasd4r3")))))) + + (define-public python2-urllib3 (package-with-python2 python-urllib3)) -- cgit v1.2.3 From 97f0bd7d68f6845c91c01dffb5181c928db5108f Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Thu, 11 Jul 2019 15:41:26 -0500 Subject: gnu: Add python-requests-2.20. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-requests-2.20): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 04f53740e4..72d4eba0ff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1352,6 +1352,22 @@ (define-public python-requests than Python’s urllib2 library.") (license license:asl2.0))) +;; Some software requires an older version of Requests, notably Docker/Docker +;; Compose. +(define-public python-requests-2.20 + (package (inherit python-requests) + (version "2.20.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "requests" version)) + (sha256 + (base32 + "0qzj6cgv3k9wyj7wlxgz7xq0cfg4jbbkfm24pp8dnhczwl31527a")))) + (propagated-inputs + `(("python-urllib3" ,python-urllib3-1.24) + ("python-idna" ,python-idna-2.7) + ,@(package-propagated-inputs python-requests))))) + ;; Some software requires an older version of Requests, notably Docker ;; Compose. (define-public python-requests-2.7 -- cgit v1.2.3 From c31302fda717e08ba82f7ba6092a4a2975af8484 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Fri, 12 Jul 2019 23:33:47 +0200 Subject: gnu: python-aiorpcx: Update to 0.18.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-aiorpcx): Update to 0.18.3 Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 72d4eba0ff..408ad88bfb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -154,14 +154,14 @@ (define-public python-aiodns (define-public python-aiorpcx (package (name "python-aiorpcx") - (version "0.10.2") + (version "0.18.3") (source (origin (method url-fetch) (uri (pypi-uri "aiorpcX" version)) (sha256 (base32 - "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj")))) + "0k545hc7wl6sh1svydzbv6x7sx5pig2pqkl3yxs9riwmvzawx9xp")))) (build-system python-build-system) (propagated-inputs `(("python-attrs" ,python-attrs))) -- cgit v1.2.3 From eb71211478e44d093ec907a66c7d70867e259303 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Fri, 12 Jul 2019 23:33:48 +0200 Subject: gnu: python-aiohttp: Update to 3.5.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-aiohttp): Update to 3.5.4. Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 408ad88bfb..1b899871d8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -75,14 +75,14 @@ (define-module (gnu packages python-web) (define-public python-aiohttp (package (name "python-aiohttp") - (version "3.4.4") + (version "3.5.4") (source (origin (method url-fetch) (uri (pypi-uri "aiohttp" version)) (sha256 (base32 - "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi")))) + "1gy95ni8rkdwzir9zf14ivpfwp02g69xbhibldykff0rzbs86k4w")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;missing pytest-timeout -- cgit v1.2.3 From bd105b78b018ce3ac921111f126204437b55a8f1 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Fri, 12 Jul 2019 23:41:10 +0200 Subject: gnu: python-aiorpcx: capitalize description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-web.scm (python-aiorpcx): capitalize description Signed-off-by: Ludovic Courtès --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1b899871d8..7047c515e2 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -168,8 +168,8 @@ (define-public python-aiorpcx (home-page "https://github.com/kyuupichan/aiorpcX") (synopsis "Generic asyncio RPC implementation") (description - "aiorpcX is a generic asyncio library implementation of RPC suitable for -an application that is a client, server or both. + "The aiorpcX library is a generic asyncio implementation of RPC suitable +for an application that is a client, server or both. The package includes a module with full coverage of JSON RPC versions 1.0 and 2.0, JSON RPC protocol auto-detection, and arbitrary message framing. It also -- cgit v1.2.3 From 6e00b1ea62584b55d6019fd81943aebba853729a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 17:20:24 +0200 Subject: gnu: python-cachecontrol: Do not use unstable source archive. * gnu/packages/python-web.scm (python-cachecontrol)[source]: Change to GIT-FETCH. --- gnu/packages/python-web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7047c515e2..d1ca5a1947 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1982,15 +1982,15 @@ (define-public python-cachecontrol (version "0.11.6") (source (origin - (method url-fetch) + (method git-fetch) ;; Pypi does not have tests. - (uri (string-append - "https://github.com/ionrock/cachecontrol/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (git-reference + (url "https://github.com/ionrock/cachecontrol") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0yj60d0f69a2l8p7y86k4zhzzm6rnxpq74sfl240pry9l0lfw2vw")))) + "0pb16bzbkk99nh317xyfk8fxc2ngimsbz7lz9pxsw8c82n83d4dh")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From d1b103e14b3fc566f3bae98b9f2d2d484d963088 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 17 Jul 2019 11:48:49 +0200 Subject: gnu: Add python-flask-htpasswd. * gnu/packages/python-web.scm (python-flask-htpasswd): New variable. --- gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d1ca5a1947..8e5324b37e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2191,6 +2191,30 @@ (define-public python-flask-basicauth "This package provides HTTP basic access authentication for Flask.") (license license:bsd-3))) +(define-public python-flask-htpasswd + (package + (name "python-flask-htpasswd") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flask-htpasswd" version)) + (sha256 + (base32 + "14q1y1y9i9bhabdnwd25jqzc4ljli23smxfyyh8abxz1vq93pxra")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flask" ,python-flask) + ("python-itsdangerous" ,python-itsdangerous) + ("python-passlib" ,python-passlib) + ("python-tox" ,python-tox))) + (home-page "http://github.com/carsongee/flask-htpasswd") + (synopsis "Basic authentication via htpasswd files in Flask applications") + (description "This package provides Basic authentication via +@file{htpasswd} files and access_token authentication in Flask +applications.") + (license license:bsd-3))) + (define-public python-flask-sqlalchemy (package (name "python-flask-sqlalchemy") -- cgit v1.2.3