From 543689f3fdae7ec746817b44cae777408733b16f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 3 May 2018 16:37:42 +0200 Subject: gnu: python-mako: Update to 1.0.7. * gnu/packages/python.scm (python-mako): Update to 1.0.7. Signed-off-by: Rutger Helling --- 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 a359eebd12..97b8ace869 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7652,14 +7652,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "03dyxgjknp4ffsv7vwfd28l5bbpzi0ylp20543wpg3iahyyrwma8")))) + "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit 1.4.1 From d5ed14bdda200dd98aa770eb9c2c883392fe15e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Jun 2018 02:05:32 +0200 Subject: gnu: python-parso: Update to 0.2.1. * gnu/packages/python.scm (python-parso): Update to 0.2.1. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a8e6ad1f21..d4e01202b5 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13419,14 +13419,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2")))) + "0zvh4rdhv2wkglkgh0h9kn9ndpsw5p639wcwv47jn1kfp504lq7h")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit 1.4.1 From af029a80dd0e81be65b05ffa9a68c7ee43a62ae9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Jun 2018 01:58:10 +0200 Subject: gnu: python2-xopen: Fix build. * gnu/packages/python.scm (python2-xopen)[propagated-inputs]: Add python2-bz2file. --- 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 d4e01202b5..b05911db56 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10446,7 +10446,12 @@ possible on all supported Python versions.") (license license:expat))) (define-public python2-xopen - (package-with-python2 python-xopen)) + (let ((base (package-with-python2 + (strip-python2-variant python-xopen)))) + (package + (inherit base) + (propagated-inputs `(("python2-bz2file" ,python2-bz2file) + ,@(package-propagated-inputs base)))))) (define-public python2-cheetah (package -- cgit 1.4.1 From e0e7ea7459ad64268fba84744958486b70cba3d3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Jun 2018 01:59:26 +0200 Subject: gnu: python-xopen: Update to 0.3.3. * gnu/packages/python.scm (python-xopen): Update to 0.3.3. --- 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 b05911db56..a1bd802121 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10426,14 +10426,14 @@ network.") (define-public python-xopen (package (name "python-xopen") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (pypi-uri "xopen" version)) (sha256 (base32 - "0bzjmn3rl1cd3d2q39cjwnkhaspk2b0hfj3rl64pclm44ihg5fb6")) + "1a0wbil552wsmklwd89ssmgz3pjd86qa9i7jh8wqb9wslc8a2qjr")) (file-name (string-append name "-" version ".tar.gz")))) (build-system python-build-system) (home-page "https://github.com/marcelm/xopen/") -- cgit 1.4.1 From 4df9c195f2fd3cc42b13e9bf4a92297ba3e3891b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Jun 2018 01:42:39 +0200 Subject: gnu: python-rst.linker: Update to 1.10. * gnu/packages/python.scm (python-rst.linker): Update to 1.10. --- 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 a1bd802121..263c1c9c36 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2683,14 +2683,14 @@ and several other projects.") (define-public python-rst.linker (package (name "python-rst.linker") - (version "1.9") + (version "1.10") (source (origin (method url-fetch) (uri (pypi-uri "rst.linker" version)) (sha256 (base32 - "16crgnai6020vdmnpwdimw1vm3jb74ysfyb3kmcidb0lgma5xq2d")))) + "0iqaacp7pj1s8avs4kc0qg0r7dscywaq37y6l9j14glqdikk0wdj")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit 1.4.1 From 2cde6e1de3e96648363303a0011feb584c472e19 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 16 May 2018 14:27:56 +0200 Subject: gnu: Add python-commandlines. * gnu/packages/python.scm (python-commandlines): New variable. --- gnu/packages/python.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 263c1c9c36..c9b22e87ee 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -13799,3 +13799,23 @@ Let's Encrypt.") (define-public python2-dns-lexicon (package-with-python2 python-dns-lexicon)) + +(define-public python-commandlines + (package + (name "python-commandlines") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "commandlines" version)) + (sha256 + (base32 + "0r7xcr0knv02p4mswa2bng61nn8nbhhrs6kvdnb9bb3hhjvm1dl6")))) + (build-system python-build-system) + (home-page "https://github.com/chrissimpkins/commandlines") + (synopsis "Command line argument to object parsing library") + (description + "@code{Commandlines} is a Python library for command line application +development that supports command line argument parsing, command string +validation testing and application logic.") + (license license:expat))) -- cgit 1.4.1 From 250276a20272dcbf609bb8761b6ef213a2e9f863 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 12 Jul 2018 16:06:28 +0200 Subject: gnu: python-pyyaml: Update to 3.13. * gnu/packages/python.scm (python-pyyaml): Update to 3.13. --- 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 c9b22e87ee..057a14c501 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2218,14 +2218,14 @@ environments and back.") (define-public python-pyyaml (package (name "python-pyyaml") - (version "3.12") + (version "3.13") (source (origin (method url-fetch) (uri (pypi-uri "PyYAML" version)) (sha256 (base32 - "1aqjl8dk9amd4zr99n8v2qxzgmr2hdvqfma4zh7a41rj6336c9sr")))) + "1gx603g484z46cb74j9rzr6sjlh2vndxayicvlyhxdz98lhhkwry")))) (build-system python-build-system) (inputs `(("libyaml" ,libyaml))) -- cgit 1.4.1 From 5908818e309280b124b64f5320e4b98210093061 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sun, 15 Jul 2018 00:43:57 +1000 Subject: gnu: python-h5py: Update to 2.8.0. * gnu/packages/python.scm (python-h5py): Update 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 0fdc53bdca..d350990c67 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -782,14 +782,14 @@ NetCDF files can also be read and modified. Python-HDF4 is a fork of (define-public python-h5py (package (name "python-h5py") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "h5py" version)) (sha256 (base32 - "0433sdv6xc9p7v1xs1gvbxp7p152ywi3nplgjb258q9fvw9469br")))) + "0mdr6wrq02ac93m1aqx9kad0ppfzmm4imlxqgyy1x4l7hmdcc9p6")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test target -- cgit 1.4.1 From 6c10675928a4485fd4ed83f4a067f22ae06779cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 14 Jul 2018 23:19:26 +0300 Subject: gnu: python-xenon: Update to 0.5.4. * gnu/packages/python.scm (python-xenon): Update to 0.5.4. [arguments]: Remove part of custom 'patch-test-requirements phase. --- gnu/packages/python.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index d350990c67..38c48288a9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa -;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015, 2017 Kyle Meyer ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic @@ -12242,14 +12242,14 @@ pure Python module.") (define-public python-xenon (package (name "python-xenon") - (version "0.5.1") + (version "0.5.4") (source (origin (method url-fetch) (uri (pypi-uri "xenon" version)) (sha256 (base32 - "14kby2y48vp3sgwxqlm5d5789yibqwb1qli5fwcmdqg3iayrbklc")))) + "029cbhysg2vr5n4jz8gpg2793f8wkwnqpr1qgv6c1dn685vy31mc")))) (build-system python-build-system) (native-inputs `(("python-pyyaml" ,python-pyyaml) @@ -12261,12 +12261,7 @@ pure Python module.") `(#:phases (modify-phases %standard-phases (add-before 'build 'patch-test-requirements - (lambda* (#:key inputs #:allow-other-keys) - ;; Update requirements from dependency==version to - ;; dependency>=version. - (substitute* "requirements.txt" - (("==") ">=") - ((",<1.5.0") "")) + (lambda _ ;; Remove httpretty dependency for tests. (substitute* "setup.py" (("httpretty") "")) -- cgit 1.4.1 From 90f38fb66109e7da897fa9e6d56a10079d05c4bf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 16 Jul 2018 16:44:59 -0400 Subject: gnu: python-pyasn1: Update to 0.4.3. * gnu/packages/python.scm (python-pyasn1, python2-pyasn1): Update to 0.4.3. --- 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 38c48288a9..7e2e194816 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6284,14 +6284,14 @@ designed to efficiently cope with extremely large amounts of data.") (define-public python-pyasn1 (package (name "python-pyasn1") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) (uri (pypi-uri "pyasn1" version)) (sha256 (base32 - "05bxnr4wmrg62m4qr1pg1p3z7bhwrv74jll3k42pgxwl36kv0n6j")))) + "1z5h38anjzzrxpraa9iq9llffyx2zs8gx0q6dc1g029miwnn50gv")))) (build-system python-build-system) (home-page "http://pyasn1.sourceforge.net/") (synopsis "ASN.1 types and codecs") -- cgit 1.4.1 From 8e632a6435bb8ea408127833030f7764b78768a9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 16 Jul 2018 16:45:37 -0400 Subject: gnu: python-pyasn1-modules: Update to 0.2.2. * gnu/packages/python.scm (python-pyasn1-modules, python2-pyasn1-modules): Update to 0.2.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 7e2e194816..ebf02af22e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -6306,14 +6306,14 @@ suitable for a wide range of protocols based on the ASN.1 specification.") (define-public python-pyasn1-modules (package (name "python-pyasn1-modules") - (version "0.0.8") + (version "0.2.2") (source (origin (method url-fetch) (uri (pypi-uri "pyasn1-modules" version)) (sha256 (base32 - "0drqgw81xd3fxdlg89kgd79zzrabvfncvkbybi2wr6w2y4s1jmhh")))) + "0ivm850yi7ajjbi8j115qpsj95bgxdsx48nbjzg0zip788c3xkx0")))) (build-system python-build-system) (propagated-inputs `(("python-pyasn1" ,python-pyasn1))) -- cgit 1.4.1 From a545090ce5e6b9da1f473f558dabda69f317e461 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 16 Jul 2018 23:48:24 +0200 Subject: gnu: python-cairocffi: Fix loading of shared libraries. Fixes . * gnu/packages/patches/python-cairocffi-dlopen-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-cairocffi)[inputs]: Add glib, gtk+, pango. [native-inputs]: Add python-pytest. [arguments]: Enable tests. [arguments]<#:phases>[patch-paths]: New phase. --- gnu/local.mk | 1 + .../patches/python-cairocffi-dlopen-path.patch | 10 ++++++ gnu/packages/python.scm | 38 +++++++++++++++++++--- 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/python-cairocffi-dlopen-path.patch (limited to 'gnu/packages/python.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 64e71a84f8..d40b1963db 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1057,6 +1057,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ + %D%/packages/patches/python-cairocffi-dlopen-path.patch \ %D%/packages/patches/python-dendropy-fix-tests.patch \ %D%/packages/patches/python-fix-tests.patch \ %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch \ diff --git a/gnu/packages/patches/python-cairocffi-dlopen-path.patch b/gnu/packages/patches/python-cairocffi-dlopen-path.patch new file mode 100644 index 0000000000..e7a7fe3737 --- /dev/null +++ b/gnu/packages/patches/python-cairocffi-dlopen-path.patch @@ -0,0 +1,10 @@ +--- cairocffi-0.8.0/cairocffi/__init__.py.orig 2018-07-16 11:00:59.075664158 +0200 ++++ cairocffi-0.8.0/cairocffi/__init__.py 2018-07-16 17:09:42.471958015 +0200 +@@ -35,6 +35,7 @@ + return lib + except OSError: + pass ++ return ffi.dlopen(name) + raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names)) + + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ebf02af22e..fc1ef3eb2a 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4210,23 +4210,53 @@ support for Python 3 and PyPy. It is based on cffi.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rk2dvy3fxrga6bvvxc2fi5lbaynm5h4a0w0aaxyn3bc77rszjg9")))) + "1rk2dvy3fxrga6bvvxc2fi5lbaynm5h4a0w0aaxyn3bc77rszjg9")) + (patches (search-patches "python-cairocffi-dlopen-path.patch")))) (build-system python-build-system) (outputs '("out" "doc")) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("cairo" ,cairo))) + `(("glib" ,glib) + ("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) + ("cairo" ,cairo) + ("pango" ,pango))) (native-inputs `(("pkg-config" ,pkg-config) + ("python-pytest" ,python-pytest) ("python-sphinx" ,python-sphinx) ("python-docutils" ,python-docutils))) (propagated-inputs `(("python-xcffib" ,python-xcffib))) ; used at run time (arguments `(;; FIXME: Tests cannot find 'libcairo.so.2'. - #:tests? #f + #:tests? #t #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* (find-files "." "\\.py$") + (("dlopen\\(ffi, 'cairo'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "cairo") + "/lib/libcairo.so.2'")) + (("dlopen\\(ffi, 'gdk-3'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "gtk+") + "/lib/libgtk-3.so.0'")) + (("dlopen\\(ffi, 'gdk_pixbuf-2.0'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "gdk-pixbuf") + "/lib/libgdk_pixbuf-2.0.so.0'")) + (("dlopen\\(ffi, 'glib-2.0'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "glib") + "/lib/libglib-2.0.so.0'")) + (("dlopen\\(ffi, 'gobject-2.0'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "glib") + "/lib/libgobject-2.0.so.0'")) + (("dlopen\\(ffi, 'pangocairo-1.0'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "pango") + "/lib/libpangocairo-1.0.so.0'")) + (("dlopen\\(ffi, 'pango-1.0'") + (string-append "dlopen(ffi, '" (assoc-ref inputs "pango") + "/lib/libpango-1.0.so.0'"))) + #t)) (add-after 'install 'install-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "doc") "/share")) -- cgit 1.4.1