From 6717c87964a7b210c34c122ce9dcef54ad7119cf Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sun, 18 Oct 2015 08:43:40 +0800 Subject: gnu: python-dbus: Fix test. * gnu/packages/python.scm (python-dbus)[arguments]: Run test with 'DBUS_FATAL_WARNINGS=0'. --- gnu/packages/python.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c972b6250..9db578ed9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4211,6 +4211,17 @@ features useful for text console applications.") (sha256 (base32 "1py62qir966lvdkngg0v8k1khsqxwk5m4s8nflpk1agk5f5nqb71")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before + 'check 'pre-check + (lambda _ + ;; XXX: For the missing '/etc/machine-id'. + (substitute* "test/run-test.sh" + (("DBUS_FATAL_WARNINGS=1") + "DBUS_FATAL_WARNINGS=0")) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.3 From 1e656049b01bdeb2370229641ef8e0def92b4f89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 13 Oct 2015 14:56:15 +0200 Subject: gnu: Add python-numexpr. * gnu/packages/python.scm (python-numexpr, python2-numexpr): New variables. --- gnu/packages/python.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c972b6250..972134323 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3060,6 +3060,43 @@ that client code uses to construct the grammar directly in Python code.") (define-public python2-numpydoc (package-with-python2 python-numpydoc)) +(define-public python-numexpr + (package + (name "python-numexpr") + (version "2.4.4") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/" + "n/numexpr/numexpr-" version ".tar.gz")) + (sha256 + (base32 + "0nsnff5312fm38w6dm34bw7ghfqqy8vl9gig0al963h4mz8zm8nz")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ; no tests included + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (home-page "https://github.com/pydata/numexpr") + (synopsis "Fast numerical expression evaluator for NumPy") + (description + "Numexpr is a fast numerical expression evaluator for NumPy. With it, +expressions that operate on arrays are accelerated and use less memory than +doing the same calculation in Python. In addition, its multi-threaded +capabilities can make use of all your cores, which may accelerate +computations, most specially if they are not memory-bounded (e.g. those using +transcendental functions).") + (license license:expat))) + +(define-public python2-numexpr + (let ((numexpr (package-with-python2 python-numexpr))) + (package (inherit numexpr) + ;; Make sure to use special packages for Python 2 instead + ;; of those automatically rewritten by package-with-python2. + (propagated-inputs + `(("python2-numpy" ,python2-numpy) + ,@(alist-delete "python-numpy" + (package-propagated-inputs numexpr))))))) + (define-public python-matplotlib (package (name "python-matplotlib") -- cgit v1.3 From 5e1c936712d824e7ccbb3cbb8ac7ffa375237469 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 26 Oct 2015 09:58:55 +0100 Subject: gnu: Add python-file. * gnu/packages/python.scm (python-file, python2-file): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 972134323..23150a3df 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages backup) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages gdbm) #:use-module (gnu packages gcc) @@ -5750,3 +5751,29 @@ Python's @code{ctypes} foreign function interface (FFI).") (define-public python2-libarchive-c (package-with-python2 python-libarchive-c)) + +(define-public python-file + (package + (inherit file) + (name "python-file") + (build-system python-build-system) + (arguments + '(#:tests? #f ;no tests + #:phases (modify-phases %standard-phases + (add-before 'build 'change-directory + (lambda _ + (chdir "python") + #t)) + (add-before 'build 'set-library-file-name + (lambda* (#:key inputs #:allow-other-keys) + (let ((file (assoc-ref inputs "file"))) + (substitute* "magic.py" + (("find_library\\('magic'\\)") + (string-append "'" file "/lib/libmagic.so'"))) + #t)))))) + (inputs `(("file" ,file))) + (self-native-input? #f) + (synopsis "Python bindings to the libmagic file type guesser"))) + +(define-public python2-file + (package-with-python2 python-file)) -- cgit v1.3 From 85d4aeacc49f2793b7d67914fd4086e2d7b2e6f8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 27 Oct 2015 20:43:11 +0100 Subject: gnu: Add python-debian. * gnu/packages/python.scm (python-debian, python2-debian): New variables. --- gnu/packages/python.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 23150a3df..8fc87599f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5777,3 +5777,43 @@ Python's @code{ctypes} foreign function interface (FFI).") (define-public python2-file (package-with-python2 python-file)) + +(define-public python-debian + (package + (name "python-debian") + (version "0.1.23") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/p/python-debian/python-debian-" + version ".tar.gz")) + (sha256 + (base32 + "193faznwnjc3n5991wyzim6h9gyq1zxifmfrnpm3avgkh7ahyynh")))) + (build-system python-build-system) + (inputs + `(("python-six" ,python-six))) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://packages.debian.org/sid/python-debian") + (synopsis "Debian package related modules") + (description + "This package provides Python modules that abstract many formats of +Debian-related files, such as: + +@itemize +@item Debtags information; +@item @file{debian/changelog} files; +@item packages files, pdiffs; +@item control files of single or multiple RFC822-style paragraphs---e.g. + @file{debian/control}, @file{.changes}, @file{.dsc}; +@item Raw @file{.deb} and @file{.ar} files, with (read-only) access to + contained files and meta-information. +@end itemize\n") + + ;; Modules are either GPLv2+ or GPLv3+. + (license gpl3+))) + +(define-public python2-debian + (package-with-python2 python-debian)) -- cgit v1.3 From 816a653884558feab29ccf470c972262708309f9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 27 Oct 2015 20:53:48 +0100 Subject: gnu: Add python-chardet. * gnu/packages/python.scm (python-chardet, python2-chardet): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8fc87599f..45fd417e8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5817,3 +5817,30 @@ Debian-related files, such as: (define-public python2-debian (package-with-python2 python-debian)) + +(define-public python-chardet + (package + (name "python-chardet") + (version "2.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/c/chardet/chardet-" + version + ".tar.gz")) + (sha256 + (base32 + "1ak87ikcw34fivcgiz2xvi938dmclh078az65l9x3rmgljrkhgp5")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/chardet/chardet") + (synopsis "Universal encoding detector for Python 2 and 3") + (description + "This package provides @code{chardet}, a Python module that can +automatically detect a wide range of file encodings.") + (license lgpl2.1+))) + +(define-public python2-chardet + (package-with-python2 python-chardet)) -- cgit v1.3 From 5c7bdc9a7fb2ed4f963dbacc7c1bee8cc9223303 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 28 Oct 2015 11:59:42 +0100 Subject: gnu: python-debian: Avoid @itemize in description. * gnu/packages/python.scm (python-debian): Use @enumerate instead of @itemize. --- 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 45fd417e8..08f014664 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5799,10 +5799,12 @@ Python's @code{ctypes} foreign function interface (FFI).") (home-page "http://packages.debian.org/sid/python-debian") (synopsis "Debian package related modules") (description + ;; XXX: Use @enumerate instead of @itemize to work around + ;; . "This package provides Python modules that abstract many formats of Debian-related files, such as: -@itemize +@enumerate @item Debtags information; @item @file{debian/changelog} files; @item packages files, pdiffs; @@ -5810,7 +5812,7 @@ Debian-related files, such as: @file{debian/control}, @file{.changes}, @file{.dsc}; @item Raw @file{.deb} and @file{.ar} files, with (read-only) access to contained files and meta-information. -@end itemize\n") +@end enumerate\n") ;; Modules are either GPLv2+ or GPLv3+. (license gpl3+))) -- cgit v1.3 From b416aadf7455470b702a557f4f475b04198ce698 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 29 Oct 2015 16:48:32 +0100 Subject: gnu: Move gdbm to (gnu packages databases). * gnu/packages/gdbm.scm: Remove. * gnu/packages/databases.scm (gdbm): New variable, from gdbm.scm. * gnu/packages/avahi.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/guile.scm, gnu/packages/mail.scm, gnu/packages/man.scm, gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/ruby.scm, gnu/packages/sawfish.scm: Adjust accordingly. * gnu-system.am (GNU_SYSTEM_MODULES): Remove gdbm.scm. --- gnu-system.am | 1 - gnu/packages/avahi.scm | 2 +- gnu/packages/cyrus-sasl.scm | 4 ++-- gnu/packages/databases.scm | 22 ++++++++++++++++++++++ gnu/packages/gdbm.scm | 46 --------------------------------------------- gnu/packages/guile.scm | 2 +- gnu/packages/mail.scm | 2 -- gnu/packages/man.scm | 2 +- gnu/packages/pulseaudio.scm | 2 +- gnu/packages/python.scm | 1 - gnu/packages/ruby.scm | 3 +-- gnu/packages/sawfish.scm | 2 +- 12 files changed, 30 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/gdbm.scm (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index 3e976e9fb..d8430b473 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -121,7 +121,6 @@ GNU_SYSTEM_MODULES = \ gnu/packages/gcc.scm \ gnu/packages/gd.scm \ gnu/packages/gdb.scm \ - gnu/packages/gdbm.scm \ gnu/packages/geeqie.scm \ gnu/packages/gettext.scm \ gnu/packages/ghostscript.scm \ diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index b6eef1a6a..2d480192a 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -23,7 +23,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages databases) #:use-module (gnu packages libdaemon) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index cd0f1bb40..8f3e1a1b7 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; ;;; This file is part of GNU Guix. @@ -19,7 +19,7 @@ (define-module (gnu packages cyrus-sasl) #:use-module (gnu packages) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages databases) #:use-module (gnu packages mit-krb5) #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a17424196..51e2a3e05 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -53,6 +53,28 @@ #:use-module (srfi srfi-26) #:use-module (ice-9 match)) +(define-public gdbm + (package + (name "gdbm") + (version "1.11") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdbm/gdbm-" + version ".tar.gz")) + (sha256 + (base32 + "1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd")))) + (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) + (build-system gnu-build-system) + (home-page "http://www.gnu.org/software/gdbm/") + (synopsis + "Hash library of database functions compatible with traditional dbm") + (description + "GDBM is a library for manipulating hashed databases. It is used to +store key/value pairs in a file in a manner similar to the Unix dbm library +and provides interfaces to the traditional file format.") + (license gpl3+))) + (define-public bdb (package (name "bdb") diff --git a/gnu/packages/gdbm.scm b/gnu/packages/gdbm.scm deleted file mode 100644 index 62d02001c..000000000 --- a/gnu/packages/gdbm.scm +++ /dev/null @@ -1,46 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (gnu packages gdbm) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public gdbm - (package - (name "gdbm") - (version "1.11") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gdbm/gdbm-" - version ".tar.gz")) - (sha256 - (base32 - "1hz3jgh3pd4qzp6jy0l8pd8x01g9abw7csnrlnj1a2sxy122z4cd")))) - (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) - (build-system gnu-build-system) - (home-page "http://www.gnu.org/software/gdbm/") - (synopsis - "Hash library of database functions compatible with traditional dbm") - (description - "GDBM is a library for manipulating hashed databases. It is used to -store key/value pairs in a file in a manner similar to the Unix dbm library -and provides interfaces to the traditional file format.") - (license gpl3+))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index da75addc9..ac9e9c7b4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -38,7 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages texinfo) #:use-module (gnu packages gettext) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages databases) #:use-module (gnu packages python) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 25407b835..699b8802b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -36,7 +36,6 @@ #:use-module (gnu packages dejagnu) #:use-module (gnu packages emacs) #:use-module (gnu packages enchant) - #:use-module (gnu packages gdbm) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -48,7 +47,6 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages linux) #:use-module (gnu packages m4) - #:use-module (gnu packages databases) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 46b7d8b9b..3298268d2 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -24,9 +24,9 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) + #:use-module (gnu packages databases) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) - #:use-module (gnu packages gdbm) #:use-module (gnu packages groff) #:use-module (gnu packages less) #:use-module (gnu packages lynx) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index d83222827..27b269afc 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -27,7 +27,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages check) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages databases) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 08f014664..24a342b8d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -41,7 +41,6 @@ #:use-module (gnu packages databases) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) - #:use-module (gnu packages gdbm) #:use-module (gnu packages gcc) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 701b7ee6e..8bf85233e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Pjotr Prins -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2014, 2015 David Thompson ;;; Copyright © 2015 Ricardo Wurmus @@ -30,7 +30,6 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages java) #:use-module (gnu packages libffi) - #:use-module (gnu packages gdbm) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (guix packages) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index e2cb62c62..9b09b6171 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -22,7 +22,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages gdbm) + #:use-module (gnu packages databases) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) -- cgit v1.3 From 69b96e5eee36dd2f15790c6022a5c162e3206291 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 Nov 2015 14:26:05 +0100 Subject: gnu: python-simplegeneric: Add setuptools to native inputs. * gnu/packages/python.scm (python-simplegeneric)[native-inputs]: Add python-setuptools. --- 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 b37bb1360..1055c6f24 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3961,7 +3961,8 @@ PickleShare.") (base32 "0wwi1c6md4vkbcsfsf8dklf3vr4mcdj4mpxkanwgb6jb1432x5yw")))) (build-system python-build-system) (native-inputs - `(("unzip" ,unzip))) + `(("python-setuptools" ,python-setuptools) + ("unzip" ,unzip))) (home-page "http://cheeseshop.python.org/pypi/simplegeneric") (synopsis "Python module for simple generic functions") (description -- cgit v1.3 From cbaa6a1e41178fa96c6911eb503e6ae1cc191eac Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 11 Oct 2015 05:16:28 +0200 Subject: gnu: Update python-requests. * gnu/packages/python.scm (python-requests, python2-requests): Bump to 2.8.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 1055c6f24..70b297d0e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2073,7 +2073,7 @@ with sensible defaults out of the box.") (define-public python-requests (package (name "python-requests") - (version "2.4.0") + (version "2.8.0") (source (origin (method url-fetch) (uri @@ -2082,7 +2082,7 @@ with sensible defaults out of the box.") version ".tar.gz")) (sha256 (base32 - "0gknlfx1wakrrm1zi8gi03x2lzj4dsns0vjw0nsmgqvkphyf01vh")))) + "0yrvj8hfnabrdxds59w6d6887sn5j0jlgpmcq04lk4k0kdc07w5j")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools) -- cgit v1.3 From 7477fbb1bed276b9cf2252126ad9ae9b2ed7e669 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 11 Oct 2015 05:20:08 +0200 Subject: gnu: Add python-mccabe 0.2.1 * gnu/packages/python.scm (python-mccabe-0.2.1, python2-mccabe-0.2.1): New variables. --- gnu/packages/python.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 70b297d0e..e6b66f088 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4895,6 +4895,20 @@ complexity of Python source code.") (define-public python2-mccabe (package-with-python2 python-mccabe)) +(define-public python-mccabe-0.2.1 + (package (inherit python-mccabe) + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mccabe" version)) + (sha256 + (base32 + "0fi4a81kr5bcv5p4xgibqr595hyj5dafkqgsmfk96mfy8w71fajs")))))) + +(define-public python2-mccabe-0.2.1 + (package-with-python2 python-mccabe-0.2.1)) + ;; Flake8 2.4.1 requires an older version of pep8. ;; This should be removed ASAP. (define-public python-pep8-1.5.7 -- cgit v1.3 From abf21efcae3bb52b463c6b92f7b9132ba1c0bfa8 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Sun, 11 Oct 2015 05:21:12 +0200 Subject: gnu: Add python-flake8-2.2.4 * gnu/packages/python.scm (python-flake8-2.2.4, python2-flake8-2.2.4): New variables. --- 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 e6b66f088..ce424675b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4979,6 +4979,29 @@ complexity of Python source code.") (define-public python2-flake8 (package-with-python2 python-flake8)) +;; This will only be needed by the python-hacking package and will not be +;; necessary once python-hacking > 0.10.2 is released. +(define-public python-flake8-2.2.4 + (package (inherit python-flake8) + (inputs + `(("python-setuptools" ,python-setuptools) + ("python-pep8" ,python-pep8-1.5.7) + ("python-pyflakes" ,python-pyflakes-0.8.1) + ("python-mccabe" ,python-mccabe-0.2.1) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose))) + (version "2.2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 + "1r9wsry4va45h1rck5hxd3vzsg2q3y6lnl6pym1bxvz8ry19jwx8")))))) + +(define-public python2-flake8-2.2.4 + (package-with-python2 python-flake8-2.2.4)) + (define-public python-mistune (package (name "python-mistune") -- cgit v1.3 From a3fc12daa7ee35d78180c21fa5d62616108fef53 Mon Sep 17 00:00:00 2001 From: Cyril Roelandt Date: Mon, 12 Oct 2015 02:31:38 +0200 Subject: gnu: paramiko: Move python-pycrypto to the propagated inputs. * gnu/packages/python.scm (python-paramiko): Move python-pycrypto to the propagated-inputs. --- 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 ce424675b..4e54ef94f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -413,9 +413,10 @@ John the Ripper).") (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) + (propagated-inputs + `(("python-pycrypto" ,python-pycrypto))) (inputs - `(("python-ecdsa" ,python-ecdsa) - ("python-pycrypto" ,python-pycrypto))) + `(("python-ecdsa" ,python-ecdsa))) (home-page "http://www.paramiko.org/") (synopsis "SSHv2 protocol library") (description "Paramiko is a python implementation of the SSHv2 protocol, -- cgit v1.3 From f7d17ac7565b6b1d005ff735180e5b24c9bf32cc Mon Sep 17 00:00:00 2001 From: Erik Edrosa Date: Sun, 15 Nov 2015 20:29:46 -0500 Subject: gnu: Add python-pystache. * gnu/packages/python.scm (python-pystache, python2-pystache): 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 4e54ef94f..508479b25 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Ben Woodcroft +;;; Copyright © 2015 Erik Edrosa ;;; ;;; This file is part of GNU Guix. ;;; @@ -2352,6 +2353,29 @@ written in pure Python.") (define-public python2-jinja2 (package-with-python2 python-jinja2)) +(define-public python-pystache + (package + (name "python-pystache") + (version "0.5.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "pystache" version)) + (sha256 + (base32 + "0nmqsfmiw4arjxqkmf9z66ml950pcdjk6aq4gin4sywmzdjw5fzp")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://defunkt.io/pystache/") + (synopsis "Python logic-less template engine") + (description + "Pystache is a Python implementation of the framework agnostic, +logic-free templating system Mustache.") + (license license:expat))) + +(define-public python2-pystache + (package-with-python2 python-pystache)) + (define-public python-joblib (package (name "python-joblib") -- cgit v1.3 From 3698a77588250134f7e32f7b18d652ad7ce55004 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Nov 2015 09:09:29 -0500 Subject: gnu: python-cryptography-vectors: Update to 1.0.2. * gnu/packages/python.scm (python-cryptography-vectors): Update to 1.0.2. --- 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 508479b25..5a83e945a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5575,7 +5575,7 @@ responses, rather than doing any computation.") (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -5584,7 +5584,7 @@ responses, rather than doing any computation.") version ".tar.gz")) (sha256 (base32 - "1i2chlyhlx4792di82fqzcy9wz0gnnc661bj46zr794ip4629sp4")))) + "0dx98kcypmarwwhi6rjwy30ridys2ja6mc6mjf0svd4nllkaljdq")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From 7f51b663b01ea10060410ffa9a69ae28c184f6c1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Nov 2015 09:11:30 -0500 Subject: gnu: python-cryptography: Update to 1.0.2. * gnu/packages/python.scm (python-cryptography): Update to 1.0.2. --- 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 5a83e945a..dff7948cb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5601,7 +5601,7 @@ responses, rather than doing any computation.") (define-public python-cryptography (package (name "python-cryptography") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) @@ -5609,7 +5609,7 @@ responses, rather than doing any computation.") "cryptography/cryptography-" version ".tar.gz")) (sha256 (base32 - "1lxzvhlyl6h6nm77n34622rcj2cxnx220x9vgjlw76wjd8m0kqyg")))) + "1jmcidddbbgdavvnvjjc0pda4b9a5i9idsivchn69pqxx68x8k6n")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) -- cgit v1.3 From f4a4a71885f5ad6db36f8b83a1b87e86d2dbbea4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Nov 2015 09:44:37 -0500 Subject: gnu: python-tornado: Use the preferred home-page. * gnu/packages/python.scm (python-tornado)[home-page]: Use the preferred one. --- 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 dff7948cb..ecf02ddb8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4751,7 +4751,7 @@ It is written entirely in Python.") `(("python-certifi" ,python-certifi))) (native-inputs `(("python-setuptools" ,python-setuptools))) - (home-page "https://pypi.python.org/pypi/tornado/4.1") + (home-page "http://www.tornadoweb.org/") (synopsis "Python web framework and asynchronous networking library") (description "Tornado is a Python web framework and asynchronous networking library, -- cgit v1.3 From 383af6b0962616ca851414a93e371522d83842f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Nov 2015 17:20:42 +0200 Subject: gnu: python-setuptools-scm: Update to 1.9.0. * gnu/packages/python.scm (python-setuptools-scm): Update to 1.9.0. [native-inputs]: Add python-setuptools. --- 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 ecf02ddb8..4edff94c6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Ben Woodcroft ;;; Copyright © 2015 Erik Edrosa +;;; Copyright © 2015 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -3895,20 +3896,19 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "1.8.0") + (version "1.9.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/s/" - "setuptools_scm/setuptools_scm-" - version ".tar.bz2")) + (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "00p60v2yfqy1r58pjcx9wy6dvqd7wkpfs5z1dzwf7y75c1g3dgyx")))) + "0y24bl893zk6nrklbvdrlmpkalf214zjn6k1xrglljd29rrn4wxi")))) (build-system python-build-system) + (native-inputs `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") (description - "setuptools_scm handles managing your Python package versions in + "Setuptools_scm handles managing your Python package versions in @dfn{software configuration management} (SCM) metadata instead of declaring them as the version argument or in a SCM managed file.") (license license:expat))) -- cgit v1.3 From d50d097d58a4df1b575f1239c11cd6b57fde68cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Nov 2015 21:42:19 +0200 Subject: gnu: python-pytest-runner: Add python-setuptools as native-input. * gnu/packages/python.scm (python-pytest-runner)[native-input]: Add python-setuptools. --- gnu/packages/python.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4edff94c6..bab64612b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1598,6 +1598,7 @@ and many external plugins.") #t))))) (native-inputs `(("python-pytest" ,python-pytest) + ("python-setuptools" ,python-setuptools) ("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://bitbucket.org/pytest-dev/pytest-runner") (synopsis "Invoke py.test as a distutils command") -- cgit v1.3 From eb31d4b4f12d82b3cd8ab04c0e8a796322e6abbc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Nov 2015 13:18:06 +0200 Subject: gnu: python-pyjwt: Update to 1.4.0. * gnu/packages/python.scm (python-pyjwt): Update to 1.4.0. [native-inputs]: Move python-setuptools here, add python-pytest-runner. --- gnu/packages/python.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bab64612b..6d1a8e0d0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2159,19 +2159,18 @@ somewhat intelligeble.") (define-public python-pyjwt (package (name "python-pyjwt") - (version "0.2.1") + (version "1.4.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/P/PyJWT/PyJWT-" - version ".tar.gz")) + (uri (pypi-uri "PyJWT" version)) (sha256 (base32 - "1ahqblfy2sj3xz34wsa48cn9rp0dspzq56p54i5znmws3b8gml6g")))) + "1556v2jppd8mjkkj66pxb5rcazm35jq81r233mdl8hfmz9n3icp1")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools))) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-pytest-runner" ,python-pytest-runner))) (arguments '(#:tests? #f)) ; test suite doesn't work (home-page "http://github.com/progrium/pyjwt") -- cgit v1.3 From 7957fe6c10820446a58d56a29dbcffc650557414 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 25 Nov 2015 16:34:25 +0200 Subject: gnu: python2-unittest2: Use python2-setuptools. * gnu/packages/python.scm (python2-unittest2)[inputs]: Switch from python-setuptools to python2-setuptools. --- 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 6d1a8e0d0..94df2b6a9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1504,7 +1504,7 @@ standard library.") (base32 "0wbs4i4x3x7klr3v35ss6p9mcqz883i1xgcpkhvl7n2lyv6yhpda")))) (inputs - `(("python2-setuptools" ,python-setuptools))) + `(("python2-setuptools" ,python2-setuptools))) (arguments `(#:python ,python-2 #:tests? #f)))) ; no setup.py test command -- cgit v1.3 From bde2171d4daa09e86efc3352a9cc20def8dd9ac8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Nov 2015 10:43:02 +0200 Subject: gnu: python-oauthlib: Update to 1.0.3. * gnu/packages/python.scm (python-oauthlib): Update to 1.0.3. [native-inputs]: Move python-setuptools, python-nose, python mock here. Add python-coverage. [inputs]: Add python-blinker, python-cryptography, python-pyjwt. --- gnu/packages/python.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 94df2b6a9..f17185c34 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2185,23 +2185,23 @@ somewhat intelligeble.") (define-public python-oauthlib (package (name "python-oauthlib") - (version "0.6.3") + (version "1.0.3") (source (origin (method url-fetch) - (uri - (string-append - "https://pypi.python.org/packages/source/o/oauthlib/oauthlib-" - version ".tar.gz")) + (uri (pypi-uri "oauthlib" version)) (sha256 (base32 - "1yaj3j64la4arwsbhbfmpnickzh3jpg9nlpyg409v8pp24isn48a")))) + "1bfrj70vdjxjw74khbyh6f0dksv7p5rh2346jnlrffyacd3gwjzg")))) (build-system python-build-system) - (inputs + (native-inputs `(("python-setuptools" ,python-setuptools) - ("python-pyjwt" ,python-pyjwt) - ("python-pycrypto" ,python-pycrypto) + ("python-coverage", python-coverage) ("python-nose" ,python-nose) ("python-mock" ,python-mock))) + (inputs + `(("python-blinker" ,python-blinker) + ("python-cryptography" ,python-cryptography) + ("python-pyjwt" ,python-pyjwt))) (home-page "https://github.com/idan/oauthlib") (synopsis "OAuth implementation for Python") (description -- cgit v1.3 From 0066de6f3a5964da8d62d099ee826639fe53c2b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Nov 2015 12:03:45 +0200 Subject: gnu: python2-oauthlib: Override python2-cryptography in inputs. * gnu/packages/python.scm (python2-oauthlib)[inputs]: Override inherited "python2-cryptography" in inputs. --- 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 f17185c34..a47318e43 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2214,8 +2214,10 @@ OAuth request-signing logic.") (package (inherit base) (inputs - (append (package-inputs base) - `(("python2-unittest2" ,python2-unittest2))))))) + `(("python2-unittest2" ,python2-unittest2) + ("python2-cryptography" ,python2-cryptography) + ,@(alist-delete "python-cryptography" + (package-inputs base))))))) (define-public python-itsdangerous (package -- cgit v1.3 From 553b709ba103a61a4a934837cb4de4b4f53665ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Nov 2015 15:26:18 +0200 Subject: gnu: python-pathpy: Add python-setuptools to native-inputs. * gnu/packages/python.scm (python-pathpy)[native-inputs]: Add python-setuptools. --- 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 a47318e43..1ac6df099 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3933,7 +3933,8 @@ them as the version argument or in a SCM managed file.") (propagated-inputs `(("python-appdirs" ,python-appdirs))) (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm) + `(("python-setuptools" ,python-setuptools) + ("python-setuptools-scm" ,python-setuptools-scm) ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (home-page "http://github.com/jaraco/path.py") -- cgit v1.3 From b72a44100e769e9f07933a7ba3357fa6c3ec4308 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Nov 2015 15:28:31 +0200 Subject: gnu: python-pickleshare: Add python-setuptools to native-inputs. * gnu/packages/python.scm (python-pickleshare)[native-inputs]: Add python-setuptools. --- gnu/packages/python.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1ac6df099..001d00e9b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3961,6 +3961,8 @@ common operations on files to be invoked on those path objects directly.") (build-system python-build-system) (propagated-inputs `(("python-pathpy" ,python-pathpy))) + (native-inputs + `(("python-setuptools" ,python-setuptools))) (home-page "https://github.com/vivainio/pickleshare") (synopsis "Tiny key value database with concurrency support") (description -- cgit v1.3 From dedc8320701b3f5d23ccc213c1c0381e00b33785 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 14 Nov 2015 00:08:35 +0100 Subject: gnu: python-2: Honor 'SOURCE_DATE_EPOCH'. * gnu/packages/patches/python-2.7-source-date-epoch.patch: New file. * gnu/packages/python.scm (python-2)[source]: Use it. [arguments]: Set SOURCE_DATE_EPOCH in 'patch-lib-shells' phase. * guix/build/python-build-system.scm (set-SOURCE-DATE-EPOCH): New procedure. (%standard-phases): Add it. * gnu-system.am (dist_patch_DATA): Add patch. --- gnu-system.am | 1 + .../patches/python-2.7-source-date-epoch.patch | 33 ++++++++++++++++++++++ gnu/packages/python.scm | 9 +++++- guix/build/python-build-system.scm | 7 +++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-2.7-source-date-epoch.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index 1fdbd0073..c7a17a42e 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -670,6 +670,7 @@ dist_patch_DATA = \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ gnu/packages/patches/python-2.7-search-paths.patch \ + gnu/packages/patches/python-2.7-source-date-epoch.patch \ gnu/packages/patches/python-3-search-paths.patch \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ diff --git a/gnu/packages/patches/python-2.7-source-date-epoch.patch b/gnu/packages/patches/python-2.7-source-date-epoch.patch new file mode 100644 index 000000000..be1f8e010 --- /dev/null +++ b/gnu/packages/patches/python-2.7-source-date-epoch.patch @@ -0,0 +1,33 @@ +Honor the 'SOURCE_DATE_EPOCH' environment variable to allow for +determinitic builds. + +--- a/Lib/py_compile.py ++++ b/Lib/py_compile.py +@@ -105,7 +105,10 @@ def compile(file, cfile=None, dfile=None, doraise=False): + """ + with open(file, 'U') as f: + try: +- timestamp = long(os.fstat(f.fileno()).st_mtime) ++ if 'SOURCE_DATE_EPOCH' in os.environ: ++ timestamp = long(os.environ['SOURCE_DATE_EPOCH']) ++ else: ++ timestamp = long(os.fstat(f.fileno()).st_mtime) + except AttributeError: + timestamp = long(os.stat(file).st_mtime) + codestring = f.read() +diff --git a/Python/import.c b/Python/import.c +index e47ce63..7eecf9c 100644 +--- a/Python/import.c ++++ b/Python/import.c +@@ -945,6 +945,11 @@ write_compiled_module(PyCodeObject *co, char *cpathname, struct stat *srcstat, t + /* Now write the true mtime (as a 32-bit field) */ + fseek(fp, 4L, 0); + assert(mtime <= 0xFFFFFFFF); ++ if (Py_GETENV("SOURCE_DATE_EPOCH") != NULL) { ++ const char *epoch = Py_GETENV("SOURCE_DATE_EPOCH"); ++ mtime = atoi(epoch); ++ } ++ + PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION); + fflush(fp); + fclose(fp); diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 001d00e9b..07725c727 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -92,7 +92,9 @@ (sha256 (base32 "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")) - (patches (list (search-patch "python-2.7-search-paths.patch"))))) + (patches (map search-patch + '("python-2.7-search-paths.patch" + "python-2.7-source-date-epoch.patch"))))) (build-system gnu-build-system) (arguments `(#:tests? #f @@ -158,6 +160,11 @@ "Lib/distutils/tests/test_spawn.py" "Lib/test/test_subprocess.py")) (("/bin/sh") (which "sh"))) + + ;; Use zero as the timestamp in .pyc files so that builds are + ;; deterministic. TODO: Remove it when this variable is set in + ;; gnu-build-system.scm. + (setenv "SOURCE_DATE_EPOCH" "0") #t)) (add-before 'check 'pre-check diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 1ae42c00b..6775cc439 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -136,11 +136,18 @@ installed with setuptools." #t)) #t)) +(define* (set-SOURCE-DATE-EPOCH #:rest _) + "Set the 'SOURCE_DATE_EPOCH' environment variable." + ;; Use zero as the timestamp in .pyc files so that builds are deterministic. + ;; TODO: Remove it when this variable is set in GNU:%STANDARD-PHASES. + (setenv "SOURCE_DATE_EPOCH" "0")) + (define %standard-phases ;; 'configure' and 'build' phases are not needed. Everything is done during ;; 'install'. (modify-phases gnu:%standard-phases (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980) + (add-after 'unpack 'set-SOURCE-DATE-EPOCH set-SOURCE-DATE-EPOCH) (delete 'configure) (replace 'install install) (replace 'check check) -- cgit v1.3 From a665996f58764a0c6e805016915225f911294989 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 14 Nov 2015 16:52:17 +0100 Subject: gnu: python: Set SOURCE_DATE_EPOCH to 1 instead of 0. * gnu/packages/python.scm (python-2)[arguments]: Set SOURCE_DATE_EPOCH to 1 to match what the daemon does. * guix/build/python-build-system.scm (set-SOURCE-DATE-EPOCH): Likewise. --- gnu/packages/python.scm | 2 +- guix/build/python-build-system.scm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 07725c727..7f7fa388a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -164,7 +164,7 @@ ;; Use zero as the timestamp in .pyc files so that builds are ;; deterministic. TODO: Remove it when this variable is set in ;; gnu-build-system.scm. - (setenv "SOURCE_DATE_EPOCH" "0") + (setenv "SOURCE_DATE_EPOCH" "1") #t)) (add-before 'check 'pre-check diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 6775cc439..8025b7fec 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -140,7 +140,7 @@ installed with setuptools." "Set the 'SOURCE_DATE_EPOCH' environment variable." ;; Use zero as the timestamp in .pyc files so that builds are deterministic. ;; TODO: Remove it when this variable is set in GNU:%STANDARD-PHASES. - (setenv "SOURCE_DATE_EPOCH" "0")) + (setenv "SOURCE_DATE_EPOCH" "1")) (define %standard-phases ;; 'configure' and 'build' phases are not needed. Everything is done during -- cgit v1.3 From 9820a6d4a0fb82cd97f62ada764af658a4a3e71d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 15 Nov 2015 00:25:55 +0100 Subject: gnu: python: Make 'sys.version' deterministic. * gnu/packages/patches/python-2-deterministic-build-info.patch, gnu/packages/patches/python-3-deterministic-build-info.patch: New files. * gnu/packages/python.scm (python-2, python): Use them. * gnu-system.am (dist_patch_DATA): Add them. --- gnu-system.am | 2 ++ .../patches/python-2-deterministic-build-info.patch | 17 +++++++++++++++++ .../patches/python-3-deterministic-build-info.patch | 17 +++++++++++++++++ gnu/packages/python.scm | 2 ++ 4 files changed, 38 insertions(+) create mode 100644 gnu/packages/patches/python-2-deterministic-build-info.patch create mode 100644 gnu/packages/patches/python-3-deterministic-build-info.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index c7a17a42e..71b914442 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -669,8 +669,10 @@ dist_patch_DATA = \ gnu/packages/patches/pybugz-encode-error.patch \ gnu/packages/patches/pybugz-stty.patch \ gnu/packages/patches/pyqt-configure.patch \ + gnu/packages/patches/python-2-deterministic-build-info.patch \ gnu/packages/patches/python-2.7-search-paths.patch \ gnu/packages/patches/python-2.7-source-date-epoch.patch \ + gnu/packages/patches/python-3-deterministic-build-info.patch \ gnu/packages/patches/python-3-search-paths.patch \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ diff --git a/gnu/packages/patches/python-2-deterministic-build-info.patch b/gnu/packages/patches/python-2-deterministic-build-info.patch new file mode 100644 index 000000000..25a079fe9 --- /dev/null +++ b/gnu/packages/patches/python-2-deterministic-build-info.patch @@ -0,0 +1,17 @@ +Always provide the same date and time in 'Py_GetBuildInfo'. +This is the information shown at the REPL and in 'sys.version'. +We cannot pass it in CPPFLAGS due to whitespace in the DATE string. + +--- a/Modules/getbuildinfo.c ++++ b/Modules/getbuildinfo.c +@@ -4,6 +4,10 @@ + #include + #endif + ++/* Deterministic date and time. */ ++#define DATE "Jan 1 1970" ++#define TIME "00:00:01" ++ + #ifndef DATE + #ifdef __DATE__ + #define DATE __DATE__ diff --git a/gnu/packages/patches/python-3-deterministic-build-info.patch b/gnu/packages/patches/python-3-deterministic-build-info.patch new file mode 100644 index 000000000..22c372a0c --- /dev/null +++ b/gnu/packages/patches/python-3-deterministic-build-info.patch @@ -0,0 +1,17 @@ +Always provide the same date and time in 'Py_GetBuildInfo'. +This is the information shown at the REPL and in 'sys.version'. +We cannot pass it in CPPFLAGS due to whitespace in the DATE string. + +--- Modules/getbuildinfo.c ++++ Modules/getbuildinfo.c +@@ -4,6 +4,10 @@ + #include + #endif + ++/* Deterministic date and time. */ ++#define DATE "Jan 1 1970" ++#define TIME "00:00:01" ++ + #ifndef DATE + #ifdef __DATE__ + #define DATE __DATE__ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7f7fa388a..fa8f20382 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -94,6 +94,7 @@ "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")) (patches (map search-patch '("python-2.7-search-paths.patch" + "python-2-deterministic-build-info.patch" "python-2.7-source-date-epoch.patch"))))) (build-system gnu-build-system) (arguments @@ -223,6 +224,7 @@ data types.") '("python-fix-tests.patch" ;; XXX Try removing this patch for python > 3.4.3 "python-disable-ssl-test.patch" + "python-3-deterministic-build-info.patch" "python-3-search-paths.patch"))) (patch-flags '("-p0")) (sha256 -- cgit v1.3 From c5a05e31437d640647b5aa1dd70917149bb3f1a3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 15 Nov 2015 00:27:15 +0100 Subject: gnu: python: Factorize configure flags with minimal variants. * gnu/packages/python.scm (python2-minimal, python-minimal)[arguments]: Reuse the inherited configure flags, and just add --without-system-ffi. --- gnu/packages/python.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fa8f20382..fd3e6b312 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -247,10 +247,8 @@ data types.") (name "python-minimal") (arguments (substitute-keyword-arguments (package-arguments python-2) - ((#:configure-flags _) - `(list "--enable-shared" - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib"))))) + ((#:configure-flags cf) + `(append ,cf '("--without-system-ffi"))))) (inputs '()))) ;none of the optional dependencies (define-public python-minimal @@ -258,10 +256,8 @@ data types.") (name "python-minimal") (arguments (substitute-keyword-arguments (package-arguments python) - ((#:configure-flags _) - `(list "--enable-shared" - (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib"))))) + ((#:configure-flags cf) + `(append ,cf '("--without-system-ffi"))))) ;; OpenSSL is a mandatory dependency of Python 3.x, for urllib; ;; zlib is required by 'zipimport', used by pip. -- cgit v1.3 From 5b4e2791ef898a5fd43388b8020377b5d7bda771 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 15 Nov 2015 17:51:12 +0100 Subject: gnu: python: Do not record configure flags. This reduces the number of run-time dependencies of python-2 from 25 to 15, corresponding only to ~4 MiB. * gnu/packages/python.scm (python-2)[arguments]: Add 'do-not-record-configure-flags' phase. --- gnu/packages/python.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fd3e6b312..6cae1324a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -167,6 +167,22 @@ ;; gnu-build-system.scm. (setenv "SOURCE_DATE_EPOCH" "1") #t)) + (add-before 'configure 'do-not-record-configure-flags + (lambda* (#:key configure-flags #:allow-other-keys) + ;; Remove configure flags from the installed '_sysconfigdata.py' + ;; and 'Makefile' so we don't end up keeping references to the + ;; build tools. + ;; + ;; Preserve at least '--with-system-ffi' since otherwise the + ;; thing tries to build libffi, fails, and we end up with a + ;; Python that lacks ctypes. + (substitute* "configure" + (("^CONFIG_ARGS=.*$") + (format #f "CONFIG_ARGS='~a'\n" + (if (member "--with-system-ffi" configure-flags) + "--with-system-ffi" + "")))) + #t)) (add-before 'check 'pre-check (lambda _ -- cgit v1.3 From d2cc9c7cfd5e66853a66d706186a69a0c044ef34 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 15 Nov 2015 22:15:41 +0100 Subject: gnu: python: Clarify and shorten the list of built-time modules. * gnu/packages/python.scm (python-2)[arguments]: Make the #:modules list shorter. --- 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 6cae1324a..3d4ad98a0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -146,8 +146,8 @@ (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) - #:modules ((ice-9 ftw) - ,@%gnu-build-system-modules) + #:modules ((ice-9 ftw) (ice-9 match) + (guix build utils) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases (add-before -- cgit v1.3 From 02f0c3b28e37e9bee3d65724da7eab7225286a1f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 15 Nov 2015 22:27:45 +0100 Subject: gnu: python: Move tkinter to "tk" output. * gnu/packages/python.scm (python-2)[outputs]: New field. [arguments]: Add 'move-tk-inter' phase. (python2-minimal, python-minimal, wrap-python3)[outputs]: New field. --- gnu/packages/python.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3d4ad98a0..39d0751f6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -96,6 +96,8 @@ '("python-2.7-search-paths.patch" "python-2-deterministic-build-info.patch" "python-2.7-source-date-epoch.patch"))))) + (outputs '("out" + "tk")) ;tkinter; adds 50 MiB to the closure (build-system gnu-build-system) (arguments `(#:tests? #f @@ -200,7 +202,28 @@ (ftw "." (lambda (file stat flag) (utime file circa-1980 circa-1980) #t)) - #t)))))) + #t))) + (add-after 'install 'move-tk-inter + (lambda* (#:key outputs #:allow-other-keys) + ;; When Tkinter support is built move it to a separate output so + ;; that the main output doesn't contain a reference to Tcl/Tk. + (let ((out (assoc-ref outputs "out")) + (tk (assoc-ref outputs "tk"))) + (when tk + (match (find-files out "tkinter.*\\.so") + ((tkinter.so) + ;; The .so is in OUT/lib/pythonX.Y/lib-dynload, but we + ;; want it under TK/lib/pythonX.Y/site-packages. + (let* ((len (string-length out)) + (target (string-append + tk "/" + (string-drop + (dirname (dirname tkinter.so)) + len) + "/site-packages"))) + (install-file tkinter.so target) + (delete-file tkinter.so))))) + #t)))))) (inputs `(("bzip2" ,bzip2) ("gdbm" ,gdbm) @@ -261,6 +284,7 @@ data types.") (define-public python2-minimal (package (inherit python-2) (name "python-minimal") + (outputs '("out")) (arguments (substitute-keyword-arguments (package-arguments python-2) ((#:configure-flags cf) @@ -270,6 +294,7 @@ data types.") (define-public python-minimal (package (inherit python) (name "python-minimal") + (outputs '("out")) (arguments (substitute-keyword-arguments (package-arguments python) ((#:configure-flags cf) @@ -285,6 +310,7 @@ data types.") (name name) (source #f) (build-system trivial-build-system) + (outputs '("out")) (propagated-inputs `(("python" ,python))) (arguments `(#:modules ((guix build utils)) -- cgit v1.3 From 1c0059da41b4c0c0525ca75c5631f04495126814 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Nov 2015 17:42:53 +0200 Subject: gnu: python2-pycrypto: Use python2. * gnu/packages/python.scm (python2-pycrypto)[inputs]: Force building with python2. --- gnu/packages/python.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 39d0751f6..d69c722de 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -826,7 +826,13 @@ etc.). The package is structured to make adding new modules easy.") (license public-domain))) (define-public python2-pycrypto - (package-with-python2 python-pycrypto)) + (let ((pycrypto (package-with-python2 python-pycrypto))) + (package (inherit pycrypto) + (inputs + `(("python" ,python-2) + ,@(alist-delete + "python" + (package-inputs pycrypto))))))) (define-public python-keyring (package -- cgit v1.3 From 44e30a7647ebe08c1b7a18666f3d66bd385ce86f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 30 Nov 2015 20:04:57 +0200 Subject: gnu: python2-keyring: Use python2-pycrypto. * gnu/packages/python.scm (python2-keyring)[inputs]: Force building with python2-pycrypto. --- gnu/packages/python.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d69c722de..cd19462fa 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -875,7 +875,10 @@ password storage.") (license x11))) (define-public python2-keyring - (package-with-python2 python-keyring)) + (let ((keyring (package-with-python2 python-keyring))) + (package (inherit keyring) + (inputs + `(("python2-pycrypto" ,python2-pycrypto)))))) (define-public python-six (package -- cgit v1.3 From b850a6d82d83bc2b529435c72ea8724c7995c61e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Dec 2015 20:55:06 +0200 Subject: gnu: python-babel: Update to 2.1.1. * gnu/packages/python.scm (python-babel): Update to 2.1.1. [source]: Change uri to pypi format. --- 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 cd19462fa..290195109 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -597,15 +597,14 @@ using Python 2.4 or higher and provides access to the Olson timezone database.") (define-public python-babel (package (name "python-babel") - (version "1.3") + (version "2.1.1") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/B/Babel/Babel-" - version ".tar.gz")) + (uri (pypi-uri "Babel" version)) (sha256 (base32 - "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz")))) + "0j2jgfzj1a2m39pm2qc36fzr7a6p5ybwndi0xdzhi2p8zw7dbdkz")))) (build-system python-build-system) (inputs `(("python-pytz" ,python-pytz) -- cgit v1.3 From b6ab89efb2442f1537bf931541310e0da768916f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 1 Dec 2015 21:10:55 +0200 Subject: gnu: python-six: Update to 1.10.0. * gnu/packages/python.scm (python-six): Update to 1.10.0. [source]: Change uri to pypi format. --- 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 290195109..d8d7d0c9b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -882,15 +882,14 @@ password storage.") (define-public python-six (package (name "python-six") - (version "1.9.0") + (version "1.10.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/s/" - "six/six-" version ".tar.gz")) + (uri (pypi-uri "six" version)) (sha256 (base32 - "1mci5i8mjqmljmv33h0q3d4djc13zk1kfmb3fbvd3yy43x0m4h72")))) + "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3 From 1bbc659fd2012fbe33b53783c838e84833c74496 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Tue, 1 Dec 2015 17:20:59 +0100 Subject: gnu: python-matplotlib: Add 'TkAgg' backend and update to version '1.4.3'. * gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Do it. * gnu/packages/patches/matplotlib-setupext-tk.patch: New file. * gnu-system.am (dist_patch_DATA): Add the new patch. --- gnu-system.am | 1 + gnu/packages/patches/matplotlib-setupext-tk.patch | 34 +++++++++++++++++++++++ gnu/packages/python.scm | 24 ++++++++++------ 3 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/matplotlib-setupext-tk.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index 4e068536a..ee7fcc185 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -611,6 +611,7 @@ dist_patch_DATA = \ gnu/packages/patches/make-impure-dirs.patch \ gnu/packages/patches/mars-install.patch \ gnu/packages/patches/mars-sfml-2.3.patch \ + gnu/packages/patches/matplotlib-setupext-tk.patch \ gnu/packages/patches/maxima-defsystem-mkdir.patch \ gnu/packages/patches/mc-fix-ncurses-build.patch \ gnu/packages/patches/mcron-install.patch \ diff --git a/gnu/packages/patches/matplotlib-setupext-tk.patch b/gnu/packages/patches/matplotlib-setupext-tk.patch new file mode 100644 index 000000000..37c3d686e --- /dev/null +++ b/gnu/packages/patches/matplotlib-setupext-tk.patch @@ -0,0 +1,34 @@ +Use 'pkg-config' instead of heuristics to find 'tk' flags. + +--- matplotlib-1.4.3/setupext.py.orig 2015-12-01 14:21:19.554417453 +0100 ++++ matplotlib-1.4.3/setupext.py 2015-12-02 10:39:47.282363530 +0100 +@@ -1457,7 +1457,7 @@ + p = subprocess.Popen( + '. %s ; eval echo ${%s}' % (file, varname), + shell=True, +- executable="/bin/sh", ++ executable="sh", + stdout=subprocess.PIPE) + result = p.communicate()[0] + return result.decode('ascii') +@@ -1601,8 +1601,19 @@ + # of distros. + + # Query Tcl/Tk system for library paths and version string ++ def getoutput(s): ++ ret = os.popen(s).read().strip() ++ return ret + try: +- tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk() ++ pkg_config_libs = getoutput('pkg-config --libs-only-L tk').split() ++ # drop '-L' part of strings ++ pkg_config_libs = [s[2:] for s in pkg_config_libs] ++ pkg_config_ver = getoutput('pkg-config --modversion tk') ++ tk_ver = re.match(r"(\d+.\d+)[\d.]*", pkg_config_ver).group(1) ++ tcl_lib_dir = next(s for s in pkg_config_libs ++ if re.match(r".*-tcl-.*", s)) + '/tcl' + tk_ver ++ tk_lib_dir = next(s for s in pkg_config_libs ++ if re.match(r".*-tk-.*", s)) + '/tk' + tk_ver + except: + tk_ver = '' + result = self.hardcoded_tcl_config() diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d8d7d0c9b..f033cb1a7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3182,7 +3182,7 @@ transcendental functions).") (define-public python-matplotlib (package (name "python-matplotlib") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) @@ -3190,13 +3190,15 @@ transcendental functions).") "/matplotlib-" version ".tar.gz")) (sha256 (base32 - "0m6v9nwdldlwk22gcd339zg6mny5m301fxgks7z8sb8m9wawg8qp")))) + "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av")) + (patches (list (search-patch "matplotlib-setupext-tk.patch"))))) (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs ; the following packages are all needed at run time `(("python-pyparsing" ,python-pyparsing) ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) + ("python-tkinter" ,python "tk") ;; The 'gtk+' package (and 'gdk-pixbuf', 'atk' and 'pango' propagated ;; from 'gtk+') provides the required 'typelib' files used by ;; 'gobject-introspection'. The location of these files is set with the @@ -3231,7 +3233,8 @@ transcendental functions).") ;; FIXME: Add backends when available. ;("python-wxpython" ,python-wxpython) ;("python-pyqt" ,python-pyqt) - )) + ("tcl" ,tcl) + ("tk" ,tk))) (native-inputs `(("pkg-config" ,pkg-config) ("texlive" ,texlive) @@ -3250,8 +3253,12 @@ transcendental functions).") (setenv "HOME" (getcwd)) (call-with-output-file "setup.cfg" (lambda (port) - (format port "[rc_options]~% -backend = GTK3Agg~%"))))) + (format port "[directories]~% +basedirlist = ~a,~a~% +[rc_options]~% +backend = TkAgg~%" + (assoc-ref inputs "tcl") + (assoc-ref inputs "tk")))))) (alist-cons-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) @@ -3295,10 +3302,9 @@ toolkits.") (propagated-inputs `(("python2-pycairo" ,python2-pycairo) ("python2-pygobject-2" ,python2-pygobject-2) - ,@(alist-delete "python-pycairo" - (alist-delete "python-pygobject" - (package-propagated-inputs - matplotlib)))))))) + ("python2-tkinter" ,python-2 "tk") + ,@(fold alist-delete (package-propagated-inputs matplotlib) + '("python-pycairo" "python-pygobject" "python-tkinter"))))))) (define-public python2-pysnptools (package -- cgit v1.3 From 5d26e542ee624e764f9f273e45ea6f0fc718ecf7 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Tue, 1 Dec 2015 17:41:32 +0100 Subject: gnu: python-ipython: Don't use the bootstrap version of 'python-numpy'. * gnu/packages/python.scm (python-ipython): Do it. --- 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 f033cb1a7..513910e5f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4146,7 +4146,7 @@ without using the configuration machinery.") `(("readline" ,readline) ("which" ,which) ("python-matplotlib" ,python-matplotlib) - ("python-numpy" ,python-numpy-bootstrap) + ("python-numpy" ,python-numpy) ("python-numpydoc" ,python-numpydoc) ("python-jinja2" ,python-jinja2) ("python-mistune" ,python-mistune) -- cgit v1.3 From 18b3151613e90eb7b4e0d174069ccc9fbe99b721 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Tue, 1 Dec 2015 22:03:48 +0100 Subject: gnu: python-matplotlib: Adjust path to figures in 'info' file. * gnu/packages/python.scm (python-matplotlib): Do it. --- gnu/packages/python.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 513910e5f..45222e998 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3276,13 +3276,23 @@ backend = TkAgg~%" ;; The doc recommends to run the 'html' target twice. (system* "python" "make.py" "html") (system* "python" "make.py" "html") + (copy-recursively "build/html" html) (system* "python" "make.py" "latex") (system* "python" "make.py" "texinfo") + (symlink (string-append html "/_images") + (string-append info "/matplotlib-figures")) + (with-directory-excursion "build/texinfo" + (substitute* "matplotlib.texi" + (("@image\\{([^,]*)" all file) + (string-append "@image{matplotlib-figures/" file))) + (symlink (string-append html "/_images") + "./matplotlib-figures") + (system* "makeinfo" "--no-split" + "-o" "matplotlib.info" "matplotlib.texi")) (copy-file "build/texinfo/matplotlib.info" (string-append info "/matplotlib.info")) (copy-file "build/latex/Matplotlib.pdf" - (string-append doc "/Matplotlib.pdf")) - (copy-recursively "build/html" html)))) + (string-append doc "/Matplotlib.pdf"))))) %standard-phases)))) (home-page "http://matplotlib.org") (synopsis "2D plotting library for Python") -- cgit v1.3 From 5587253a8786beca5b270ac72cc68802b72b7539 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 3 Dec 2015 08:38:44 +0100 Subject: gnu: python2-ipython: Use custom 'python2-numpy'. * gnu/packages/python.scm (python2-ipython): Do it. --- 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 45222e998..71853dc72 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4246,8 +4246,9 @@ computing.") (inputs `(("python2-mock" ,python2-mock) ("python2-matplotlib" ,python2-matplotlib) - ,@(alist-delete "python-matplotlib" - (package-inputs ipython))))))) + ("python2-numpy" ,python2-numpy) + ,@(fold alist-delete (package-inputs ipython) + '("python-matplotlib" "python-numpy"))))))) (define-public python-isodate (package -- cgit v1.3 From 3cbe7d5e52714410cf8b8ca58bfd37ff5ba525b8 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 3 Dec 2015 08:52:46 +0100 Subject: gnu: python2-pandas: Use custom 'python2-numpy'. * gnu/packages/python.scm (python2-pandas): Do it. --- gnu/packages/python.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 71853dc72..655d97db1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1016,7 +1016,12 @@ doing practical, real world data analysis in Python.") (license bsd-3))) (define-public python2-pandas - (package-with-python2 python-pandas)) + (let ((pandas (package-with-python2 python-pandas))) + (package (inherit pandas) + (propagated-inputs + `(("python2-numpy" ,python2-numpy) + ,@(alist-delete "python-numpy" + (package-propagated-inputs pandas))))))) (define-public python-tzlocal (package -- cgit v1.3 From d9bc0bf8fa3f305c49b1ea630ca10abff50b2149 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 3 Dec 2015 09:11:58 +0100 Subject: gnu: python2-scikit-image: Use custom 'python2-' packages. * gnu/packages/python.scm (python2-scikit-image): Use customized 'python2-' versions of 'matplotlib', 'numpy' and 'scipy'. --- gnu/packages/python.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 655d97db1..1cbbf20bb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2791,7 +2791,11 @@ mining and data analysis.") ,@(package-native-inputs scikit-image))) (propagated-inputs `(("python2-pytz" ,python2-pytz) - ,@(package-propagated-inputs scikit-image)))))) + ("python2-matplotlib" ,python2-matplotlib) + ("python2-numpy" ,python2-numpy) + ("python2-scipy" ,python2-scipy) + ,@(fold alist-delete (package-propagated-inputs scikit-image) + '("python-matplotlib" "python-numpy" "python-scipy"))))))) (define-public python-redis (package -- cgit v1.3 From dab8ebd92583781c8ed6e216396771fe4390470e Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Thu, 3 Dec 2015 11:06:30 +0100 Subject: gnu: python2-seaborn: Use custom 'python2-' packages. * gnu/packages/python.scm (python2-seaborn): Use customized 'python2-' versions of 'matplotlib', 'pandas' and 'scipy'. --- gnu/packages/python.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1cbbf20bb..3385393f1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4701,7 +4701,9 @@ and statistical routines from scipy and statsmodels.") (package (inherit seaborn) (propagated-inputs `(("python2-pytz" ,python2-pytz) - ,@(package-propagated-inputs seaborn)))))) + ("python2-pandas" ,python2-pandas) + ("python2-matplotlib" ,python2-matplotlib) + ("python2-scipy" ,python2-scipy)))))) (define-public python-sympy (package -- cgit v1.3 From 2fc5f186801ab8e989b6d8e97f37455af96969fd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 21:58:16 -0500 Subject: gnu: Add python-zope-event. * gnu/packages/python.scm (python-zope-event, python2-zope-event): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3385393f1..25f5c6eee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015 Christopher Allan Webber ;;; Copyright © 2015 Eric Dvorsak +;;; Copyright © 2015 David Thompson ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2015 Ben Woodcroft ;;; Copyright © 2015 Erik Edrosa @@ -6006,3 +6007,29 @@ automatically detect a wide range of file encodings.") (define-public python2-chardet (package-with-python2 python-chardet)) + +(define-public python-zope-event + (package + (name "python-zope-event") + (version "4.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.event/zope.event-" version ".tar.gz")) + (sha256 + (base32 + "11p75zpfz3ffhz21nzx9wb23xs993ck5s6hkjcvhswwizni5jynw")))) + (build-system python-build-system) + (inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://pypi.python.org/pypi/zope.event") + (synopsis "Event publishing system for Python") + (description "Zope.event provides an event publishing API, intended for +use by applications which are unaware of any subscribers to their events. It +is a simple event-dispatching system on which more sophisticated event +dispatching systems can be built.") + (license zpl2.1))) + +(define-public python2-zope-event + (package-with-python2 python-zope-event)) -- cgit v1.3 From 97abe268ab54c2aa6aad9b9e068ace9f8ab87988 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 21:59:08 -0500 Subject: gnu: Add python-zope-interface. * gnu/packages/python.scm (python-zope-interface, python2-zope-interface): New variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 25f5c6eee..fbefd9598 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6033,3 +6033,29 @@ dispatching systems can be built.") (define-public python2-zope-event (package-with-python2 python-zope-event)) + +(define-public python-zope-interface + (package + (name "python-zope-interface") + (version "4.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.interface/zope.interface-" version ".tar.gz")) + (sha256 + (base32 + "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-event" ,python-zope-event))) + (home-page "https://github.com/zopefoundation/zope.interface") + (synopsis "Python implementation of the \"design by contract\" +methodology") + (description "Zope.interface provides an implementation of \"object +interfaces\" for Python. Interfaces are a mechanism for labeling objects as +conforming to a given API or contract.") + (license zpl2.1))) + +(define-public python2-zope-interface + (package-with-python2 python-zope-interface)) -- cgit v1.3 From 81f2373cd4f3a6c4992573d9cacd0ff57b63ffd2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:00:40 -0500 Subject: gnu: Add python-zope-exceptions. * gnu/packages/python.scm (python-zope-exceptions, python2-zope-exceptions): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fbefd9598..0aabe083e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6059,3 +6059,30 @@ conforming to a given API or contract.") (define-public python2-zope-interface (package-with-python2 python-zope-interface)) + +(define-public python-zope-exceptions + (package + (name "python-zope-exceptions") + (version "4.0.8") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.exceptions/zope.exceptions-" + version ".tar.gz")) + (sha256 + (base32 + "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; circular dependency with zope.testrunner + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (home-page "http://cheeseshop.python.org/pypi/zope.exceptions") + (synopsis "Zope exceptions") + (description "Zope.exceptions provides general-purpose exception types +that have uses outside of the Zope framework.") + (license zpl2.1))) + +(define-public python2-zope-exceptions + (package-with-python2 python-zope-exceptions)) -- cgit v1.3 From 900e3c0e0e87e2da7e5297e39bbc8119b7209937 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:01:16 -0500 Subject: gnu: Add python-zope-testing. * gnu/packages/python.scm (python-zope-testing, python2-zope-testing): New variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0aabe083e..3dd50ff38 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6086,3 +6086,29 @@ that have uses outside of the Zope framework.") (define-public python2-zope-exceptions (package-with-python2 python-zope-exceptions)) + +(define-public python-zope-testing + (package + (name "python-zope-testing") + (version "4.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.testing/zope.testing-" version ".tar.gz")) + (sha256 + (base32 + "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s")))) + (build-system python-build-system) + (native-inputs + `(("python-zope-exceptions" ,python-zope-exceptions))) + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (home-page "http://pypi.python.org/pypi/zope.testing") + (synopsis "Zope testing helpers") + (description "Zope.testing provides a number of testing utilities for HTML +forms, HTTP servers, regular expressions, and more.") + (license zpl2.1))) + +(define-public python2-zope-testing + (package-with-python2 python-zope-testing)) -- cgit v1.3 From 01614c4feaaf1ff942b08e9054bd3acf9399cae8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:01:51 -0500 Subject: gnu: Add python-zope-testrunner. * gnu/packages/python.scm (python-zope-testrunner, python2-zope-testrunner): New variables. --- gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3dd50ff38..1c9f9a657 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6112,3 +6112,39 @@ forms, HTTP servers, regular expressions, and more.") (define-public python2-zope-testing (package-with-python2 python-zope-testing)) + +(define-public python-zope-testrunner + (package + (name "python-zope-testrunner") + (version "4.4.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.testrunner/zope.testrunner-" + version ".zip")) + (sha256 + (base32 + "1r7iqknhh55y45f64mz5hghgvzx34h1i11k350s0avx6q8gznja1")))) + (build-system python-build-system) + (native-inputs + `(("python-six" ,python-six) + ("python-zope-exceptions" ,python-zope-exceptions) + ("python-zope-testing" ,python-zope-testing) + ("unzip" ,unzip))) + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (home-page "http://pypi.python.org/pypi/zope.testrunner") + (synopsis "Zope testrunner script") + (description "Zope.testrunner provides a script for running Python +tests.") + (license zpl2.1))) + +(define-public python2-zope-testrunner + (let ((base (package-with-python2 python-zope-testrunner))) + (package + (inherit base) + (native-inputs + (append (package-native-inputs base) + `(("python2-subunit" ,python2-subunit) + ("python2-mimeparse" ,python2-mimeparse))))))) -- cgit v1.3 From 6a5c710c40c147c90af61afc3a8d693844d0f83e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:02:34 -0500 Subject: gnu: Add python-zope-i18nmessageid. * gnu/packages/python.scm (python-zope-i18nmessageid, python2-zope-i18nmessageid): New variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1c9f9a657..4707a5c03 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6148,3 +6148,29 @@ tests.") (append (package-native-inputs base) `(("python2-subunit" ,python2-subunit) ("python2-mimeparse" ,python2-mimeparse))))))) + +(define-public python-zope-i18nmessageid + (package + (name "python-zope-i18nmessageid") + (version "4.0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/z" + "/zope.i18nmessageid/zope.i18nmessageid-" + version ".tar.gz")) + (sha256 + (base32 + "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml")))) + (build-system python-build-system) + (inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "http://pypi.python.org/pypi/zope.i18nmessageid") + (synopsis "Message identifiers for internationalization") + (description "Zope.i18nmessageid provides facilities for declaring +internationalized messages within program source text.") + (license zpl2.1))) + +(define-public python2-zope-i18nmessageid + (package-with-python2 python-zope-i18nmessageid)) -- cgit v1.3 From 71fb09f32633bdf36151a10ea25b68409587f25f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:03:22 -0500 Subject: gnu: Add python-zope-schema. * gnu/packages/python.scm (python-zope-schema, python2-zope-schema): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4707a5c03..81c10fb00 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6174,3 +6174,30 @@ internationalized messages within program source text.") (define-public python2-zope-i18nmessageid (package-with-python2 python-zope-i18nmessageid)) + +(define-public python-zope-schema + (package + (name "python-zope-schema") + (version "4.4.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.schema/zope.schema-" version ".tar.gz")) + (sha256 + (base32 + "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-event" ,python-zope-event) + ("python-zope-interface" ,python-zope-interface))) + (native-inputs + `(("python-zope-testing" ,python-zope-testing))) + (home-page "http://pypi.python.org/pypi/zope.schema") + (synopsis "Zope data schemas") + (description "Zope.scheme provides extensions to zope.interface for +defining data schemas.") + (license zpl2.1))) + +(define-public python2-zope-schema + (package-with-python2 python-zope-schema)) -- cgit v1.3 From fbac9b178ea9b7273b7fc8bf99db8ad786ba8669 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:03:53 -0500 Subject: gnu: Add python-zope-configuration. * gnu/packages/python.scm (python-zope-configuration, python2-zope-configuration): 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 81c10fb00..0be8e6f6e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6201,3 +6201,28 @@ defining data schemas.") (define-public python2-zope-schema (package-with-python2 python-zope-schema)) + +(define-public python-zope-configuration + (package + (name "python-zope-configuration") + (version "4.0.3") + (source (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.configuration/zope.configuration-" + version ".tar.gz")) + (sha256 + (base32 + "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-schema" ,python-zope-schema))) + (home-page "http://pypi.python.org/pypi/zope.configuration") + (synopsis "Zope Configuration Markup Language") + (description "Zope.configuration implements ZCML, the Zope Configuration +Markup Language.") + (license zpl2.1))) + +(define-public python2-zope-configuration + (package-with-python2 python-zope-configuration)) -- cgit v1.3 From 2ad520866f44e8c441810dbcce7f60923ee1e37b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:04:23 -0500 Subject: gnu: Add python-zope-proxy. * gnu/packages/python.scm (python-zope-proxy, python2-zope-proxy): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0be8e6f6e..afba511c6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6226,3 +6226,30 @@ Markup Language.") (define-public python2-zope-configuration (package-with-python2 python-zope-configuration)) + +(define-public python-zope-proxy + (package + (name "python-zope-proxy") + (version "4.1.6") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.proxy/zope.proxy-" version ".tar.gz")) + (sha256 + (base32 + "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-interface" ,python-zope-interface))) + (home-page "http://pypi.python.org/pypi/zope.proxy") + (synopsis "Generic, transparent proxies") + (description "Zope.proxy provides generic, transparent proxies for Python. +Proxies are special objects which serve as mostly-transparent wrappers around +another object, intervening in the apparent behavior of the wrapped object +only when necessary to apply the policy (e.g., access checking, location +brokering, etc.) for which the proxy is responsible.") + (license zpl2.1))) + +(define-public python2-zope-proxy + (package-with-python2 python-zope-proxy)) -- cgit v1.3 From f404b5ea6e52ed14640d42e84858fc16a9b42091 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:04:51 -0500 Subject: gnu: Add python-zope-location. * gnu/packages/python.scm (python-zope-location, python2-zope-location): 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 afba511c6..9ba4388e7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6253,3 +6253,28 @@ brokering, etc.) for which the proxy is responsible.") (define-public python2-zope-proxy (package-with-python2 python-zope-proxy)) + +(define-public python-zope-location + (package + (name "python-zope-location") + (version "4.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.location/zope.location-" version ".tar.gz")) + (sha256 + (base32 + "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74")))) + (build-system python-build-system) + (native-inputs + `(("python-zope-proxy" ,python-zope-proxy) + ("python-zope-schema" ,python-zope-schema))) + (home-page "http://pypi.python.org/pypi/zope.location/") + (synopsis "Zope location library") + (description "Zope.location implements the concept of \"locations\" in +Zope3, which are are special objects that have a structural location.") + (license zpl2.1))) + +(define-public python2-zope-location + (package-with-python2 python-zope-location)) -- cgit v1.3 From d4b77f3662fd903be432a268f5076191cd0da777 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:05:29 -0500 Subject: gnu: Add python-zope-security. * gnu/packages/python.scm (python-zope-security, python2-zope-security): New variables. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9ba4388e7..41ac5becd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6278,3 +6278,33 @@ Zope3, which are are special objects that have a structural location.") (define-public python2-zope-location (package-with-python2 python-zope-location)) + +(define-public python-zope-security + (package + (name "python-zope-security") + (version "4.0.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.security/zope.security-" version ".tar.gz")) + (sha256 + (base32 + "14zmf684amc0x32kq05yxnhfqd1cmyhafkw05gn81rn90zjv6ssy")))) + (build-system python-build-system) + (propagated-inputs + `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-component" ,python-zope-component) + ("python-zope-location" ,python-zope-location) + ("python-zope-proxy" ,python-zope-proxy) + ("python-zope-schema" ,python-zope-schema) + ("python-zope-testrunner" ,python-zope-testrunner) + ("python-zope-testing" ,python-zope-testing))) + (home-page "http://pypi.python.org/pypi/zope.security") + (synopsis "Zope security framework") + (description "Zope.security provides a generic mechanism to implement +security policies on Python objects.") + (license zpl2.1))) + +(define-public python2-zope-security + (package-with-python2 python-zope-security)) -- cgit v1.3 From a6b61b271b4abd3ad3c31504d170d5e8f9536cb2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:05:59 -0500 Subject: gnu: Add python-zope-component. * gnu/packages/python.scm (python-zope-component, python2-zope-component): 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 41ac5becd..d6b43fdae 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6308,3 +6308,36 @@ security policies on Python objects.") (define-public python2-zope-security (package-with-python2 python-zope-security)) + +(define-public python-zope-component + (package + (name "python-zope-component") + (version "4.2.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/z" + "/zope.component/zope.component-" version ".tar.gz")) + (sha256 + (base32 + "06pqr8m5jv12xjyy5b59hh9anl61cxkzhw9mka33r3nxalmi2b18")))) + (build-system python-build-system) + (arguments + ;; Skip tests due to circular dependency with python-zope-security. + '(#:tests? #f)) + (native-inputs + `(("python-zope-testing" ,python-zope-testing))) + (propagated-inputs + `(("python-zope-event" ,python-zope-event) + ("python-zope-interface" ,python-zope-interface) + ("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-configuration" ,python-zope-configuration))) + (home-page "https://github.com/zopefoundation/zope.component") + (synopsis "Zope Component Architecture") + (description "Zope.component represents the core of the Zope Component +Architecture. Together with the zope.interface package, it provides +facilities for defining, registering and looking up components.") + (license zpl2.1))) + +(define-public python2-zope-component + (package-with-python2 python-zope-component)) -- cgit v1.3 From 3859ac12d6a5648d8cfc7d521218c0d582b6d4c5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 03:28:34 -0500 Subject: gnu: Add python-pyrfc3339. * gnu/packages/python.scm (python-pyrfc3339, python2-pyrfc3339): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d6b43fdae..692372448 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6341,3 +6341,30 @@ facilities for defining, registering and looking up components.") (define-public python2-zope-component (package-with-python2 python-zope-component)) + +(define-public python-pyrfc3339 + (package + (name "python-pyrfc3339") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/p/" + "pyRFC3339/pyRFC3339-" version ".tar.gz")) + (sha256 + (base32 + "1pp648xsjaw9h1xq2mgwzda5wis2ypjmzxlksc1a8grnrdmzy155")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pytz" ,python-pytz))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/kurtraschke/pyRFC3339") + (synopsis "Python timestamp library") + (description "Python library for generating and parsing RFC 3339-compliant +timestamps.") + (license license:expat))) + +(define-public python2-pyrfc3339 + (package-with-python2 python-pyrfc3339)) -- cgit v1.3 From 5eea20051877044fd4d2fa2ea075d5f66824f123 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 04:00:02 -0500 Subject: gnu: Add python-werkzeug. * gnu/packages/python.scm (python-werkzeug, python2-werkzeug): New variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 692372448..d2d6b9113 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6368,3 +6368,31 @@ timestamps.") (define-public python2-pyrfc3339 (package-with-python2 python-pyrfc3339)) + +(define-public python-werkzeug + (package + (name "python-werkzeug") + (version "0.11.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/W/Werkzeug" + "/Werkzeug-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gzwn1lkl90f3l1nzzxr7vjhm21qk8f837i8rvny5a209fcrhkzb")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "http://werkzeug.pocoo.org/") + (synopsis "Utilities for WSGI applications") + (description "One of the most advanced WSGI utility modules. It includes a +powerful debugger, full-featured request and response objects, HTTP utilities to +handle entity tags, cache control headers, HTTP dates, cookie handling, file +uploads, a powerful URL routing system and a bunch of community-contributed +addon modules.") + (license x11))) + +(define-public python2-werkzeug + (package-with-python2 python-werkzeug)) -- cgit v1.3 From 99fffa8ae08264b1c41ddaa9e7f745dcb621b398 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 15:38:55 -0500 Subject: gnu: Add python-configobj. * gnu/packages/python.scm (python-configobj, python2-configobj): New variables. * gnu/packages/patches/python-configobj-setuptools.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu-system.am | 1 + .../patches/python-configobj-setuptools.patch | 30 ++++++++++++++++++++++ gnu/packages/python.scm | 30 ++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 gnu/packages/patches/python-configobj-setuptools.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu-system.am b/gnu-system.am index ae3b3d24d..00cf38f31 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -660,6 +660,7 @@ dist_patch_DATA = \ gnu/packages/patches/python-disable-ssl-test.patch \ gnu/packages/patches/python-fix-tests.patch \ gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ + gnu/packages/patches/python-configobj-setuptools.patch \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ gnu/packages/patches/qemu-CVE-2015-6855.patch \ gnu/packages/patches/qt4-ldflags.patch \ diff --git a/gnu/packages/patches/python-configobj-setuptools.patch b/gnu/packages/patches/python-configobj-setuptools.patch new file mode 100644 index 000000000..3f207ffd7 --- /dev/null +++ b/gnu/packages/patches/python-configobj-setuptools.patch @@ -0,0 +1,30 @@ +From 16fbc38f13e435b4e3e1a37d706e64e05bad4691 Mon Sep 17 00:00:00 2001 +From: Leo Famulari +Date: Tue, 10 Nov 2015 23:09:24 -0500 +Subject: [PATCH] patch build to use setuptools + +--- + setup.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index c6d57a6..27bf260 100644 +--- a/setup.py ++++ b/setup.py +@@ -12,7 +12,12 @@ + # http://opensource.org/licenses/BSD-3-Clause + import os + import sys +-from distutils.core import setup ++ ++try: ++ from setuptools import setup ++except ImportError: ++ from distutils.core import setup ++ + # a simple import wouldn't work if we moved towards a package with __init__ + from _version import __version__ + +-- +2.6.2 + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d2d6b9113..4e69e74b9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6396,3 +6396,33 @@ addon modules.") (define-public python2-werkzeug (package-with-python2 python-werkzeug)) + +(define-public python-configobj + (package + (name "python-configobj") + (version "5.0.6") + (source (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/c/configobj/" + "configobj-" version ".tar.gz")) + (sha256 + (base32 + "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2")) + ;; Patch setup.py so it looks for python-setuptools, which is + ;; required to parse the keyword 'install_requires' in setup.py. + (patches (list (search-patch "python-configobj-setuptools.patch"))))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-six" ,python-six))) + (synopsis "Config file reading, writing and validation") + (description "ConfigObj is a simple but powerful config file reader and +writer: an ini file round tripper. Its main feature is that it is very easy to +use, with a straightforward programmer’s interface and a simple syntax for +config files.") + (home-page "https://github.com/DiffSK/configobj") + (license bsd-3))) + +(define-public python2-configobj + (package-with-python2 python-configobj)) -- cgit v1.3 From b5f218be26d8a4f683bcece76ac10314cb58b326 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 23 Nov 2015 23:46:09 -0500 Subject: gnu: Add python2-pythondialog. * gnu/packages/python.scm (python2-pythondialog): New variable. --- gnu/packages/python.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4e69e74b9..05de9939f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6342,6 +6342,43 @@ facilities for defining, registering and looking up components.") (define-public python2-zope-component (package-with-python2 python-zope-component)) +(define-public python2-pythondialog + (package + (name "python2-pythondialog") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://pypi.python.org/packages/source/p/" + "python2-pythondialog/python2-pythondialog-" + version ".tar.gz")) + (sha256 + (base32 + "1yhkagsh99bfi592ymczf8rnw8rk6n9hdqy3dd98m3yrx8zmjvry")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((dialog (assoc-ref inputs "dialog"))) + ;; Since this library really wants to grovel the search path, we + ;; must hardcode dialog's store path into it. + (substitute* "dialog.py" + (("os.getenv\\(\"PATH\", \":/bin:/usr/bin\"\\)") + (string-append "os.getenv(\"PATH\") + \":" dialog "/bin\""))) + #t)))) + #:python ,python-2 + #:tests? #f)) ; no test suite + (propagated-inputs + `(("dialog" ,dialog))) + (home-page "http://pythondialog.sourceforge.net/") + (synopsis "Python interface to the UNIX dialog utility") + (description "A Python wrapper for the dialog utility. Its purpose is to +provide an easy to use, pythonic and comprehensive Python interface to dialog. +This allows one to make simple text-mode user interfaces on Unix-like systems") + (license lgpl2.1))) + (define-public python-pyrfc3339 (package (name "python-pyrfc3339") -- cgit v1.3 From 79e8a2916dac8bea5fcaabf257ed86d2bfd5daff Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 8 Nov 2015 22:47:48 -0500 Subject: gnu: Add python-configargparse. * gnu/packages/python.scm (python-configargparse, python2-configargparse): New variables. --- gnu/packages/python.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 05de9939f..ff37b865a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6463,3 +6463,29 @@ config files.") (define-public python2-configobj (package-with-python2 python-configobj)) + +(define-public python-configargparse + (package + (name "python-configargparse") + (version "0.10.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/C/ConfigArgParse/" + "ConfigArgParse-" version ".tar.gz")) + (sha256 + (base32 + "19wh919gbdbzxzpagg52q3lm62yicm95ddlcx77dyjc1slyshl1v")))) + (build-system python-build-system) + (arguments + ;; FIXME: Bug in test suite filed upstream: + ;; https://github.com/bw2/ConfigArgParse/issues/32 + '(#:tests? #f)) + (synopsis "Replacement for argparse") + (description "A drop-in replacement for argparse that allows options to also +be set via config files and/or environment variables.") + (home-page "https://github.com/bw2/ConfigArgParse") + (license license:expat))) + +(define-public python2-configargparse + (package-with-python2 python-configargparse)) -- cgit v1.3 From ab41f9799f962a4c7f90aa82deb11fda4ad03167 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 9 Nov 2015 04:49:59 -0500 Subject: gnu: Add python-ndg-httpsclient. * gnu/packages/python.scm (python-ndg-httpsclient, python2-ndg-httpsclient): New variables. --- gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ff37b865a..4d0c23d1e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6489,3 +6489,35 @@ be set via config files and/or environment variables.") (define-public python2-configargparse (package-with-python2 python-configargparse)) + +(define-public python-ndg-httpsclient + (package + (name "python-ndg-httpsclient") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/n/ndg-httpsclient/" + "ndg_httpsclient-" version ".tar.gz")) + (sha256 + (base32 + "0x32ibixm3vv5m9xfk83xsqm8xcqw4dd0khbh6qbri6rxgymbhg8")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pyopenssl" ,python-pyopenssl))) + (synopsis "HTTPS support for Python's httplib and urllib2") + (description "This is a HTTPS client implementation for httplib and urllib2 +based on PyOpenSSL. PyOpenSSL provides a more fully featured SSL implementation +over the default provided with Python and importantly enables full verification +of the SSL peer.") + (home-page "https://github.com/cedadev/ndg_httpsclient/") + (license bsd-3))) + +;; python2-openssl requires special care, so package-with-python2 is +;; insufficient. +(define-public python2-ndg-httpsclient + (package (inherit python-ndg-httpsclient) + (name "python2-ndg-httpsclient") + (arguments `(#:python ,python-2)) + (propagated-inputs + `(("python2-pyopenssl" ,python2-pyopenssl))))) -- cgit v1.3 From 4df1e30da894e7f0216479fef71ddfd4fcfc91e8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2015 04:29:49 -0500 Subject: gnu: python-parsedatetime: Update to 1.5. * gnu/packages/python.scm (python-parsedatetime): Update to 1.5. [arguments]: Enable tests. --- gnu/packages/python.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4d0c23d1e..10b3c21e3 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -961,7 +961,7 @@ datetime module, available in Python 2.3+.") (define-public python-parsedatetime (package (name "python-parsedatetime") - (version "1.2") + (version "1.5") (source (origin (method url-fetch) @@ -969,11 +969,10 @@ datetime module, available in Python 2.3+.") "parsedatetime/parsedatetime-" version ".tar.gz")) (sha256 (base32 - "1zcj0pzxvpl4j2ma9awmpkfxldybi2kjaahjjpmgfbg5cxwcjsqv")))) + "1as0mm4ql3z0324nc9bys2s1ngh507i317p16b79rx86wlmvx9ix")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools))) - (arguments `(#:tests? #f)) ;no test target (home-page "http://github.com/bear/parsedatetime/") (synopsis "Parse human-readable date/time text") -- cgit v1.3 From 38b8f9b21b9629c13523b085154471836c309ae5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 11 Nov 2015 04:30:47 -0500 Subject: gnu: Add python2-parsedatetime. * gnu/packages/python.scm (python2-parsedatetime): New variable. --- gnu/packages/python.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 10b3c21e3..7d5451620 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -980,6 +980,9 @@ datetime module, available in Python 2.3+.") "Parse human-readable date/time text.") (license asl2.0))) +(define-public python2-parsedatetime + (package-with-python2 python-parsedatetime)) + (define-public python-pandas (package (name "python-pandas") -- cgit v1.3 From 1872f1bb798d399a9fb7affc375af1581fabf5a2 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 5 Dec 2015 02:11:31 -0500 Subject: gnu: Add python-docopt. * gnu/packages/python.scm (python-docopt, python2-docopt): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7d5451620..056775ec4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2015 Ben Woodcroft ;;; Copyright © 2015 Erik Edrosa ;;; Copyright © 2015 Efraim Flashner +;;; Copyright © 2015 Kyle Meyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -6010,6 +6011,41 @@ automatically detect a wide range of file encodings.") (define-public python2-chardet (package-with-python2 python-chardet)) +(define-public python-docopt + (package + (name "python-docopt") + (version "0.6.2") + (source + (origin + (method url-fetch) + ;; The release on PyPI does not include tests. + (uri (string-append + "https://github.com/docopt/docopt/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "16bf890xbdz3m30rsv2qacklh2rdn1zrfspfnwzx9g7vwz8yw4r1")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-setuptools" ,python-setuptools))) + (arguments + `(#:phases (alist-replace + 'check + (lambda _ (zero? (system* "py.test"))) + %standard-phases))) + (home-page "http://docopt.org") + (synopsis "Command-line interface description language for Python") + (description "This library allows the user to define a command-line +interface from a program's help message rather than specifying it +programatically with command-line parsers like @code{getopt} and +@code{argparse}.") + (license license:expat))) + +(define-public python2-docopt + (package-with-python2 python-docopt)) + (define-public python-zope-event (package (name "python-zope-event") -- cgit v1.3 From 044176621e80eaf7c97cf92a5ea6cf97bd7dd45a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 7 Dec 2015 12:31:56 +0200 Subject: gnu: python2-zope-security: Use python2-zope-testrunner. * gnu/packages/python.scm (python2-zope-security): Do it. --- gnu/packages/python.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 056775ec4..d01c1d3df 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6345,7 +6345,13 @@ security policies on Python objects.") (license zpl2.1))) (define-public python2-zope-security - (package-with-python2 python-zope-security)) + (let ((zope-security (package-with-python2 python-zope-security))) + (package (inherit zope-security) + (propagated-inputs + `(("python2-zope-testrunner" ,python2-zope-testrunner) + ,@(alist-delete + "python-zope-testrunner" + (package-propagated-inputs zope-security))))))) (define-public python-zope-component (package -- cgit v1.3 From 7fbee931a5565a009e23f785c5874a55a905626f Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 23 Oct 2015 20:59:28 +0200 Subject: gnu: python-pillow: Update to 3.0.0. * gnu/packages/python.scm (python-pillow, python2-pillow): 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 d01c1d3df..9fe945ee9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3604,7 +3604,7 @@ services for your Python modules and applications.") (define-public python-pillow (package (name "python-pillow") - (version "2.8.1") + (version "3.0.0") (source (origin (method url-fetch) @@ -3612,7 +3612,7 @@ services for your Python modules and applications.") "Pillow/Pillow-" version ".tar.gz")) (sha256 (base32 - "15n92axxph2s3kvg68bki9gv3nzwgq7130kp7wbblpi1l0cc2q47")))) + "1fsl6sywd4f4axvbpy5h5h26l6w8592j0f1wcnj1hmgy83svwl5d")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools) -- cgit v1.3 From b01bbbcf3d28db885a48f74908214b12e18e7861 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 10 Dec 2015 05:30:09 +0200 Subject: gnu: python-pytz: Update to 2015.7. * gnu/packages/python.scm (python-pytz): Update to 2015.7. [source]: Change uri to pypi's location. [home-page]: Change to new website. [license]: Change to expat. --- gnu/packages/python.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9fe945ee9..afc9dcd6a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -574,23 +574,22 @@ Cassandra cluster on localhost.") (define-public python-pytz (package (name "python-pytz") - (version "2013b") + (version "2015.7") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/pytz/main/" version - "/+download/pytz-" version ".tar.bz2")) + (uri (pypi-uri "pytz" version)) (sha256 (base32 - "19giwgfcrg0nr1gdv49qnmf2jb2ilkcfc7qyqvfpz4dp0p64ksv5")))) + "1spgdfp1ssya7v3kww7zp71xpj437skpqazcvqr3kr1p1brnw9lr")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no test target - (home-page "https://launchpad.net/pytz") + (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") (description "This library allows accurate and cross platform timezone calculations using Python 2.4 or higher and provides access to the Olson timezone database.") - (license x11))) + (license license:expat))) (define-public python2-pytz (package-with-python2 python-pytz)) -- cgit v1.3 From 358c3d612b00f58f713746b7ec6ca11c7b03875e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Nov 2015 17:12:52 +0200 Subject: gnu: Add python-pytest-cov. * gnu/packages/python.scm (python-pytest-cov, python2-pytest-cov): New variables. --- gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index afc9dcd6a..91c932823 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1633,6 +1633,34 @@ and many external plugins.") (define-public python2-pytest (package-with-python2 python-pytest)) +(define-public python-pytest-cov + (package + (name "python-pytest-cov") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-cov" version)) + (sha256 + (base32 + "1lf9jsmhqk5nc4w3kzwglmdzjvmi7ajvrsnwv826j3bn0wzx8c92")))) + (build-system python-build-system) + (propagated-inputs + `(("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest))) + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (home-page "https://github.com/pytest-dev/pytest-cov") + (synopsis "Pytest plugin for measuring coverage") + (description + "Pytest-cov produces coverage reports. It supports centralised testing and +distributed testing in both load and each modes. It also supports coverage +of subprocesses.") + (license license:expat))) + +(define-public python2-pytest-cov + (package-with-python2 python-pytest-cov)) + (define-public python-pytest-runner (package (name "python-pytest-runner") -- cgit v1.3 From addc808ddc4a97bb55b13a82e580664429175910 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Nov 2015 18:44:57 +0200 Subject: gnu: Add python-wheel. * gnu/packages/python.scm (python-wheel, python2-wheel): New variables. --- gnu/packages/python.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 91c932823..6a7fbf852 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2164,6 +2164,33 @@ with sensible defaults out of the box.") (define-public python2-click (package-with-python2 python-click)) +(define-public python-wheel + (package + (name "python-wheel") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wheel" version)) + (sha256 + (base32 + "032k1ajijbqnv0z0k88bhf75mdimi18fcmm28mss90610lw3bbga")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools" ,python-setuptools) + ("python-jsonschema" ,python-jsonschema) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://bitbucket.org/pypa/wheel/") + (synopsis "Built-package format for Python") + (description + "A wheel is a ZIP-format archive with a specially formatted filename and the +.whl extension. It is designed to contain all the files for a PEP 376 +compatible install in a way that is very close to the on-disk format.") + (license license:expat))) + +(define-public python2-wheel + (package-with-python2 python-wheel)) + (define-public python-requests (package (name "python-requests") -- cgit v1.3 From 5d69165797cd96bb0a04b1b049b0ce4c0673f439 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 23 Nov 2015 17:58:07 +0200 Subject: gnu: python-requests: Update to 2.8.1. * gnu/packages/python.scm (python-requests): Update to 2.8.1. [native-inputs]: Move python-setuptools here. [inputs]: Remove python-certifi. [propagated-inputs]: Add python-py, python-pytest, python-pytest-cov, python-wheel. [arguments]: Enable tests. --- gnu/packages/python.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6a7fbf852..647dbd4fe 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2194,21 +2194,21 @@ compatible install in a way that is very close to the on-disk format.") (define-public python-requests (package (name "python-requests") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) - (uri - (string-append - "https://pypi.python.org/packages/source/r/requests/requests-" - version ".tar.gz")) + (uri (pypi-uri "requests" version)) (sha256 (base32 - "0yrvj8hfnabrdxds59w6d6887sn5j0jlgpmcq04lk4k0kdc07w5j")))) + "0ny2nr1sqr4hcn3903ghmh7w2yni8shlfv240a8c9p6wyidqvzl4")))) (build-system python-build-system) - (inputs - `(("python-setuptools" ,python-setuptools) - ("python-certifi" ,python-certifi))) - (arguments `(#:tests? #f)) ; no tests + (native-inputs + `(("python-setuptools" ,python-setuptools))) + (propagated-inputs + `(("python-py" ,python-py) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-wheel" ,python-wheel))) (home-page "http://python-requests.org/") (synopsis "Python HTTP library") (description -- cgit v1.3 From 9a41f4439d0470bd42d611d5f25bed1bfc6ecc76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 11 Dec 2015 15:12:39 +0200 Subject: gnu: python-certifi: Update to 2015.11.20.1. * gnu/packages/python.scm (python-certifi): Update to 2015.11.20.1. [source]: Change to pypi syntax. --- gnu/packages/python.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 647dbd4fe..5880cac09 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2113,16 +2113,13 @@ files.") (define-public python-certifi (package (name "python-certifi") - (version "14.05.14") + (version "2015.11.20.1") (source (origin (method url-fetch) - (uri - (string-append - "https://pypi.python.org/packages/source/c/certifi/certifi-" - version ".tar.gz")) + (uri (pypi-uri "certifi" version)) (sha256 (base32 - "0s8vxzfz6s4m6fvxc7z25k9j35w0rh6jkw3wwcd1az1mssncn6qy")))) + "05lgwf9rz1kn465azy2bpb3zmpnsn9gkypbhnjlclchv98ssgc1h")))) (build-system python-build-system) (inputs `(("python-setuptools" ,python-setuptools))) -- cgit v1.3