[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/37: gnu: python-gevent: Update to 1.4.0.
From: |
guix-commits |
Subject: |
26/37: gnu: python-gevent: Update to 1.4.0. |
Date: |
Mon, 16 Mar 2020 10:46:27 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit f11b55563723164886939f5dd01598197ddcc8d6
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Mar 16 13:33:06 2020 +0100
gnu: python-gevent: Update to 1.4.0.
* gnu/packages/python-xyz.scm (python-gevent): Update to 1.4.0.
[arguments]: Adjust unbundling variables. Future-proof the C_INCLUDE_PATH
override. Add phases "pretend-to-be-CI" and "adjust-tests". Run the tests
with "python -m gevent.tests", and respect PARALLEL-JOB-COUNT.
[native-inputs]: Add PYTHON-DNSPYTHON, PYTHON-PSUTIL, PYTHON-ZOPE-EVENT and
PYTHON-ZOPE-INTERFACE.
(python2-gevent)[native-inputs]: Fix input inheritance.
---
gnu/packages/python-xyz.scm | 97 ++++++++++++++++++++++++++++++++++-----------
1 file changed, 73 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f467e28..be02b03 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10581,13 +10581,13 @@ graphviz.")
(define-public python-gevent
(package
(name "python-gevent")
- (version "1.3.7")
+ (version "1.4.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "gevent" version))
(sha256
(base32
- "0b0fr04qdk1p4sniv87fh8z5psac60x01pv054kpgi94520g81iz"))
+ "1lchr4akw2jkm5v4kz7bdm4wv3knkfhbfn9vkkz4s5yrkcxzmdqy"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -10614,10 +10614,7 @@ graphviz.")
#t))
(add-before 'build 'do-not-use-bundled-sources
(lambda* (#:key inputs #:allow-other-keys)
- (setenv "CONFIG_SHELL" (which "bash"))
- (setenv "LIBEV_EMBED" "false")
- (setenv "CARES_EMBED" "false")
- (setenv "EMBED" "false")
+ (setenv "GEVENTSETUP_EMBED" "0")
;; Prevent building bundled libev.
(substitute* "setup.py"
@@ -10632,15 +10629,65 @@ graphviz.")
(string-prefix? "python" item)))
((python)
(setenv "C_INCLUDE_PATH"
- (string-append greenlet "/" python)))))
+ (string-append greenlet "/" python ":"
+ (or (getenv "C_INCLUDE_PATH")
+ ""))))))
#t))
- (add-before 'check 'skip-timer-test
+ (add-before 'check 'pretend-to-be-CI
(lambda _
- ;; XXX: Skip 'TestTimerResolution', which appears to be
- ;; unreliable.
- (substitute* "src/greentest/test__core_timer.py"
- (("not greentest.RUNNING_ON_CI") "False"))
+ ;; A few tests are skipped due to network constraints or
+ ;; get longer timeouts when running in a CI environment.
+ ;; Piggy-back on that, as we need the same adjustments.
+ (setenv "TRAVIS" "1")
+ (setenv "APPVEYOR" "1")
#t))
+ (add-before 'check 'adjust-tests
+ (lambda _
+ (let ((disabled-tests
+ '(;; These tests rely on networking which is not
+ ;; available in the build container.
+ "test_urllib2net.py"
+ "test__server.py"
+ "test__server_pywsgi.py"
+ "test_socket.py"
+ "test__socket.py"
+ "test__socket_ssl.py"
+ "test__socket_dns.py"
+ "test__socket_dns6.py"
+ "test___example_servers.py"
+ "test__getaddrinfo_import.py"
+ "test__examples.py"
+ "test_httplib.py"
+ "test_https.py"
+ "test_urllib2_localnet.py"
+ "test_ssl.py"
+ "test__ssl.py"
+ ;; XXX: These tests borrow functionality from
the
+ ;; Python builtin 'test' module, but it is not
+ ;; installed with the Guix Python distribution.
+ "test_smtpd.py"
+ "test_wsgiref.py"
+ "test_urllib2.py"
+ "test_thread.py"
+ "test_threading.py"
+ "test__threading_2.py"
+ ;; FIXME: test_patch_twice_warning_events fails
for
+ ;; no apparent reason. Needs more
investigation!
+ "test__monkey.py"
+ ;; These tests rely on KeyboardInterrupts which
do not
+ ;; work inside the build container for some
reason
+ ;; (lack of controlling terminal?).
+ "test_subprocess.py"
+ "test__issues461_471.py"
+ ;; TODO: Patch out the tests that use
getprotobyname, etc
+ ;; instead of disabling all the tests from
these files.
+ "test__all__.py"
+ "test___config.py"
+ "test__execmodules.py")))
+ (call-with-output-file "skipped_tests.txt"
+ (lambda (port)
+ (display (string-join disabled-tests "\n") port)))
+ #t)))
(replace 'check
(lambda _
;; Make sure the build directory is on PYTHONPATH.
@@ -10649,21 +10696,23 @@ graphviz.")
(getenv "PYTHONPATH") ":"
(getcwd) "/build/"
(car (scandir "build" (cut string-prefix?
"lib." <>)))))
- (with-directory-excursion "src/greentest"
- ;; XXX: Many tests require network access. Instead we
only
- ;; run known-good tests. Unfortunately we cannot use
- ;; recursion here since this directory also contains
- ;; Python-version-specific subfolders.
- (apply invoke "python" "testrunner.py" "--config"
- "known_failures.py"
- (scandir "." (cut regexp-exec
- (make-regexp
"test_+(subprocess|core)")
- <>)))))))))
+
+ ;; Use the build daemons configured number of workers.
+ (setenv "NWORKERS" (number->string (parallel-job-count)))
+
+ (invoke "python" "-m" "gevent.tests" "--config"
+ "known_failures.py" "--ignore"
"skipped_tests.txt"))))))
(propagated-inputs
`(("python-greenlet" ,python-greenlet)
("python-objgraph" ,python-objgraph)))
(native-inputs
- `(("python-six" ,python-six)))
+ `(("python-six" ,python-six)
+
+ ;; For tests.
+ ("python-dnspython" ,python-dnspython)
+ ("python-psutil" ,python-psutil)
+ ("python-zope.event" ,python-zope-event)
+ ("python-zope.interface" ,python-zope-interface)))
(inputs
`(("c-ares" ,c-ares)
("libev" ,libev)))
@@ -10680,7 +10729,7 @@ to provide a high-level synchronous API on top of the
libev event loop.")
(strip-python2-variant python-gevent))))
(package
(inherit base)
- (native-inputs `(,@(package-native-inputs python-gevent)
+ (native-inputs `(,@(package-native-inputs base)
("python-mock" ,python2-mock))))))
(define-public python-fastimport
- 18/37: gnu: Remove python2-oslo.log., (continued)
- 18/37: gnu: Remove python2-oslo.log., guix-commits, 2020/03/16
- 14/37: gnu: Remove git-annex-remote-hubic., guix-commits, 2020/03/16
- 13/37: gnu: beets: Fix build with newer Werkzeug., guix-commits, 2020/03/16
- 22/37: gnu: Remove python2-bandit., guix-commits, 2020/03/16
- 07/37: gnu: python-flask-restful: Update to 0.3.8., guix-commits, 2020/03/16
- 10/37: gnu: python-flask-migrate: Update to 2.5.3., guix-commits, 2020/03/16
- 17/37: gnu: Remove python2-tempest-lib., guix-commits, 2020/03/16
- 08/37: gnu: python-stdnum: Update to 1.13., guix-commits, 2020/03/16
- 16/37: gnu: Remove python2-swiftclient., guix-commits, 2020/03/16
- 21/37: gnu: Remove python2-oslo.config., guix-commits, 2020/03/16
- 26/37: gnu: python-gevent: Update to 1.4.0.,
guix-commits <=
- 33/37: gnu: python-zope-configuration: Update to 4.3.1., guix-commits, 2020/03/16
- 24/37: gnu: Remove python2-gitdb., guix-commits, 2020/03/16
- 27/37: gnu: python-zope-interface: Update to 4.7.2., guix-commits, 2020/03/16
- 28/37: gnu: python-zope-exceptions: Update to 4.3., guix-commits, 2020/03/16
- 30/37: gnu: python-zope-testrunner: Update to 5.1., guix-commits, 2020/03/16
- 31/37: gnu: python-zope-i18nmessageid: Update to 5.0.1., guix-commits, 2020/03/16
- 35/37: gnu: python-zope-location: Update to 4.2., guix-commits, 2020/03/16
- 36/37: gnu: python-zope-security: Update to 5.1.0., guix-commits, 2020/03/16
- 37/37: gnu: python-tqdm: Update to 4.43.0., guix-commits, 2020/03/16
- 19/37: gnu: Remove python2-oslo.serialization., guix-commits, 2020/03/16