From 8dd1fce66e93bebceeacfa2dc398a76b10bc8e39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:12:08 +0100 Subject: gnu: python-py: Update to 1.7.0. * gnu/packages/python-xyz.scm (python-py): Update to 1.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 34126c1fe1..afffdb7d33 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1521,14 +1521,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.5.4") + (version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "1xxvwfn82457djf55f5n2c94699rfqnk43br8fif2r2q8gvrmm9z")))) + "152nyjvd8phqbm9pwlnfx0xi4c6343hakjzg42sp4qw3k1qn74mz")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From 850926439fb3d853c7f50d8be9580b1599ad47c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 16:12:39 +0100 Subject: gnu: python-setuptools-scm: Update to 3.2.0. * gnu/packages/python-xyz.scm (python-setuptools-scm): Update to 3.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afffdb7d33..38241c67f8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4263,13 +4263,13 @@ child application and control it as if a human were typing commands.") (define-public python-setuptools-scm (package (name "python-setuptools-scm") - (version "3.1.0") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools_scm" version)) (sha256 (base32 - "0h4bglwfz8b9prqljv8z3w9rgydfyxzaj05bm1y6zs5m6shz548i")))) + "0n3knn3p1sqlx31k2lahn7z9bacvlv8nhlfidj77vz50bxqlgasj")))) (build-system python-build-system) (home-page "https://github.com/pypa/setuptools_scm/") (synopsis "Manage Python package versions in SCM metadata") -- cgit v1.2.3 From ac63cf0a6995fb9de6121e648b401167895b2c9d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 17:45:51 +0100 Subject: gnu: Remove python-flake8@3.5. * gnu/packages/python-xyz.scm (python-flake8-3.5): Rename to ... (python-flake8): ... this. Update to 3.6.0. Remove previous variant. [arguments]: Remove phases 'delete-broken-test' and 'fix-problem-with-pycodestyle'. [properties]: Adjust for renamed variable. (python2-flake8-3.5): Rename to ... (python2-flake8): ... this. Remove previous variable. * gnu/packages/check.scm (python-hypothesis)[native-inputs]: Adjust accordingly. --- gnu/packages/check.scm | 3 +-- gnu/packages/python-xyz.scm | 65 ++++++++------------------------------------- 2 files changed, 12 insertions(+), 56 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index afb3b96aba..02ee9b136b 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1456,8 +1456,7 @@ instantly.") "0fvq4mfybm129l978war86mcshkn28dkrxw7lr8549zr9ywvik1c")))) (build-system python-build-system) (native-inputs - `(;; FIXME: Change to python-flake8 in the next rebuild cycle. - ("python-flake8" ,python-flake8-3.5) + `(("python-flake8" ,python-flake8) ("python-pytest" ,python-pytest-bootstrap))) (propagated-inputs `(("python-attrs" ,python-attrs-bootstrap) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38241c67f8..b92bed542f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5556,35 +5556,20 @@ complexity of Python source code.") (define-public python2-pyflakes-0.8.1 (package-with-python2 python-pyflakes-0.8.1)) -;; This package is used by hypothesis which has thousands of dependent packages. -;; FIXME: Consolidate this with "python-flake8" below in the next rebuild cycle. -(define-public python-flake8-3.5 +(define-public python-flake8 (package (name "python-flake8") - (version "3.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "184b33grvvjmiwlv9kyd7yng9qv5ld24154j70z332xxg9gjclvj")))) + (version "3.6.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "flake8" version)) + (sha256 + (base32 + "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; Two errors don't seem to have assigned codes. - (add-after 'unpack 'delete-broken-test - (lambda _ (delete-file "tests/unit/test_pyflakes_codes.py") #t)) - (add-after 'unpack 'fix-problem-with-pycodestyle - (lambda _ - ;; See https://gitlab.com/pycqa/flake8/merge_requests/230 - ;; This should no longer be needed with the next release. - (substitute* "setup.py" - (("PEP8_PLUGIN\\('break_around_binary_operator'\\),") - "PEP8_PLUGIN('break_after_binary_operator'),\ -PEP8_PLUGIN('break_before_binary_operator'),")) - #t)) (delete 'check) (add-after 'install 'check (lambda* (#:key inputs outputs #:allow-other-keys) @@ -5604,45 +5589,17 @@ PEP8_PLUGIN('break_before_binary_operator'),")) "The modular source code checker: pep8, pyflakes and co") (description "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") - (properties `((python2-variant . ,(delay python2-flake8-3.5)))) + (properties `((python2-variant . ,(delay python2-flake8)))) (license license:expat))) -(define-public python2-flake8-3.5 - (let ((base (package-with-python2 (strip-python2-variant python-flake8-3.5)))) +(define-public python2-flake8 + (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) -;; Version 3.5.0 has compatibility issues with Pyflakes 2.0, so we need -;; this newer version. Keep it as a separate variable for now to avoid -;; rebuilding "python-hypothesis"; this should be removed in the next -;; rebuild cycle. -(define-public python-flake8 - (package - (inherit python-flake8-3.5) - (version "3.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "flake8" version)) - (sha256 - (base32 - "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) - (arguments - (substitute-keyword-arguments (package-arguments python-flake8-3.5) - ((#:phases phases) - `(modify-phases ,phases - (delete 'delete-broken-test) - (delete 'fix-problem-with-pycodestyle))))) - (properties `((python2-variant . ,(delay python2-flake8)))))) - -(define-public python2-flake8 - (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) - (package (inherit base) - (propagated-inputs - (package-propagated-inputs python2-flake8-3.5))))) - ;; python-hacking requires flake8 <2.6.0. (define-public python-flake8-2.5 (package -- cgit v1.2.3 From d16ef28b8037664ad08af5fb825811e9f46bb64c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:43:42 +0100 Subject: gnu: python-pycodestyle: Update to 2.5.0. * gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.5.0. [source](patches): Remove. --- gnu/local.mk | 1 - .../python-pycodestyle-stdlib-tokenize-fix.patch | 35 ---------------------- gnu/packages/python-xyz.scm | 5 ++-- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 41f81d0d0b..9df65b9d21 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1171,7 +1171,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch \ %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch b/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch deleted file mode 100644 index 16388c8dba..0000000000 --- a/gnu/packages/patches/python-pycodestyle-stdlib-tokenize-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 -From: Michael Hudson-Doyle -Date: Tue, 25 Sep 2018 14:58:57 +1200 -Subject: [PATCH] Keep compability with stdlib tokenize.py changes - -https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 -is not yet part of any release of Python but has been backported to all -versions in Git (includeing 2.7!). It causes the tokenize.py module to -emit a synthetic NEWLINE token for files that do not in fact end with a -newline, which confuses pycodestyle's checks for blank lines at the end -of a file. Fortunately the synthetic NEWLINE tokens are easy to detect -(the token text is ""). - -Fixes #786 ---- - pycodestyle.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pycodestyle.py b/pycodestyle.py -index 0d725d27..fbc3dca3 100755 ---- a/pycodestyle.py -+++ b/pycodestyle.py -@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): - """ - if line_number == total_lines: - stripped_last_line = physical_line.rstrip() -- if not stripped_last_line: -+ if physical_line and not stripped_last_line: - return 0, "W391 blank line at end of file" - if stripped_last_line == physical_line: -- return len(physical_line), "W292 no newline at end of file" -+ return len(lines[-1]), "W292 no newline at end of file" - - - @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b92bed542f..9d80531296 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3593,15 +3593,14 @@ as the original project seems to have been abandoned circa 2007.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0fhy4vnlgpjq4qd1wdnl6pvdw7rah0ypmn8c9mkhz8clsndskz6b")) - (patches (search-patches "python-pycodestyle-stdlib-tokenize-fix.patch")))) + "0v4prb05n21bm8650v0a01k1nyqjdmkrsm3zycfxh2j5k9n962p4")))) (build-system python-build-system) (home-page "https://pycodestyle.readthedocs.io/") (synopsis "Python style guide checker") -- cgit v1.2.3 From 14f10479d0c9705dda371b2b17708b63cdf28ada Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:46:43 +0100 Subject: gnu: python-atomicwrites: Update to 1.3.0. * gnu/packages/python-xyz.scm (python-atomicwrites): Update to 1.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d80531296..c24caa836c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7169,13 +7169,13 @@ tables.") (define-public python-atomicwrites (package (name "python-atomicwrites") - (version "1.1.5") + (version "1.3.0") (source (origin (method url-fetch) (uri (pypi-uri "atomicwrites" version)) (sha256 (base32 - "11bm90fwm2avvf4f3ib8g925w7jr4m11vcsinn1bi6ns4bm32214")))) + "19ngcscdf3jsqmpcxn6zl5b6anmsajb6izp1smcd1n02midl9abm")))) (build-system python-build-system) (synopsis "Atomic file writes in Python") (description "Library for atomic file writes using platform dependent tools -- cgit v1.2.3 From 81ed0980a50ee1846c3a1c812e72fbb94c61c8f2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:47:19 +0100 Subject: gnu: python-pluggy: Update to 0.8.1. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c24caa836c..1fd3e8bb27 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7607,14 +7607,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "1qbn70mksmr03hac6jgp6fiqc4l7859z8dchx2x950vhlij87swm")))) + "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 54da6f9f9b7badb6c957e598e71652af9e86c0e5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:48:07 +0100 Subject: gnu: python2-pathlib2: Update to 2.3.3. * gnu/packages/python-xyz.scm (python2-pathlib2): Update to 2.3.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1fd3e8bb27..f2ef078cf3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8300,13 +8300,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "10yb0iv5x2hs631rcppkhbddx799d3h8pcwmkbh2a66ns3w71ccf")))) + "0hpp92vqqgcd8h92msm9slv161b1q160igjwnkf2ag6cx0c96695")))) (build-system python-build-system) ;; We only need the the Python 2 variant, since for Python 3 our minimum ;; version is 3.4 which already includes this package as part of the -- cgit v1.2.3 From 84127f8c300b6485d1fc476ccb2a0bf06cea683e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:48:46 +0100 Subject: gnu: python-configparser: Update to 3.7.1. * gnu/packages/python-xyz.scm (python-configparser): Update to 3.7.1. [source](uri): Use PYPI-URI. --- gnu/packages/python-xyz.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f2ef078cf3..89a1ec0172 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11348,17 +11348,14 @@ of @code{functools.lru_cache} from python 3.3.") (define-public python-configparser (package (name "python-configparser") - (version "3.5.0") + (version "3.7.1") (source (origin (method url-fetch) - (uri (string-append - "https://bitbucket.org/ambv/configparser/get/" - version ".tar.bz2")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "configparser" version)) (sha256 (base32 - "0waq40as14abwzbb321hfz4vr1fi363nscy32ga14qvfygrg96wa")))) + "0cnz213il9lhgda6x70fw7mfqr8da43s3wm343lwzhqx94mgmmav")))) (build-system python-build-system) (home-page "https://github.com/jaraco/configparser/") (synopsis "Backport of configparser from python 3.5") -- cgit v1.2.3 From 16e03a521e3d4a0b0415cacb87d66d88a5463f67 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 18:50:33 +0100 Subject: gnu: python-more-itertools: Update to 5.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 5.0.0. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 89a1ec0172..3c9da320cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13560,29 +13560,15 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "4.3.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "17h3na0rdh8xq30w4b9pizgkdxmm51896bxw600x84jflg9vaxn4")))) + "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) (build-system python-build-system) - (arguments - `(,@(if (any (cute string-prefix? <> (or (%current-system) - (%current-target-system))) - '("armhf" "i686")) - '(#:phases - (modify-phases %standard-phases - ;; This is required for 32-bit hardware. - ;; TODO: Try to remove this when upgrading. - (add-after 'unpack 'patch-test - (lambda _ - (substitute* "more_itertools/tests/test_more.py" - (("10 \\*\\* 10") "9 ** 9")) - #t)))) - '()))) (propagated-inputs `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") -- cgit v1.2.3 From b3ca2b45d1be73f5d0a843c6e3721e7209f1c89d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 Feb 2019 19:10:48 +0100 Subject: gnu: python-setuptools: Update to 40.8.0. * gnu/packages/python-xyz.scm (python-setuptools): Update to 40.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3c9da320cc..28618bc6bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -613,14 +613,14 @@ encoded).") (define-public python-setuptools (package (name "python-setuptools") - (version "40.0.0") + (version "40.8.0") (source (origin (method url-fetch) (uri (pypi-uri "setuptools" version ".zip")) (sha256 (base32 - "0pq116lr14gnc62v76nk0npkm6krb2mpp7p9ab369zgv4n7dnah1")) + "0k9hifpgahnw2a26w3cr346iy733k6d3nwh3f7g9m13y6f8fqkkf")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 59bd5a4a09f0f43f5cd7f86a4ee61d2351f93d99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:37:58 +0100 Subject: gnu: python-fonttools: Update to 3.37.3. * gnu/packages/python-xyz.scm (python-fonttools): Update to 3.37.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 28618bc6bc..0147abff98 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5826,13 +5826,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.28.0") + (version "3.37.3") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0vsvjhidpb5kywpjgz1j3fywzkddxkb0afqai18qa3h6lqjyxwpb")))) + "0k90g0q1h4var3kq6xn6zs3j1ghff97hwyn1gdqfdywsldas9668")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 94295903939471314e5c89f4eff73bee28b9def6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 00:38:23 +0100 Subject: gnu: python-packaging: Update to 19.0. * gnu/packages/python-xyz.scm (python-packaging): Update to 19.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0147abff98..b4ebf46d1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11711,14 +11711,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "18.0") + (version "19.0") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "01wq9c53ix5rz6qg2c98gy8n4ff768rmanifm8m5jpjiaizj51h8")))) + "1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 47f66348f7c80056d6ae9637c42fce4effa688db Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 13 Feb 2019 18:24:03 +0100 Subject: gnu: python-more-itertools: Update to 6.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 6.0.0. [propagated-inputs]: Remove PYTHON-SIX-BOOTSTRAP. [properties]: New field. (python2-more-itertools): Stay on version 5.0.0. --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d119fd12a..5768228dfe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2016, 2017 Nils Gillmann ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2016, 2017 Stefan Reichör ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016, 2017 Alex Vong @@ -13788,27 +13788,40 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "5.0.0") + (version "6.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) + "1lfrx2ndnilla3a5lhpjc1wjgkplkxrhp5nyn6ys2l93jkil802r")))) (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six-bootstrap))) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") (description "Python's built-in @code{itertools} module implements a number of iterator building blocks inspired by constructs from APL, Haskell, and SML. @code{more-itertools} includes additional building blocks for working with iterables.") + (properties `((python2-variant . ,(delay python2-more-itertools)))) (license license:expat))) +;; The 5.x series are the last versions supporting Python 2.7. (define-public python2-more-itertools - (package-with-python2 python-more-itertools)) + (package + (inherit python-more-itertools) + (name "python2-more-itertools") + (version "5.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "more-itertools" version)) + (sha256 + (base32 + "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) + (arguments + `(#:python ,python2-minimal)) + (propagated-inputs + `(("python2-six" ,python2-six-bootstrap))))) (define-public python-latexcodec (package -- cgit v1.2.3 From 08eba545f1551157d4b24877a8f6f167d7957d3d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:06:27 +0100 Subject: gnu: python-py: Update to 1.8.0. * gnu/packages/python-xyz.scm (python-py): Update to 1.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd754e10fd..afb74859bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1526,14 +1526,14 @@ server.") (define-public python-py (package (name "python-py") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "py" version)) (sha256 (base32 - "152nyjvd8phqbm9pwlnfx0xi4c6343hakjzg42sp4qw3k1qn74mz")))) + "0lsy1gajva083pzc7csj1cvbmminb7b4l6a0prdzyb3fd829nqyw")))) (build-system python-build-system) (arguments ;; FIXME: "ImportError: 'test' module incorrectly imported from -- cgit v1.2.3 From d0cba11bc568a75070cae19fe3aed14ae8a524b5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:08:59 +0100 Subject: gnu: python-pyflakes: Update to 2.1.1. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afb74859bb..46f71ccbfa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5652,14 +5652,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.0.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "0jba28czyvimdc72llms3f17swp3i8jdcabf5w0j00adfbn64xls")))) + "18pq95a1xj2dgdd0m85gyfsn40jajj4xc3lp8wfv7igqhrc86xnr")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- cgit v1.2.3 From b86b79960174eea6b16e4b8baa0e3d0d12310332 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:09:59 +0100 Subject: gnu: python-pluggy: Update to 0.9.0. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46f71ccbfa..0fa5d45a0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7800,14 +7800,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.8.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "05l6g42p9ilmabw0hlbiyxy6gyzjri41m5l11a8dzgvi77q35p4d")))) + "13yg2q0wgcb4l8lgdvcnzqa8db5lrw3nwn50lxjy1z5jkp7gkv0r")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From 6c58a06e796962720c02ba50651d26acfbcbd269 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:16:51 +0100 Subject: gnu: python-six: Update to 1.12.0. * gnu/packages/python-xyz.scm (python-six): Update to 1.12.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0fa5d45a0d..7d4498f285 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -872,14 +872,14 @@ from the Python interpreter, or as a small part of a larger application.") (define-public python-six (package (name "python-six") - (version "1.11.0") + (version "1.12.0") (source (origin (method url-fetch) (uri (pypi-uri "six" version)) (sha256 (base32 - "1scqzwc51c875z23phj48gircqjgnn3af8zy2izjwmnlxrxsgs3h")))) + "0wxs1q74v07ssjywbbm7x6h5v9qx209ld2yfsif4060sxi0h2sni")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From beaff4a8a991fc04b5298d86be70490a718b80dd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 18:17:11 +0100 Subject: gnu: python-flake8: Update to 3.7.7. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.7.7. [propagated-inputs]: Add PYTHON-ENTRYPOINTS. (python2-flake8)[propagated-inputs]: Add PYTHON2-TYPING. --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7d4498f285..af3c5a4667 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5751,13 +5751,13 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.6.0") + (version "3.7.7") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0w0nprx22rbvrrkbfx9v5jc5gskbm08g219l7r8wai8zfswgadba")))) + "0qg6zggqigrd4k3gv88shd1a27d0cwgfql8vfiq2c7rl7w3rd6c5")))) (build-system python-build-system) (arguments `(#:phases @@ -5770,6 +5770,7 @@ complexity of Python source code.") #t))))) (propagated-inputs `(("python-pycodestyle" ,python-pycodestyle) + ("python-entrypoints" ,python-entrypoints) ("python-pyflakes" ,python-pyflakes) ("python-mccabe" ,python-mccabe))) (native-inputs @@ -5790,6 +5791,7 @@ complexity of Python source code.") (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) + ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) ;; python-hacking requires flake8 <2.6.0. -- cgit v1.2.3 From ce1706b1bd7c4d085ea050fff038a811e3b2df10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:38:58 +0100 Subject: gnu: python-pympler: Update to 0.6. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.6. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index af3c5a4667..5043f87c6f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1980,13 +1980,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.5") + (version "0.6") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "03qwsbilqgvnbl3a1jmpgixbr2kq6m3fvdlzyr3wdp01bwlc85kx")))) + "19qkpaw5icwhb4c0f6ijqfmhwhj34k2k6s4m4fsvhrxc9p5cwqn2")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From a6184bee6fd01c6cfac5b51d1020a8ba6d9c61de Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:41:54 +0100 Subject: gnu: python-attrs-bootstrap: Update to 18.2.0. * gnu/packages/python-xyz.scm (python-attrs-bootstrap)[version, source]: Remove. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5043f87c6f..e86698fd5b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11237,15 +11237,6 @@ protocols.") (package (inherit python-attrs) (name "python-attrs-bootstrap") - ;; Keep this on a fixed version so python-attrs can be updated without - ;; triggering a mass-rebuild. FIXME: Update this in the next rebuild cycle. - (version "17.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "attrs" version)) - (sha256 - (base32 - "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w")))) (native-inputs `()) (arguments `(#:tests? #f)))) -- cgit v1.2.3 From c41d5144cf9affce02b7252493e3ac4b93a2f745 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 19:43:06 +0100 Subject: gnu: python-attrs: Update to 19.1.0. * gnu/packages/python-xyz.scm (python-attrs): Update to 19.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e86698fd5b..e3917f5a1c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11189,13 +11189,13 @@ and bit flag values.") (define-public python-attrs (package (name "python-attrs") - (version "18.2.0") + (version "19.1.0") (source (origin (method url-fetch) (uri (pypi-uri "attrs" version)) (sha256 (base32 - "0s9ydh058wmmf5v391pym877x4ahxg45dw6a0w4c7s5wgpigdjqh")))) + "16g33zr5f449lqc5wgvzpknxryfzrfsxcr6kpgxwn7l5fkv71f7h")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 1a4bb420a7485a389e46cd793f4a4d6ca4209462 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 4 Mar 2019 20:19:51 +0100 Subject: gnu: python-fonttools: Update to 3.38.0. * gnu/packages/python-xyz.scm (python-fonttools): Update to 3.38.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3917f5a1c..0a5b24e79d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6021,13 +6021,13 @@ add functionality and customization to your projects with their own plugins.") (define-public python-fonttools (package (name "python-fonttools") - (version "3.37.3") + (version "3.38.0") (source (origin (method url-fetch) (uri (pypi-uri "fonttools" version ".zip")) (sha256 (base32 - "0k90g0q1h4var3kq6xn6zs3j1ghff97hwyn1gdqfdywsldas9668")))) + "12ripk3s7skgxr1bs9r8n13r94ym3s8iir7ivfixls9fa4dabmlh")))) (build-system python-build-system) (native-inputs `(("unzip" ,unzip) -- cgit v1.2.3 From 3d3694079d24756c6963d3e81d5341d6e536a450 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 20:25:00 +0100 Subject: gnu: python-chardet: Disable tests. * gnu/packages/python-xyz.scm (python-chardet)[arguments]: New field. --- gnu/packages/python-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 46339c1abb..f5bc442a35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7160,6 +7160,8 @@ simulation, statistical modeling, machine learning and much more.") ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (build-system python-build-system) + ;; XXX: Incompatible with Pytest 4: . + (arguments `(#:tests? #f)) (home-page "https://github.com/chardet/chardet") (synopsis "Universal encoding detector for Python 2 and 3") (description -- cgit v1.2.3 From 8acd1e90c5032d8bbcb0cdebc7f659ebdf442802 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 6 Mar 2019 20:32:56 +0100 Subject: gnu: python-babel: Disable tests that are incompatible with Pytest 4. * gnu/packages/python-xyz.scm (python-babel)[arguments]: Expand pytest invokation. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f5bc442a35..bf2fc56294 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -302,7 +302,14 @@ by @code{binstar}, @code{binstar-build} and @code{chalmers}.") (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "pytest" "-vv")))))) + (lambda _ + (invoke "pytest" "-vv" "-k" + (string-append + ;; XXX: These tests fail when using Pytest 4.x and + ;; Babel 2.6.0. Try removing this for later versions. + "not test_no_inherit_metazone_marker_never_in_output" + " and not test_smoke_dates" + " and not test_smoke_numbers"))))))) (home-page "http://babel.pocoo.org/") (synopsis "Tools for internationalizing Python applications") -- cgit v1.2.3 From 5a457656284cfb25e9305362e18adf4aff13f91a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 10 Mar 2019 18:08:33 +0100 Subject: gnu: python-mako: Fix FTBFS with Pytest 4. * gnu/packages/python-xyz.scm (python-mako)[arguments]: New field. --- gnu/packages/python-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bf2fc56294..9749ce96bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8000,6 +8000,14 @@ python-xdo for newer bindings.)") (base32 "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-setup.cfg + (lambda _ + ;; Adjust setup.cfg for compatibility with Pytest 4. + (substitute* "setup.cfg" + (("\\[pytest\\]") "[tool:pytest]")) + #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs -- cgit v1.2.3 From db65a4fd914be10f9170cb8ad049e15eefefd5a9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 23 Mar 2019 19:32:53 +0100 Subject: gnu: python-mako: Update to 1.0.8. * gnu/packages/python-xyz.scm (python-mako): Update to 1.0.8. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db31794225..71727ad1da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8117,23 +8117,15 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) + "0hr89gcda0y0baz25cm4yq7fbl7cvid4zsns8cgv0jfzq102j284")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-setup.cfg - (lambda _ - ;; Adjust setup.cfg for compatibility with Pytest 4. - (substitute* "setup.cfg" - (("\\[pytest\\]") "[tool:pytest]")) - #t))))) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) (native-inputs -- cgit v1.2.3 From 1f62621607fa5fa3914303e793ddb56d7455ac94 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Apr 2019 22:10:49 +0200 Subject: gnu: python-more-itertools: Update to 7.0.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 7.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6d84932a6..bf1c0e3eb9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14280,14 +14280,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "6.0.0") + (version "7.0.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "1lfrx2ndnilla3a5lhpjc1wjgkplkxrhp5nyn6ys2l93jkil802r")))) + "0npsg9rbzvjrf176bf1p7239lkq0laqv11j81aixpn5al65p9r63")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From 1b0668272cb44d78a94b65ae0e004903b78e4138 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 29 Jun 2019 19:12:01 +0200 Subject: gnu: python-more-itertools: Update to 7.1.0. * gnu/packages/python-xyz.scm (python-more-itertools): Update to 7.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3e2b5f0d7..3ae5b1248f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14446,14 +14446,14 @@ file system events on Linux.") (define-public python-more-itertools (package (name "python-more-itertools") - (version "7.0.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (pypi-uri "more-itertools" version)) (sha256 (base32 - "0npsg9rbzvjrf176bf1p7239lkq0laqv11j81aixpn5al65p9r63")))) + "16phg2f2dvm6ci5wr49ncha5lmc0m2in3bsl33c61vzca4gkvd4b")))) (build-system python-build-system) (home-page "https://github.com/erikrose/more-itertools") (synopsis "More routines for operating on iterables, beyond itertools") -- cgit v1.2.3 From 0c6de725d814205d94ca3abb3f793c438137998a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 6 Jul 2019 20:32:17 +0200 Subject: gnu: python-pillow: Update to 6.1.0. * gnu/packages/python-xyz.scm (python-pillow): Update to 6.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e8de98814..cd74ee181e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4364,14 +4364,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "5.4.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17waygkhhzjd75kajlfw9v57mbb41lcpg6cvkdijqd7smm76ccsj")))) + "1pnrsz0f0n0c819v1pdr8j6rm8xvhc9f3kh1fv9xpdp9n5ygf108")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From e5731c03829fa8a71aab5bcf50442c517df2a8c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 8 Jul 2019 00:58:09 +0200 Subject: gnu: python-pluggy: Update to 0.11.0. * gnu/packages/python-xyz.scm (python-pluggy): Update to 0.11.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd74ee181e..f3fae63f59 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8483,14 +8483,14 @@ library as well as on the command line.") (define-public python-pluggy (package (name "python-pluggy") - (version "0.9.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (pypi-uri "pluggy" version)) (sha256 (base32 - "13yg2q0wgcb4l8lgdvcnzqa8db5lrw3nwn50lxjy1z5jkp7gkv0r")))) + "10511a54dvafw1jrk75mrhml53c7b7w4yaw7241696lc2hfvr895")))) (build-system python-build-system) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm))) -- cgit v1.2.3 From ff1e80d7918df85b78216a70ab31062af320c0e4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Jul 2019 20:25:40 +0200 Subject: gnu: python-cram: Fix build. * gnu/packages/python-xyz.scm (python-cram)[arguments]: Do not require 100% test coverage. While here, do not move the 'check' phase, as PYTHON-BUILD-SYSTEM now runs tests after install by default. --- gnu/packages/python-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f3fae63f59..ee347a3abf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6622,12 +6622,16 @@ pseudo terminal (pty), and interact with both the process and its pty.") ;; lines, but the test expects a single line... (("env\\['COLUMNS'\\] = '80'") "env['COLUMNS'] = '160'")) + + (substitute* "Makefile" + ;; Recent versions of python-coverage have caused the test + ;; coverage to decrease (as of version 0.7). Allow that. + (("--fail-under=100") + "--fail-under=90")) + #t)) - (delete 'check) - (add-after 'install 'check + (replace 'check ;; The test phase uses the built library and executable. - ;; It's easier to run it after install since the build - ;; directory contains version-specific PATH. (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (setenv "PATH" (string-append (getenv "PATH") ":" -- cgit v1.2.3 From dc23bb451365919f0bc7c2b6ec5707c23bca9629 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Jul 2019 15:42:42 +0200 Subject: gnu: python-pyicu: Update to 2.3.1. * gnu/packages/python-xyz.scm (python-pyicu): Update to 2.3.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee347a3abf..952f2436fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1204,14 +1204,14 @@ Python 3.3+.") (define-public python-pyicu (package (name "python-pyicu") - (version "2.2") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "PyICU" version)) (sha256 (base32 - "0wq9y5fi1ighgf5aws9nr87vi1w44p7q1k83rx2y3qj5d2xyhspa")))) + "1x4w8m7ifki9z2a187pgjr33z6z0rp2fii9b73djak1vhm9v9cnx")))) (build-system python-build-system) (inputs `(("icu4c" ,icu4c))) -- cgit v1.2.3 From da460865074bf3cc3b3c51e7678909e7e755787a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:50:59 +0200 Subject: gnu: python2-cython: Fix failing test. This started failing because Python no longer bundles libexpat since commit d1659c0fb27c4f71c8ddc6a85d3cd9f3a10cca97. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: New field. --- gnu/packages/python-xyz.scm | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac1c66a1d9..943ffdd4cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3239,11 +3239,39 @@ writing C extensions for Python as easy as Python itself.") (properties `((python2-variant . ,(delay python2-cython)))))) (define-public python2-cython - (package (inherit (package-with-python2 - (strip-python2-variant python-cython))) - (name "python2-cython") - (inputs - `(("python-2" ,python-2))))) ; this is not automatically changed + (let ((base (package-with-python2 (strip-python2-variant python-cython)))) + (package + (inherit base) + (name "python2-cython") + (inputs + `(("python-2" ,python-2))) ;this is not automatically changed + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'check 'adjust-test_embed + (lambda _ + (substitute* "runtests.py" + ;; test_embed goes great lengths to find the static libpythonX.Y.a + ;; so it can give the right -L flag to GCC when embedding static + ;; builds of Python. It is unaware that the Python "config" + ;; directory (where the static library lives) was renamed in + ;; Python 3, and falls back to sysconfig.get_config_var('LIBDIR'), + ;; which works fine, because that is where the shared library is. + ;; + ;; It also appears to be unaware that the Makefile in Demos/embed + ;; already unconditionally pass the static library location to GCC, + ;; after checking sysconfig.get_config_var('LIBPL). + ;; + ;; The effect is that the linker is unable to resolve libexpat + ;; symbols when building for Python 2, because neither the Python 2 + ;; shared library nor Expat is available. To fix it, we can either + ;; add Expat as an input and make it visible to the linker, or just + ;; prevent it from overriding the Python shared library location. + ;; The end result is identical, so we take the easy route. + ((" or libname not in os\\.listdir\\(libdir\\)") + "")) + #t))))))))) ;; The RPython toolchain currently does not support Python 3. (define-public python2-rpython -- cgit v1.2.3 From e9194eb04896165f15830862c42673e96bc5c5f7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 13 Jul 2019 18:51:16 +0200 Subject: gnu: python-cython: Speed up test suite. * gnu/packages/python-xyz.scm (python-cython)[arguments]: In the CHECK phase, disable compiler optimizations and enable (some) parallel tests. --- gnu/packages/python-xyz.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 943ffdd4cc..a60e1c7e2a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3229,7 +3229,12 @@ provides additional functionality on the produced Mallard documents.") (replace 'check (lambda _ - (invoke "python" "runtests.py" "-vv")))))) + ;; Disable compiler optimizations to greatly reduce the running + ;; time of the test suite. + (setenv "CFLAGS" "-O0") + + (invoke "python" "runtests.py" "-vv" + "-j" (number->string (parallel-job-count)))))))) (home-page "https://cython.org/") (synopsis "C extensions for Python") (description "Cython is an optimising static compiler for both the Python -- cgit v1.2.3 From 2be878d8e54057980121e4c659ca48317b79970e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Jul 2019 22:51:48 +0100 Subject: gnu: python-pep8: Patch to fix test failure with Python 3.7. Patch from the upstream repository, see https://github.com/PyCQA/pycodestyle/issues/786 for more details. * gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch: New file. * gnu/packages/python-xyz.scm (python-pep8)[source]: Add it. --- .../python-pep8-stdlib-tokenize-compat.patch | 35 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch new file mode 100644 index 0000000000..f11d8f7be8 --- /dev/null +++ b/gnu/packages/patches/python-pep8-stdlib-tokenize-compat.patch @@ -0,0 +1,35 @@ +From 397463014fda3cdefe8d6c9d117ae16d878dc494 Mon Sep 17 00:00:00 2001 +From: Michael Hudson-Doyle +Date: Tue, 25 Sep 2018 14:58:57 +1200 +Subject: [PATCH] Keep compability with stdlib tokenize.py changes + +https://github.com/python/cpython/commit/c4ef4896eac86a6759901c8546e26de4695a1389 +is not yet part of any release of Python but has been backported to all +versions in Git (includeing 2.7!). It causes the tokenize.py module to +emit a synthetic NEWLINE token for files that do not in fact end with a +newline, which confuses pycodestyle's checks for blank lines at the end +of a file. Fortunately the synthetic NEWLINE tokens are easy to detect +(the token text is ""). + +Fixes #786 +--- + pycodestyle.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pycodestyle.py b/pycodestyle.py +index 0d725d27..fbc3dca3 100755 +--- a/pep8.py ++++ b/pep8.py +@@ -258,10 +258,10 @@ def trailing_blank_lines(physical_line, lines, line_number, total_lines): + """ + if line_number == total_lines: + stripped_last_line = physical_line.rstrip() +- if not stripped_last_line: ++ if physical_line and not stripped_last_line: + return 0, "W391 blank line at end of file" + if stripped_last_line == physical_line: +- return len(physical_line), "W292 no newline at end of file" ++ return len(lines[-1]), "W292 no newline at end of file" + + + @register_check diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a60e1c7e2a..ac43ef9057 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6350,7 +6350,8 @@ applications.") (uri (pypi-uri "pep8" version)) (sha256 (base32 - "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")))) + "002rkl4lsn6x2mxmf8ar00l0m8i3mzrc6pnzz77blyksmpsxa4x1")) + (patches (search-patches "python-pep8-stdlib-tokenize-compat.patch")))) (build-system python-build-system) (home-page "https://pep8.readthedocs.org/") (synopsis "Python style guide checker") -- cgit v1.2.3 From b5b56b7f27dc902721ce23dfcbbbf777026186e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 16:56:15 +0200 Subject: gnu: python-gevent: Fix build with libev 4.25 and GCC 7. * gnu/packages/python-xyz.scm (python-gevent)[arguments]: Simplify libev unbundling, which failed with the newer libev. Use C_INCLUDE_PATH instead of CPATH. [native-inputs]: Remove (PACKAGE-SOURCE LIBEV). --- gnu/packages/python-xyz.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac43ef9057..e58acc3578 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9823,13 +9823,6 @@ graphviz.") (guix build utils) (guix build python-build-system)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'unpack-libev - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "deps/libev") - ;; FIXME: gevent requires building libev, even though - ;; it only links against the proper one. - (invoke "tar" "-xf" (assoc-ref inputs "libev-source") - "--strip-components=1" "-C" "deps/libev"))) (add-before 'patch-source-shebangs 'patch-hard-coded-paths (lambda _ (substitute* "src/gevent/subprocess.py" @@ -9847,6 +9840,11 @@ graphviz.") (setenv "CARES_EMBED" "false") (setenv "EMBED" "false") + ;; Prevent building bundled libev. + (substitute* "setup.py" + (("run_make=_BUILDING") + "run_make=False")) + (let ((greenlet (string-append (assoc-ref inputs "python-greenlet") "/include"))) @@ -9854,7 +9852,7 @@ graphviz.") (lambda (item) (string-prefix? "python" item))) ((python) - (setenv "CPATH" + (setenv "C_INCLUDE_PATH" (string-append greenlet "/" python))))) #t)) (add-before 'check 'skip-timer-test @@ -9886,8 +9884,7 @@ graphviz.") `(("python-greenlet" ,python-greenlet) ("python-objgraph" ,python-objgraph))) (native-inputs - `(("libev-source" ,(package-source libev)) - ("python-six" ,python-six))) + `(("python-six" ,python-six))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) -- cgit v1.2.3 From 0b58cb427db55ec710d54330191cf9b4ebab3e6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 15 Jul 2019 18:13:39 +0200 Subject: gnu: python-datrie: Update to 0.8. * gnu/packages/python-xyz.scm (python-datrie): Update to 0.8. [arguments]: Remove. --- gnu/packages/python-xyz.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e58acc3578..21f8a916d6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5860,23 +5860,15 @@ of the structure, dynamics, and functions of complex networks.") (define-public python-datrie (package (name "python-datrie") - (version "0.7.1") + (version "0.8") (source (origin (method url-fetch) (uri (pypi-uri "datrie" version)) (sha256 (base32 - "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs")))) + "0338r8xgmpy78556jhms0h6qkvyjr10p8bpgdvcpqzm9lrmxmmdx")))) (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'build 'cythonize - (lambda _ - ;; Regenerate Cython classes to solve ABI issues with Python - ;; 3.7.0. See . - (invoke "cython" "src/datrie.pyx" "src/cdatrie.pxd" - "src/stdio_ext.pxd" "-a")))))) (native-inputs `(("python-cython" ,python-cython) ("python-hypothesis" ,python-hypothesis) -- cgit v1.2.3 From 40a7153d198821c4111d5bb864f872d2df108013 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 18 Jul 2019 23:15:50 +0200 Subject: gnu: python-flake8-polyfill: Adjust tests for Pytest 4. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[arguments]: Add substitution in setup.cfg. --- gnu/packages/python-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5a7a21da5d..e2ef589acf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6541,6 +6541,12 @@ complexity of Python source code.") (modify-phases %standard-phases (replace 'check (lambda _ + ;; Be compatible with Pytest 4: + ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 + (substitute* "setup.cfg" + (("\\[pytest\\]") + "[tool:pytest]")) + (setenv "PYTHONPATH" (string-append (getcwd) "/build/lib:" (getenv "PYTHONPATH"))) -- cgit v1.2.3 From c498a07e2d5a0dbe3a68cae02355202095146697 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 00:19:42 +0200 Subject: gnu: python-pympler: Update to 0.7. * gnu/packages/python-xyz.scm (python-pympler): Update to 0.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e2ef589acf..0dc61c1099 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2207,13 +2207,13 @@ JavaScript-like message boxes. Types of dialog boxes include: (package (name "python-pympler") (home-page "https://pythonhosted.org/Pympler/") - (version "0.6") + (version "0.7") (source (origin (method url-fetch) (uri (pypi-uri "Pympler" version)) (sha256 (base32 - "19qkpaw5icwhb4c0f6ijqfmhwhj34k2k6s4m4fsvhrxc9p5cwqn2")))) + "0ki7bqp1h9l1xc2k1h4vjyzsgs20i8ingvcdhszyi72s28wyf4bs")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 0fdec2a309bfc9c62b449524e3e71714674bca6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 14:57:06 +0200 Subject: gnu: tensorflow: Provide older setuptools version. * gnu/packages/python-xyz.scm (python-setuptools-for-tensorflow): New public variable. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs]: Add it. --- gnu/packages/machine-learning.scm | 3 +++ gnu/packages/python-xyz.scm | 13 +++++++++++++ 2 files changed, 16 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index ace52b4c9d..e3c69948e2 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1604,6 +1604,9 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("protobuf:native" ,protobuf-next) ; protoc ("protobuf:src" ,(package-source protobuf-next)) ("eigen:src" ,(package-source eigen-for-tensorflow)) + ;; install_pip_packages.sh wants setuptools 39.1.0 specifically. + ("python-setuptools" ,python-setuptools-for-tensorflow) + ;; The commit hashes and URLs for third-party source code are taken ;; from "tensorflow/workspace.bzl". ("boringssl-src" diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 65dffd33bf..6796f1c065 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -713,6 +713,19 @@ Python 3 support.") (define-public python2-setuptools (package-with-python2 python-setuptools)) +;; The setuptools provided by Python 3.7.4 is too new for Tensorflow. +(define-public python-setuptools-for-tensorflow + (hidden-package + (package + (inherit python-setuptools) + (version "39.1.0") + (source (origin + (inherit (package-source python-setuptools)) + (uri (pypi-uri "setuptools" version ".zip")) + (sha256 + (base32 + "1mzdhvfhnv4lggxa8rjl0dzqxvfx377gg5sqs57v89wrp09lwj65"))))))) + (define-public python-uniseg (package (name "python-uniseg") -- cgit v1.2.3 From d478cc043557ca3fcd5fced87d2e2c8e246eff03 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Jul 2019 18:38:11 +0200 Subject: gnu: pybind11: Update to 2.3.0. * gnu/packages/python-xyz.scm (pybind11): Update to 2.3.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6796f1c065..d3744e82c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14888,7 +14888,7 @@ under Python 2.7.") (define-public pybind11 (package (name "pybind11") - (version "2.2.4") + (version "2.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -14896,7 +14896,7 @@ under Python 2.7.") (commit (string-append "v" version)))) (sha256 (base32 - "0pa79ymcasv8br5ifbx7878id5py2jpjac3i20cqxr6gs9l6ivlv")) + "11b6dniri8m05spfd2a19irz82shf4sdca73566bniggrf3zclnf")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From dfe8a7048e036a6d702edfd133a4ead5e879e3cf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 20 Aug 2019 01:53:49 +0200 Subject: gnu: Add python-folium. * gnu/packages/python-xyz.scm (python-folium): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 459d5d44e1..6f4c3b79d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16058,3 +16058,34 @@ one-off scripts.") time-or-computationally-expensive properties quick and easy and works in Python 2 or 3.") (license license:bsd-3))) + +(define-public python-folium + (package + (name "python-folium") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "folium" version)) + (sha256 + (base32 + "18fzxijsgrb95r0a8anc9ba5ijyw3nlnv3rpavfbkqa5v878x84f")))) + (build-system python-build-system) + (propagated-inputs + `(("python-branca" ,python-branca) + ("python-jinja2" ,python-jinja2) + ("python-numpy" ,python-numpy) + ("python-requests" ,python-requests))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/python-visualization/folium") + (synopsis "Make beautiful maps with Leaflet.js & Python") + (description "@code{folium} makes it easy to visualize data that’s been +manipulated in Python on an interactive leaflet map. It enables both the +binding of data to a map for @code{choropleth} visualizations as well as +passing rich vector/raster/HTML visualizations as markers on the map. + +The library has a number of built-in tilesets from OpenStreetMap, Mapbox, and +Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It +supports Image, Video, GeoJSON and TopoJSON overlays.") + (license license:expat))) -- cgit v1.2.3 From 9dd5f4752844c1445fd1b1dd3927ca8e9e4f8abd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 23 Aug 2019 18:41:05 +0200 Subject: gnu: Add JUBE. * gnu/packages/python-xyz.scm (jube): New variable. Co-authored-by: Florent Pruvost --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f4c3b79d0..135ff05237 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16089,3 +16089,28 @@ The library has a number of built-in tilesets from OpenStreetMap, Mapbox, and Stamen, and supports custom tilesets with Mapbox or Cloudmade API keys. It supports Image, Video, GeoJSON and TopoJSON overlays.") (license license:expat))) + +(define-public jube + (package + ;; This is a command-line tool, so no "python-" prefix. + (name "jube") + (version "2.2.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://apps.fz-juelich.de/jsc/jube/jube2/download.php?version=" + version)) + (sha256 + (base32 + "0xq4k1q63s1p6swgyp61vahlrd1fqmgbm0gm5kpj8ikwy0yc0nqk")) + (file-name (string-append "jube-" version ".tar.gz")))) + (build-system python-build-system) + (home-page "https://apps.fz-juelich.de/jsc/jube/jube2/docu/index.html") + (synopsis "Benchmarking environment") + (description + "JUBE helps perform and analyze benchmarks in a systematic way. For each +benchmarked application, benchmark data is stored in a format that allows JUBE +to deduct the desired information. This data can be parsed by automatic pre- +and post-processing scripts that draw information and store it more densely +for manual interpretation.") + (license license:expat))) -- cgit v1.2.3 From a9f3396014461a29e9d0256dcd5a87c19f850f0b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 23 Aug 2019 19:14:32 +0200 Subject: gnu: jube: Fix license. * gnu/packages/python-xyz.scm (jube)[license]: Change to GPL3+. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 135ff05237..ec7017eb7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16113,4 +16113,4 @@ benchmarked application, benchmark data is stored in a format that allows JUBE to deduct the desired information. This data can be parsed by automatic pre- and post-processing scripts that draw information and store it more densely for manual interpretation.") - (license license:expat))) + (license license:gpl3+))) -- cgit v1.2.3 From fdfad2fc4e291030bd7b864a7a1fa5885bfe8eea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Aug 2019 04:08:16 +0200 Subject: gnu: python-twisted: Update to 19.7.0. * gnu/packages/python-xyz.scm (python-twisted): Update to 19.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ec7017eb7e..40e6a01dd7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9978,13 +9978,13 @@ format.") (define-public python-twisted (package (name "python-twisted") - (version "19.2.1") + (version "19.7.0") (source (origin (method url-fetch) (uri (pypi-uri "Twisted" version ".tar.bz2")) (sha256 (base32 - "0liymyd4pzphizjlpwkncxjpm9akyr3lkfkm77yfg6wasv108b7s")))) + "17d3hnxv9qndagzz63mdpyk99xj63p9gq586vjn0rxk8cl197nym")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: some tests fail -- cgit v1.2.3 From 6643642482c6fabf6bebae3a5bdf576723b2099c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 10:00:26 +0200 Subject: gnu: Add python-pyroutelib3. * gnu/packages/python-xyz.scm (python-pyroutelib3): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 40e6a01dd7..ee17bf78e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16114,3 +16114,22 @@ to deduct the desired information. This data can be parsed by automatic pre- and post-processing scripts that draw information and store it more densely for manual interpretation.") (license license:gpl3+))) + +(define-public python-pyroutelib3 + (package + (name "python-pyroutelib3") + (version "1.3.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyroutelib3" version)) + (sha256 + (base32 + "1hpbydpn2alyswiajfbvhzq4c7f36vdmvxy91hgv8l1lb2g2vfrj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dateutil" ,python-dateutil))) + (home-page "https://github.com/MKuranowski/pyroutelib3") + (synopsis "Library for simple routing on OSM data") + (description "Library for simple routing on OSM data") + (license license:gpl3+))) -- cgit v1.2.3 From 6263b5b3be1e673fc6142c5299c79a90f6611159 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 10:44:01 +0200 Subject: gnu: python-pillow: Update to 6.1.0. * gnu/packages/python-xyz.scm (python-pillow): Update to 6.1.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ee17bf78e2..64c1b7f443 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4356,14 +4356,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "5.4.1") + (version "6.1.0") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17waygkhhzjd75kajlfw9v57mbb41lcpg6cvkdijqd7smm76ccsj")))) + "1pnrsz0f0n0c819v1pdr8j6rm8xvhc9f3kh1fv9xpdp9n5ygf108")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit v1.2.3 From 523ba4b16e9c250783e482cc6c5c42dd4484e172 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 26 Aug 2019 23:25:55 +0200 Subject: gnu: python-pip: Update to 19.2.1. * gnu/packages/python-xyz.scm (python-pip): Update to 19.2.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 64c1b7f443..79bcd7090f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7312,14 +7312,14 @@ responses, rather than doing any computation.") (define-public python-pip (package (name "python-pip") - (version "18.1") + (version "19.2.1") (source (origin (method url-fetch) (uri (pypi-uri "pip" version)) (sha256 (base32 - "188fclay154s520n43s7cxxlhdaiysvxf19zk8vr1xbyjyyr58n0")))) + "100sd12ss4mbdj5lf3wawad29cm573b27765mq098x6xhcj71395")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are no tests in the pypi archive. -- cgit v1.2.3 From 30e7c03aaedd248c57a7d92ced9963fed058cc53 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Tue, 20 Aug 2019 00:15:20 +0200 Subject: gnu: Add python-elementpath. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-elementpath): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 79bcd7090f..04957b4407 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald +;;; Copyright © 2019 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -16133,3 +16134,28 @@ for manual interpretation.") (synopsis "Library for simple routing on OSM data") (description "Library for simple routing on OSM data") (license license:gpl3+))) + +(define-public python-elementpath + (package + (name "python-elementpath") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "elementpath" version)) + (sha256 + (base32 + "1syn2z543brab23dskh3fjd9pqvz6npqbcicrs2d88dbg26xl08p")))) + (build-system python-build-system) + (home-page + "https://github.com/sissaschool/elementpath") + (synopsis + "XPath 1.0/2.0 parsers and selectors for ElementTree and lxml") + (description + "The proposal of this package is to provide XPath 1.0 and 2.0 selectors +for Python's ElementTree XML data structures, both for the standard +ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. + +For lxml.etree this package can be useful for providing XPath 2.0 selectors, +because lxml.etree already has it's own implementation of XPath 1.0.") + (license license:expat))) -- cgit v1.2.3 From 2271a1dcdbaa5b54967aa2f31e96db2f90528376 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 16 Aug 2019 23:31:50 +0200 Subject: gnu: python-wrapt: Update to 1.11.2. * gnu/packages/python-xyz.scm (python-wrapt): Update to 1.11.2. --- gnu/packages/python-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 04957b4407..e7fffd0879 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6990,14 +6990,14 @@ Supported netlink families and protocols include: (define-public python-wrapt (package (name "python-wrapt") - (version "1.11.1") + (version "1.11.2") (source - (origin - (method url-fetch) - (uri (pypi-uri "wrapt" version)) - (sha256 - (base32 - "0cqmysny1pz01jw26q48q5zasvns6507rwhgm6wcw743f0r01sja")))) + (origin + (method url-fetch) + (uri (pypi-uri "wrapt" version)) + (sha256 + (base32 + "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn")))) (build-system python-build-system) (arguments ;; Tests are not included in the tarball, they are only available in the @@ -7006,7 +7006,7 @@ Supported netlink families and protocols include: (home-page "https://github.com/GrahamDumpleton/wrapt") (synopsis "Module for decorators, wrappers and monkey patching") (description - "The aim of the wrapt module is to provide a transparent object proxy for + "The aim of the wrapt module is to provide a transparent object proxy for Python, which can be used as the basis for the construction of function wrappers and decorator functions.") (license license:bsd-2))) -- cgit v1.2.3 From 9441a9c1635edf4678d35f425a4aab0a2abb1bda Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Aug 2019 03:24:58 +0200 Subject: gnu: python-pybtex: Update to 0.22.2. * gnu/packages/python-xyz.scm (python-pybtex): Update to 0.22.2. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e7fffd0879..d5fcc5668c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14677,14 +14677,13 @@ working with iterables.") (define-public python-pybtex (package (name "python-pybtex") - (version "0.21") + (version "0.22.2") (source (origin (method url-fetch) (uri (pypi-uri "pybtex" version)) (sha256 - (base32 - "00300j8dn5pxq4ndxmfmbmycg2znawkqs49val2x6jlmfiy6r2mg")))) + (base32 "070wfcmxrd7xg1si421mi9150gmx2qwx431nwf69sq3hhmgnx080")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) -- cgit v1.2.3 From a35f153d54a2e571c88386424c7846b2d4b59689 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 7 Sep 2019 00:42:16 +0200 Subject: gnu: python-scipy: Update to 1.3.1. * gnu/packages/python-xyz.scm (python-scipy): Update to 1.3.1. (python2-scipy): Keep at version 1.2.2. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d5fcc5668c..2827ddf770 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4033,14 +4033,14 @@ operators such as union, intersection, and difference.") (define-public python-scipy (package (name "python-scipy") - (version "1.2.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 (base32 - "1cgvgin8fvckv96hjh3ikmwkra5rif51bdb75ifzf7xbil5iwcx4")))) + "1df113c9i6vazsn6y3n9wc22jh737z1g7dmx3mypkdwpdnscyhr6")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) @@ -4136,9 +4136,19 @@ routines such as routines for numerical integration and optimization.") (properties `((python2-variant . ,(delay python2-scipy)))) (license license:bsd-3))) +;; Version 1.2.2 is the last version to support Python 2 (define-public python2-scipy - (package-with-python2 - (strip-python2-variant python-scipy))) + (package + (inherit (package-with-python2 + (strip-python2-variant python-scipy))) + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "scipy" version)) + (sha256 + (base32 + "1cgvgin8fvckv96hjh3ikmwkra5rif51bdb75ifzf7xbil5iwcx4")))))) (define-public python-socksipy-branch (package -- cgit v1.2.3 From 9f74bd317f00c55ab1fa30683c1668a19bf17eab Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 7 Sep 2019 20:08:16 -0700 Subject: gnu: python-debian: Update to 0.1.36. * gnu/packages/python-xyz (python-debian): Update to 0.1.36. [source]: Switch to using git-fetch. [arguments]: Add phase to delete tests depending on tools not yet present in guix. [propagated-inputs]: Add python-chardet. --- gnu/packages/python-xyz.scm | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2827ddf770..16f1331a84 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7490,17 +7490,31 @@ serve the same purpose: provide Python bindings for libmagic."))) (package (name "python-debian") (home-page "https://salsa.debian.org/python-debian-team/python-debian") - (version "0.1.28") + (version "0.1.36") (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + ;; Use git-fetch, as pypi doesn't include test suite. + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0i15f0xzx679sd0ldq2sls9pnnps9fv6vhqvnv9dzf4qhma42i0y")))) + "0qy6x28bj6yfikhjww932v5xq4mf5bm1iczl7acy4c7zm6mwhqfa")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-debian-specific-tests + ;; python-apt, apt and dpkg are not yet available in guix, + ;; and these tests heavily depend on them. + (lambda _ + (delete-file "lib/debian/tests/test_deb822.py") + (delete-file "lib/debian/tests/test_debfile.py") + #t))))) (propagated-inputs - `(("python-six" ,python-six))) + `(("python-six" ,python-six) + ("python-chardet" ,python-chardet))) (synopsis "Debian package related modules") (description ;; XXX: Use @enumerate instead of @itemize to work around -- cgit v1.2.3 From 984cabc4a66cd6b58354887530d136e92bd8a172 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Sat, 24 Aug 2019 04:47:38 +0200 Subject: gnu: python-language-server: Update to 0.28.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-language-server): Update to 0.28.1. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 16f1331a84..a928677858 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2987,14 +2987,14 @@ Server (PLS).") (define-public python-language-server (package (name "python-language-server") - (version "0.26.1") + (version "0.28.1") (source (origin (method url-fetch) (uri (pypi-uri "python-language-server" version)) (sha256 (base32 - "1vs9ckfmm534n1hq3m871916wsjvi5h4gyj6wlzg13ck6506lx0s")))) + "1qbiij208l6g1l5hzihx8badhmqkxdk0spn7gm7564yg54zdp2g2")))) (build-system python-build-system) (propagated-inputs `(("python-pluggy" ,python-pluggy) -- cgit v1.2.3 From 1475094a457cd927e149d54ec9b8f59a8b05f0f2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 Sep 2019 22:28:00 +0900 Subject: gnu: python-parso: Update to 0.5.1. * gnu/packages/python-xyz.scm (python-parso): Update to 0.5.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a928677858..ea183c0301 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14744,14 +14744,14 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.3.1") + (version "0.5.1") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 (base32 - "18p89iwcm8mnf380f92g9w0bhx5km8wxp392vvjcq4y1ld1llw1m")))) + "171a9ivhxwsd52h1cgsz40zgzpgzscn7yqb7sdjhy8m1lzj0wsv6")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit v1.2.3 From 4eb97c254effc95115d5e9da1b7083ecbc427a2f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 10 Sep 2019 22:34:22 +0900 Subject: gnu: python-parso: Run the test suite. * gnu/packages/python-xyz.scm (python-parso)[phases]: Replace the check phase. --- gnu/packages/python-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ea183c0301..991082eed0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14755,6 +14755,10 @@ time-based (TOTP) passwords.") (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "pytest" "-vv")))))) (home-page "https://github.com/davidhalter/parso") (synopsis "Python Parser") (description "Parso is a Python parser that supports error recovery and -- cgit v1.2.3 From 296e1aea65eda887d9c9ce14038fec5ff090b977 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 11 Sep 2019 09:34:29 +0900 Subject: gnu: python-jedi: Update to 0.15.1 and re-enable tests. * gnu/packages/python-xyz.scm (python-jedi): Update to 0.15.1; re-enable tests. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 991082eed0..819b3045a3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10556,25 +10556,29 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.13.3") + (version "0.15.1") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) (sha256 (base32 - "0nsrjlb57njqppxmi8wjsb1dkad7qa7svx67jbkhixq66lz61c1b")))) + "0bp4pxhsynaarbvzblsn5x32lzp29svy3sxfy8i6m5iwz9s9r1ds")))) (build-system python-build-system) (arguments - `( ;; Many tests are failing with Python 3.7.x as of version 0.13.3 (see: - ;; https://github.com/davidhalter/jedi/issues/1263) - #:tests? #f - #:phases + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-file-completion-test + ;; A single parameterized test currently fail (see: + ;; https://github.com/davidhalter/jedi/issues/1395). Remove it. + (lambda _ + (substitute* "test/test_api/test_completion.py" + ((".*'example.py', 'rb\"' \\+ join\\('\\.\\.'.*") "")) + #t)) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "py.test" "-vv"))))))) + (lambda _ + (setenv "HOME" "/tmp") + (invoke "python" "-m" "pytest")))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-docopt" ,python-docopt))) @@ -10592,11 +10596,7 @@ well.") (license license:expat))) (define-public python2-jedi - (let ((base (package-with-python2 (strip-python2-variant python-jedi)))) - (package - (inherit base) - (arguments (substitute-keyword-arguments (package-arguments base) - ((#:tests? _) #t)))))) + (package-with-python2 python-jedi)) (define-public ptpython (package -- cgit v1.2.3 From 0f272518eca06f849cef86d26c294f17edc82c3e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 Sep 2019 23:29:07 +0200 Subject: gnu: python-ipython-documentation: Make reproducible. Fixes . * gnu/packages/python-xyz.scm (python-ipython)[arguments]: Add phase "make-docs-reproducible" to remove timestamps from documentation generated in dependent python-ipython-documentation package. --- gnu/packages/python-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 819b3045a3..00bffca74a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5399,6 +5399,13 @@ computing.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'make-docs-reproducible + (lambda _ + (substitute* "IPython/sphinxext/ipython_directive.py" + ((".*import datetime") "") + ((".*datetime.datetime.now\\(\\)") "") + (("%timeit") "# %timeit")) + #t)) ;; Tests can only be run after the library has been installed and not ;; within the source directory. (delete 'check) -- cgit v1.2.3 From 4913828bb1f1c9f672a49c19090ba4ae8d14e88b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Wed, 11 Sep 2019 19:15:22 +0200 Subject: gnu: python-language-server: Update to 0.28.3-1.c3cab77. * gnu/packages/python-xyz.scm (python-language-server): Update to 0.28.3-1.c3cab77. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 62 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 28 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 00bffca74a..8b2023ceba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2984,38 +2984,44 @@ Language (TOML) configuration files.") Server (PLS).") (license license:expat))) +;; XXX: We must use a non-release version since the latest release version +;; requires python-jedi version < 0.15. (define-public python-language-server - (package - (name "python-language-server") - (version "0.28.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "python-language-server" version)) - (sha256 - (base32 - "1qbiij208l6g1l5hzihx8badhmqkxdk0spn7gm7564yg54zdp2g2")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pluggy" ,python-pluggy) - ("python-jsonrpc-server" ,python-jsonrpc-server) - ("python-jedi" ,python-jedi) - ("python-yapf" ,python-yapf) - ("python-pyflakes" ,python-pyflakes) - ("python-pydocstyle" ,python-pydocstyle) - ("python-pycodestyle" ,python-pycodestyle) - ("python-mccabe" ,python-mccabe) - ("python-rope" ,python-rope) - ("python-autopep8" ,python-autopep8) - ("python-pylint" ,python-pylint))) - (home-page "https://github.com/palantir/python-language-server") - (synopsis "Python implementation of the Language Server Protocol") - (description - "The Python Language Server (pyls) is an implementation of the Python 3 + (let ((commit "c3cab77a85b1de4af1aec1bafea6a7320d6baec5") + (revision "1")) + (package + (name "python-language-server") + (version (git-version "0.28.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/palantir/python-language-server.git") + (commit commit))) + (sha256 + (base32 + "1q0xdwgln09sh58j0ryygj92hfgdhwcs57zjvqihya23jr5v0bz4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pluggy" ,python-pluggy) + ("python-jsonrpc-server" ,python-jsonrpc-server) + ("python-jedi" ,python-jedi) + ("python-yapf" ,python-yapf) + ("python-pyflakes" ,python-pyflakes) + ("python-pydocstyle" ,python-pydocstyle) + ("python-pycodestyle" ,python-pycodestyle) + ("python-mccabe" ,python-mccabe) + ("python-rope" ,python-rope) + ("python-autopep8" ,python-autopep8) + ("python-pylint" ,python-pylint))) + (home-page "https://github.com/palantir/python-language-server") + (synopsis "Python implementation of the Language Server Protocol") + (description + "The Python Language Server (pyls) is an implementation of the Python 3 language specification for the Language Server Protocol (LSP). This tool is used in text editing environments to provide a complete and integrated feature-set for programming Python effectively.") - (license license:expat))) + (license license:expat)))) (define-public python-black (package -- cgit v1.2.3 From 01a53e0b378aca02c429ebfb5018237867a6d024 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 Sep 2019 00:05:09 +0900 Subject: gnu: python-pathpy: Add a missing propagated input. This fixes the build of 'python-pytest-shutil', amongst others. * gnu/packages/python-xyz.scm (python-pathpy)[propagated-inputs]: Add python-importlib-metadata. --- gnu/packages/python-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8b2023ceba..74abf336c8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4972,7 +4972,8 @@ releases.") (outputs '("out" "doc")) (build-system python-build-system) (propagated-inputs - `(("python-appdirs" ,python-appdirs))) + `(("python-appdirs" ,python-appdirs) + ("python-importlib-metadata" ,python-importlib-metadata))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) ("python-sphinx" ,python-sphinx) -- cgit v1.2.3 From 5ea654cfe030165efadf1f1dcfb2adef66a1f44f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Sep 2019 21:59:10 +0200 Subject: gnu: python-matplotlib: Update to 3.1.1. * gnu/packages/python-xyz.scm (python-matplotlib): Update to 3.1.1. [native-inputs]: Remove python-nose; add python-pytest and unzip; add jquery-ui. [arguments]: Add build phases "fix-and-disable-failing-tests" and "install-jquery-ui", and move the "check" phase after the "install" phase; use the default backend in setup.cfg. (python2-matplotlib): Keep at version 2.2.3. (python-matplotlib-documentation)[arguments]: Remove "check" phase. --- gnu/packages/python-xyz.scm | 73 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 66 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74abf336c8..1a4c804f37 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3806,14 +3806,14 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (define-public python-matplotlib (package (name "python-matplotlib") - (version "2.2.3") + (version "3.1.1") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) + "14qc109dibp32xfd9lah54djc0rc76fhbsj9cwyb328lzqmd5sqz")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) @@ -3830,7 +3830,7 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context' ;; object. For this reason we need to import both libraries. - ;; https://pythonhosted.org/cairocffi/cffi_api.html#converting-pycairo + ;; https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi ("python-pycairo" ,python-pycairo) ("python-cairocffi" ,python-cairocffi))) (inputs @@ -3845,11 +3845,59 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. ("tk" ,tk))) (native-inputs `(("pkg-config" ,pkg-config) - ("python-nose" ,python-nose) - ("python-mock" ,python-mock))) + ("python-pytest" ,python-pytest) + ("python-mock" ,python-mock) + ("unzip" ,unzip) + ("jquery-ui" + ,(origin + (method url-fetch) + (uri "https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip") + (sha256 + (base32 + "0kb21xf38diqgxcdi1z3s9ssq36pldvyqxy56hn6pcva6rs3c8zq")))))) (arguments `(#:phases (modify-phases %standard-phases + ;; XXX We disable all image comparison tests because we're using a + ;; newer version of FreeType than matplotlib expects. This leads to + ;; minor differences throughout the tests. + (add-after 'unpack 'fix-and-disable-failing-tests + (lambda _ + (substitute* (append (find-files "lib/matplotlib/tests/" + "test_.*\\.py$") + (find-files "lib/mpl_toolkits/tests" + "test_.*\\.py$")) + (("^from matplotlib" match) + (string-append "import pytest\n" match)) + (("( *)@image_comparison" match indent) + (string-append indent + "@pytest.mark.skip(reason=\"unknown minor image differences\")\n" + match))) + (substitute* "lib/matplotlib/tests/test_animation.py" + (("/bin/sh") (which "sh"))) + (for-each delete-file + ;; test_normal_axes, test_get_tightbbox_polar + '("lib/matplotlib/tests/test_axes.py" + ;; test_outward_ticks + "lib/matplotlib/tests/test_tightlayout.py" + ;; Fontconfig returns no fonts. + "lib/matplotlib/tests/test_font_manager.py")) + #t)) + (add-before 'install 'install-jquery-ui + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") + "/lib/python3.7/site-packages/matplotlib/backends/web_backend/"))) + (mkdir-p dir) + (invoke "unzip" + (assoc-ref inputs "jquery-ui") + "-d" dir)) + #t)) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs inputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "python" "tests.py" "-v" + "-m" "not network"))) (add-before 'build 'configure-environment (lambda* (#:key outputs inputs #:allow-other-keys) (let ((cairo (assoc-ref inputs "cairo"))) @@ -3861,8 +3909,8 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (lambda (port) (format port "[directories]~% basedirlist = ~a,~a~% - [rc_options]~% -backend = TkAgg~%" +[packages]~% +tests = True~%" (assoc-ref inputs "tcl") (assoc-ref inputs "tk"))))) #t))))) @@ -3881,6 +3929,14 @@ toolkits.") (let ((matplotlib (package-with-python2 (strip-python2-variant python-matplotlib)))) (package (inherit matplotlib) + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "matplotlib" version)) + (sha256 + (base32 + "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) ;; Make sure to use special packages for Python 2 instead ;; of those automatically rewritten by package-with-python2. (propagated-inputs @@ -3930,6 +3986,9 @@ toolkits.") `(#:tests? #f ; we're only generating documentation #:phases (modify-phases %standard-phases + ;; The tests in python-matplotlib are run after the install phase, so + ;; we need to delete the extra phase here. + (delete 'check) (replace 'build (lambda _ (chdir "doc") -- cgit v1.2.3 From 5ad0a4522116007420aeb288f76da241f43cb6bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Sep 2019 23:00:39 +0200 Subject: gnu: python-matplotlib-documentation: Add missing input. * gnu/packages/python-xyz.scm (python-matplotlib-documentation)[native-inputs]: Add python-sphinx-copybutton. (python2-matplotlib-documentation)[native-inputs]: Remove python-sphinx-copybutton. --- gnu/packages/python-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1a4c804f37..4541604873 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3960,6 +3960,7 @@ toolkits.") `(("python-matplotlib" ,python-matplotlib) ("python-colorspacious" ,python-colorspacious) ("python-sphinx" ,python-sphinx) + ("python-sphinx-copybutton" ,python-sphinx-copybutton) ("python-sphinx-gallery" ,python-sphinx-gallery) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) @@ -4037,7 +4038,12 @@ toolkits.") (license (package-license python-matplotlib)))) (define-public python2-matplotlib-documentation - (package-with-python2 python-matplotlib-documentation)) + (let ((parent (package-with-python2 python-matplotlib-documentation))) + (package + (inherit parent) + (native-inputs + (alist-delete "python-sphinx-copybutton" + (package-native-inputs parent)))))) (define-public python-matplotlib-venn (package -- cgit v1.2.3 From 5d484f42a87d7121b6f9d50bb5f8d61e157bb186 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:27:12 +0300 Subject: gnu: python2-matplotlib: Disable tests. * gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Skip the custom 'check phase. --- gnu/packages/python-xyz.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4541604873..66f7e176e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3937,6 +3937,11 @@ toolkits.") (sha256 (base32 "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) + (arguments + (substitute-keyword-arguments (package-arguments matplotlib) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check))))) ; These tests weren't run the the past. ;; Make sure to use special packages for Python 2 instead ;; of those automatically rewritten by package-with-python2. (propagated-inputs -- cgit v1.2.3 From 66a3c2db9b1d344145ded88fd5aeec4cff77137f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:29:49 +0300 Subject: gnu: python2-matplotlib: Fix jquery-ui install path. * gnu/packages/python-xyz.scm (python2-matplotlib)[arguments]: Override custom 'install-jquery-ui phase to install in the appropriate directory. --- gnu/packages/python-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 66f7e176e2..71adf82a77 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3941,6 +3941,16 @@ toolkits.") (substitute-keyword-arguments (package-arguments matplotlib) ((#:phases phases) `(modify-phases ,phases + (replace 'install-jquery-ui + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((dir (string-append (assoc-ref outputs "out") + "/lib/python2.7/site-packages/" + "matplotlib/backends/web_backend/"))) + (mkdir-p dir) + (invoke "unzip" + (assoc-ref inputs "jquery-ui") + "-d" dir)) + #t)) (delete 'check))))) ; These tests weren't run the the past. ;; Make sure to use special packages for Python 2 instead ;; of those automatically rewritten by package-with-python2. -- cgit v1.2.3 From 7380df7312cc9f3fedce553954528e574df451bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:32:31 +0300 Subject: gnu: python2-matplotlib: Update to 2.2.4. * gnu/packages/python-xyz.scm (python2-matplotlib): Update to 2.2.4. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 71adf82a77..28b472c72e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3929,14 +3929,14 @@ toolkits.") (let ((matplotlib (package-with-python2 (strip-python2-variant python-matplotlib)))) (package (inherit matplotlib) - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "1rcc7x9ig3hpchkc4cwdvym3y451w74275fxr455zkfagrsvymbk")))) + "09i1gnrra1590brc1f8d5rh2zvnknmfgzp613ab0462qkrwj15h2")))) (arguments (substitute-keyword-arguments (package-arguments matplotlib) ((#:phases phases) -- cgit v1.2.3 From 339b582892dea157b54879884032900bf0700d72 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Sep 2019 12:36:13 +0300 Subject: gnu: python-matplotlib: Use https in home-page. * gnu/packages/python-xyz.scm (python-matplotlib)[home-page]: Update to use https. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 28b472c72e..5c261cc6fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3914,7 +3914,7 @@ tests = True~%" (assoc-ref inputs "tcl") (assoc-ref inputs "tk"))))) #t))))) - (home-page "http://matplotlib.org") + (home-page "https://matplotlib.org/") (synopsis "2D plotting library for Python") (description "Matplotlib is a Python 2D plotting library which produces publication -- cgit v1.2.3 From f315673d9e56f4f2398098590ebdc080b63ce8b1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 19 Sep 2019 10:23:47 -0700 Subject: gnu: Add python-binwalk. * gnu/packages/python-xyz (python-binwalk): New variable. * gnu/packages/diffoscope (diffoscope)[native-inputs]: Add python-binwalk for tests. --- gnu/packages/diffoscope.scm | 1 + gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 59a15205c0..17a2d212e5 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -150,6 +150,7 @@ ;; Below are modules used for tests. (native-inputs `(("python-pytest" ,python-pytest) ("python-chardet" ,python-chardet) + ("python-binwalk" ,python-binwalk) ;; test suite skips tests when tool is missing ("abootimg" ,abootimg) ("bdb" ,bdb) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5c261cc6fd..601e4b13df 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10868,6 +10868,42 @@ binary or text.") `(("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) +(define-public python-binwalk + (let ((commit "64201acfb5b0a9cdd9faa58c40a36dcff8612e29") + (revision "0")) + (package + (name "python-binwalk") + (version (git-version "2.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ReFirmLabs/binwalk") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1z7ca6rfp887hw5jc3sb45mm4fa0xid4lsp2z8g4r590dr7k7w15")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-pythonpath + (lambda _ + (setenv "PYTHONPATH" + (string-append + (getcwd) "/src/" + ":" (getenv "PYTHONPATH"))) + (setenv "HOME" "") + #t))))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-nose" ,python-nose))) + (home-page "https://github.com/ReFirmLabs/binwalk") + (synopsis "Firmware analysis tool") + (description "Binwalk is a tool for analyzing, reverse engineering, and extracting firmware images") + (license license:expat)))) + (define-public python-nltk (package (name "python-nltk") -- cgit v1.2.3 From af760990e9651be865ccd20b935863d85f605f2e Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 8 Sep 2019 23:53:00 -0700 Subject: gnu: Add python-editorconfig. * gnu/packages/python-xyz (python-editorconfig): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 601e4b13df..44aa471bb1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -882,6 +882,27 @@ messages in color.") (define-public python2-coloredlogs (package-with-python2 python-coloredlogs)) +(define-public python-editorconfig + (package + (name "python-editorconfig") + (version "0.12.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "EditorConfig" version)) + (sha256 + (base32 + "0v55z351p9qkyp3bbspwywwn28sbcknhirngjbj779n3z52z63hv")))) + (build-system python-build-system) + (home-page "https://editorconfig.org/") + (synopsis "EditorConfig bindings for python") + (description "The EditorConfig project consists of a file format for +defining coding styles and a collection of text editor plugins that enable +editors to read the file format and adhere to defined styles. EditorConfig +files are easily readable and they work nicely with version control systems.") + ;; "fnmatch.py" and "ini.py" are licensed under psfl, the rest is bsd-2. + (license (list license:bsd-2 license:psfl)))) + (define-public python-et-xmlfile (package (name "python-et-xmlfile") -- cgit v1.2.3 From 6ec872231fdf746bd6e11b97f8a6b3a23498806c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 19 Sep 2019 13:45:41 -0700 Subject: gnu: Add python-jsbeautifier. * gnu/packages/python-xyz (python-jsbeautifier): New variable. * gnu/packages/diffoscope (diffoscope)[native-arguments]: Add python-jsbeautifier. [arguments]: Add python-jsbeautifier to add-known-tools phase. --- gnu/packages/diffoscope.scm | 4 ++++ gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index e2b2565004..fff331ac13 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -92,6 +92,9 @@ ;; Patch in support for known tools (add-after 'unpack 'add-known-tools (lambda _ + (substitute* "diffoscope/external_tools.py" + (("'arch': 'python-jsbeautifier'},") + "'arch': 'python-jsbeautifier', 'guix': 'python-jsbeautifier'},")) (substitute* "diffoscope/external_tools.py" (("'arch': 'wabt'},") "'arch': 'wabt', 'guix': 'wabt'},")))) @@ -188,6 +191,7 @@ ("openssh" ,openssh) ("pgpdump" ,pgpdump) ("poppler" ,poppler) + ("python-jsbeautifier" ,python-jsbeautifier) ("r-minimal" ,r-minimal) ("rpm" ,rpm) ("sng" ,sng) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 44aa471bb1..4e33fa575f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8035,6 +8035,45 @@ Jupyter kernels such as IJulia and IRKernel.") support for rich media output.") (license license:bsd-3))) +(define-public python-jsbeautifier + (package + (name "python-jsbeautifier") + (version "1.10.2") + (home-page "https://github.com/beautify-web/js-beautify") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wawb070ki1axb3jc9xvsrgpji52vcfif3zmjzc3z4g98m5xw4kg")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, + ;; but this package only builds the python code. + (chdir "python") + #t)) + (add-after 'unpack 'patch-python-six-requirements + (lambda _ + (substitute* "python/setup.py" + (("six>=1.12.0") + "six>=1.11.0")) + #t))))) + (propagated-inputs + `(("python-editorconfig" ,python-editorconfig) + ("python-six" ,python-six))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (synopsis "JavaScript unobfuscator and beautifier") + (description "Beautify, unpack or deobfuscate JavaScript, leveraging +popular online obfuscators.") + (license license:expat))) + (define-public jupyter (package (name "jupyter") -- cgit v1.2.3 From c1bbef6920b1eb7e212b5e11d0385d477a53fbfb Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Mon, 16 Sep 2019 18:19:39 +0200 Subject: gnu: Add python-bibtexparser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-bibtexparser): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e33fa575f..69c8e63ecf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2019 Wiktor Żelazny ;;; ;;; This file is part of GNU Guix. ;;; @@ -16376,3 +16377,24 @@ ElementTree library and for the @uref{http://lxml.de, lxml.etree} library. For lxml.etree this package can be useful for providing XPath 2.0 selectors, because lxml.etree already has it's own implementation of XPath 1.0.") (license license:expat))) + +(define-public python-bibtexparser + (package + (name "python-bibtexparser") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bibtexparser" version)) + (sha256 + (base32 + "0zwhfkrzf3n5847dbnfng92k7ak199l9v6x6ax3dgdidfpm6d2fz")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pyparsing" ,python-pyparsing))) + (native-inputs + `(("python-future" ,python-future))) + (home-page "https://github.com/sciunto-org/python-bibtexparser") + (synopsis "Python library to parse BibTeX files") + (description "BibtexParser is a Python library to parse BibTeX files.") + (license (list license:bsd-3 license:lgpl3)))) -- cgit v1.2.3 From 8581b40d097bf7c0b3016435e0985cf56a003afb Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 8 Sep 2019 12:07:09 +0200 Subject: gnu: Add python-distro. * gnu/packages/python-xyz.scm (python-distro): New variable. --- gnu/packages/python-xyz.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 69c8e63ecf..1bd218b797 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2015, 2016 Chris Marusich ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016, 2018 Hartmut Goebel +;;; Copyright © 2016, 2018-2019 Hartmut Goebel ;;; Copyright © 2016 Daniel Pimentel ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016, 2017 Troy Sankey @@ -16398,3 +16398,30 @@ because lxml.etree already has it's own implementation of XPath 1.0.") (synopsis "Python library to parse BibTeX files") (description "BibtexParser is a Python library to parse BibTeX files.") (license (list license:bsd-3 license:lgpl3)))) + +(define-public python-distro + (package + (name "python-distro") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "distro" version)) + (sha256 + (base32 + "0mrg75w4ap7mdzyga75yaid9n8bgb345ih5mwjp3plj6v1jxwb9n")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/nir0s/distro") + (synopsis + "OS platform information API") + (description + "@code{distro} provides information about the OS distribution it runs on, +such as a reliable machine-readable ID, or version information. + +It is the recommended replacement for Python's original +`platform.linux_distribution` function (which will be removed in Python 3.8). +@code{distro} also provides a command-line interface to output the platform +information in various formats.") + (license license:asl2.0))) -- cgit v1.2.3 From dc827867be9496dd7071b76c0629da2ddbb82696 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Sep 2019 12:07:33 +0200 Subject: gnu: Add python-boolean.py. * gnu/packages/python-xyz.scm (python-boolean.py): New public variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1bd218b797..adc6fc08bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -387,6 +387,32 @@ certificate returned by the server to which a connection has been established, and verifies that it matches the intended target hostname.") (license license:psfl))) +(define-public python-boolean.py + (package + (name "python-boolean.py") + (version "3.6") + (source + (origin + ;; There's no source tarball on PyPI. + (method git-fetch) + (uri (git-reference + (url "https://github.com/bastikr/boolean.py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wc89y73va58cj7dsx6c199zpxsy9q53dsffsdj6zmc90inqz6qs")))) + (build-system python-build-system) + (home-page "https://github.com/bastikr/boolean.py") + (synopsis "Boolean algebra in one Python module") + (description + "This is a small Python library that implements boolean algebra. +It defines two base elements, @code{TRUE} and @code{FALSE}, and a +@code{Symbol} class that can take on one of these two values. Calculations +are done only in terms of @code{AND}, @code{OR}, and @code{NOT}---other +compositions like @code{XOR} and @code{NAND} are emulated on top of them. +Expressions are constructed from parsed strings or directly in Python.") + (license license:bsd-2))) + (define-public python-hdf4 (package (name "python-hdf4") -- cgit v1.2.3 From d6803445eeff619214cc9fcf99af79975c36f740 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 27 Sep 2019 12:08:03 +0200 Subject: gnu: Add python-license-expression. * gnu/packages/python-xyz.scm (python-license-expression): New public variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index adc6fc08bf..413d68c258 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -609,6 +609,29 @@ to users of that module.") (define-public python2-netcdf4 (package-with-python2 python-netcdf4)) +(define-public python-license-expression + (package + (name "python-license-expression") + (version "0.999") + (source + (origin + (method url-fetch) + (uri (pypi-uri "license-expression" version)) + (sha256 + (base32 "08ppb0bxbrsxazy88sgpl9yffvdsabw6dkk1nc332wcz2mphwwyf")))) + (build-system python-build-system) + (propagated-inputs + `(("python-boolean.py" ,python-boolean.py))) + (home-page "https://github.com/nexB/license-expression") + (synopsis "Apply boolean logic to license expressions") + (description + "This Python module defines a tiny language to evaluate and compare +license expressions using boolean logic. Logical combinations of licenses can +be tested for equality, containment, and equivalence. They can be normalised +and simplified. It supports SPDX license expressions as well as other naming +conventions and aliases in the same expression.") + (license license:gpl2+))) + (define-public python-lockfile (package (name "python-lockfile") -- cgit v1.2.3 From 0af697d94092057842ddb63867b2ded2b2289618 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 4 Oct 2019 19:00:29 +0200 Subject: gnu: python-importlib-metadata: Update to 0.23. * gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 0.23. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 413d68c258..840281600b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5052,14 +5052,13 @@ older Python versions.") (define-public python-importlib-metadata (package (name "python-importlib-metadata") - (version "0.18") + (version "0.23") (source (origin (method url-fetch) (uri (pypi-uri "importlib_metadata" version)) (sha256 - (base32 - "1nqj6vj2z4byi8flzf2lbldhqgicsz9mkpv4k69kjd8p8qxy4vnb")))) + (base32 "09mdqdfv5rdrwz80jh9m379gxmvk2vhjfz0fg53hid00icvxf65a")))) (build-system python-build-system) (propagated-inputs `(("python-configparser" ,python-configparser) -- cgit v1.2.3 From ac5e205a3c09c20d08d8c5cea8fde8f4ebb45cf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 6 Oct 2019 02:47:52 +0200 Subject: gnu: python-traitlets: Update to 4.3.3. * gnu/packages/python-xyz.scm (python-traitlets): Update to 4.3.3. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 840281600b..42c2b2730f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5222,14 +5222,14 @@ away.") (define-public python-traitlets (package (name "python-traitlets") - (version "4.3.2") + (version "4.3.3") (source (origin (method url-fetch) (uri (pypi-uri "traitlets" version)) (sha256 (base32 - "0dbq7sx26xqz5ixs711k5nc88p8a0nqyz6162pwks5dpcz9d4jww")))) + "1xsrwgivpkxlbr4dfndfsi098s29yqgswgjc1qqn69yxklvfw8yh")))) (build-system python-build-system) (arguments `(#:phases @@ -5237,7 +5237,7 @@ away.") (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets")))))) (propagated-inputs `(("python-ipython-genutils" ,python-ipython-genutils) - ("python-decorator" ,python-decorator))) ;not needed for >4.3.2 + ("python-decorator" ,python-decorator))) (native-inputs `(("python-pytest" ,python-pytest))) (properties `((python2-variant . ,(delay python2-traitlets)))) -- cgit v1.2.3