;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018, 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2018, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2018, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
#:use-module (gnu packages libffi)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
(define-public python-aiohttp
(package
(name "python-aiohttp")
- (version "3.7.3")
+ (version "3.7.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiohttp" version))
(sha256
- (base32 "1i3p4yrfgrf1zpbgnywqmb33ps4k51wylcxykhf2cwky0spq26lw"))))
+ (base32 "1pn79h8fng4xi5gl1f6saw31nxgmgyxl41yf3vba1l21673yr12x"))))
(build-system python-build-system)
(arguments
'(#:phases
(define-public python-aiohttp-socks
(package
(name "python-aiohttp-socks")
- (version "0.2.2")
+ (version "0.5.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "aiohttp_socks" version))
(sha256
(base32
- "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+ "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
(build-system python-build-system)
(propagated-inputs
- `(("python-aiohttp" ,python-aiohttp)))
+ `(("python-aiohttp" ,python-aiohttp)
+ ("python-attrs" ,python-attrs)
+ ("python-socks" ,python-socks)))
(home-page "https://github.com/romis2012/aiohttp-socks")
(synopsis "SOCKS proxy connector for aiohttp")
(description "This package provides a SOCKS proxy connector for
@item Compatible with both CPython and PyPy
@item Cython support for better performance when used with CPython
@end itemize")
- (properties `((python2-variant . ,(delay python2-falcon))))
(license license:asl2.0)))
-(define-public python2-falcon
- (let ((falcon (package-with-python2 (strip-python2-variant python-falcon))))
- (package
- (inherit falcon)
- (native-inputs
- (alist-delete "python-rapidjson" (package-native-inputs falcon))))))
-
(define-public python-falcon-cors
(package
(name "python-falcon-cors")
over a different origin than that of the web application.")
(license license:asl2.0)))
-(define-public python2-falcon-cors
- (package-with-python2 python-falcon-cors))
-
(define-public python-furl
(package
(name "python-furl")
(define-public python-requests
(package
(name "python-requests")
- (version "2.24.0")
+ (version "2.25.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "requests" version))
(sha256
(base32
- "06r3017hz0hzxv42gpg73l8xvdjbzw7q904ljvp36b5p3l9rlmdk"))))
+ "1y6mb8c0ipd64d5axq2p368yxndp3f966hmabjka2q2a5y9hn6kz"))))
(build-system python-build-system)
(propagated-inputs
`(("python-certifi" ,python-certifi)
(description
"This module provides a building block to stub out the HTTP requests
portions of your testing code.")
- (properties `((python2-variant . ,(delay python2-requests-mock))))
(license license:asl2.0)))
-(define-public python2-requests-mock
- (package (inherit (package-with-python2
- (strip-python2-variant python-requests-mock)))
- (arguments
- `(#:python ,python-2
- ;; FIXME: 'subunit.run discover: error: no such option: --list'
- #:tests? #f))))
-
(define-public python-requests-toolbelt
(package
(name "python-requests-toolbelt")
(define-public python-urllib3
(package
(name "python-urllib3")
- (version "1.25.9")
+ (version "1.26.2")
(source
(origin
(method url-fetch)
(uri (pypi-uri "urllib3" version))
(sha256
(base32
- "09rmjqm5syhhc8fx3v06h3yv6cqy0b1081jg8wm5grpwpr72j61h"))))
+ "024yldjwjavps39yb77sc422z8fa9bn20wcqrcncjwrqjab8y60r"))))
(build-system python-build-system)
(arguments `(#:tests? #f))
(propagated-inputs
(package
;; Note: updating awscli typically requires updating botocore as well.
(name "awscli")
- (version "1.18.183")
+ (version "1.18.203")
(source
(origin
(method url-fetch)
(uri (pypi-uri name version))
(sha256
(base32
- "0n1pmdl33r1v8qnrcg08ihvri9zm4fvsp14605vwmlkxvs8nb7s5"))))
+ "128zg24961j8nmnq2dxqg6a7zwh3qgv87cmvclsdqwwih9nigxv9"))))
(build-system python-build-system)
(arguments
;; FIXME: The 'pypi' release does not contain tests.
(define-public python-geventhttpclient
(package
(name "python-geventhttpclient")
- (version "1.3.1")
+ (version "1.4.4")
(source (origin
(method url-fetch)
(uri (pypi-uri "geventhttpclient" version))
(sha256
(base32
- "07d0q3wzmml75227r6y6mrl5a0zpf4v9gj0ni5rhbyzmaj4az1xx"))
+ "1hy4qm9d3r69n5199i7qjji1v7718n7cxbj8ggi0njify99m37pm"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete pre-compiled files.
(for-each delete-file (find-files "src/geventhttpclient"
- ".*\\.pyc"))
- #t))))
+ ".*\\.pyc"))))))
(build-system python-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-network-tests
(lambda _
- (delete-file "src/geventhttpclient/tests/test_client.py")
- #t))
+ (delete-file "src/geventhttpclient/tests/test_client.py")))
+ (add-after 'unpack 'fix-compatibility-issue
+ ;; See: https://github.com/gwik/geventhttpclient/issues/137.
+ (lambda _
+ (substitute* "src/geventhttpclient/tests/test_ssl.py"
+ ((".*sock.last_seen_sni = None.*")
+ ""))))
(replace 'check
(lambda* (#:key inputs outputs #:allow-other-keys)
(add-installed-pythonpath inputs outputs)
;; Append the test modules to sys.path to avoid
;; namespace conflict which breaks SSL tests.
"--import-mode=append"
- ;; XXX: Disable test fails with Python 3.8:
+ ;; XXX: This test fails with Python 3.8:
;; https://github.com/gwik/geventhttpclient/issues/119
- "-k" (string-append "not test_cookielib_compatibility"))
- #t)))))
+ "-k" "not test_cookielib_compatibility"))))))
(native-inputs
- `(("python-pytest" ,python-pytest)))
+ `(("python-dpkt" ,python-dpkt)
+ ("python-pytest" ,python-pytest)))
(propagated-inputs
`(("python-certifi" ,python-certifi)
("python-gevent" ,python-gevent)
concurrent HTTP client library for python using @code{gevent}.")
(license license:expat)))
-(define-public python2-geventhttpclient
- (package-with-python2 python-geventhttpclient))
-
(define-public python-requests-oauthlib
(package
(name "python-requests-oauthlib")
provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients.")
(license license:isc)))
-(define-public python2-requests-oauthlib
- (package-with-python2 python-requests-oauthlib))
-
(define-public python-url
(package
(name "python-url")
@code{httplib2} for use with @code{requests} session objects.")
(license license:asl2.0)))
-(define-public python2-cachecontrol
- (package-with-python2 python-cachecontrol))
-
(define-public python-cachecontrol-0.11
(package
(inherit python-cachecontrol)
'("captcha/2captcha.py"
"captcha/9kw.py"
"captcha/anticaptcha.py"
- "captcha/deathbycaptcha.py"
- "interpreters/js2py.py"
- "interpreters/v8.py"))
+ "captcha/deathbycaptcha.py"))
(substitute* "__init__.py"
;; Perhaps it's a joke, but don't promote proprietary software.
(("([Th]is feature is not available) in the .*'" _ prefix)
(string-append prefix ".'")))
#t))))
(build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; XXX: Dependencies, that have not yet been packaged
+ ;; and cause an import error when included.
+ (add-after 'unpack 'drop-unsupported-sources
+ (lambda _
+ (with-directory-excursion "cloudscraper"
+ (for-each delete-file
+ '("interpreters/js2py.py"
+ "interpreters/v8.py")))
+ #t)))))
(propagated-inputs
`(("python-requests" ,python-requests)
("python-requests-toolbelt" ,python-requests-toolbelt-0.9.1)
@code{async/await} syntax added in Python 3.5, which makes
your code non-blocking and speedy.")
(license license:expat)))
+
+(define-public python-socks
+ (package
+ (name "python-socks")
+ (version "1.1.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "python-socks" version))
+ (sha256
+ (base32
+ "06mgv3icsyglv50w3sb71x6cpbskza20pqd93l5xk59x574i6xgs"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:tests? #f ; tests not included
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "pytest" "tests/" "-s"))
+ #t)))))
+ (propagated-inputs
+ `(("python-async-timeout" ,python-async-timeout)
+ ("python-curio" ,python-curio)
+ ("python-trio" ,python-trio)))
+ (native-inputs
+ `(("python-pytest" ,python-pytest)))
+ (home-page "https://github.com/romis2012/python-socks")
+ (synopsis
+ "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+ (description
+ "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling)
+ functionality.")
+ (license license:asl2.0)))