From 44b885656aa1eb1d2dff9ecda35149c71d51b1fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:10:51 +0100 Subject: gnu: python-werkzeug: Update to 1.0.0. * gnu/packages/python-web.scm (python-werkzeug): Update to 1.0.0. [source](uri): Capitalize PyPI project name. [native-inputs]: Add PYTHON-PYTEST-TIMEOUT. --- gnu/packages/python-web.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 07c1ceb2db..d1e09fc727 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2783,14 +2783,14 @@ List. Forked from and using the same API as the publicsuffix package.") (define-public python-werkzeug (package (name "python-werkzeug") - (version "0.14.1") + (version "1.0.0") (source (origin (method url-fetch) - (uri (pypi-uri "werkzeug" version)) + (uri (pypi-uri "Werkzeug" version)) (sha256 (base32 - "0z2m4snn1vc9518r2vzgdj1nc90kcgi60wijvd29yvcp85ypmzf3")))) + "15kh0z61klp62mrc1prka13xsshxn0rsp1j1s2964iw86yisi6qn")))) (build-system python-build-system) (arguments '(#:phases @@ -2803,7 +2803,8 @@ List. Forked from and using the same API as the publicsuffix package.") (propagated-inputs `(("python-requests" ,python-requests))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-pytest-timeout" ,python-pytest-timeout))) (home-page "https://www.palletsprojects.org/p/werkzeug/") (synopsis "Utilities for WSGI applications") (description "One of the most advanced WSGI utility modules. It includes a -- cgit v1.3 From 15af040cc35895e779397ab42f53561666d9301a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:27:50 +0100 Subject: gnu: python-flask: Update to 1.1.1. * gnu/packages/python-web.scm (python-flask): Update to 1.1.1. --- gnu/packages/python-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d1e09fc727..985d03f8d1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1728,20 +1728,22 @@ minimum of WSGI.") (define-public python-flask (package (name "python-flask") - (version "1.0.3") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Flask" version)) (sha256 (base32 - "1wxnhjlxwwjhjxmghykjhllpahv5pkdc5hln4ab6nab43s26sz5d")))) + "0ljdjgyjn7vh8ic1n1dc2l1cl421i6pr3kx5sz2w5irhyfbg3y8k")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "python" "-m" "pytest")))))) + (setenv "PYTHONPATH" (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv" "tests")))))) (native-inputs `(("python-pytest" ,python-pytest))) (propagated-inputs -- cgit v1.3 From 4393dafd320ad5d10d8c87d4ae46ce21fdd4ffb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:33:57 +0100 Subject: gnu: python-flask-login: Update to 0.5.0. * gnu/packages/python-web.scm (python-flask-login): Update to 0.5.0. [arguments]: Remove. [native-inputs]: Remove PYTHON-NOSE and PYTHON-PEP8. Add PYTHON-COVERAGE, PYTHON-PYCODESTYLE. and PYTHON-PYTEST. --- gnu/packages/python-web.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 985d03f8d1..b17de9953f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2394,7 +2394,7 @@ on the command line.") (define-public python-flask-login (package (name "python-flask-login") - (version "0.4.1") + (version "0.5.0") (source (origin (method git-fetch) @@ -2403,25 +2403,18 @@ on the command line.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'avoid-yanc - ;; Work around '.nosetests-real: error: no such option: --with-yanc'. - (lambda _ - (setenv "NOCOLOR" "set") - #t))))) + (base32 "11ac924w0y4m0kf3mxnxdlidy88jfa7njw5yyrq16dvnx4iwd8gg")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask))) (native-inputs ;; For tests. `(("python-blinker" ,python-blinker) + ("python-coverage" ,python-coverage) ("python-mock" ,python-mock) - ("python-nose" ,python-nose) - ("python-pep8" ,python-pep8) + ("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes) + ("python-pytest" ,python-pytest) ("python-semantic-version" ,python-semantic-version) ("python-werkzeug" ,python-werkzeug))) (home-page "https://github.com/maxcountryman/flask-login") -- cgit v1.3 From 33901ed8c0a85e9b0badbc7ea042d310bdfac970 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:41:51 +0100 Subject: gnu: python-flask-babel: Update to 1.0.0. * gnu/packages/python-web.scm (python-flask-babel): Update to 1.0.0. [arguments]: New field. --- gnu/packages/python-web.scm | 10 ++++++++-- 1 file changed, 8 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 b17de9953f..b87764b907 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -440,15 +440,21 @@ between a web browser and web server.") (define-public python-flask-babel (package (name "python-flask-babel") - (version "0.11.2") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "Flask-Babel" version)) (sha256 (base32 - "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0")))) + "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (with-directory-excursion "tests" + (invoke "python" "tests.py"))))))) (propagated-inputs `(("python-flask" ,python-flask) ("python-babel" ,python-babel) -- cgit v1.3 From 8f29817ed523dd4e5dbd459ecb94dbd1cab6a4fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:43:25 +0100 Subject: gnu: python-flask-wtf: Update to 0.14.3. * gnu/packages/python-web.scm (python-flask-wtf): Update to 0.14.3. [arguments]: Remove obsolete phase. Override check phase. [native-inputs]: Remove PYTHON-NOSE. Add PYTHON-PYTEST. --- gnu/packages/python-web.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b87764b907..6d4204bad0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1770,31 +1770,29 @@ presume or force a developer to use a particular tool or library.") (define-public python-flask-wtf (package (name "python-flask-wtf") - (version "0.13.1") + (version "0.14.3") (source (origin (method url-fetch) (uri (pypi-uri "Flask-WTF" version)) (sha256 (base32 - "04l5743j2dici46038sqlzvf0xzpg8rf7s9ld2x24xv7f4idg990")))) + "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'check 'drop-failing-test + (replace 'check (lambda _ - ;; FIXME: This file tries resolving an external server, which - ;; fails. Try to patch out the offending section instead of - ;; deleting the whole thing. - (delete-file "tests/test_recaptcha.py") - #t))))) + (setenv "PYTHONPATH" (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) (propagated-inputs `(("python-flask-babel" ,python-flask-babel) ("python-babel" ,python-babel) ("python-wtforms" ,python-wtforms))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/lepture/flask-wtf") (synopsis "Simple integration of Flask and WTForms") (description "Flask-WTF integrates Flask and WTForms, including CSRF, file -- cgit v1.3 From 0a044f75b54d92417debf600fe7c4c4f86af344d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:55:16 +0100 Subject: gnu: python-flask-restful: Update to 0.3.8. * gnu/packages/patches/python-flask-restful-werkzeug-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-web.scm (python-flask-restful): Update to 0.3.8. [source](patches): New field. [native-inputs]: Remove PYTHON-SPHINX. --- gnu/local.mk | 1 + .../python-flask-restful-werkzeug-compat.patch | 36 ++++++++++++++++++++++ gnu/packages/python-web.scm | 8 ++--- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/python-flask-restful-werkzeug-compat.patch (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 3be54b2627..1dd7e0a6a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1327,6 +1327,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ + %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ diff --git a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch new file mode 100644 index 0000000000..0e928ef455 --- /dev/null +++ b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch @@ -0,0 +1,36 @@ +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 6d4204bad0..ae01f83611 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2173,14 +2173,15 @@ pretty printer and a tree visitor.") (define-public python-flask-restful (package (name "python-flask-restful") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) (uri (pypi-uri "Flask-RESTful" version)) + (patches (search-patches "python-flask-restful-werkzeug-compat.patch")) (sha256 (base32 - "1a9cbwkr6krryyzq4sd3f415nkkc6dyfls5i3pgyibs94g0hw97q")))) + "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay")))) (build-system python-build-system) (propagated-inputs `(("python-aniso8601" ,python-aniso8601) @@ -2191,8 +2192,7 @@ pretty printer and a tree visitor.") `(;; Optional dependency of Flask. Tests need it. ("python-blinker" ,python-blinker) ("python-mock" ,python-mock) ; For tests - ("python-nose" ,python-nose) ; For tests - ("python-sphinx" ,python-sphinx))) + ("python-nose" ,python-nose))) ;for tests (home-page "https://www.github.com/flask-restful/flask-restful/") (synopsis -- cgit v1.3 From e5b4b8028ae59eab96b12df5e1e615cb63fca8ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:08:26 +0100 Subject: gnu: python-flask-restful-swagger: Update to 0.20.1. * gnu/packages/python-web.scm (python-flask-restful-swagger): Update to 0.20.1. [arguments]: New field. Explicitly disable tests. --- gnu/packages/python-web.scm | 5 +++-- 1 file changed, 3 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 ae01f83611..19d3255d79 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2309,15 +2309,16 @@ documentation builder.") (define-public python-flask-restful-swagger (package (name "python-flask-restful-swagger") - (version "0.19") + (version "0.20.1") (source (origin (method url-fetch) (uri (pypi-uri "flask-restful-swagger" version)) (sha256 (base32 - "16msl8hd5xjmj833bpy264v98cpl5hkw5bgl5gf5vgndxbv3rm6v")))) + "1p66f98b5zpypnnz56pxpbirchqj6aniw6qyrp8h572l0dn9xlvq")))) (build-system python-build-system) + (arguments '(#:tests? #f)) ;no tests (propagated-inputs `(("python-flask-restful" ,python-flask-restful))) (home-page "https://github.com/rantav/flask-restful-swagger") -- cgit v1.3 From b85822eaf9b8c85d0a579e37df813d35c3e5d314 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:14:48 +0100 Subject: gnu: python-flask-migrate: Update to 2.5.3. * gnu/packages/python-web.scm (python-flask-migrate): Update to 2.5.3. --- 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 19d3255d79..1000784d6d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2606,14 +2606,14 @@ itself.") (define-public python-flask-migrate (package (name "python-flask-migrate") - (version "2.0.3") + (version "2.5.3") (source (origin (method url-fetch) (uri (pypi-uri "Flask-Migrate" version)) (sha256 (base32 - "107x78lkqsnbg92dld3dkagg07jvchp3ib3y0sivc4ipz6n1y7rk")))) + "1vip9ww6l18dxffjsggm83k71zkvihxpnhaswpv8klh95s6517d6")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit v1.3 From 066c21cda4a9893a0cc8398d1a4d3f9f1ac1dfbb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:32:31 +0100 Subject: gnu: Remove python2-flask-migrate. Upstream no longer supports Python 2 and there are no dependencies on it in Guix. * gnu/packages/python-web.scm (python2-flask-migrate): Remove variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1000784d6d..e431a072d1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2628,9 +2628,6 @@ Alembic") for Flask programs that are using @code{python-alembic}.") (license license:expat))) -(define-public python2-flask-migrate - (package-with-python2 python-flask-migrate)) - (define-public python-genshi (package (name "python-genshi") -- cgit v1.3 From 5af516544856373e07fb8d57f14b7eef369623a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:34:09 +0100 Subject: gnu: python-zope-interface: Update to 4.7.2. * gnu/packages/python-web.scm (python-zope-interface): Update to 4.7.2. --- 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 e431a072d1..775c87f194 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -992,14 +992,14 @@ dispatching systems can be built.") (define-public python-zope-interface (package (name "python-zope-interface") - (version "4.6.0") + (version "4.7.2") (source (origin (method url-fetch) (uri (pypi-uri "zope.interface" version)) (sha256 (base32 - "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v")))) + "0r9kvb1q3lxrdhxabliv9nwhjsdmn1n0vcjv93rlqkyb7yyh24gx")))) (build-system python-build-system) (native-inputs `(("python-zope-event" ,python-zope-event))) -- cgit v1.3 From 9a1dfda6fa3f2efcb1125f51e854cf788c936387 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:35:03 +0100 Subject: gnu: python-zope-exceptions: Update to 4.3. * gnu/packages/python-web.scm (python-zope-exceptions): Update to 4.3. --- 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 775c87f194..72377f11e6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1017,14 +1017,14 @@ conforming to a given API or contract.") (define-public python-zope-exceptions (package (name "python-zope-exceptions") - (version "4.0.8") + (version "4.3") (source (origin (method url-fetch) (uri (pypi-uri "zope.exceptions" version)) (sha256 (base32 - "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl")))) + "04bjskwas17yscl8bs3l44maxspw1gdji0zcmr499fs420y9r9az")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; circular dependency with zope.testrunner -- cgit v1.3 From 16839ec340414a7cf7cff6427e8cf1756efaef8e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:36:42 +0100 Subject: gnu: python-zope-testing: Update to 4.7. * gnu/packages/python-web.scm (python-zope-testing): Update to 4.7. [source](modules, snippet): Remove. --- gnu/packages/python-web.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 72377f11e6..51e246f513 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1042,20 +1042,14 @@ that have uses outside of the Zope framework.") (define-public python-zope-testing (package (name "python-zope-testing") - (version "4.6.2") + (version "4.7") (source (origin (method url-fetch) (uri (pypi-uri "zope.testing" version)) (sha256 (base32 - "0iiq54hjhkk2gpvzfjac70vyn4r0kw0ngvicshxbdwrkgf2gjq3g")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove pre-compiled .pyc files backup files from source. - (for-each delete-file (find-files "." "(\\.pyc|~)$")) - #t)))) + "1sh3c3i0m8n8fnhqiry0bk3rr356i56ry7calmn57s1pvv8yhsyn")))) (build-system python-build-system) (home-page "https://pypi.org/project/zope.testing/") (synopsis "Zope testing helpers") -- cgit v1.3 From ddacd13d564b38ac2cb3fee7aa6372790d033b2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:42:45 +0100 Subject: gnu: python-zope-testrunner: Update to 5.1. * gnu/packages/python-web.scm (python-zope-testrunner): Update to 5.1. [source](uri): Download tarball instead of zipball. [native-inputs]: Remove UNZIP. Move PYTHON-ZOPE-INTERFACE and PYTHON-ZOPE-EXCEPTIONS ... [propagated-inputs]: ... here. --- gnu/packages/python-web.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 51e246f513..176e54a6ac 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1063,25 +1063,23 @@ forms, HTTP servers, regular expressions, and more.") (define-public python-zope-testrunner (package (name "python-zope-testrunner") - (version "4.4.9") + (version "5.1") (source (origin (method url-fetch) - (uri (pypi-uri "zope.testrunner" version ".zip")) + (uri (pypi-uri "zope.testrunner" version)) (sha256 (base32 - "1r7iqknhh55y45f64mz5hghgvzx34h1i11k350s0avx6q8gznja1")))) + "0w3q66cy4crpj7c0hw0vvvvwf3g931rnvw7wwa20av7yqvv6ajim")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. (native-inputs + `(("python-zope-testing" ,python-zope-testing))) + (propagated-inputs `(("python-six" ,python-six) - ;("python-zope-interface" ,python-zope-interface) ("python-zope-exceptions" ,python-zope-exceptions) - ("python-zope-testing" ,python-zope-testing) - ("unzip" ,unzip))) - (propagated-inputs - `(("python-zope-interface" ,python-zope-interface))) + ("python-zope-interface" ,python-zope-interface))) (home-page "https://pypi.org/project/zope.testrunner/") (synopsis "Zope testrunner script") (description "Zope.testrunner provides a script for running Python @@ -1089,13 +1087,7 @@ tests.") (license license:zpl2.1))) (define-public python2-zope-testrunner - (let ((base (package-with-python2 python-zope-testrunner))) - (package - (inherit base) - (native-inputs - (append (package-native-inputs base) - `(("python2-subunit" ,python2-subunit) - ("python2-mimeparse" ,python2-mimeparse))))))) + (package-with-python2 python-zope-testrunner)) (define-public python-zope-i18nmessageid (package -- cgit v1.3 From ce4b7a44366b0d40699c082fbfa8d985681187c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:55:29 +0100 Subject: gnu: python-zope-i18nmessageid: Update to 5.0.1. * gnu/packages/python-web.scm (python-zope-i18nmessageid): Update to 5.0.1. [native-inputs]: Add PYTHON-COVERAGE and PYTHON-ZOPE-TESTRUNNER. [propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python-web.scm | 9 +++++++-- 1 file changed, 7 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 176e54a6ac..848d5856b5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1092,15 +1092,20 @@ tests.") (define-public python-zope-i18nmessageid (package (name "python-zope-i18nmessageid") - (version "4.0.3") + (version "5.0.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.i18nmessageid" version)) (sha256 (base32 - "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml")))) + "0ndhn4w1qgwkfbwf9vm2bgq418z5g0wmfsgl0d9nz62cd0mi8d4m")))) (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-zope-testrunner" ,python-zope-testrunner))) + (propagated-inputs + `(("python-six" ,python-six))) (home-page "https://pypi.org/project/zope.i18nmessageid/") (synopsis "Message identifiers for internationalization") (description "Zope.i18nmessageid provides facilities for declaring -- cgit v1.3 From a1e9c929fa7e0b8b79f86c32830dad8ca3263b85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:11:59 +0100 Subject: gnu: python-zope-schema: Update to 5.0.1. * gnu/packages/python-web.scm (python-zope-schema): Update to 5.0.1. [propagated-inputs]: Remove PYTHON-ZOPE-EXCEPTIONS. [native-inputs]: Remove PYTHON-NOSE and PYTHON-COVERAGE. Add PYTHON-ZOPE-TESTRUNNER and PYTHON-ZOPE-I18NMESSAGEID. --- gnu/packages/python-web.scm | 11 +++++------ 1 file changed, 5 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 848d5856b5..82185cd81f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1118,25 +1118,24 @@ internationalized messages within program source text.") (define-public python-zope-schema (package (name "python-zope-schema") - (version "4.4.2") + (version "5.0.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.schema" version)) (sha256 (base32 - "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank")))) + "0q93j0x52a42khw12al90jw2bk0wly3jwghql3a25zpwwxvn24ya")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.event. (propagated-inputs `(("python-zope-event" ,python-zope-event) - ("python-zope-exceptions" ,python-zope-exceptions) ("python-zope-interface" ,python-zope-interface))) (native-inputs - `(("python-zope-testing" ,python-zope-testing) - ("python-coverage" ,python-coverage) - ("python-nose" ,python-nose))) + `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) (home-page "https://pypi.org/project/zope.schema/") (synopsis "Zope data schemas") (description "Zope.scheme provides extensions to zope.interface for -- cgit v1.3 From 2585304c6ea7293b71f8db4dd00cd11cb3e07cb5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:15:28 +0100 Subject: gnu: python-zope-configuration: Update to 4.3.1. * gnu/packages/python-web.scm (python-zope-configuration): Update to 4.3.1. [native-inputs]: Add PYTHON-ZOPE-TESTING and PYTHON-ZOPE-TESTRUNNER. [propagated-inputs]: Add PYTHON-ZOPE-INTERFACE. --- gnu/packages/python-web.scm | 8 ++++++-- 1 file changed, 6 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 82185cd81f..b1e60bc2a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1148,18 +1148,22 @@ defining data schemas.") (define-public python-zope-configuration (package (name "python-zope-configuration") - (version "4.0.3") + (version "4.3.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.configuration" version)) (sha256 (base32 - "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n")))) + "1qb88764fd7nkkmqv7fl9bxd1jirynkg5vbqkpqdiffnkxzp85kf")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. + (native-inputs + `(("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-interface" ,python-zope-interface) ("python-zope-schema" ,python-zope-schema))) (home-page "https://pypi.org/project/zope.configuration/") (synopsis "Zope Configuration Markup Language") -- cgit v1.3 From a3a7a0331282a4d39f0f7c71ab551fc3038e835b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:18:04 +0100 Subject: gnu: python-zope-proxy: Update to 4.3.4. * gnu/packages/python-web.scm (python-zope-proxy): Update to 4.3.4. [native-inputs]: Add PYTHON-ZOPE-TESTRUNNER. --- gnu/packages/python-web.scm | 6 ++++-- 1 file changed, 4 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 b1e60bc2a1..43f62883a8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1177,17 +1177,19 @@ Markup Language.") (define-public python-zope-proxy (package (name "python-zope-proxy") - (version "4.1.6") + (version "4.3.4") (source (origin (method url-fetch) (uri (pypi-uri "zope.proxy" version)) (sha256 (base32 - "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4")))) + "1g0rcfnbchpvqhm76aixqlz544dawrgmy8gw9zwmijhk6wfl9f26")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. + (native-inputs + `(("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) (home-page "https://pypi.org/project/zope.proxy/") -- cgit v1.3 From 386d2fd130dd557a81620e8409e05e6be7c7507a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:20:16 +0100 Subject: gnu: python-zope-location: Update to 4.2. * gnu/packages/python-web.scm (python-zope-location): Update to 4.2. [native-inputs]: Add PYTHON-ZOPE-TESTRUNNER. [propagated-inputs]: Add PYTHON-ZOPE-INTERFACE. --- gnu/packages/python-web.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 43f62883a8..6ff5482612 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1207,19 +1207,22 @@ brokering, etc.) for which the proxy is responsible.") (define-public python-zope-location (package (name "python-zope-location") - (version "4.0.3") + (version "4.2") (source (origin (method url-fetch) (uri (pypi-uri "zope.location" version)) (sha256 (base32 - "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74")))) + "1b40pzl8v00d583d3gsxv1qjdw2dhghlgkbgxl3m07d5r3izj857")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. + (native-inputs + `(("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs - `(("python-zope-proxy" ,python-zope-proxy) + `(("python-zope-interface" ,python-zope-interface) + ("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) (home-page "https://pypi.org/project/zope.location/") (synopsis "Zope location library") -- cgit v1.3 From e26e084fbb33608379d124030d8f9413fcb00a16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:23:24 +0100 Subject: gnu: python-zope-security: Update to 5.1.0. * gnu/packages/python-web.scm (python-zope-security): Update to 5.1.0. [native-inputs]: Remove PYTHON-SIX. Move PYTHON-ZOPE-COMPONENT and PYTHON-ZOPE-LOCATION ... [propagated-inputs]: ... here. Add PYTHON-ZOPE-INTERFACE. (python2-zope-security)[propagated-inputs]: Remove. --- gnu/packages/python-web.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6ff5482612..b02ffd5f58 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1236,26 +1236,26 @@ Zope3, which are are special objects that have a structural location.") (define-public python-zope-security (package (name "python-zope-security") - (version "4.0.3") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.security" version)) (sha256 (base32 - "14zmf684amc0x32kq05yxnhfqd1cmyhafkw05gn81rn90zjv6ssy")))) + "1npfrgnm202v48wavpwn3450dsn7az12lfww95vbhxyjl11f14yb")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.testrunner. (propagated-inputs - `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + `(("python-zope-component" ,python-zope-component) + ("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-interface" ,python-zope-interface) + ("python-zope-location" ,python-zope-location) ("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) (native-inputs - `(("python-six" ,python-six) - ("python-zope-component" ,python-zope-component) - ("python-zope-configuration" ,python-zope-configuration) - ("python-zope-location" ,python-zope-location) + `(("python-zope-configuration" ,python-zope-configuration) ("python-zope-testrunner" ,python-zope-testrunner) ("python-zope-testing" ,python-zope-testing))) (home-page "https://pypi.org/project/zope.security/") @@ -1265,13 +1265,7 @@ security policies on Python objects.") (license license:zpl2.1))) (define-public python2-zope-security - (let ((zope-security (package-with-python2 python-zope-security))) - (package (inherit zope-security) - (propagated-inputs - `(("python2-zope-testrunner" ,python2-zope-testrunner) - ,@(alist-delete - "python-zope-testrunner" - (package-propagated-inputs zope-security))))))) + (package-with-python2 python-zope-security)) (define-public python-zope-component (package -- cgit v1.3 From 6dcbd20afa775ba28b7e7986daa6fc4c5981fe0c Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:20 +0100 Subject: gnu: python-cachecontrol: Add missing propagated-input. * gnu/packages/python-web.scm (python-cachecontrol): [propagated-inputs]: Add python-msgpack. Signed-off-by: Leo Famulari --- gnu/packages/python-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b02ffd5f58..2cc4bc270f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2036,6 +2036,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." `(#:tests? #f)) (propagated-inputs `(("python-requests" ,python-requests) + ("python-msgpack" ,python-msgpack) ("python-lockfile" ,python-lockfile))) (home-page "https://github.com/ionrock/cachecontrol") (synopsis "The httplib2 caching algorithms for use with requests") -- cgit v1.3 From c596359729a87a62204bde4437919f0a4fa023c1 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jan 2020 14:58:06 +0000 Subject: gnu: Add python-requests_ntlm. * gnu/packages/python-web.scm (python-requests_ntlm): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-web.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2cc4bc270f..26e2fe04ec 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Evan Straw +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -1422,6 +1423,30 @@ than Python’s urllib2 library.") (define-public python2-requests (package-with-python2 python-requests)) +(define-public python-requests_ntlm + (package + (name "python-requests_ntlm") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "requests_ntlm" version)) + (sha256 + (base32 + "0wgbqzaq9w7bas16b7brdb75f91bh3275fb459093bk1ihpck2ci")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-ntlm-auth" ,python-ntlm-auth) + ("python-requests" ,python-requests))) + (home-page "https://github.com/requests/requests-ntlm") + (synopsis + "NTLM authentication support for Requests") + (description + "This package allows for HTTP NTLM authentication using the requests +library.") + (license license:isc))) + (define-public python-requests-mock (package (name "python-requests-mock") -- cgit v1.3