From 7e06086522484fbb68917c9c777a24abc4ea4da8 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Mon, 15 Jan 2018 16:22:29 +0100 Subject: gnu: python-matplotlib: Fix import failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-matplotlib)[propagated-inputs]: Add python-pyqt. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0b582e6b73..0a7ca2e77a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3213,6 +3213,7 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ;; object. For this reason we need to import both libraries. ;; https://pythonhosted.org/cairocffi/cffi_api.html#converting-pycairo ("python-pycairo" ,python-pycairo) + ("python-pyqt" ,python-pyqt) ("python-cairocffi" ,python-cairocffi))) (inputs `(("libpng" ,libpng) @@ -3222,7 +3223,6 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ("glib" ,glib) ;; FIXME: Add backends when available. ;("python-wxpython" ,python-wxpython) - ("python-pyqt" ,python-pyqt) ("tcl" ,tcl) ("tk" ,tk))) (native-inputs -- cgit v1.2.3 From 3ca1545b2107417228e7f351885d343fd9c32209 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Jan 2018 17:13:31 +0100 Subject: gnu: python: Use HTTPS for ipython.org home pages. * gnu/packages/python.scm (python-ipython-genutils, python-traitlets) (python-ipykernel, python-ipython, python-widgetsnbextension) (python-ipywidgets)[home-page]: Use HTTPS. --- gnu/packages/python.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0a7ca2e77a..05d1314fe9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4255,7 +4255,7 @@ standard library.") (base32 "19l2pp1c64ansr89l3cqh19jdi2ixhssdzx0vz4n6r52a6i281is")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests - (home-page "http://ipython.org") + (home-page "https://ipython.org") (synopsis "Vestigial utilities from IPython") (description "This package provides retired utilities from IPython. No packages @@ -4292,7 +4292,7 @@ away.") (native-inputs `(("python-mock" ,python-mock) ("python-nose" ,python-nose))) - (home-page "http://ipython.org") + (home-page "https://ipython.org") (synopsis "Configuration system for Python applications") (description "Traitlets is a framework that lets Python classes have attributes with @@ -4380,7 +4380,7 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (propagated-inputs ;; imported at runtime during connect `(("python-jupyter-client" ,python-jupyter-client))) - (home-page "http://ipython.org") + (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") (description "This package provides the IPython kernel for Jupyter.") @@ -4526,7 +4526,7 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (substitute* "./IPython/core/tests/test_magic.py" (("def test_dirops\\(\\):" all) (string-append "@dec.skipif(True)\n" all)))))))) - (home-page "http://ipython.org") + (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") (description "IPython provides a rich architecture for interactive computing with: @@ -6437,7 +6437,7 @@ interactive computing.") (native-inputs `(("python-certifi" ,python-certifi) ("python-nose" ,python-nose))) - (home-page "http://ipython.org") + (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") (description "This package provides interactive HTML widgets for Jupyter notebooks.") @@ -6465,7 +6465,7 @@ notebooks.") ("python-ipython" ,python-ipython) ("python-traitlets" ,python-traitlets) ("python-widgetsnbextension" ,python-widgetsnbextension))) - (home-page "http://ipython.org") + (home-page "https://ipython.org") (synopsis "IPython HTML widgets for Jupyter") (description "Ipywidgets are interactive HTML widgets for Jupyter notebooks and the IPython kernel. Notebooks come alive when interactive -- cgit v1.2.3 From 44e4a621640b6495c816e9556613b074033c16f2 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 14 Jan 2018 20:13:13 -0500 Subject: gnu: Add python-shapely and python2-shapely. * gnu/packages/python.scm (python-shapely, python2-shapely): New variables. --- gnu/packages/python.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 05d1314fe9..a131d52645 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -41,7 +41,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2017 Kei Kebreau +;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley @@ -76,6 +76,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gcc) + #:use-module (gnu packages geo) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -470,6 +471,52 @@ pidof, tty, taskset, pmap.") (define-public python2-psutil (package-with-python2 python-psutil)) +(define-public python-shapely + (package + (name "python-shapely") + (version "1.6.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Shapely" version)) + (sha256 + (base32 + "0svc58dzcw9gj92b4sgq35sdxkf85z0qwlzxarkzq4bp3h8jy58l")))) + (build-system python-build-system) + (native-inputs + `(("python-cython" ,python-cython) + ("python-matplotlib" ,python-matplotlib) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (inputs + `(("geos" ,geos))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-geos-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((geos (assoc-ref inputs "geos")) + (glibc (assoc-ref inputs ,(if (%current-target-system) + "cross-libc" "libc")))) + (substitute* "shapely/geos.py" + (("_lgeos = load_dll\\('geos_c', fallbacks=.*\\)") + (string-append "_lgeos = load_dll('geos_c', fallbacks=['" + geos "/lib/libgeos_c.so'])")) + (("free = load_dll\\('c'\\)\\.free") + (string-append "free = load_dll('c', fallbacks=['" + glibc "/lib/libc.so.6']).free")))) + #t))))) + (home-page "https://github.com/Toblerity/Shapely") + (synopsis "Library for the manipulation and analysis of geometric objects") + (description "Shapely is a Python package for manipulation and analysis of +planar geometric objects. It is based on the @code{GEOS} library.") + (license license:bsd-3))) + +(define-public python2-shapely + (package-with-python2 python-shapely)) + (define-public python-clyent (package (name "python-clyent") -- cgit v1.2.3 From aebd91bb9f9896c245535e6da5b0f06618596a29 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Jan 2018 15:27:09 -0800 Subject: gnu: python-consul: Skip the test phase. * gnu/packages/python.scm (python-consul, python2-consul)[arguments]: Set #:tests? #f. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 99e5bd9e0b..0489b157d2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9373,8 +9373,8 @@ interface for programs.") (base32 "0rfyxcy4cr3x848vhx876ifalxd5ghq6l5x813m49h4vq2d4jiq8")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest))) + (arguments + '(#:tests? #f)) ; The tests are not distributed (propagated-inputs `(("python-requests" ,python-requests) ("python-six" ,python-six))) -- cgit v1.2.3 From dce2ad69538ee95d789b7efb2d7a483cbfb06bcb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Jan 2018 15:30:04 -0800 Subject: gnu: python-graphql-relay: Skip the test phase. * gnu/packages/python.scm (python-graphql-relay, python2-graphql-relay)[arguments]: Set #:tests? #f --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0489b157d2..e1216eb382 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9578,8 +9578,8 @@ to Python.") (base32 "1nv5dxcj59zv31qvl8bd142njmxcmymny2dz3br1l2cpbljbf5i7")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest))) + (arguments + '(#:tests? #f)) ; The tests are not distributed (propagated-inputs `(("python-graphql-core" ,python-graphql-core) ("python-promise" ,python-promise) -- cgit v1.2.3 From e81e154c40b262b1c7a0928cbc712e3631f6342a Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 21 Jan 2018 10:54:29 +0100 Subject: gnu: python-kivy: Update to 1.10.0. * gnu/packages/python.scm (python-kivy): Update to 1.10.0. [arguments]: Remove custom "build" phase. --- gnu/packages/python.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a131d52645..9b9b22be28 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9203,21 +9203,20 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") (define-public python-kivy (package (name "python-kivy") - (version "1.9.1") + (version "1.10.0") (source (origin (method url-fetch) - (uri (pypi-uri "kivy" version)) + (uri (pypi-uri "Kivy" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0zk3g1j1z0lzcm9d0k1lprrs95zr8n8k5pdg3p5qlsn26jz4bg19")))) + "1394zh6kvf7k5d8vlzxcsfcailr3q59xwg9b1n7qaf25bvyq1h98")))) (build-system python-build-system) (arguments `(#:tests? #f ; Tests require many optional packages #:phases (modify-phases %standard-phases - (replace 'build (lambda _ (zero? (system* "make" "force")))) (add-after 'patch-generated-file-shebangs 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "KIVY_SDL2_PATH" -- cgit v1.2.3 From 220ed20b225414a466d4e35d0724ecd0ad5a0127 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Dec 2017 19:25:36 +0100 Subject: gnu: Add python-txamqp. * gnu/packages/python.scm (python-txamqp, python2-txamqp): New variables. --- gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9b9b22be28..3c40f00edd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7598,6 +7598,35 @@ alternative when librabbitmq is not available.") #:tests? #f ,@(package-arguments amqp)))))) +(define-public python-txamqp + (package + (name "python-txamqp") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "txAMQP" version)) + (sha256 + (base32 + "1r43a66dd547mz40ikymm8y3d480cidy560fj81qc0jk4lncgmmr")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-twisted" ,python-twisted))) + (home-page "https://github.com/txamqp/txamqp") + (synopsis "Communicate with AMQP peers and brokers using Twisted") + (description + "This package provides a Python library for communicating with AMQP peers +and brokers using the asynchronous networking framework Twisted. It contains +all the necessary code to connect, send and receive messages to/from an +AMQP-compliant peer or broker (Qpid, OpenAMQ, RabbitMQ) using Twisted. It +also includes support for using Thrift RPC over AMQP in Twisted +applications.") + (license license:asl2.0))) + +(define-public python2-txamqp + (package-with-python2 python-txamqp)) + (define-public python-kombu (package (name "python-kombu") -- cgit v1.2.3 From 3b6502e25d421ddc6dec3ed828ef23f311e279a6 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 21 Jan 2018 10:54:29 +0100 Subject: gnu: python-kivy: Add "git" native-input. * gnu/packages/python.scm (python-kivy)[native-inputs]: Add git. --- gnu/packages/python.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c40f00edd..8ded440815 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -9253,7 +9253,8 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") "/include/SDL2")) #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("git" ,git) + ("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) (inputs `(("gstreamer" ,gstreamer) -- cgit v1.2.3 From ce4c9b73c8357c7ba16df491dfa05aef9645c36e Mon Sep 17 00:00:00 2001 From: Adriano Peluso Date: Mon, 22 Jan 2018 18:36:17 +0100 Subject: gnu: python-magic: Update to 0.4.15. * gnu/packages/python.scm (python-magic) Updated to 0.4.15. Signed-off-by: Danny Milosavljevic --- gnu/packages/python.scm | 53 +++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8ded440815..346363d720 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8093,15 +8093,14 @@ is made as zipfile like as possible.") (define-public python-magic (package (name "python-magic") - (version "0.4.3") + (version "0.4.15") (source (origin (method url-fetch) - (uri (string-append "https://github.com/ahupp/python-magic/archive/" - version ".tar.gz")) + (uri (pypi-uri "python-magic" version)) (sha256 (base32 - "17bgy92i7sb021f2s4mw1dcvpm6p1mi9jihridwy1pyn8mzvpjgk")) + "1mgwig9pnzgkf86q9ji9pnc99bngms15lfszq5rgqb9db07mqxpk")) (file-name (string-append name "-" version "-checkout")))) (build-system python-build-system) (arguments @@ -8119,31 +8118,33 @@ is made as zipfile like as possible.") ;; expected. '(#:tests? #f #:phases (modify-phases %standard-phases - ;; Replace a specific method call with a hard-coded - ;; path to the necessary libmagic.so file in the - ;; store. If we don't do this, then the method call - ;; will fail to find the libmagic.so file, which in - ;; turn will cause any application using - ;; python-magic to fail. - (add-before 'build 'hard-code-path-to-libmagic - (lambda* (#:key inputs #:allow-other-keys) - (let ((file (assoc-ref inputs "file"))) - (substitute* "magic.py" - (("ctypes.util.find_library\\('magic'\\)") - (string-append "'" file "/lib/libmagic.so'"))) - #t))) - (add-before 'install 'disable-egg-compression - (lambda _ - (let ((port (open-file "setup.cfg" "a"))) - (display "\n[easy_install]\nzip_ok = 0\n" - port) - (close-port port) - #t)))))) + ;; Replace a specific method call with a hard-coded + ;; path to the necessary libmagic.so file in the + ;; store. If we don't do this, then the method call + ;; will fail to find the libmagic.so file, which in + ;; turn will cause any application using + ;; python-magic to fail. + (add-before 'build 'hard-code-path-to-libmagic + (lambda* (#:key inputs #:allow-other-keys) + (let ((file (assoc-ref inputs "file"))) + (substitute* "magic.py" + (("ctypes.util.find_library\\('magic'\\)") + (string-append "'" file "/lib/libmagic.so'"))) + #t))) + (add-before 'install 'disable-egg-compression + (lambda _ + (let ((port (open-file "setup.cfg" "a"))) + (display "\n[easy_install]\nzip_ok = 0\n" + port) + (close-port port) + #t)))))) (inputs ;; python-magic needs to be able to find libmagic.so. `(("file" ,file))) - (home-page "https://github.com/ahupp/python-magic") - (synopsis "File type identification using libmagic") + (home-page + "https://github.com/ahupp/python-magic") + (synopsis + "File type identification using libmagic") (description "This module uses ctypes to access the libmagic file type identification library. It makes use of the local magic database and -- cgit v1.2.3 From edb09c53c448a41818927c4e88eca6a72833a08b Mon Sep 17 00:00:00 2001 From: Adriano Peluso Date: Mon, 22 Jan 2018 18:39:29 +0100 Subject: gnu: python-relatorio: Update to 0.8.0. * gnu/packages/python.scm (python-relatorio): Updated to 0.8.0. Signed-off-by: Danny Milosavljevic --- gnu/packages/python.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 346363d720..9767536124 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11117,18 +11117,20 @@ information.") (define-public python-relatorio (package (name "python-relatorio") - (version "0.6.4") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "relatorio" version)) (sha256 (base32 - "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z")))) + "1na6hlhz1awi1hbjg1gyclq0khz42iz90wvdjw7mmj655788bpxx")))) (build-system python-build-system) (propagated-inputs `(("python-lxml" ,python-lxml) ("python-genshi" ,python-genshi))) + (native-inputs + `(("python-magic" ,python-magic))) (home-page "https://relatorio.tryton.org/") (synopsis "Templating library able to output ODT and PDF files") (description "Relatorio is a templating library which provides a way to -- cgit v1.2.3 From 09b9cf7327f1cdaee31e9a176451a263d56cec5b Mon Sep 17 00:00:00 2001 From: Adriano Peluso Date: Mon, 22 Jan 2018 18:55:12 +0100 Subject: gnu: Add python-phonenumbers. * gnu/packages/python.scm (python-phonenumbers, python2-phonenumbers): New variables. Signed-off-by: Danny Milosavljevic --- gnu/packages/python.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9767536124..2c2a0fde3b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Frederick M. Muriithi -;;; Copyright © 2017 Adriano Peluso +;;; Copyright © 2017, 2018 Adriano Peluso ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García @@ -12370,3 +12370,26 @@ and normal mode analysis, but also basic routines for implementing new methods for simulation and analysis. The library is currently not actively maintained and works only with Python 2 and NumPy < 1.9.") (license license:cecill-c))) + +(define-public python-phonenumbers + (package + (name "python-phonenumbers") + (version "8.8.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "phonenumbers" version)) + (sha256 + (base32 + "1lhhxmx3hk0b5891nc0p82dl5bq2w9cqbawmh8j5zy587af2j6fq")))) + (build-system python-build-system) + (home-page + "https://github.com/daviddrysdale/python-phonenumbers") + (synopsis + "Python library for dealing with international phone numbers") + (description + "This package provides a Python port of Google's libphonenumber library.") + (license license:asl2.0))) + +(define-public python2-phonenumbers + (package-with-python2 python-phonenumbers)) -- cgit v1.2.3 From 6055e88c0d6212884d5f050eea1cefc4fcaec043 Mon Sep 17 00:00:00 2001 From: Fis Trivial Date: Sun, 21 Jan 2018 18:37:57 +0000 Subject: gnu: Add python-yapf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.scm (python-yapf, python2-yapf): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2c2a0fde3b..8802abd094 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2018 Fis Trivial ;;; ;;; This file is part of GNU Guix. ;;; @@ -12393,3 +12394,26 @@ and works only with Python 2 and NumPy < 1.9.") (define-public python2-phonenumbers (package-with-python2 python-phonenumbers)) + +(define-public python-yapf + (package + (name "python-yapf") + (version "0.20.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "yapf" version)) + (sha256 + (base32 + "0s7l6afzxvpx39kzd0lwshlaxw8m4fwh4iy0rlmav4vipr3g46dx")))) + (build-system python-build-system) + (home-page "https://github.com/google/yapf") + (synopsis "Formatter for Python code") + (description "YAPF is a formatter for Python code. It's based off of +@dfn{clang-format}, developed by Daniel Jasper. In essence, the algorithm +takes the code and reformats it to the best formatting that conforms to the +style guide, even if the original code didn't violate the style guide.") + (license license:asl2.0))) + +(define-public python2-yapf + (package-with-python2 python-yapf)) -- cgit v1.2.3 From ce018d16f1ebae914220e2351487b43cb7254442 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 23 Jan 2018 18:29:18 +0100 Subject: gnu: python2-mmtk: Update to 2.7.11 * gnu/packages/python.scm (python2-mmtk): Update to 2.7.11. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8802abd094..e4d5edb41f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12334,7 +12334,7 @@ not actively maintained and works only with Python 2 and NumPy < 1.9.") (define-public python2-mmtk (package (name "python2-mmtk") - (version "2.7.10") + (version "2.7.11") (source (origin (method url-fetch) @@ -12343,7 +12343,7 @@ not actively maintained and works only with Python 2 and NumPy < 1.9.") (file-name (string-append "MMTK-" version ".tar.gz")) (sha256 (base32 - "1k4gsd50zja89dbzgy3aji7h4zpvbvdfrds7rxr3whqrsgcffnir")))) + "1d0nnjx4lwsvh8f99vv1r6gi50d93yba0adkz8b4zgv4za4c5862")))) (build-system python-build-system) (native-inputs `(("netcdf" ,netcdf))) -- cgit v1.2.3 From accfabf6d5870a50f27b04132b63783eb07a9677 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jan 2018 19:56:56 +0100 Subject: gnu: python-networkx: Update to 2.1. * gnu/packages/python.scm (python-networkx): Update to 2.1. [source](uri): Change to zipball. [native-inputs]: Add UNZIP. --- gnu/packages/python.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 439c05b665..6b4167b36c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4861,19 +4861,20 @@ interfaces in an easy and portable manner.") (define-public python-networkx (package (name "python-networkx") - (version "1.11") + (version "2.1") (source (origin (method url-fetch) - (uri (pypi-uri "networkx" version)) + (uri (pypi-uri "networkx" version ".zip")) (sha256 - (base32 "1f74s56xb4ggixiq0vxyfxsfk8p20c7a099lpcf60izv1php03hd")))) + (base32 "1ccb8mfz4m821k9y0cigkbq42q2sbb4dj5fbjshp0awp32j2q9v4")))) (build-system python-build-system) ;; python-decorator is needed at runtime (propagated-inputs `(("python-decorator" ,python-decorator))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-nose" ,python-nose) + ("unzip" ,unzip))) (home-page "http://networkx.github.io/") (synopsis "Python module for creating and manipulating graphs and networks") (description -- cgit v1.2.3 From 12ad52c37223487795686e091adc47cd04e8370c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jan 2018 19:58:08 +0100 Subject: gnu: python-colormath: Update to 3.0.0. * gnu/packages/python.scm (python-colormath): Update to 3.0.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6b4167b36c..36e0781389 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2852,14 +2852,14 @@ objects.") (define-public python-colormath (package (name "python-colormath") - (version "2.1.1") + (version "3.0.0") (source (origin (method url-fetch) (uri (pypi-uri "colormath" version)) (sha256 (base32 - "01wp5xwm0a89wdm1dc9rr1ij90idzdiiipxdj1yslhqzkhnjnfh0")))) + "05qjycgxp3p2f9n6lmic68sxmsyvgnnlyl4z9w7dl9s56jphaiix")))) (build-system python-build-system) (propagated-inputs `(("python-networkx" ,python-networkx) -- cgit v1.2.3 From 7afd2069d5995b5642b5de971f0aafdba966a784 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 27 Jan 2018 19:58:33 +0100 Subject: gnu: python-spectra: Update to 0.0.11. * gnu/packages/python.scm (python-spectra): Update to 0.0.11. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 36e0781389..9d98700321 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2876,14 +2876,14 @@ objects.") (define-public python-spectra (package (name "python-spectra") - (version "0.0.8") + (version "0.0.11") (source (origin (method url-fetch) (uri (pypi-uri "spectra" version)) (sha256 (base32 - "0n87kzhpkml2s2q91rdkl8wz2kkv5b0bkrgww45lxa5vq34qh6w5")))) + "1f322x914bhkg6r5gv1vmnir3iy0k5kih0fd2gp3rdkw32jn5cwf")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 526789a1acb14cf930a756e968b4de8cb9d95188 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Sun, 21 Jan 2018 18:43:07 +1100 Subject: gnu: python-uniseg: Switch to PyPi source to get missing ucd.sqlite3. Fixes . * gnu/packages/python.scm (python-uniseg)[source]: Fetch from PyPi. [native-inputs]: Add unzip. Signed-off-by: Leo Famulari --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e4d5edb41f..94551da331 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -821,15 +821,15 @@ Python 3 support.") (source (origin (method url-fetch) - (uri (string-append "https://bitbucket.org/emptypage/uniseg-python/" - "get/rel-" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "uniseg" version ".zip")) (sha256 (base32 - "1df4gddnj2a0v8z35wb2ra5vvh1f1qyxs8fgd25c8g64031mna6x")))) + "05jsazvz6nbmh6l3v1rph5ydkqn1hzx1pyggdyvgp2qgmgrnmiz2")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; The test suite requires network access. + (native-inputs + `(("unzip" ,unzip))) (home-page "https://bitbucket.org/emptypage/uniseg-python") (synopsis -- cgit v1.2.3 From fcaab9c0e5b339c854a895803dd3b6113e513040 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 31 Jan 2018 12:59:34 +0100 Subject: gnu: python-gevent: Update to 1.2.2. * gnu/packages/python.scm (python-gevent): Update to 1.2.2. [source](snippet): Adjust to moved software bundles. Remove greentest substitution. [arguments]: Add #:modules. Add phases 'unpack-libev', 'patch-hard-coded-paths' and 'do-not-use-bundled-sources' and replace check phase with a custom command. [native-inputs]: Add LIBEV source. --- gnu/packages/python.scm | 65 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9d98700321..edc6ea4e40 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2016, 2017, 2018 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -8561,28 +8561,73 @@ are synchronized with data exchanges on \"channels\".") (define-public python-gevent (package (name "python-gevent") - (version "1.1.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "1smf3kvidpdiyi2c81alal74p2zm0clrm6xbyy6y1k9a3f2vkrbf")) + "0bbbjvi423y9k9xagrcsimnayaqymg6f2dj76m9z3mjpkjpci4a7")) (modules '((guix build utils))) (snippet '(begin ;; unbunding libev and c-ares - (for-each delete-file-recursively '("libev" "c-ares")) - ;; fixing testsuite - (call-with-output-file "greentest/__init__.py" noop) - (substitute* "greentest/testrunner.py" - (("import util") "from . import util") - (("from util import log") "from .util import log")))))) + (delete-file-recursively "deps") + #t)))) (build-system python-build-system) + (arguments + `(#:modules ((ice-9 ftw) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'unpack-libev + (lambda* (#:key inputs #:allow-other-keys) + (mkdir-p "deps/libev") + ;; FIXME: gevent requires building libev, even though + ;; it only links against the proper one. + (invoke "tar" "-xf" (assoc-ref inputs "libev-source") + "--strip-components=1" "-C" "deps/libev"))) + (add-before 'patch-source-shebangs 'patch-hard-coded-paths + (lambda _ + (substitute* "src/gevent/subprocess.py" + (("/bin/sh") (which "sh"))) + (for-each (lambda (file) + (substitute* file + (("/bin/sh") (which "sh")) + (("/bin/true") (which "true")))) + (find-files "src/greentest" "\\.py$")) + #t)) + (add-before 'build 'do-not-use-bundled-sources + (lambda _ + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "LIBEV_EMBED" "false") + (setenv "CARES_EMBED" "false") + (setenv "EMBED" "false") + #t)) + (replace 'check + (lambda _ + ;; Make sure the build directory is on PYTHONPATH. + (setenv "PYTHONPATH" + (string-append + (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)") + <>))))))))) (propagated-inputs `(("python-greenlet" ,python-greenlet))) (native-inputs - `(("python-six" ,python-six))) + `(("libev-source" ,(package-source libev)) + ("python-six" ,python-six))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) -- cgit v1.2.3 From 8b7009de7508b155a5554b8cd777446fc5a7e7d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 1 Feb 2018 10:52:12 +0100 Subject: gnu: python-flake8-polyfill: Update to 1.0.2. * gnu/packages/python.scm (python-flake8-polyfill): Update to 1.0.2. [native-inputs]: Add PYTHON-PEP8. --- gnu/packages/python.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index edc6ea4e40..72bb0b519e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5446,14 +5446,14 @@ complexity of Python source code.") (define-public python-flake8-polyfill (package (name "python-flake8-polyfill") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (pypi-uri "flake8-polyfill" version)) (sha256 (base32 - "02gn2wxvh9vnf7m7dld7ca4l60mg5c370hv3swwppkngwaqmcw67")))) + "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")))) (build-system python-build-system) (arguments '(#:phases @@ -5467,6 +5467,7 @@ complexity of Python source code.") (native-inputs `(("python-flake8" ,python-flake8) ("python-mock" ,python-mock) + ("python-pep8" ,python-pep8) ("python-pycodestyle" ,python-pycodestyle) ("python-pytest" ,python-pytest))) (home-page "https://gitlab.com/pycqa/flake8-polyfill") -- cgit v1.2.3 From beacd8a07ce4141762a40d46bc5f05a2d9685928 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 1 Feb 2018 14:08:48 -0500 Subject: gnu: python-botocore: Update to 1.8.36. * gnu/packages/python.scm (python-botocore): Update to 1.8.36. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 94551da331..9483ad6b1b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7375,14 +7375,14 @@ document.") (define-public python-botocore (package (name "python-botocore") - (version "1.7.9") + (version "1.8.36") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "02b1bw25r1wdjs5yppb1h9igf11wj092biriv2yg8hzp5r0wrkmg")))) + "0xd607qd9vkwpsvp552nqnrxppnx2n1rzh9kk9shz48ldpyy1jdj")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From 956ba99cb799889e0a0bc0f657f4e31b4f830775 Mon Sep 17 00:00:00 2001 From: "Ethan R. Jones" Date: Mon, 5 Feb 2018 17:55:34 -0500 Subject: gnu: Add python-gyp. * gnu/packages/python.scm (python-gyp, python2-gyp): New variables. --- gnu/packages/python.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9483ad6b1b..b45d89932d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki ;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2018 Ethan R. Jones ;;; ;;; This file is part of GNU Guix. @@ -12417,3 +12418,35 @@ style guide, even if the original code didn't violate the style guide.") (define-public python2-yapf (package-with-python2 python-yapf)) + +(define-public python-gyp + (let ((commit "5e2b3ddde7cda5eb6bc09a5546a76b00e49d888f") + (revision "0")) + (package + (name "python-gyp") + ;; Google does not release versions, + ;; based on second most recent commit date. + (version (git-version "0.0.0" revision commit)) + (source + (origin + ;; Google does not release tarballs, + ;; git checkout is needed. + (method git-fetch) + (uri (git-reference + (url "https://chromium.googlesource.com/external/gyp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fr7nxcrk292djmxzpcjaphnsd123k31gp8jnd91vwknhq6snmv9")))) + (build-system python-build-system) + (home-page "https://gyp.gsrc.io/") + (synopsis "GYP is a Meta-Build system") + (description + "GYP builds build systems for large, cross platform applications. +It can be used to generate XCode projects, Visual Studio projects, Ninja build +files, and Makefiles.") + (license license:bsd-3)))) + +(define-public python2-gyp + (package-with-python2 python-gyp)) -- cgit v1.2.3 From 127dc7c7be0559b8683dc90e65b277059ac986bb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 5 Feb 2018 19:56:27 -0500 Subject: gnu: python-llfuse: Update to 1.3.2. * gnu/packages/python.scm (python-llfuse, python2-llfuse): Update to 1.3.2. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b45d89932d..d789fcfee5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5688,15 +5688,13 @@ should be stored on various operating systems.") (define-public python-llfuse (package (name "python-llfuse") - (version "1.2") + (version "1.3.2") (source (origin (method url-fetch) - (uri (string-append - "https://bitbucket.org/nikratio/python-llfuse/downloads/" - "llfuse-" version ".tar.bz2")) + (uri (pypi-uri "llfuse" version ".tar.bz2")) (sha256 (base32 - "11hms1x68bf1bqbqy7w3wpffqsd3jkgricmzrc1hrnwkswfzzlr4")))) + "0qxvnbz41bpvpc1vbi8qkhmpr9gj1qrrp5jdj085iqibd8l2l9cn")))) (build-system python-build-system) (inputs `(("fuse" ,fuse) -- cgit v1.2.3 From 89c57efd788b6c72939977ad9122b91e557cab6d Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 6 Feb 2018 10:35:12 +0100 Subject: gnu: Add python-whatever. * gnu/packages/python.scm (python-whatever, python2-whatever): New variables. --- gnu/packages/python.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d789fcfee5..7838207762 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12448,3 +12448,34 @@ files, and Makefiles.") (define-public python2-gyp (package-with-python2 python-gyp)) + +(define-public python-whatever + (package + (name "python-whatever") + (version "0.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/Suor/whatever/archive/" version + ".tar.gz")) + (sha256 + (base32 + "1iqvnaf0zpc6b4rvbqq4xy45mszcscyzpzknv8wg6j84pbp22sap")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "py.test")))))) + (native-inputs + `(("python-pytest-3.0" ,python-pytest-3.0))) + (home-page "http://github.com/Suor/whatever") + (synopsis "Make anonymous functions by partial application of operators") + (description "@code{whatever} provides an easy way to make anonymous +functions by partial application of operators.") + (license license:bsd-3))) + +(define-public python2-whatever + (package-with-python2 python-whatever)) -- cgit v1.2.3 From 7e2dd00bfb2d1a5522bb35d876f2a0344034df48 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 6 Feb 2018 10:55:24 +0100 Subject: gnu: Add python-funcy. * gnu/packages/python.scm (python-funcy, python2-funcy): New variables. --- gnu/packages/python.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7838207762..a6de4550fd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12479,3 +12479,56 @@ functions by partial application of operators.") (define-public python2-whatever (package-with-python2 python-whatever)) + +(define-public python-funcy + (package + (name "python-funcy") + (version "1.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/Suor/funcy/archive/" version + ".tar.gz")) + (sha256 + (base32 + "1fanxivsip29vgarw6dn39xym3q4pbxcpa11plpp548lvxajpahz")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "py.test")))))) + (native-inputs + `(("python-pytest-3.0" ,python-pytest-3.0) + ("python-pytest-warnings" ,python-pytest-warnings) + ("python-whatever" ,python-whatever))) + (home-page "http://github.com/Suor/funcy") + (synopsis "Functional tools") + (description "@code{funcy} is a library that provides functional tools. +Examples are: +@enumerate +@item merge - Merges collections of the same type +@item walk - Type-preserving map +@item select - Selects a part of a collection +@item take - Takes the first n items of a collection +@item first - Takes the first item of a collection +@item remove - Predicated-removes items of a collection +@item concat - Concatenates two collections +@item flatten - Flattens a collection with subcollections +@item distinct - Returns only distinct items +@item split - Predicated-splits a collection +@item split_at - Splits a collection at a given item +@item group_by - Groups items by group +@item pairwise - Pairs off adjacent items +@item partial - Partially-applies a function +@item curry - Curries a function +@item compose - Composes functions +@item complement - Complements a predicate +@item all_fn - \"all\" with predicate +@end enumerate") + (license license:bsd-3))) + +(define-public python2-funcy + (package-with-python2 python-funcy)) -- cgit v1.2.3 From 4283653cb02d67de186fc632e88eed74587e8546 Mon Sep 17 00:00:00 2001 From: Konrad Hinsen Date: Tue, 6 Feb 2018 12:08:00 +0100 Subject: gnu: Add python-isoweek. * gnu/packages/python.scm (python-isoweek, python2-isoweek): New variables. Signed-off-by: Danny Milosavljevic --- gnu/packages/python.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a6de4550fd..777590b583 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12532,3 +12532,26 @@ Examples are: (define-public python2-funcy (package-with-python2 python-funcy)) + +(define-public python-isoweek + (package + (name "python-isoweek") + (version "1.3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "isoweek" version)) + (sha256 + (base32 + "1s7zsf0pab0l9gn6456qadnz5i5h90hafcjwnhx5mq23qjxggwvk")))) + (build-system python-build-system) + (home-page "https://github.com/gisle/isoweek") + (synopsis "Objects representing a week") + (description "The @code{isoweek} module provide the class Week that +implements the week definition of ISO 8601. This standard also defines +a notation for identifying weeks; yyyyWww (where the W is a literal). +Week instances stringify to this form.") + (license license:bsd-3))) + +(define-public python2-isoweek + (package-with-python2 python-isoweek)) -- cgit v1.2.3 From 01af1e11a67466d5f6338bdb207ff99ef5cf094e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 15:26:41 +0100 Subject: gnu: python2-flake8: Fix python-enum34 propagation. * gnu/packages/python.scm (python2-flake8)[propagated-inputs]: Replace PYTHON2-ENUM with PYTHON2-ENUM34. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ad6778e7a4..3b9c3c87b9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5440,7 +5440,7 @@ complexity of Python source code.") (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) - ("python2-enum" ,python2-enum) + ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) (define-public python-flake8-polyfill -- cgit v1.2.3 From 3cbddeec3961dc862486c9d91e241276ed64b0bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 14:44:23 +0100 Subject: gnu: python-tqdm: Update to 4.19.5. * gnu/packages/python.scm (python-tqdm): Update to 4.19.5. [native-inputs]: Remove PYTHON-NOSE-TIMER and PYTHON-VIRTUALENV. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3b9c3c87b9..f6ae93ed8e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11925,21 +11925,19 @@ ignoring formatting changes.") (define-public python-tqdm (package (name "python-tqdm") - (version "4.15.0") + (version "4.19.5") (source (origin (method url-fetch) (uri (pypi-uri "tqdm" version)) (sha256 (base32 - "0lwrmby8qz23gvqwkpivfrv4q8nfh90cz9ml6slwvwmcxxsdrhbf")))) + "0xvkffm77nqckk29xjy5fkqvig5b97vk7nzafp3cn36w4zqyccnz")))) (build-system python-build-system) (native-inputs `(("python-flake8" ,python-flake8) ("python-nose" ,python-nose) - ("python-nose-timer" ,python-nose-timer) - ("python-coverage" ,python-coverage) - ("python-virtualenv" ,python-virtualenv))) + ("python-coverage" ,python-coverage))) (home-page "https://github.com/tqdm/tqdm") (synopsis "Fast, extensible progress meter") (description -- cgit v1.2.3 From 2aa33bf41b43db128f08284789f76d745efdadd5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 14:58:11 +0100 Subject: gnu: python-mando: Update to 0.6.4. * gnu/packages/python.scm (python-mando): Update to 0.6.4. [propagated-inputs]: Add PYTHON-SIX. [native-inputs]: Remove PYTHON-SPHINX and PYTHON-PARAMUNITTEST. Add PYTHON-PYTEST. --- gnu/packages/python.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f6ae93ed8e..da7eecd902 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10827,20 +10827,20 @@ in other versions.") (define-public python-mando (package (name "python-mando") - (version "0.5") + (version "0.6.4") (source (origin (method url-fetch) (uri (pypi-uri "mando" version)) (sha256 (base32 - "0q05h66439gqdmlk4jqm6xrwrzfdgs4mwk70barxhr2y83qbbdc0")))) + "0q6rl085q1hw1wic52pqfndr0x3nirbxnhqj9akdm5zhq2fv3zkr")))) (build-system python-build-system) (propagated-inputs - `(("python-rst2ansi" ,python-rst2ansi))) + `(("python-rst2ansi" ,python-rst2ansi) + ("python-six" ,python-six))) (native-inputs - `(("python-sphinx" ,python-sphinx-1.5.3) - ("python-paramunittest" ,python-paramunittest))) + `(("python-pytest" ,python-pytest))) (home-page "https://mando.readthedocs.org/") (synopsis "Wrapper around argparse, allowing creation of complete CLI applications") -- cgit v1.2.3 From 50c84dd5a653f99e9ac4cf058392125cdde93eb7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 14:59:43 +0100 Subject: gnu: python-mando: Fix indentation. * gnu/packages/python.scm (python-mando): Indent with emacs. --- gnu/packages/python.scm | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index da7eecd902..c7308d1326 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10826,28 +10826,27 @@ in other versions.") (define-public python-mando (package - (name "python-mando") - (version "0.6.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mando" version)) - (sha256 - (base32 - "0q6rl085q1hw1wic52pqfndr0x3nirbxnhqj9akdm5zhq2fv3zkr")))) - (build-system python-build-system) - (propagated-inputs - `(("python-rst2ansi" ,python-rst2ansi) - ("python-six" ,python-six))) - (native-inputs - `(("python-pytest" ,python-pytest))) - (home-page "https://mando.readthedocs.org/") - (synopsis - "Wrapper around argparse, allowing creation of complete CLI applications") - (description - "This package is a wrapper around argparse, allowing you to write complete CLI - applications in seconds while maintaining all the flexibility.") - (license license:expat))) + (name "python-mando") + (version "0.6.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "mando" version)) + (sha256 + (base32 + "0q6rl085q1hw1wic52pqfndr0x3nirbxnhqj9akdm5zhq2fv3zkr")))) + (build-system python-build-system) + (propagated-inputs + `(("python-rst2ansi" ,python-rst2ansi) + ("python-six" ,python-six))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://mando.readthedocs.org/") + (synopsis + "Wrapper around argparse, allowing creation of complete CLI applications") + (description + "This package is a wrapper around argparse, allowing you to write complete CLI +applications in seconds while maintaining all the flexibility.") + (license license:expat))) (define-public python2-mando (package-with-python2 python-mando)) -- cgit v1.2.3 From 5861f9c9d685c0f7921c7cf118e02c9d4b094485 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 15:18:04 +0100 Subject: gnu: python-radon: Update to 2.2.0. * gnu/packages/python.scm (python-radon): Update to 2.2.0. [arguments]: Replace CHECK-PHASE with custom test command. [propagated-inputs]: Replace PYTHON-MANDO-0.3.1 with PYTHON-MANDO. [native-inputs]: Remove PYTHON-FLAKE8, PYTHON-TOX and PYTHON-PARAMUNITTEST. Add PYTHON-PYTEST-MOCK. --- gnu/packages/python.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c7308d1326..e5fe4f6f75 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11238,24 +11238,27 @@ for more filetypes can be easily added by creating plugins for them.") (define-public python-radon (package (name "python-radon") - (version "1.5.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "radon" version)) (sha256 (base32 - "1h6jv36am0i827182a04ki6291lyx4kp957xfr5njgprj4nd0qsl")))) + "07gq5hq4nrffxnlnksws9hrx7fd001gam63j62i82gyfr23gvdym")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "radon/tests/run.py")))))) (propagated-inputs `(("python-colorama" ,python-colorama) ("python-flake8-polyfill" ,python-flake8-polyfill) - ("python-mando" ,python-mando-0.3.1))) + ("python-mando" ,python-mando))) (native-inputs - `(("python-flake8" ,python-flake8) - ("python-tox" ,python-tox) - ("python-pytest" ,python-pytest) - ("python-paramunittest" ,python-paramunittest))) + `(("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) (home-page "https://radon.readthedocs.org/") (synopsis "Code Metrics in Python") (description "Radon is a Python tool which computes various code metrics. -- cgit v1.2.3 From 0a2d977ac1dc351bbf9d01b0523b7f673088c2ed Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 15:22:06 +0100 Subject: gnu: python-mando: Remove version 0.3.1. * gnu/packages/python.scm (python-mando-0.3.1): Remove variable. --- gnu/packages/python.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e5fe4f6f75..5a477e8cb6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10851,23 +10851,6 @@ applications in seconds while maintaining all the flexibility.") (define-public python2-mando (package-with-python2 python-mando)) -(define-public python-mando-0.3.1 - ;; python-radon (version 1.5.0) has a requirement - ;; for mando<0.4,>=0.3 - (package - (inherit python-mando) - (name "python-mando") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/rubik/mando/archive/v" - version - ".tar.gz")) - (sha256 - (base32 - "17jlkdpqw22z1nyml5ybslilqkzmnk0dxxjml8bfghav1l5hbwd2")))))) - (define-public python-fudge (package (name "python-fudge") -- cgit v1.2.3 From b7049b2e23a514a1d9c131af484e808ee0ee4226 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 17:00:45 +0100 Subject: Revert "gnu: python2-flake8: Fix python-enum34 propagation." This triggers a rebuild of 1111 packages, so let's work around it on the few that are affected instead. This reverts commit 01af1e11a67466d5f6338bdb207ff99ef5cf094e. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5a477e8cb6..6013c31acb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5440,7 +5440,7 @@ complexity of Python source code.") (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) - ("python2-enum34" ,python2-enum34) + ("python2-enum" ,python2-enum) ,@(package-propagated-inputs base)))))) (define-public python-flake8-polyfill -- cgit v1.2.3 From 53f826cd0f429864d46fc3bf6305c14356d0b2ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 17:05:23 +0100 Subject: gnu: python2-tqdm: Work around missing flake8 propagation. * gnu/packages/python.scm (python-tqdm)[properties]: Declare python2 variant. (python2-tqdm): Use STRIP-PYTHON2-VARIANT. [native-inputs]: Add PYTHON-ENUM34. --- gnu/packages/python.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6013c31acb..40c6077951 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11929,10 +11929,18 @@ ignoring formatting changes.") "Make loops show a progress bar on the console by just wrapping any iterable with @code{|tqdm(iterable)|}. Offers many options to define design and layout.") - (license (list license:mpl2.0 license:expat)))) + (license (list license:mpl2.0 license:expat)) + (properties `((python2-variant . ,(delay python2-tqdm)))))) (define-public python2-tqdm - (package-with-python2 python-tqdm)) + (let ((tqdm (package-with-python2 + (strip-python2-variant python-tqdm)))) + (package + (inherit tqdm) + (native-inputs + ;; FIXME: This should be propagated from python2-flake8 instead. + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs tqdm)))))) (define-public python-pkginfo (package -- cgit v1.2.3 From 2c7f4ae5611d934b823a373efc278e384b1944be Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 15:47:19 +0100 Subject: gnu: python-numpy: Update to 1.14.0. * gnu/packages/python.scm (python-numpy): Update to 1.4.0. [source](uri): Use release tarball. [source](file-name): Remove. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8ee85f7db6..f2c6913cbd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2710,16 +2710,16 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") - (version "1.13.3") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append - "https://github.com/numpy/numpy/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + "https://github.com/numpy/numpy/releases/download/v" + version "/numpy-" version ".tar.gz")) (sha256 (base32 - "1f25rbn6n4ia87spy18iwc76g36d9mimyl27p2lfaalgx897pf8x")))) + "1kh7y2ay21s9mcc11mq59g2f1yc75v152z2k2vlh0xmh9c9rjpf4")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) -- cgit v1.2.3 From ba62f087bc5d47897f2cfd5b7335f4f70b53da5b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 8 Feb 2018 12:31:45 +0100 Subject: gnu: python-scipy: Update to 1.0.0. * gnu/packages/python.scm (python-scipy): Update to 1.0.0. [arguments]: Remove obsolete FIX-TESTS-PHASE. Override sphinxbuild in INSTALL-DOC-PHASE. Fix PYVER argument. Use INVOKE instead of SYSTEM*. [native-inputs]: Remove PYTHON-NOSE. Add PYTHON-PYTEST and WHICH. --- gnu/packages/python.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f2c6913cbd..ac8927c0f1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3533,14 +3533,14 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "0.19.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 (base32 - "1rl411bvla6q7qfdb47fpdnyjhfgzl6smpha33n9ar1klykjr6m1")))) + "043djb3vyk6qripmyw30jhl0g8qza0fmar6wck10iv79l08izsl7")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) @@ -3551,11 +3551,12 @@ functions.") ("openblas" ,openblas))) (native-inputs `(("python-cython" ,python-cython) - ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest) ("python-sphinx" ,python-sphinx) ("python-numpydoc" ,python-numpydoc) ("gfortran" ,gfortran) - ("perl" ,perl))) + ("perl" ,perl) + ("which" ,which))) (outputs '("out" "doc")) (arguments `(#:phases @@ -3584,7 +3585,11 @@ atlas_libs = openblas (let* ((data (string-append (assoc-ref outputs "doc") "/share")) (doc (string-append data "/doc/" ,name "-" ,version)) (html (string-append doc "/html")) - (pyver ,(string-append "PYVER="))) + (pyver ,(string-append "PYVER=" (version-major+minor + (package-version python)))) + ;; By default it tries to run sphinx-build through the Python + ;; interpreter which won't work with our shell wrapper. + (sphinxbuild "SPHINXBUILD=LANG=C sphinx-build")) ;; Make installed package available for building the ;; documentation (add-installed-pythonpath inputs outputs) @@ -3594,7 +3599,7 @@ atlas_libs = openblas (("pngmath_use_preview = True") "pngmath_use_preview = False")) (mkdir-p html) - (system* "make" "html" pyver) + (invoke "make" "html" pyver sphinxbuild) (with-directory-excursion "build/html" (for-each (lambda (file) (let* ((dir (dirname file)) @@ -3602,21 +3607,15 @@ atlas_libs = openblas (install-file file html))) (find-files "." ".*"))))) #t)) - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "scipy/integrate/tests/test_quadpack.py" - (("libm.so") "libm.so.6")) - #t)) - ;; Tests can only be run after the library has been installed and not - ;; within the source directory. + ;; Tests can only be run after the library has been installed and not + ;; within the source directory. (delete 'check) (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (with-directory-excursion "/tmp" - (zero? (system* "python" "-c" - "import scipy; scipy.test('full')"))) - #t))))) + (invoke "python" "-c" + "import scipy; scipy.test('full', verbose=2)"))))))) (home-page "https://www.scipy.org/") (synopsis "The Scipy library provides efficient numerical routines") (description "The SciPy library is one of the core packages that make up -- cgit v1.2.3 From ce2cfcabfccbd6062ab4029258ab61b308508c62 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 9 Feb 2018 14:40:44 +0100 Subject: gnu: python-pandas: Update to 0.22.0. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/patches/python-pandas-skip-failing-tests.patch: Delete file. * gnu/packages/python.scm (python-pandas): Update to 0.22.0. [source](patches): Remove. [native-inputs]: Add PYTHON-PYTEST and PYTHON-LXML. [arguments]: Replace CHECK-PHASE with custom pytest invocation. [home-page]: Use HTTPS. --- gnu/local.mk | 1 - .../patches/python-pandas-skip-failing-tests.patch | 49 ---------------------- gnu/packages/python.scm | 38 +++++++++++++---- 3 files changed, 31 insertions(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/python-pandas-skip-failing-tests.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 9cf14c8b08..0a7810df9d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1026,7 +1026,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ - %D%/packages/patches/python-pandas-skip-failing-tests.patch \ %D%/packages/patches/python-paste-remove-website-test.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ %D%/packages/patches/python-pygit2-disable-network-tests.patch \ diff --git a/gnu/packages/patches/python-pandas-skip-failing-tests.patch b/gnu/packages/patches/python-pandas-skip-failing-tests.patch deleted file mode 100644 index 8ac330c18f..0000000000 --- a/gnu/packages/patches/python-pandas-skip-failing-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -These tests fail on 32bit architectures. - -Upstream bug URL: https://github.com/pandas-dev/pandas/issues/14866 - ---- a/pandas/tests/indexes/common.py 2017-03-09 00:10:26.063996176 +0100 -+++ b/pandas/tests/indexes/common.py 2017-03-09 00:10:53.152844191 +0100 -@@ -119,20 +119,6 @@ - with tm.assertRaisesRegexp(ValueError, 'Invalid fill method'): - idx.get_indexer(idx, method='invalid') - -- def test_ndarray_compat_properties(self): -- -- idx = self.create_index() -- self.assertTrue(idx.T.equals(idx)) -- self.assertTrue(idx.transpose().equals(idx)) -- -- values = idx.values -- for prop in self._compat_props: -- self.assertEqual(getattr(idx, prop), getattr(values, prop)) -- -- # test for validity -- idx.nbytes -- idx.values.nbytes -- - def test_repr_roundtrip(self): - - idx = self.create_index() ---- a/pandas/tools/tests/test_tile.py 2017-03-08 17:47:39.762261841 +0100 -+++ b/pandas/tools/tests/test_tile.py 2017-03-08 17:48:26.831780495 +0100 -@@ -271,19 +271,6 @@ - np.array([0, 0, 1, 1], dtype=np.int8)) - tm.assert_numpy_array_equal(bins, np.array([0, 1.5, 3])) - -- def test_single_bin(self): -- # issue 14652 -- expected = Series([0, 0]) -- -- s = Series([9., 9.]) -- result = cut(s, 1, labels=False) -- tm.assert_series_equal(result, expected) -- -- s = Series([-9., -9.]) -- result = cut(s, 1, labels=False) -- tm.assert_series_equal(result, expected) -- -- - def curpath(): - pth, _ = os.path.split(os.path.abspath(__file__)) - return pth diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ac8927c0f1..6e08e38b45 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1066,24 +1066,48 @@ human-friendly syntax.") (define-public python-pandas (package (name "python-pandas") - (version "0.19.2") + (version "0.22.0") (source (origin (method url-fetch) (uri (pypi-uri "pandas" version)) (sha256 - (base32 "0540cnbwy2hc4hv2sxfs8i47xi91qzvzxfn80dl785ibiicly3vg")) - (patches - (search-patches "python-pandas-skip-failing-tests.patch")))) + (base32 "0v0fi2i10kwnmlpsl6f1fgajcpx3q6766qf6xqi5kw3ivn8l1aa4")))) (build-system python-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-26)) + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (let ((build-directory + (string-append + (getcwd) "/build/" + (car (scandir "build" + (cut string-prefix? "lib." <>)))))) + (with-directory-excursion build-directory + ;; Delete tests that require "moto" which is not yet in Guix. + (for-each delete-file + '("pandas/tests/io/conftest.py" + "pandas/tests/io/json/test_compression.py" + "pandas/tests/io/test_excel.py")) + (invoke "pytest" "-v" "pandas" "-k" + (string-append + "not network and not disabled" + ;; XXX: Due to the deleted tests above. + " and not test_read_s3_jsonl"))))))))) (propagated-inputs `(("python-numpy" ,python-numpy) ("python-pytz" ,python-pytz) ("python-dateutil" ,python-dateutil))) (native-inputs - `(("python-nose" ,python-nose) - ("python-cython" ,python-cython))) - (home-page "http://pandas.pydata.org") + `(("python-cython" ,python-cython) + ("python-lxml" ,python-lxml) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (home-page "https://pandas.pydata.org") (synopsis "Data structures for data analysis, time series, and statistics") (description "Pandas is a Python package providing fast, flexible, and expressive data -- cgit v1.2.3 From 5c4fd60416627634b05406e79448e7e960416227 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 13 Feb 2018 14:30:44 -0500 Subject: gnu: python-icalendar: Update to 4.0.1. * gnu/packages/python.scm (python-icalendar): Update to 4.0.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 777590b583..f0eb376217 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6954,13 +6954,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "0jfp93x2pnpsbck92zw22dq7sl4pk0avv0gnb4x9vldrg6vlhyin")))) + "139y79y6ijl39m5bj771r43vpah9s4ly7d1k76la6hrx7l144ak8")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From 8b2ad13b1952892adb1222ab69592c81b7be9a25 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Feb 2018 14:26:54 +0100 Subject: gnu: Add python-tokenize-rt. * gnu/packages/python.scm (python-tokenize-rt): New variable. --- gnu/packages/python.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8c239c3f11..18aa4f5900 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12663,3 +12663,24 @@ Week instances stringify to this form.") (define-public python2-isoweek (package-with-python2 python-isoweek)) + +(define-public python-tokenize-rt + (package + (name "python-tokenize-rt") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tokenize-rt" version)) + (sha256 + (base32 + "1yjvbz7rvrz31zjyax1cgy3xhf4wb3j18jwnj4bnl77ca4gliyiw")))) + (build-system python-build-system) + (home-page "https://github.com/asottile/tokenize-rt") + (synopsis "Wrapper around the stdlib tokenize which roundtrips.") + (description + "This Python library is a wrapper around @code{tokenize} from the Python +standard library. It provides two additional tokens @code{ESCAPED_NL} and +@code{UNIMPORTANT_WS}, and a @code{Token} data type. Use @code{src_to_tokens} +and @code{tokens_to_src} to roundtrip.") + (license license:expat))) -- cgit v1.2.3 From 130d290e29fa3af4567fba1132c55cedd2d0e11a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Feb 2018 14:27:16 +0100 Subject: gnu: Add python-future-fstrings. * gnu/packages/python.scm (python-future-fstrings): New variable. --- gnu/packages/python.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 18aa4f5900..b05a4a4a2b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12684,3 +12684,26 @@ standard library. It provides two additional tokens @code{ESCAPED_NL} and @code{UNIMPORTANT_WS}, and a @code{Token} data type. Use @code{src_to_tokens} and @code{tokens_to_src} to roundtrip.") (license license:expat))) + +(define-public python-future-fstrings + (package + (name "python-future-fstrings") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "future_fstrings" version)) + (sha256 + (base32 + "0ydxqz2dvns44g55p8ix2x18qkfk3aaz0m0dc70f3g6n8js35h47")))) + (build-system python-build-system) + (propagated-inputs + `(("python-tokenize-rt" ,python-tokenize-rt))) + (home-page "https://github.com/asottile/future-fstrings") + (synopsis "Backport of fstrings to Python < 3.6") + (description + "This package provides a UTF-8 compatible encoding +@code{future_fstrings}, which performs source manipulation. It decodes the +source bytes using the UTF-8 encoding and then rewrites Python 3.6 style +@code{f} strings.") + (license license:expat))) -- cgit v1.2.3 From fc162dbaec1348d42361e0f12fc0ea731d53141b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 14 Feb 2018 14:27:26 +0100 Subject: gnu: Add python-typing. * gnu/packages/python.scm (python-typing, python2-typing): New variables. --- gnu/packages/python.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b05a4a4a2b..c3459cc51f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12707,3 +12707,28 @@ and @code{tokens_to_src} to roundtrip.") source bytes using the UTF-8 encoding and then rewrites Python 3.6 style @code{f} strings.") (license license:expat))) + +(define-public python-typing + (package + (name "python-typing") + (version "3.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "typing" version)) + (sha256 + (base32 + "1wmk9nkh30n37cbrqwkbggmj2390lhrlagjkd0ikm02l88saj06l")))) + (build-system python-build-system) + (home-page "https://docs.python.org/3/library/typing.html") + (synopsis "Type hints for Python") + (description "This is a backport of the standard library @code{typing} +module to Python versions older than 3.5. Typing defines a standard notation +for Python function and variable type annotations. The notation can be used +for documenting code in a concise, standard format, and it has been designed +to also be used by static and runtime type checkers, static analyzers, IDEs +and other tools.") + (license license:psfl))) + +(define-public python2-typing + (package-with-python2 python-typing)) -- cgit v1.2.3 From 34581f68c05e08ff3cf5419e598ef6ad4faa22da Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 2 Jan 2017 17:31:34 +0100 Subject: gnu: Add bpython. * gnu/packages/python.scm (bpython, bpython2): New variables. --- gnu/packages/python.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f0eb376217..72b1d05e9f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016, 2018 Hartmut Goebel ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey @@ -112,6 +112,7 @@ #:use-module (gnu packages shells) #:use-module (gnu packages ssh) #:use-module (gnu packages statistics) + #:use-module (gnu packages terminals) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) @@ -12555,3 +12556,92 @@ Week instances stringify to this form.") (define-public python2-isoweek (package-with-python2 python-isoweek)) + +(define-public bpython + (package + (name "bpython") + (version "0.17") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bpython" version)) + (sha256 + (base32 + "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; Remove failing test. FIXME: make it pass + (delete-file "bpython/test/test_args.py") + #t)) + (add-after 'wrap 'add-aliases + ;; for symmetry to bpython2, add symlinks bypthon3, bpdb3, etc. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (old new) + (symlink old (string-append out "/bin/" new))) + '("bpython" "bpython-curses" "bpython-urwid" "bpdb") + '("bpython3" "bpython3-curses" "bpython3-urwid" "bpdb3"))) + #t))))) + (propagated-inputs + `(("python-pygments" ,python-pygments) + ("python-requests", python-requests) + ("python-babel" ,python-babel) ; optional, for internationalization + ("python-curtsies" ,python-curtsies) ; >= 0.1.18 + ("python-greenlet" ,python-greenlet) + ("python-urwid" ,python-urwid) ; for bpython-urwid only + ("python-six" ,python-six))) + (native-inputs + `(("python-sphinx" ,python-sphinx) + ("python-mock" ,python-mock))) + (home-page "https://bpython-interpreter.org/") + (synopsis "Fancy interface to the Python interpreter") + (description "Bpython is a fancy interface to the Python +interpreter. bpython's main features are + +@enumerate +@item in-line syntax highlighting, +@item readline-like autocomplete with suggestions displayed as you type, +@item expected parameter list for any Python function, +@item \"rewind\" function to pop the last line of code from memory and + re-evaluate, +@item send the code you've entered off to a pastebin, +@item save the code you've entered to a file, and +@item auto-indentation. +@end enumerate") + (license license:expat))) + +(define-public bpython2 + (let ((base (package-with-python2 + (strip-python2-variant bpython)))) + (package (inherit base) + (name "bpython2") + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test + (lambda _ + ;; Remove failing test. FIXME: make it pass + (delete-file "bpython/test/test_args.py") + ;; Disable failing test-cases (renaming inhibits they are + ;; discovered) + (substitute* "bpython/test/test_curtsies_repl.py" + (("^(\\s*def )(test_get_last_word_with_prev_line\\W)" _ a b) + (string-append a "xxx_off_" b)) + (("^(\\s*def )(test_complex\\W)" _ a b) + (string-append a "xxx_off_" b))) + #t)) + (add-before 'build 'rename-scripts + ;; rename the scripts to bypthon2, bpdb2, etc. + (lambda _ + (substitute* "setup.py" + (("^(\\s+'bpdb)(\\s+=.*',?)\\s*?$" _ name rest) + (string-append name "2" rest "\n")) + (("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub rest) + (string-append name "2" (or sub "") rest "\n"))) + #t)))))))) -- cgit v1.2.3 From 6ca86ed7a3cbd61bbc3e1a3314b6b43abf42d83a Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 15 Feb 2018 19:14:31 -0500 Subject: gnu: python-botocore: Update to 1.8.43. * gnu/packages/python.scm (python-botocore): Update to 1.8.43. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 72b1d05e9f..91e1a8bf28 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7375,14 +7375,14 @@ document.") (define-public python-botocore (package (name "python-botocore") - (version "1.8.36") + (version "1.8.43") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "0xd607qd9vkwpsvp552nqnrxppnx2n1rzh9kk9shz48ldpyy1jdj")))) + "12cqpbnz3vfv41mp9admvciw7bc7hz57sjpqs2bxaw9wnfmbw5lg")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From 26176bee23706669c7402c8bd083ed29187fe8e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 20:49:39 +0100 Subject: gnu: python-waitress: Update to 1.1.0. * gnu/packages/patches/python-waitress-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/python.scm (python-waitress): Update to 1.1.0. [source](patches): New field. --- gnu/local.mk | 1 + .../patches/python-waitress-fix-tests.patch | 29 ++++++++++++++++++++++ gnu/packages/python.scm | 5 ++-- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-waitress-fix-tests.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 846de07a5d..19062df6a2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1041,6 +1041,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ + %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-CVE-2017-15038.patch \ %D%/packages/patches/qemu-CVE-2017-15289.patch \ %D%/packages/patches/qt4-ldflags.patch \ diff --git a/gnu/packages/patches/python-waitress-fix-tests.patch b/gnu/packages/patches/python-waitress-fix-tests.patch new file mode 100644 index 0000000000..110492a604 --- /dev/null +++ b/gnu/packages/patches/python-waitress-fix-tests.patch @@ -0,0 +1,29 @@ +Skip test that requires getaddrinfo(), which is not available in the build +environment. This package uses a regexp for finding tests (see runner.py), +so using @unittest.skip does not work. + +--- a/waitress/tests/test_adjustments.py ++++ b/waitress/tests/test_adjustments.py +@@ -185,22 +185,6 @@ + def test_bad_port(self): + self.assertRaises(ValueError, self._makeOne, listen='127.0.0.1:test') + +- def test_service_port(self): +- if WIN and PY2: # pragma: no cover +- # On Windows and Python 2 this is broken, so we raise a ValueError +- self.assertRaises( +- ValueError, +- self._makeOne, +- listen='127.0.0.1:http', +- ) +- return +- +- inst = self._makeOne(listen='127.0.0.1:http 0.0.0.0:https') +- +- bind_pairs = [sockaddr[:2] for (_, _, _, sockaddr) in inst.listen] +- +- self.assertEqual(bind_pairs, [('127.0.0.1', 80), ('0.0.0.0', 443)]) +- + def test_dont_mix_host_port_listen(self): + self.assertRaises( + ValueError, diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6e5e804c34..257489d09b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7550,14 +7550,15 @@ templates into Python modules.") (define-public python-waitress (package (name "python-waitress") - (version "0.8.10") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "waitress" version)) + (patches (search-patches "python-waitress-fix-tests.patch")) (sha256 (base32 - "017n9ra6vvmq9d5sfhdzyzr1mg15x2hj2dhm4pdlw98c1ypw2h3w")))) + "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k")))) (build-system python-build-system) (home-page "https://github.com/Pylons/waitress") (synopsis "Waitress WSGI server") -- cgit v1.2.3 From 6f6db0269f76525e91201038b77798d666c8130b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Feb 2018 21:45:31 +0100 Subject: gnu: python-hacking: Update to 1.0.0. * gnu/packages/openstack.scm (python-hacking): Update to 1.0.0. [propagated-inputs]: Change PYTHON-FLAKE8 to PYTHON-FLAKE8-2.5. * gnu/packages/python.scm (python-flake8-2.5, python2-flake8-2.5): New public variables. --- gnu/packages/openstack.scm | 6 +++--- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index c339cd5178..2a55a80842 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -118,17 +118,17 @@ manner.") (define-public python-hacking (package (name "python-hacking") - (version "0.13.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "hacking" version)) (sha256 (base32 - "1s1wq2sds6fjp8rwz31vkp33kjl9nyk5y2g2pri8shic75dr00h4")))) + "0s9l99s64jsyvm28fa4hzllbdi21sb7jn4gzdf1pd5ckvy7p4b0k")))) (build-system python-build-system) (propagated-inputs - `(("python-flake8" ,python-flake8) + `(("python-flake8" ,python-flake8-2.5) ("python-mccabe-0.2.1" ,python-mccabe-0.2.1) ("python-pbr" ,python-pbr) ("python-pep8-1.5.7" ,python-pep8-1.5.7) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 257489d09b..5bbe472da6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5468,6 +5468,32 @@ complexity of Python source code.") ("python2-enum" ,python2-enum) ,@(package-propagated-inputs base)))))) +;; python-hacking requires flake8 <2.6.0. +(define-public python-flake8-2.5 + (package + (inherit python-flake8) + (version "2.5.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 + "1snylqwbmrylbx3r1wpz8ggk98f6bcag4441ag8mm2l7wyn58sij")))) + (propagated-inputs + `(("python-pep8" ,python-pep8) + ,@(package-propagated-inputs python-flake8))) + (properties `((python2-variant . ,(delay python2-flake8-2.5)))))) + +(define-public python2-flake8-2.5 + (package + (inherit python2-flake8) + (version (package-version python-flake8-2.5)) + (source (origin + (inherit (package-source python-flake8-2.5)))) + (propagated-inputs + `(("python2-pep8" ,python2-pep8) + ,@(package-propagated-inputs python2-flake8))))) + (define-public python-flake8-polyfill (package (name "python-flake8-polyfill") -- cgit v1.2.3