From eb82a95fc475d91c75ef97fdcabbd6f42d04464a Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Mon, 22 Nov 2021 04:31:53 -0500 Subject: gnu: Add python-orgparse. * gnu/packages/python-xyz.scm (python-orgparse): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fdbca24b6e7..34d4910194c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28039,6 +28039,33 @@ simple mock/record and a complete capture/replay framework.") interfaces.") (license license:bsd-3))) +(define-public python-orgparse + (package + (name "python-orgparse") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "orgparse" version)) + (sha256 + (base32 "14iv4pg3rma9560plg0w943x04mr2cmrssda43y2d1x9acrd2n71")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "orgparse/tests"))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/karlicoss/orgparse") + (synopsis "Emacs Org mode parser in Python") + (description + "This package is a Python module for reading Emacs Org mode files.") + (license license:bsd-3))) + (define-public python-sgmllib3k (package (name "python-sgmllib3k") -- cgit v1.3 From aab9e79fa4a09459e35561d69cc140b6142dcb49 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 25 Nov 2021 12:33:15 +0100 Subject: gnu: python-click-threading: Update to 0.5.0. * gnu/packages/python-xyz.scm (python-click-threading): Update to 0.5.0. Signed-off-by: Leo Famulari --- 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 34d4910194c..6de20d8af9a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12774,13 +12774,13 @@ the construction of PyQt/PySide stylesheets.") (define-public python-click-threading (package (name "python-click-threading") - (version "0.4.4") + (version "0.5.0") (source (origin (method url-fetch) (uri (pypi-uri "click-threading" version)) (sha256 (base32 - "1rsxc2fbkxlhwhlmxsdjzq3spn284l6rvjfcz9mbb17ibgdgmc5j")))) + "0f9lmxwcq0y9lb8w0whbni7gwy12gbv74h1igh85qn9aq0iydkxd")))) (build-system python-build-system) (propagated-inputs `(("python-click" ,python-click))) -- cgit v1.3 From 8182a3d1a970eb5cfec4b02167b1bff356076c4d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Nov 2021 08:43:05 +0100 Subject: gnu: pyzo: Update to 4.11.4. * gnu/packages/python-xyz.scm (pyzo): Update to 4.11.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 6de20d8af9a..1506072625c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25550,13 +25550,13 @@ dictionaries.") (define-public pyzo (package (name "pyzo") - (version "4.11.2") + (version "4.11.4") (source (origin (method url-fetch) (uri (pypi-uri "pyzo" version)) (sha256 - (base32 "1jk5f79lj09vnsdk9h01w21p9h49z2hhf8xhkx8471pjbg9vrlzr")))) + (base32 "18djnzx9wwlhxk0v2gcpmwnn3iw572n7gkdyh7ghh92yxck6qqkl")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.3 From 37aaee14a13e673d659decc418d9b3a164e6fc63 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Nov 2021 08:47:19 +0100 Subject: gnu: pyzo: Remove trailing #T. * gnu/packages/python-xyz.scm (pyzo)[arguments]: Remove #T from `fix-home-directory' phase. --- gnu/packages/python-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1506072625c..2e0135fab12 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25564,8 +25564,7 @@ dictionaries.") (add-before 'check 'fix-home-directory (lambda _ ;; Tests fail with "Permission denied: '/homeless-shelter'". - (setenv "HOME" "/tmp") - #t))) + (setenv "HOME" "/tmp")))) ;; Tests fail with "Uncaught Python exception: python: undefined ;; symbol: objc_getClass". #:tests? #f)) -- cgit v1.3 From e5a1d306785a394c45533cc03e6002a5c5202f47 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 24 Nov 2021 15:00:31 +0100 Subject: gnu: python-urwidtrees: Update to 1.0.3. * gnu/packages/python-xyz.scm (python-urwidtrees): Update to 1.0.3. [arguments]: Use setuptools. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 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 2e0135fab12..ffd39860d86 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8855,7 +8855,7 @@ distance between two or more sequences by many algorithms.") (define-public python-urwidtrees (package (name "python-urwidtrees") - (version "1.0.2") + (version "1.0.3") (source (origin (method git-fetch) @@ -8867,11 +8867,10 @@ distance between two or more sequences by many algorithms.") (file-name (git-file-name name version)) (sha256 (base32 - "1n1kpidvkdnsqyb82vlvk78gmly96kh8351lqxn2pzgwwns6fml2")))) + "1y1vysx7jg0vbrarlsykhf7nmr8fc6k1fva1q3i98xq2m30s6r68")))) (build-system python-build-system) (arguments - '(#:use-setuptools? #f - #:tests? #f)) ; no tests + '(#:tests? #f)) ; no tests (propagated-inputs `(("python-urwid" ,python-urwid))) (home-page "https://github.com/pazz/urwidtrees") (synopsis "Tree widgets for urwid") -- cgit v1.3 From 3b74b4149851bf5e4fb1a0541acccd8f49df5da8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 30 Nov 2021 20:49:10 +0100 Subject: gnu: Add python-polling2. * gnu/packages/python-xyz.scm (python-polling2): New variable. --- 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 ffd39860d86..9d202bf65ec 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2961,6 +2961,28 @@ existing ones.") ;; Tests don't work with python2. #:tests? #f))))) +(define-public python-polling2 + (package + (name "python-polling2") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "polling2" version)) + (sha256 + (base32 "0hp3238fv6k1qk43gv4jwnv1mwlkmx33akbj560b9nvsry1dmdwh")))) + (build-system python-build-system) + (arguments '(#:tests? #false)) ; no tests included + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/ddmee/polling2") + (synopsis "Polling utility with many configurable options") + (description "Polling2 is a utility used to wait for a function to return +a certain expected condition.") + (license license:expat))) + (define-public python-poyo (package (name "python-poyo") -- cgit v1.3 From 38d648655ba36bf4ca02082a256d7d884094f621 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Dec 2021 11:28:57 +0100 Subject: gnu: python-numpydoc: Update to 1.1.0. * gnu/packages/python-xyz.scm (python-numpydoc): Update to 1.1.0. [arguments]: Override 'check phase to run tests. [native-inputs]: Remove python-nose; add python-matplotlib, python-pytest, and python-pytest-cov. --- gnu/packages/python-xyz.scm | 18 +++++++++++++++--- 1 file changed, 15 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 9d202bf65ec..6b42d15c3da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6050,19 +6050,31 @@ that client code uses to construct the grammar directly in Python code.") (define-public python-numpydoc (package (name "python-numpydoc") - (version "0.8.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (pypi-uri "numpydoc" version)) (sha256 (base32 - "1zazxg3m8j4fksv3f7v7vpf4bj9qb1vj3r326am0vdip141vzx31")))) + "13j4fvy2p7lc8sn00sxvs0jb19vicaznfgx4cphv9jgxgz5xcvy3")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v" "numpydoc/tests" + ;; TODO: unclear why these fail. + "-k" "not test_MyClass and not test_my_function"))))))) (propagated-inputs `(("python-sphinx" ,python-sphinx))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-matplotlib" ,python-matplotlib) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) (home-page "https://pypi.org/project/numpydoc/") (synopsis "Numpy's Sphinx extensions") -- cgit v1.3 From 124d76c5c27fd92dd8c1f9cb9cfe241eaf2498ea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 1 Dec 2021 11:28:39 +0100 Subject: gnu: python2-numpydoc: Update to 0.9.1. * gnu/packages/python-xyz.scm (python2-numpydoc): Update to 0.9.1; do not inherit from Python 3 variant. --- gnu/packages/python-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6b42d15c3da..3fe6a06db5c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6087,6 +6087,15 @@ that client code uses to construct the grammar directly in Python code.") (let ((base (package-with-python2 (strip-python2-variant python-numpydoc)))) (package/inherit base + ;; This is the last version to support Python 2 + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "numpydoc" version)) + (sha256 + (base32 + "09x6l1a4dcvj7001bvcmcayg1nwqwhaxlwbp6kzj9qrk57lqx3z0")))) (propagated-inputs `(("python2-jinja2" ,python2-jinja2) ,@(package-propagated-inputs base)))))) -- cgit v1.3 From a8d62aea2240d5651c857c1145720b4e2cf275ed Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 20 Nov 2021 00:41:22 +0100 Subject: gnu: Add python-dotenv. * gnu/packages/python-xyz.scm (python-dotenv): New variable. Signed-off-by: Efraim Flashner --- 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 3fe6a06db5c..bbe5aed40e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27625,6 +27625,29 @@ cons cells in Python.") systems in Python.") (license license:bsd-3))) +(define-public python-dotenv + (package + (name "python-dotenv") + (version "0.19.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-dotenv" version)) + (sha256 + (base32 "0pv5ygpr6syc6zkw21in4ysqs3k7qaxk9m1g5pzlafwm3silkpm5")))) + (build-system python-build-system) + (propagated-inputs + `(("python-click" ,python-click))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-sh" ,python-sh))) + (home-page "https://github.com/theskumar/python-dotenv") + (synopsis "Setup environment variables according to .env files") + (description + "This package provides the @code{python-dotenv} Python module to read +key-value pairs from a @code{.env} file and set them as environment variables.") + (license license:bsd-3))) (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") -- cgit v1.3 From 1e8ad167f6b35da7faffa5b29079d627ac159165 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Dec 2021 13:16:26 +0200 Subject: gnu: python-dotenv: Run test suite. * gnu/packages/python-xyz.scm (python-dotenv)[arguments]: Add custom 'check phase. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bbe5aed40e6..186749b96ef 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27636,6 +27636,18 @@ systems in Python.") (sha256 (base32 "0pv5ygpr6syc6zkw21in4ysqs3k7qaxk9m1g5pzlafwm3silkpm5")))) (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (setenv "PATH" (string-append (getenv "PATH") ":" + (assoc-ref outputs "out") "/bin")) + ;; Skip the ipython tests. + (delete-file "tests/test_ipython.py") + (invoke "python" "-m" "pytest"))))))) (propagated-inputs `(("python-click" ,python-click))) (native-inputs -- cgit v1.3 From f8b12158744d3813805d1dff3ae24e1ad93010e2 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 20 Nov 2021 00:41:24 +0100 Subject: gnu: Add python-dotenv-0.13.0. * gnu/packages/python-xyz.scm (python-dotenv-0.13.0): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 186749b96ef..319313bab00 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27661,6 +27661,18 @@ systems in Python.") key-value pairs from a @code{.env} file and set them as environment variables.") (license license:bsd-3))) +(define-public python-dotenv-0.13.0 + (package (inherit python-dotenv) + (name "python-dotenv") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-dotenv" version)) + (sha256 + (base32 + "0x5dagmfn31phrbxlwacw3s4w5vibv8fxqc62nqcdvdhjsy0k69v")))))) + (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") (revision "1")) -- cgit v1.3 From ce6ea46d409c0ef56f18c02a862ea48504392489 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 20 Nov 2021 00:41:25 +0100 Subject: gnu: Add dynaconf. * gnu/packages/python-xyz.scm (dynaconf): New variable. * gnu/packages/patches/dynaconf-Unvendor-dependencies.patch: New file. * local.mk (dist_patch_DATA): Register it. Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + gnu/packages/patches/dynaconf-unvendor-deps.patch | 179 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 74 ++++++++- 3 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/dynaconf-unvendor-deps.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index a5c0486c94c..d3949f36a42 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -995,6 +995,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dune-istl-2.7-fix-non-mpi-tests.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/dynaconf-unvendor-deps.patch \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ %D%/packages/patches/ecl-16-libffi.patch \ diff --git a/gnu/packages/patches/dynaconf-unvendor-deps.patch b/gnu/packages/patches/dynaconf-unvendor-deps.patch new file mode 100644 index 00000000000..550e3113636 --- /dev/null +++ b/gnu/packages/patches/dynaconf-unvendor-deps.patch @@ -0,0 +1,179 @@ +From 3f7b48195500cbbbbecd3cac2f5308c64004479b Mon Sep 17 00:00:00 2001 +From: Giacomo Leidi +Date: Sun, 29 Aug 2021 23:39:27 +0200 +Subject: [PATCH] Use system site dependencies. + +Box was not unvendored because it appears to be heavily patched. +--- + dynaconf/cli.py | 4 ++-- + dynaconf/default_settings.py | 2 +- + dynaconf/loaders/env_loader.py | 2 +- + dynaconf/loaders/toml_loader.py | 2 +- + dynaconf/loaders/yaml_loader.py | 2 +- + dynaconf/utils/parse_conf.py | 2 +- + dynaconf/vendor/box/converters.py | 4 ++-- + dynaconf/vendor/box/from_file.py | 4 ++-- + dynaconf/vendor_src/box/converters.py | 4 ++-- + dynaconf/vendor_src/box/from_file.py | 4 ++-- + tests/test_cli.py | 2 +- + 11 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/dynaconf/cli.py b/dynaconf/cli.py +index 5bb8316..1341a95 100644 +--- a/dynaconf/cli.py ++++ b/dynaconf/cli.py +@@ -20,8 +20,8 @@ from dynaconf.utils.functional import empty + from dynaconf.utils.parse_conf import parse_conf_data + from dynaconf.validator import ValidationError + from dynaconf.validator import Validator +-from dynaconf.vendor import click +-from dynaconf.vendor import toml ++import click ++import toml + + + CWD = Path.cwd() +diff --git a/dynaconf/default_settings.py b/dynaconf/default_settings.py +index 66601b0..9605fc5 100644 +--- a/dynaconf/default_settings.py ++++ b/dynaconf/default_settings.py +@@ -8,7 +8,7 @@ from dynaconf.utils import upperfy + from dynaconf.utils import warn_deprecations + from dynaconf.utils.files import find_file + from dynaconf.utils.parse_conf import parse_conf_data +-from dynaconf.vendor.dotenv import load_dotenv ++from dotenv import load_dotenv + + + def try_renamed(key, value, older_key, current_key): +diff --git a/dynaconf/loaders/env_loader.py b/dynaconf/loaders/env_loader.py +index e7b13bd..b034c8a 100644 +--- a/dynaconf/loaders/env_loader.py ++++ b/dynaconf/loaders/env_loader.py +@@ -2,7 +2,7 @@ from os import environ + + from dynaconf.utils import upperfy + from dynaconf.utils.parse_conf import parse_conf_data +-from dynaconf.vendor.dotenv import cli as dotenv_cli ++from dotenv import cli as dotenv_cli + + + IDENTIFIER = "env" +diff --git a/dynaconf/loaders/toml_loader.py b/dynaconf/loaders/toml_loader.py +index 07b973f..d81d675 100644 +--- a/dynaconf/loaders/toml_loader.py ++++ b/dynaconf/loaders/toml_loader.py +@@ -5,7 +5,7 @@ from dynaconf import default_settings + from dynaconf.constants import TOML_EXTENSIONS + from dynaconf.loaders.base import BaseLoader + from dynaconf.utils import object_merge +-from dynaconf.vendor import toml ++import toml + + + def load(obj, env=None, silent=True, key=None, filename=None): +diff --git a/dynaconf/loaders/yaml_loader.py b/dynaconf/loaders/yaml_loader.py +index 33c6532..3ef419a 100644 +--- a/dynaconf/loaders/yaml_loader.py ++++ b/dynaconf/loaders/yaml_loader.py +@@ -7,7 +7,7 @@ from dynaconf.constants import YAML_EXTENSIONS + from dynaconf.loaders.base import BaseLoader + from dynaconf.utils import object_merge + from dynaconf.utils.parse_conf import try_to_encode +-from dynaconf.vendor.ruamel import yaml ++from ruamel import yaml + + # Add support for Dynaconf Lazy values to YAML dumper + yaml.SafeDumper.yaml_representers[ +diff --git a/dynaconf/utils/parse_conf.py b/dynaconf/utils/parse_conf.py +index c42b07a..01ccdae 100644 +--- a/dynaconf/utils/parse_conf.py ++++ b/dynaconf/utils/parse_conf.py +@@ -9,7 +9,7 @@ from dynaconf.utils import isnamedtupleinstance + from dynaconf.utils import multi_replace + from dynaconf.utils import recursively_evaluate_lazy_format + from dynaconf.utils.boxing import DynaBox +-from dynaconf.vendor import toml ++import toml + + try: + from jinja2 import Environment +diff --git a/dynaconf/vendor/box/converters.py b/dynaconf/vendor/box/converters.py +index 93cdcfb..e34c7dc 100644 +--- a/dynaconf/vendor/box/converters.py ++++ b/dynaconf/vendor/box/converters.py +@@ -7,9 +7,9 @@ _B='utf-8' + _A=None + import csv,json,sys,warnings + from pathlib import Path +-import dynaconf.vendor.ruamel.yaml as yaml ++import ruamel.yaml as yaml + from dynaconf.vendor.box.exceptions import BoxError,BoxWarning +-from dynaconf.vendor import toml ++import toml + BOX_PARAMETERS='default_box','default_box_attr','conversion_box','frozen_box','camel_killer_box','box_safe_prefix','box_duplicates','ordered_box','default_box_none_transform','box_dots','modify_tuples_box','box_intact_types','box_recast' + def _exists(filename,create=_E): + A=filename;B=Path(A) +diff --git a/dynaconf/vendor/box/from_file.py b/dynaconf/vendor/box/from_file.py +index daa1137..d75940b 100644 +--- a/dynaconf/vendor/box/from_file.py ++++ b/dynaconf/vendor/box/from_file.py +@@ -1,8 +1,8 @@ + from json import JSONDecodeError + from pathlib import Path + from typing import Union +-from dynaconf.vendor.toml import TomlDecodeError +-from dynaconf.vendor.ruamel.yaml import YAMLError ++from toml import TomlDecodeError ++from ruamel.yaml import YAMLError + from .exceptions import BoxError + from .box import Box + from .box_list import BoxList +diff --git a/dynaconf/vendor_src/box/converters.py b/dynaconf/vendor_src/box/converters.py +index c9a2293..ae42bf6 100644 +--- a/dynaconf/vendor_src/box/converters.py ++++ b/dynaconf/vendor_src/box/converters.py +@@ -9,9 +9,9 @@ import sys + import warnings + from pathlib import Path + +-import dynaconf.vendor.ruamel.yaml as yaml ++import ruamel.yaml as yaml + from dynaconf.vendor.box.exceptions import BoxError, BoxWarning +-from dynaconf.vendor import toml ++import toml + + + BOX_PARAMETERS = ('default_box', 'default_box_attr', 'conversion_box', +diff --git a/dynaconf/vendor_src/box/from_file.py b/dynaconf/vendor_src/box/from_file.py +index 2e2a6ad..3f76819 100644 +--- a/dynaconf/vendor_src/box/from_file.py ++++ b/dynaconf/vendor_src/box/from_file.py +@@ -3,8 +3,8 @@ + from json import JSONDecodeError + from pathlib import Path + from typing import Union +-from dynaconf.vendor.toml import TomlDecodeError +-from dynaconf.vendor.ruamel.yaml import YAMLError ++from toml import TomlDecodeError ++from ruamel.yaml import YAMLError + + + from .exceptions import BoxError +diff --git a/tests/test_cli.py b/tests/test_cli.py +index 6693701..df44409 100644 +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -11,7 +11,7 @@ from dynaconf.cli import main + from dynaconf.cli import read_file_in_root_directory + from dynaconf.cli import WRITERS + from dynaconf.utils.files import read_file +-from dynaconf.vendor.click.testing import CliRunner ++from click.testing import CliRunner + + + runner = CliRunner() + +base-commit: ebf7b17cffd5e08b212948bd8036d580718d5bf8 +-- +2.32.0 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 319313bab00..fa6a1e333c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -63,7 +63,7 @@ ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019, 2020, 2021 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald -;;; Copyright © 2019, 2020 Giacomo Leidi +;;; Copyright © 2019, 2020, 2021 Giacomo Leidi ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019, 2020, 2021 Tanguy Le Carrour ;;; Copyright © 2019, 2021 Mădălin Ionel Patrașcu @@ -142,6 +142,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages django) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) #:use-module (gnu packages enchant) @@ -28178,6 +28179,77 @@ It is used to parse text files formatted in @acronym{SGML,Standard Generalized Mark-up Language}.") (license license:bsd-3))) +(define-public dynaconf + (package + (name "dynaconf") + (version "3.1.7") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/rochacbruno/dynaconf") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pjyjsdzairpn5vq8nzddhxwxmr18grn272nj31wcy2ipwdl3c3h")) + (patches (search-patches "dynaconf-unvendor-deps.patch")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove vendored dependencies + (let ((unvendor '("click" "dotenv" "ruamel" "toml"))) + (with-directory-excursion "dynaconf/vendor" + (for-each delete-file-recursively unvendor)) + (with-directory-excursion "dynaconf/vendor_src" + (for-each delete-file-recursively unvendor))))))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? outputs #:allow-other-keys) + (when tests? + (setenv "PATH" + (string-append (assoc-ref outputs "out") "/bin:" + (getenv "PATH"))) + ;; These tests depend on hvac and a live Vault process. + (delete-file "tests/test_vault.py") + (invoke "make" "test_only"))))))) + (propagated-inputs + `(("python-click" ,python-click) + ("python-configobj" ,python-configobj) + ("python-dotenv" ,python-dotenv-0.13.0) + ("python-ruamel.yaml" ,python-ruamel.yaml) + ("python-toml" ,python-toml))) + (native-inputs + `(("python-django" ,python-django) + ("python-flask" ,python-flask) + ("python-pytest" ,python-pytest-6) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "https://www.dynaconf.com/") + (synopsis "The dynamic configurator for your Python project") + (description + "This package provides @code{dynaconf} the dynamic configurator manager for +your Python project. It provides features such as: + +@itemize +@item Inspired by the @url{https://12factor.net/config, 12-factor application guide}; +@item Settings management (default values, validation, parsing, templating); +@item Protection of sensitive information (passwords/tokens); +@item Multiple file formats @code{toml|yaml|json|ini|py} and also customizable +loaders; +@item Full support for environment variables to override existing settings +(dotenv support included); +@item Optional layered system for multiple environments @code{[default, +development, testing, production]}; +@item Built-in support for Hashicorp Vault and Redis as settings and secrets storage; +@item Built-in extensions for Django and Flask web frameworks; +@item CLI for common operations such as @code{init, list, write, validate, export}. +@end itemize") + (license license:expat))) + (define-public python-iwlib (package (name "python-iwlib") -- cgit v1.3 From 5ca0042116c05f5d0c3c34211d64cef61bd9c8ff Mon Sep 17 00:00:00 2001 From: ZmnSCPxj via Guix-patches via Date: Wed, 1 Dec 2021 05:50:24 +0000 Subject: gnu: Add python-mrkd. * gnu/packages/python-xyz.scm (python-mrkd): New variable. Signed-off-by: Nicolas Goaziou --- 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 fa6a1e333c4..7b70c974849 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -111,6 +111,7 @@ ;;; Copyright © 2021 Felix Gruber ;;; Copyright © 2021 Sébastien Lerique ;;; Copyright © 2021 Raphaël Mélotte +;;; Copyright © 2021 ZmnSCPxj ;;; ;;; This file is part of GNU Guix. ;;; @@ -535,6 +536,28 @@ It indexes documents and provides a search interface for retrieving documents that best match text queries.") (license license:expat))) +(define-public python-mrkd + (package + (name "python-mrkd") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mrkd" version)) + (sha256 + (base32 "1bvaqbna1ihb4y2mv9pmvqcq3r9j6lwbbii99dani8lxx4dqqvs5")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jinja2" ,python-jinja2) + ("python-mistune" ,python-mistune) + ("python-pygments" ,python-pygments))) + (home-page "https://pypi.org/project/mrkd/") + (synopsis "Python Markdown implementation") + (description + "@code{mrkd} writes man pages using Markdown, and convert them to Roff or +HTML") + (license license:bsd-3))) + (define-public python-mkdocs (package (name "python-mkdocs") -- cgit v1.3 From c56e9033f55aebe02a61c012a038644c6eb0c007 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 28 Nov 2021 10:08:50 -0500 Subject: gnu: python-parso: Update to 0.8.2. * gnu/packages/python-xyz.scm (python-parso): Update to 0.8.2. Signed-off-by: Nicolas Goaziou --- 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 7b70c974849..da6e3dcf8af 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21387,13 +21387,13 @@ time-based (TOTP) passwords.") (define-public python-parso (package (name "python-parso") - (version "0.7.1") + (version "0.8.2") (source (origin (method url-fetch) (uri (pypi-uri "parso" version)) (sha256 - (base32 "1f9fc99mjx0h2ad4mgsid728nnmw58hvnq3411g8ljlr9dr49fna")))) + (base32 "161k8771m7w60qakyvrwf9q62lvakmix7mpfylpy7713qs939f0j")))) (native-inputs `(("python-pytest" ,python-pytest))) (build-system python-build-system) -- cgit v1.3 From 6b29c3c735203e44a69c6f98f78d1ff52f42e411 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 28 Nov 2021 10:08:51 -0500 Subject: gnu: python2-jedi: Remove package. * gnu/packages/python-xyz.scm (python2-jedi): Delete variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index da6e3dcf8af..047e38793ba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16349,9 +16349,6 @@ Jedi understands docstrings and you can use Jedi autocompletion in your REPL as well.") (license license:expat))) -(define-public python2-jedi - (package-with-python2 python-jedi)) - (define-public ptpython (package (name "ptpython") -- cgit v1.3 From 46e030764d8a227f2eb82ce9cd662f7749024bd0 Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 1 Dec 2021 17:12:31 +0100 Subject: gnu: python-jedi: Update to 0.18.1. * gnu/packages/python-xyz.scm (python-jedi): Update to 0.18.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 10 ++++++---- 1 file changed, 6 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 047e38793ba..d9f366f012d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16316,13 +16316,13 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.17.2") + (version "0.18.1") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) (sha256 - (base32 "080xyf97ifabdz7jp8clg00b8zv5g33fva1fb2xf80q6fndpvvc6")))) + (base32 "1as9v6kv49j11al2mzjh72dd5mxxnfcjv0z5dbmwi6aalqk7c4vl")))) (build-system python-build-system) (arguments `(#:phases @@ -16334,8 +16334,10 @@ characters, mouse support, and auto suggestions.") (invoke "python" "-m" "pytest" "-vv")) #t))))) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-docopt" ,python-docopt))) + `(("python-docopt" ,python-docopt) + ("python-colorama" ,python-colorama) + ("python-django" ,python-django-2.2) + ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-parso" ,python-parso))) (home-page "https://github.com/davidhalter/jedi") -- cgit v1.3 From 869c7d6703b340ecfa4a3f07db78e93d4b0d30a5 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 28 Nov 2021 10:08:53 -0500 Subject: gnu: Add python-lsp-jsonrpc. * gnu/packages/python-xyz.scm (python-jsonrpc-server): Delete variable. * gnu/packages/python-xyz.scm (python-lsp-jsonrpc): New variable. Removes deprecated python-jsonrpc-server package and adds maintained fork. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 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 d9f366f012d..e1fbc18fdf2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4916,24 +4916,24 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (define-public python2-feedgenerator (package-with-python2 python-feedgenerator)) -(define-public python-jsonrpc-server +(define-public python-lsp-jsonrpc (package - (name "python-jsonrpc-server") - (version "0.4.0") + (name "python-lsp-jsonrpc") + (version "1.0.0") (source (origin (method url-fetch) - (uri (pypi-uri "python-jsonrpc-server" version)) + (uri (pypi-uri "python-lsp-jsonrpc" version)) (sha256 (base32 - "1585ybn3djvx5r5zbxkzlhz2wb1d47y4wrfwaxdyq0gi87jl7ib2")))) + "1gb0fsamxndhplx25v8m0b3k7aknzy454fpa0qsqsqnv6c3igv3v")))) (build-system python-build-system) - (propagated-inputs + (native-inputs `(("python-mock" ,python-mock) - ("python-pytest" ,python-pytest) - ("python-ujson" ,python-ujson))) - (home-page - "https://github.com/palantir/python-jsonrpc-server") + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-ujson" ,python-ujson))) + (home-page "https://github.com/python-lsp/python-lsp-jsonrpc") (synopsis "JSON RPC 2.0 server library") (description "This package provides a JSON RPC 2.0 server library for Python.") -- cgit v1.3 From 0c3acb247a73e53ffd3752657bfca27e84920020 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 28 Nov 2021 10:08:54 -0500 Subject: gnu: python-lsp-jsonrpc: Add deprecated alias. * gnu/packages/python-xyz.scm (python-jsonrpc-server): New variable. Add deprecated alias for package removed in the parent commit. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e1fbc18fdf2..96fdd15fbac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4939,6 +4939,9 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") "This package provides a JSON RPC 2.0 server library for Python.") (license license:expat))) +(define-public python-jsonrpc-server + (deprecated-package "python-jsonrpc-server" python-lsp-jsonrpc)) + (define-public python-pydantic (package (name "python-pydantic") -- cgit v1.3 From 7907ddbc3af325c16ea40877d7e15aef00325a0d Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 28 Nov 2021 10:08:55 -0500 Subject: gnu: Add python-lsp-server. * gnu/packages/python-xyz.scm (python-language-server): Delete variable. * gnu/packages/python-xyz.scm (python-lsp-server): New variable. Removes deprecated python-language-server package and adds maintained fork. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 96fdd15fbac..afd875212c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5017,29 +5017,23 @@ errors when data is invalid.") Server (PLS).") (license license:expat))) -(define-public python-language-server +(define-public python-lsp-server (package - (name "python-language-server") - (version "0.36.2") + (name "python-lsp-server") + (version "1.3.1") (source (origin (method url-fetch) - (uri (pypi-uri "python-language-server" version)) + (uri (pypi-uri "python-lsp-server" version)) (sha256 (base32 - "1c0pnk2aibfhfaanrs0a5gkabkvz81gj20z7r0152b7fcx5ci14r")))) + "15075a5irjxh55wcdf25hllz9c42byxc4770cmwgb480k1dm8scq")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'relax-deps - (lambda _ - (substitute* "setup.py" (("pycodestyle>=2.6.0,<2.7.0") - "pycodestyle")) - (substitute* "setup.py" (("pyflakes>=2.2.0,<2.3.0") "pyflakes")) - #t)) (add-before 'check 'set-HOME - (lambda _ (setenv "HOME" "/tmp") #t)) + (lambda _ (setenv "HOME" "/tmp"))) (replace 'check (lambda _ ;; Disable failing test. @@ -5052,7 +5046,7 @@ Server (PLS).") ("python-flake8" ,python-flake8) ("python-future" ,python-future) ("python-jedi" ,python-jedi) - ("python-jsonrpc-server" ,python-jsonrpc-server) + ("python-lsp-jsonrpc" ,python-lsp-jsonrpc) ("python-pluggy" ,python-pluggy) ("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes) @@ -5073,10 +5067,10 @@ Server (PLS).") (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.") +"The Python Language Server @command{pylsp} 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))) (define-public python-pathspec -- cgit v1.3 From e7ead4238350e596791d8f335aa76b79d513b425 Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Sun, 28 Nov 2021 10:08:56 -0500 Subject: gnu: python-language-server: Add deprecated alias. * gnu/packages/python-xyz.scm (python-language-server): New variable. Add deprecated alias for package removed in the parent commit. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afd875212c6..3f4396f1744 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5073,6 +5073,9 @@ This tool is used in text editing environments to provide a complete and integrated feature-set for programming Python effectively.") (license license:expat))) +(define-public python-language-server + (deprecated-package "python-language-server" python-lsp-server)) + (define-public python-pathspec (package (name "python-pathspec") -- cgit v1.3 From 5ff34d596db98ad168f606dac6a6330faa7a52e8 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 31 Oct 2021 21:49:27 +0000 Subject: gnu: Add python-codespell. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-codespell): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3f4396f1744..0de304e100a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14476,6 +14476,53 @@ checking library.") ,python2-backport-ssl-match-hostname) ,@(package-propagated-inputs whoosh)))))) +(define-public python-codespell + (package + (name "python-codespell") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "codespell" version)) + (sha256 + (base32 "1r9y714cz8m894rxp7pyvicr1lw2iid24vz6fxbl5wzy8ibgxlqr")))) + (build-system python-build-system) + (inputs + `(("python-chardet" ,python-chardet))) + (native-inputs + `(("python-check-manifest" ,python-check-manifest) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-dependency" ,python-pytest-dependency))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key outputs tests? #:allow-other-keys) + (when tests? + ;; Make installed executable available for running the tests. + (setenv "PATH" + (string-append (assoc-ref outputs "out") "/bin" + ":" (getenv "PATH"))) + (invoke "pytest" "-vv"))))))) + (home-page "https://github.com/codespell-project/codespell/") + (synopsis "Spellchecker for code") + (description "Codespell fixes common misspellings in text files. +It's designed primarily for checking misspelled words in source code, +but it can be used with other files as well. It does not check for word +membership in a complete dictionary, but instead looks for a set of +common misspellings. Therefore it should catch errors like \"adn\", but +it will not catch \"adnasdfasdf\". This also means it shouldn't +generate false-positives when you use a niche term it doesn't know +about.") + (license + (list + ; for codespell and codespell_lib + license:gpl2 + ; for dictionary*.txt + license:cc-by-sa3.0)))) + (define-public python-pathlib (package (name "python-pathlib") -- cgit v1.3 From 508200d66acb5f6d38a53e787f78d7ae388b8083 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Wed, 1 Dec 2021 16:47:07 +0100 Subject: gnu: python-daemon: Update to 2.3.0. * gnu/packages/python-xyz.scm (python-daemon): Update to 2.3.0. [native-inputs]: Add python-coverage and python-twine. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 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 0de304e100a..f5ff039d241 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4149,14 +4149,14 @@ logging and tracing of the execution.") (define-public python-daemon (package (name "python-daemon") - (version "2.2.3") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "python-daemon" version)) (sha256 (base32 - "09fcjdjzk9ywmpnrj62iyxqgcygzdafsz41qlrk2dknzbagcmzmg")))) + "1bxfn2bq56sd4w0nm9mqy8y0905m7fc8vmhnjxlrf49vcbqr7adx")))) (build-system python-build-system) (arguments `(#:phases @@ -4171,9 +4171,11 @@ logging and tracing of the execution.") (propagated-inputs `(("python-lockfile" ,python-lockfile))) (native-inputs - `(("python-unittest2" ,python-unittest2) + `(("python-coverage" ,python-coverage) + ("python-unittest2" ,python-unittest2) ("python-testtools" ,python-testtools) ("python-testscenarios" ,python-testscenarios) + ("python-twine" ,python-twine) ("python-mock" ,python-mock) ("python-docutils" ,python-docutils))) (home-page "https://pagure.io/python-daemon/") -- cgit v1.3 From 5723503f9f348af008fff7d1f59ff0741fa6f799 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Dec 2021 13:32:09 +0100 Subject: gnu: python-ipython: Remove trailing #T. * gnu/packages/python-xyz.scm (python-ipython)[arguments]: Remove trailing #T from build phases. --- 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 f5ff039d241..eb2b8a36ed1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8697,8 +8697,7 @@ callback signature using a prototype function.") (substitute* "IPython/sphinxext/ipython_directive.py" ((".*import datetime") "") ((".*datetime.datetime.now\\(\\)") "") - (("%timeit") "# %timeit")) - #t)) + (("%timeit") "# %timeit")))) ;; Tests can only be run after the library has been installed and not ;; within the source directory. (delete 'check) @@ -8712,8 +8711,7 @@ callback signature using a prototype function.") ;; We only test the core because one of the other tests ;; tries to import ipykernel. (invoke "python" "IPython/testing/iptest.py" - "-v" "IPython/core/tests")) - #t))) + "-v" "IPython/core/tests"))))) (add-before 'check 'fix-tests (lambda* (#:key inputs #:allow-other-keys) (substitute* "./IPython/utils/_process_posix.py" @@ -8725,8 +8723,7 @@ callback signature using a prototype function.") ;; (which depends on ipython). (delete-file "IPython/core/tests/test_display.py") ;; AttributeError: module 'IPython.core' has no attribute 'formatters' - (delete-file "IPython/core/tests/test_interactiveshell.py") - #t))))) + (delete-file "IPython/core/tests/test_interactiveshell.py")))))) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") (description -- cgit v1.3 From 46b73fd22d40f8e4c035b32a061ebe5c02b17c41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Dec 2021 13:32:29 +0100 Subject: gnu: python-ipython: Update to 7.20.0. * gnu/packages/python-xyz.scm (python-ipython): Update to 7.20.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 eb2b8a36ed1..18a9b775e73 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8654,13 +8654,13 @@ callback signature using a prototype function.") (define-public python-ipython (package (name "python-ipython") - (version "7.9.0") + (version "7.20.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "103jkw18z7fnwdal1mdbijjxi1fndzn31g887lmj7ddpf2r07lyz")))) + (base32 "17pzzyfh6z7il1j49fb32glad04pqppqjsymj67gb30ah80ay8qr")))) (build-system python-build-system) (propagated-inputs `(("python-backcall" ,python-backcall) -- cgit v1.3 From 1f5c1bc024874b697e4251e1410919b705a86eb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Dec 2021 18:56:29 +0100 Subject: gnu: python2-decorator: Downgrade to 4.3.0 * gnu/packages/python-xyz.scm (python2-decorator): Keep at 4.3.0. (python-decorator)[properties]: Add python2-variant. --- gnu/packages/python-xyz.scm | 15 +++++++++++++-- 1 file changed, 13 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 18a9b775e73..c607aff3d31 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7633,10 +7633,21 @@ PNG, PostScript, PDF, and SVG file output.") for the average programmer, and to popularize decorators usage giving examples of useful decorators, such as memoize, tracing, redirecting_stdout, locked, etc. The core of this module is a decorator factory.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-decorator)))))) +;; Version 5 does not support Python 2 (define-public python2-decorator - (package-with-python2 python-decorator)) + (package + (inherit (package-with-python2 + (strip-python2-variant python-decorator))) + (version "4.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "decorator" version)) + (sha256 + (base32 "0308djallnh00v112y5b7nadl657ysmkp6vc8xn51d6yzc9zm7n3")))))) (define-public python-drmaa (package -- cgit v1.3 From 66a2d3830cb6f8cd911dc3847b9ca82b5fddf62e Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 5 Dec 2021 12:18:24 +0100 Subject: gnu: Add pudb. * gnu/packages/python-xyz.scm (pudb): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c607aff3d31..81b99e1d2e3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28329,6 +28329,45 @@ development, testing, production]}; @end itemize") (license license:expat))) +(define-public pudb + (package + (name "pudb") + (version "2021.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pudb" version)) + (sha256 + (base32 "0p16pvzfa3w02ybg3n0iy5rs23z4rz4a42lb8wh3mcq62y9ik2w7")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-read-only-home + (lambda _ + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest"))))))) + (native-inputs + `(("python-numpy" ,python-numpy) + ("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock))) + (propagated-inputs + `(("python-jedi" ,python-jedi) + ("python-pygments" ,python-pygments) + ("python-urwid" ,python-urwid) + ("python-urwid-readline" ,python-urwid-readline))) + (home-page "https://documen.tician.de/pudb/") + (synopsis "Console-based Python debugger") + (description + "@command{pudb} is a full-screen, console-based Python debugger providing +all the niceties of modern GUI-based debuggers in a more lightweight and +keyboard-friendly package.") + (license license:expat))) + (define-public python-iwlib (package (name "python-iwlib") -- cgit v1.3