From a0b2accf8217f15480272bef2e61fc0407afbcbd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 19 Oct 2019 15:21:35 +0200 Subject: gnu: Add python-setuptools-scm-3.3. * gnu/packages/python-xyz.scm (python-setuptools-scm-3.3): New variable. --- gnu/packages/python-xyz.scm | 14 +++++++++++++- 1 file changed, 13 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 f27fa4f871..4c46bdca47 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017, 2018 Adriano Peluso ;;; Copyright © 2017 Ben Sturmfels -;;; Copyright © 2017, 2018 Mathieu Othacehe +;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Kei Kebreau @@ -5111,6 +5111,18 @@ (define-public python-setuptools-scm them as the version argument or in a SCM managed file.") (license license:expat))) +;; Needed by python-lazy-object-proxy, remove on next update cycle. +(define-public python-setuptools-scm-3.3 + (package + (inherit python-setuptools-scm) + (version "3.3.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "setuptools_scm" version)) + (sha256 + (base32 + "19cyndx23xmpbhz4qrwmfwsmnnaczd0dw7qg977ksq2dbvxy29dx")))))) + (define-public python2-setuptools-scm (package-with-python2 python-setuptools-scm)) -- cgit v1.2.3 From 63d4873b9300693ddcbcb6b220b2e892588b83b4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 19 Oct 2019 15:22:38 +0200 Subject: gnu: python-lazy-object-proxy: Update to 1.4.2. * gnu/packages/python-xyz.scm (python-lazy-object-proxy): Update to 1.4.2, [native-inputs]: add python-setuptools-scm. --- 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 4c46bdca47..29834257cf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10628,13 +10628,15 @@ (define-public python2-cleo (define-public python-lazy-object-proxy (package (name "python-lazy-object-proxy") - (version "1.3.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (pypi-uri "lazy-object-proxy" version)) (sha256 (base32 - "0yha7q9bhw857fwaby785d63mffhngl9npwzlk9i0pwlkwvbx4gb")))) + "1wgl0fmddi0ind78a74yyk2qrr9pb5llvj1892cdpp6z6n6mn4zx")))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm-3.3))) (build-system python-build-system) (home-page "https://github.com/ionelmc/python-lazy-object-proxy") (synopsis "Lazy object proxy for python") -- cgit v1.2.3 From bae89583827501db4038bffbd9b4bc863e17571d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 19 Oct 2019 15:26:55 +0200 Subject: gnu: python-typed-ast: Update to 1.4.0. * gnu/packages/python-xyz.scm (python-typed-ast): Update to 1.4.0, [source]: switch to git-fetch. --- gnu/packages/python-xyz.scm | 12 +++++++----- 1 file changed, 7 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 29834257cf..fb6470ef5f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14735,14 +14735,16 @@ (define-public python-future-fstrings (define-public python-typed-ast (package (name "python-typed-ast") - (version "1.3.5") + (version "1.4.0") (source (origin - (method url-fetch) - (uri (pypi-uri "typed-ast" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/python/typed_ast.git") + (commit version))) (sha256 - (base32 - "1m7pr6qpana3cvqwiw7mlvrgvmw27ch5mx1592572xhlki8g85ak")))) + (base32 "0l0hz809f7i356kmqkvfsaswiidb98j9hs9rrjnfawzqcbffzgyb")) + (file-name (git-file-name name version)))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From f0935460464d70d1f3b87dfd9ec8751b166fa679 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 19 Oct 2019 15:28:51 +0200 Subject: gnu: python-astroid: Update to 2.3.2. * gnu/packages/python-xyz.scm (python-astroid): Update to 2.3.2, [propagated-inputs]: add python-typed-ast. --- gnu/packages/python-xyz.scm | 5 +++-- 1 file changed, 3 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 fb6470ef5f..c8fbf9c98e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12538,18 +12538,19 @@ (define-public python2-larch (define-public python-astroid (package (name "python-astroid") - (version "2.1.0") + (version "2.3.2") (source (origin (method url-fetch) (uri (pypi-uri "astroid" version)) (sha256 (base32 - "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m")))) + "0crfhpblcy5a6nh694hc2073gw389f01yilamzqi34si2skgp8q9")))) (build-system python-build-system) (propagated-inputs `(("python-lazy-object-proxy" ,python-lazy-object-proxy) ("python-six" ,python-six) + ("python-typed-ast" ,python-typed-ast) ("python-wrapt" ,python-wrapt))) (native-inputs `(("python-dateutil" ,python-dateutil) -- cgit v1.2.3 From 741f98b3f1d66252ce0122aed9f800da6bdaa8f7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 19 Oct 2019 15:31:11 +0200 Subject: gnu: python2-astroid: Fix build. * gnu/packages/python-xyz.scm (python2-astroid)[propagated-inputs]: Remove python-typed-ast. --- 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 c8fbf9c98e..0c1479d411 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12617,7 +12617,8 @@ (define-public python2-astroid ,python2-backports-functools-lru-cache) ("python2-enum34" ,python2-enum34) ("python2-singledispatch" ,python2-singledispatch) - ,@(package-propagated-inputs base)))))) + ,@(alist-delete "python-typed-ast" + (package-propagated-inputs base))))))) (define-public python-isort (package -- cgit v1.2.3 From 1760c970639d898e3ddec4185119a9bda8b663a6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 19 Oct 2019 22:46:44 +0200 Subject: gnu: python-verboselogs: Fix build. * gnu/packages/python-xyz.scm (python-verboselogs)[arguments]: Do not run pylint plugin test that depend of an old version of astroid and also remove ..., [native-inputs]: ... python-astroid and python-pylint from here. --- gnu/packages/python-xyz.scm | 12 ++++++++++-- 1 file changed, 10 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 0c1479d411..e81a6b838a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -910,10 +910,18 @@ (define-public python-verboselogs (base32 "09z4d1jiasn7k1hs5af2ckmnrd0i1d1m04bhfjhv7z6svzfdwgg3")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Do not run pylint plugin test, as astroid is an old + ;; unsupported version. + (invoke "pytest" "-v" "-k" "not test_pylint_plugin" + "verboselogs/tests.py")))))) (native-inputs `(("python-mock" ,python-mock) - ("python-astroid" ,python-astroid) - ("python-pylint" ,python-pylint))) + ("python-pytest" ,python-pytest))) (home-page "https://verboselogs.readthedocs.io") (synopsis "Verbose logging level for Python's logging module") (description -- cgit v1.2.3