diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/check.scm | 48 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 31 | ||||
| -rw-r--r-- | gnu/packages/jupyter.scm | 27 | ||||
| -rw-r--r-- | gnu/packages/openstack.scm | 44 | ||||
| -rw-r--r-- | gnu/packages/patches/dynaconf-unvendor-deps.patch | 169 | ||||
| -rw-r--r-- | gnu/packages/patches/python-mox3-python3.6-compat.patch | 43 | ||||
| -rw-r--r-- | gnu/packages/python-science.scm | 59 | ||||
| -rw-r--r-- | gnu/packages/python-web.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 143 |
9 files changed, 170 insertions, 406 deletions
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fa7412412a..2451fd9d04 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -3932,28 +3932,34 @@ helpers for writing tests.") (define-public subunit (package (name "subunit") - (version "1.4.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/testing-cabal/subunit") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16n1zxwnmhb7vzixngvmm5zzk4q5jaqqjwyr6pr6w0ys60b7xja3")))) + (version "1.4.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/testing-cabal/subunit") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fcqxh4cwhn9yz2z1zszzvgc554gai5b7c59w45a4cg9y9p30h8d")))) (build-system gnu-build-system) - (native-inputs (list autoconf - automake - check - cppunit - libtool - pkg-config - python-fixtures - python-hypothesis - python-testscenarios)) - (inputs (list perl python)) - (propagated-inputs (list python-testtools)) + (native-inputs + (list autoconf + automake + check + cppunit + libtool + pkg-config + python-fixtures + python-hypothesis + python-testscenarios)) + (inputs + (list perl + python)) + (propagated-inputs + (list python-iso8601 + python-pygobject + python-testtools)) (home-page "https://github.com/testing-cabal/subunit") (synopsis "Test reporting and control protocol") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 757e194889..002bbe17fe 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2116,28 +2116,19 @@ printing and other features typical of a source code editor.") (define-public python-pycairo (package (name "python-pycairo") - (version "1.26.0") + (version "1.28.0") (source (origin - (method url-fetch) - ;; TODO: Try to build from git checkout instead GitHub release tarball. - (uri (string-append "https://github.com/pygobject/pycairo/releases/download/v" - version "/pycairo-" version ".tar.gz")) - (sha256 - (base32 - "1sybz43sj4ynjahlkidrcdpdrq8yi1avkndc2hgb5pgvfjld1p9d")))) - (build-system pyproject-build-system) - (arguments - (list - ;; XXX: Project provides Meson build as well which may simplify the - ;; packaging. - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'build-extensions - (lambda _ - (invoke "python" "setup.py" "build_ext" "--inplace")))))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pygobject/pycairo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k0mm3kx0rsz07v7a4ijrgjnxigr9in1zcsij8nlg8aszxi7a09q")))) + (build-system meson-build-system) (native-inputs - (list pkg-config python-pytest python-setuptools)) + (list pkg-config python python-pytest python-setuptools)) (propagated-inputs ;pycairo.pc references cairo (list cairo)) (home-page "https://cairographics.org/pycairo/") @@ -2148,8 +2139,6 @@ printing and other features typical of a source code editor.") '((upstream-name . "pycairo"))) (license license:lgpl3+))) -;; Pycairo no longer supports Python 2 since version 1.19.0, so we stick - (define-public perl-cairo (package (name "perl-cairo") diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index dbbd319940..cebf4b8635 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -361,26 +361,33 @@ to Jupyter Server for their Python Web application backend.") (define-public python-jupyter-lsp (package (name "python-jupyter-lsp") - (version "2.2.5") + (version "2.3.0") (source (origin (method url-fetch) - (uri (pypi-uri "jupyter-lsp" version)) + (uri (pypi-uri "jupyter_lsp" version)) (sha256 - (base32 "00ahai7wp0m98glpqsrd1bymcllzkb8irvskzl4zhinlbah4fcbr")))) + (base32 "0i825shcn9d3f7a5zmvcj1p87s5wgpqn8cyphjvqz1nw769sb2j5")))) (build-system pyproject-build-system) (arguments (list + ;; tests: 63 passed, 8 skipped, 1 deselected, 20 warnings #:test-flags - ;; No R language server is present. - '(list "-k" "not test_r_package_detection") + ;; Network access is required or most tests failed. + #~(list "--ignore=jupyter_lsp/tests/test_listener.py" + "--ignore=jupyter_lsp/tests/test_session.py" + ;; No R language server is present. + "-k" "not test_r_package_detection") #:phases - '(modify-phases %standard-phases - ;; Some tests require a writable HOME - (add-before 'check 'set-HOME - (lambda _ (setenv "HOME" "/tmp")))))) + #~(modify-phases %standard-phases + ;; Some tests require a writable HOME + (add-before 'check 'set-HOME + (lambda _ (setenv "HOME" "/tmp")))))) + (native-inputs + (list python-pytest + python-pytest-asyncio + python-setuptools)) (propagated-inputs (list python-jupyter-server)) - (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://pypi.org/project/jupyter-lsp/") (synopsis "Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab server") (description diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index ac0ab05ca1..ee31ae9f08 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -174,50 +174,6 @@ manner.") guidelines}.") (license license:asl2.0))) -(define-public python-mox3 - (package - (name "python-mox3") - (version "0.24.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mox3" version)) - (patches (search-patches "python-mox3-python3.6-compat.patch")) - (sha256 - (base32 "0w58adwv7q9wzvmq9mlrk2asfk73myq9fpwy7mjkzsz3baa95zf5")))) - (build-system pyproject-build-system) - (propagated-inputs - (list python-fixtures python-pbr)) - (native-inputs - (list python-openstackdocstheme - python-setuptools - python-sphinx - python-subunit - python-testrepository - python-testtools - python-wheel)) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-for-python-3.11 - (lambda _ - ;; The getargspec function has been removed in python 3.11. - (substitute* "mox3/mox.py" - (("self\\._args, varargs, varkw, defaults = inspect\\.getargspec\\(method\\)") - "inspect_result = inspect.getfullargspec(method) - self._args = inspect_result.args - varargs = inspect_result.varargs - varkw = inspect_result.varkw - defaults = inspect_result.defaults"))))))) - (home-page "https://www.openstack.org/") - (synopsis "Mock object framework for Python") - (description - "Mox3 is an unofficial port of the @uref{https://code.google.com/p/pymox/, -Google mox framework} to Python 3. It was meant to be as compatible -with mox as possible, but small enhancements have been made.") - (license license:asl2.0))) - (define-public python-openstackdocstheme (package (name "python-openstackdocstheme") diff --git a/gnu/packages/patches/dynaconf-unvendor-deps.patch b/gnu/packages/patches/dynaconf-unvendor-deps.patch deleted file mode 100644 index f816264f4a..0000000000 --- a/gnu/packages/patches/dynaconf-unvendor-deps.patch +++ /dev/null @@ -1,169 +0,0 @@ -From d3252748b0f9036cb31f4697ebb5c6a494aceaca Mon Sep 17 00:00:00 2001 -From: Giacomo Leidi <goodoldpaul@autistici.org> -Date: Sun, 14 Jan 2024 12:05:49 +0100 -Subject: [PATCH] Use system site dependencies. - -* Box was not unvendored because it appears to be heavily patched. -* Tomllib seems to be a backport from Python 3.11, as such it wasn't unvendored. ---- - 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/inspect.py | 2 +- - dynaconf/utils/parse_conf.py | 2 +- - dynaconf/vendor/box/converters.py | 2 +- - dynaconf/vendor/box/from_file.py | 2 +- - tests/test_cli.py | 2 +- - tests/test_inspect.py | 2 +- - 11 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/dynaconf/cli.py b/dynaconf/cli.py -index c0fd489..5739e79 100644 ---- a/dynaconf/cli.py -+++ b/dynaconf/cli.py -@@ -24,8 +24,8 @@ from dynaconf.utils.parse_conf import parse_conf_data - from dynaconf.utils.parse_conf import unparse_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 - from dynaconf.vendor import tomllib - - -diff --git a/dynaconf/default_settings.py b/dynaconf/default_settings.py -index 7e8c222..526b01e 100644 ---- a/dynaconf/default_settings.py -+++ b/dynaconf/default_settings.py -@@ -11,7 +11,7 @@ from dynaconf.utils import warn_deprecations - from dynaconf.utils.files import find_file - from dynaconf.utils.parse_conf import boolean_fix - 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 a563b4e..91ac3ae 100644 ---- a/dynaconf/loaders/env_loader.py -+++ b/dynaconf/loaders/env_loader.py -@@ -11,7 +11,7 @@ from dynaconf.utils.parse_conf import parse_conf_data - - DOTENV_IMPORTED = False - with suppress(ImportError, FileNotFoundError): -- from dynaconf.vendor.dotenv import cli as dotenv_cli -+ from dotenv import cli as dotenv_cli - - DOTENV_IMPORTED = True - -diff --git a/dynaconf/loaders/toml_loader.py b/dynaconf/loaders/toml_loader.py -index 42db7b3..ba0188b 100644 ---- a/dynaconf/loaders/toml_loader.py -+++ b/dynaconf/loaders/toml_loader.py -@@ -7,7 +7,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 # Backwards compatibility with uiri/toml -+import toml # Backwards compatibility with uiri/toml - from dynaconf.vendor import tomllib # New tomllib stdlib on py3.11 - - -diff --git a/dynaconf/loaders/yaml_loader.py b/dynaconf/loaders/yaml_loader.py -index 5721681..ab628c2 100644 ---- a/dynaconf/loaders/yaml_loader.py -+++ b/dynaconf/loaders/yaml_loader.py -@@ -10,7 +10,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/inspect.py b/dynaconf/utils/inspect.py -index 21d724e..2933b8f 100644 ---- a/dynaconf/utils/inspect.py -+++ b/dynaconf/utils/inspect.py -@@ -18,7 +18,7 @@ from dynaconf.loaders.base import SourceMetadata - from dynaconf.utils.boxing import DynaBox - from dynaconf.utils.functional import empty - from dynaconf.vendor.box.box_list import BoxList --from dynaconf.vendor.ruamel.yaml import YAML -+from ruamel.yaml import YAML - - if TYPE_CHECKING: # pragma: no cover - from dynaconf.base import LazySettings, Settings -diff --git a/dynaconf/utils/parse_conf.py b/dynaconf/utils/parse_conf.py -index 882110e..a262864 100644 ---- a/dynaconf/utils/parse_conf.py -+++ b/dynaconf/utils/parse_conf.py -@@ -12,7 +12,7 @@ from dynaconf.utils import multi_replace - from dynaconf.utils import recursively_evaluate_lazy_format - from dynaconf.utils.boxing import DynaBox - from dynaconf.utils.functional import empty --from dynaconf.vendor import toml -+import toml - from dynaconf.vendor import tomllib - - try: -diff --git a/dynaconf/vendor/box/converters.py b/dynaconf/vendor/box/converters.py -index 08694fe..4e84930 100644 ---- a/dynaconf/vendor/box/converters.py -+++ b/dynaconf/vendor/box/converters.py -@@ -9,7 +9,7 @@ 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 tomllib as toml - -diff --git a/dynaconf/vendor/box/from_file.py b/dynaconf/vendor/box/from_file.py -index a82ac96..cd01f13 100644 ---- a/dynaconf/vendor/box/from_file.py -+++ b/dynaconf/vendor/box/from_file.py -@@ -4,7 +4,7 @@ from json import JSONDecodeError - from pathlib import Path - from typing import Union - from dynaconf.vendor.tomllib import TOMLDecodeError --from dynaconf.vendor.ruamel.yaml import YAMLError -+from ruamel.yaml import YAMLError - - - from .exceptions import BoxError -diff --git a/tests/test_cli.py b/tests/test_cli.py -index c679ae5..9df5f7f 100644 ---- a/tests/test_cli.py -+++ b/tests/test_cli.py -@@ -15,7 +15,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 - - settings = LazySettings(OPTION_FOR_TESTS=True, environments=True) - -diff --git a/tests/test_inspect.py b/tests/test_inspect.py -index 0819715..96638c1 100644 ---- a/tests/test_inspect.py -+++ b/tests/test_inspect.py -@@ -18,7 +18,7 @@ from dynaconf.utils.inspect import inspect_settings - from dynaconf.utils.inspect import KeyNotFoundError - from dynaconf.utils.inspect import OutputFormatError - from dynaconf.validator import Validator --from dynaconf.vendor.ruamel import yaml -+from ruamel import yaml - - - def create_file(filename: str, data: str) -> str: --- -2.41.0 - diff --git a/gnu/packages/patches/python-mox3-python3.6-compat.patch b/gnu/packages/patches/python-mox3-python3.6-compat.patch deleted file mode 100644 index 0426d07cf9..0000000000 --- a/gnu/packages/patches/python-mox3-python3.6-compat.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix regex so that it works with Python 3.6. - -See <https://docs.python.org/3/library/re.html#re.LOCALE>. - -Copied from upstream bug report: -https://bugs.launchpad.net/python-mox3/+bug/1665266 - -From 05064cdb6ea7a16450c6beae2b6f7c6074212a69 Mon Sep 17 00:00:00 2001 -From: Zac Medico <zmedico@gentoo.org> -Date: Thu, 16 Feb 2017 00:24:10 -0800 -Subject: [PATCH] RegexTest: python3.6 compatibility - -These fixes are backward-compatible with older python versions: - -* raw strings fix invalid escape sequences -* flags=8 fixes ValueError: cannot use LOCALE flag with a str pattern ---- - mox3/tests/test_mox.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mox3/tests/test_mox.py b/mox3/tests/test_mox.py -index 15ac565..3a1af17 100644 ---- a/mox3/tests/test_mox.py -+++ b/mox3/tests/test_mox.py -@@ -312,12 +312,12 @@ class RegexTest(testtools.TestCase): - def testReprWithoutFlags(self): - """repr should return the regular expression pattern.""" - self.assertTrue( -- repr(mox.Regex(r"a\s+b")) == "<regular expression 'a\s+b'>") -+ repr(mox.Regex(r"a\s+b")) == r"<regular expression 'a\s+b'>") - - def testReprWithFlags(self): - """repr should return the regular expression pattern and flags.""" -- self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) == -- "<regular expression 'a\s+b', flags=4>") -+ self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) == -+ r"<regular expression 'a\s+b', flags=8>") - - - class IsTest(testtools.TestCase): --- -2.10.2 - diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 40b3dd62de..61f75dd6b6 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1907,7 +1907,11 @@ between dataframe libraries. (sha256 (base32 "1lpgsagmgxzsas7g8yiv6wmyss8q57w92h70fn11rnpadsvx16xz")))) (build-system pyproject-build-system) - (arguments (list #:test-flags #~(list "-c" "/dev/null"))) ;avoid coverage + (arguments + (list + #:test-flags + #~(list "-c" "/dev/null" ;avoid coverage + "-k" "not test_iter_indices_matmul"))) ; flaky (native-inputs (list python-cython python-numpy @@ -5470,34 +5474,37 @@ data.") (license license:expat))) (define-public python-supersmoother - (package - (name "python-supersmoother") - (version "0.4") - (source - (origin - (method git-fetch) ; no package in PyPI - (uri (git-reference - (url "https://github.com/jakevdp/supersmoother") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lkj8l2mpki6x2pxcwlrplx63lhi8h9v2rzxgjfb0cppsfr8m1wp")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest - python-scipy - python-setuptools - python-wheel)) - (propagated-inputs - (list python-numpy)) - (home-page "http://github.com/jakevdp/supersmoother") - (synopsis "Python implementation of Friedman's Supersmoother") - (description - "This package provides an efficient implementation of + ;; 0.4 was release in 2017, there a lot of changes on master branch + ;; providing tests fixtures. + (let ((commit "0a81544ac6bb33bdb08deeba69e97a4ceebcebcf") + (revision "0")) + (package + (name "python-supersmoother") + (version (git-version "0.4" revision commit)) + (source + (origin + (method git-fetch) ; no package in PyPI + (uri (git-reference + (url "https://github.com/jakevdp/supersmoother") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1r79nssw4a44zizvqg8y685nv3asdfj440s227phfww6kz33s3la")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-scipy + python-setuptools)) + (propagated-inputs + (list python-numpy)) + (home-page "http://github.com/jakevdp/supersmoother") + (synopsis "Python implementation of Friedman's Supersmoother") + (description + "This package provides an efficient implementation of @url{https://www.slac.stanford.edu/pubs/slacpubs/3250/slac-pub-3477.pdf, Friedman's SuperSmoother} based in Python. It makes use of numpy for fast numerical computation.") - (license license:bsd-2))) + (license license:bsd-2)))) (define-public python-pylems (package diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a198b52193..7f4f175c8e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -8563,7 +8563,8 @@ association.") (sha256 (base32 "19wkdd1grw6mcd4qi8iaw4jdr207h3m24951vgy69j7g904lynjq")))) (build-system pyproject-build-system) - (native-inputs (list python-django python-setuptools python-wheel)) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-django python-setuptools)) (propagated-inputs (list python-tornado)) (home-page "https://github.com/lepture/python-livereload") (synopsis "Python LiveReload") @@ -9528,6 +9529,11 @@ using a pure Python implementation.") (license license:bsd-3))) (define-public python-pyjsparser + ;; XXX: This project is potentially abandonware, consider to remove in next + ;; refresh cycle, see: + ;; <https://github.com/PiotrDabkowski/pyjsparser/issues/28>, + ;; <https://github.com/PiotrDabkowski/pyjsparser/issues/39>, and + ;; <https://github.com/PiotrDabkowski/pyjsparser/issues/40>. (package (name "python-pyjsparser") (version "2.7.1") @@ -9538,7 +9544,9 @@ using a pure Python implementation.") (sha256 (base32 "0ycmf9fsvwliqmm1n6sfz7x71y7i2kbfgn39d8lsbiccfxmxlq5y")))) (build-system pyproject-build-system) - (native-inputs (list python-setuptools python-wheel)) + (arguments + '(#:tests? #f)) ;no tests in PyPI + (native-inputs (list python-setuptools)) (home-page "https://github.com/PiotrDabkowski/pyjsparser") (synopsis "Fast JavaScript parser") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5448f2695d..74bfdc4e38 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8322,7 +8322,7 @@ templates. A format string can be provided to control the output.") python-poetry-core python-pytest python-tornado-6)) - (propagated-inputs (list python-charset-normalizer)) + (propagated-inputs (list python-charset-normalizer python-six)) (home-page "https://github.com/kakulukia/pypugjs") (synopsis "Convert Pug source files into different template languages") (description @@ -9041,14 +9041,16 @@ with Python.") (version "3.4") (source (origin - (method url-fetch) - (uri (pypi-uri "vdf" version)) + (method git-fetch) ; no tests in PyPI release + (uri (git-reference + (url "https://github.com/ValvePython/vdf") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1bz2gn04pl6rj2mawlzlirz1ygg4rdypq0pxbyg018873vs1jm7x")))) + (base32 "1xc0sd21xgf08pf6dwa4l23y9jb6yqaw61rr03ns0d2r6sby137a")))) (build-system pyproject-build-system) (native-inputs - (list python-setuptools python-wheel)) + (list python-pytest python-setuptools)) (home-page "https://github.com/ValvePython/vdf") (synopsis "Work with Valve's VDF text format") (description "This package provides @code{python-vdf}, a library for @@ -20248,14 +20250,14 @@ explicit subcommand name.") (define-public python-structlog (package (name "python-structlog") - (version "23.1.0") + (version "25.4.0") (source (origin (method url-fetch) (uri (pypi-uri "structlog" version)) (sha256 (base32 - "0swh5wxghpzdkncsl3zhiq5bblkj4i5r3g00lldw2qyiswfnh397")))) + "1r09fhpshvkrnyn6v93045q32shxvx56d5bh84ljwxmfm2qd2v0q")))) (build-system pyproject-build-system) (native-inputs (list ;; For the build @@ -20263,13 +20265,10 @@ explicit subcommand name.") python-hatch-vcs python-hatchling ;; For the tests - python-coverage python-freezegun python-pretend python-pytest - python-pytest-asyncio - python-simplejson - python-twisted)) + python-pytest-asyncio)) (home-page "https://www.structlog.org/") (synopsis "Structured Logging for Python") (description "@code{structlog} changes logging in Python by adding structure @@ -31696,23 +31695,25 @@ information in various formats.") (define-public python-cairosvg (package (name "python-cairosvg") - (version "2.5.0") + (version "2.8.2") (source (origin (method url-fetch) - (uri (pypi-uri "CairoSVG" version)) + (uri (pypi-uri "cairosvg" version)) (sha256 - (base32 "1ylsisha2cc4w0yydxwhy7idkfw1inl9fsipxsrm7vyby080vi9z")))) + (base32 "17zgbgw24jw70rfka9wa3ff5wymk9cmaqk4a6697mchpcglg9jq7")))) (build-system pyproject-build-system) - (propagated-inputs - (list python-cairocffi python-cssselect2 python-defusedxml - python-pillow python-tinycss2)) + (arguments + (list #:test-flags #~(list "cairosvg/test_api.py"))) (native-inputs - (list python-pytest-flake8 - python-pytest-isort - python-pytest-runner - python-setuptools - python-wheel)) + (list python-pytest + python-setuptools)) + (propagated-inputs + (list python-cairocffi + python-cssselect2 + python-defusedxml + python-pillow + python-tinycss2)) (home-page "https://cairosvg.org/") (synopsis "SVG to PDF/PS/PNG converter based on Cairo") (description "CairoSVG is a SVG converter based on Cairo. It can export @@ -32053,7 +32054,9 @@ standard error channel (stderr) in your program.") (sha256 (base32 "1ygjgkzn0i61zk2yr27aqnma08c8xpblhdixli9f20if1nlgkm2y")))) (build-system pyproject-build-system) - (native-inputs (list python-setuptools python-wheel)) + (arguments + (list #:tests? #f)) ;no tests + (native-inputs (list python-setuptools)) (home-page "http://github.com/vpelletier/python-ioctl-opt") (synopsis "Functions to compute fnctl.ioctl's opt argument") (description @@ -34321,13 +34324,17 @@ By default it uses the open Python vulnerability database Safety DB.") (version "1.15") (source (origin - (method url-fetch) - (uri (pypi-uri "pypandoc" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/JessicaTegner/pypandoc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "04yfja8p8flvpjakyw7n43jb1jm3863w043l7zb43bhjwzmvw9ga")))) + (base32 "0jqr380xpg1n93dagxv7zfakhdravw0nc81rc4pnmjzkj360l5nr")))) (build-system pyproject-build-system) (arguments (list + #:test-backend #~'unittest #:phases #~(modify-phases %standard-phases (add-before 'check 'disable-tests @@ -34356,8 +34363,8 @@ By default it uses the open Python vulnerability database Safety DB.") (propagated-inputs (list python-wheel)) (home-page "https://github.com/JessicaTegner/pypandoc") (synopsis "Python wrapper for pandoc") - (description "pypandoc is a thin Python wrapper around pandoc -and pandoc-citeproc.") + (description + "pypandoc is a thin Python wrapper around pandoc and pandoc-citeproc.") (license license:expat))) (define-public python-rnc2rng @@ -36754,18 +36761,6 @@ 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")) @@ -37378,49 +37373,57 @@ Python @code{set} interface.") (define-public dynaconf (package (name "dynaconf") - (version "3.2.4") + (version "3.2.11") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/dynaconf/dynaconf") - (commit version))) + (url "https://github.com/dynaconf/dynaconf") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0fj2ffvzfvjf4d7f672h5x5fzq26f8hax9j3dfsix158fwm0212w")) - (patches (search-patches "dynaconf-unvendor-deps.patch")) + (base32 "05122x1bwskfqnzi9hqi86h7407byfjvhgczj74x6lp2m6rnwkzl")) + ;; (patches (search-patches "dynaconf-unvendor-deps.patch")) (modules '((guix build utils))) ;; Remove vendored dependencies - (snippet '(let ((unvendor '("click" "dotenv" "ruamel" "toml"))) - (with-directory-excursion "dynaconf/vendor" - (for-each delete-file-recursively unvendor)))))) + (snippet + #~(let ((unvendor '("click" "ruamel" "toml"))) + (with-directory-excursion "dynaconf/vendor" + (for-each delete-file-recursively unvendor)) + (substitute* (find-files "." "\\.py$") + (("from dynaconf\\.vendor import (click|ruamel|toml)([^l]+.*)$" + _ target rest) + (string-append "import " target rest)) + (("dynaconf\\.vendor\\.(click|ruamel|toml)" _ target) + target)))))) (build-system pyproject-build-system) (arguments - `(#:test-flags - '("--ignore=tests/test_vault.py" ; depend on hvac and a live Vault - "-k" ,(let ((click-tests '("test_negative_get" - "test_inspect_invalid_format"))) - ;; Disable integration tests - (string-append "not integration and not " - ;; These tests fail because we use Click 8.* - ;; instead of Click 7 - (string-join click-tests " and not "))) - "tests") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-for-click-8 - (lambda _ - (substitute* "dynaconf/cli.py" - (("click.get_os_args\\()") ;deprecated from Click 8.1+ - "sys.argv[1:]"))))))) + (list + #:test-flags + #~(list "--ignore=tests/test_vault.py" ; depend on hvac and a live Vault + "-k" #$(let ((click-tests '("test_negative_get" + "test_not_found_key_exit_error[get]" + "test_inspect_invalid_format"))) + ;; Disable integration tests + (string-append "not integration and not " + ;; These tests fail because we use + ;; Click 8.* instead of Click 7 + (string-join click-tests " and not "))) + "tests") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-for-click-8 + (lambda _ + (substitute* "dynaconf/cli.py" + (("click.get_os_args\\()") ;deprecated from Click 8.1+ + "sys.argv[1:]"))))))) (propagated-inputs - (list python-click python-configobj python-dotenv-0.13.0 - python-ruamel.yaml-0.16 python-toml python-tomli)) + (list python-click python-configobj python-ruamel.yaml-0.16 + python-toml python-tomli)) (native-inputs (list python-django python-flask python-pytest python-pytest-cov - python-pytest-mock python-setuptools python-wheel)) + python-pytest-mock python-setuptools)) (home-page "https://www.dynaconf.com/") (synopsis "The dynamic configurator for your Python project") (description |