From a20016e15a8f1a02dcc77666603ad71538b5a2f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 22 Aug 2018 17:41:30 +0200 Subject: gnu: python-urllib3: Update to 1.23. * gnu/packages/python-web.scm (python-urllib3): Update to 1.23. --- 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 2e98a95d4b..494fbe7999 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1286,14 +1286,14 @@ authenticated session objects providing things like keep-alive.") (define-public python-urllib3 (package (name "python-urllib3") - (version "1.18.1") + (version "1.23") (source (origin (method url-fetch) (uri (pypi-uri "urllib3" version)) (sha256 (base32 - "1wb8aqnq53vzh2amrv8kc66f3h6fx217y0q62y6n30a64p2yqmam")))) + "1bvbd35q3zdcd7gsv38fwpizy7p06dr0154g5gfybrvnbvhwb2m6")))) (build-system python-build-system) (arguments `(#:tests? #f)) (native-inputs -- cgit v1.2.3 From 95176544d54cbc8c7c2bacd96e19b4a1411afbff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 11 Nov 2018 10:41:32 +0200 Subject: gnu: python-paste: Update to 3.0.4. * gnu/packages/python-web.scm (python-paste): Update to 3.0.4. [source]: Remove patch, add snippet to remove one test. [native-inputs]: Add python-pytest, python-pytest-runner. * gnu/packages/patches/python-paste-remove-website-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/python-paste-remove-website-test.patch | 21 --------------------- gnu/packages/python-web.scm | 18 ++++++++++++------ 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/python-paste-remove-website-test.patch (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 15088a56a2..31dafdd42b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1086,7 +1086,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ - %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ diff --git a/gnu/packages/patches/python-paste-remove-website-test.patch b/gnu/packages/patches/python-paste-remove-website-test.patch deleted file mode 100644 index 93417fbe75..0000000000 --- a/gnu/packages/patches/python-paste-remove-website-test.patch +++ /dev/null @@ -1,21 +0,0 @@ -Remove the test to see if the Python Paste website is up. - -Obviously without network access there is no way for us to check this, and -it's pretty strange to test a project's website when you really mean to test -the project anyhow... - ---- a/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800 -+++ b/tests/test_proxy.py 2016-02-22 19:13:04.040117767 -0800 -@@ -1,12 +1,3 @@ - from paste import proxy - from paste.fixture import TestApp - --def test_paste_website(): -- # Not the most robust test... -- # need to test things like POSTing to pages, and getting from pages -- # that don't set content-length. -- app = proxy.Proxy('http://pythonpaste.org') -- app = TestApp(app) -- res = app.get('/') -- assert 'documentation' in res -- diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6a8b1f21fb..e158df2000 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge @@ -2628,19 +2628,25 @@ available in Django, but is a standalone package.") (define-public python-paste (package (name "python-paste") - (version "2.0.3") + (version "3.0.4") (source (origin (method url-fetch) (uri (pypi-uri "Paste" version)) (sha256 (base32 - "062jk0nlxf6lb2wwj6zc20rlvrwsnikpkh90y0dn8cjch93s6ii3")) - (patches (search-patches "python-paste-remove-website-test.patch" - "python-paste-remove-timing-test.patch")))) + "01w26w9jyfkh0mfydhfz3dwy3pj3fw7mzvj0lna3vs8hyx1hwl0n")) + (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) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-nose" ,python-nose))) (propagated-inputs `(("python-six" ,python-six))) (home-page "http://pythonpaste.org") -- cgit v1.2.3 From 60667159d329b1f07d01b5bd03e3b289208ad406 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 24 Nov 2018 15:56:55 +0100 Subject: gnu: python-pycurl: Fix FTBFS from 7b844100464633db5455a3931858bb57c9e529e6. * gnu/packages/python-web.scm (python-pycurl)[arguments]: Add phase 'configure-tls-backend'. --- gnu/packages/python-web.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-web.scm') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 03db842531..8957d28268 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -443,7 +443,15 @@ C, yielding parse times that can be a thirtieth of the html5lib parse times.") (arguments ;; The tests attempt to access external web servers, so we cannot run ;; them. Furthermore, they are skipped altogether when using Python 2. - '(#:tests? #f)) + '(#:tests? #f + #:phases (modify-phases %standard-phases + (add-before 'build 'configure-tls-backend + (lambda _ + ;; XXX: PycURL fails to automatically determine which TLS + ;; backend to use when cURL is built with --disable-static. + ;; See setup.py and . + (setenv "PYCURL_SSL_LIBRARY" "gnutls") + #t))))) (native-inputs `(("python-nose" ,python-nose) ("python-bottle" ,python-bottle))) -- cgit v1.2.3