diff options
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/check.scm | 48 | ||||
| -rw-r--r-- | gnu/packages/jupyter.scm | 27 | ||||
| -rw-r--r-- | gnu/packages/openstack.scm | 44 | ||||
| -rw-r--r-- | gnu/packages/patches/python-mox3-python3.6-compat.patch | 43 | ||||
| -rw-r--r-- | gnu/packages/python-web.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 36 |
6 files changed, 72 insertions, 135 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/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/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-web.scm b/gnu/packages/python-web.scm index a4933931eb..7f4f175c8e 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -9529,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") @@ -9539,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 ad6a5cf455..ec0d5867a2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -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 @@ -31696,23 +31698,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 |