From 97849d6762e1d0865b6a17133c841eb5421c44d3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 13 Jul 2020 23:48:31 +0200 Subject: gnu: python-urllib3: Remove unused input. * gnu/packages/python-web.scm (python-urllib3)[propagated-inputs]: Remove PYTHON-IPADDRESS. [properties]: New field. (python2-urllib3)[propagated-inputs]: Add PYTHON2-IPADDRESS. --- 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 030abef9c2..4b8a959570 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1691,7 +1691,6 @@ authenticated session objects providing things like keep-alive.") ("python-certifi" ,python-certifi) ("python-cryptography" ,python-cryptography) ("python-idna" ,python-idna) - ("python-ipaddress" ,python-ipaddress) ("python-pyopenssl" ,python-pyopenssl) ("python-pysocks" ,python-pysocks))) (home-page "https://urllib3.readthedocs.io/") @@ -1700,6 +1699,7 @@ authenticated session objects providing things like keep-alive.") "Urllib3 supports features left out of urllib and urllib2 libraries. It can reuse the same socket connection for multiple requests, it can POST files, supports url redirection and retries, and also gzip and deflate decoding.") + (properties `((python2-variant . ,(delay python2-urllib3)))) (license license:expat))) ;; Some software requires an older version of urllib3, notably Docker. @@ -1715,7 +1715,12 @@ supports url redirection and retries, and also gzip and deflate decoding.") (define-public python2-urllib3 - (package-with-python2 python-urllib3)) + (let ((base (package-with-python2 (strip-python2-variant python-urllib3)))) + (package/inherit + base + (propagated-inputs + `(("python-ipaddress" ,python2-ipaddress) + ,@(package-propagated-inputs base)))))) (define-public awscli (package -- cgit 1.4.1 From dd31108b250e1d32bbbdcd5221c38a69f95b4c0f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Jul 2020 22:37:42 +0200 Subject: gnu: python-requests: Update to 2.24.0. * gnu/packages/python-web.scm (python-requests): Update to 2.24.0. --- 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 1965a96c16..95af1856b8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1630,13 +1630,13 @@ WebSocket usage in Python programs.") (define-public python-requests (package (name "python-requests") - (version "2.23.0") + (version "2.24.0") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k")))) + "06r3017hz0hzxv42gpg73l8xvdjbzw7q904ljvp36b5p3l9rlmdk")))) (build-system python-build-system) (propagated-inputs `(("python-certifi" ,python-certifi) -- cgit 1.4.1