From 4a828263791ebb8ed8f8104e015a8f467008fc76 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 22 Mar 2022 22:57:39 -0400 Subject: gnu: : Update to v9.0.0.post1. * gnu/packages/python-xyz.scm (): Update to v9.0.0.post1. --- 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 7649dd0ad5..e500360db8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7250,7 +7250,7 @@ (define-public python-pillow-simd (package (inherit python-pillow) (name "python-pillow-simd") - (version "9.0.0") + (version "v9.0.0.post1") ;; The PyPI tarball does not include test files. (source (origin @@ -7260,7 +7260,7 @@ (define-public python-pillow-simd (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pxvfyzxzgk18mhm7xh5n19s88bpwaah5cm60p4c239phspzprdb")))) + (base32 "1dnvsln451aw3qy2cxg2ndd5mcanf5nrhxw9l7mcam730635hdm9")))) (inputs (modify-inputs (package-inputs python-pillow) (prepend libraqm libimagequant))) -- cgit v1.2.3 From fada73a28020a2996c708d8c0a992d38a2cdd05d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 23 Mar 2022 08:33:37 +0200 Subject: gnu: pybind11: Update to 2.8.1. * gnu/packages/python-xyz.scm (pybind11): Update to 2.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e500360db8..997b809b65 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22291,7 +22291,7 @@ (define-public python-stone (define-public pybind11 (package (name "pybind11") - (version "2.6.2") + (version "2.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -22299,7 +22299,7 @@ (define-public pybind11 (commit (string-append "v" version)))) (sha256 (base32 - "1lsacpawl2gb5qlh0cawj9swsyfbwhzhwiv6553a7lsigdbadqpy")) + "10hrkrh78sk7k0ydw1ghmp7gvpwmkby0l2s0kf2iaj9sz0vijkhs")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (native-inputs -- cgit v1.2.3 From 9a31942cabb5c73174aee96ecd873fcf89955a9d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 23 Mar 2022 14:26:40 +0100 Subject: gnu: python-pillow-simd: Fix version. * gnu/packages/python-xyz.scm (python-pillow-simd)[version]: Move "v" prefix out of version string. --- 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 997b809b65..2b6051265f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7250,14 +7250,14 @@ (define-public python-pillow-simd (package (inherit python-pillow) (name "python-pillow-simd") - (version "v9.0.0.post1") + (version "9.0.0.post1") ;; The PyPI tarball does not include test files. (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/uploadcare/pillow-simd") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1dnvsln451aw3qy2cxg2ndd5mcanf5nrhxw9l7mcam730635hdm9")))) -- cgit v1.2.3 From d8f62653e5810beceff79b8fe655715734a8dcee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 24 Mar 2022 14:46:37 -0400 Subject: gnu: python-robotframework: Update to 5.0 and run acceptance tests. * gnu/packages/python-xyz.scm (python-robotframework): Update to 5.0. [patches]: Remove python-robotframework-ug2html.patch. Add python-robotframework-atest.patch and update python-robotframework-source-date-epoch.patch. [phases]: Use gexps. {delete-problematic-tests}: New phase. {check}: Also run `atest', the acceptance test suite. [native-inputs]: Use new style. Add python-lxml, python-pyyaml, python-xmlschema, scrot and xvfb-run. * gnu/packages/patches/python-robotframework-atest.patch: New file. * gnu/packages/patches/python-robotframework-source-date-epoch.patch: Update patch. * gnu/packages/patches/python-robotframework-ug2html.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- .../patches/python-robotframework-atest.patch | 61 ++++++++ .../python-robotframework-source-date-epoch.patch | 153 +++++++++++++++++---- .../patches/python-robotframework-ug2html.patch | 57 -------- gnu/packages/python-xyz.scm | 109 +++++++++------ 5 files changed, 256 insertions(+), 126 deletions(-) create mode 100644 gnu/packages/patches/python-robotframework-atest.patch delete mode 100644 gnu/packages/patches/python-robotframework-ug2html.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 4b453f3b73..05b787ac9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1709,8 +1709,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-runpath.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-1.9.0-system-libraries.patch \ + %D%/packages/patches/python-robotframework-atest.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ - %D%/packages/patches/python-robotframework-ug2html.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ %D%/packages/patches/python-seaborn-kde-test.patch \ %D%/packages/patches/python-seaborn-2690.patch \ diff --git a/gnu/packages/patches/python-robotframework-atest.patch b/gnu/packages/patches/python-robotframework-atest.patch new file mode 100644 index 0000000000..619ed61b65 --- /dev/null +++ b/gnu/packages/patches/python-robotframework-atest.patch @@ -0,0 +1,61 @@ +Patch submitted upstream: https://github.com/robotframework/robotframework/pull/4286. + +diff --git a/atest/robot/standard_libraries/operating_system/modified_time.robot b/atest/robot/standard_libraries/operating_system/modified_time.robot +index d144ffd34..c7681e61d 100644 +--- a/atest/robot/standard_libraries/operating_system/modified_time.robot ++++ b/atest/robot/standard_libraries/operating_system/modified_time.robot +@@ -8,7 +8,7 @@ ${TESTFILE} %{TEMPDIR}${/}robot-os-tests${/}f1.txt + *** Test Cases *** + Get Modified Time As Timestamp + ${tc} = Check Test Case ${TESTNAME} +- Should Match Regexp ${tc.kws[0].msgs[0].message} Last modified time of '' is 20\\d\\d-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d ++ Should Match Regexp ${tc.kws[0].msgs[0].message} Last modified time of '' is \\d\\d\\d\\d-\\d\\d-\\d\\d \\d\\d:\\d\\d:\\d\\d + + Get Modified Time As Seconds After Epoch + ${tc} = Check Test Case ${TESTNAME} +diff --git a/atest/testdata/standard_libraries/builtin/get_time.robot b/atest/testdata/standard_libraries/builtin/get_time.robot +index 9847d8c42..24ce732ca 100644 +--- a/atest/testdata/standard_libraries/builtin/get_time.robot ++++ b/atest/testdata/standard_libraries/builtin/get_time.robot +@@ -11,18 +11,18 @@ Get Time As Timestamp + + Get Time As Seconds After Epoch + ${time} = Get Time epoch +- Should Be True 1000000000 < ${time} < 2000000000 ++ Should Be True 0 < ${time} + + Get Time As Parts + @{time} = Get Time year, month, day, hour, min, sec +- Should Be True 2000 < ${time}[0] < 2100 ++ Should Match Regexp ${time}[0] \\d{4} + Should Be True 1 <= int('${time}[1]') <= 12 + Should Be True 1 <= int('${time}[2]') <= 31 + Should Be True 0 <= int('${time}[3]') <= 23 + Should Be True 0 <= int('${time}[4]') <= 59 + Should Be True 0 <= int('${time}[5]') <= 59 + ${year} ${min} ${sec} = Get Time seconds and minutes and year and whatnot +- Should Be True 2000 < ${year} < 2100 ++ Should Match Regexp ${year} \\d{4} + Should Be True 0 <= int('${min}') <= 59 + Should Be True 0 <= int('${sec}') <= 59 + +diff --git a/atest/testdata/standard_libraries/operating_system/modified_time.robot b/atest/testdata/standard_libraries/operating_system/modified_time.robot +index 9489b3c9c..c712ebaed 100644 +--- a/atest/testdata/standard_libraries/operating_system/modified_time.robot ++++ b/atest/testdata/standard_libraries/operating_system/modified_time.robot +@@ -14,13 +14,13 @@ Get Modified Time As Timestamp + + Get Modified Time As Seconds After Epoch + ${dirtime} = Get Modified Time ${CURDIR} epoch +- Should Be True 1000000000 < ${dirtime} < 2000000000 ++ Should Be True ${dirtime} > 0 + ${current} = Get Time epoch + Should Be True ${current} >= ${dirtime} + + Get Modified Time As Parts + ${year} = Get Modified Time ${CURDIR} year +- Should Be True 2000 < ${year} < 2100 ++ Should Match Regexp ${year} \\d{4} + ${yyyy} ${mm} ${dd} = Get Modified Time ${CURDIR} year, month, day + Should Be Equal ${yyyy} ${year} + # Must use `int('x')` because otherwise 08 and 09 are considered octal diff --git a/gnu/packages/patches/python-robotframework-source-date-epoch.patch b/gnu/packages/patches/python-robotframework-source-date-epoch.patch index 11424bf4db..7f00d82061 100644 --- a/gnu/packages/patches/python-robotframework-source-date-epoch.patch +++ b/gnu/packages/patches/python-robotframework-source-date-epoch.patch @@ -1,12 +1,64 @@ -Do not embed any timestamp in the built documentation. - -Upstream issue: https://github.com/robotframework/robotframework/issues/4262. +Patch submitted upstream: https://github.com/robotframework/robotframework/pull/4286. +diff --git a/BUILD.rst b/BUILD.rst +index 67902dd09..749c53fde 100644 +--- a/BUILD.rst ++++ b/BUILD.rst +@@ -204,6 +204,9 @@ Creating distributions + + 7. Documentation + ++ - For a reproducible build, set the ``SOURCE_DATE_EPOCH`` ++ environment variable to 1. ++ + - Generate library documentation:: + + invoke library-docs all +diff --git a/atest/robot/libdoc/html_output.robot b/atest/robot/libdoc/html_output.robot +index f42a4b150..af428c967 100644 +--- a/atest/robot/libdoc/html_output.robot ++++ b/atest/robot/libdoc/html_output.robot +@@ -15,7 +15,7 @@ Version + + Generated + [Template] Should Match Regexp +- ${MODEL}[generated] \\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} ++ ${MODEL}[generated] \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}[+-]\\d{2}:\\d{2} + + Scope + ${MODEL}[scope] GLOBAL +diff --git a/atest/robot/libdoc/json_output.robot b/atest/robot/libdoc/json_output.robot +index 78305a458..654603704 100644 +--- a/atest/robot/libdoc/json_output.robot ++++ b/atest/robot/libdoc/json_output.robot +@@ -15,7 +15,7 @@ Version + + Generated + [Template] Should Match Regexp +- ${MODEL}[generated] \\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} ++ ${MODEL}[generated] \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}[+-]\\d{2}:\\d{2} + + Scope + ${MODEL}[scope] GLOBAL +diff --git a/atest/robot/libdoc/libdoc_resource.robot b/atest/robot/libdoc/libdoc_resource.robot +index bd7c10ecd..b7e06aacc 100644 +--- a/atest/robot/libdoc/libdoc_resource.robot ++++ b/atest/robot/libdoc/libdoc_resource.robot +@@ -92,7 +92,8 @@ Lineno Should Be + Element Attribute Should Be ${LIBDOC} lineno ${lineno} + + Generated Should Be Defined +- Element Attribute Should Match ${LIBDOC} generated ????-??-??T??:??:??Z ++ # For example, '1970-01-01T00:00:01+00:00'. ++ Element Attribute Should Match ${LIBDOC} generated ????-??-??T??:??:?????:?? + + Spec version should be correct + Element Attribute Should Be ${LIBDOC} specversion 4 diff --git a/doc/userguide/ug2html.py b/doc/userguide/ug2html.py -index 43cdb31bd..550e74a79 100755 +index 033203552..b278c71c8 100755 --- a/doc/userguide/ug2html.py +++ b/doc/userguide/ug2html.py -@@ -158,8 +158,7 @@ def create_userguide(): +@@ -150,8 +150,7 @@ def create_userguide(): install_file = _copy_installation_instructions() description = 'HTML generator for Robot Framework User Guide.' @@ -17,48 +69,97 @@ index 43cdb31bd..550e74a79 100755 'RobotFrameworkUserGuide.html'] os.chdir(CURDIR) diff --git a/src/robot/libdocpkg/model.py b/src/robot/libdocpkg/model.py -index 4d9ffd70b..5c276d1d6 100644 +index 5f44039ef..c36bf4a49 100644 --- a/src/robot/libdocpkg/model.py +++ b/src/robot/libdocpkg/model.py -@@ -14,6 +14,7 @@ - # limitations under the License. +@@ -19,7 +19,7 @@ from itertools import chain - import json -+import os - import re - from itertools import chain + from robot.model import Tags + from robot.running import ArgumentSpec +-from robot.utils import getshortdoc, get_timestamp, Sortable, setter ++from robot.utils import get_timestamp_for_doc, getshortdoc, Sortable, setter -@@ -113,7 +114,8 @@ class LibraryDoc(object): + from .htmlutils import DocFormatter, DocToHtml, HtmlToText + from .writer import LibdocWriter +@@ -113,7 +113,7 @@ class LibraryDoc: 'name': self.name, 'doc': self.doc, 'version': self.version, - 'generated': get_timestamp(daysep='-', millissep=None), -+ 'generated': ('' if os.environ['SOURCE_DATE_EPOCH'] -+ else get_timestamp(daysep='-', millissep=None)), ++ 'generated': get_timestamp_for_doc(), 'type': self.type, 'scope': self.scope, 'docFormat': self.doc_format, diff --git a/src/robot/libdocpkg/xmlwriter.py b/src/robot/libdocpkg/xmlwriter.py -index 3882e1219..4a84fb42e 100644 +index a765ebb2b..980debebb 100644 --- a/src/robot/libdocpkg/xmlwriter.py +++ b/src/robot/libdocpkg/xmlwriter.py -@@ -14,6 +14,8 @@ +@@ -13,9 +13,7 @@ + # See the License for the specific language governing permissions and # limitations under the License. - import os.path -+import os -+ - from datetime import datetime +-from datetime import datetime +- +-from robot.utils import XmlWriter ++from robot.utils import XmlWriter, get_timestamp_for_doc + - from robot.utils import WINDOWS, XmlWriter, unicode -@@ -30,7 +32,9 @@ class LibdocXmlWriter(object): + class LibdocXmlWriter: +@@ -32,12 +30,11 @@ class LibdocXmlWriter: self._write_end(writer) def _write_start(self, libdoc, writer): - generated = datetime.utcnow().replace(microsecond=0).isoformat() + 'Z' -+ generated = ( -+ '' if os.environ['SOURCE_DATE_EPOCH'] -+ else datetime.utcnow().replace(microsecond=0).isoformat() + 'Z') attrs = {'name': libdoc.name, 'type': libdoc.type, 'format': libdoc.doc_format, + 'scope': libdoc.scope, +- 'generated': generated, ++ 'generated': get_timestamp_for_doc(), + 'specversion': '4'} + self._add_source_info(attrs, libdoc) + writer.start('keywordspec', attrs) +diff --git a/src/robot/utils/__init__.py b/src/robot/utils/__init__.py +index 442ffa4f3..80793ec29 100644 +--- a/src/robot/utils/__init__.py ++++ b/src/robot/utils/__init__.py +@@ -58,9 +58,9 @@ from .robotinspect import is_init + from .robotio import binary_file_writer, create_destination_directory, file_writer + from .robotpath import abspath, find_file, get_link_path, normpath + from .robottime import (elapsed_time_to_string, format_time, get_elapsed_time, +- get_time, get_timestamp, secs_to_timestamp, +- secs_to_timestr, timestamp_to_secs, timestr_to_secs, +- parse_time) ++ get_time, get_timestamp, get_timestamp_for_doc, ++ secs_to_timestamp, secs_to_timestr, timestamp_to_secs, ++ timestr_to_secs, parse_time) + from .robottypes import (FALSE_STRINGS, TRUE_STRINGS, is_bytes, is_dict_like, is_falsy, + is_integer, is_list_like, is_number, is_pathlike, is_string, + is_truthy, is_union, type_name, type_repr, typeddict_types) +diff --git a/src/robot/utils/robottime.py b/src/robot/utils/robottime.py +index 97a7d1af0..4a0ba2d83 100644 +--- a/src/robot/utils/robottime.py ++++ b/src/robot/utils/robottime.py +@@ -13,6 +13,8 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + ++import datetime ++import os + import re + import time + +@@ -316,6 +318,13 @@ def get_timestamp(daysep='', daytimesep=' ', timesep=':', millissep='.'): + return TIMESTAMP_CACHE.get_timestamp(daysep, daytimesep, timesep, millissep) + + ++def get_timestamp_for_doc(): ++ """Return a timestamp that honors `SOURCE_DATE_EPOCH`.""" ++ ts = float(os.getenv('SOURCE_DATE_EPOCH', time.time())) ++ dt = datetime.datetime.fromtimestamp(round(ts), datetime.timezone.utc) ++ return dt.isoformat() ++ ++ + def timestamp_to_secs(timestamp, seps=None): + try: + secs = _timestamp_to_millis(timestamp, seps) / 1000.0 diff --git a/gnu/packages/patches/python-robotframework-ug2html.patch b/gnu/packages/patches/python-robotframework-ug2html.patch deleted file mode 100644 index eea88e01f3..0000000000 --- a/gnu/packages/patches/python-robotframework-ug2html.patch +++ /dev/null @@ -1,57 +0,0 @@ -Do not require the obsolete robotframeworklexer. - -Submitted upstream at: https://github.com/robotframework/robotframework/pull/4265. -diff --git a/doc/userguide/ug2html.py b/doc/userguide/ug2html.py -index 43cdb31bd..033203552 100755 ---- a/doc/userguide/ug2html.py -+++ b/doc/userguide/ug2html.py -@@ -93,34 +93,26 @@ from docutils.parsers.rst import directives - from pygments import highlight, __version__ as pygments_version - from pygments.lexers import get_lexer_by_name - --# Use latest version, not version bundled with Pygments --import robotframeworklexer -- - - def too_old(version_string, minimum): - version = tuple(int(v) for v in version_string.split('.')[:2]) - return version < minimum - - --if too_old(getattr(robotframeworklexer, '__version__', '1.0'), (1, 1)): -- sys.exit('robotframeworklexer >= 1.1 is required.') --if too_old(pygments_version, (2, 1)): -- sys.exit('Pygments >= 2.1 is required.') -+if too_old(pygments_version, (2, 8)): -+ sys.exit('Pygments >= 2.8 is required.') - - - def pygments_directive(name, arguments, options, content, lineno, - content_offset, block_text, state, state_machine): - try: -- if arguments[0] == 'robotframework': -- lexer = robotframeworklexer.RobotFrameworkLexer() -- else: -- lexer = get_lexer_by_name(arguments[0]) -+ lexer = get_lexer_by_name(arguments[0]) - except ValueError as err: - raise ValueError(f'Invalid syntax highlighting language "{arguments[0]}".') - # take an arbitrary option if more than one is given - formatter = options and VARIANTS[options.keys()[0]] or DEFAULT - # possibility to read the content from an external file -- filtered = [ line for line in content if line.strip() ] -+ filtered = [line for line in content if line.strip()] - if len(filtered) == 1: - path = filtered[0].replace('/', os.sep) - if os.path.isfile(path): -diff --git a/requirements-build.txt b/requirements-build.txt -index e0f5e19a2..a2fcdcfd5 100644 ---- a/requirements-build.txt -+++ b/requirements-build.txt -@@ -5,5 +5,4 @@ rellu >= 0.7 - twine >= 1.12 - wheel - docutils --pygments >= 2.1 --robotframeworklexer >= 1.1 -+pygments >= 2.8 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2b6051265f..b0224573f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4671,7 +4671,7 @@ (define-public python-rellu (define-public python-robotframework (package (name "python-robotframework") - (version "4.1.3") + (version "5.0") ;; There are no tests in the PyPI archive. (source (origin @@ -4681,55 +4681,80 @@ (define-public python-robotframework (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j71awmfkwk7prz82kr1zbcl3nrih3396sshrygnqlrdjmgivd3p")) + (base32 "0qcm36c8hachbv3bc05ky7cf63i3sj0y8dw3bwjvcln28i543f81")) (patches (search-patches - "python-robotframework-source-date-epoch.patch" - "python-robotframework-ug2html.patch")))) + "python-robotframework-atest.patch" + "python-robotframework-source-date-epoch.patch")))) (build-system python-build-system) (arguments - `(#:modules ((guix build python-build-system) + (list + #:modules '((guix build python-build-system) (guix build utils) (ice-9 ftw) (ice-9 match) (srfi srfi-26)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'build-and-install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/robotframework"))) - (invoke "invoke" "library-docs" "all") - (invoke "doc/userguide/ug2html.py" "dist") ;user guide - (mkdir-p doc) - (with-directory-excursion "dist" - (define user-guide-dir - (match (scandir "." (cut string-prefix? - "robotframework-userguide-" <>)) - ((dir) dir) - (_ (error "could not find the user guide directory")))) - (copy-recursively user-guide-dir doc))))) - (replace 'check - (lambda* (#:key native-inputs inputs tests? - #:allow-other-keys) - (when tests? - ;; Some tests require timezone data. Otherwise, they - ;; look up /etc/localtime, which doesn't exist, and - ;; fail with: - ;; - ;; OverflowError: mktime argument out of range - (setenv "TZDIR" - (search-input-directory - (or native-inputs inputs) "share/zoneinfo")) - (setenv "TZ" "Europe/Paris") - (invoke "python" "utest/run.py"))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-problematic-tests + (lambda _ + ;; Tests such as 'Tilde and username in path' rely on HOME and + ;; USER being set, on top of the user's /etc/passwd home + ;; directory not being '/', as is the case in the Guix build + ;; container. + (delete-file "atest/robot/standard_libraries/\ +operating_system/path_expansion.robot") + ;; FIXME: The test 'Process.Sending Signal.By default signal + ;; is not sent to process running in shell' fails for unknown + ;; reason (see: + ;; https://github.com/robotframework/robotframework/issues/4292). + (delete-file "atest/robot/standard_libraries/\ +process/sending_signal.robot"))) + (add-before 'build 'build-and-install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/robotframework"))) + (invoke "invoke" "library-docs" "all") + (invoke "doc/userguide/ug2html.py" "dist") ;user guide + (mkdir-p doc) + (with-directory-excursion "dist" + (define user-guide-dir + (match (scandir "." (cut string-prefix? + "robotframework-userguide-" <>)) + ((dir) dir) + (_ (error "could not find the user guide directory")))) + (copy-recursively user-guide-dir doc))))) + (replace 'check + (lambda* (#:key native-inputs inputs tests? + #:allow-other-keys) + (when tests? + ;; Some tests require timezone data. Otherwise, they + ;; look up /etc/localtime, which doesn't exist, and + ;; fail with: + ;; + ;; OverflowError: mktime argument out of range + (setenv "TZDIR" + (search-input-directory + (or native-inputs inputs) "share/zoneinfo")) + (setenv "TZ" "Europe/Paris") + + (format #t "Running unit tests...~%") + (invoke "utest/run.py") + + (format #t "Running acceptance tests...~%") + (invoke "xvfb-run" "atest/run.py"))))))) (native-inputs - `(("python-docutils" ,python-docutils) - ("python-jsonschema" ,python-jsonschema) - ("python-invoke" ,python-invoke) - ("python-pygments" ,python-pygments) - ("python-rellu" ,python-rellu) - ("python:tk" ,python "tk") ;used when building the HTML doc - ("tzdata" ,tzdata-for-tests))) + (list python-docutils + python-jsonschema + python-invoke + python-lxml + python-pygments + python-pyyaml + python-rellu + `(,python "tk") ;used when building the HTML doc + python-xmlschema + scrot ;for taking screenshots + tzdata-for-tests + xvfb-run)) (outputs '("out" "doc")) (home-page "https://robotframework.org") (synopsis "Generic automation framework") -- cgit v1.2.3 From 07f55a361e23152b48f34425f116a725cce39e48 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 24 Mar 2022 15:24:42 -0400 Subject: gnu: Add python-robotframework-pabot. * gnu/packages/python-xyz.scm (python-robotframework-pabot): New variable. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0224573f0..739697b10f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4839,6 +4839,38 @@ (define-public python-robotframework-lint utility, a static analysis tool (linter) for Robot Framework source files.") (license license:asl2.0)))) +(define-public python-robotframework-pabot + (package + (name "python-robotframework-pabot") + (version "2.5.2") + (source + (origin + ;; There are no tests in the PyPI archive. + (method git-fetch) + (uri (git-reference + (url "https://github.com/mkorpela/pabot") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14a8isq1f4lgfwjb84hhzg6jm7ns18dxa9bg6dy8k2ml8zl0qknk")))) + (build-system python-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests"))))))) + (propagated-inputs + (list python-robotframework python-robotframework-stacktrace)) + (native-inputs + (list python-pytest)) + (home-page "https://pabot.org") + (synopsis "Parallel test runner for Robot Framework") + (description "Pabot is a parallel executor for Robot Framework tests.") + (license license:asl2.0))) + (define-public python-robotframework-stacktrace (package (name "python-robotframework-stacktrace") -- cgit v1.2.3 From 66cd0ce176fcebb21a0270083b1bb76ccd170d13 Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Sun, 6 Feb 2022 16:35:56 +0100 Subject: gnu: Add python-psycopg2-binary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-psycopg2-binary): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 739697b10f..cb50741f0e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29106,6 +29106,42 @@ (define-public python-types-dataclasses static types.") (license license:asl2.0))) +(define-public python-psycopg2-binary + (package + (name "python-psycopg2-binary") + (version "2.9.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "psycopg2-binary" version)) + (sha256 + (base32 + "0kpaxg3lg5wg5ww5kxmzi2z2d7arsx13ci915d8a2pf17lqza7bn")))) + (build-system python-build-system) + (inputs (list postgresql)) + (arguments + ;; Tests are disable because they need a live instance of PostgreSQL. + '(#:tests? #f)) + (home-page "https://psycopg.org/") + (synopsis "PostgreSQL database adapter for Python") + (description + "Psycopg is a PostgreSQL database adapter for the Python programming +language. Its main features are the complete implementation of the Python DB +API 2.0 specification and the thread safety (several threads can share the +same connection). It was designed for heavily multi-threaded applications +that create and destroy lots of cursors and make a large number of concurrent +@code{INSERT}s or @code{UPDATE}s. + +Psycopg 2 is mostly implemented in C as a libpq wrapper, resulting in +being both efficient and secure. It features client-side and +server-side cursors, asynchronous communication and notifications, +@code{COPY TO}/@code{COPY FROM} support. Many Python types are supported +out-of-the-box and adapted to matching PostgreSQL data types; +adaptation can be extended and customized thanks to a flexible objects +adaptation system. + +Psycopg 2 is both Unicode and Python 3 friendly.") + (license license:lgpl3+))) + (define-public python-pyfuse3 (package (name "python-pyfuse3") -- cgit v1.2.3 From d90b06cc428146347b0f44faf963c03543854a4e Mon Sep 17 00:00:00 2001 From: Pierre-Henry Fröhring Date: Sun, 6 Feb 2022 15:47:23 +0100 Subject: gnu: Add python-aiopg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-aiopg): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cb50741f0e..e2bb1ca4ef 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29274,3 +29274,24 @@ (define-public python-multipart (description "This package provides a streaming multipart parser for Python.") (license license:asl2.0))) + +(define-public python-aiopg + (package + (name "python-aiopg") + (version "1.3.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "aiopg" version)) + (sha256 + (base32 + "1mwmypsfzh8adjbyvf7kqv9h3k1kf5ykhi1g3ahw4wqdxaj6nz2l")))) + (build-system python-build-system) + (native-inputs (list python-sqlalchemy)) + (propagated-inputs (list python-async-timeout python-psycopg2-binary)) + (home-page "https://aiopg.readthedocs.io") + (synopsis "Postgres integration with asyncio") + (description + "aiopg is a library for accessing a PostgreSQL +database from the asyncio (PEP-3156/tulip) framework. It wraps +asynchronous features of the Psycopg database driver.") + (license license:bsd-3))) -- cgit v1.2.3 From f252e6b8bf539db4ebc811aff40670af7cf26308 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 24 Mar 2022 20:57:18 -0400 Subject: gnu: Add python-flake8-isort. * gnu/packages/python-xyz.scm (python-flake8-isort): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e2bb1ca4ef..ae335cc83f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10739,6 +10739,34 @@ (define-public python-flake8-todo TODO notes checker plugin for flake8.") (license license:expat))) +(define-public python-flake8-isort + (package + (name "python-flake8-isort") + (version "4.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-isort" version)) + (sha256 + (base32 "05r7z0j9rqgy0a9261bhisairrz6w8hy5hy5kf2mhvhfnx53056q")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (propagated-inputs (list python-flake8 python-isort python-testfixtures)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/gforcada/flake8-isort") + (synopsis "Flake8 plugin integrating isort") + (description "This package provides a flake8 plugin that integrates isort, +extending flake8 so that it can warn about badly sorted Python import +directives.") + (license license:gpl2+))) + (define-public python-autoflake (package (name "python-autoflake") -- cgit v1.2.3 From b9e01b7516f7cd4e83924bbb382b6e629382115e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 21 Jan 2022 02:43:44 -0500 Subject: gnu: Add python-msgpack-1.0.2. * gnu/packages/python-xyz.scm (python-msgpack-1.0.2): New variable. --- gnu/packages/python-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ae335cc83f..c576d2106a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11321,6 +11321,17 @@ (define-public python-msgpack (home-page "https://pypi.org/project/msgpack/") (license license:asl2.0))) +(define-public python-msgpack-1.0.2 + (package + (inherit python-msgpack) + (version "1.0.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "msgpack" version)) + (sha256 + (base32 + "1109s2yynrahwi64ikax68hx0mbclz8p35afmpphw5dwynb49q7s")))))) + ;; This msgpack library's name changed from "python-msgpack" to "msgpack" with ;; release 0.5. Some packages like borg still call it by the old name for now. ;; -- cgit v1.2.3 From 967d5fd5c24883e0e33ca9b2f5b7d8a12805d57f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 31 Mar 2022 10:33:54 +0200 Subject: gnu: python2-h5py: Detach version and source from python-h5py. * gnu/packages/python-xyz.scm (python2-h5py): Override source and version field. (python-h5py)[properties]: Record 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 c576d2106a..a4d86ace92 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1388,10 +1388,21 @@ (define-public python-h5py complete wrapping of the HDF5 API, while the high-level component supports access to HDF5 files, datasets and groups using established Python and NumPy concepts.") - (license license:bsd-3))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-h5py)))))) (define-public python2-h5py - (package-with-python2 python-h5py)) + (let ((base (package-with-python2 (strip-python2-variant python-h5py)))) + (package + (inherit base) + (version "2.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "h5py" version)) + (sha256 + (base32 + "0baipzv8n93m0dq0riyi8rfhzrjrfrfh8zqhszzp1j2xjac2fhc4"))))))) (define-public python-hnswlib (package -- cgit v1.2.3 From ea403bf290f4bf8c7bae314e32dbb90653f92996 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 31 Mar 2022 10:35:17 +0200 Subject: gnu: python-h5py: Update to 3.6.0. * gnu/packages/python-xyz.scm (python-h5py): Update to 3.6.0. [arguments]: Set HDF5_DIR variable instead of patching files. --- gnu/packages/python-xyz.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a4d86ace92..9e05908303 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1349,14 +1349,14 @@ (define-public python-hdf4 (define-public python-h5py (package (name "python-h5py") - (version "2.10.0") + (version "3.6.0") (source (origin (method url-fetch) (uri (pypi-uri "h5py" version)) (sha256 (base32 - "0baipzv8n93m0dq0riyi8rfhzrjrfrfh8zqhszzp1j2xjac2fhc4")))) + "0afv805vqrm5071g7alwv41920nhh8kjv4m5nbia9awj9a0x4ll7")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test target @@ -1364,16 +1364,7 @@ (define-public python-h5py (modify-phases %standard-phases (add-after 'unpack 'fix-hdf5-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((prefix (assoc-ref inputs "hdf5"))) - (substitute* "setup_build.py" - (("\\['/opt/local/lib', '/usr/local/lib'\\]") - (string-append "['" prefix "/lib" "']")) - (("'/opt/local/include', '/usr/local/include'") - (string-append "'" prefix "/include" "'"))) - (substitute* "setup_configure.py" - (("\\['/usr/local/lib', '/opt/local/lib'\\]") - (string-append "['" prefix "/lib" "']"))) - #t)))))) + (setenv "HDF5_DIR" (assoc-ref inputs "hdf5"))))))) (propagated-inputs (list python-six python-numpy)) (inputs -- cgit v1.2.3 From dda555feadf4fce11e792555258f1c9a52f19466 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 31 Mar 2022 10:35:50 +0200 Subject: gnu: python-anndata: Update to 0.8.0. * gnu/packages/python-xyz.scm (python-anndata): Update to 0.8.0. [arguments]: Remove build phase 'relax-dependency-requirements. --- gnu/packages/python-xyz.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9e05908303..d3bd107350 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2020 Christine Lemmer-Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson @@ -22921,7 +22921,7 @@ (define-public python-zarr (define-public python-anndata (package (name "python-anndata") - (version "0.7.8") + (version "0.8.0") (source (origin ;; The tarball from PyPi doesn't include tests. @@ -22932,18 +22932,12 @@ (define-public python-anndata (file-name (git-file-name name version)) (sha256 (base32 - "1rrr9xfdaf00ixj5gyym75bl78gkaj55yfw3wjhvx0pdwqpwp9py")))) + "0v7npqrg1rdm8jzw22a45c0mqrmsv05r3k88i3lhzi0pzzxca1i1")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'check) - (add-before 'build 'relax-dependency-requirements - (lambda _ - ;; We need to upgrade python-pandas to avoid - ;; https://github.com/pandas-dev/pandas/issues/35446 - (substitute* "pyproject.toml" - (("pandas>=1.1.1") "pandas>=1.0.5")))) (replace 'build (lambda _ (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" ,version) -- cgit v1.2.3 From a27cef76c29ba6ef0d7c203783b758ea2d5331d7 Mon Sep 17 00:00:00 2001 From: Chadwain Holness Date: Thu, 24 Mar 2022 13:37:02 -0400 Subject: gnu: python-pycountry: Update to 22.3.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pycountry): Update to 22.3.5. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d3bd107350..5304b6915e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18512,14 +18512,14 @@ (define-public python-ddt (define-public python-pycountry (package (name "python-pycountry") - (version "18.5.26") + (version "22.3.5") (source (origin (method url-fetch) (uri (pypi-uri "pycountry" version)) (sha256 (base32 - "15q9j047s3yc9cfcxq1ch8b71f81na44cr6dydd5gxk0ki9a4akz")))) + "0ihnkh86zz01vi46gcwgq6h71jrpj7hq71zi13c98n2qdhj3l5mj")))) (build-system python-build-system) (home-page "https://bitbucket.org/flyingcircus/pycountry") (synopsis "ISO databases for languages, countries, currencies, etc.") -- cgit v1.2.3 From 4d336ecf200e1011eed6433f4a74e3fa7272b3af Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Thu, 3 Mar 2022 10:11:05 +0100 Subject: gnu: Add python-bip39. * gnu/packages/python-xyz.scm (python-bip39): New variable. Signed-off-by: Ricardo Wurmus --- 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 5304b6915e..60a13906d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1262,6 +1262,29 @@ (define-public python-bidict for working with bidirectional mappings in Python.") (license license:mpl2.0))) +(define-public python-bip39 + (package + (name "python-bip39") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bip39" version)) + (sha256 + (base32 "18m7d3gi7vj2zi0bl1z7m0nhcj6i8j9vj4vil276siagnpkv64ry")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/de-centralized-systems/python-bip39/") + (synopsis "Self-contained and simple BIP39 implementation in Python") + (description + "This package provides a self-contained and simple BIP39 +implementation written in Python. It includes a @code{bip39.py} executable. + +BIP39 is a standardized mapping between binary data (the @emph{entropy}), +and a list of words that are easier to remember for humans (the +@emph{mnemonic}).") + (license license:expat))) + (define-public python-bitarray (package (name "python-bitarray") -- cgit v1.2.3 From d3e1a94391a838332b0565d56762a58cf87ac6b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 30 Mar 2022 17:53:44 +0200 Subject: gnu: python2-pyyaml: Detach source from python-pyyaml. * gnu/packages/python-xyz.scm (python2-pyyaml): Override source and version fields. (python-pyyaml)[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 60a13906d1..ff36c988c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3925,10 +3925,21 @@ (define-public python-pyyaml complete YAML 1.1 parser, Unicode support, pickle support, capable extension API, and sensible error messages. PyYAML supports standard YAML tags and provides Python-specific tags that represent an arbitrary Python object.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-pyyaml)))))) (define-public python2-pyyaml - (package-with-python2 python-pyyaml)) + (let ((base (package-with-python2 (strip-python2-variant python-pyyaml)))) + (package + (inherit base) + (version "5.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))))) (define-public python-vine (package -- cgit v1.2.3 From 27720d0fe14ee4cd413a6745e0782a698a011924 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 30 Mar 2022 17:55:05 +0200 Subject: gnu: python-pyyaml: Update to 6.0. * gnu/packages/python-xyz.scm (python-pyyaml): Update to 6.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 ff36c988c7..5b92724a53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3907,14 +3907,14 @@ (define-public python-itsdangerous (define-public python-pyyaml (package (name "python-pyyaml") - (version "5.4.1") + (version "6.0") (source (origin (method url-fetch) (uri (pypi-uri "PyYAML" version)) (sha256 (base32 - "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))) + "18imkjacvpxfgg1lbpraqywx3j7hr5dv99d242byqvrh2jf53yv8")))) (build-system python-build-system) (inputs (list libyaml python-cython)) -- cgit v1.2.3 From 9d25dab4db05303a621844a1c18d85b9b1835125 Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 4 Apr 2022 14:40:32 -0400 Subject: gnu: python-dotenv: Update to 0.20.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-dotenv): Update to 0.20.0. [home-page]: Update home page. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5b92724a53..30cab6a113 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28268,13 +28268,13 @@ (define-public python-minikanren (define-public python-dotenv (package (name "python-dotenv") - (version "0.19.2") + (version "0.20.0") (source (origin (method url-fetch) (uri (pypi-uri "python-dotenv" version)) (sha256 - (base32 "0pv5ygpr6syc6zkw21in4ysqs3k7qaxk9m1g5pzlafwm3silkpm5")))) + (base32 "13s9imfd0k4d7b1qy5wfqzw5vyj6rhmcrccsdz1l4g39b55b1qxp")))) (build-system python-build-system) (arguments `(#:phases @@ -28292,7 +28292,7 @@ (define-public python-dotenv (list python-click)) (native-inputs (list python-mock python-pytest python-sh)) - (home-page "https://github.com/theskumar/python-dotenv") + (home-page "https://saurabh-kumar.com/python-dotenv/") (synopsis "Setup environment variables according to .env files") (description "This package provides the @code{python-dotenv} Python module to read -- cgit v1.2.3 From e1df15794b8e72dc24a8855c696f17009d647fa8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Apr 2022 12:37:10 +0200 Subject: gnu: python-latexcodec: Update to 2.0.1. * gnu/packages/python-xyz.scm (python-latexcodec): Update to 2.0.1. [inputs]: Move python-six from here... [propagated-inputs]: ...to here. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 30cab6a113..2e3f766113 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21984,15 +21984,15 @@ (define-public python2-more-itertools (define-public python-latexcodec (package (name "python-latexcodec") - (version "1.0.7") + (version "2.0.1") (source (origin (method url-fetch) (uri (pypi-uri "latexcodec" version)) (sha256 - (base32 "0wnp3yqcgx0rpy8dz51vh75lbp2qif67da19zi7m3ca98n887hgb")))) + (base32 "16pynfnn8y8xp55yp06i721fccv5dlx9ba6k5bzcwq9j6wf5b8ia")))) (build-system python-build-system) - (inputs + (propagated-inputs (list python-six)) (home-page "https://readthedocs.org/projects/latexcodec/") (synopsis "Work with LaTeX code in Python") -- cgit v1.2.3 From 3b262b51fa616e3809b7bad450e288359845028a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 6 Apr 2022 12:37:33 +0200 Subject: gnu: python-pybtex: Update to 0.24.0. * gnu/packages/python-xyz.scm (python-pybtex): Update to 0.24.0. [native-inputs]: Remove python-nose; add python-pytest. [inputs]: Move python-latexcodec, python-pyyaml, and python-six from here... [propagated-inputs]: ...to here. [arguments]: Use pytest. --- gnu/packages/python-xyz.scm | 10 +++++----- 1 file changed, 5 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 2e3f766113..55705ab2ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22002,17 +22002,17 @@ (define-public python-latexcodec (define-public python-pybtex (package (name "python-pybtex") - (version "0.22.2") + (version "0.24.0") (source (origin (method url-fetch) (uri (pypi-uri "pybtex" version)) (sha256 - (base32 "070wfcmxrd7xg1si421mi9150gmx2qwx431nwf69sq3hhmgnx080")))) + (base32 "0ma7sc10hk6caq5zghbk865vrlaynz7x5z630z0facqpnqssx3l1")))) (build-system python-build-system) (native-inputs - (list python-nose)) - (inputs + (list python-pytest)) + (propagated-inputs (list python-latexcodec python-pyyaml python-six)) (arguments (list @@ -22020,7 +22020,7 @@ (define-public python-pybtex (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "nosetests"))))))) + (invoke "pytest"))))))) (home-page "https://pybtex.org/") (synopsis "BibTeX-compatible bibliography processor") (description "Pybtex is a BibTeX-compatible bibliography processor written -- cgit v1.2.3 From 8499f14a215a7ba020e8e87292e66de631027b08 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Apr 2022 16:48:12 +0200 Subject: gnu: Add python-plac. * gnu/packages/python-xyz.scm (python-plac): New variable. --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55705ab2ea..12a79d8450 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9909,6 +9909,35 @@ (define-public python-bigfloat multiprecision arithmetic.") (license license:lgpl3+))) +(define-public python-plac + (package + (name "python-plac") + (version "1.3.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "plac" version)) + (sha256 + (base32 "1410h6jw1ksi24kb55xzkwqzba2qqjwiga1s354bf3s5s1jdig9q")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tkinter + (lambda _ + (substitute* "plac_tk.py" + (("from Tkinter import Tk") + "from tkinter import Tk") + (("from ScrolledText import ScrolledText") + "from tkinter.scrolledtext import ScrolledText"))))))) + (native-inputs + `(("python-tkinter" ,python "tk"))) + (home-page "https://github.com/ialbert/plac") + (synopsis "Command line arguments parser") + (description "This package can generate command line parameters from +function signatures.") + (license license:bsd-3))) + (define-public python-sympy (package (name "python-sympy") -- cgit v1.2.3 From 6145e25afa597a1c3c571df8d1ec0ca69b69125f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Apr 2022 16:48:27 +0200 Subject: gnu: Add python-yte. * gnu/packages/python-xyz.scm (python-yte): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12a79d8450..12f0779ba6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9938,6 +9938,29 @@ (define-public python-plac function signatures.") (license license:bsd-3))) +(define-public python-yte + (package + (name "python-yte") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "yte" version)) + (sha256 + (base32 "07hm1warpqi4ifqgkaz5sg887x4a44yhxafmpf835ywnpchg4s03")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-HOME + (lambda _ (setenv "HOME" "/tmp")))))) + (propagated-inputs (list python-plac python-pyyaml)) + (home-page "https://github.com/koesterlab/yte") + (synopsis "YAML template engine with Python expressions") + (description + "This package provides a YAML template engine with Python expressions.") + (license license:expat))) + (define-public python-sympy (package (name "python-sympy") -- cgit v1.2.3 From fc7f80707872a35794c242da11637c4e3dab7d95 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 7 Apr 2022 16:48:59 +0200 Subject: gnu: Add python-stopit. * gnu/packages/python-xyz.scm (python-stopit): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12f0779ba6..e83eb017f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11081,6 +11081,25 @@ (define-public python-stdlib-list (description "This package contains a list of Python Standard Libraries.") (license license:expat))) +(define-public python-stopit + (package + (name "python-stopit") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "stopit" version)) + (sha256 + (base32 "0vcrcvky249q4rbgmwf18mwmnypfk8jpn4h6knyjf86r7xc9rwzp")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ;there are none + (home-page "https://pypi.python.org/pypi/stopit") + (synopsis "Timeout control decorator and context managers") + (description + "Raise asynchronous exceptions in other threads, control the timeout of +blocks or callables with two context managers and two decorators.") + (license license:expat))) + (define-public python-straight-plugin (package (name "python-straight-plugin") -- cgit v1.2.3 From 7fcb16e9d4a0fd7b169079ff9b737d12d5e06b17 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Apr 2022 23:06:47 +0200 Subject: gnu: Add python-pyyaml-for-awscli. * gnu/packages/python-xyz.scm (python-pyyaml-for-awscli): New variable. --- 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 e83eb017f5..8484770719 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3941,6 +3941,18 @@ (define-public python2-pyyaml (base32 "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))))) +(define-public python-pyyaml-for-awscli + (package + (inherit python-pyyaml) + (version "5.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))) + (define-public python-vine (package (name "python-vine") -- cgit v1.2.3 From 9320410d76b213853cb18adc3e2b1e7f0262fbb1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Apr 2022 23:07:50 +0200 Subject: gnu: Add python-botocore-for-awscli. * gnu/packages/python-xyz.scm (python-botocore-for-awscli): New variable. --- gnu/packages/python-xyz.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8484770719..4c01d39036 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14654,6 +14654,20 @@ (define-public python-botocore (define-public python2-botocore (package-with-python2 python-botocore)) +(define-public python-botocore-for-awscli + ;; Note: When updating botocore, also make sure that boto3 and awscli + ;; are compatible. + (package + (inherit python-botocore) + (version "1.22.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "botocore" version)) + (sha256 + (base32 + "1z7g2scyzvfq4yj9b4w911k7802ry1v6lqfnwq12l0ak7ywmsvrh")))))) + (define-public python-boto3 (package (name "python-boto3") -- cgit v1.2.3 From 8a6c012deb641705a2b0460f9a64d99bc1f08c73 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Apr 2022 23:08:06 +0200 Subject: gnu: python-boto3: Update to 1.21.35. * gnu/packages/python-xyz.scm (python-boto3): Update to 1.21.35. [arguments]: Override 'check phase. --- gnu/packages/python-xyz.scm | 10 +++++++--- 1 file changed, 7 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 4c01d39036..394c7680fd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14671,7 +14671,7 @@ (define-public python-botocore-for-awscli (define-public python-boto3 (package (name "python-boto3") - (version "1.19.11") + (version "1.21.35") (home-page "https://github.com/boto/boto3") (source (origin (method git-fetch) @@ -14679,14 +14679,18 @@ (define-public python-boto3 (file-name (git-file-name name version)) (sha256 (base32 - "1wv0ci2z5ywvm63dh4mp64vqyyvkm4qxc8dxv8ncrqiiphpgr9aq")))) + "1kdyf238rpfldnpzs0rdh3nhjn6hwfym4faskyhzlgzkf1smmbg1")))) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'delete-network-tests ;; Deleting integration tests because they are trying to connect to AWS. (lambda _ - (delete-file-recursively "tests/integration")))))) + (delete-file-recursively "tests/integration"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) (build-system python-build-system) (native-inputs (list python-nose python-mock python-pytest)) -- cgit v1.2.3 From e8a99abf41c92920ebc4fb1763801e50ff73bac5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Apr 2022 23:08:24 +0200 Subject: gnu: python-botocore: Update to 1.24.35. * gnu/packages/python-xyz.scm (python-botocore): Update to 1.24.35. --- 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 394c7680fd..f617fbcf4a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14631,14 +14631,14 @@ (define-public python-botocore ;; are compatible. (package (name "python-botocore") - (version "1.22.11") + (version "1.24.35") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "1z7g2scyzvfq4yj9b4w911k7802ry1v6lqfnwq12l0ak7ywmsvrh")))) + "0rv8mvhq5s373zdjs2yb45hzvqcqdh2lp2rbb21jjc8ciwnl5d9n")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From 6a69e41c1783fa2eafd06cf1844d680ed1a09f65 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 12 Apr 2022 23:09:25 +0200 Subject: gnu: python-moto: Update to 3.1.4. * gnu/packages/python-xyz.scm (python-moto): Update to 3.1.4. [arguments]: Adjust disabled tests. [native-inputs]: Remove python-parameterized; add python-graphql-core. [propagated-inputs]: Remove python-boto, python-idna, python-mock, and python-six; add python-importlib-metadata and python-markupsafe. --- gnu/packages/python-xyz.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f617fbcf4a..36e4fe5898 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14249,13 +14249,12 @@ (define-public python-colorama-for-awscli (define-public python-moto (package (name "python-moto") - (version "2.2.12") + (version "3.1.4") (source (origin (method url-fetch) (uri (pypi-uri "moto" version)) (sha256 - (base32 - "0pvay0jp119lzzwf5qj5h6311271yq0w2i6344ds20grpf6g6gz8")))) + (base32 "0dfnad1f9d5ybabs69dzc7x357z1r4jbhrhgw57gyic1qnmcw864")))) (build-system python-build-system) (arguments `(#:phases @@ -14278,7 +14277,9 @@ (define-public python-moto ;; These tests require Docker. " and not test_terminate_job" " and not test_invoke_function_from_sqs_exception" - " and not test_rotate_secret_lambda_invocations" + " and not test_create_custom_lambda_resource__verify_cfnresponse_failed" + " and not test_lambda_function" + ;; These tests also require the network. " and not test_put_record_batch_http_destination" " and not test_put_record_http_destination" @@ -14289,30 +14290,28 @@ (define-public python-moto (list python-flask python-flask-cors python-freezegun - python-parameterized + python-graphql-core python-pytest python-sure)) (inputs (list bash-minimal)) (propagated-inputs (list python-aws-xray-sdk - python-boto python-boto3 python-botocore python-cfn-lint python-cryptography python-dateutil python-docker - python-idna + python-importlib-metadata python-jinja2 python-jose python-jsondiff - python-mock + python-markupsafe python-pytz python-pyyaml python-requests python-responses - python-six python-sshpubkeys python-werkzeug python-xmltodict)) -- cgit v1.2.3 From 802c94034cf8900987855c205fcb0ae37af985c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 14 Apr 2022 23:21:55 +0300 Subject: gnu: python-pywavelets: Remove cythonized files. * gnu/packages/python-xyz.scm (python-pywavelets)[source]: Add snippet to remove cythonized files. [native-inputs]: Add python-cython. --- 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 36e4fe5898..d70d8cc270 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7671,7 +7671,17 @@ (define-public python-pywavelets (uri (pypi-uri "PyWavelets" version)) (sha256 (base32 - "13csbr6ls9q9ww53z2xwwsj0hpsz88rj2iwp623h0kmv8yq6kgbc")))) + "13csbr6ls9q9ww53z2xwwsj0hpsz88rj2iwp623h0kmv8yq6kgbc")) + (snippet + #~(begin + (use-modules ((guix build utils))) + (for-each delete-file + (list + "pywt/_extensions/_cwt.c" + "pywt/_extensions/_dwt.c" + "pywt/_extensions/_pywt.c" + "pywt/_extensions/_pywt.h" + "pywt/_extensions/_swt.c")))))) (build-system python-build-system) (arguments '(#:modules ((ice-9 ftw) @@ -7689,7 +7699,8 @@ (define-public python-pywavelets (with-directory-excursion (string-append cwd "/build/" libdir) (invoke "pytest" "-vv")))))))) (native-inputs - (list python-matplotlib ;for tests + (list python-cython + python-matplotlib ;for tests python-pytest)) (propagated-inputs (list python-numpy)) -- cgit v1.2.3 From 304c6b395cdf0cd5ca911c428e08dbb06e37a8c5 Mon Sep 17 00:00:00 2001 From: Vincent Prat Date: Fri, 8 Apr 2022 15:11:21 +0200 Subject: gnu: Add python-shtab. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shtab): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d70d8cc270..03b157de5c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29475,3 +29475,37 @@ (define-public python-aiopg database from the asyncio (PEP-3156/tulip) framework. It wraps asynchronous features of the Psycopg database driver.") (license license:bsd-3))) + +(define-public python-shtab + (package + (name "python-shtab") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "shtab" version)) + (sha256 + (base32 "127mymfm7r0hddk2vknqq34fj6dirj6ip990i3g4isx0lsd7pnsc")))) + (build-system python-build-system) + (native-inputs + (list bash + python-pytest + python-pytest-cov + python-pytest-timeout + python-setuptools-scm + python-wheel)) + (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"))))))) + (home-page "https://github.com/iterative/shtab") + (synopsis "Automagic shell tab completion for Python CLI applications") + (description + "This package automatically generates shell tab completion scripts for +Python CLI apps.") + (license license:asl2.0))) -- cgit v1.2.3 From 4ed02d571a53f5a1e108a4df0bc3bf12a28fb0ed Mon Sep 17 00:00:00 2001 From: Vincent Prat Date: Fri, 8 Apr 2022 16:29:38 +0200 Subject: gnu: Add python-verspec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python.xyz.scm (python-verspec): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 03b157de5c..219a0d9213 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29476,6 +29476,34 @@ (define-public python-aiopg asynchronous features of the Psycopg database driver.") (license license:bsd-3))) +(define-public python-verspec + (package + (name "python-verspec") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "verspec" version)) + (sha256 + (base32 + "07n06wv85fm4vl1ird2mja0823js3x322wgs9gdnq1djjyk4ql64")))) + (build-system python-build-system) + (native-inputs (list python-coverage python-flake8 python-mypy + python-pretend python-pytest)) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "touch" "test/__init__.py") + (invoke "pytest"))))))) + (home-page "https://github.com/jimporter/verspec") + (synopsis "Flexible version handling for Python") + (description + "This Python library handles software versions and specifiers. It is +adapted from the @code{packaging} package.") + (license (list license:bsd-2 license:asl2.0)))) + (define-public python-shtab (package (name "python-shtab") -- cgit v1.2.3 From b0ec23afb72eecaa2a59fddf5d528255d05d4b3c Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 17 Apr 2022 20:04:19 +0000 Subject: gnu: python-jmespath: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-jmespath): Update to 1.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 219a0d9213..101204a5d5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14491,14 +14491,14 @@ (define-public python-tox (define-public python-jmespath (package (name "python-jmespath") - (version "0.9.4") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "jmespath" version)) (sha256 (base32 - "0k0765x1mybcrzajh3hiqkl8sy9hs0bmn4900frxy0j3ykvaxqmx")))) + "0pmzfi230zfgiq2rz896kbb9f7mp0lnrjdl6x1npvxfixn0f5454")))) (build-system python-build-system) (native-inputs (list python-nose)) -- cgit v1.2.3 From 4810100db6d841794cf50c02807394eb265e5432 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 17 Apr 2022 20:04:21 +0000 Subject: gnu: Remove python-botocore-for-awscli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-botocore-for-awscli): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 101204a5d5..ad4e05bb0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14664,20 +14664,6 @@ (define-public python-botocore (define-public python2-botocore (package-with-python2 python-botocore)) -(define-public python-botocore-for-awscli - ;; Note: When updating botocore, also make sure that boto3 and awscli - ;; are compatible. - (package - (inherit python-botocore) - (version "1.22.11") - (source - (origin - (method url-fetch) - (uri (pypi-uri "botocore" version)) - (sha256 - (base32 - "1z7g2scyzvfq4yj9b4w911k7802ry1v6lqfnwq12l0ak7ywmsvrh")))))) - (define-public python-boto3 (package (name "python-boto3") -- cgit v1.2.3 From 617d8a836fee6b06da4b7713c3e6a28a3a4522db Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 17 Apr 2022 20:04:22 +0000 Subject: gnu: Remove python-pyyaml-for-awscli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyyaml-for-awscli): Remove variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ad4e05bb0d..7193d4e6ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3941,18 +3941,6 @@ (define-public python2-pyyaml (base32 "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))))) -(define-public python-pyyaml-for-awscli - (package - (inherit python-pyyaml) - (version "5.4.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyYAML" version)) - (sha256 - (base32 - "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))) - (define-public python-vine (package (name "python-vine") -- cgit v1.2.3 From 283088f7b158815a58ca687147860e2a6b8112ba Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Tue, 5 Apr 2022 15:12:57 -0400 Subject: gnu: Add python-sre-yield. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-sre-yield): New variable. Signed-off-by: Ludovic Courtès --- 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 7193d4e6ce..9a5d311680 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -118,6 +118,7 @@ ;;; Copyright © 2022 Aleksandr Vityazev ;;; Copyright © 2022 Evgeny Pisemsky ;;; Copyright © 2022 drozdov +;;; Copyright © 2022 Peter Polidoro ;;; ;;; This file is part of GNU Guix. ;;; @@ -29511,3 +29512,25 @@ (define-public python-shtab "This package automatically generates shell tab completion scripts for Python CLI apps.") (license license:asl2.0))) + +(define-public python-sre-yield + (package + (name "python-sre-yield") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sre_yield" version)) + (sha256 + (base32 + "12kv3mvdr22g2v9wfr5aabh1f58s817dbh8mrlfzxzxs7hm1lkz9")))) + (build-system python-build-system) + (native-inputs (list python-nose)) + (home-page "https://github.com/google/sre_yield") + (synopsis "Expands a regular expression to its possible matches") + (description + "The goal of sre_yield is to efficiently generate all values that can +match a given regular expression, or count possible matches efficiently. It +uses the parsed regular expression, so you get a much more accurate result +than trying to just split strings.") + (license license:asl2.0))) -- cgit v1.2.3 From de61e4908557290c94656c49a71465e7eab17318 Mon Sep 17 00:00:00 2001 From: Vincent Prat Date: Fri, 22 Apr 2022 10:15:59 +0200 Subject: gnu: Add python-mike. * gnu/packages/python-xyz.scm (python-mike): New variable. Signed-off-by: Mathieu Othacehe --- 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 9a5d311680..a3a8734cbd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29534,3 +29534,26 @@ (define-public python-sre-yield uses the parsed regular expression, so you get a much more accurate result than trying to just split strings.") (license license:asl2.0))) + +(define-public python-mike + (package + (name "python-mike") + (version "1.1.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "mike" version)) + (sha256 + (base32 + "0yxp816x7s948xsd0fifvq9shg01xdxlifd9rzf5y2rd9iwz3hsn")))) + (build-system python-build-system) + (native-inputs + (list python-coverage python-flake8 python-shtab)) + (propagated-inputs + (list python-jinja2 python-mkdocs python-pyyaml python-verspec)) + (home-page "https://github.com/jimporter/mike") + (synopsis "Manage multiple versions of MkDocs-powered documentation") + (description + "This package provides a Python utility to easily deploy multiple +versions of MkDocs-powered docs to a Git branch. It is suitable for deploying +to Github via gh-pages.") + (license license:bsd-3))) -- cgit v1.2.3 From 7ed87432e3c8f8192cf45133d5b572c034576ca5 Mon Sep 17 00:00:00 2001 From: "Wamm K. D" Date: Wed, 20 Apr 2022 13:15:03 -0500 Subject: gnu: Add python-hypy-utils. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-hypy-utils): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a3a8734cbd..afb80171a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -119,6 +119,7 @@ ;;; Copyright © 2022 Evgeny Pisemsky ;;; Copyright © 2022 drozdov ;;; Copyright © 2022 Peter Polidoro +;;; Copyright © 2022 Wamm K. D. ;;; ;;; This file is part of GNU Guix. ;;; @@ -29535,6 +29536,23 @@ (define-public python-sre-yield than trying to just split strings.") (license license:asl2.0))) +(define-public python-hypy-utils + (package + (name "python-hypy-utils") + (version "1.0.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "hypy_utils" version)) + (sha256 + (base32 + "05csk0x8ivavq88x457cq5hwjcdirfbkzj7bbg5qgnpnf2dxxhiw")))) + (build-system python-build-system) + (home-page "https://github.com/hykilpikonna/HyPyUtils") + (synopsis "Python utility functions for HyDEV") + (description "This module provides Python utility functions for modifying +and setting the color of terminal output, via HyDEV.") + (license license:expat))) + (define-public python-mike (package (name "python-mike") -- cgit v1.2.3 From bf10421a67d308a0b306e27a4ff1576a491362a2 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 14 Apr 2022 13:10:36 +0200 Subject: gnu: python-pyyaml: Reintroduce 5.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyyaml-5): New variable. Co-authored-by: Ludovic Courtès --- 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 afb80171a5..f8e599a453 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3930,6 +3930,18 @@ (define-public python-pyyaml (license license:expat) (properties `((python2-variant . ,(delay python2-pyyaml)))))) +(define-public python-pyyaml-5 + (package + (inherit python-pyyaml) + (version "5.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))) + (define-public python2-pyyaml (let ((base (package-with-python2 (strip-python2-variant python-pyyaml)))) (package -- cgit v1.2.3 From 1bb177d08401feb4370d6422f2c6fc746adc7c2a Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Wed, 6 Apr 2022 15:21:14 -0400 Subject: gnu: Add python-flatten-json. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-flatten-json): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f8e599a453..2bfe6745d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29587,3 +29587,22 @@ (define-public python-mike versions of MkDocs-powered docs to a Git branch. It is suitable for deploying to Github via gh-pages.") (license license:bsd-3))) + +(define-public python-flatten-json + (package + (name "python-flatten-json") + (version "0.1.13") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flatten_json" version)) + (sha256 + (base32 "007m28gfs7pmz2rqqjxpial6skzw26hrfi8vrdy9agi9x0rj6dgf")))) + (build-system python-build-system) + (propagated-inputs (list python-six)) + (home-page "https://github.com/amirziai/flatten") + (synopsis "Flatten JSON objects") + (description + "The @code{flatten_json} Python library flattens the hierarchy in your +object, which can be useful if you want to force your objects into a table.") + (license license:expat))) -- cgit v1.2.3 From 33366f196e01f759228cf532a415a356dcc24222 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 1 May 2022 12:48:02 +0200 Subject: gnu: Add python-deepmerge. * gnu/packages/python-xyz.scm (python-deepmerge): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2bfe6745d9..7391b17b77 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29606,3 +29606,48 @@ (define-public python-flatten-json "The @code{flatten_json} Python library flattens the hierarchy in your object, which can be useful if you want to force your objects into a table.") (license license:expat))) + +(define-public python-deepmerge + (package + (name "python-deepmerge") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "deepmerge" version)) + (sha256 + (base32 "06hagzg8ccmjzqvszdxb52jgx5il8a1jdz41n4dpkyyjsfg7fi2b")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800"))) + (replace 'build + (lambda _ + (invoke "python" "-m" "build" "--wheel" + "--no-isolation" "."))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest")))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl))))))) + (native-inputs + (list python-pypa-build + python-setuptools-scm + python-pytest + python-wheel)) + (home-page "https://deepmerge.readthedocs.io/en/latest/") + (synopsis "Merge nested data structures") + (description + "The @code{deep-merge} Python library provides a toolset to deeply merge +nested data structures in Python like lists and dictionaries.") + (license license:expat))) -- cgit v1.2.3 From 9dafaf163574edca5cb4eac0f8dc3edbb0ef0a75 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 May 2022 12:36:26 +0200 Subject: gnu: python-anndata: Remove python-xlrd-1. * gnu/packages/python-xyz.scm (python-anndata)[propagated-inputs]: Remove python-xlrd-1. --- gnu/packages/python-xyz.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7391b17b77..ff52b01e34 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23097,7 +23097,6 @@ (define-public python-anndata python-packaging python-pandas python-scipy - python-xlrd-1 python-zarr)) (native-inputs (list python-joblib python-pytest python-toml python-flit -- cgit v1.2.3 From 4642a50d526106c556c64862544f00532c6f0e79 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 May 2022 13:35:03 +0200 Subject: gnu: Remove python-cytoolz-for-cooler. * gnu/packages/python-xyz.scm (python-cytoolz-for-cooler): Remove variable. --- gnu/packages/python-xyz.scm | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ff52b01e34..9e5ec4c54f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23246,22 +23246,6 @@ (define-public python-cytoolz that is accessible to other projects developed in Cython.") (license license:bsd-3))) -;; python-cooler doesn't work with 0.11 yet -(define-public python-cytoolz-for-cooler - (package - (inherit python-cytoolz) - (version "0.10.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cytoolz" version)) - (sha256 - (base32 - "0p4a9nadsy1337gy2cnb5yanbn03j3zm6d9adyqad9bk3nlbpxc2")) - (modules '((guix build utils))) - (snippet - '(for-each delete-file (find-files "cytoolz" "\\.c$"))))))) - (define-public python-sortedcollections (package (name "python-sortedcollections") -- cgit v1.2.3 From 4571b218b52c2f0386fda6c9b24d011e368c13f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 2 May 2022 13:49:57 +0200 Subject: gnu: Remove python-xlrd-1. * gnu/packages/python-xyz.scm (python-xlrd-1): Remove variable. --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9e5ec4c54f..074cbeb970 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11739,32 +11739,6 @@ (define-public python-xlrd (define-public python2-xlrd (package-with-python2 python-xlrd)) -;; We need this for python-anndata -(define-public python-xlrd-1 - (package - (inherit python-xlrd) - (name "python-xlrd") - (version "1.2.0") - (source (origin - ;; The tests are not included in the PyPI archive. - (method git-fetch) - (uri (git-reference - (url "https://github.com/python-excel/xlrd") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0sm5p0ii5ayh52ak1jpw0n1kgsv72vdwwp8c3z13l8yf4irsb587")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Some tests depend on writing a temporary file to the user's home - ;; directory. - (add-after 'unpack 'fix-tests - (lambda _ - (setenv "HOME" "/tmp")))))))) - ;;; Note: this package is unmaintained since 2018 (archived on GitHub). (define-public python-xlwt (package -- cgit v1.2.3 From f728d1dcd239ea2ad5f05c77f8a990bb9a5e0e83 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 20 Apr 2022 17:27:58 +0000 Subject: gnu: Add python-pydispatcher. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pydispatcher): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 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 074cbeb970..1bc4468fa9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -108,7 +108,7 @@ ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Daniel Meißner ;;; Copyright © 2021 Pradana Aumars -;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021, 2022 Felix Gruber ;;; Copyright © 2021 Sébastien Lerique ;;; Copyright © 2021 Raphaël Mélotte ;;; Copyright © 2021 ZmnSCPxj @@ -29505,6 +29505,36 @@ (define-public python-sre-yield than trying to just split strings.") (license license:asl2.0))) +(define-public python-pydispatcher + (package + (name "python-pydispatcher") + (version "2.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyDispatcher" version)) + (sha256 + (base32 "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (native-inputs (list python-pytest)) + (home-page "http://pydispatcher.sourceforge.net") + (synopsis "Multi-producer-multi-consumer signal dispatching mechanism") + (description "PyDispatcher is an enhanced version of Patrick K. O’Brien’s +original @code{dispatcher.py} module. It provides the Python programmer with +a robust mechanism for event routing within various application contexts. + +Included in the package are the robustapply and saferef modules, which +provide the ability to selectively apply arguments to callable objects +and to reference instance methods using weak-references.") + (license license:bsd-3))) + (define-public python-hypy-utils (package (name "python-hypy-utils") -- cgit v1.2.3 From fce913281f901cbeb3e6ed8c2a4468474ac46021 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 20 Apr 2022 17:27:59 +0000 Subject: gnu: Add python-queuelib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-queuelib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1bc4468fa9..d371fb27ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29535,6 +29535,30 @@ (define-public python-pydispatcher and to reference instance methods using weak-references.") (license license:bsd-3))) +(define-public python-queuelib + (package + (name "python-queuelib") + (version "1.6.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "queuelib" version)) + (sha256 + (base32 "1lpwq8wx3025i14y5h0hbald2ypbarf081pql6cqcak4y9kp482b")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/scrapy/queuelib") + (synopsis + "Collection of persistent (disk-based) and non-persistent (memory-based) queues") + (description "Queuelib is a Python library that implements object +collections which are stored in memory or persisted to disk, provide a +simple API, and run fast. + +Queuelib provides collections for queues (FIFO), stacks (LIFO), queues +sorted by priority and queues that are emptied in a round-robin +fashion.") + (license license:bsd-3))) + (define-public python-hypy-utils (package (name "python-hypy-utils") -- cgit v1.2.3 From c0c16d6b8472563acf895578a3ebfeeb75b29fec Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 20 Apr 2022 17:28:00 +0000 Subject: gnu: Add python-itemadapter. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-itemadapter): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d371fb27ca..1c98ddb263 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29559,6 +29559,36 @@ (define-public python-queuelib fashion.") (license license:bsd-3))) +(define-public python-itemadapter + (package + (name "python-itemadapter") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "itemadapter" version)) + (sha256 + (base32 "083wp3h2brh8x19jbdr8rz3biqwp3jlqd0rfzcyrjyhssffsgdh5")))) + (build-system python-build-system) + (home-page "https://github.com/scrapy/itemadapter") + (synopsis "Common interface for data container classes") + (description "The ItemAdapter class is a wrapper for data container +objects, providing a common interface to handle objects of different +types in an uniform manner, regardless of their underlying implementation. + +Currently supported types are: +@itemize +@item scrapy.item.Item +@item dict +@item dataclass-based classes +@item attrs-based classes +@item pydantic-based classes +@end itemize + +Additionally, interaction with arbitrary types is supported by +implementing a pre-defined interface.") + (license license:bsd-3))) + (define-public python-hypy-utils (package (name "python-hypy-utils") -- cgit v1.2.3 From d9a7f652e259c7d04a2384bff92d2934904cb211 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 20 Apr 2022 17:28:03 +0000 Subject: gnu: Add python-itemloaders. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-itemloaders): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1c98ddb263..9e110577a4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29589,6 +29589,30 @@ (define-public python-itemadapter implementing a pre-defined interface.") (license license:bsd-3))) +(define-public python-itemloaders + (package + (name "python-itemloaders") + (version "1.0.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "itemloaders" version)) + (sha256 + (base32 "15hc78h90qhwass1bga1c3xar2dd6j8sxg61zg6jvh74lf6csxqj")))) + (build-system python-build-system) + (propagated-inputs + (list python-itemadapter python-jmespath python-parsel python-w3lib)) + (home-page "https://github.com/scrapy/itemloaders") + (synopsis "Base library for scrapy's ItemLoader") + (description "Itemloaders is a library that helps you collect data +from HTML and XML sources. It comes in handy to extract data from web +pages, as it supports data extraction using CSS and XPath Selectors. + +It’s specially useful when you need to standardize the data from many +sources. For example, it allows you to have all your casting and +parsing rules in a single place.") + (license license:bsd-3))) + (define-public python-hypy-utils (package (name "python-hypy-utils") -- cgit v1.2.3 From d809e71df220e2be40a7cee32316ca3f20da6768 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 5 May 2022 16:14:43 +0200 Subject: gnu: python-pari-jupyter: Update to 1.4.1. * gnu/packages/python-xyz.scm (python-pari-jupyter): Update to 1.4.1. [home-page]: Update after maintainer change. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9e110577a4..82d297af3b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8947,21 +8947,21 @@ (define-public python-ipykernel-bootstrap (define-public python-pari-jupyter (package (name "python-pari-jupyter") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (pypi-uri "pari-jupyter" version)) (sha256 (base32 - "1hwjr66vfjsx28qmxrgsp3z0px1xqwxv53byvsrbwbjp4pbp79sz")))) + "1ikqvv335qfrhmlji0iclci6pnm2c3fvnxf031jr1d68j79g6ypd")))) (build-system python-build-system) (arguments '(#:tests? #f)) ;no test suite (propagated-inputs (list python-ipykernel)) (inputs (list pari-gp readline)) - (home-page "https://github.com/jdemeyer/pari-jupyter") + (home-page "https://github.com/sagemath/pari-jupyter") (synopsis "Jupyter kernel for PARI/GP") (description "The package provides a PARI/GP kernel for Jupyter.") (license license:gpl3+))) -- cgit v1.2.3 From b95e3dc17cc8f4ba4f7796a12c34837dd4af164b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 May 2022 12:27:51 +0200 Subject: gnu: python-multipart: Fix test failure due to PyYAML 6. * gnu/packages/python-xyz.scm (python-multipart)[arguments]: Patch instance of yaml.load. --- gnu/packages/python-xyz.scm | 6 +++++- 1 file changed, 5 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 82d297af3b..a37dc5e9e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29393,7 +29393,11 @@ (define-public python-multipart (lambda _ (substitute* "setup.py" (("test_suite = 'multipart.tests.suite'") - "test_suite = 'multipart.tests.test_multipart.suite'"))))))) + "test_suite = 'multipart.tests.test_multipart.suite'")) + ;; Needed by PyYAML 6.0. + (substitute* "multipart/tests/test_multipart.py" + (("yaml_data = yaml.load\\(f\\)") + "yaml_data = yaml.load(f, Loader=yaml.SafeLoader)"))))))) (home-page "https://github.com/andrew-d/python-multipart") (synopsis "Streaming multipart parser for Python") (description -- cgit v1.2.3 From 43992cdbea4d264a8e2aea1905eff98006709fbc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 May 2022 12:37:38 +0200 Subject: gnu: python-anyio: Update to 3.5.0. * gnu/packages/python-xyz.scm (python-anyio): Update to 3.5.0. [arguments]: Remove phase 'fix-compatibility; disable one more test. [propagated-inputs]: Add python-contextvars and python-dataclasses. [native-inputs]: Add python-contextlib2 and python-trio; remove python-iniconfig. --- gnu/packages/python-xyz.scm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a37dc5e9e2..aa74063ace 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24736,25 +24736,18 @@ (define-public python-iocapture (define-public python-anyio (package (name "python-anyio") - (version "3.3.0") + (version "3.5.0") (source (origin (method url-fetch) (uri (pypi-uri "anyio" version)) (sha256 (base32 - "0x03hsprdrs86wjjkj96zm2jswy3a5bgyrknyi58pzz5hdsscmxf")))) + "19m58805wir4i2s45dd5ynwlzb7ky1218isbir53gpqzzgigzbm0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-compatibility - (lambda _ - (substitute* "tests/test_taskgroups.py" - (("import pytest") - "import pytest\nimport _pytest\nfrom _pytest import logging") - (("pytest.LogCaptureFixture") - "_pytest.logging.LogCaptureFixture")))) (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? @@ -24791,18 +24784,24 @@ (define-public python-anyio " and not test_send_eof" " and not test_send_large_buffer" " and not test_send_receive" - " and not test_socket_options")))))))) + " and not test_socket_options" + " and not test_unretrieved_future_exception_server_crash")))))))) (propagated-inputs - (list python-idna python-sniffio python-typing-extensions)) + (list python-contextvars + python-dataclasses + python-idna + python-sniffio + python-typing-extensions)) (native-inputs - (list python-coverage + (list python-contextlib2 + python-coverage python-hypothesis - python-iniconfig python-mock python-pytest-6 python-pytest-mock python-pytest-trio python-setuptools-scm + python-trio python-trustme python-uvloop)) (home-page "https://github.com/agronholm/anyio") -- cgit v1.2.3 From 471f6504983c7bd266603512910b9445c995e5e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 5 May 2022 23:22:50 +0200 Subject: gnu: Add python-kneed. * gnu/packages/python-xyz.scm (python-kneed): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aa74063ace..4b23dac960 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19337,6 +19337,26 @@ (define-public python-mwclient (description "This package provides a MediaWiki API client.") (license license:expat))) +(define-public python-kneed + (package + (name "python-kneed") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "kneed" version)) + (sha256 + (base32 "0vkwi0pr7nfkp3c46hnmx0275yx68v96v10rmspv0wis33x6f39l")))) + (build-system python-build-system) + (propagated-inputs + (list python-matplotlib python-numpy python-scipy)) + (home-page "https://github.com/arvkevi/kneed") + (synopsis "Knee-point detection in Python") + (description "This package implements the kneedle algorithm. Given a set +of x and y values, kneed will return the knee point of the function. The knee +point is the point of maximum curvature.") + (license license:bsd-3))) + (define-public python-utils (package (name "python-utils") -- cgit v1.2.3 From ce1746819b76fa65d058467c81bd52287a1165f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 May 2022 08:43:22 +0200 Subject: gnu: python-traitlets: Update to 5.1.1. * gnu/packages/python-xyz.scm (python-traitlets): Update to 5.1.1. [propagated-inputs]: Remove python-ipython-genutils, python-decorator, and python-six. --- gnu/packages/python-xyz.scm | 6 ++---- 1 file changed, 2 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 4b23dac960..4cf606e6e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8735,21 +8735,19 @@ (define-public python-ipython-sql (define-public python-traitlets (package (name "python-traitlets") - (version "4.3.3") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "traitlets" version)) (sha256 (base32 - "1xsrwgivpkxlbr4dfndfsi098s29yqgswgjc1qqn69yxklvfw8yh")))) + "1ivhxglsrnhqw4g98ihddn7i5f6976gpk31fijwq473wb9n4b7q5")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets")))))) - (propagated-inputs - (list python-ipython-genutils python-decorator python-six)) (native-inputs (list python-pytest)) (home-page "https://ipython.org") -- cgit v1.2.3 From a2fb35e43db8913a26377d19f4cab5759774240c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 May 2022 09:47:58 +0200 Subject: gnu: python-ipython: Add missing input. * gnu/packages/python-xyz.scm (python-ipython)[propagated-inputs]: Add python-decorator. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4cf606e6e2..804cffced4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8999,6 +8999,7 @@ (define-public python-ipython (build-system python-build-system) (propagated-inputs (list python-backcall + python-decorator python-pyzmq python-prompt-toolkit-2 python-terminado -- cgit v1.2.3 From 9e630a362d8d280800cc96c9420ff09f119228b7 Mon Sep 17 00:00:00 2001 From: Vincent Prat Date: Fri, 29 Apr 2022 09:43:35 +0200 Subject: gnu: Add python-arpeggio. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-arpeggio): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 804cffced4..cf3e201b1a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29675,6 +29675,35 @@ (define-public python-mike to Github via gh-pages.") (license license:bsd-3))) +(define-public python-arpeggio + (package + (name "python-arpeggio") + (version "2.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "Arpeggio" version)) + (sha256 + (base32 + "0ggdsck1wpladd5bh9drhkmm86bblgk2wagrhn3sdf4v04wkic6n")))) + (build-system python-build-system) + (native-inputs (list python-coverage + python-coveralls + python-flake8 + python-mike + python-mkdocs + python-pytest + python-pytest-runner + python-twine + python-wheel)) + (home-page "https://github.com/textX/Arpeggio") + (synopsis "Packrat parser interpreter for Python") + (description + "This Python library provides a recursive descent parser with backtracking +and memoization (a.k.a. packrat parser). Arpeggio grammars are based on PEG +formalism. Arpeggio's main use is a foundation for a toolchain for DSL +development but it can be used for all sorts of general purpose parsing.") + (license license:expat))) + (define-public python-flatten-json (package (name "python-flatten-json") -- cgit v1.2.3 From 0d73287d9735f607b1f1bb3b1230553c7b4c7972 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 May 2022 11:22:58 +0200 Subject: gnu: Add python-mercantile. * gnu/packages/python-xyz.scm (python-mercantile): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cf3e201b1a..cde610455f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24403,6 +24403,32 @@ (define-public python-folium supports Image, Video, GeoJSON and TopoJSON overlays.") (license license:expat))) +(define-public python-mercantile + (package + (name "python-mercantile") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mercantile" version)) + (sha256 + (base32 "0sxmndhzzrvss5irsgzfrk51k6jihwcb7661992mizdgbnqnsg7s")))) + (build-system python-build-system) + (propagated-inputs (list python-click)) + (native-inputs + (list python-check-manifest python-hypothesis python-pytest)) + (home-page "https://github.com/mapbox/mercantile") + (synopsis "Web mercator XYZ tile utilities") + (description "The mercantile module provides @code{ul(xtile, ytile, zoom)} +and @code{bounds(xtile, ytile, zoom)} functions that respectively return the +upper left corner and bounding longitudes and latitudes for XYZ tiles, a +@code{xy(lng, lat)} function that returns spherical mercator x and y +coordinates, a @code{tile(lng, lat, zoom)} function that returns the tile +containing a given point, and quadkey conversion functions +@code{quadkey(xtile, ytile, zoom)} and @code{quadkey_to_tile(quadkey)} for +translating between quadkey and tile coordinates.") + (license license:bsd-3))) + (define-public jube (package ;; This is a command-line tool, so no "python-" prefix. -- cgit v1.2.3 From 221bf543e8e92230424d7d3ca7f1c61c33b536f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 6 May 2022 11:23:34 +0200 Subject: gnu: Add python-xyzservices. * gnu/packages/python-xyz.scm (python-xyzservices): New variable. --- 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 cde610455f..6f450f6c50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24429,6 +24429,33 @@ (define-public python-mercantile translating between quadkey and tile coordinates.") (license license:bsd-3))) +(define-public python-xyzservices + (package + (name "python-xyzservices") + (version "2022.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xyzservices" version)) + (sha256 + (base32 "1paxv4i0dws85md7csv7pf80jl3xh792mx8rxnsrk61ks3ivbsyg")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs + (list python-pytest python-mercantile python-requests)) + (home-page "https://github.com/geopandas/xyzservices") + (synopsis "Source of XYZ tiles providers") + (description "@code{xyzservices} is a lightweight library providing a +repository of available XYZ services offering raster basemap tiles. The +repository is provided via Python API and as a compressed JSON file.") + (license license:bsd-3))) + (define-public jube (package ;; This is a command-line tool, so no "python-" prefix. -- cgit v1.2.3 From 1439bc9dbbf563b4267e2b49f3b0c3432b40bad3 Mon Sep 17 00:00:00 2001 From: Jai Vetrivelan Date: Thu, 14 Apr 2022 12:30:28 +0530 Subject: gnu: Add python-click-8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-click-8): New variable. Signed-off-by: Ludovic Courtès --- 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 6f450f6c50..5221b29bd7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3510,6 +3510,18 @@ (define-public python-click-5 (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) (arguments `()))) +(define-public python-click-8 + (package (inherit python-click) + (name "python-click") + (version "8.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click" version)) + (sha256 + (base32 "0whs38a2i0561kwbgigs6vic9r0a1887m2v1aw3rmv6r2kz0g5s7")))) + (arguments `()))) + (define-public python-cligj (package (name "python-cligj") -- cgit v1.2.3 From 4f3fd912a7bfcc8dd8bbcdfa1df7b7b58dc05746 Mon Sep 17 00:00:00 2001 From: Jai Vetrivelan Date: Thu, 14 Apr 2022 12:30:29 +0530 Subject: gnu: Add python-proselint. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-proselint): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5221b29bd7..eea67eec46 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -120,6 +120,7 @@ ;;; Copyright © 2022 drozdov ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Wamm K. D. +;;; Copyright © 2022 Jai Vetrivelan ;;; ;;; This file is part of GNU Guix. ;;; @@ -17168,6 +17169,33 @@ (define-public python-prompt-toolkit (license license:bsd-3) (properties `((python2-variant . ,(delay python-prompt-toolkit-2)))))) +(define-public python-proselint + (package + (name "python-proselint") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "proselint" version)) + (sha256 + (base32 + "0n1ahnq2mkgvh94g05xhc3l1fs3hh0ycskqlqivhhfdaq8ybdlkx")))) + (build-system python-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + (lambda _ + (setenv "HOME" "/tmp")))))) + (propagated-inputs + (list python-click-8 python-future python-six)) + (home-page "https://github.com/amperser/proselint") + (synopsis "Linter for prose") + (description "@code{python-proselint} is a linter for English prose, that +scans through a file and detects issues.") + (license license:bsd-3))) + (define-public python-prompt-toolkit-2 (package (inherit python-prompt-toolkit) (name "python-prompt-toolkit") -- cgit v1.2.3 From 09e720309ebcd1d75ef5a59737fe9876897422fe Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 25 Apr 2022 04:15:57 -0400 Subject: gnu: Add python-style. * gnu/packages/python-xyz.scm (python-style): New variable. Co-authored-by: Yuchen Pei Co-authored-by: donotshake Co-authored-by: Vagrant Cascadian Co-authored-by: Pranav Vats Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eea67eec46..b86774fb64 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29598,6 +29598,24 @@ (define-public python-shtab Python CLI apps.") (license license:asl2.0))) +(define-public python-style + (package + (name "python-style") + (version "1.1.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "style" version)) + (sha256 + (base32 "1dcfb578v9mrwh92rgms87gql0gp4vgj6l9hpgyfg0wbd3rh3bfh")))) + (build-system python-build-system) + (home-page "https://github.com/lmittmann/style") + (synopsis "Terminal string styling") + (description +"@code{python-style} is a simple terminal string styling package. Its API is +a port of the chalk package for javascript.") + (license license:expat))) + (define-public python-sre-yield (package (name "python-sre-yield") -- cgit v1.2.3 From 4980630d1e3e6f9a6dc05438c7593a727207d9a0 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 23 Apr 2022 16:48:05 +0000 Subject: gnu: python-numpy-next: Update to 1.22.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-numpy-next): Update to 1.22.3. [native-inputs]: Replace python-hypothesis with python-hypothesis-6.23. * gnu/packages/python-xyz.scm (python-numpy-1.20)[native-inputs]: Explicitly set native-inputs to prevent it to inherit the modified native-inputs from python-numpy-next, which would result in > 2000 package rebuilds. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 12 +++++++++--- 1 file changed, 9 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 b86774fb64..659538d193 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5693,7 +5693,7 @@ (define-public python-cython-3 (define-public python-numpy-next (package (name "python-numpy-next") - (version "1.21.3") + (version "1.22.3") (source (origin (method url-fetch) @@ -5702,12 +5702,12 @@ (define-public python-numpy-next version "/numpy-" version ".tar.gz")) (sha256 (base32 - "0s6hy8828yr7fcjiwnym4l8lrknr21gqfkaiawsf86n0hd0a5fyh")))) + "19dw91pqbqcniw2z57kiyqs1qp56g7kqy1bdyv664g8s62sc01m9")))) (build-system python-build-system) (inputs (list openblas)) (native-inputs - (list python-cython python-hypothesis python-pytest + (list python-cython python-hypothesis-6.23 python-pytest python-pytest-xdist gfortran)) (arguments `(#:phases @@ -5799,6 +5799,12 @@ (define-public python-numpy-1.20 (sha256 (base32 "140zq9snx0di4id4g97vaw9zz8x2rfla5lp3a70j666f5030yd5p")))) + ;; python-numpy-next replaced python-hypothesis with + ;; python-hypothesis-6.23. We switch it back here, to prevent + ;; python-numpy-1.20 and its numerous dependents from being rebuilt. + (native-inputs + (list python-cython python-hypothesis python-pytest + python-pytest-xdist gfortran)) ;; 92 tests fail, many of them because parts of the temp file name ;; accidentally ends up in a comparison. (arguments -- cgit v1.2.3 From e764b89a52171fd5ff6d22fdb562ceb60ec6a50a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 31 Mar 2022 16:34:47 +0000 Subject: gnu: libgit2: Update to 1.4.3. * gnu/packages/version-control.scm (libgit2): Update to 1.4.3. [source]: Adjust snippet to comment out the "10 years ago" test, which was changed in 1.4.3 but is still problematic. [arguments]: Add "-DUSE_SSH=ON". Remove 'fix-hardcoded-paths' phase. Adjust 'check' phase for new executable name. (libgit2-1.3): New variable. (libgit2-1.1): Inherit from 'libgit2-1.3'; inherit from its origin too. * gnu/packages/crates-io.scm (rust-git2-0.13)[inputs]: Use LIBGIT2-1.3. * gnu/packages/python-xyz.scm (python-pygit2)[propagated-inputs]: Likewise. Co-authored-by: Maxime Devos --- gnu/packages/crates-io.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/version-control.scm | 66 ++++++++++++++++++++++++---------------- 3 files changed, 41 insertions(+), 29 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c55c7593e..136e5fe727 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25048,7 +25048,7 @@ (define-public rust-git2-0.13 `(("pkg-config" ,pkg-config) ("git" ,git-minimal))) ;for a single test (inputs - (list libgit2 libssh2 openssl zlib)) + (list libgit2-1.3 libssh2 openssl zlib)) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Rust bindings to libgit2") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 659538d193..299804ae3e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6137,7 +6137,7 @@ (define-public python-pygit2 (arguments '(#:tests? #f)) ; tests don't run correctly in our environment (propagated-inputs - (list python-cached-property python-cffi libgit2)) + (list python-cached-property python-cffi libgit2-1.3)) (native-inputs (list python-pytest)) (home-page "https://github.com/libgit2/pygit2") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 49b53789f9..d528a08e63 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -789,7 +790,7 @@ (define-public git-cal (define-public libgit2 (package (name "libgit2") - (version "1.3.0") + (version "1.4.3") (source (origin ;; Since v1.1.1, release artifacts are no longer offered (see: ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). @@ -800,18 +801,18 @@ (define-public libgit2 (file-name (git-file-name name version)) (sha256 (base32 - "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")) + "02x1a4zrzpzjd0yxnsi8njh5hgihc1iy1v4r0fnl8m4ckcgp6x2s")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "deps") ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" doesn't match anything, - ;; which is no longer true. Adjust that test. + ;; assumes "HEAD@{10 years ago}" matches a specific commit. + ;; See . (substitute* "tests/refs/revparse.c" - (("10 years ago") - "100 years ago")))))) + (("test_object.*10 years ago.*" all) + (string-append "// " all "\n"))))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -819,6 +820,7 @@ (define-public libgit2 (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing ,@(if (%current-target-system) `((string-append "-DPKG_CONFIG_EXECUTABLE=" @@ -829,18 +831,11 @@ (define-public libgit2 '())) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* "tests/repo/init.c" - (("#!/bin/sh") (string-append "#!" (which "sh")))) - (substitute* "tests/clar/fs.h" - (("/bin/cp") (which "cp")) - (("/bin/rm") (which "rm"))))) ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check (lambda* (#:key (tests? #t) #:allow-other-keys) (if tests? - (invoke "./libgit2_clar" "-v" "-Q") + (invoke "./libgit2_tests" "-v" "-Q") ;; Tests may be disabled if cross-compiling. (format #t "Test suite not run.~%"))))))) (inputs @@ -859,12 +854,39 @@ (define-public libgit2 ;; GPLv2 with linking exception (license license:gpl2))) -(define-public libgit2-1.1 +(define-public libgit2-1.3 (package (inherit libgit2) - (name "libgit2") + (version "1.3.0") + (source (origin + (inherit (package-source libgit2)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name "libgit2" version)) + (sha256 + (base32 + "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")))) + (arguments + (substitute-keyword-arguments (package-arguments libgit2) + ((#:phases _ '%standard-phases) + `(modify-phases %standard-phases + ;; Run checks more verbosely, unless we are cross-compiling. + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (invoke "./libgit2_clar" "-v" "-Q") + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%")))))))))) + +(define-public libgit2-1.1 + (package + (inherit libgit2-1.3) (version "1.1.0") (source (origin + (inherit (package-source libgit2-1.3)) + (file-name #f) ;use the default name (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" "releases/download/v" version @@ -872,17 +894,7 @@ (define-public libgit2-1.1 (sha256 (base32 "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) - (patches (search-patches "libgit2-mtime-0.patch")) - (snippet '(begin - (delete-file-recursively "deps") - - ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" doesn't match anything, - ;; which is no longer true. Adjust that test. - (substitute* "tests/refs/revparse.c" - (("10 years ago") - "100 years ago")))) - (modules '((guix build utils))))))) + (patches (search-patches "libgit2-mtime-0.patch")))))) (define-public git-crypt (package -- cgit v1.2.3 From d3553810627ebb8019e383acbc6a2daae01dfadf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 11 May 2022 23:41:37 +0200 Subject: gnu: python-pygit2: Update to 1.9.1. * gnu/packages/python-xyz.scm (python-pygit2): Update to 1.9.1. [propagated-inputs]: Change LIBGIT2-1.3 to LIBGIT2. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 299804ae3e..ab4102273a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6126,18 +6126,18 @@ (define-public python-numpy-documentation (define-public python-pygit2 (package (name "python-pygit2") - (version "1.7.1") + (version "1.9.1") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 - (base32 "0p8n25bijirxh31cv99vd1mkdsvpcs6z6441wz1fqva3b2as5ynp")))) + (base32 "1jdr6z1il03nifwgpcdf95w6xzzbfzdkcqq5dcqjaa0rnv1pjr7g")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; tests don't run correctly in our environment (propagated-inputs - (list python-cached-property python-cffi libgit2-1.3)) + (list python-cached-property python-cffi libgit2)) (native-inputs (list python-pytest)) (home-page "https://github.com/libgit2/pygit2") -- cgit v1.2.3 From 75ca0e52581f7da95f540acadada671ee08a0cda Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 May 2022 16:07:53 +0200 Subject: gnu: python2-setuptools: Patch source code. * gnu/packages/python-xyz.scm (python2-setuptools)[arguments]: Add phase 'compatibility-fixes. --- gnu/packages/python-xyz.scm | 12 +++++++++++- 1 file changed, 11 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 ab4102273a..0ef71605e9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1863,7 +1863,17 @@ (define-public python2-setuptools ;; FIXME: Tests require pytest, which itself relies on setuptools. ;; One could bootstrap with an internal untested setuptools. (arguments - `(#:tests? #f)) + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'compatibility-fixes + (lambda _ + ;; HTMLParser no longer exists. + (substitute* "setuptools/py33compat.py" + (("html_parser.HTMLParser\\(\\).unescape") + "html.unescape")) + ;; This needs distutils.msvc9compiler + (delete-file "setuptools/tests/test_msvc.py")))))) (native-inputs (list unzip)) (home-page "https://pypi.org/project/setuptools/") -- cgit v1.2.3 From 2936acfb37d87d33f1e879a63795aa7c65affb07 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 11 May 2022 16:18:33 +0200 Subject: gnu: python2-numpy: Update name. * gnu/packages/python-xyz.scm (python2-numpy)[name]: Rename to python2-numpy. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ef71605e9..d1df93826f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5772,7 +5772,7 @@ (define-public python2-numpy (strip-python2-variant python-numpy-next)))) (package (inherit numpy) - (name "python-numpy") + (name "python2-numpy") (version "1.16.5") (source (origin (method url-fetch) -- cgit v1.2.3 From df53689c512ac7ff38b270596f0cee0f41d12dfb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 22 Mar 2022 23:36:56 -0400 Subject: gnu: python-ipython: Re-order fields. * gnu/packages/python-xyz.scm (python-ipython): Move the 'arguments' field right after the 'build-system' one, Re-indent 'inputs' field. [propagated-inputs]: Sort inputs. --- gnu/packages/python-xyz.scm | 80 +++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 43 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d1df93826f..95fab20247 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9026,34 +9026,6 @@ (define-public python-ipython (sha256 (base32 "04xgymypnbfgf2q0d5b0hanjbjsp53f055sh1p8xlq52vyzmxdaq")))) (build-system python-build-system) - (propagated-inputs - (list python-backcall - python-decorator - python-pyzmq - python-prompt-toolkit-2 - python-terminado - python-matplotlib - python-matplotlib-inline - python-numpy - python-numpydoc - python-jedi - python-jinja2 - python-mistune - python-pexpect - python-pickleshare - python-simplegeneric - python-jsonschema - python-traitlets - python-nbformat - python-pygments)) - (inputs - (list readline which)) - (native-inputs - (list graphviz - pkg-config - python-requests ;; for tests - python-testpath - python-nose)) (arguments `(#:phases (modify-phases %standard-phases @@ -9063,20 +9035,6 @@ (define-public python-ipython ((".*import datetime") "") ((".*datetime.datetime.now\\(\\)") "") (("%timeit") "# %timeit")))) - ;; Tests can only be run after the library has been installed and not - ;; within the source directory. - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (if tests? - (begin - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (setenv "HOME" "/tmp/") ;; required by a test - ;; 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"))))) (add-before 'check 'fix-tests (lambda* (#:key inputs #:allow-other-keys) (substitute* "./IPython/utils/_process_posix.py" @@ -9091,7 +9049,43 @@ (define-public python-ipython (delete-file "IPython/core/tests/test_interactiveshell.py") ;; AttributeError: module 'matplotlib_inline' has no ;; attribute 'backend_inline' - (delete-file "IPython/core/tests/test_pylabtools.py")))))) + (delete-file "IPython/core/tests/test_pylabtools.py"))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) + (setenv "HOME" "/tmp/") ;; required by a test + ;; 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"))))))) + (inputs (list readline which)) + (propagated-inputs + (list python-backcall + python-jedi + python-jinja2 + python-jsonschema + python-matplotlib + python-matplotlib-inline + python-mistune + python-nbformat + python-numpy + python-numpydoc + python-pexpect + python-pickleshare + python-prompt-toolkit-2 + python-pygments + python-pyzmq + python-simplegeneric + python-terminado + python-traitlets)) + (native-inputs + (list graphviz + pkg-config + python-requests ;for tests + python-testpath + python-nose)) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") (description -- cgit v1.2.3 From a116f7fdeeb267146d59ff03e148934e7373496d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 23 Mar 2022 00:21:56 -0400 Subject: gnu: python-astroid: Propagate python-typing-extensions. * gnu/packages/python-xyz.scm (python-astroid) [native-inputs]: Move python-typing-extensions to... [propagated-inputs]: ... here. [synopsis]: Shorten. [description]: Normalize indentation. --- gnu/packages/python-xyz.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 95fab20247..8e1f0fd807 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19084,21 +19084,19 @@ (define-public python-astroid (base32 "19iiys4233cicpm48fd7lrkm31kk47qiv44wvk952rqbcn4rd2dh")))) (build-system python-build-system) (propagated-inputs - (list python-lazy-object-proxy python-wrapt)) + (list python-lazy-object-proxy python-typing-extensions python-wrapt)) (native-inputs - (list python-pytest python-pytest-runner python-typing-extensions)) + (list python-pytest python-pytest-runner)) (home-page "https://github.com/PyCQA/astroid") - (synopsis "Common base representation of python source code for pylint and - other projects") + (synopsis "Python source code base representation") (description "@code{python-astroid} provides a common base representation - of python source code for projects such as pychecker, pyreverse, pylint, etc. - - It provides a compatible representation which comes from the _ast module. It - rebuilds the tree generated by the builtin _ast module by recursively walking - down the AST and building an extended ast. The new node classes have - additional methods and attributes for different usages. They include some - support for static inference and local name scopes. Furthermore, astroid - builds partial trees by inspecting living objects.") +of Python source code for projects such as pychecker, pyreverse, pylint, etc. +It provides a compatible representation which comes from the _ast module. It +rebuilds the tree generated by the builtin _ast module by recursively walking +down the AST and building an extended ast. The new node classes have +additional methods and attributes for different usages. They include some +support for static inference and local name scopes. Furthermore, astroid +builds partial trees by inspecting living objects.") (license license:lgpl2.1+))) (define-public python-isbnlib -- cgit v1.2.3 From dc04cf5598cc17d9220996b65266cb45b175cf7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 23 Mar 2022 00:28:15 -0400 Subject: gnu: Add python-pure-eval. * gnu/packages/python-xyz.scm (python-pure-eval): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8e1f0fd807..9ed49d5cc3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9015,6 +9015,24 @@ (define-public python-backcall callback signature using a prototype function.") (license license:bsd-3))) +(define-public python-pure-eval + (package + (name "python-pure-eval") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pure_eval" version)) + (sha256 + (base32 "1hwsm85cwqwh6d6x4vzcimla2865s6v19ms3ym81ganzyq534i9b")))) + (build-system python-build-system) + (native-inputs (list python-pytest python-setuptools-scm)) + (home-page "https://github.com/alexmojaki/pure_eval") + (synopsis "Python library to evaluate abstract syntax tree nodes") + (description "The @code{pure_eval} Python library can safely evaluate +abstract syntax tree (AST) nodes without side effects.") + (license license:expat))) + (define-public python-ipython (package (name "python-ipython") -- cgit v1.2.3 From 952c8f805cd1f67ae192c0904e89ba8fe490d8ba Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 23 Mar 2022 00:28:29 -0400 Subject: gnu: Add python-asttokens. * gnu/packages/python-xyz.scm (python-asttokens): 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 9ed49d5cc3..1d3c4ca3e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9033,6 +9033,28 @@ (define-public python-pure-eval abstract syntax tree (AST) nodes without side effects.") (license license:expat))) +(define-public python-asttokens + (package + (name "python-asttokens") + (version "2.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asttokens" version)) + (sha256 + (base32 "1mglbkikxvnhrk3inbx0v1qzxwd38qjr6l35sn098yicy0ac2m4s")))) + (build-system python-build-system) + (propagated-inputs (list python-six)) + (native-inputs (list python-astroid python-pytest python-setuptools-scm)) + (home-page "https://github.com/gristlabs/asttokens") + (synopsis "Python library to annotate abstract syntax trees") + (description "The @code{asttokens} module annotates Python abstract syntax +trees (ASTs) with the positions of tokens and text in the source code that +generated them. It makes it possible for tools that work with logical AST +nodes to find the particular text that resulted in those nodes, for example +for automated refactoring or highlighting.") + (license license:asl2.0))) + (define-public python-ipython (package (name "python-ipython") -- cgit v1.2.3 From 68d7bc9ee518fd8d4485b1da89180860173e4481 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 23 Mar 2022 00:28:38 -0400 Subject: gnu: Add python-littleutils. * gnu/packages/python-xyz.scm (python-littleutils): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1d3c4ca3e1..87c9bb015c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9055,6 +9055,23 @@ (define-public python-asttokens for automated refactoring or highlighting.") (license license:asl2.0))) +(define-public python-littleutils + (package + (name "python-littleutils") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "littleutils" version)) + (sha256 + (base32 "0vwijrylppmk0nbddqvn527r9cg3zw8d6zk6r58hslry42jf7jp6")))) + (build-system python-build-system) + (home-page "https://github.com/alexmojaki/littleutils") + (synopsis "Python utility function collection") + (description "@code{littleutils} is a small collection of Python utility +functions, useful in the context of writing unit tests among other uses.") + (license license:expat))) + (define-public python-ipython (package (name "python-ipython") -- cgit v1.2.3 From 9d31c06992e631167918b04db53c1c281f60222b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 23 Mar 2022 00:28:52 -0400 Subject: gnu: Add python-stack-data. * gnu/packages/python-xyz.scm (python-stack-data): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 87c9bb015c..622af01927 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9072,6 +9072,32 @@ (define-public python-littleutils functions, useful in the context of writing unit tests among other uses.") (license license:expat))) +(define-public python-stack-data + (package + (name "python-stack-data") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "stack_data" version)) + (sha256 + (base32 "04lfcj5qrn4qikjw89qbdzqwm0xm4bgm4m8rll1rafk3pm0jssa5")))) + (build-system python-build-system) + (propagated-inputs (list python-asttokens python-executing python-pure-eval)) + (native-inputs + (list python-cython + python-littleutils + python-pygments + python-pytest + python-setuptools-scm + python-typeguard)) + (home-page "https://github.com/alexmojaki/stack_data") + (synopsis "Python stack frame and traceback manipulation library") + (description "The @code{stack_data} Python library extracts data from +stack frames and tracebacks. Is can be used to display more useful tracebacks +than the default.") + (license license:expat))) + (define-public python-ipython (package (name "python-ipython") -- cgit v1.2.3 From 812f2a185a82beb9dbd6af499a516a49d722932d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 30 Mar 2022 18:05:08 -0400 Subject: gnu: python-traitlets: Update to 5.1.1. * gnu/packages/python-xyz.scm (python-traitlets): Update to 5.1.1. [phases]{check}: Honor TESTS?. [propagated-inputs]: Delete field. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 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 622af01927..f6bb0fb0f7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8776,7 +8776,9 @@ (define-public python-traitlets (arguments `(#:phases (modify-phases %standard-phases - (replace 'check (lambda _ (invoke "pytest" "-vv" "traitlets")))))) + (replace 'check (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "traitlets"))))))) (native-inputs (list python-pytest)) (home-page "https://ipython.org") -- cgit v1.2.3 From e6f46eabbd1694d0c947af9f53778ca66561c47c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Apr 2022 12:19:05 -0400 Subject: gnu: python-jinja2: Update to 3.1.1. * gnu/packages/python-xyz.scm (python-jinja2): Update to 3.1.1. --- gnu/packages/python-xyz.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f6bb0fb0f7..6bcb17dfad 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4075,14 +4075,14 @@ (define-public python2-markupsafe (define-public python-jinja2 (package (name "python-jinja2") - (version "3.0.1") + (version "3.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "197ms1wimxql650245v63wkv04n8bicj549wfhp51bx68x5lhgvh")))) + "1saawzys14l1p4kafs7hkihmnvqjq8fwxjmkjiqx3jq1nm5ys2v4")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -4091,11 +4091,9 @@ (define-public python-jinja2 (if tests? (invoke "pytest" "-vv") (format #t "test suite not run~%"))))))) - (native-inputs - (list python-pytest)) - (propagated-inputs - (list python-markupsafe)) - (home-page "http://jinja.pocoo.org/") + (native-inputs (list python-pytest)) + (propagated-inputs (list python-markupsafe)) + (home-page "https://jinja.palletsprojects.com/") (synopsis "Python template engine") (description "Jinja2 is a small but fast and easy to use stand-alone template engine -- cgit v1.2.3 From 23d2319f9aab48fbb31d63e04197839600d01967 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 11 Apr 2022 01:07:29 -0400 Subject: gnu: python-prompt-toolkit: Update to 3.0.29. * gnu/packages/python-xyz.scm (python-prompt-toolkit): Update to 3.0.29. [phases]{post-install-check}: Move to... {check}: ... this phase override instead, and streamline. --- gnu/packages/python-xyz.scm | 19 +++++++++---------- 1 file changed, 9 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 6bcb17dfad..5bf168df1f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17228,25 +17228,24 @@ (define-public python2-backpack (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") - (version "3.0.18") + (version "3.0.29") (source (origin (method url-fetch) (uri (pypi-uri "prompt_toolkit" version)) (sha256 - (base32 "1g1kq1aimhm23k2dmlmnznfzc83l6ly65g0h32hqz8injcdz3d71")))) + (base32 "19vf5cahp3imdpwhgvk55g3dvqmc6ga175r4vkq79kffx1h0yr5x")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'post-install-check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; HOME is needed for the test - ;; "test_pathcompleter_can_expanduser". - (setenv "HOME" "/tmp") - (add-installed-pythonpath inputs outputs) - (invoke "py.test")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; HOME is needed for the test + ;; "test_pathcompleter_can_expanduser". + (setenv "HOME" "/tmp") + (invoke "pytest" "-vv"))))))) (propagated-inputs (list python-wcwidth)) (native-inputs -- cgit v1.2.3 From 1c8264d62e16f404786d9b526511cea29138ab9f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 23 Mar 2022 12:06:26 -0400 Subject: gnu: python-ipython: Update to 8.2.0 [fixes CVE-2022-21699]. * gnu/packages/python-xyz.scm (python-ipython): Update to 8.2.0. [phases]{fix-tests}: Delete phase. {check}: Remove extraneous add-installed-pythonpath call. Invoke Pytest directly. Reported-by: Leo Famulari --- gnu/packages/python-xyz.scm | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5bf168df1f..bd8ae0e5e5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9101,13 +9101,13 @@ (define-public python-stack-data (define-public python-ipython (package (name "python-ipython") - (version "7.27.0") + (version "8.2.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "04xgymypnbfgf2q0d5b0hanjbjsp53f055sh1p8xlq52vyzmxdaq")))) + (base32 "1hcxa713wh3axa57412iy02rj0494ljvv6gpnls4lndc5h9yprbh")))) (build-system python-build-system) (arguments `(#:phases @@ -9118,34 +9118,15 @@ (define-public python-ipython ((".*import datetime") "") ((".*datetime.datetime.now\\(\\)") "") (("%timeit") "# %timeit")))) - (add-before 'check 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "./IPython/utils/_process_posix.py" - (("/usr/bin/env', 'which") (which "which"))) - (substitute* "./IPython/core/tests/test_inputtransformer.py" - (("#!/usr/bin/env python") - (string-append "#!" (which "python")))) - ;; This test introduces a circular dependency on ipykernel - ;; (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") - ;; AttributeError: module 'matplotlib_inline' has no - ;; attribute 'backend_inline' - (delete-file "IPython/core/tests/test_pylabtools.py"))) (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (setenv "HOME" "/tmp/") ;; required by a test - ;; 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"))))))) + (setenv "HOME" "/tmp/") ;required by some tests + (invoke "python" "-m" "pytest" "-vv"))))))) (inputs (list readline which)) (propagated-inputs (list python-backcall + python-decorator python-jedi python-jinja2 python-jsonschema @@ -9157,18 +9138,20 @@ (define-public python-ipython python-numpydoc python-pexpect python-pickleshare - python-prompt-toolkit-2 + python-prompt-toolkit python-pygments python-pyzmq python-simplegeneric + python-stack-data python-terminado python-traitlets)) (native-inputs (list graphviz pkg-config - python-requests ;for tests - python-testpath - python-nose)) + ;; For tests. + python-pytest + python-requests + python-testpath)) (home-page "https://ipython.org") (synopsis "IPython is a tool for interactive computing in Python") (description @@ -9215,14 +9198,14 @@ (define-public python-ipython-documentation (mkdir-p info) ;; (copy-file "docs/build/texinfo/ipython.info" ;; (string-append info "/ipython.info")) - (copy-file "COPYING.rst" (string-append doc "/COPYING.rst"))) - #t))))) + (copy-file "COPYING.rst" (string-append doc "/COPYING.rst")))))))) (inputs (list python-ipython python-ipykernel)) (native-inputs `(("python-sphinx" ,python-sphinx) ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ;; FIXME: It's possible that a smaller union would work just as well. + ;; FIXME: It's possible that a smaller updmap.cfg would work just as + ;; well. ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts texlive-capt-of texlive-fonts-ec -- cgit v1.2.3 From 7cab14c3363ae8ccdcec5b67bdad645eabd6b792 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 01:01:33 -0400 Subject: gnu: python-nbformat: Update to 5.3.0. * gnu/packages/python-xyz.scm (python-nbformat): Update to 5.3.0. [source]: Adjust git URL. [native-inputs]: Move python-fastjsonschema to... [propagated-inputs]: ... here. Remove python-ipython-genutils. --- gnu/packages/python-xyz.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bd8ae0e5e5..e1076b7190 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12816,16 +12816,16 @@ (define-public python-fastjsonschema (define-public python-nbformat (package (name "python-nbformat") - (version "5.1.3") + (version "5.3.0") ;; The PyPi release tarball lacks some test cases and test data. (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/jupyter/nbformat.git") + (url "https://github.com/jupyter/nbformat") (commit version))) (sha256 (base32 - "033v16cfmxzh3jn5phnil4p3silr49iwh9wiigzhv0crc6sanvwz")) + "114c5c6cvpxhxj8zrw74351gcfzyzjh1jq3py4xf8wk9rahfay9z")) (file-name (git-file-name name version)))) (build-system python-build-system) (arguments @@ -12836,13 +12836,10 @@ (define-public python-nbformat (when tests? (invoke "pytest" "-vv"))))))) (propagated-inputs - (list python-ipython-genutils python-jsonschema python-jupyter-core + (list python-fastjsonschema python-jsonschema python-jupyter-core python-traitlets)) (native-inputs (list python-pytest - python-fastjsonschema ; This is only active - ; when setting NBFORMAT_VALIDATOR="fastjsonschema", so include it for - ; testing only. python-testpath)) (home-page "https://jupyter.org") (synopsis "Jupyter Notebook format") -- cgit v1.2.3 From 9b6bad8c337d8045d9b7041d590eefbb67571482 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 7 Apr 2022 15:29:26 -0400 Subject: gnu: Add python-unicodedata2. * gnu/packages/python-xyz.scm (python-unicodedata2): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e1076b7190..e4cb812c53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14622,6 +14622,23 @@ (define-public python-uncertainties expression.") (license license:bsd-3))) +(define-public python-unicodedata2 + (package + (name "python-unicodedata2") + (version "14.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "unicodedata2" version)) + (sha256 + (base32 "110nnvh02ssp92xbmswy39aa186jrmb7m41x4220wigl8c0dzxs1")))) + (build-system python-build-system) + (home-page "https://github.com/fonttools/unicodedata2") + (synopsis "Python unicodedata backport") + (description "This package corresponds to the latest @code{unicodedata} +standard Python module.") + (license license:asl2.0))) + (define-public python-asteval (package (name "python-asteval") -- cgit v1.2.3 From 51b36ab71f1e5051fff55ccc4fd1855a927985dd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 1 Apr 2022 20:40:53 -0400 Subject: gnu: python-fonttools-with-test: Rename to python-fonttools-full. * gnu/packages/python-xyz.scm (python-fonttools-with-test): Rename to... (python-fonttools-full): ... this. [native-inputs]: Move python-brotli, python-fs, python-scipy and python-zopfli to... [propagated-inputs]: ... here. Add python-lxml, python-lz4 and python-unicodedata2. --- gnu/packages/python-xyz.scm | 18 ++++++++++++------ 1 file changed, 12 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 e4cb812c53..f8ef15cea1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11379,7 +11379,9 @@ (define-public python-fonttools (license license:expat) (properties `((python2-variant . ,(delay python2-fonttools))))))) -(define-public python-fonttools-with-tests +;;; Rename 'python-fonttools' in next cycle, renaming the current +;;; 'python-fonttools' to 'python-fonttools-minimal'. +(define-public python-fonttools-full (package/inherit python-fonttools (arguments (substitute-keyword-arguments (package-arguments python-fonttools) @@ -11404,11 +11406,15 @@ (define-public python-fonttools-with-tests " and not ")))))))))) (native-inputs (modify-inputs (package-native-inputs python-fonttools) - (append python-pytest ;FIXME: indentation is broken - python-brotli - python-fs - python-scipy - python-zopfli))) + (append python-pytest))) + (propagated-inputs + (list python-brotli + python-fs + python-lxml + python-lz4 + python-scipy + python-unicodedata2 + python-zopfli)) (properties (alist-delete 'hidden? (package-properties python-fonttools))))) ;; Fonttools 4.x dropped support for Python 2, so stick with 3.x here. -- cgit v1.2.3 From 21db2a0848a661883ebc9dfd53c125488541a835 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 10:53:21 -0400 Subject: gnu: Add python-types-toml. * gnu/packages/python-xyz.scm (python-types-toml): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f8ef15cea1..f1023c0563 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29512,6 +29512,24 @@ (define-public python-ansicolors "This package adds ANSI colors and decorations to your strings.") (license license:isc))) +(define-public python-types-toml + (package + (name "python-types-toml") + (version "0.10.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "types-toml" version)) + (sha256 + (base32 "10400bd3yv6rjfnq8galskkbpqz1sfx9sfgr5qwvw04270x4cjgr")))) + (build-system python-build-system) + (home-page "https://github.com/python/typeshed") + (synopsis "Typing stubs for TOML") + (description "This package contains typing stubs for TOML, a very small +subset the Python stubs contained in the complete @code{typeshed} +collection.") + (license license:asl2.0))) + (define-public python-types-ujson (package (name "python-types-ujson") -- cgit v1.2.3 From ab1dc1f162d131fa4980e9117c419c45b71c5f85 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 11:32:10 -0400 Subject: gnu: Add python-jaraco-context-bootstrap. * gnu/packages/python-xyz.scm (python-jaraco-context-bootstrap): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f1023c0563..9c77ef52d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8495,6 +8495,27 @@ (define-public python-inotify-simple "@code{inotify-simple} is a simple wrapper around inotify library.") (license license:bsd-3))) +;;; Variant used to break a cycle with python-pytest-enabler. +(define-public python-jaraco-context-bootstrap + (hidden-package + (package + (name "python-jaraco-context-bootstrap") + (version "4.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jaraco.context" version)) + (sha256 + (base32 "0hbjm1rpxf4pzmbdp9rh3ali4zqnlcr8m97bhh1nizxvzcpxim7h")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) + (native-inputs (list python-setuptools-scm)) + (home-page "https://github.com/jaraco/jaraco.context") + (synopsis "Context managers Python library") + (description "This Python library provides context managers-related +procedures.") + (license license:expat)))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From 3d72680d0ea3f9cd42364006e8c1886a9fc3a718 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 11:32:18 -0400 Subject: gnu: Add python-jaraco-functools-bootstrap. * gnu/packages/python-xyz.scm (python-jaraco-functools-bootstrap): 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 9c77ef52d0..58902afd39 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8516,6 +8516,28 @@ (define-public python-jaraco-context-bootstrap procedures.") (license license:expat)))) +;;; Variant used to break a cycle with python-pytest-enabler. +(define-public python-jaraco-functools-bootstrap + (hidden-package + (package + (name "python-jaraco-functools-bootstrap") + (version "3.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jaraco.functools" version)) + (sha256 + (base32 "186xqzs3bqhjwajnprxy3sc3h0w5vdld8spc1dxjnn9720yykq1i")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) + (native-inputs (list python-setuptools-scm)) + (propagated-inputs (list python-more-itertools)) + (home-page "https://github.com/jaraco/jaraco.functools") + (synopsis "Python library extending Python's @code{functools}") + (description "This library extends the standard @code{functools} Python +module with a few extra procedures.") + (license license:expat)))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From 21f29263f3572c4a273d9e548adb8c8c8882e445 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 12:08:31 -0400 Subject: gnu: Add python-autocommand. * gnu/packages/python-xyz.scm (python-autocommand): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 58902afd39..f7cae9e656 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7097,6 +7097,36 @@ (define-public python-orderedmultidict multivalue dictionary that retains the order of insertions and deletions.") (license license:unlicense))) +(define-public python-autocommand + (package + (name "python-autocommand") + (version "2.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "autocommand" version)) + (sha256 + (base32 "03qp9xx4dq81ljhf56r21gp5j0lpqs1vaw99g0d84i97s3lj1m7y")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; This test fails with an invalid syntax error on 'task1 = + ;; asyncio.async(coro_1())' (see: + ;; https://github.com/Lucretiel/autocommand/issues/20). + (delete-file "test/test_autoasync.py") + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest python-pytest-asyncio)) + (home-page "https://github.com/Lucretiel/autocommand") + (synopsis "Python library to build a command-line from a function") + (description "@code{autocommand} is library to automatically generate and +run simple @code{argparse} parsers from function signatures.") + (license license:lgpl3+))) + (define-public python-autopep8 (package (name "python-autopep8") -- cgit v1.2.3 From 08b524fa7850e03b15b8d47e8afce2fb5f53a00e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 13:20:45 -0400 Subject: gnu: Add python-types-freezegun. * gnu/packages/python-xyz.scm (python-types-freezegun): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f7cae9e656..ef12d973e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29585,6 +29585,24 @@ (define-public python-ansicolors "This package adds ANSI colors and decorations to your strings.") (license license:isc))) +(define-public python-types-freezegun + (package + (name "python-types-freezegun") + (version "1.1.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "types-freezegun" version)) + (sha256 + (base32 "08g926s8343zwq140zcfwly3qfgmahm7lp0vgb3ics549b2hifzl")))) + (build-system python-build-system) + (home-page "https://github.com/python/typeshed") + (synopsis "Typing stubs for @code{freezegun}") + (description "This package contains typing stubs for for @code{freezegun}, a +very small subset the Python stubs contained in the complete @code{typeshed} +collection.") + (license license:asl2.0))) + (define-public python-types-toml (package (name "python-types-toml") -- cgit v1.2.3 From 586ef9b9cfe0286712c710752e2904fa82be9365 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 13:20:53 -0400 Subject: gnu: Add python-types-pytz. * gnu/packages/python-xyz.scm (python-types-pytz): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ef12d973e6..3ef29cccc2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29603,6 +29603,24 @@ (define-public python-types-freezegun collection.") (license license:asl2.0))) +(define-public python-types-pytz + (package + (name "python-types-pytz") + (version "2021.3.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "types-pytz" version)) + (sha256 + (base32 "14yr5hg2ww8s4a0mz2bkd549fv8qgm538fnzxvqv92ld1pcpym3l")))) + (build-system python-build-system) + (home-page "https://github.com/python/typeshed") + (synopsis "Typing stubs for pytz") + (description "This package contains typing stubs for @code{pytz}, a very +small subset the Python stubs contained in the complete @code{typeshed} +collection.") + (license license:asl2.0))) + (define-public python-types-toml (package (name "python-types-toml") -- cgit v1.2.3 From fc7fc0764b9deb41c9425f0c1596d2298cb3a935 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 14:35:40 -0400 Subject: gnu: Add python-path-bootstrap. * gnu/packages/python-xyz.scm (python-path-bootstrap): New variable. --- gnu/packages/python-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3ef29cccc2..563ff63e7a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12572,6 +12572,44 @@ (define-public python-idna-ssl domains support.") (license license:expat))) +;;; Variant used to break a cycle with python-pip-run-bootstrap. +(define-public python-path-bootstrap + (hidden-package + (package + (name "python-path-bootstrap") + (version "16.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "path" version)) + (sha256 + (base32 "0lig13gxnfv98v790db1smvsbd3mnj7y8rwyiwhfi6xiqibygwms")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl))))))) + (native-inputs (list python-pypa-build python-setuptools-scm)) + (home-page "https://github.com/jaraco/path") + (synopsis "Object-oriented file system path manipulation library") + (description "@code{path} (formerly @code{path.py}) implements path +objects as first-class entities, allowing common operations on files to be +invoked on those path objects directly.") + (license license:expat)))) + (define-public python-pretend (package (name "python-pretend") -- cgit v1.2.3 From 040615d8f889ed51e238caad59cb6e1650d96aa1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 14:41:19 -0400 Subject: gnu: Add python-pip-run-bootstrap. * gnu/packages/python-xyz.scm (python-pip-run-bootstrap): New variable. --- gnu/packages/python-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 563ff63e7a..c622e1f93d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12658,6 +12658,49 @@ (define-public python-pip (define-public python2-pip (package-with-python2 python-pip)) +;;; Variant used to break a dependency cycle with +;;; python-pytest-perf-bootstrap. +(define-public python-pip-run-bootstrap + (hidden-package + (package + (name "python-pip-run-bootstrap") + (version "8.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jaraco/pip-run") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ycrjj3jgqcr9c2k7y8vprq65iblg0q0hvwz8zwi13gmb0ffds0c")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'pretend-version + ;; The version string is usually derived via setuptools-scm, but + ;; without the git metadata available this fails. + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) + (native-inputs (list python-setuptools-scm)) + (propagated-inputs (list python-autocommand python-path-bootstrap + python-packaging)) + (home-page "https://github.com/jaraco/pip-run") + (synopsis "Dynamic dependency loader for Python") + (description "The @command{pip-run} command provides on-demand temporary +package installation for a single interpreter run. It replaces this series of +commands: +@example +$ virtualenv --python pythonX.X --system-site-packages /tmp/env +$ /tmp/env/bin/pip install pkg1 pkg2 -r reqs.txt +$ /tmp/env/bin/python ... +$ rm -rf /tmp/env +@end example") + (license license:expat)))) + (define-public python-tlsh (package (name "python-tlsh") -- cgit v1.2.3 From b25a2c7c4057106efd9c02807fa7b4cdf2c5a574 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 15:38:27 -0400 Subject: gnu: python-importlib-metadata: Update to 4.11.3. * gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 4.11.3. [phases]{build, install, check}: Override phases. [native-inputs]: Remove python-packaging. Add python-pypa-build and python-pytest. (python2-importlib-metadata): Adjust to keep unchanged. --- gnu/packages/python-xyz.scm | 68 +++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 18 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c622e1f93d..6f4ffa0c63 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8418,19 +8418,41 @@ (define-public python2-importlib-resources-bootstrap (define-public python-importlib-metadata (package (name "python-importlib-metadata") - (version "1.5.0") + (version "4.11.3") (source (origin (method url-fetch) (uri (pypi-uri "importlib_metadata" version)) (sha256 (base32 - "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86")))) + "0f951zynlh39yicqnhrs3p1qa5p3g6ajjfcggf12y51ppxz5jk7a")))) (build-system python-build-system) - (propagated-inputs - (list python-zipp)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests"))))))) + (propagated-inputs (list python-zipp)) (native-inputs - (list python-setuptools-scm python-pyfakefs python-packaging)) + (list python-pypa-build + python-pyfakefs + python-pytest + python-setuptools-scm)) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description @@ -8446,19 +8468,29 @@ (define-public python-importlib-metadata (define-public python2-importlib-metadata (let ((base (package-with-python2 (strip-python2-variant python-importlib-metadata)))) - (package/inherit - base - (name "python2-importlib-metadata") - (native-inputs - `(("python-setuptools-scm" ,python2-setuptools-scm) - ("python-pyfakefs" ,python2-pyfakefs-bootstrap) - ("python-packaging" ,python2-packaging-bootstrap))) - (propagated-inputs - `(("python-configparser" ,python2-configparser) - ("python-contextlib2" ,python2-contextlib2) - ("python-importlib-resources" ,python2-importlib-resources) - ("python-pathlib2" ,python2-pathlib2) - ,@(package-propagated-inputs base)))))) + (package/inherit base + (name "python2-importlib-metadata") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "importlib_metadata" version)) + (sha256 + (base32 + "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86")))) + (arguments (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) ;reset standard phases + #~%standard-phases))) + (native-inputs + `(("python-setuptools-scm" ,python2-setuptools-scm) + ("python-pyfakefs" ,python2-pyfakefs-bootstrap) + ("python-packaging" ,python2-packaging-bootstrap))) + (propagated-inputs + `(("python-configparser" ,python2-configparser) + ("python-contextlib2" ,python2-contextlib2) + ("python-importlib-resources" ,python2-importlib-resources) + ("python-pathlib2" ,python2-pathlib2) + ,@(package-propagated-inputs base)))))) ;; This package is used by python2-pytest, and thus must not depend on it. (define-public python2-importlib-metadata-bootstrap -- cgit v1.2.3 From c014b00b2800fe46b40692e2cc4aff8bfb9d46e1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 15:57:27 -0400 Subject: gnu: python-pytest-black: Update to 0.3.12. * gnu/packages/python-xyz.scm (python-pytest-black): Update to 0.3.12. --- 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 6f4ffa0c63..89ca75ddb3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12143,14 +12143,14 @@ (define-public python-sniffio (define-public python-pytest-black (package (name "python-pytest-black") - (version "0.3.8") + (version "0.3.12") (source (origin (method url-fetch) (uri (pypi-uri "pytest-black" version)) (sha256 (base32 - "04lppqydxm0f3f3x0l8hj7v0j6d8syj34jc37yzqwqcyqsnaga81")))) + "19bmbcnaq02md8nnj6pywri3vps8sxnhysbfy386qkbn9w09ncqx")))) (build-system python-build-system) (propagated-inputs (list python-pytest python-black python-toml)) -- cgit v1.2.3 From bd152b5475fcf4deab65f9374f4a6ec782881c54 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 23:15:05 -0400 Subject: gnu: Add python-types-docutils. * gnu/packages/python-xyz.scm (python-types-docutils): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 89ca75ddb3..0ae000d15b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29621,6 +29621,23 @@ (define-public python-types-dataclasses static types.") (license license:asl2.0))) +(define-public python-types-docutils + (package + (name "python-types-docutils") + (version "0.18.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "types-docutils" version)) + (sha256 + (base32 "14ypv0x6fk1pjw0bvvr1lkb2g6dvq2pwvbd5b5pzjl6182fhmaim")))) + (build-system python-build-system) + (home-page "https://github.com/python/typeshed") + (synopsis "Typing stubs for docutils") + (description "This package provides a collection of library stubs for +Python, with static types.") + (license license:asl2.0))) + (define-public python-psycopg2-binary (package (name "python-psycopg2-binary") -- cgit v1.2.3 From f761974b123d1129849dd2be11dab0893b4d5766 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 11:31:59 -0400 Subject: gnu: Add python-jaraco-classes. * gnu/packages/python-xyz.scm (python-jaraco-classes): New variable. --- gnu/packages/python-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ae000d15b..a9d77fe84c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8557,6 +8557,44 @@ (define-public python-inotify-simple "@code{inotify-simple} is a simple wrapper around inotify library.") (license license:bsd-3))) +(define-public python-jaraco-classes + (package + (name "python-jaraco-classes") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jaraco.classes" version)) + (sha256 + (base32 "0d6g7qvfv1jlzbzh6asprqdblqd59grvlvr3nwbdqdqrmwlbfm7d")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the Internet. + (invoke "pytest" "-vv" "-k" "not project"))))))) + (native-inputs + (list python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-enabler-bootstrap ;OK since not propagated + python-pytest-flake8 + python-pytest-mypy + python-setuptools-scm + python-wheel)) + (propagated-inputs (list python-more-itertools)) + (home-page "https://github.com/jaraco/jaraco.classes") + (synopsis "Utility functions for Python class constructs") + (description "This Python library contains utility functions for Python +class constructs.") + (license license:expat))) + ;;; Variant used to break a cycle with python-pytest-enabler. (define-public python-jaraco-context-bootstrap (hidden-package -- cgit v1.2.3 From 26d92095d6870c0d10ef3a0f16256d7979a8dba5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 00:12:13 -0400 Subject: gnu: Add python-jaraco-context. * gnu/packages/python-xyz.scm (python-jaraco-context): New variable. --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9d77fe84c..f586728ce9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8616,6 +8616,35 @@ (define-public python-jaraco-context-bootstrap procedures.") (license license:expat)))) +(define-public python-jaraco-context + (package/inherit python-jaraco-context-bootstrap + (name "python-jaraco-context") + (arguments + (substitute-keyword-arguments + (package-arguments python-jaraco-context-bootstrap) + ((#:tests? _ #f) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the Internet. + (invoke "pytest" "-vv" "-k" "not project")))))))) + (native-inputs + (modify-inputs + (package-native-inputs python-jaraco-context-bootstrap) + (append python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-enabler-bootstrap ;OK since not propagated + python-pytest-flake8 + python-pytest-mypy))) + (properties (alist-delete 'hidden? (package-properties + python-jaraco-context-bootstrap))))) + ;;; Variant used to break a cycle with python-pytest-enabler. (define-public python-jaraco-functools-bootstrap (hidden-package -- cgit v1.2.3 From 59944e875af8be1f3501a5f9fd12c644cef4f9d5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 00:16:46 -0400 Subject: gnu: Add python-jaraco-functools. * gnu/packages/python-xyz.scm (python-jaraco-functools): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f586728ce9..458d0d58af 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8667,6 +8667,36 @@ (define-public python-jaraco-functools-bootstrap module with a few extra procedures.") (license license:expat)))) +(define-public python-jaraco-functools + (package/inherit python-jaraco-functools-bootstrap + (name "python-jaraco-functools") + (arguments + (substitute-keyword-arguments + (package-arguments python-jaraco-functools-bootstrap) + ((#:tests? _ #f) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the Internet. + (invoke "pytest" "-vv" "-k" "not project")))))))) + (native-inputs + (modify-inputs + (package-native-inputs python-jaraco-functools-bootstrap) + (append python-jaraco-classes + python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-enabler-bootstrap ;OK since not propagated + python-pytest-flake8 + python-pytest-mypy))) + (properties (alist-delete 'hidden? (package-properties + python-jaraco-functools-bootstrap))))) + (define-public python-jaraco-packaging (package (name "python-jaraco-packaging") -- cgit v1.2.3 From 831bf98f6ceed5b1ac400c90f74c3a49587d7d0b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 00:42:34 -0400 Subject: gnu: Add python-path. * gnu/packages/python-xyz.scm (python-path): New variable. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 458d0d58af..88435942ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12739,6 +12739,42 @@ (define-public python-path-bootstrap invoked on those path objects directly.") (license license:expat)))) +(define-public python-path + (package/inherit python-path-bootstrap + (name "python-path") + (arguments + (substitute-keyword-arguments + (package-arguments python-path-bootstrap) + ((#:tests? _ #f) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the Internet. + (invoke "pytest" "-vv" "-k" + (string-append + "not project " + ;; This tests assumes a root user exists. + "and not test_get_owner"))))))))) + (native-inputs + (modify-inputs (package-native-inputs python-path-bootstrap) + (append python-appdirs + python-packaging + python-pygments + python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-enabler + python-pytest-flake8 + python-pytest-mypy))) + (properties (alist-delete 'hidden? + (package-properties + python-path-bootstrap))))) + (define-public python-pretend (package (name "python-pretend") -- cgit v1.2.3 From a293faef3fbd6a3f8b128ee35a3e56a6cc458734 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 01:09:32 -0400 Subject: gnu: Add python-pip-run. * gnu/packages/python-xyz.scm (python-pip-run): New variable. --- gnu/packages/python-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 88435942ce..8e6dee235e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12866,6 +12866,44 @@ (define-public python-pip-run-bootstrap @end example") (license license:expat)))) +(define-public python-pip-run + (package/inherit python-pip-run-bootstrap + (name "python-pip-run") + (arguments + (substitute-keyword-arguments (package-arguments python-pip-run-bootstrap) + ((#:tests? _ #f) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-k" + (string-append + ;; Do not test the myproject.toml build as it tries + ;; to pull dependencies from the internet. + "not project " + ;; These tests attempt to install dependencies from + ;; the network and fail. + "and not test_pkg_imported " + "and not test_pkg_loaded_from_alternate_index "))))))))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-pip-run-bootstrap) + (replace "python-path-bootstrap" python-path))) + (native-inputs + (modify-inputs (package-native-inputs python-pip-run-bootstrap) + (append python-nbformat + python-pygments + python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-enabler + python-pytest-flake8 + python-pytest-mypy))) + (properties (alist-delete 'hidden? (package-properties + python-pip-run-bootstrap))))) + (define-public python-tlsh (package (name "python-tlsh") -- cgit v1.2.3 From 0be033d3c569450b347b1fe69ff6a52395afc971 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 Apr 2022 15:02:08 -0400 Subject: gnu: Add python-tempora. * gnu/packages/python-xyz.scm (python-tempora): New variable. --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8e6dee235e..1ebdd81f8e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21508,6 +21508,60 @@ (define-public python-tempdir (define-public python2-tempdir (package-with-python2 python-tempdir)) +(define-public python-tempora + (package + (name "python-tempora") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tempora" version)) + (sha256 + (base32 "09wirlk5vmxlhl9rnxp7g5qz2nsd6b0gnzk5fczbz0s8lsbz386b")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: PEP 517 manual build copied from python-isort. + (replace 'build + (lambda _ + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Do not test the myproject.toml build as it tries to pull + ;; dependencies from the Internet. + (invoke "pytest" "-k" "not project"))))))) + (native-inputs + (list python-pypa-build + python-freezegun + python-pytest + python-pytest-black + python-pytest-checkdocs + python-pytest-cov + python-pytest-enabler + python-pytest-flake8 + python-pytest-freezegun + python-pytest-mypy + python-setuptools-scm + python-types-freezegun + python-types-pytz)) + (propagated-inputs (list python-jaraco-functools python-pytz)) + (home-page "https://github.com/jaraco/tempora") + (synopsis "Python date and time objects and routines") + (description "The @code{tempora} Python library contains miscellaneous +date and time related utilities and constants, routines for measuring, +profiling, and getting datetime-aware @acronym{UTC, Coordinated Universal +Time} values as well as an event scheduler.") + (license license:expat))) + (define-public python-activepapers (package (name "python-activepapers") -- cgit v1.2.3 From b391578a2447e677528d6684f424ab798b885dc0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 08:46:56 -0400 Subject: gnu: python-factory-boy: Update to 3.2.1. * gnu/packages/python-xyz.scm (python-factory-boy): Update to 3.2.1. [propagated-inputs]: Use new style. [description]: Fix indentation and remove blank lines. --- gnu/packages/python-xyz.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1ebdd81f8e..176fa7ec28 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20004,30 +20004,26 @@ (define-public python2-stemming (define-public python-factory-boy (package (name "python-factory-boy") - (version "2.8.1") + (version "3.2.1") (source (origin (method url-fetch) (uri (pypi-uri "factory_boy" version)) (sha256 - (base32 "1fvin6san5xsjh2c4y18caj2lnmwxlylyqm8mh1yc6rp38wlwr56")))) + (base32 "0pm5lbvnwm0kg5i6z611rg907yw1gy551f2advmpaz041ixjg3d9")))) (build-system python-build-system) (arguments ;; Tests are not included in the tarball. `(#:tests? #f)) - (propagated-inputs - `(("faker" ,python-faker))) + (propagated-inputs (list python-faker)) (home-page "https://github.com/benhoyt/scandir") (synopsis "Versatile test fixtures replacement") - (description - "Factory_boy is a fixtures replacement based on thoughtbot’s factory_girl. - - As a fixtures replacement tool, it aims to replace static, hard to maintain - fixtures with easy-to-use factories for complex object. - - Instead of building an exhaustive test setup with every possible combination - of corner cases, factory_boy allows you to use objects customized for the - current test, while only declaring the test-specific fields") + (description "Factory_boy is a fixtures replacement based on thoughtbot’s +factory_girl. As a fixtures replacement tool, it aims to replace static, hard +to maintain fixtures with easy-to-use factories for complex object. Instead +of building an exhaustive test setup with every possible combination of corner +cases, factory_boy allows you to use objects customized for the current test, +while only declaring the test-specific fields.") (license license:expat))) (define-public python-translate-toolkit -- cgit v1.2.3 From a749fbea4e5f0f3faaff60b64625921225df2dbb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 08:52:08 -0400 Subject: gnu: python-faker: Update to 13.3.4 and honor TESTS?. * gnu/packages/python-xyz.scm (python-faker): Update to 13.3.4. [phases]{check}: Honor TESTS?. [native-inputs]: Replace python-pytest-6 by python-pytest. Remove comment. [propagated-inputs]: Remove python-text-unidecode. --- gnu/packages/python-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 176fa7ec28..43009da908 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17506,28 +17506,28 @@ (define-public python2-ukpostcodeparser (define-public python-faker (package (name "python-faker") - (version "9.3.1") + (version "13.3.4") (source (origin (method url-fetch) (uri (pypi-uri "Faker" version)) (sha256 (base32 - "0lpfdc4ndvk7chgqrfd2b1my4n54pccq9b645vp9cp5s5ypyknfd")))) + "04855dqvvi2mr739l5x3qf82rxq0a7spc8gl76k8xixmbw36328q")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "python" "-m" "pytest" "-v")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "-v"))))))) (native-inputs - (list ;; For testing - python-freezegun - python-pytest-6 + (list python-freezegun + python-pytest python-random2 python-ukpostcodeparser python-validators)) - (propagated-inputs - (list python-dateutil python-text-unidecode)) + (propagated-inputs (list python-dateutil)) (home-page "https://github.com/joke2k/faker") (synopsis "Python package that generates fake data") (description -- cgit v1.2.3 From e91180f450a3ce0c99b778da0d43d11729adfa6f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 13:44:02 -0400 Subject: gnu: Add python-ordered-set. * gnu/packages/python-xyz.scm (python-ordered-set): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 43009da908..9591ced6da 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29425,6 +29425,32 @@ (define-public python-ijson interfaces.") (license license:bsd-3))) +(define-public python-ordered-set + (package + (name "python-ordered-set") + (version "4.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ordered-set" version)) + (sha256 + (base32 "1a34fg3r3480nfm6652kyqql3lwixf8jirzdja9camvnr128wjk9")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-cython python-pytest)) + (home-page "https://github.com/simonpercivall/orderedset") + (synopsis "Ordered Set implementation in Cython") + (description "This library provides an @code{OrderedSet} data type that +works like a regular set, but remembers insertion order. It supports the full +Python @code{set} interface.") + (license license:asl2.0))) + (define-public python-orgparse (package (name "python-orgparse") -- cgit v1.2.3 From 06aa3cad61291d4a19cda8833074d99ef5282fff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 14:14:09 -0400 Subject: gnu: Add python-xdoctest. * gnu/packages/python-xyz.scm (python-xdoctest): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9591ced6da..5048b5c04b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15204,6 +15204,36 @@ (define-public python-xdo (define-public python2-xdo (package-with-python2 python-xdo)) +(define-public python-xdoctest + (package + (name "python-xdoctest") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xdoctest" version)) + (sha256 + (base32 "0bgbmb9nqv95f9gfxqifqff1qaz5fnanjqy4hv7ygrjp2kksgfvy")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; A writable HOME is needed by the + ;; 'import_module_from_path' test. + (setenv "HOME" "/tmp") + (invoke "pytest" "-vv"))))))) + (propagated-inputs (list python-six)) + (native-inputs (list python-pytest which)) + (home-page "https://github.com/Erotemic/xdoctest") + (synopsis "Rewrite of the Python builtin doctest module") + (description "This package provides a rewrite of the builtin doctest +module which leverages the Python @acronym{AST, Abstract Syntax Tree} instead +of @acronym{REGEXPs, regular expressions}.") + (license license:asl2.0))) + (define-public python-mako (package (name "python-mako") -- cgit v1.2.3 From 5c41c122a5da0855f1a369e8670b26ab28cf86b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 14:31:46 -0400 Subject: gnu: Add python-ubelt. * gnu/packages/python-xyz.scm (python-ubelt): New variable. --- gnu/packages/python-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5048b5c04b..612e69c7bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -364,6 +364,50 @@ (define-public python-logbook applications in mind and the idea to make logging fun.") (license license:bsd-3))) +(define-public python-ubelt + (package + (name "python-ubelt") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Erotemic/ubelt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hac9nqqvqfbca2s4g0mp1fnj0ah60bg9fb8234ibna3jww8qs33")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") ;else the test suite hangs + (invoke "pytest" "-vv" "-k" + (string-append + ;; The builder user home doesn't match HOME, + ;; which causes this test to fail. + "not userhome " + ;; This one pointlessly tries + ;; locating various binaries on + ;; the path. + "and not find_exe")))))))) + (propagated-inputs (list python-ordered-set)) + (native-inputs + (list python-pytest + python-requests + python-xdoctest)) + (home-page "https://github.com/Erotemic/ubelt") + (synopsis "Python library for hashing, caching, timing and more") + (description "Ubelt is a small library of simple functions that extend the +Python standard library. It includes an @acronym{API, Application Programming +Interface} to simplify common problems such as caching, timing, computing +progress, among other things.") + (license license:asl2.0))) + (define-public python-ueberzug (package (name "python-ueberzug") -- cgit v1.2.3 From 520cdf80581669646ff61e9f18f3b27045556e76 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 14:46:32 -0400 Subject: gnu: python-setuptools: Update to 62.0.0. * gnu/packages/python-xyz.scm (python-setuptools): Update to 62.0.0. [source]: Simplify snippet and strip trailing #t. [arguments]: Re-indent. [synopsis]: Likewise. [description]: Use @itemize. [license]: Strip leading spaces from in-line comments. --- gnu/packages/python-xyz.scm | 57 +++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 612e69c7bc..b7f7e91e3f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1842,44 +1842,41 @@ (define-public python2-serpent (define-public python-setuptools (package (name "python-setuptools") - (version "52.0.0") + (version "62.0.0") (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools" version)) - (sha256 - (base32 - "15ibjdjhkwgj6qbmpsxikkqdfsb1550z46fly7dm15ah4bk1wfpv")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove included binaries which are used to build self-extracting - ;; installers for Windows. - ;; TODO: Find some way to build them ourself so we can include them. - (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$")) - #t)))) + (method url-fetch) + (uri (pypi-uri "setuptools" version)) + (sha256 + (base32 + "0sm8n6y6q640cpac9wjyggidbgi4n9la7vs7pwriyvhvgzccp6br")) + (modules '((guix build utils))) + (snippet + ;; Remove included binaries which are used to build self-extracting + ;; installers for Windows. + ;; TODO: Find some way to build them ourself so we can include them. + '(for-each delete-file (find-files "setuptools" + "^(cli|gui).*\\.exe$"))))) (build-system python-build-system) ;; FIXME: Tests require pytest, which itself relies on setuptools. ;; One could bootstrap with an internal untested setuptools. - (arguments - `(#:tests? #f)) + (arguments (list #:tests? #f)) (home-page "https://pypi.org/project/setuptools/") - (synopsis - "Library designed to facilitate packaging Python projects") - (description - "Setuptools is a fully-featured, stable library designed to facilitate -packaging Python projects, where packaging includes: -Python package and module definitions, -distribution package metadata, -test hooks, -project installation, -platform-specific details, -Python 3 support.") + (synopsis "Library designed to facilitate packaging Python projects") + (description "Setuptools is a fully-featured, stable library designed to +facilitate packaging Python projects, where packaging includes: +@itemize +@item Python package and module definitions +@item distribution package metadata +@item test hooks +@item project installation +@item platform-specific details. +@end itemize") ;; TODO: setuptools now bundles the following libraries: ;; packaging, pyparsing, six and appdirs. How to unbundle? - (license (list license:psfl ; setuptools itself - license:expat ; six, appdirs, pyparsing - license:asl2.0 ; packaging is dual ASL2/BSD-2 + (license (list license:psfl ;setuptools itself + license:expat ;six, appdirs, pyparsing + license:asl2.0 ;packaging is dual ASL2/BSD-2 license:bsd-2)) (properties `((python2-variant . ,(delay python2-setuptools)))))) -- cgit v1.2.3 From c6c2e3710b91c570fb244e4a5fd3a476ebef33d1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 15:13:06 -0400 Subject: gnu: python-pathpy: Deprecate by python-path. * gnu/packages/python-xyz.scm (python-pathpy): Mark as deprecated by python-path. --- gnu/packages/python-xyz.scm | 54 +++------------------------------------------ 1 file changed, 3 insertions(+), 51 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b7f7e91e3f..7913e1eedd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8766,57 +8766,6 @@ (define-public python-jaraco-packaging releases.") (license license:expat))) -(define-public python-pathpy - (package - (name "python-pathpy") - (version "11.5.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "path.py" version)) - (sha256 - (base32 "0ir9j1haq2jbi7aip6k2fa9l7q1l03k4hp1awxhjhcwzsnwp3ll8")))) - (outputs '("out" "doc")) - (build-system python-build-system) - (propagated-inputs - (list python-appdirs python-importlib-metadata)) - (native-inputs - (list python-setuptools-scm - python-sphinx - python-rst.linker - python-pytest - python-pytest-runner - python-jaraco-packaging)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - (setenv "LANG" "en_US.UTF-8") - (invoke "python" "setup.py" "build_sphinx"))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "doc") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (html (string-append doc "/html"))) - (mkdir-p html) - (for-each (lambda (file) - (copy-file file (string-append doc "/" file))) - '("README.rst" "CHANGES.rst")) - (copy-recursively "build/sphinx/html" html) - #t))) - (replace 'check - (lambda _ - ;; The import time test aborts if an import takes longer than - ;; 100ms. It may very well take a little longer than that. - (invoke "pytest" "-v" "-k" "not test_import_time")))))) - (home-page "https://github.com/jaraco/path.py") - (synopsis "Python module wrapper for built-in os.path") - (description - "@code{path.py} implements path objects as first-class entities, allowing -common operations on files to be invoked on those path objects directly.") - (license license:expat))) - (define-public python-simplegeneric (package (name "python-simplegeneric") @@ -12816,6 +12765,9 @@ (define-public python-path (package-properties python-path-bootstrap))))) +(define-public python-pathpy + (deprecated-package "python-pathpy" python-path)) + (define-public python-pretend (package (name "python-pretend") -- cgit v1.2.3 From 5324bff060654c7185c0be1f2ea9e2e2a3b69bd0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 6 Apr 2022 17:22:44 -0400 Subject: gnu: Add python-scikit-build. * gnu/packages/python-xyz.scm (python-scikit-build): New variable. --- gnu/packages/python-xyz.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7913e1eedd..271f948bc5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -189,6 +189,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) #:use-module (gnu packages ncurses) + #:use-module (gnu packages ninja) #:use-module (gnu packages openstack) #:use-module (gnu packages pcre) #:use-module (gnu packages pdf) @@ -28325,6 +28326,94 @@ (define-public python-sane ;; Yet another variant of the X/MIT license. "https://github.com/python-pillow/Sane/blob/master/COPYING")))) +(define-public python-scikit-build + (package + (name "python-scikit-build") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "scikit-build" version)) + (sha256 + (base32 "1wx1m9vnxnnz59lyaisgyxldp313kciyd4af8lf112vb8vbjy9yk")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-executable + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "skbuild/constants.py" + (("^(CMAKE_DEFAULT_EXECUTABLE = ).*" _ head) + (format #f "~a ~s~%" head + (search-input-file inputs "bin/cmake")))))) + ;; XXX: PEP 517 manual build copied from python-isort. + (replace 'build + (lambda _ + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; These tests attempt to pull dependencies from the Internet. + (delete-file "tests/test_distribution.py") + (delete-file "tests/test_pep518.py") + (invoke "pytest" "-vv" + "-n" (number->string (parallel-job-count)) + "-k" (string-append + ;; These tests attempt to write to read-only + ;; Python install directory. + "not test_install_command " + "and not test_test_command " + "and not test_hello_develop " + ;; These sdist-related tests fail for unknown + ;; reasons (see: + ;; https://github.com/scikit-build/scikit-build/issues/689). + "and not test_hello_sdist_with_base " + "and not test_manifest_in_sdist " + "and not test_hello_sdist " + "and not test_sdist_with_symlinks " + ;; These are not parallel safe and fail + ;; nondeterministically (see: + ;; https://github.com/scikit-build/scikit-build/issues/711). + "and not test_generator_cleanup" + "and not test_generator_selection"))))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl))))))) + (native-inputs + (list cmake-minimal + gfortran + git-minimal + ninja + python-coverage + python-cython + python-mock + python-packaging + python-path + python-pypa-build + python-pytest + python-pytest-cov + python-pytest-mock + python-pytest-virtualenv + python-pytest-xdist + python-requests + python-setuptools-scm + python-wheel)) + (propagated-inputs + (list python-distro python-packaging python-wheel)) + (home-page "https://github.com/scikit-build/scikit-build") + (synopsis "Build system generator for Python C/C++/Fortran/Cython extensions") + (description "Scikit-build is an improved build system generator for +CPython C/C++/Fortran/Cython extensions. It has support for additional +compilers, build systems, cross compilation, and locating dependencies and +determining their build requirements. The scikit-build package is +fundamentally just glue between the @code{setuptools} Python module and +CMake.") + (license license:expat))) + (define-public python-screenkey (package (name "python-screenkey") -- cgit v1.2.3 From 4f8bd85506e7016f62647ec9513e53db856c2190 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 7 Apr 2022 14:59:34 -0400 Subject: gnu: Add python-fonttools-next. * gnu/packages/python-xyz.scm (python-fonttools-next): New variable. --- 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 271f948bc5..9d103f1003 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11623,6 +11623,18 @@ (define-public python2-fonttools (base32 "0v6399g755f2hn1ry62i5b6gdinf2fpx2966v3bxh6bjw1accb5p"))))))) +(define-public python-fonttools-next + (package + (inherit python-fonttools-full) + (version "4.32.0") + (source (origin + (inherit (package-source python-fonttools-full)) + (method url-fetch) + (uri (pypi-uri "fonttools" version ".zip")) + (sha256 + (base32 + "14nk43z0dmznypm3zp4sdc04x1y608jawlnmwdkk32a947khvaar")))))) + (define-public python-ly (package (name "python-ly") -- cgit v1.2.3 From 2b22de8923d2f7a605b51a47013cc77d616547cc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 10 Apr 2022 13:58:42 -0400 Subject: gnu: python-click: Update to 8.1.2 and honor TESTS?. * gnu/packages/python-xyz.scm (python-click): Update to 8.1.2. [phases]{fix-paths}: Remove obsolete phase. {check}: Invoke pytest directly and honor TESTS?. (python2-click): Delete variable. --- gnu/packages/python-xyz.scm | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9d103f1003..b1ce2a66e7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3515,30 +3515,23 @@ (define-public python-cli-helpers (define-public python-click (package (name "python-click") - (version "7.1.2") + (version "8.1.2") (source (origin (method url-fetch) (uri (pypi-uri "click" version)) (sha256 (base32 - "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj")))) + "0whs38a2i0561kwbgigs6vic9r0a1887m2v1aw3rmv6r2kz0g5s7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((glibc (assoc-ref inputs ,(if (%current-target-system) - "cross-libc" "libc")))) - (substitute* "src/click/_unicodefun.py" - (("'locale'") - (string-append "'" glibc "/bin/locale'")))))) (replace 'check - (lambda _ - (invoke "python" "-m" "pytest")))))) - (native-inputs - (list python-pytest)) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest)) (home-page "https://palletsprojects.com/p/click/") (synopsis "Command line library for Python") (description @@ -3548,9 +3541,6 @@ (define-public python-click with sensible defaults out of the box.") (license license:bsd-3))) -(define-public python2-click - (package-with-python2 python-click)) - (define-public python-click-5 (package (inherit python-click) (name "python-click") -- cgit v1.2.3 From 86be766874a198611f70c1883106cee42361d114 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 10 Apr 2022 21:57:02 -0400 Subject: gnu: python-black: Update to 22.3.0. * gnu/packages/python-xyz.scm (python-black): Update to 22.3.0. [phases]{relax-version-requirements}: Delete phase. {use-absolute-file-names}: Streamline phase. {disable-broken-tests, remove-entrypoint}: Delete phases. --- gnu/packages/python-xyz.scm | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b1ce2a66e7..e7ca4ac84d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5451,58 +5451,27 @@ (define-public python-pathspec (define-public python-black (package (name "python-black") - (version "21.12b0") + (version "22.3.0") (source (origin (method url-fetch) (uri (pypi-uri "black" version)) (sha256 (base32 - "1czjwr1bx9ax5l64xfi54sxb1ycdy4s9ciaqg592x7jn79lhzf3p")))) + "0yfahlqc7dsdp1js0cbv706apldnfnlbal9b53cww8n0hs40n0im")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - ;; XXX Remove this when updating this package: - ;; https://github.com/psf/black/issues/2703#issuecomment-1004752142 - (add-after 'unpack 'relax-version-requirements - (lambda _ - (substitute* "setup.py" - (("tomli[^\"]*\",") - "tomli\",")))) (add-after 'patch-source-shebangs 'use-absolute-file-names (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((inpts (or native-inputs inputs)) - (python3 (search-input-file inpts "/bin/python3")) - (/bin/false (search-input-file inpts "/bin/false")) - (/bin/sleep (search-input-file inpts "/bin/sleep"))) + (python3 (search-input-file inpts "/bin/python3"))) (substitute* (find-files "tests" "\\.py$") (("#!/usr/bin/env python3(\\.[0-9]+)?" _ minor-version) (string-append "#!" python3 (if (string? minor-version) minor-version - "")))) - (substitute* "tests/test_primer.py" - (("/bin/false") /bin/false) - (("/bin/sleep") /bin/sleep))))) - (add-after 'unpack 'disable-broken-tests - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; Make installed package available for running the tests - (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" - ":" (getenv "PATH"))) - - ;; The source formatting test fails because we patch various - ;; files; just disable it. - (substitute* "tests/test_format.py" - (("def test_source_is_formatted" all) - (format #f "@pytest.mark.skip(\"Disabled by Guix.\")\n~a" - all))))) - ;; Remove blackd, because it depends on python-aiohttp and - ;; python-aiohttp-cors. - (add-after 'unpack 'remove-entrypoint - (lambda _ - (substitute* "setup.py" - (("\\s*\"blackd=blackd:patched_main \\[d\\]\",\n") "") - (("\"blackd\", ") "")))) + ""))))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "pytest" "-vv"))))))) -- cgit v1.2.3 From 33570ca6bd5f16420330d2c60fbef89daa0088c0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 10 Apr 2022 22:57:17 -0400 Subject: gnu: python-trio: Update to 0.20.0. * gnu/packages/python-xyz.scm (python-trio): Update to 0.20.0. [phases]{patch-sleep}: New phase. [change-home]: Delete trailing #t. {check}: Run tests in parallel. Disable the test_cancel_scope_exit_doesnt_create_cyclic_garbage, test_ipython_exc_handler, test_for_leaking_fds and test_static_tool_sees_all_symbols tests. [native-inputs]: Add python-pytest-xdist. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++------ 1 file changed, 18 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 e7ca4ac84d..6e05d633b3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24426,26 +24426,32 @@ (define-public python-outcome (define-public python-trio (package (name "python-trio") - (version "0.19.0") + (version "0.20.0") (source (origin (method url-fetch) (uri (pypi-uri "trio" version)) (sha256 - (base32 "1qgg4zhca81dxc1nlmcr5pl1bclmvdp3niqbyslwxs65bs732pl9")))) + (base32 "0w30cwmdwfa8zq2agqv3h62jzwwsk7ms8f683ag8f3jx279m42k7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-sleep + (lambda _ + (substitute* "trio/tests/test_subprocess.py" + (("/bin/sleep") + (which "sleep"))))) (add-before 'check 'change-home (lambda _ ;; Tests require a writable home. - (setenv "HOME" "/tmp") - #t)) + (setenv "HOME" "/tmp"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "-vv" "-k" + (invoke "pytest" "-vv" + "-n" (number->string (parallel-job-count)) + "-k" (string-append ;; This test times out. "not test_ki_protection_works" @@ -24454,7 +24460,10 @@ (define-public python-trio " and not test_run_in_trio_thread_ki" " and not test_simple_cancel_scope_usage_doesnt_create_cyclic_garbage" " and not test_nursery_cancel_doesnt_create_cyclic_garbage" + " and not test_cancel_scope_exit_doesnt_create_cyclic_garbage" " and not test_locals_destroyed_promptly_on_cancel" + " and not test_ipython_exc_handler" + " and not test_for_leaking_fds" ;; These try to raise KeyboardInterrupt which does not work ;; in the build environment. " and not test_ki_self" @@ -24463,7 +24472,9 @@ (define-public python-trio " and not test_getnameinfo" " and not test_SocketType_resolve" ;; OSError: protocol not found. - " and not test_getprotobyname")))))))) + " and not test_getprotobyname" + ;; EOFError: Ran out of input. + " and not test_static_tool_sees_all_symbols")))))))) (native-inputs (list python-astor python-ipython @@ -24471,6 +24482,7 @@ (define-public python-trio python-pylint python-pyopenssl python-pytest + python-pytest-xdist python-pytest-cov python-trustme)) (propagated-inputs -- cgit v1.2.3 From 61c8a13f50e7a12cce751cd3140a4506cc617702 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 11 Apr 2022 00:55:16 -0400 Subject: gnu: Add python-pydevd. * gnu/packages/python-xyz.scm (python-pydevd): New variable. --- gnu/packages/python-xyz.scm | 102 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6e05d633b3..11c057ad99 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -159,6 +159,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gdb) #:use-module (gnu packages gcc) #:use-module (gnu packages geo) #:use-module (gnu packages ghostscript) @@ -13032,6 +13033,107 @@ (define-public python-file (define-public python2-file (package-with-python2 python-file)) +(define-public python-pydevd + ;; Use the latest commit, which includes cleanups that removes Python 2 + ;; syntax that would fail to build. + (let ((revision "0") + (commit "47e298499ef19563bb2ef5941a57046a35ae6868")) + (package + (name "python-pydevd") + (version (git-version "2.8.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fabioz/PyDev.Debugger") + (commit commit))) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete pre-built binaries. + (for-each delete-file (find-files "." "\\.(so|dylib|dll)")) + ;; This source is generated via Cython. + (delete-file "_pydevd_bundle/pydevd_cython.c"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yd017dh6xgxrqcyf8kk8jrr0a3zw895yfjih0z5jghyf0rck38q")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "tests_python/test_convert_utilities.py" + ;; Add missing trailing '/'. + (("'\\\\\\\\usr\\\\\\\\bin\\\\\\\\') == '/usr/bin" all) + (string-append all "/"))))) + (add-after 'unpack 'patch-command-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "_pydevd_bundle/pydevd_api.py" + (("'kill'") + (format #f "~s" (search-input-file inputs "bin/kill"))) + (("'pgrep'") + (format #f "~s" (search-input-file inputs "bin/pgrep")))))) + (add-after 'unpack 'generate-sources + (lambda _ + (setenv "PYTHONPATH" (getcwd)) + (invoke "python" "build_tools/build.py"))) + (add-after 'unpack 'adjust-attach-binary-name + (lambda _ + (substitute* + '("pydevd_tracing.py" + "pydevd_attach_to_process/add_code_to_python_process.py") + (("def get_(target|python_helper_lib)_filename.*" all) + (format #f "~a return ~s~%" all + (string-append #$output "/lib/attach.so")))))) + (add-after 'unpack 'patch-gdb + (lambda* (#:key inputs #:allow-other-keys) + (substitute* + "pydevd_attach_to_process/add_code_to_python_process.py" + (("'gdb',") + (format #f "~s," (search-input-file inputs "bin/gdb")))))) + (add-after 'build 'build-attach-linux-binary + (lambda _ + (invoke #+(cxx-for-target) "-shared" "-o" "attach.so" + "-fPIC" "-nostartfiles" + "pydevd_attach_to_process/linux_and_mac/attach.cpp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "PYDEVD_USE_CYTHON" "YES") + (invoke "pytest" "-vv" + "-n" (number->string (parallel-job-count)) + "-k" + (string-append + ;; the GUI event loop requires an X server. + "not test_gui_event_loop_custom " + ;; This test validates that 'pydevd' is not in the + ;; exception message, but it is due to being part + ;; of the build file name present in the message. + "and not test_evaluate_exception_trace"))))) + (add-after 'install 'install-attach-binary + (lambda _ + (install-file "attach.so" + (string-append #$output "/lib")))) + ;; Some modules aren't designed to be loadable by themselves, such + ;; as 'pydev_app_engine_debug_startup' and fail. + (delete 'sanity-check)))) + (native-inputs + (list python-cython + python-numpy + python-psutil + python-pytest + python-pytest-xdist + python-trio + python-untangle)) + (inputs (list coreutils gdb procps)) + (home-page "https://github.com/fabioz/PyDev.Debugger/") + (synopsis "Python debugger") + (description "PyDev.Debugger is a capable Python debugger used in PyDev +and other @acronym{IDEs, Integrated Development Environments}.") + (license license:epl1.0)))) + (define-public python-debian (package (name "python-debian") -- cgit v1.2.3 From 08199a93c8e986841dde05b1c249a01e7e29430a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 11 Apr 2022 01:15:28 -0400 Subject: gnu: Add python-debugpy. * gnu/packages/python-xyz.scm (python-debugpy): New variable. * gnu/packages/patches/python-debugpy-unbundle-pydevd.patch: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + .../patches/python-debugpy-unbundle-pydevd.patch | 254 +++++++++++++++++++++ gnu/packages/python-xyz.scm | 72 ++++++ 3 files changed, 327 insertions(+) create mode 100644 gnu/packages/patches/python-debugpy-unbundle-pydevd.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 9c5c6896ba..06367fac5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1681,6 +1681,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ + %D%/packages/patches/python-debugpy-unbundle-pydevd.patch \ %D%/packages/patches/python-docopt-pytest6-compat.patch \ %D%/packages/patches/python-execnet-read-only-fix.patch \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ diff --git a/gnu/packages/patches/python-debugpy-unbundle-pydevd.patch b/gnu/packages/patches/python-debugpy-unbundle-pydevd.patch new file mode 100644 index 0000000000..7a6ad54489 --- /dev/null +++ b/gnu/packages/patches/python-debugpy-unbundle-pydevd.patch @@ -0,0 +1,254 @@ +Allow using pydevd as a regular dependency. +Submitted upstream at: https://github.com/microsoft/debugpy/pull/902 + +diff --git a/setup.py b/setup.py +index 5fc40070..3a530a29 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,6 +11,9 @@ import subprocess + import sys + + ++DEBUGPY_BUNDLING_DISABLED = bool(os.getenv('DEBUGPY_BUNDLING_DISABLED')) ++ ++ + sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) + import versioneer # noqa + +@@ -18,12 +21,15 @@ del sys.path[0] + + sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src")) + import debugpy +-import debugpy._vendored ++ ++if not DEBUGPY_BUNDLING_DISABLED: ++ import debugpy._vendored + + del sys.path[0] + + +-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd") ++PYDEVD_ROOT = (None if DEBUGPY_BUNDLING_DISABLED else ++ debugpy._vendored.project_root("pydevd")) + DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__)) + + +@@ -67,7 +73,7 @@ def iter_vendored_files(): + # relevant setuptools versions. + class ExtModules(list): + def __bool__(self): +- return True ++ return not DEBUGPY_BUNDLING_DISABLED + + + def override_build(cmds): +@@ -133,9 +139,24 @@ with open("DESCRIPTION.md", "r") as fh: + + + if __name__ == "__main__": +- if not os.getenv("SKIP_CYTHON_BUILD"): ++ if not (os.getenv("SKIP_CYTHON_BUILD") or DEBUGPY_BUNDLING_DISABLED): + cython_build() + ++ # Etch bundling status in the source. ++ if debugpy.__bundling_disabled__ != DEBUGPY_BUNDLING_DISABLED: ++ ++ with open(os.path.join(DEBUGBY_ROOT, '__init__.py'), 'r') as f: ++ lines = f.readlines() ++ with open(os.path.join(DEBUGBY_ROOT, '__init__.py'), 'w') as f: ++ edited = [] ++ for line in lines: ++ if line.startswith('__bundling_disabled__'): ++ edited.append( ++ f'__bundling_disabled__ = {DEBUGPY_BUNDLING_DISABLED}\n') ++ else: ++ edited.append(line) ++ f.writelines(edited) ++ + extras = {} + platforms = get_buildplatform() + if platforms is not None: +@@ -145,6 +166,18 @@ if __name__ == "__main__": + override_build(cmds) + override_build_py(cmds) + ++ data = {"debugpy": ["ThirdPartyNotices.txt"]} ++ packages = [ ++ "debugpy", ++ "debugpy.adapter", ++ "debugpy.common", ++ "debugpy.launcher", ++ "debugpy.server", ++ ] ++ if not DEBUGPY_BUNDLING_DISABLED: ++ data.update({"debugpy._vendored": list(iter_vendored_files())}) ++ packages.append("debugpy._vendored") ++ + setuptools.setup( + name="debugpy", + version=versioneer.get_version(), +@@ -173,20 +206,10 @@ if __name__ == "__main__": + "License :: OSI Approved :: MIT License", + ], + package_dir={"": "src"}, +- packages=[ +- "debugpy", +- "debugpy.adapter", +- "debugpy.common", +- "debugpy.launcher", +- "debugpy.server", +- "debugpy._vendored", +- ], +- package_data={ +- "debugpy": ["ThirdPartyNotices.txt"], +- "debugpy._vendored": list(iter_vendored_files()), +- }, ++ packages=packages, ++ package_data=data, + ext_modules=ExtModules(), +- has_ext_modules=lambda: True, ++ has_ext_modules=lambda: not DEBUGPY_BUNDLING_DISABLED, + cmdclass=cmds, + **extras + ) +diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py +index baa5a7c5..7b7a29aa 100644 +--- a/src/debugpy/__init__.py ++++ b/src/debugpy/__init__.py +@@ -206,6 +206,8 @@ def trace_this_thread(should_trace): + + __version__ = _version.get_versions()["version"] + ++__bundling_disabled__ = False ++ + # Force absolute path on Python 2. + __file__ = os.path.abspath(__file__) + +diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py +index e6a1ad66..5f29a87a 100644 +--- a/src/debugpy/server/__init__.py ++++ b/src/debugpy/server/__init__.py +@@ -4,6 +4,50 @@ + + from __future__ import absolute_import, division, print_function, unicode_literals + ++from importlib import import_module ++import os ++ + # "force_pydevd" must be imported first to ensure (via side effects) + # that the debugpy-vendored copy of pydevd gets used. +-import debugpy._vendored.force_pydevd # noqa ++import debugpy ++if debugpy.__bundling_disabled__: ++ # Do what force_pydevd.py does, but using the system-provided ++ # pydevd. ++ ++ # XXX: This is copied here so that the whole '_vendored' directory ++ # can be deleted when DEBUGPY_BUNDLING_DISABLED is set. ++ ++ # If debugpy logging is enabled, enable it for pydevd as well ++ if "DEBUGPY_LOG_DIR" in os.environ: ++ os.environ[str("PYDEVD_DEBUG")] = str("True") ++ os.environ[str("PYDEVD_DEBUG_FILE")] = \ ++ os.environ["DEBUGPY_LOG_DIR"] + str("/debugpy.pydevd.log") ++ ++ # Work around https://github.com/microsoft/debugpy/issues/346. ++ # Disable pydevd frame-eval optimizations only if unset, to allow opt-in. ++ if "PYDEVD_USE_FRAME_EVAL" not in os.environ: ++ os.environ[str("PYDEVD_USE_FRAME_EVAL")] = str("NO") ++ ++ # Constants must be set before importing any other pydevd module ++ # due to heavy use of "from" in them. ++ pydevd_constants = import_module('_pydevd_bundle.pydevd_constants') ++ # The default pydevd value is 1000. ++ pydevd_constants.MAXIMUM_VARIABLE_REPRESENTATION_SIZE = 2 ** 32 ++ ++ # When pydevd is imported it sets the breakpoint behavior, but it needs to be ++ # overridden because by default pydevd will connect to the remote debugger using ++ # its own custom protocol rather than DAP. ++ import pydevd # noqa ++ import debugpy # noqa ++ ++ def debugpy_breakpointhook(): ++ debugpy.breakpoint() ++ ++ pydevd.install_breakpointhook(debugpy_breakpointhook) ++ ++ # Ensure that pydevd uses JSON protocol ++ from _pydevd_bundle import pydevd_constants ++ from _pydevd_bundle import pydevd_defaults ++ pydevd_defaults.PydevdCustomization.DEFAULT_PROTOCOL = pydevd_constants.HTTP_JSON_PROTOCOL ++else: ++ import debugpy._vendored.force_pydevd # noqa +diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py +index e6345996..87cfdd53 100644 +--- a/src/debugpy/server/attach_pid_injected.py ++++ b/src/debugpy/server/attach_pid_injected.py +@@ -8,6 +8,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera + + import os + ++import debugpy + + __file__ = os.path.abspath(__file__) + _debugpy_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) +@@ -30,25 +31,29 @@ def attach(setup): + def on_critical(msg): + print(msg, file=sys.stderr) + +- pydevd_attach_to_process_path = os.path.join( +- _debugpy_dir, +- "debugpy", +- "_vendored", +- "pydevd", +- "pydevd_attach_to_process", +- ) +- assert os.path.exists(pydevd_attach_to_process_path) +- sys.path.insert(0, pydevd_attach_to_process_path) +- +- # NOTE: that it's not a part of the pydevd PYTHONPATH +- import attach_script ++ if debugpy.__bundling_disabled__: ++ from pydevd_attach_to_process import attach_script ++ else: ++ pydevd_attach_to_process_path = os.path.join( ++ _debugpy_dir, ++ "debugpy", ++ "_vendored", ++ "pydevd", ++ "pydevd_attach_to_process", ++ ) ++ assert os.path.exists(pydevd_attach_to_process_path) ++ sys.path.insert(0, pydevd_attach_to_process_path) ++ ++ # NOTE: that it's not a part of the pydevd PYTHONPATH ++ import attach_script + + attach_script.fix_main_thread_id( + on_warn=on_warn, on_exception=on_exception, on_critical=on_critical + ) + +- # NOTE: At this point it should be safe to remove this. +- sys.path.remove(pydevd_attach_to_process_path) ++ if not debugpy.__bundling_disabled__: ++ # NOTE: At this point it should be safe to remove this. ++ sys.path.remove(pydevd_attach_to_process_path) + except: + import traceback + +diff --git a/tests/tests/test_vendoring.py b/tests/tests/test_vendoring.py +index dd6c4269..28c03702 100644 +--- a/tests/tests/test_vendoring.py ++++ b/tests/tests/test_vendoring.py +@@ -1,3 +1,8 @@ ++import pytest ++ ++import debugpy ++ ++@pytest.mark.skipif(debugpy.__bundling_disabled__, reason='Bundling disabled') + def test_vendoring(pyfile): + @pyfile + def import_debugpy(): +-- +2.34.0 + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 11c057ad99..0034ed703b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13134,6 +13134,78 @@ (define-public python-pydevd and other @acronym{IDEs, Integrated Development Environments}.") (license license:epl1.0)))) +(define-public python-debugpy + (package + (name "python-debugpy") + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference ;no tests in PyPI archive + (url "https://github.com/microsoft/debugpy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + ;; Remove the bundled PyDev-Debugger copy, including its pre-built + ;; attach binary. + (snippet '(delete-file-recursively "src/debugpy/_vendored")) + (patches (search-patches "python-debugpy-unbundle-pydevd.patch")) + (sha256 + (base32 + "1dpfzs3p51648i7f3fz8dw5d0vrj39iwn1jhn0226idc02ybyqih")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-sh-in-tests + (lambda _ + (substitute* "tests/debugpy/test_run.py" + (("#!/bin/sh") + (string-append "#!" (which "sh")))))) + (add-after 'unpack 'fix-version + ;; Versioneer is useless when there is no git metadata. + (lambda _ + (substitute* "setup.py" + (("version=versioneer.get_version\\(),") + (format #f "version=~s," #$version))))) + (add-before 'build 'configure + (lambda _ + ;; This adjusts the behavior of debugpy to load pydevd from + ;; Python site packages. + (setenv "DEBUGPY_BUNDLING_DISABLED" "1"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (invoke "pytest" "-vv" + "-n" (number->string (parallel-job-count)) + "-k" + (string-append + ;; These tests cannot be run in parallel because their + ;; test data would not be copied by xdist and lead to + ;; import errors. (see: + ;; https://github.com/microsoft/debugpy/issues/342 and + ;; https://github.com/microsoft/debugpy/issues/880). + "not test_custom_python_args " + "and not test_autokill "))))))) + (native-inputs + ;; See: https://raw.githubusercontent.com/microsoft/debugpy/ + ;; main/tests/requirements.txt. + (list python-django + python-gevent + python-flask + python-psutil + python-pytest + python-pytest-cov + python-pytest-timeout + python-pytest-xdist + python-requests)) + (propagated-inputs (list python-pydevd)) + (home-page "https://aka.ms/debugpy") + (synopsis "Debug Adapter Protocol Python implementation") + (description "An implementation of the Debug Adapter Protocol for +Python.") + (license license:expat))) + (define-public python-debian (package (name "python-debian") -- cgit v1.2.3 From 4b6500f972cd9c6fd5f4a06b3a778b0b5ccb53f4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Apr 2022 00:41:04 -0400 Subject: gnu: python-greenlet: Update to 1.1.2. * gnu/packages/python-xyz.scm (python-greenlet): Update to 1.1.2. --- 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 0034ed703b..22869bcaa3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16708,13 +16708,13 @@ (define-public python-tftpy (define-public python-greenlet (package (name "python-greenlet") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "10gllbrcbazxck84nr7dw3js3gq0rxrsr4kkvy5hg542rms2gwn0")))) + "0jkln5bf6rq7dbvpv7ypin3pp9jqd2jr91yyxlnfcii3msj5w3z3")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit v1.2.3 From d5ee3dcf9e997dc8ad527e73b9e07ea983f8610b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Apr 2022 16:21:56 -0400 Subject: gnu: Add python-ipyparallel-bootstrap. * gnu/packages/python-xyz.scm (python-ipyparallel): Morph into... (python-ipyparallel-bootstrap): ... this, moving native inputs to a new definition of... (python-ipyparallel): ... this. --- gnu/packages/python-xyz.scm | 97 +++++++++++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 39 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 22869bcaa3..b8f66486d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8782,47 +8782,41 @@ (define-public python-ipython-genutils (define-public python2-ipython-genutils (package-with-python2 python-ipython-genutils)) -(define-public python-ipyparallel - (package - (name "python-ipyparallel") - (version "6.2.4") - (source +;;; Variant used to break a cycle with python-ipykernel. +(define-public python-ipyparallel-bootstrap + (hidden-package + (package + (name "python-ipyparallel-bootstrap") + (version "6.2.4") + (source (origin (method url-fetch) (uri (pypi-uri "ipyparallel" version)) (sha256 (base32 "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; RuntimeError: IO Loop failed to start - #:phases - (modify-phases %standard-phases - (add-before 'check 'prepare-for-tests - (lambda _ - (setenv "HOME" (getcwd)) - #t))))) - (propagated-inputs - (list python-dateutil - python-decorator - python-ipykernel - python-ipython - python-ipython-genutils - python-jupyter-client - python-pyzmq - python-tornado - python-traitlets)) - (native-inputs - (list python-ipython - python-mock - python-nose - python-pytest - python-pytest-cov - python-testpath)) - (home-page "https://ipython.org/") - (synopsis "Interactive Parallel Computing with IPython") - (description - "@code{ipyparallel} is a Python package and collection of CLI scripts for + (build-system python-build-system) + (arguments + (list + #:tests? #f + #:phases #~(modify-phases %standard-phases + ;; The python-ipykernel is normally propagated but is + ;; removed from this package to break the cycle. + (delete 'sanity-check)))) + (propagated-inputs + (list python-dateutil + python-decorator + ;; python-ipykernel is omitted here to avoid a cycle. + python-ipython + python-ipython-genutils + python-jupyter-client-bootstrap + python-pyzmq + python-tornado + python-traitlets)) + (home-page "https://ipython.org/") + (synopsis "Interactive Parallel Computing with IPython") + (description + "@code{ipyparallel} is a Python package and collection of CLI scripts for controlling clusters for Jupyter. @code{ipyparallel} contains the following CLI scripts: @enumerate @@ -8830,7 +8824,26 @@ (define-public python-ipyparallel @item ipcontroller - start a scheduler @item ipengine - start an engine @end enumerate") - (license license:bsd-3))) + (license license:bsd-3)))) + +(define-public python-ipyparallel + (package + (inherit python-ipyparallel-bootstrap) + (name "python-ipyparallel") + (arguments (list #:tests? #t)) + (native-inputs + (list python-ipython + python-mock + python-nose + python-pytest + python-pytest-cov + python-testpath)) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-ipyparallel-bootstrap) + (replace "python-jupyter-client-bootstrap" python-jupyter-client) + (append python-ipykernel))) + (properties (alist-delete 'hidden? (package-properties + python-ipyparallel-bootstrap))))) (define-public python-ipython-cluster-helper (package @@ -9119,10 +9132,16 @@ (define-public python-ipykernel-bootstrap (package (inherit parent) (name "python-ipykernel-bootstrap") + (arguments (list #:tests? #f + ;; The package should normally propagate ipykernel, + ;; left out here to break the cycle. + #:phases #~(modify-phases %standard-phases + (delete 'sanity-check)))) + (native-inputs '()) (propagated-inputs - `(("python-jupyter-client" ,python-jupyter-client-bootstrap) - ,@(fold alist-delete (package-propagated-inputs parent) - '("python-jupyter-client")))))))) + (modify-inputs (package-propagated-inputs parent) + (replace "python-jupyter-client" python-jupyter-client-bootstrap) + (append python-ipyparallel-bootstrap))))))) (define-public python-pari-jupyter (package -- cgit v1.2.3 From 1ca00ddbbe882db08df55e3694f958c068aa457d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Apr 2022 16:49:31 -0400 Subject: gnu: python-nest-asyncio: Update to 1.5.5. * gnu/packages/python-xyz.scm (python-nest-asyncio): Update to 1.5.5. --- 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 b8f66486d3..5c1fcfb725 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27874,14 +27874,14 @@ (define-public python-nestedtext (define-public python-nest-asyncio (package (name "python-nest-asyncio") - (version "1.5.1") + (version "1.5.5") (source (origin (method url-fetch) (uri (pypi-uri "nest_asyncio" version)) (sha256 (base32 - "1anha29fcijminn5bh2icnx8x7nk39lna9wkc72262i12p2s3idg")))) + "0rbdw7lry66yj13hh4w63yzflnapdal1ffl237k8nsa2v4f2jhp4")))) (build-system python-build-system) (home-page "https://github.com/erdewit/nest_asyncio") (synopsis "Patch asyncio to allow nested event loops") -- cgit v1.2.3 From d54b8754fdba52d89aafaaf80b6c8e89bcea92bd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Apr 2022 17:31:43 -0400 Subject: gnu: python-jupyter-core: Update to 4.10.0. * gnu/packages/python-xyz.scm (python-jupyter-core): Update to 4.10.0. [phases]: Delete trailing #t. {check}: Remove extraneous add-installed-pythonpath. Skip the test_argv0, test_path_priority and test_not_on_path tests. [propagated-inputs, native-inputs]: Fix indentation. --- gnu/packages/python-xyz.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5c1fcfb725..8bd7258f9e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8959,26 +8959,30 @@ (define-public python-traitlets (define-public python-jupyter-core (package (name "python-jupyter-core") - (version "4.7.1") + (version "4.10.0") (source (origin (method url-fetch) (uri (string-append (pypi-uri "jupyter_core" version))) (sha256 (base32 - "1d12j5hkff0xiax87pnhmzbsph3jqqzhz16h8xld7z2y4armq0kr")))) + "1v0s31rmwppdmww135hif03hy164j9kimirh24kxfcbvdfql9pm6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - ; Some tests write to $HOME. + ;; Some tests write to $HOME. (setenv "HOME" "/tmp") - ; Some tests load the installed package. - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv")))) + (invoke "pytest" "-vv" + "-k" + (string-append + ;; XXX: These tests fail with "ModuleNotFoundError: No + ;; module named 'jupyter_core'". + "not test_argv0 and not test_path_priority " + "and not test_not_on_path"))))) (add-after 'unpack 'patch-testsuite (lambda _ ;; test_not_on_path() and test_path_priority() try to run a test @@ -8987,8 +8991,7 @@ (define-public python-jupyter-core (("env = \\{'PATH': ''\\}") "env = {'PATH': '', 'PYTHONPATH': os.environ['GUIX_PYTHONPATH']}") (("env = \\{'PATH': str\\(b\\)\\}") - "env = {'PATH': str(b), 'PYTHONPATH': os.environ['GUIX_PYTHONPATH']}")) - #t)) + "env = {'PATH': str(b), 'PYTHONPATH': os.environ['GUIX_PYTHONPATH']}")))) ;; Migration is running whenever etc/jupyter exists, but the ;; Guix-managed directory will never contain any migratable IPython ;; config files and cannot be written to anyway, so just pretend we @@ -9000,10 +9003,8 @@ (define-public python-jupyter-core (string-append (assoc-ref outputs "out") "/etc/jupyter/migrated"))))))) - (propagated-inputs - (list python-traitlets)) - (native-inputs - (list python-six python-pytest)) + (propagated-inputs (list python-traitlets)) + (native-inputs (list python-pytest)) ;; This package provides the `jupyter` binary and thus also exports the ;; search paths. (native-search-paths -- cgit v1.2.3 From f30bdda88f6103a004ff118d568950aa42d36ad3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Apr 2022 17:33:51 -0400 Subject: gnu: python-jupyter-client: Update to 7.2.2. * gnu/packages/python-xyz.scm (python-jupyter-client-bootstrap): Make the base package definition, moving most fields. Update to 7.2.2. [propagated-inputs]: Add python-entrypoints and python-nest-asyncio. (python-jupyter-client): Inherit from python-jupyter-client-bootstrap, adjusting accordingly. [native-inputs]: Add python-pytest-asyncio. --- gnu/packages/python-xyz.scm | 120 +++++++++++++++++++++++--------------------- 1 file changed, 63 insertions(+), 57 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8bd7258f9e..9ede07e505 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9020,69 +9020,75 @@ (define-public python-jupyter-core "Jupyter core is the base package on which Jupyter projects rely.") (license license:bsd-3))) -(define-public python-jupyter-client - (package - (name "python-jupyter-client") - (version "6.1.12") - (source - (origin - (method url-fetch) - (uri (pypi-uri "jupyter_client" version)) - (sha256 - (base32 - "10p7fcgvv9hvz9zical9wk68ks5ssak2ykbzx65wm1k1hk8a3g64")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-tool-file-names - (lambda* (#:key inputs #:allow-other-keys) - (let ((iproute (assoc-ref inputs "iproute"))) +;; Bootstrap variant of jupyter-client, which breaks the loop between ipykernel +;; and jupyter-client by removing the former from its native-inputs and +;; disabling tests. +(define-public python-jupyter-client-bootstrap + (hidden-package + (package + (name "python-jupyter-client-bootstrap") + (version "7.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jupyter_client" version)) + (sha256 + (base32 + "12pbp177bfb3710y1a5598mwn8ffhyzmpll67m0nmalb98savnwg")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-tool-file-names + (lambda* (#:key inputs #:allow-other-keys) (substitute* "jupyter_client/localinterfaces.py" (("'ip'") - (string-append "'" iproute "/sbin/ip'"))) - #t))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Some tests try to write to $HOME. - (setenv "HOME" "/tmp") - (invoke "pytest" "-vv"))))))) - (inputs - `(("iproute" ,iproute))) - (propagated-inputs - (list python-dateutil python-jupyter-core python-pyzmq - python-tornado-6 python-traitlets)) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-pytest-timeout" ,python-pytest-timeout) - ("python-async-generator" ,python-async-generator) - ("python-mock" ,python-mock) - ("python-msgpack" ,python-msgpack) - ("python-ipython" ,python-ipython) - ("python-ipykernel" ,python-ipykernel-bootstrap))) - (home-page "https://jupyter.org/") - (synopsis "Jupyter protocol implementation and client libraries") - (description - "The @code{jupyter_client} package contains the reference implementation + (format #f "'~a'" (search-input-file inputs "sbin/ip"))))))))) + (inputs (list iproute)) + (propagated-inputs + (list python-dateutil + python-entrypoints + python-jupyter-core + python-nest-asyncio + python-pyzmq + python-tornado-6 + python-traitlets)) + (home-page "https://jupyter.org/") + (synopsis "Jupyter protocol implementation and client libraries") + (description + "The @code{jupyter_client} package contains the reference implementation of the Jupyter protocol. It also provides client and kernel management APIs for working with kernels, and the @code{jupyter kernelspec} entrypoint for installing @code{kernelspec}s for use with Jupyter frontends.") - (license license:bsd-3))) + (license license:bsd-3)))) -;; Bootstrap variant of jupyter-client, which breaks the loop between ipykernel -;; and jupyter-client by removing the former from its native-inputs and -;; disabling tests. -(define-public python-jupyter-client-bootstrap - (let ((base python-jupyter-client)) - (hidden-package - (package - (inherit base) - (name "python-jupyter-client-bootstrap") - (arguments - `(#:tests? #f - ,@(package-arguments base))) - (native-inputs `()))))) +(define-public python-jupyter-client + (let ((base python-jupyter-client-bootstrap)) + (package + (inherit base) + (name "python-jupyter-client") + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:tests? _ #f) + #t) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Some tests try to write to $HOME. + (setenv "HOME" "/tmp") + (invoke "pytest" "-vv")))))))) + (native-inputs + (list python-pytest + python-pytest-asyncio + python-pytest-timeout + python-async-generator + python-ipython + python-ipykernel-bootstrap)) + (properties (alist-delete 'hidden? (package-properties base)))))) (define-public python-ipykernel (package -- cgit v1.2.3 From 53e179c752a7e0a289d845f1dc92883dd335e1f2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Apr 2022 23:36:01 -0400 Subject: gnu: python-ipykernel: Update to 6.13.0. * gnu/packages/python-xyz.scm (python-ipykernel): Update to 6.13.0. [origin]: Fix indentation. [phases]: Use gexps. {check}: Invoke pytest via tini {set-python-file-name}: Adjust to use search-input-file. [propagated-inputs]: Add python-debugpy, python-matplotlib-inline and python-psutil. [native-inputs]{python-nose}: Delete. {python-ipyrallel-bootstrap}: New native input. {python-pytest}: Replace with... {python-pytest-bootstrap}: ... this. {python-pytest-timeout, tini}: New native inputs. --- gnu/packages/python-xyz.scm | 94 ++++++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 30 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ede07e505..7055b58094 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9093,42 +9093,76 @@ (define-public python-jupyter-client (define-public python-ipykernel (package (name "python-ipykernel") - (version "5.5.3") + (version "6.13.0") (source (origin - (method url-fetch) - (uri (pypi-uri "ipykernel" version)) - (sha256 - (base32 "02f55cjkp5q64x7ikjxznbxwjpkdmfy237b9kg7dk1pxmzvy90m6")))) + (method url-fetch) + (uri (pypi-uri "ipykernel" version)) + (sha256 + (base32 "0q5yni8h08nadsn53f957p0pjsjhwl2b2lp1hqz3jn0854z2fa0f")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" "/tmp") - (invoke "pytest" "-v")))) - (add-after 'install 'set-python-file-name - (lambda* (#:key outputs #:allow-other-keys) - ;; Record the absolute file name of the 'python' executable in - ;; 'kernel.json'. - (let ((out (assoc-ref outputs "out"))) - (substitute* (string-append out "/share/jupyter" - "/kernels/python3/kernel.json") - (("\"python\"") - (string-append "\"" (which "python") "\""))) - #t)))))) - (propagated-inputs - (list python-ipython python-tornado-6 python-traitlets - ;; imported at runtime during connect - python-jupyter-client)) - (native-inputs - (list python-flaky python-nose python-pytest)) + (list + #:imported-modules `(,@%python-build-system-modules + (guix build syscalls)) + #:modules '((guix build python-build-system) + (guix build syscalls) + (guix build utils) + (ice-9 match)) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (match (primitive-fork) + (0 ;child process + (set-child-subreaper!) + ;; XXX: Tini provides proper PID1-like signal handling that + ;; reaps zombie processes, necessary for the + ;; 'test_shutdown_subprocesses' test to pass. + + ;; TODO: Complete https://issues.guix.gnu.org/30948. + (setenv "HOME" "/tmp") + (execlp "tini" "--" "pytest" "-vv")) + (pid + (match (waitpid pid) + ((_ . status) + (unless (zero? status) + (error "`pytest' exited with status" + status))))))))) + (add-after 'install 'set-python-file-name + (lambda* (#:key inputs #:allow-other-keys) + ;; Record the absolute file name of the 'python' executable in + ;; 'kernel.json'. + (substitute* (string-append #$output "/share/jupyter" + "/kernels/python3/kernel.json") + (("\"python\"") + (format #f "~s" (search-input-file inputs + "/bin/python3"))))))))) + (propagated-inputs + (list python-debugpy + python-ipython + python-jupyter-client ;imported at runtime during connect + python-matplotlib-inline + ;;python-nest-asyncio + ;;python-packaging + python-psutil + python-tornado-6 + python-traitlets)) + (inputs (list python)) ;for cross compilation + (native-inputs + (list python-flaky + python-ipyparallel-bootstrap + ;; XXX: Our Pytest package captures its native inputs in its + ;; wrapper script (such as python-nose), which is used in the code + ;; and causes deprecation warnings. Using the bootstrap variant + ;; avoids that. + python-pytest-bootstrap + python-pytest-timeout + tini)) (home-page "https://ipython.org") (synopsis "IPython Kernel for Jupyter") - (description - "This package provides the IPython kernel for Jupyter.") + (description "This package provides the IPython kernel for Jupyter.") (license license:bsd-3))) ;; Bootstrap variant of ipykernel, which uses the bootstrap jupyter-client to -- cgit v1.2.3 From 0f446f1bc4cfc0752faa49efcd11914d7b4e977c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 00:35:21 -0400 Subject: gnu: python-ipyparallel: Update to 8.2.1. * gnu/packages/python-xyz.scm (python-ipyparallel-bootstrap): Update to 8.2.1. [propagated-inputs]: Add python-entrypoints, python-psutil and python-tqdm. Update python-tornado to version 6. (python-ipyparallel)[phases]{check}: Override phase. [native-inputs]: Remove python-mock and python-nose. Add python-pytest-asyncio and python-pytest-tornado. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7055b58094..b573a7cd15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8787,14 +8787,14 @@ (define-public python-ipyparallel-bootstrap (hidden-package (package (name "python-ipyparallel-bootstrap") - (version "6.2.4") + (version "8.2.1") (source (origin (method url-fetch) (uri (pypi-uri "ipyparallel" version)) (sha256 (base32 - "0rf0dbpxf5z82bw8lsjj45r3wdd4wc74anz4wiiaf2rbjqlb1ivn")))) + "0wiwfd7870zbmczzn96jqxxjf2zcbcaxnsl1ddn8hspwa8y4frzj")))) (build-system python-build-system) (arguments (list @@ -8806,12 +8806,14 @@ (define-public python-ipyparallel-bootstrap (propagated-inputs (list python-dateutil python-decorator - ;; python-ipykernel is omitted here to avoid a cycle. + python-entrypoints python-ipython - python-ipython-genutils + ;; python-ipykernel is omitted here to break a cycle. python-jupyter-client-bootstrap + python-psutil python-pyzmq - python-tornado + python-tornado-6 + python-tqdm python-traitlets)) (home-page "https://ipython.org/") (synopsis "Interactive Parallel Computing with IPython") @@ -8830,13 +8832,19 @@ (define-public python-ipyparallel (package (inherit python-ipyparallel-bootstrap) (name "python-ipyparallel") - (arguments (list #:tests? #t)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) (native-inputs (list python-ipython - python-mock - python-nose python-pytest + python-pytest-asyncio python-pytest-cov + python-pytest-tornado python-testpath)) (propagated-inputs (modify-inputs (package-propagated-inputs python-ipyparallel-bootstrap) -- cgit v1.2.3 From abb7617f204fe800cb19233101cb7334bfd1d0ff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 10:36:21 -0400 Subject: gnu: python-anyio: Replace python-pytest-trio with python-trio. * gnu/packages/python-xyz.scm (python-anyio) [phases]{check}: Remove extraneous add-installed-pythonpath call. Expound comment about IPv6 issues. [native-inputs]: Use regular python-pytest. Replace python-pytest-trio by python-trio. --- gnu/packages/python-xyz.scm | 76 ++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b573a7cd15..60c2e0e3cd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25610,43 +25610,44 @@ (define-public python-anyio `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv" "-p" "no:asyncio" - "-m" "not network" - "-k" - (string-append - "not test_is_block_device" - - ;; These fail because of network (or specifically - ;; IPv6 network) access. - " and not test_accept" - " and not test_accept_after_close" - " and not test_close_during_receive" - " and not test_close_from_other_task" - " and not test_concurrent_receive" - " and not test_concurrent_send" - " and not test_connect_tcp_with_tls" - " and not test_connect_tcp_with_tls_cert_check_fail" - " and not test_connection_refused" - " and not test_extra_attributes" - " and not test_getaddrinfo" - " and not test_getnameinfo" - " and not test_happy_eyeballs" - " and not test_iterate" - " and not test_receive_after_close" - " and not test_receive_timeout" - " and not test_reuse_port" - " and not test_run_process" - " and not test_send_after_close" - " and not test_send_after_eof" - " and not test_send_after_peer_closed" - " and not test_send_eof" - " and not test_send_large_buffer" - " and not test_send_receive" - " and not test_socket_options" - " and not test_unretrieved_future_exception_server_crash")))))))) + (invoke + "pytest" "-vv" "-p" "no:asyncio" + "-m" "not network" + "-k" + (string-append + "not test_is_block_device" + + ;; These fail because of network (or specifically IPv6 + ;; network) access (see: + ;; https://github.com/agronholm/anyio/issues/417). + " and not test_accept" + " and not test_accept_after_close" + " and not test_close_during_receive" + " and not test_close_from_other_task" + " and not test_concurrent_receive" + " and not test_concurrent_send" + " and not test_connect_tcp_with_tls" + " and not test_connect_tcp_with_tls_cert_check_fail" + " and not test_connection_refused" + " and not test_extra_attributes" + " and not test_getaddrinfo" + " and not test_getnameinfo" + " and not test_happy_eyeballs" + " and not test_iterate" + " and not test_receive_after_close" + " and not test_receive_timeout" + " and not test_reuse_port" + " and not test_run_process" + " and not test_send_after_close" + " and not test_send_after_eof" + " and not test_send_after_peer_closed" + " and not test_send_eof" + " and not test_send_large_buffer" + " and not test_send_receive" + " and not test_socket_options" + " and not test_unretrieved_future_exception_server_crash")))))))) (propagated-inputs (list python-contextvars python-dataclasses @@ -25658,9 +25659,8 @@ (define-public python-anyio python-coverage python-hypothesis python-mock - python-pytest-6 + python-pytest python-pytest-mock - python-pytest-trio python-setuptools-scm python-trio python-trustme -- cgit v1.2.3 From 10d69f20be51c25deebb8086a6391c11b2c29a5b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 11:33:51 -0400 Subject: gnu: python-bleach: Update to 5.0.0. * gnu/packages/python-xyz.scm (python-bleach): Update to 5.0.0. [propagated-inputs]: Remove python-packaging and python-six. Add python-tinycss2. --- gnu/packages/python-xyz.scm | 10 ++++------ 1 file changed, 4 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 60c2e0e3cd..905086f133 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13441,23 +13441,21 @@ (define-public python-nb-clean (define-public python-bleach (package (name "python-bleach") - (version "4.1.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (pypi-uri "bleach" version)) (sha256 - (base32 "1nkibazmw1ry4cfxs9qrkkidxdf2z1hh1b20xq1ahqdsgsrxh009")))) + (base32 "0rc5avysbsl3w3i2qvb6522263zhwlvf50w0ifs8776w9c2wrmn6")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "pytest" "-vv"))))))) - (propagated-inputs - (list python-packaging python-six python-webencodings)) - (native-inputs - (list python-pytest)) + (propagated-inputs (list python-tinycss2 python-webencodings)) + (native-inputs (list python-pytest)) (home-page "https://github.com/mozilla/bleach") (synopsis "Whitelist-based HTML-sanitizing tool") (description "Bleach is an easy whitelist-based HTML-sanitizing tool.") -- cgit v1.2.3 From 724731de4c3e8445a347d85891e96c0f341bcc3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 15:50:36 -0400 Subject: gnu: python-nbconvert: Update to 6.5.0. * gnu/packages/python-xyz.scm (python-nbconvert): Update to 6.5.0. [arguments]: Use gexps. [phases]{fix-paths-and-tests}: Rename to... {fix-paths}: ... this. Find inputs via search-input-file. Patch inskcape file name. Disable tests in... {check}: ... this phase instead. Do not set HOME. Execute installed test suite. Run tests in parallel. Disable and not test_execute_widgets_from_nbconvert and test_execute_multiple_notebooks tests. [inputs]: Add inkscape. [native-inputs]: Delete python-pytest-cov and python-pytest-dependency. Use new style. [propagated-inputs]: Add python-beautifulsoup4. Reduce the texlive packages part of the generated updmap.cfg input, moving them to regular propagated inputs. Add texlive-unicode-math and texlive-lm-math. --- gnu/packages/python-xyz.scm | 160 +++++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 78 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 905086f133..8d82b2e5d0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -174,6 +174,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) + #:use-module (gnu packages inkscape) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jupyter) @@ -13587,70 +13588,71 @@ (define-public python-simpleeval (define-public python-nbconvert (package (name "python-nbconvert") - (version "6.0.7") + (version "6.5.0") (source (origin (method url-fetch) (uri (pypi-uri "nbconvert" version)) (sha256 (base32 - "00lhqaxn481qvk2w5568asqlsnvrw2fm61p1vssx3m7vdnl17g6b")))) + "17g9xq4za7vvzml6l6d8zrzknhxsvgx02hymmsw9d1dygbi4cgi2")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths-and-tests - (lambda _ - ;; Use pandoc binary from input. - (substitute* "nbconvert/utils/pandoc.py" - (("'pandoc'") (string-append "'" (which "pandoc") "'"))) - ;; Same for LaTeX. - (substitute* "nbconvert/exporters/pdf.py" - (("\"xelatex\"") (string-append "\"" (which "xelatex") "\"")) - (("\"bibtex\"") (string-append "\"" (which "bibtex") "\""))) - ;; Make sure tests are not skipped. - (substitute* (find-files "." "test_.+\\.py$") - (("@onlyif_cmds_exist\\(('(pandoc|xelatex)'(, )?)+\\)") "")) - ;; Pandoc is never missing, disable test. - (substitute* "nbconvert/utils/tests/test_pandoc.py" - (("import os" all) (string-append all "\nimport pytest")) - (("(.+)(def test_pandoc_available)" all indent def) - (string-append indent "@pytest.mark.skip('disabled by guix')\n" - indent def))) - ;; Not installing pyppeteer, delete test. - (delete-file "nbconvert/exporters/tests/test_webpdf.py") - (substitute* "nbconvert/tests/test_nbconvertapp.py" - (("(.+)(def test_webpdf_with_chromium)" all indent def) - (string-append indent "@pytest.mark.skip('disabled by guix')\n" - indent def))))) - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - ;; Some tests invoke the installed nbconvert binary. - (add-installed-pythonpath inputs outputs) - ;; Tests depend on templates installed to output. - (setenv "JUPYTER_PATH" - (string-append - (assoc-ref outputs "out") - "/share/jupyter:" - (getenv "JUPYTER_PATH"))) - ;; Some tests need HOME - (setenv "HOME" "/tmp") - (invoke "pytest" "-vv"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Use pandoc binary from input. + (substitute* "nbconvert/utils/pandoc.py" + (("'pandoc'") + (format #f "~s" (search-input-file inputs "bin/pandoc")))) + ;; Same for LaTeX. + (substitute* "nbconvert/exporters/pdf.py" + (("\"xelatex\"") + (format #f "~s" (search-input-file inputs "bin/xelatex"))) + (("\"bibtex\"") + (format #f "~s" (search-input-file inputs "bin/bibtex")))) + ;; Likewise for Inkscape. + (substitute* "nbconvert/preprocessors/svg2pdf.py" + (("inkscape_path = which\\(\"inkscape\")") + (format #f "inkscape_path = ~s" + (search-input-file inputs "bin/inkscape")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Tests depend on templates installed to output. + (setenv "JUPYTER_PATH" + (string-append #$output "/share/jupyter:" + (getenv "JUPYTER_PATH"))) + ;; Step outside of the source directory to avoid having both + ;; the installed package *and* the package from the source on + ;; Python's path. + (with-directory-excursion "/tmp" + (invoke "pytest" "--pyargs" "nbconvert" + "-vv" "-n" (number->string (parallel-job-count)) + "-k" + (string-append + ;; These tests require pyppeteer, not yet + ;; available in Guix. + "not test_webpdf_with_chromium " + "and not test_webpdf.py " + ;; These tests require ipywidgets, which would + ;; introduce a dependency cycle. + "and not test_execute_widgets_from_nbconvert " + "and not test_execute_multiple_notebooks "))))))))) (inputs - (list pandoc - ;; XXX: Disabled, needs substitute*. - ;;("inkscape" ,inkscape) - )) - (native-inputs - `(("python-ipykernel" ,python-ipykernel) - ;; XXX: Disabled, not in guix. - ;;("python-pyppeteer" ,python-pyppeteer) - ("python-pytest" ,python-pytest) - ("python-pytest-cov" ,python-pytest-cov) - ("python-pytest-dependency" ,python-pytest-dependency))) + (list inkscape pandoc)) + (native-inputs + (list python-ipykernel + ;; Adding ipywidgets would create a cycle. + ;;python-ipywidgets + ;;python-pyppeteer ;TODO: package me + python-pytest + python-pytest-xdist)) (propagated-inputs - (list python-bleach + (list python-beautifulsoup4 + python-bleach python-defusedxml python-entrypoints python-jinja2 @@ -13666,37 +13668,39 @@ (define-public python-nbconvert ;; Required, even if [serve] is not used. python-tornado-6 ;; Required at runtime for `jupyter nbconvert --to=pdf`. - (texlive-updmap.cfg (list texlive-adjustbox - texlive-amsfonts - texlive-booktabs - texlive-caption - texlive-enumitem + texlive-adjustbox + texlive-booktabs + texlive-caption + texlive-enumitem + texlive-fontspec + texlive-generic-iftex + texlive-grffile + texlive-hyperref + texlive-latex-fancyvrb + texlive-latex-float + texlive-latex-geometry + texlive-latex-jknapltx + texlive-latex-ms + texlive-latex-parskip + texlive-latex-trimspaces + texlive-latex-upquote + texlive-stringenc + texlive-tcolorbox + texlive-titling + texlive-tools + texlive-ulem + texlive-unicode-math + texlive-xcolor + (texlive-updmap.cfg (list texlive-amsfonts texlive-eurosym texlive-fonts-rsfs - texlive-generic-iftex texlive-jknappen texlive-latex-amsmath - texlive-latex-fancyvrb - texlive-latex-float - texlive-fontspec - texlive-latex-geometry - texlive-grffile - texlive-hyperref - texlive-latex-jknapltx - texlive-latex-ms - texlive-oberdiek - texlive-latex-parskip - texlive-latex-trimspaces - texlive-latex-upquote texlive-latex-ucs texlive-lm + texlive-lm-math texlive-mathpazo - texlive-stringenc - texlive-tcolorbox - texlive-titling - texlive-tools - texlive-ulem - texlive-xcolor + texlive-oberdiek texlive-zapfding)))) (home-page "https://jupyter.org") (synopsis "Converting Jupyter Notebooks") -- cgit v1.2.3 From 1e76c82ca6c59b96210ed72726ec9c9179db409d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 21:35:02 -0400 Subject: gnu: python-send2trash: Update to 1.8.0 and update home page. * gnu/packages/python-xyz.scm (python-send2trash): Update to 1.8.0. [source]: Update Git URL. [phases]{pre-check}: Set HOME to /tmp directly. {check}: Override phase. [native-inputs]: Add python-pytest. [properties]: Delete field. (python2-send2trash): Delete variable. [home-page]: Update URL. --- gnu/packages/python-xyz.scm | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8d82b2e5d0..2bcb51a651 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22100,46 +22100,35 @@ (define-public python-zict (define-public python-send2trash (package (name "python-send2trash") - (version "1.5.0") + (version "1.8.0") (source (origin (method git-fetch) ;; Source tarball on PyPI doesn't include tests. (uri (git-reference - (url "https://github.com/hsoft/send2trash") + (url "https://github.com/arsenetar/send2trash") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1c76zldhw2ay7q7r00nnzcampjz9lkqfcbzqpm0iqp5i6bmmv30v")))) + "1k7dfypaaq4f36fbciaasv72j6wgjihw8d88axmz9c329bz8v5qx")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ - (mkdir-p "/tmp/foo") - (setenv "HOME" "/tmp/foo") - #t))))) - (home-page "https://github.com/hsoft/send2trash") + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest)) + (home-page "https://github.com/arsenetar/send2trash") (synopsis "Send files to the user's @file{~/Trash} directory") (description "This package provides a Python library to send files to the user's @file{~/Trash} directory.") - (properties `((python2-variant . ,(delay python2-send2trash)))) (license license:bsd-3))) -(define-public python2-send2trash - (let ((base (package-with-python2 - (strip-python2-variant python-send2trash)))) - (package/inherit base - (arguments - (substitute-keyword-arguments (package-arguments python-send2trash) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'check 'setenv - (lambda _ - (setenv "GUIX_PYTHONPATH" - (string-append (getcwd) ":" (getenv "GUIX_PYTHONPATH")))))))))))) - (define-public python-pyfavicon (package (name "python-pyfavicon") -- cgit v1.2.3 From 73728b3942fc29aadd0cc6c8935a6704cf646858 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 13 Apr 2022 21:53:25 -0400 Subject: gnu: python-notebook: Update to 6.4.10. * gnu/packages/python-xyz.scm (python-notebook): Update to 6.4.10. [phases]{check}: Remove add-installed-pythonpath. [native-inputs]: python-nest-asyncio. --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 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 2bcb51a651..ca293f5f54 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13722,13 +13722,13 @@ (define-public python-nbconvert (define-public python-notebook (package (name "python-notebook") - (version "6.3.0") + (version "6.4.10") (source (origin (method url-fetch) (uri (pypi-uri "notebook" version)) (sha256 (base32 - "0zfwr87ndjzmdp9adpc9lby1hdqdkjp2q7c9vff3wiw1dj6kkjfb")))) + "03p976xq1l9xf4djwk0snmywd0zck3i6gjngxsl874i8qrmsf214")))) (build-system python-build-system) (arguments `(#:phases @@ -13747,10 +13747,9 @@ (define-public python-notebook (setenv "HOME" (getcwd)))) (replace 'check (lambda* (#:key tests? inputs outputs #:allow-other-keys) - ;; These tests require a browser + ;; These tests require a browser. (delete-file-recursively "notebook/tests/selenium") (when tests? - (add-installed-pythonpath inputs outputs) ;; Interferes with test expectations. (unsetenv "JUPYTER_CONFIG_PATH") ;; Some tests do not expect all files to be installed in the @@ -13767,6 +13766,7 @@ (define-public python-notebook python-jinja2 python-jupyter-client python-jupyter-core + python-nest-asyncio python-nbconvert python-nbformat python-prometheus-client -- cgit v1.2.3 From 6c7834f46aade4771d53434b6fd04c93e8746b7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 14 Apr 2022 23:25:31 -0400 Subject: gnu: Add python-pep621. * gnu/packages/python-xyz.scm (python-pep621): New variable. --- gnu/packages/python-xyz.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 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 ca293f5f54..23bf8add15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10813,7 +10813,57 @@ (define-public python2-pep517 (arguments `(#:tests? #f ,@(package-arguments base))) - (native-inputs `())))) + (native-inputs `())))) + +(define-public python-pep621 + (package + (name "python-pep621") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FFY00/python-pep621") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nzig7bmzf0xx5svxlf065mrzihr0ci4p1yaxka9flqjba98flpr")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" + ;; Two parameterized test_load tests are currently + ;; failing (see: + ;; https://github.com/FFY00/python-pep621/issues/14). + "-k" "not test_load")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl))))))) + (propagated-inputs (list python-packaging)) + (native-inputs (list python-pypa-build python-pytest python-tomli)) + (home-page "https://github.com/FFY00/python-pep621") + (synopsis "Dataclass for PEP 621 metadata") + (description "This project does not implement the parsing of +@file{pyproject.toml} containing PEP 621 metadata. Instead, given a Python +data structure representing PEP 621 metadata (already parsed), it will +validate this input and generate a PEP 643-compliant metadata +file (e.g. @file{PKG-INFO}).") + (license license:expat))) (define-public python-pyflakes (package -- cgit v1.2.3 From 2576d9ffc4c5cf84c4c6c1dfee2d2d8655fba4b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 16 Apr 2022 23:44:01 -0400 Subject: gnu: python-ipython-documentation: Also build info and pdf targets. * gnu/packages/patches/python-ipython-documentation-chars.patch: New file. * gnu/packages/patches/python-ipython-documentation-repro.patch: Likewise. * gnu/local.mk: Register them. * gnu/packages/python-xyz.scm (python-ipython-documentation) [source]: Apply patches. [arguments]: Use gexps. [phases]{sanitize-sources}: New phase. {configure-sphinx-for-xelatex}: Likewise. {install}: Streamline. Also build and install the PDF and info manual. Enable parallel processing. [inputs]: Delete field. [propagated-inputs]: Remove texlive-updmap.cfg input. Add fontconfig, font-gnu-freefont, graphviz, python-docrepr, texlive-polyglossia, texlive-bin and texlive-xindy. --- gnu/local.mk | 2 + .../python-ipython-documentation-chars.patch | 18 +++ .../python-ipython-documentation-repro.patch | 25 ++++ gnu/packages/python-xyz.scm | 145 +++++++++++---------- 4 files changed, 118 insertions(+), 72 deletions(-) create mode 100644 gnu/packages/patches/python-ipython-documentation-chars.patch create mode 100644 gnu/packages/patches/python-ipython-documentation-repro.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 06367fac5e..a5cf82ab28 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1686,6 +1686,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-execnet-read-only-fix.patch \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ + %D%/packages/patches/python-ipython-documentation-chars.patch \ + %D%/packages/patches/python-ipython-documentation-repro.patch \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pdoc3-tests.patch \ %D%/packages/patches/python-peachpy-determinism.patch \ diff --git a/gnu/packages/patches/python-ipython-documentation-chars.patch b/gnu/packages/patches/python-ipython-documentation-chars.patch new file mode 100644 index 0000000000..a52c54f513 --- /dev/null +++ b/gnu/packages/patches/python-ipython-documentation-chars.patch @@ -0,0 +1,18 @@ +Avoid LaTeX errors due to non-printable characters. +Submitted upstream: https://github.com/ipython/ipython/pull/13640 + +diff --git a/IPython/utils/coloransi.py b/IPython/utils/coloransi.py +index e33142180..9300b0108 100644 +--- a/IPython/utils/coloransi.py ++++ b/IPython/utils/coloransi.py +@@ -74,8 +74,8 @@ class TermColors: + class InputTermColors: + """Color escape sequences for input prompts. + +- This class is similar to TermColors, but the escapes are wrapped in \001 +- and \002 so that readline can properly know the length of each line and ++ This class is similar to TermColors, but the escapes are wrapped in \\001 ++ and \\002 so that readline can properly know the length of each line and + can wrap lines accordingly. Use this class for any colored text which + needs to be used in input prompts, such as in calls to raw_input(). + diff --git a/gnu/packages/patches/python-ipython-documentation-repro.patch b/gnu/packages/patches/python-ipython-documentation-repro.patch new file mode 100644 index 0000000000..d6a6e9c3fd --- /dev/null +++ b/gnu/packages/patches/python-ipython-documentation-repro.patch @@ -0,0 +1,25 @@ +Fix non-reproducibilities caused by time-dependent procedures. +Submitted upstream: https://github.com/ipython/ipython/pull/13640 + +diff --git a/IPython/sphinxext/ipython_directive.py b/IPython/sphinxext/ipython_directive.py +index 18bdfcae9..2c665ac87 100644 +--- a/IPython/sphinxext/ipython_directive.py ++++ b/IPython/sphinxext/ipython_directive.py +@@ -19,7 +19,7 @@ + In [1]: 1+1 + + In [1]: import datetime +- ...: datetime.datetime.now() ++ ...: datetime.date.fromisoformat('2022-02-22') + + It supports IPython construct that plain + Python does not understand (like magics): +@@ -28,7 +28,7 @@ + + In [0]: import time + +- In [0]: %timeit time.sleep(0.05) ++ In [0]: %pdoc time + + This will also support top-level async when using IPython 7.0+ + diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 23bf8add15..78e5334bce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -155,9 +155,11 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages django) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) + #:use-module (gnu packages documentation) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fontutils) + #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gdb) #:use-module (gnu packages gcc) @@ -9389,79 +9391,78 @@ (define-public python-ipython-documentation (inherit python-ipython) (name "python-ipython-documentation") (version (package-version python-ipython)) + (source + (origin + (inherit (package-source python-ipython)) + (patches (append (search-patches + "python-ipython-documentation-chars.patch" + "python-ipython-documentation-repro.patch") + (origin-patches (package-source python-ipython)))))) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'build) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "out") "/share")) - (doc (string-append data "/doc/" ,name "-" ,version)) - (html (string-append doc "/html")) - (man1 (string-append data "/man/man1")) - (info (string-append data "/info")) - (examples (string-append doc "/examples")) - (python-arg (string-append "PYTHON=" (which "python")))) - (setenv "LANG" "en_US.utf8") - (with-directory-excursion "docs" - ;; FIXME: pdf fails to build - ;;(system* "make" "pdf" "PAPER=a4") - (system* "make" python-arg "html") - ;; FIXME: the generated texi file contains ^@^@, which trips - ;; up the parser. - ;; (system* "make" python-arg "info") - ) - (copy-recursively "docs/man" man1) - (copy-recursively "examples" examples) - (copy-recursively "docs/build/html" html) - ;; (copy-file "docs/build/latex/ipython.pdf" - ;; (string-append doc "/ipython.pdf")) - (mkdir-p info) - ;; (copy-file "docs/build/texinfo/ipython.info" - ;; (string-append info "/ipython.info")) - (copy-file "COPYING.rst" (string-append doc "/COPYING.rst")))))))) - (inputs - (list python-ipython python-ipykernel)) - (native-inputs - `(("python-sphinx" ,python-sphinx) - ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) - ;; FIXME: It's possible that a smaller updmap.cfg would work just as - ;; well. - ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-capt-of - texlive-fonts-ec - texlive-generic-iftex - texlive-pdftex - texlive-latex-cmap - texlive-latex-environ - texlive-latex-eqparbox - texlive-etoolbox - texlive-latex-expdlist - texlive-latex-fancyhdr - texlive-latex-fancyvrb - texlive-latex-fncychap - texlive-latex-float - texlive-latex-framed - texlive-latex-geometry - texlive-latex-graphics - texlive-hyperref - texlive-latex-mdwtools - texlive-latex-multirow - texlive-latex-needspace - texlive-oberdiek - texlive-latex-parskip - texlive-latex-preview - texlive-latex-tabulary - texlive-latex-threeparttable - texlive-latex-titlesec - texlive-latex-trimspaces - texlive-latex-ucs - texlive-latex-upquote - texlive-url - texlive-latex-varwidth - texlive-wrapfig))) - ("texinfo" ,texinfo))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-pythonpath + (lambda _ + ;; Ensure this fixed (via the + ;; "python-ipython-documentation-chars.patch" patch) copy of + ;; IPython gets used. + (setenv "PYTHONPATH" (string-append (getcwd))))) + (add-before 'build 'configure-sphinx-for-xelatex + (lambda _ + ;; Use XeLaTeX instead of PDFLaTeX, as it can + ;; cope with the Unicode characters present in the + ;; contributors page, for example. + (substitute* "docs/source/conf.py" + (("project = 'IPython'.*" all) + (string-append all "latex_engine = 'xelatex'\n"))) + ;; XXX: The Sphinx-generated ipython.tex specifies the GNU + ;; FreeFont font to be searched via its extension, which uses + ;; kpathsea instead of fontconfig and fail (see: + ;; https://github.com/sphinx-doc/sphinx/issues/10347). Create a + ;; symlink to GNU FreeFont and add it to the TEXMF tree via + ;; GUIX_TEXMF. + (mkdir-p "texmf-dist/fonts/opentype/public") + (symlink (string-append + #$(this-package-native-input "font-gnu-freefont") + "/share/fonts/opentype") + (string-append + (getcwd) "/" + "texmf-dist/fonts/opentype/public/gnu-freefont")) + (setenv "GUIX_TEXMF" (string-append (getenv "GUIX_TEXMF") ":" + (getcwd) "/texmf-dist")))) + (delete 'build) + (delete 'check) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((data (string-append #$output "/share")) + (doc (string-append data "/doc/" #$name "-" #$version)) + (html (string-append doc "/html")) + (info (string-append data "/info"))) + (invoke "make" "-C" "docs" "info" "html" "pdf" + (string-append "SPHINXOPTS=-j" + (number->string (parallel-job-count)))) + (install-file "COPYING.rst" doc) + (copy-recursively "examples" (string-append doc "/examples")) + ;; Install HTML documentation. + (copy-recursively "docs/build/html" html) + ;; Likewise for the PDF. + (install-file "docs/build/latex/ipython.pdf" doc) + ;; Likewise for the info manual. + (install-file "docs/build/texinfo/ipython.info" info) + (symlink (string-append html "/_images") + (string-append info "/ipython-figures")))))))) + (native-inputs + (list fontconfig ;for XDG_DATA_DIRS to locate fonts + font-gnu-freefont + graphviz + python-docrepr + python-sphinx + python-sphinx-rtd-theme + texinfo + texlive-bin + texlive-polyglossia + texlive-xindy)))) (define-public python-urwid (package -- cgit v1.2.3 From 34c98f2cd387675313b06d1ff1baab2848a413bf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Apr 2022 08:46:41 -0400 Subject: gnu: Add python-strict-rfc3339. * gnu/packages/python-xyz.scm (python-strict-rfc3339): New variable. --- gnu/packages/python-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 78e5334bce..1ca87fee50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29550,6 +29550,48 @@ (define-public python-ofxparse statements in OFX files.") (license license:expat))) +(define-public python-strict-rfc3339 + (package + (name "python-strict-rfc3339") + (version "0.7") + (source + (origin + (method git-fetch) ;no tests in pypi release + (uri (git-reference + (url "https://github.com/danielrichman/strict-rfc3339") + (commit (string-append "version-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0b12bh9v9gwkm89kxbidxw2z81lg8fx1v5fzgs313v1wgx6qb09p")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" + ;; The timestamp to local offset tests fail due to + ;; missing timezone data (see: + ;; https://github.com/danielrichman/strict-rfc3339/issues/9). + "-k" "not LocalOffset"))))))) + (native-inputs (list python-pytest)) + (home-page "https://github.com/danielrichman/strict-rfc3339") + (synopsis "RFC3339 procedures library") + (description "The @code{strict_rfc3339} Python module provides strict, +simple, lightweight RFC3339 procedures. It enables or aims to: +@itemize +@item Convert UNIX timestamps to and from RFC3339. +@item Produce RFC3339 strings with a UTC offset (Z) or with the offset that +the C time module reports is the local timezone offset. +@item Be simple with minimal dependencies/libraries. +@item Avoid timezones as much as possible. +@item Be very strict and follow RFC3339. +@end itemize") + (license license:gpl3+))) + (define-public python-stripe (package (name "python-stripe") -- cgit v1.2.3 From ac4a73a1af3e0deb240407dbb1ccba40a8507068 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Apr 2022 09:00:45 -0400 Subject: gnu: Add python-rfc3339-validator. * gnu/packages/python-xyz.scm (python-rfc3339-validator): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1ca87fee50..d2245e5605 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29550,6 +29550,27 @@ (define-public python-ofxparse statements in OFX files.") (license license:expat))) +(define-public python-rfc3339-validator + (package + (name "python-rfc3339-validator") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rfc3339_validator" version)) + (sha256 + (base32 "0srg0b89aikzinw72s433994k5gv5lfyarq1adhas11kz6yjm2hk")))) + (build-system python-build-system) + (native-inputs (list python-hypothesis + python-pytest + python-pytest-runner + python-strict-rfc3339)) + (propagated-inputs (list python-six)) + (home-page "https://github.com/naimetti/rfc3339-validator") + (synopsis "Python RFC3339 validator") + (description "This package provides a pure Python RFC3339 validator.") + (license license:expat))) + (define-public python-strict-rfc3339 (package (name "python-strict-rfc3339") -- cgit v1.2.3 From ea754c74d3def755d79c5a50263b3aa185f4346c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Apr 2022 11:04:29 -0400 Subject: gnu: Add python-dictpath. * gnu/packages/python-xyz.scm (python-dictpath): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d2245e5605..4cd26d4038 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27135,6 +27135,25 @@ (define-public python-dictdiffer dictionaries.") (license license:expat))) +(define-public python-dictpath + (package + (name "python-dictpath") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dictpath" version)) + (sha256 + (base32 "1n4hq4wbgaw59bbb16nhkgg5wk8sl4iw940vjrgx4xmifqxxw73m")))) + (build-system python-build-system) + (native-inputs (list python-pytest python-pytest-cov python-pytest-flake8)) + (home-page "https://github.com/p1c2u/pathable") + (synopsis "Object-oriented path library for Python") + (description "This object-oriented dictionary path Python library enables +traversing resources like paths or accessing resources on demand with separate +accessor layer.") + (license license:asl2.0))) + (define-public pyzo (package (name "pyzo") -- cgit v1.2.3 From 411cd4345f858d038b8761b9c8bbe902aedc3e23 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Apr 2022 14:28:31 -0400 Subject: gnu: python-numpy: Update to 1.21.6 and parallelize build/tests. * gnu/packages/python-xyz.scm (python-numpy): Update to 1.21.6. Move inputs and native-inputs fields after arguments. Use gexps. [modules]: New argument. [phases]{parallelize-build}: New phase. {configure-blas}: Format via (ice-9 format). {fix-executable-paths}: Use search-file-input. Remove obsolete system_info.py substitution. {check}: Remove extraneous add-installed-pythonpath and setenv calls. Provide the '-n' pytest-xdist option. [native-inputs]: Use python-hypothesis-next. (python-numpy-next): Inherit from python-numpy. (python2-numpy): Adjust for gexps. [phases]{delete-failing-test}: Rename to... {delete-failing-tests}: ... this. (python2-numpy-1.8): Likewise, and delete 'delete-failing-tests' phase. Disable tests. [native-inputs]: Define as the empty list. --- gnu/packages/python-xyz.scm | 194 +++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 101 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4cd26d4038..7840ccfcd1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5703,10 +5703,13 @@ (define-public python-cython-3 "17fqacrpis05w1rpi7d7sbimrk20xf8h6d3vrz5nf6ix3899abil")))) (properties '()))) -(define-public python-numpy-next +;; NOTE: when upgrading numpy please make sure that python-numba, +;; python-pandas and python-scipy still build, as these three packages are +;; often used together. +(define-public python-numpy (package - (name "python-numpy-next") - (version "1.22.3") + (name "python-numpy") + (version "1.21.6") (source (origin (method url-fetch) @@ -5715,50 +5718,57 @@ (define-public python-numpy-next version "/numpy-" version ".tar.gz")) (sha256 (base32 - "19dw91pqbqcniw2z57kiyqs1qp56g7kqy1bdyv664g8s62sc01m9")))) + "0b0c5y35rd3mvwfk5is1d5ppfw9nl4d2rgx9xkwh1p0w394wdvyl")))) (build-system python-build-system) - (inputs - (list openblas)) - (native-inputs - (list python-cython python-hypothesis-6.23 python-pytest - python-pytest-xdist gfortran)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'configure-blas - (lambda* (#:key inputs #:allow-other-keys) - (call-with-output-file "site.cfg" - (lambda (port) - (format port - "\ + (list + #:modules '((guix build utils) + (guix build python-build-system) + (ice-9 format)) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'parallelize-build + (lambda _ + (setenv "NPY_NUM_BUILD_JOBS" + (number->string (parallel-job-count))))) + (add-before 'build 'configure-blas + (lambda* (#:key inputs #:allow-other-keys) + (call-with-output-file "site.cfg" + (lambda (port) + (format port + "\ [openblas] libraries = openblas library_dirs = ~a/lib -include_dirs = ~a/include -" - (assoc-ref inputs "openblas") - (assoc-ref inputs "openblas")))))) - (add-before 'build 'fix-executable-paths - (lambda* (#:key inputs #:allow-other-keys) - ;; Make /gnu/store/...-bash-.../bin/sh the default shell, - ;; instead of /bin/sh. - (substitute* "numpy/distutils/exec_command.py" - (("(os.environ.get\\('SHELL', ')(/bin/sh'\\))" match match-start match-end) - (string-append match-start (assoc-ref inputs "bash") match-end))) - ;; Use "gcc" executable, not "cc". - (substitute* "numpy/distutils/system_info.py" - (("c = distutils\\.ccompiler\\.new_compiler\\(\\)") - "c = distutils.ccompiler.new_compiler(); c.set_executables(compiler='gcc',compiler_so='gcc',linker_exe='gcc',linker_so='gcc -shared')")))) - (replace 'check - (lambda* (#:key tests? outputs inputs #:allow-other-keys) - (when tests? - ;; Make installed package available for running the tests. - (add-installed-pythonpath inputs outputs) - ;; Make sure "f2py" etc is found. - (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" - ":" (getenv "PATH"))) - (invoke "./runtests.py" - "-j" (number->string (parallel-job-count))))))))) +include_dirs = ~:*~a/include~%" #$(this-package-input "openblas")))))) + (add-before 'build 'fix-executable-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Make /gnu/store/...-bash-.../bin/sh the default shell, + ;; instead of /bin/sh. + (substitute* "numpy/distutils/exec_command.py" + (("'/bin/sh'") + (format #f "~s" (search-input-file inputs "bin/bash")))))) + (replace 'check + (lambda* (#:key tests? outputs inputs #:allow-other-keys) + (when tests? + (invoke "./runtests.py" "-vv" "--no-build" "--mode=fast" + "-j" (number->string (parallel-job-count)) + ;; Contrary to scipy, the runtests.py script of numpy + ;; does *not* automatically provide -n when -j is used + ;; (see: https://github.com/numpy/numpy/issues/21359). + "--" "-n" (number->string (parallel-job-count)) + "-k" (string-append + ;; These tests may fail on 32-bit systems (see: + ;; https://github.com/numpy/numpy/issues/18387). + "not test_float_remainder_overflow " + "and not test_pareto")))))))) + (native-inputs + (list python-cython + python-hypothesis-next + python-pytest + python-pytest-xdist + gfortran)) + (inputs (list bash openblas)) (home-page "https://numpy.org") (synopsis "Fundamental package for scientific computing with Python") (description "NumPy is the fundamental package for scientific computing @@ -5769,10 +5779,26 @@ (define-public python-numpy-next (properties `((python2-variant . ,(delay python2-numpy)))) (license license:bsd-3))) +(define-public python-numpy-next + (package + (inherit python-numpy) + (name "python-numpy-next") + (version "1.22.3") + (source + (origin + (inherit (package-source python-numpy)) + (method url-fetch) + (uri (string-append + "https://github.com/numpy/numpy/releases/download/v" + version "/numpy-" version ".tar.gz")) + (sha256 + (base32 + "19dw91pqbqcniw2z57kiyqs1qp56g7kqy1bdyv664g8s62sc01m9")))))) + ;; Numpy 1.16.x are the last versions that support Python 2. (define-public python2-numpy (let ((numpy (package-with-python2 - (strip-python2-variant python-numpy-next)))) + (strip-python2-variant python-numpy)))) (package (inherit numpy) (name "python2-numpy") @@ -5788,80 +5814,46 @@ (define-public python2-numpy (arguments (substitute-keyword-arguments (package-arguments numpy) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'delete-failing-test - (lambda _ - ;; There's just one failing test here. - (delete-file "numpy/linalg/tests/test_linalg.py") - ;; ...and this one depends on the previous one. - (delete-file "numpy/matrixlib/tests/test_matrix_linalg.py"))))))) + #~(modify-phases #$phases + (add-after 'unpack 'delete-failing-tests + (lambda _ + ;; There's just one failing test here. + (delete-file "numpy/linalg/tests/test_linalg.py") + ;; ...and this one depends on the previous one. + (delete-file "numpy/matrixlib/tests/test_matrix_linalg.py"))) + (replace 'check + ;; Older versions don't cope well with the extra Pytest + ;; options, so remove them. + (lambda* (#:key tests? outputs inputs #:allow-other-keys) + (when tests? + (invoke "./runtests.py" "-vv" "--no-build" "--mode=fast" + "-j" (number->string (parallel-job-count)))))))))) (native-inputs (list python2-cython python2-pytest gfortran))))) -;; Needed by python-numba, see https://github.com/numba/numba/issues/7176 -(define-public python-numpy-1.20 - (package - (inherit python-numpy-next) - (name "python-numpy") - (version "1.20.3") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/numpy/numpy/releases/download/v" - version "/numpy-" version ".tar.gz")) - (sha256 - (base32 - "140zq9snx0di4id4g97vaw9zz8x2rfla5lp3a70j666f5030yd5p")))) - ;; python-numpy-next replaced python-hypothesis with - ;; python-hypothesis-6.23. We switch it back here, to prevent - ;; python-numpy-1.20 and its numerous dependents from being rebuilt. - (native-inputs - (list python-cython python-hypothesis python-pytest - python-pytest-xdist gfortran)) - ;; 92 tests fail, many of them because parts of the temp file name - ;; accidentally ends up in a comparison. - (arguments - (substitute-keyword-arguments (package-arguments python-numpy-next) - ((#:tests? _ #t) #f))))) - -;; NOTE: when upgrading numpy please make sure that python-pandas and -;; python-scipy still build, as these three packages are often used together. -(define-public python-numpy python-numpy-1.20) - ;; NOTE: NumPy 1.8 is packaged only for Python 2 because it is of ;; interest only for legacy code going back to NumPy's predecessor ;; Numeric. (define-public python2-numpy-1.8 - (package (inherit python2-numpy) + (package + (inherit python2-numpy) (version "1.8.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/numpy/numpy") - (commit (string-append "v" version)))) + (url "https://github.com/numpy/numpy") + (commit (string-append "v" version)))) (file-name (git-file-name "numpy" version)) (sha256 (base32 "0ikgi15rsqwbkfsjjxrwh40lqyal2wvyp3923y6w6ch3dcr82sfk")))) - (arguments - (substitute-keyword-arguments (package-arguments python2-numpy) - ((#:phases phases) - `(modify-phases ,phases - (replace 'configure-blas - (lambda* (#:key inputs #:allow-other-keys) - (call-with-output-file "site.cfg" - (lambda (port) - (format port - "[openblas] -libraries = openblas -library_dirs = ~a/lib -include_dirs = ~a/include -" - (assoc-ref inputs "openblas") - (assoc-ref inputs "openblas")))))))))) - (native-inputs - (list python2-nose)) + (arguments (substitute-keyword-arguments (package-arguments python2-numpy) + ((#:tests? _ #f) #f) ;disable tests + ((#:phases phases) + #~(modify-phases #$phases + (delete 'delete-failing-tests))))) + (native-inputs '()) (description "NumPy is the fundamental package for scientific computing with Python. It contains among other things: a powerful N-dimensional array object, sophisticated (broadcasting) functions, tools for integrating C/C++ -- cgit v1.2.3 From feee911366d3da00c0872f46944c36a7d12859b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Apr 2022 14:58:29 -0400 Subject: gnu: python-numba: Update to 0.55.1. * gnu/packages/python-xyz.scm (python-numba): Update to 0.55.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7840ccfcd1..8a9c3ae1a4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23692,14 +23692,14 @@ (define-public python-commandlines (define-public python-numba (package (name "python-numba") - (version "0.54.1") + (version "0.55.1") (source (origin (method url-fetch) (uri (pypi-uri "numba" version)) (sha256 (base32 - "0gzl2hz9azav9mny4mga19096rrnpw5816r1h4iwrvb4r01wipzr")))) + "18rf8i32m1045zxglvicpgldvzmqdxqvs3dhjd7wilb64sd0ds83")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From f2dfeef93139efdc4e64a2003ec7ed9711db96ae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Apr 2022 23:16:08 -0400 Subject: gnu: python-types-dataclasses: Fix typo. * gnu/packages/python-xyz.scm (python-types-dataclasses): Fix typo in description. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8a9c3ae1a4..d3f9109ec7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30317,7 +30317,7 @@ (define-public python-types-dataclasses (home-page "https://github.com/python/typeshed") (synopsis "Typing stubs for dataclasses") (description - "This packages provides a collection of library stubs for Python, with + "This package provides a collection of library stubs for Python, with static types.") (license license:asl2.0))) -- cgit v1.2.3 From ef4473051e82d94560b38ca76e9a0ad4b7f410ae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 01:26:59 -0400 Subject: gnu: python-readme-renderer: Update to 34.0. * gnu/packages/python-xyz.scm (python-readme-renderer): Update to 34.0. [phases]{check}: Skip GFM tests for now. --- gnu/packages/python-xyz.scm | 11 ++++++++--- 1 file changed, 8 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 d3f9109ec7..a2713caa0f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27441,14 +27441,14 @@ (define-public python-blessed (define-public python-readme-renderer (package (name "python-readme-renderer") - (version "32.0") + (version "34.0") (source (origin (method url-fetch) (uri (pypi-uri "readme_renderer" version)) (sha256 (base32 - "11av194kgq6mvp2afpapkb6vyn3y14gingmgsp3n10krlspvw4mm")))) + "1c75h9znffc2lh4j56yg23l5ifj5l8fbdq3kfigi8vbh45zx3d6z")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -27460,7 +27460,12 @@ (define-public python-readme-renderer "cmarkgfm>=0.5.0")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) - (when tests? (invoke "pytest" "-vv"))))))) + (when tests? + ;; The GFM tests fail due to slight differences in the + ;; generated vs expected HTML due to using a more + ;; recent bleach version (see: + ;; https://github.com/pypa/readme_renderer/issues/234). + (invoke "pytest" "-vv" "-k" "not GFM"))))))) (propagated-inputs (list python-bleach python-docutils python-pygments -- cgit v1.2.3 From 1f88242992346d4e09d959abebb3fc34933bc6b5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 12:52:55 -0400 Subject: gnu: python-parse-type: Update to 0.6.0, fixing build. * gnu/packages/python-xyz.scm (python-parse-type): Update to 0.6.0. [arguments]: New field. [native-inputs]: Remove python-pytest-runner and python-setuptools. --- gnu/packages/python-xyz.scm | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a2713caa0f..d47d9507ba 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2968,21 +2968,24 @@ (define-public python2-enum34 (define-public python-parse-type (package (name "python-parse-type") - (version "0.5.2") + (version "0.6.0") (source (origin - (method url-fetch) - (uri (pypi-uri "parse_type" version)) - (sha256 - (base32 - "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz")))) + (method url-fetch) + (uri (pypi-uri "parse_type" version)) + (sha256 + (base32 + "07smqnzc9km7sbvxfyx4gdm9njrx58x8grdw6gs4gva81rk3rd10")))) (build-system python-build-system) - (propagated-inputs - (list python-six python-parse)) - (native-inputs - ;; Use setuptools < 58 to work around - ;; https://github.com/jenisys/parse_type/issues/17 - (list python-pytest python-pytest-runner python-setuptools)) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "-c" "/dev/null"))))))) + (propagated-inputs (list python-six python-parse)) + (native-inputs (list python-pytest)) (home-page "https://github.com/jenisys/parse_type") (synopsis "Extended parse module") (description -- cgit v1.2.3 From d153caabac440073d2123e9ed56151f3da6b3370 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 14:00:47 -0400 Subject: gnu: Add python-bson. * gnu/packages/python-xyz.scm (python-bson): New variable. --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d47d9507ba..21b4ac3131 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18400,6 +18400,35 @@ (define-public binwalk (define-public python-binwalk (deprecated-package "python-binwalk" binwalk)) +(define-public python-bson + (package + (name "python-bson") + (version "0.5.10") + (source + (origin + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/py-bson/bson") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vpy4rsvm3hhawvbg9rbw4j36ck8qylkhm8cjy0q6imvinkd2als")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./test.py"))))))) + (propagated-inputs (list python-dateutil python-six)) + (home-page "https://github.com/py-bson/bson") + (synopsis "BSON (Binary JSON) codec for Python") + (description "@code{bson} is a Python library implementing a BSON (Binary +JSON) codec.") + (license license:asl2.0))) + (define-public python-nltk (package (name "python-nltk") -- cgit v1.2.3 From 8f3eb93cb0d2e1c506995050496e32e30911dd34 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 14:38:56 -0400 Subject: gnu: python-can: Update to 4.0.0. * gnu/packages/python-xyz.scm (python-can): Update to 4.0.0. [phases]: Strip trailing #t. {relax-version-requirements}: Relax pytest-cov requirement. {check}: Override phase. [propagated-inputs]: Remove python-aenum. Add python-msgpack and python-typing-extensions. [native-inputs]: Add python-parameterized. --- gnu/packages/python-xyz.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 21b4ac3131..86365a04c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2119,14 +2119,14 @@ (define-public python-aenum (define-public python-can (package (name "python-can") - (version "3.3.4") + (version "4.0.0") (source (origin (method url-fetch) (uri (pypi-uri "python-can" version)) (sha256 (base32 - "0jclrvyxasaaxr0albq0kqrnrfqdgqxs7m2qw9nd8kfwg8xj4g1d")))) + "0pcbdgdw94lc2sxd56w6wdsshrs9dd5d3wp0x4sfd0drzx32inar")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -2137,8 +2137,8 @@ (define-public python-can (("coverage<5") "coverage") (("pytest~=4\\.6") "pytest") (("pytest-timeout~=1\\.3") "pytest-timeout") - (("hypothesis~=4\\.56") "hypothesis")) - #t)) + (("pytest-cov.*") "pytest-cov\n") + (("hypothesis~=4\\.56") "hypothesis")))) (add-after 'unpack 'fix-broken-tests ;; The tests try to run two scripts it expects should be ;; in PATH, but they aren't at this time (see: @@ -2146,16 +2146,26 @@ (define-public python-can (lambda _ (substitute* "test/test_scripts.py" (("\"can_logger\\.py --help\"") "") - (("\"can_player\\.py --help\"") "")) - #t))))) + (("\"can_player\\.py --help\"") "")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "test" + ;; Disable tests which require specific CAN + ;; drivers we have no package for in Guix. + "--ignore" "test/test_interface_canalystii.py" + ;; These tests fail with "OSError: [Errno 19] + ;; No such device". + "-k" "not BasicTestUdpMulticastBusIPv"))))))) (propagated-inputs - (list python-aenum python-wrapt)) + (list python-msgpack python-typing-extensions python-wrapt)) (native-inputs (list python-codecov python-coverage python-future python-hypothesis python-mock + python-parameterized python-pyserial python-pytest python-pytest-cov -- cgit v1.2.3 From e8dc6ec5d8084efef4341ef90ec5e66ce31c1f03 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:01:13 -0400 Subject: gnu: python-amqp: Update to 5.1.1 and enable tests. * gnu/packages/python-xyz.scm (python-amqp): Update to 5.1.1. [arguments]: New field. [native-inputs]: Add python-pytest. --- gnu/packages/python-xyz.scm | 19 ++++++++++++++----- 1 file changed, 14 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 86365a04c2..4831cebaa0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15673,18 +15673,27 @@ (define-public python2-anyjson (define-public python-amqp (package (name "python-amqp") - (version "5.0.7") + (version "5.1.1") (source (origin (method url-fetch) (uri (pypi-uri "amqp" version)) (sha256 - (base32 "0p9alyinl24z699w4gpd8wvn90sm2il1p0gfwdhbpinksy7vfmyp")))) + (base32 "1qmmffiy48nady7is8529vxcyqbq88v5zgawqr3fk4q8rkz166rc")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ; not compatible with pytest>=6 as of 5.0.7 - (propagated-inputs - (list python-vine)) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" + "-c" "/dev/null" ;take control over pytest options + ;; Integration tests require network connectivity. + "--ignore" "t/integration"))))))) + (native-inputs (list python-pytest)) + (propagated-inputs (list python-vine)) (home-page "https://github.com/celery/py-amqp") (synopsis "Low-level AMQP client for Python (fork of amqplib)") (description -- cgit v1.2.3 From daf2b257555b1f8a21020369eb77189a66abd96d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 14:52:36 -0400 Subject: gnu: python-kombu: Update to 5.2.4. * gnu/packages/python-xyz.scm (python-kombu): Update to 5.2.4. [phases]{delete-transport-tests}: Delete phase. {check}: New phase. [native-inputs]: Remove python-mock. --- gnu/packages/python-xyz.scm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4831cebaa0..bfae08fa7c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15751,23 +15751,28 @@ (define-public python-txamqp (define-public python-kombu (package (name "python-kombu") - (version "5.2.2") + (version "5.2.4") (source (origin (method url-fetch) (uri (pypi-uri "kombu" version)) (sha256 - (base32 "0256915q3z4pjrkqxw16a31np3p25dxnk1mq2zv0hs4izdihfp8g")))) + (base32 "044ng79gj04668kf5fmy7fjkw8302xyapskkn65ym52zfbpf7kip")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-transport-tests - (lambda _ ; this tests message passing to many different databases - (delete-file-recursively "t/unit/transport")))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" + ;; The transport tests attempt to pass messages to + ;; many different databases. + "--ignore" "t/unit/transport"))))))) (native-inputs - (list python-case python-mock python-pyro4 python-pytest-sugar - python-pytz)) + (list python-case python-pyro4 python-pytest-sugar + python-pytest python-pytz)) (propagated-inputs (list python-amqp python-cached-property python-vine)) (home-page "https://kombu.readthedocs.io") -- cgit v1.2.3 From f35d65707cb15f62f8924b245baca4ad929d309b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:22:49 -0400 Subject: gnu: python-celery: Update to 5.2.6 and enable tests. * gnu/packages/python-xyz.scm (python-celery): Update to 5.2.6. [tests?]: Delete argument. [phases]{delete-integration-tests}: Delete phase. {relax-requirements}: New phase. {check}: Ignore the "t/integration" directory and the t/unit/backends/test_mongodb.py file. Remove skip directive for test_all_reqs_enabled_in_tests. [native-inputs]: Add python-dnspython. [propagated-inputs]: Delete python-boto3 and python-cryptography. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bfae08fa7c..cd44113352 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15821,31 +15821,37 @@ (define-public python-billiard (define-public python-celery (package (name "python-celery") - (version "5.1.2") ;newer versions require python-click>=8 + (version "5.2.6") (source (origin (method url-fetch) (uri (pypi-uri "celery" version)) (sha256 - (base32 "1c6lw31i3v81fyj4yn37lbvv70xdgb389iccirzyjr992vlkv6ld")))) + (base32 "109lcqarrbmh95sk1dm4yxayq1h3i27f4w23ndk64mqgyfnqqffi")))) (build-system python-build-system) (arguments - '(#:tests? #f - #:phases + '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'delete-integration-tests + (add-after 'unpack 'relax-requirements (lambda _ - (delete-file-recursively "t/integration"))) ;hangs tests + (substitute* "requirements/default.txt" + (("pytz.*") + "pytz\n")))) (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "-m" "pytest" "t" "-k" - (string-append ; AssertionErrors - "not test_check_privileges_no_fchown" - " and not test_all_reqs_enabled_in_tests")))))))) + (invoke "python" "-m" "pytest" "t" + "--ignore" "t/integration" ;hangs tests + ;; The MongoDB backend test appears to expect an older + ;; version of MongoDB which provided its own bson + ;; module, fails with " AttributeError: module 'bson' + ;; has no attribute 'encode'". + "--ignore" "t/unit/backends/test_mongodb.py" + ;; AssertionErrors + "-k" "not test_check_privileges_no_fchown "))))))) (native-inputs (list python-case + python-dnspython python-flaky python-iniconfig python-moto @@ -15857,12 +15863,10 @@ (define-public python-celery python-toml)) (propagated-inputs (list python-billiard - python-boto3 python-click python-click-didyoumean python-click-plugins python-click-repl - python-cryptography python-kombu python-pytz python-vine)) -- cgit v1.2.3 From 2380d68227fbd87a0222f0de51fdd81904b8ddf4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:34:45 -0400 Subject: gnu: Add python-argparse-addons. * gnu/packages/python-xyz.scm (python-argparse-addons): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd44113352..e52178debb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2235,6 +2235,23 @@ (define-public python-diskcache (description "DiskCache is a disk and file backed persistent cache.") (license license:asl2.0))) +(define-public python-argparse-addons + (package + (name "python-argparse-addons") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "argparse_addons" version)) + (sha256 + (base32 "1yx54dmnr3xggjcjk6bbdafvzp6cynrakl56wyz3jglmfvk0znpm")))) + (build-system python-build-system) + (home-page "https://github.com/eerimoq/argparse_addons") + (synopsis "Extensions for Python's @code{argparse} library") + (description "This Python library provides additional types and actions +for the standard @code{argparse} library.") + (license license:expat))) + (define-public python-bitstruct (package (name "python-bitstruct") -- cgit v1.2.3 From 54f67e382e1ed21c6efb9541fe7dadc5c46e5f09 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:37:03 -0400 Subject: gnu: python-bitstruct: Update to 8.14.0. * gnu/packages/python-xyz.scm (python-bitstruct): Update to 8.14.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 e52178debb..a0642bdfab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2255,14 +2255,14 @@ (define-public python-argparse-addons (define-public python-bitstruct (package (name "python-bitstruct") - (version "8.9.0") + (version "8.14.0") (source (origin (method url-fetch) (uri (pypi-uri "bitstruct" version)) (sha256 (base32 - "1fpc1qh1vss05ap29xvhjp200fm0q4pvgcjl0qpryh7ay6xgr5vx")))) + "149c73yrqbph71bbyf925r2mbh2jdymqxc6d49lnylpiflf1j313")))) (build-system python-build-system) (home-page "https://github.com/eerimoq/bitstruct") (synopsis "Python values to and C bit field structs converter") -- cgit v1.2.3 From 10ea06342a2e57ba6db39dd2e51e8d4e37cae5bb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:52:31 -0400 Subject: gnu: Add python-toolrack. * gnu/packages/python-xyz.scm (python-toolrack): New variable. --- gnu/packages/python-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a0642bdfab..97eb3651a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24067,6 +24067,49 @@ (define-public python-multiprocess library's @code{threading} module.") (license license:bsd-3))) +(define-public python-toolrack + (package + (name "python-toolrack") + (version "3.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/albertodonato/toolrack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ych11b7nchnkhqgf7dgivbvn2lzafjsi7nhb1an5zjjyns39gpx")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (substitute* "toolrack/aio/tests/test_process.py" + (("/bin/sh") + (which "sh"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "--pyargs" "toolrack" + "-k" + (string-append + ;; These tests fail for unknown reason comparing the + ;; expected output of shell scripts. + "not test_parse_stderr " + "and not test_parse_no_ending_newline " + "and not test_parse_stdout")))))))) + (native-inputs (list python-pytest python-pytest-asyncio + python-pytest-mock)) + (home-page "https://github.com/albertodonato/toolrack") + (synopsis "Collection of Python utility functions and classes") + (description "This package provides a collection of miscellaneous utility +functions and classes.") + (license license:lgpl3+))) + (define-public python-toolz (package (name "python-toolz") -- cgit v1.2.3 From abca2b804740ec28d56f4ef291b07dfe913b5361 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 16:17:49 -0400 Subject: gnu: python-multipart: Fix build with PyYAML 6. * gnu/packages/python-xyz.scm (python-multipart) [phases]{patch-test-suite}: Substitute yaml.load for yaml.safe_load. --- gnu/packages/python-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 97eb3651a5..e86be67ddb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30677,6 +30677,10 @@ (define-public python-multipart ;; There is a bug in the test_suit specification. (add-after 'unpack 'patch-test-suite (lambda _ + ;; Make compatible with PyYAML 6. + (substitute* "multipart/tests/test_multipart.py" + (("yaml.load") + "yaml.safe_load")) (substitute* "setup.py" (("test_suite = 'multipart.tests.suite'") "test_suite = 'multipart.tests.test_multipart.suite'")) -- cgit v1.2.3 From 91525740096b07b278fcc18803c70f73402d59f8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 16:32:47 -0400 Subject: gnu: Add python-mergedeep. * gnu/packages/python-xyz.scm (python-mergedeep): 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 e86be67ddb..2246df9da1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17428,6 +17428,28 @@ (define-public python-memcached more, possibly remote, memcached servers.") (license license:psfl))) +(define-public python-mergedeep + (package + (name "python-mergedeep") + (version "1.3.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarketm/mergedeep") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/clarketm/mergedeep") + (synopsis "Deep merge function for Python") + (description "This package provides a deep merge function for Python, +useful to combine multiple data objects as one.") + (license license:expat))) + (define-public python-clikit (package (name "python-clikit") -- cgit v1.2.3 From e051e00fef153c240f64fb256c816d73f656614a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 16:38:10 -0400 Subject: gnu: Add python-pyyaml-env-tag. * gnu/packages/python-xyz.scm (python-pyyaml-env-tag): New variable. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2246df9da1..a9ee1da742 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17912,6 +17912,24 @@ (define-public python-pyaml (define-public python2-pyaml (package-with-python2 python-pyaml)) +(define-public python-pyyaml-env-tag + (package + (name "python-pyyaml-env-tag") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyyaml_env_tag" version)) + (sha256 + (base32 "1nsva88jsmwn0cb9jnrfiz4dvs9xakkpgfii7g1xwkx1pmsjc2bh")))) + (build-system python-build-system) + (propagated-inputs (list python-pyyaml)) + (home-page "https://github.com/waylan/pyyaml-env-tag") + (synopsis "Custom YAML tag for environment variables") + (description "This package provides a custom YAML tag for referencing +environment variables in YAML files.") + (license license:expat))) + (define-public python-backpack (package (name "python-backpack") -- cgit v1.2.3 From c5078029031350bb22a91db8c3be7c08461d264a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 16:52:35 -0400 Subject: gnu: Add python-mdx-gh-links. * gnu/packages/python-xyz.scm (python-mdx-gh-links): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9ee1da742..4258b06600 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -706,6 +706,26 @@ (define-public python-pymdown-extensions Markdown. All extensions are found under the module namespace of pymdownx.") (license license:expat))) +(define-public python-mdx-gh-links + (package + (name "python-mdx-gh-links") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mdx_gh_links" version)) + (sha256 + (base32 "167k1jbp3jifxbnlpi6wy0z1skam7gqv2sixb5bhggb2vypqvysr")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ;tests connect github + (propagated-inputs (list python-markdown)) + (home-page "https://github.com/Python-Markdown/github-links/") + (synopsis "Python-Markdown extension adding support for shorthand links") + (description "This package is an extension to Python-Markdown which adds +support for shorthand links to GitHub users, repositories, issues and +commits.") + (license license:bsd-3))) + (define-public python-mkdocs-material (package (name "python-mkdocs-material") -- cgit v1.2.3 From 4fe4943ba66bd4c9ed5f3c0e30f4ae639bcea105 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 17:14:06 -0400 Subject: gnu: python-mkdocs: Update to 1.3.0. * gnu/packages/python-xyz.scm (python-mkdocs): Update to 1.3.0. [source]: Use git. [phases]{check}: New override. [propagated-inputs]: Remove python-livereload, python-lunr and python-tornado. Add python-babel, python-ghp-import, python-importlib-metadata, python-markupsafe, python-mdx-gh-links, python-mergedeep, python-packaging, python-pyyaml-env-tag and python-watchdog. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 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 4258b06600..09b55e7362 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -650,14 +650,18 @@ (define-public python-mrkd (define-public python-mkdocs (package (name "python-mkdocs") - (version "1.1.2") + (version "1.3.0") (source (origin - (method url-fetch) - (uri - (pypi-uri "mkdocs" version)) + ;; The tests suite appears to be incomplete in the PyPI archive. + (method git-fetch) + (uri (git-reference + (url "https://github.com/mkdocs/mkdocs") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0fgv5zawpyyv0vd4j5y8m4h058lh9jkwfcm0xy4pg7dr09a1xdph")))) + (base32 + "1n5rdllrxvhnxmdrddf55p3s86dakx0rq2gg6bj6pr6jg2pn932b")))) (build-system python-build-system) (arguments `(#:phases @@ -667,15 +671,27 @@ (define-public python-mkdocs (add-after 'unpack 'patch-requirements (lambda _ (substitute* "setup.py" - (("==") ">="))))))) + (("==") ">=")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" + "discover" "-p" "*tests.py" "mkdocs" + "--top-level-directory" "."))))))) (propagated-inputs - (list python-click + (list python-babel + python-click + python-ghp-import + python-importlib-metadata python-jinja2 - python-livereload - python-lunr python-markdown + python-markupsafe + python-mdx-gh-links + python-mergedeep + python-packaging python-pyyaml - python-tornado)) + python-pyyaml-env-tag + python-watchdog)) (home-page "https://www.mkdocs.org") (synopsis "Project documentation with Markdown") (description "MkDocs is a static site generator geared towards building -- cgit v1.2.3 From 1341779f8489c207c9683e0c88bc8c99815da57a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 17:26:02 -0400 Subject: gnu: Add python-crccheck. * gnu/packages/python-xyz.scm (python-crccheck): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 09b55e7362..d46b129329 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11488,6 +11488,32 @@ (define-public python-cram (define-public python2-cram (package-with-python2 python-cram)) +(define-public python-crccheck + (package + (name "python-crccheck") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "crccheck" version)) + (sha256 + (base32 "15psg7wjfbpmmry54ffwg6pg63mnv7mkwmb0a7884axnr8qj55j5")))) + (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest)) + (home-page "https://sourceforge.net/projects/crccheck/") + (synopsis "Calculation library for CRCs and checksums") + (description "@code{crccheck} is a calculation library for CRCs and +checksums. It implement more than a hundred checksum routines.") + (license license:gpl3+))) + (define-public python-crashtest (package (name "python-crashtest") -- cgit v1.2.3 From bb22c1ba5d37773639a3a6d3eb7f83f5504f91af Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 15:39:31 -0400 Subject: gnu: python-cantools: Update to 37.0.7. * gnu/packages/python-xyz.scm (python-cantools): Update to 37.0.7. [arguments]: Use gexps. [phases]: Strip trailing #t. {build-doc}: Use make -C instead of with-directory-excursion. {install-doc}: Adjust for gexp. [native-inputs]: Use new style. [propagated-inputs]: Add python-argparse-addons, python-crccheck, python-matplotlib and python-parameterized. --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d46b129329..928e0aac9c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2311,7 +2311,7 @@ (define-public python-bitstruct (define-public python-cantools (package (name "python-cantools") - (version "33.1.1") + (version "37.0.7") (source (origin ;; We take the sources from the Git repository as the documentation is @@ -2323,34 +2323,36 @@ (define-public python-cantools (file-name (git-file-name name version)) (sha256 (base32 - "1aad137yd8b4jkfvlv812qsxmxcgra7g1p4wbxfsjy1cbf8fbq9q")))) + "1qcf1fcwif7w70qmhxw2b8kqh420igbinq60p1chzf98xcb0ansx")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - ;; See: https://github.com/eerimoq/cantools/issues/190. - (substitute* "README.rst" - (("https://github.com/eerimoq/cantools/raw/master\ + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + ;; See: https://github.com/eerimoq/cantools/issues/190. + (substitute* "README.rst" + (("https://github.com/eerimoq/cantools/raw/master\ /docs/monitor.png") - "monitor.png")) - (with-directory-excursion "docs" - (invoke "make" "man" "info")))) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info")) - (man1 (string-append out "/share/man/man1"))) - (format #t "CWD: ~s~%" (getcwd)) - (install-file "docs/_build/texinfo/cantools.info" info) - (install-file "docs/_build/man/cantools.1" man1) - #t)))))) - (native-inputs - `(("sphinx" ,python-sphinx) - ("texinfo" ,texinfo))) - (propagated-inputs - (list python-bitstruct python-can python-diskcache python-textparser)) + "monitor.png")) + (invoke "make" "-C" "docs" "man" "info"))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((info (string-append #$output "/share/info")) + (man1 (string-append #$output "/share/man/man1"))) + (install-file "docs/_build/texinfo/cantools.info" info) + (install-file "docs/_build/man/cantools.1" man1))))))) + (native-inputs (list python-sphinx texinfo)) + (propagated-inputs + (list python-argparse-addons + python-bitstruct + python-can + python-crccheck + python-diskcache + python-matplotlib + python-parameterized + python-textparser)) (home-page "https://github.com/eerimoq/cantools") (synopsis "Tools for the Controller Area Network (CAN) bus protocol") (description "This package includes Controller Area Network (CAN) related -- cgit v1.2.3 From 571713526c51d4ccc9711c5a6e77a00e134fde6d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 21:15:23 -0400 Subject: gnu: Remove python2-jmespath. * gnu/packages/python-xyz.scm (python2-jmespath): Delete variable. --- 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 928e0aac9c..20187ac66d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15279,9 +15279,6 @@ (define-public python-jmespath (home-page "https://github.com/jmespath/jmespath.py") (license license:expat))) -(define-public python2-jmespath - (package-with-python2 python-jmespath)) - (define-public python-symengine (package (name "python-symengine") -- cgit v1.2.3 From 3ddeaf90a69a4392a3638649ef25025db01a9271 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Apr 2022 21:51:12 -0400 Subject: gnu: python-croniter: Update to 1.3.4. * gnu/packages/python-xyz.scm (python-croniter): Update to 1.3.4. --- 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 20187ac66d..8d12f28850 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25162,16 +25162,15 @@ (define-public python-annoy (define-public python-croniter (package (name "python-croniter") - (version "0.3.34") + (version "1.3.4") (source (origin (method url-fetch) (uri (pypi-uri "croniter" version)) (sha256 (base32 - "0r79cx4v2dw4hzr0annkkxxis46c8hivq61sr39z6p7lcjsbk1ki")))) + "1whbm26m9kpn0klgr9dqiqpp83ki9nhpxifaq9afcjw32rckcs9i")))) (build-system python-build-system) - (propagated-inputs - (list python-dateutil python-natsort)) + (propagated-inputs (list python-dateutil)) (home-page "https://github.com/kiorky/croniter") (synopsis "Iterate datetime objects with cron-like syntax") (description -- cgit v1.2.3 From 418630a63c26bf683bb215fe2f655485f07020ea Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 20 Apr 2022 14:03:34 -0400 Subject: gnu: dynaconf: Fix build following python-click upgrade. * gnu/packages/python-xyz.scm (dynaconf) [phases]{patch-for-click-8}: New phase. {check}: Remove extraneous setenv call. [native-inputs]: Use the regular python-pytest variable. --- 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 8d12f28850..8b55e67ca9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30183,12 +30183,14 @@ (define-public dynaconf (arguments `(#: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:]")))) (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"))))))) @@ -30196,7 +30198,7 @@ (define-public dynaconf (list python-click python-configobj python-dotenv-0.13.0 python-ruamel.yaml python-toml)) (native-inputs - (list python-django python-flask python-pytest-6 python-pytest-cov + (list python-django python-flask python-pytest python-pytest-cov python-pytest-mock)) (home-page "https://www.dynaconf.com/") (synopsis "The dynamic configurator for your Python project") -- cgit v1.2.3 From a7e5a116fd9088bbcac0af71546966d8352491b1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 21 Apr 2022 15:53:03 -0400 Subject: gnu: python-numpydoc: Update to 1.2.1. * gnu/packages/python-xyz.scm (python-numpydoc): Update to 1.2.1. Fix indentation. [phases]{relax-requirements}: New phase. [propagated-inputs]: Add python-jinja2. --- gnu/packages/python-xyz.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8b55e67ca9..ea1fb174c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6438,34 +6438,34 @@ (define-public python-patch-ng (define-public python-numpydoc (package (name "python-numpydoc") - (version "1.1.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (pypi-uri "numpydoc" version)) (sha256 (base32 - "13j4fvy2p7lc8sn00sxvs0jb19vicaznfgx4cphv9jgxgz5xcvy3")))) + "1xjsli2fqks4iv3524v1d329siad7bbsi4kr174zvhsl1pnjds3w")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + (("'Jinja2>=2.10,<3.1'") + "'Jinja2>=2.10'")))) (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (lambda* (#:key tests? #: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 - (list python-sphinx)) - (native-inputs - (list python-matplotlib python-pytest python-pytest-cov)) + (propagated-inputs (list python-jinja2 python-sphinx)) + (native-inputs (list python-matplotlib python-pytest python-pytest-cov)) (home-page "https://pypi.org/project/numpydoc/") - (synopsis - "Numpy's Sphinx extensions") - (description - "Sphinx extension to support docstrings in Numpy format.") + (synopsis "Numpy's Sphinx extensions") + (description "Sphinx extension to support docstrings in Numpy format.") (license license:bsd-2) (properties `((python2-variant . ,(delay python2-numpydoc)))))) -- cgit v1.2.3 From b60ca1f3b83ae62194cd8ea7317f4aef3b2bc2e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 21 Apr 2022 12:06:41 -0400 Subject: gnu: python-numpy-documentation: Overhaul package definition. * gnu/packages/python-xyz.scm (python-numpy-documentation): Relocate next to the python-numpy package in the module. Inherit from python-numpy. [version, source, build-system, home-page, license]: Remove fields, now inherited. [phases]{add-gnu-freefont-to-texmf}: New phase. {install}: Patch conf.py to allow building the info manual. Set HOME. Copy the whole generated HTML directory. Parallelize documentation build. [native-inputs]: Use new style. Add font-gnu-freefont, fontconfig, python-breathe, python-ipython, python-pandas, python-pydata-sphinx-theme, python-scipy, python-sphinx-panels, texlive-bin, texlive-cbfonts, texlive-cm-super, texlive-greek-fontenc, texlive-latex-expdlist, texlive-polyglossia and texlive-xindy. Remove pkg-config, the previous "texlive" updmap.cfg package, scipy-sphinx-theme, and do not inherit the native inputs of python-numpy. [synopsis]: Refine. [description]: Expound a bit. --- gnu/packages/python-xyz.scm | 206 ++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 113 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ea1fb174c4..1140e29790 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5863,6 +5863,99 @@ (define-public python-numpy-next (base32 "19dw91pqbqcniw2z57kiyqs1qp56g7kqy1bdyv664g8s62sc01m9")))))) +(define-public python-numpy-documentation + (package + (inherit python-numpy) + (name "python-numpy-documentation") + (arguments + (list + #:tests? #f ;we're only generating the documentation + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'add-gnu-freefont-to-texmf + (lambda _ + ;; XXX: The Sphinx-generated tex output specifies the GNU + ;; FreeFont font to be searched via its extension, which uses + ;; kpathsea instead of fontconfig and fail (see: + ;; https://github.com/sphinx-doc/sphinx/issues/10347). Create a + ;; symlink to GNU FreeFont and add it to the TEXMF tree via + ;; GUIX_TEXMF. + (mkdir-p "texmf-dist/fonts/opentype/public") + (symlink (string-append + #$(this-package-native-input "font-gnu-freefont") + "/share/fonts/opentype") + (string-append + (getcwd) "/" + "texmf-dist/fonts/opentype/public/gnu-freefont")) + (setenv "GUIX_TEXMF" (string-append (getenv "GUIX_TEXMF") ":" + (getcwd) "/texmf-dist")))) + (delete 'build) + (replace 'install + (lambda _ + (let* ((data (string-append #$output "/share")) + (doc (string-append data "/doc/numpy")) + (html (string-append doc "/html")) + (info (string-append data "/info")) + (sphinxopts (string-append + "SPHINXOPTS=-j" + (number->string (parallel-job-count))))) + (with-directory-excursion "doc" + ;; Do not treat warnings as errors. + (substitute* "Makefile" + ((" -WT ") " -T ")) + (setenv "HOME" "/tmp") + ;; Build the PDF documentation. + (invoke "make" "latex-build" sphinxopts) + (invoke "make" "-C" "build/latex" "all-pdf" sphinxopts) + ;; Build the HTML documentation + (invoke "make" "html" sphinxopts) + ;; Build the Info documentation. The issues worked around + ;; below can be tracked at + ;; https://github.com/numpy/numpy/issues/12278. + (substitute* "source/conf.py" + ;; The root document should be "index", not "contents". + (("\"contents\"") "'index'") + ;; Disable Sphinx extensions that produce broken Texinfo. + ((".*'numpydoc'.*") "") + ((".*'sphinx.ext.autosummary'.*") "")) + (invoke "make" "info" sphinxopts) + ;; Install the HTML documentation. + (mkdir-p html) + (copy-recursively "build/html" html) + ;; Install the PDF reference and user manuals. + (install-file "build/latex/numpy-ref.pdf" doc) + (install-file "build/latex/numpy-user.pdf" doc) + ;; Install the info manual. + (install-file "build/texinfo/numpy.info" info) + (symlink (string-append html "/_images") + (string-append info "/numpy-figures"))))))))) + (native-inputs + (list font-gnu-freefont + perl + python-breathe + python-ipython + python-matplotlib + python-numpy + python-numpydoc + python-pandas + python-pydata-sphinx-theme + python-scipy ;used by matplotlib + python-sphinx + python-sphinx-panels + texinfo + texlive-bin + texlive-cbfonts + texlive-cm-super + texlive-greek-fontenc + texlive-latex-expdlist + texlive-polyglossia + texlive-xindy)) + (inputs '()) + (propagated-inputs '()) + (synopsis "Documentation for the @code{python-numpy} package") + (description "This package provides the complete NumPy documentation in +the Texinfo, HTML, and PDF formats."))) + ;; Numpy 1.16.x are the last versions that support Python 2. (define-public python2-numpy (let ((numpy (package-with-python2 @@ -6083,119 +6176,6 @@ (define-public python-pyspnego readable format.") (license license:expat))) -(define-public python-numpy-documentation - (package - (name "python-numpy-documentation") - (version (package-version python-numpy)) - (source (package-source python-numpy)) - (build-system python-build-system) - (native-inputs - `(("python-matplotlib" ,python-matplotlib) - ("python-numpy" ,python-numpy) - ("pkg-config" ,pkg-config) - ("python-sphinx" ,python-sphinx) - ("python-numpydoc" ,python-numpydoc) - ("texlive" ,(texlive-updmap.cfg (list - texlive-capt-of - texlive-cm-super - texlive-fonts-ec - texlive-generic-iftex - texlive-pdftex - texlive-amsfonts - texlive-latex-cmap - texlive-latex-environ - texlive-latex-eqparbox - texlive-etoolbox - texlive-latex-expdlist - texlive-latex-fancyhdr - texlive-latex-fancyvrb - texlive-latex-fncychap - texlive-latex-float - texlive-latex-framed - texlive-latex-geometry - texlive-latex-graphics - texlive-hyperref - texlive-latex-mdwtools - texlive-latex-multirow - texlive-latex-needspace - texlive-oberdiek - texlive-latex-parskip - texlive-latex-preview - texlive-latex-tabulary - texlive-latex-threeparttable - texlive-latex-titlesec - texlive-latex-trimspaces - texlive-latex-ucs - texlive-latex-upquote - texlive-url - texlive-latex-varwidth - texlive-wrapfig))) - ("texinfo" ,texinfo) - ("perl" ,perl) - ("scipy-sphinx-theme" - ,(let ((commit "c466764e2231ba132c09826b5b138fffa1cfcec3")) - (origin ;the build script expects scipy-sphinx-theme as a git submodule - (method git-fetch) - (uri (git-reference - (url "https://github.com/scipy/scipy-sphinx-theme") - (commit commit))) - (file-name (git-file-name "python-scipy-sphinx-theme" - (string-take commit 7))) - (sha256 - (base32 - "0q2y87clwlsgc7wvlsn9pzyssybcq10plwhq2w1ydykfsyyqbmkl"))))) - ,@(package-native-inputs python-numpy))) - (arguments - `(#:tests? #f ; we're only generating the documentation - #:phases - (modify-phases %standard-phases - (delete 'build) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "out") "/share")) - (doc (string-append - data "/doc/" ,name "-" - ,(package-version python-numpy))) - (info-reader (string-append data "/info")) - (html (string-append doc "/html")) - (scipy-sphinx-theme "scipy-sphinx-theme") - (sphinx-theme-checkout (assoc-ref inputs scipy-sphinx-theme)) - (pyver ,(string-append "PYVER="))) - - ;; FIXME: this is needed to for texlive-updmap.cfg to generate - ;; fonts, which are not found. - (setenv "HOME" "/tmp") - - (with-directory-excursion "doc" - (copy-recursively sphinx-theme-checkout scipy-sphinx-theme) - (mkdir-p html) - (invoke "make" "html" pyver) - (invoke "make" "latex" "PAPER=a4" pyver) - (invoke "make" "-C" "build/latex" - "all-pdf" "PAPER=a4" pyver) - ;; FIXME: Generation of the info file fails. - ;; (invoke "make" "info" pyver) - ;; (mkdir-p info) - ;; (copy-file "build/texinfo/numpy.info" - ;; (string-append info "/numpy.info")) - (for-each (lambda (file) - (copy-file (string-append "build/latex" file) - (string-append doc file))) - '("/numpy-ref.pdf" "/numpy-user.pdf")) - (with-directory-excursion "build/html" - (for-each (lambda (file) - (let* ((dir (dirname file)) - (tgt-dir (string-append html "/" dir))) - (unless (equal? "." dir) - (mkdir-p tgt-dir)) - (install-file file html))) - (find-files "." ".*"))))) - #t))))) - (home-page (package-home-page python-numpy)) - (synopsis "Documentation for the python-numpy package") - (description (package-description python-numpy)) - (license (package-license python-numpy)))) - (define-public python-pygit2 (package (name "python-pygit2") -- cgit v1.2.3 From dfe81d0f812e012cb0cb7d6c89f8aea03b733038 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 22 Apr 2022 21:41:39 -0400 Subject: gnu: Add python-ipdb. * gnu/packages/python-xyz.scm (python-ipdb): New variable. --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1140e29790..e99587cf67 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6278,6 +6278,32 @@ (define-public python-fancycompleter module from the standard Python library.") (license license:bsd-3))) +(define-public python-ipdb + (package + (name "python-ipdb") + (version "0.13.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ipdb" version)) + (sha256 + (base32 "1ibql99agjf2gj7y0svzd5m0h81hailf4p3sj3yl9i1i8ykdj6wm")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover"))))))) + (propagated-inputs (list python-ipython python-toml python-decorator)) + (home-page "https://github.com/gotcha/ipdb") + (synopsis "IPython-enhanced Python debugger (pdb)") + (description "@code{ipdb} exports functions to access the IPython +debugger, which features tab completion, syntax highlighting, better +tracebacks and better introspection than Python's standard @command{pdb} +debugger, with which it shares the same interface.") + (license license:bsd-3))) + (define-public python-pdbpp (package (name "python-pdbpp") -- cgit v1.2.3 From 09fccde9c04769ecf01bc5c6a22aadc9704369e5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 22 Apr 2022 21:55:47 -0400 Subject: gnu: python-pudb: Update to 2022.1.1 and rename from pudb. Renaming rationale: pudb can also be used as a Python library (like pdb). * gnu/packages/python-xyz.scm (python-pudb): Update to 2022.1.1. [phases]{check}: Remove obsolete 'add-installed-pythonpath' call. Invoke pytest verbosely. [native-inputs]: Remove python-numpy. [propagated-inputs]: Apply guix style. (pudb): Define as a deprecated alias to python-pudb. --- gnu/packages/python-xyz.scm | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e99587cf67..771b00e047 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -30228,32 +30228,29 @@ (define-public dynaconf @end itemize") (license license:expat))) -(define-public pudb +(define-public python-pudb (package - (name "pudb") - (version "2021.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pudb" version)) - (sha256 - (base32 "0p16pvzfa3w02ybg3n0iy5rs23z4rz4a42lb8wh3mcq62y9ik2w7")))) + (name "python-pudb") + (version "2022.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pudb" version)) + (sha256 + (base32 + "0gq82hwnibby9qdyv7ri11phvg94nby4jb0w9h3jk79w89kdsfyv")))) (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 - (list python-numpy python-pytest python-pytest-mock)) - (propagated-inputs - (list python-jedi python-pygments python-urwid python-urwid-readline)) + `(#:phases (modify-phases %standard-phases + (add-before 'check 'fix-read-only-home + (lambda _ + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) + (native-inputs (list python-pytest python-pytest-mock)) + (propagated-inputs (list python-jedi python-pygments python-urwid + python-urwid-readline)) (home-page "https://documen.tician.de/pudb/") (synopsis "Console-based Python debugger") (description @@ -30262,6 +30259,9 @@ (define-public pudb keyboard-friendly package.") (license license:expat))) +(define-public pudb + (deprecated-package "pudb" python-pudb)) + (define-public python-iwlib (package (name "python-iwlib") -- cgit v1.2.3 From 44256e57cc0bf83ff86bf54722c4757852aadd9d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 23 Apr 2022 23:48:31 -0400 Subject: gnu: python-matplotlib-documentation: Fix build. * gnu/packages/python-xyz.scm (python-matplotlib-documentation): Inherit from python-matplotlib. [version, source, build-system, home-page, description, license]: Delete fields, now inherited. [phases]: Streamline build and install phases and enable parallel build. [native-inputs]: Use new style. Remove python-matplotlib, python-ipykernel, python-mock, texlive-enumitem, texlive-latex-geometry, texlive-latex-preview, texlive-latex-ucs, texlive-pdftex, texlive-fonts-ec, texlive-txfonts and inherited python-matplotlib packages. Add inkscape, python-mpl-sphinx-theme, python-scipy, python-ipywidgets, texlive-babel, texlive-fontspec, texlive-unicode-math, texlive-etoolbox, and texlive-underscore. --- gnu/packages/python-xyz.scm | 138 +++++++++++++++++++------------------------- 1 file changed, 58 insertions(+), 80 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 771b00e047..12ee339a80 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6800,87 +6800,65 @@ (define-public python2-matplotlib (define-public python-matplotlib-documentation (package + (inherit python-matplotlib) (name "python-matplotlib-documentation") - (version (package-version python-matplotlib)) - (source (package-source python-matplotlib)) - (build-system python-build-system) - (native-inputs - `(("python-matplotlib" ,python-matplotlib) - ("python-colorspacious" ,python-colorspacious) - ("python-sphinx" ,python-sphinx) - ("python-sphinx-copybutton" ,python-sphinx-copybutton) - ("python-sphinx-gallery" ,python-sphinx-gallery) - ("python-numpydoc" ,python-numpydoc) - ("python-ipython" ,python-ipython) - ("python-ipykernel" ,python-ipykernel) - ("python-mock" ,python-mock) - ("graphviz" ,graphviz) - ("texlive" ,(texlive-updmap.cfg (list texlive-amsfonts - texlive-enumitem - texlive-latex-amsmath - texlive-latex-expdlist - texlive-latex-geometry - texlive-latex-preview - texlive-latex-type1cm - texlive-latex-ucs - - texlive-pdftex - - texlive-fonts-ec - texlive-times - texlive-txfonts))) - ("texinfo" ,texinfo) - ,@(package-native-inputs python-matplotlib))) - (arguments - `(#:tests? #f ; we're only generating documentation - #:phases - (modify-phases %standard-phases - ;; The tests in python-matplotlib are run after the install phase, so - ;; we need to delete the extra phase here. - (delete 'check) - (replace 'build - (lambda _ - (chdir "doc") - (setenv "PYTHONPATH" "../examples/units") - (substitute* "conf.py" - ;; Don't use git. - (("^SHA = check_output.*") - (string-append "SHA = \"" ,version "\"\n")) - ;; Don't fetch intersphinx files from the Internet - (("^explicit_order_folders" m) - (string-append "intersphinx_mapping = {}\n" m)) - (("'sphinx.ext.intersphinx',") "") - ;; Disable URL embedding which requires internet access. - (("'https://docs.scipy.org/doc/numpy'") "None") - (("'https://docs.scipy.org/doc/scipy/reference'") "None")) - (invoke "make" - "SPHINXBUILD=sphinx-build" - "SPHINXOPTS=" ; don't abort on warnings - "html" "texinfo"))) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((data (string-append (assoc-ref outputs "out") "/share")) - (doc (string-append data "/doc/python-matplotlib-" ,version)) - (info (string-append data "/info")) - (html (string-append doc "/html"))) - (mkdir-p html) - (mkdir-p info) - (copy-recursively "build/html" html) - (symlink (string-append html "/_images") - (string-append info "/matplotlib-figures")) - (with-directory-excursion "build/texinfo" - (substitute* "matplotlib.texi" - (("@image\\{([^,]*)" all file) - (string-append "@image{matplotlib-figures/" file))) - (symlink (string-append html "/_images") - "./matplotlib-figures") - (invoke "makeinfo" "--no-split" - "-o" "matplotlib.info" "matplotlib.texi")) - (install-file "build/texinfo/matplotlib.info" info))))))) - (home-page (package-home-page python-matplotlib)) - (synopsis "Documentation for the python-matplotlib package") - (description (package-description python-matplotlib)) - (license (package-license python-matplotlib)))) + (arguments + (list + #:tests? #f ;we're only generating documentation + #:phases + #~(modify-phases %standard-phases + (replace 'build + (lambda _ + (setenv "HOME" "/tmp") + (chdir "doc") + (substitute* "conf.py" + ;; The sphinx_panels extension causes a "TypeError: first + ;; argument must be callable" to be raised when generating the + ;; info target; remove it (see: + ;; https://github.com/executablebooks/sphinx-panels/issues/74). + ((".*'sphinx_panels',.*") "")) + (invoke "make" "html" "info" + ;; Don't abort on warnings; build in parallel. + (format #f "SPHINXOPTS=-j~a" (parallel-job-count))))) + (replace 'install + (lambda _ + (let* ((data (string-append #$output "/share")) + (doc (string-append data "/doc/matplotlib")) + (info (string-append data "/info")) + (html (string-append doc "/html"))) + (mkdir-p html) + (copy-recursively "build/html" html) + (install-file "build/texinfo/matplotlib.info" info) + ;; The "matplotlib-figures" directory contains are a subset of + ;; the images produced for the html target; simply create a + ;; symlink to it, saving about 11 MiB. + (symlink (string-append html "/_images") + (string-append info "/matplotlib-figures")))))))) + (native-inputs + (list graphviz + inkscape + python-colorspacious + python-mpl-sphinx-theme + python-scipy + python-sphinx + python-sphinx-copybutton + python-sphinx-gallery + python-sphinxcontrib-svg2pdfconverter + python-numpydoc + python-ipython + python-ipywidgets + texlive-amsfonts + texlive-amsmath + texlive-babel + texlive-fontspec + texlive-unicode-math + texlive-etoolbox + texlive-latex-expdlist + texlive-underscore + texlive-latex-type1cm + texlive-times + texinfo)) + (synopsis "Documentation for the @code{python-matplotlib} package"))) (define-public python-matplotlib-inline (package -- cgit v1.2.3 From dd50817dd661755c72e1a321e69e116c8044656e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 25 Apr 2022 11:38:04 +0200 Subject: gnu: python-qtconsole: Update to 5.3.0. * gnu/packages/python-xyz.scm (python-qtconsole): Update to 5.3.0. [native-inputs]: Add python-pytest-qt. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12ee339a80..fd0f51120e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14011,13 +14011,13 @@ (define python-jupyter-console-minimal (define-public python-qtconsole (package (name "python-qtconsole") - (version "4.7.7") + (version "5.3.0") (source (origin (method url-fetch) (uri (pypi-uri "qtconsole" version)) (sha256 - (base32 "013qgpsm8jzcz3prhq7sxs36l8f7fgagmn3xa010gfhxf7cfldpj")))) + (base32 "09anp8g7vqi8z8wyi2lv21a2frd2dyhyrzvcrk2anijyqzyj0dcf")))) (build-system python-build-system) (arguments `(#:phases @@ -14034,7 +14034,7 @@ (define-public python-qtconsole python-jupyter-core python-pygments python-pyqt python-pyzmq python-qtpy python-traitlets)) (native-inputs - (list python-flaky python-pytest)) + (list python-flaky python-pytest python-pytest-qt)) (home-page "https://jupyter.org") (synopsis "Jupyter Qt console") (description "This package provides a Qt-based console for Jupyter with -- cgit v1.2.3 From f2ab6b04a464f07389d9b8196379ab84118e258b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 08:29:10 -0400 Subject: gnu: python-pygments: Update to 2.12.0. * gnu/packages/python-xyz.scm (python-pygments): Update to 2.12.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fd0f51120e..69c16411d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4661,14 +4661,14 @@ (define-public python-doc8 (define-public python-pygments (package (name "python-pygments") - (version "2.8.1") + (version "2.12.0") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "153zyxigm879sk2n71lfv03y2pgxb7dl0dlsbwkz9aydxnkf2mi6")))) + "1sr6iqh21xi6p8aba4wa9pqfhjbbpcvn9jcsx0ggy4lniw8idcay")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. -- cgit v1.2.3 From 1fd6bcfba7442f7b4fa2f610a8a84be7c5274a3b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 9 May 2022 22:57:54 -0400 Subject: gnu: python-matplotlib: Update to 3.5.2. * gnu/packages/python-xyz.scm (python-matplotlib): Update to 3.5.2. [propagated-inputs]: Move after 'arguments' field. Use new style and re-order. [inputs]: Order lexicographically. [native-inputs]: Use new style. [phases]{fix-and-disable-failing-tests}: Fix indentation. Delete the 'lib/matplotlib/tests/test_animation.py' test. {check}: Skip the test_lazy_auto_backend_selection test. --- gnu/packages/python-xyz.scm | 95 ++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 44 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 69c16411d8..1fe9a969aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6625,51 +6625,14 @@ (define-public python-proto-matcher (define-public python-matplotlib (package (name "python-matplotlib") - (version "3.5.1") + (version "3.5.2") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 - (base32 "076f8qi265x8jy89c03r3vv5h4is4ir5mawwrrrpp96314783sdj")))) - (build-system python-build-system) - (propagated-inputs ; the following packages are all needed at run time - `(("python-cycler" ,python-cycler) - ("python-fonttools" ,python-fonttools) - ("python-kiwisolver" ,python-kiwisolver) - ("python-packaging" ,python-packaging) - ("python-pyparsing" ,python-pyparsing) - ("python-pygobject" ,python-pygobject) - ("python-certifi" ,python-certifi) - ("gobject-introspection" ,gobject-introspection) - ("python-tkinter" ,python "tk") - ("python-dateutil" ,python-dateutil) - ("python-numpy" ,python-numpy) - ("python-pillow" ,python-pillow) - ("python-pytz" ,python-pytz) - ("python-six" ,python-six) - ("python-wxpython" ,python-wxpython) - ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of - ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context' - ;; object. For this reason we need to import both libraries. - ;; https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi - ("python-pycairo" ,python-pycairo) - ("python-cairocffi" ,python-cairocffi))) - (inputs - (list libpng - freetype - qhull - cairo - glib - tcl - tk)) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python-pytest" ,python-pytest) - ("python-pytest-timeout" ,python-pytest-timeout) - ("python-pytest-xdist" ,python-pytest-xdist) - ("python-setuptools-scm" ,python-setuptools-scm) - ("python-setuptools-scm-git-archive" ,python-setuptools-scm-git-archive))) + (base32 "18h78s5ld1i6mz00w258hy29909nfr3ddq6ry9kq18agw468bks8")))) + (build-system python-build-system) (arguments (list #:phases @@ -6687,8 +6650,8 @@ (define-public python-matplotlib (lambda _ (substitute* (append (find-files "lib/matplotlib/tests/" "test_.*\\.py$") - (find-files "lib/mpl_toolkits/tests" - "test_.*\\.py$")) + (find-files "lib/mpl_toolkits/tests" + "test_.*\\.py$")) (("^from matplotlib" match) (string-append "import pytest\n" match)) (("( *)@([^_]+_)*(image_comparison|check_figures_equal)" match @@ -6711,7 +6674,11 @@ (define-public python-matplotlib ;; different version of FreeType. "lib/matplotlib/tests/test_constrainedlayout.py" ;; Fontconfig returns no fonts. - "lib/matplotlib/tests/test_font_manager.py")))) + "lib/matplotlib/tests/test_font_manager.py" + ;; The images comparison test fails + ;; non-deterministically when run in parallel (see: + ;; https://github.com/matplotlib/matplotlib/issues/22992). + "lib/matplotlib/tests/test_compare_images.py")))) (add-before 'build 'configure-environment (lambda* (#:key inputs #:allow-other-keys) ;; Fix rounding errors when using the x87 FPU. @@ -6741,7 +6708,47 @@ (define-public python-matplotlib ;; everything gets built in the source directory. (invoke "pytest" "-n" (number->string (parallel-job-count)) - "-m" "not network" "--pyargs" "matplotlib")))))))) + "-m" "not network" "--pyargs" "matplotlib" + ;; The 'test_lazy_auto_backend_selection' fails + ;; because it would require an X server; skip it. + "-k" "not test_lazy_auto_backend_selection")))))))) + (propagated-inputs + (list gobject-introspection + python-cairocffi + python-certifi + python-cycler + python-dateutil + python-fonttools + python-kiwisolver + python-numpy + python-packaging + python-pillow + ;; ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context' + ;; ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of + ;; ;; https://cairocffi.readthedocs.io/en/stable/cffi_api.html#converting-pycairo-wrappers-to-cairocffi + ;; ;; object. For this reason we need to import both libraries. + ;; python-pycairo + python-pygobject + python-pyparsing + python-pytz + python-six + `(,python "tk") + python-wxpython)) + (inputs + (list cairo + freetype + glib + libpng + qhull + tcl + tk)) + (native-inputs + (list pkg-config + python-pytest + python-pytest-timeout + python-pytest-xdist + python-setuptools-scm + python-setuptools-scm-git-archive)) (home-page "https://matplotlib.org/") (synopsis "2D plotting library for Python") (description -- cgit v1.2.3 From 1a0c253b937bbb54f44f7d3c5e7d52a7eacb8a14 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 Apr 2022 09:45:48 +0200 Subject: gnu: python-multidict: Update to 5.2.0. * gnu/packages/python-xyz.scm (python-multidict): Update to 5.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1fe9a969aa..fdfdd3fef3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7105,14 +7105,14 @@ (define-public python-pycodestyle-2.6 (define-public python-multidict (package (name "python-multidict") - (version "4.7.5") + (version "5.2.0") (source (origin (method url-fetch) (uri (pypi-uri "multidict" version)) (sha256 (base32 - "07ikq2c72kd263hpldw55y0px2l3g34hjk66ml9lryh1jv287qmf")))) + "1kjrxav572j45xvr1iy60zb2g8zqvrinzdkl4ax36js4vczckl8d")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 84f24711366b173c3d0aa427be64501809b1d060 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 16:24:49 -0400 Subject: gnu: python-scikit-build: Fix build. * gnu/packages/python-xyz.scm (python-scikit-build) [phases]{check}: Add forgotten trailing spaces. --- 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 fdfdd3fef3..020f078dee 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28870,8 +28870,8 @@ (define-public python-scikit-build ;; These are not parallel safe and fail ;; nondeterministically (see: ;; https://github.com/scikit-build/scikit-build/issues/711). - "and not test_generator_cleanup" - "and not test_generator_selection"))))) + "and not test_generator_cleanup " + "and not test_generator_selection "))))) (replace 'install (lambda _ (let ((whl (car (find-files "dist" "\\.whl$")))) -- cgit v1.2.3 From 40a729a0e6f1d660b942241416c1e2c567616d4d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 15 May 2022 20:20:08 -0400 Subject: gnu: Fix the build of wicd. Fixes . * gnu/packages/check.scm (python2-pytest-cov, python2-freezegun): Define without package-with-python2. * gnu/packages/python-xyz.scm (python2-babel): Likewise. * gnu/packages/time.scm (python2-dateutil): Likwise. --- gnu/packages/check.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++- gnu/packages/time.scm | 39 +++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 8e6576208c..8c161a4a4f 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1178,6 +1178,38 @@ (define-public python-pytest-cov supports coverage of subprocesses.") (license license:expat))) +(define-public python2-pytest-cov + (package + (name "python2-pytest-cov") + (version "2.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-cov" version)) + (sha256 + (base32 "0avzlk9p4nc44k7lpx9109dybq71xqnggxb9f4hp0l64pbc44ryc")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Options taken from tox.ini. + ;; TODO: make "--restructuredtext" tests pass. They currently fail + ;; with "Duplicate implicit target name". + (invoke "python" "./setup.py" "check" + "--strict" "--metadata")))))) + (propagated-inputs + (list python2-coverage python2-pytest)) + (home-page "https://github.com/pytest-dev/pytest-cov") + (synopsis "Pytest plugin for measuring coverage") + (description + "Pytest-cov produces coverage reports. It supports centralised testing and +distributed testing in both @code{load} and @code{each} modes. It also +supports coverage of subprocesses.") + (license license:expat))) + (define-public python-pytest-httpserver (package (name "python-pytest-httpserver") @@ -2935,7 +2967,35 @@ (define-public python-freezegun (license license:asl2.0))) (define-public python2-freezegun - (package-with-python2 python-freezegun)) + (package + (name "python2-freezegun") + (version "0.3.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "freezegun" version)) + (sha256 + (base32 "0al75mk829j1izxi760b7yjnknjihyfhp2mvi5qiyrxb9cpxwqk2")))) + (build-system python-build-system) + (native-inputs + (list python2-mock python2-pytest)) + (propagated-inputs + (list python2-six python2-dateutil)) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + ;; The tests are normally executed via `make test`, but the PyPi + ;; package does not include the Makefile. + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (home-page "https://github.com/spulec/freezegun") + (synopsis "Test utility for mocking the datetime module") + (description + "FreezeGun is a library that allows your python tests to travel through +time by mocking the datetime module.") + (license license:asl2.0))) (define-public python-flexmock (package diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 020f078dee..199fcf5fb8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1283,7 +1283,37 @@ (define-public python-babel (license license:bsd-3))) (define-public python2-babel - (package-with-python2 python-babel)) + (package + (name "python2-babel") + (version "2.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Babel" version)) + (sha256 + (base32 + "018yg7g2pa6vjixx1nx41cfispgfi0azzp0a1chlycbj8jsil0ys")))) + (build-system python-build-system) + (native-inputs + (list python2-freezegun python2-pytest tzdata-for-tests)) + (propagated-inputs + (list python2-pytz)) + (arguments + `(#:python ,python-2 + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (home-page "https://babel.pocoo.org/") + (synopsis + "Tools for internationalizing Python applications") + (description + "Babel is composed of two major parts: +- tools to build and work with gettext message catalogs +- a Python interface to the CLDR (Common Locale Data Repository), providing +access to various locale display names, localized number and date formatting, +etc.") + (license license:bsd-3))) (define-public python2-backport-ssl-match-hostname (package diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 9b57fe41fb..ca5e462680 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -233,7 +233,44 @@ (define-public python-dateutil (license (list bsd-3 asl2.0)))) (define-public python2-dateutil - (package-with-python2 python-dateutil)) + (package + (name "python2-dateutil") + (version "2.8.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-dateutil" version)) + (sha256 + (base32 + "11iy7m4bp2lgfkcl0r6xzf34bvk7ppjmsyn2ygfikbi72v6cl8q1")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Delete tests that depend on "freezegun" to avoid a + ;; circular dependency. + (delete-file "dateutil/test/test_utils.py") + (delete-file "dateutil/test/test_rrule.py") + + ;; XXX: Fails to get timezone from /etc/localtime. + (delete-file "dateutil/test/test_tz.py") + + (invoke "pytest" "-vv")))))) + (native-inputs + (list python2-pytest python2-pytest-cov python2-setuptools-scm)) + (propagated-inputs + (list python2-six)) + (home-page "https://dateutil.readthedocs.io/en/stable/") + (synopsis "Extensions to the standard datetime module") + (description + "The dateutil module provides powerful extensions to the standard +datetime module, available in Python 2.3+.") + ;; The license was changed from the three-clause BSD license to a dual + ;; Apache 2.0/BSD-3 variant at 2017-12-01. Some code is only available as + ;; BSD-3 still; but all new code is dual licensed (the user can choose). + (license (list bsd-3 asl2.0)))) (define-public python-parsedatetime (package -- cgit v1.2.3 From f40c4b4ec9f1c16c56f7dc9ae511b2c6ee455356 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 May 2022 14:31:03 +0200 Subject: gnu: python-jupyter-console-minimal: Use 'modify-inputs'. * gnu/packages/python-xyz.scm (python-jupyter-console-minimal)[propagated-inputs]: Use 'modify-inputs'. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 199fcf5fb8..36171eb538 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14041,9 +14041,8 @@ (define python-jupyter-console-minimal (assoc-ref outputs "out") "/bin")))))))) ;; Remove the python-ipython propagated input, to avoid the cycle (propagated-inputs - (alist-delete - "python-ipython" - (package-propagated-inputs python-jupyter-console))))) + (modify-inputs (package-propagated-inputs python-jupyter-console) + (delete "python-ipython"))))) (define-public python-qtconsole (package -- cgit v1.2.3 From f0373a0c94566e9883c001503300ac764071ad91 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 May 2022 14:47:56 +0200 Subject: gnu: python-jupyter-console: Depend on python-prompt-toolkit 3.x. Fixes . * gnu/packages/python-xyz.scm (python-jupyter-console)[propagated-inputs]: Change 'python-prompt-toolkit-2' to 'python-prompt-toolkit'. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 36171eb538..cf75542f09 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14009,7 +14009,7 @@ (define-public python-jupyter-console "1iqrxhd8hvlyf8cqbc731ssnwm61wrycnbiczy5wsfahd3hlh8i4")))) (build-system python-build-system) (propagated-inputs - (list python-ipykernel python-jupyter-client python-prompt-toolkit-2 + (list python-ipykernel python-jupyter-client python-prompt-toolkit python-pygments)) (native-inputs (list python-nose python-pytest)) -- cgit v1.2.3 From 6a3d23c77a436fd5432b4f8d6aef532e503e225e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 May 2022 14:54:58 +0200 Subject: gnu: python-pari-jupyter: Do not propagate 'python-ipykernel'. Failing that, Guix-Jupyter sees both kernels in environments containing python-pari-jupyter and its ";;guix environment" command thus fails. * gnu/packages/python-xyz.scm (python-pari-jupyter)[propagated-inputs]: Move PYTHON-IPYKERNEL to... [inputs]: ... here. --- gnu/packages/python-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cf75542f09..29b42ea3a0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9289,10 +9289,8 @@ (define-public python-pari-jupyter "1ikqvv335qfrhmlji0iclci6pnm2c3fvnxf031jr1d68j79g6ypd")))) (build-system python-build-system) (arguments '(#:tests? #f)) ;no test suite - (propagated-inputs - (list python-ipykernel)) (inputs - (list pari-gp readline)) + (list pari-gp readline python-ipykernel)) (home-page "https://github.com/sagemath/pari-jupyter") (synopsis "Jupyter kernel for PARI/GP") (description "The package provides a PARI/GP kernel for Jupyter.") -- cgit v1.2.3 From 93ef1eecd96a0dd0ebfe44adac8b027151697f2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 18 May 2022 16:20:25 +0200 Subject: gnu: python-rich: Update to 12.4.1. * gnu/packages/python-xyz.scm (python-rich): Update to 12.4.1. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 29b42ea3a0..2eebf774bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16497,13 +16497,13 @@ (define-public python-rarfile (define-public python-rich (package (name "python-rich") - (version "10.2.2") + (version "12.4.1") (source (origin (method url-fetch) (uri (pypi-uri "rich" version)) (sha256 (base32 - "1z5m5brcdf3vndpavcqj5nl35xby4x5rfj48klhwqycfqf3g9cqp")))) + "149vjb4cpf9mz14iig0b6d8065dm8aslp6pc45g9ipmp1wf00ffj")))) (build-system python-build-system) (arguments `(#:phases @@ -16532,7 +16532,7 @@ (define-public python-rich (file-name (git-file-name name version)) (sha256 (base32 - "19f4svb363sn5708qkpa6lakmiwzyb25h8kmh7bqrsbbrvi9hr70")))))) + "17c3gljn8zv32xnpsgd3fqgqn4r7cdfqri41hridcpbhssdgkyp9")))))) (home-page "https://github.com/willmcgugan/rich") (synopsis "Render rich text and more to the terminal") (description -- cgit v1.2.3 From fe9d14552a918ab3d064e56d7cb8f8342e87d2d4 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 11 May 2022 18:36:20 +0000 Subject: gnu: python-tldextract: Update to 3.3.0. * gnu/packages/python-xyz.scm (python-tldextract): Update to 3.3.0. [propagated-inputs]: Add python-filelock. [native-inputs]: Add python-setuptools-scm. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 8 ++++---- 1 file changed, 4 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 2eebf774bb..5094ef068c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23684,19 +23684,19 @@ (define-public python-identify (define-public python-tldextract (package (name "python-tldextract") - (version "2.2.0") + (version "3.3.0") (source (origin (method url-fetch) (uri (pypi-uri "tldextract" version)) (sha256 (base32 - "1d5s8v6kpsgazyahflhji1cfdcf89rv7l7z55v774bhzvcjp2y99")))) + "1wac4yvcpgqjvls770mfx165amvy7gr00nnd2w24bqqwyamj9kdd")))) (build-system python-build-system) (native-inputs - (list python-pytest python-responses)) + (list python-pytest python-responses python-setuptools-scm)) (propagated-inputs - (list python-idna python-requests python-requests-file)) + (list python-filelock python-idna python-requests python-requests-file)) (home-page "https://github.com/john-kurkowski/tldextract") (synopsis -- cgit v1.2.3 From 8d0ac5697c0b6cb37bbf5f7464298da525535e36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 20 May 2022 09:45:47 +0200 Subject: gnu: Add python-py-tes. * gnu/packages/python-xyz.scm (python-py-tes): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5094ef068c..eaaa58d3fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10074,6 +10074,25 @@ (define-public python-pulp solve linear problems.") (license license:expat))) +(define-public python-py-tes + (package + (name "python-py-tes") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "py-tes" version)) + (sha256 + (base32 "0b272y392v0mnq0f3sm5kgcx8fn4qwfbym89hhvqxz3xkganr4pn")))) + (build-system python-build-system) + (propagated-inputs + (list python-attrs python-dateutil python-future python-requests)) + (home-page "https://github.com/ohsu-comp-bio/py-tes") + (synopsis "Library for communicating with the GA4GH Task Execution API") + (description "This package provides a library for communicating with the +GA4GH Task Execution API.") + (license license:expat))) + (define-public python-toposort (package (name "python-toposort") -- cgit v1.2.3 From 62a4ed258c27d19bf168095981ebf7bb1d381051 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 20 May 2022 09:47:11 +0200 Subject: gnu: Add python-connection-pool. * gnu/packages/python-xyz.scm (python-connection-pool): New variable. --- gnu/packages/python-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eaaa58d3fb..cdb6300117 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14398,6 +14398,23 @@ (define-public python-configargparse (home-page "https://github.com/bw2/ConfigArgParse") (license license:expat))) +(define-public python-connection-pool + (package + (name "python-connection-pool") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "connection_pool" version)) + (sha256 + (base32 "1p6hfkcl4n3hhhcgjbaxn21i7b1yipag6j7dnilir4k5xxx9whmz")))) + (build-system python-build-system) + (home-page "https://github.com/zhouyl/ConnectionPool") + (synopsis "Thread-safe connection pool") + (description "This package provides a library implementing a thread-safe +connection pool.") + (license license:expat))) + (define-public python-argparse-manpage (package (name "python-argparse-manpage") -- cgit v1.2.3 From 5fd82d7bbd30e17fa1e542037dd48e34a0a1c776 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 20 May 2022 13:59:38 +0200 Subject: gnu: Add snakemake-6. * gnu/packages/python-xyz.scm (snakemake-6): New variable. --- gnu/packages/python-xyz.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cdb6300117..96a739f90e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10194,6 +10194,74 @@ (define-public snakemake Python style, together with a fast and comfortable execution environment.") (license license:expat))) +(define-public snakemake-6 + (package + (inherit snakemake) + (name "snakemake") + (version "6.15.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snakemake/snakemake") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09yrpi9f86r9yvcm2dfjs5zy87c4j31bxama77kfd6y8yfrrjlai")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; For cluster execution Snakemake will call Python. Since there is + ;; no suitable GUIX_PYTHONPATH set, cluster execution will fail. We + ;; fix this by calling the snakemake wrapper instead. + + ;; XXX: There is another instance of sys.executable on line 692, but + ;; it is not clear how to patch it. + (add-after 'unpack 'call-wrapper-not-wrapped-snakemake + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "snakemake/executors/__init__.py" + (("\\{sys.executable\\} -m snakemake") + (string-append (assoc-ref outputs "out") + "/bin/snakemake"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + ;; This test attempts to change S3 buckets on AWS and fails + ;; because there are no AWS credentials. + (delete-file "tests/test_tibanna.py") + (invoke "pytest"))))))) + (inputs + (list python-appdirs + python-configargparse + python-connection-pool + python-datrie + python-docutils + python-filelock + python-gitpython + python-jinja2 + python-jsonschema + python-nbformat + python-networkx + python-psutil + python-pulp + python-pyyaml + python-py-tes + python-ratelimiter + python-requests + python-smart-open + python-stopit + python-tabulate + python-toposort + python-wrapt)) + (native-inputs + (list git-minimal + python-wrapper + python-pytest + python-pandas + python-requests-mock)))) + (define-public python-pyqrcode (package (name "python-pyqrcode") -- cgit v1.2.3 From 8d32ec335b35948d190b3fee3b561f19b9ed24ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 20 May 2022 14:43:52 +0200 Subject: gnu: Add snakemake-7. * gnu/packages/python-xyz.scm (snakemake-7): New variable. --- gnu/packages/python-xyz.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 96a739f90e..738dfd61cd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10262,6 +10262,79 @@ (define-public snakemake-6 python-pandas python-requests-mock)))) +(define-public snakemake-7 + (package + (inherit snakemake-6) + (name "snakemake") + (version "7.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snakemake/snakemake") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qrqbmx4cbis0wxr6dl2rdjv9v627sbirsz6v5c31vlbqwkvs04q")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; For cluster execution Snakemake will call Python. Since there is + ;; no suitable GUIX_PYTHONPATH set, cluster execution will fail. We + ;; fix this by calling the snakemake wrapper instead. + + ;; XXX: There is another instance of sys.executable on line 692, but + ;; it is not clear how to patch it. + (add-after 'unpack 'call-wrapper-not-wrapped-snakemake + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "snakemake/executors/__init__.py" + (("\\{sys.executable\\} -m snakemake") + (string-append (assoc-ref outputs "out") + "/bin/snakemake"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + ;; This test attempts to change S3 buckets on AWS and fails + ;; because there are no AWS credentials. + (delete-file "tests/test_tibanna.py") + ;; It's a similar story with this test, which requires access + ;; to the Google Storage service. + (delete-file "tests/test_google_lifesciences.py") + (invoke "pytest"))))))) + (inputs + (list python-appdirs + python-configargparse + python-connection-pool + python-datrie + python-docutils + python-filelock + python-gitpython + python-jinja2 + python-jsonschema + python-nbformat + python-networkx + python-psutil + python-pulp + python-pyyaml + python-py-tes + python-ratelimiter + python-requests + python-retry + python-smart-open + python-stopit + python-tabulate + python-toposort + python-wrapt + python-yte)) + (native-inputs + (list git-minimal + python-wrapper + python-pytest + python-pandas + python-requests-mock)))) + (define-public python-pyqrcode (package (name "python-pyqrcode") -- cgit v1.2.3 From bbb7957881af7cf359d30f041247a0d786aa3888 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sun, 8 May 2022 01:45:25 +0000 Subject: gnu: python-kivy: Update to 2.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-kivy): Update to 2.1.0. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 738dfd61cd..4794195c8f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18632,7 +18632,7 @@ (define-public python-kivy-garden (define-public python-kivy (package (name "python-kivy") - (version "1.10.1") + (version "2.1.0") (source (origin (method url-fetch) @@ -18640,7 +18640,7 @@ (define-public python-kivy (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zzxjdp78hfjjiklzr82l4zwibwcq4j6kgicspqs6iyyfn5yisbw")))) + "1cq4djfn7h8560mvz94dydsldg2jpp5w9rby7nafgmbh7fxg65is")))) (build-system python-build-system) (arguments `(#:tests? #f ; Tests require many optional packages @@ -18650,7 +18650,7 @@ (define-public python-kivy (lambda* (#:key inputs #:allow-other-keys) (setenv "KIVY_SDL2_PATH" (search-input-directory inputs "/include/SDL2")))) - (add-before 'sanity-check 'set-home + (add-before 'build 'set-home (lambda _ ;; 'kivy/__init__.py' wants to create $HOME/.kivy. (setenv "HOME" (getcwd))))))) -- cgit v1.2.3 From 1594d6c93a5c7d927bd7505c689e267560df73db Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Sun, 8 May 2022 01:45:36 +0000 Subject: gnu: Add python-kivymd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-kivymd): New symbol. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4794195c8f..b8fd857fd6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18670,6 +18670,35 @@ (define-public python-kivy multitouch applications.") (license license:expat))) +(define-public python-kivymd + (package + (name "python-kivymd") + (version "0.104.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "kivymd" version)) + (sha256 + (base32 "04lwy6j0agrdwa4a6dl6qs97nx9ysmscmm8psvdzjpyj8aa1zg4p")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;tests require network + #:phases + (modify-phases %standard-phases + (add-before 'sanity-check 'set-home + (lambda _ + ;; 'kivy/__init__.py' wants to create $HOME/.kivy. + (setenv "HOME" (getcwd))))))) + (native-inputs (list python-docutils)) + (propagated-inputs + (list python-kivy python-pillow python-pygments python-kivy-garden)) + (home-page "https://github.com/kivymd/KivyMD") + (synopsis "Material Design compliant widgets for use with Kivy") + (description + "This package provides Kivy widgets that approximate Google's Material +Design spec without sacrificing ease of use or application performance.") + (license license:expat))) + (define-public python2-kivy (package-with-python2 python-kivy)) -- cgit v1.2.3 From b29358f1988c0b1a5dc456115f2e753c69198088 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 14 May 2022 11:59:07 +0300 Subject: gnu: Add python-murmurhash3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-murmurhash3): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8fd857fd6..1802867d17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -121,6 +121,7 @@ ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -31383,3 +31384,37 @@ (define-public python-deepmerge "The @code{deep-merge} Python library provides a toolset to deeply merge nested data structures in Python like lists and dictionaries.") (license license:expat))) + +(define-public python-murmurhash3 + (package + (name "python-murmurhash3") + (version "2.3.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "murmurhash3" version)) + (sha256 + (base32 + "1gdzys1212dx70byz07ipknbw1awbqskh6aznlkm85js8b8qfczm")))) + (build-system python-build-system) + (native-inputs (list python-cython python-pytest)) + (inputs (list python)) + (arguments + (list #:modules + '((ice-9 ftw) (ice-9 match) + (guix build utils) + (guix build python-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-source-file-times-to-1980 + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." + (lambda (file stat flag) + (utime file circa-1980 circa-1980) #t)))))))) + (home-page "https://github.com/veegee/mmh3") + (synopsis "Python wrapper for MurmurHash (MurmurHash3)") + (description + "@code{murmurhash3} is a Python library for MurmurHash (MurmurHash3), a set +of fast and robust hash functions. This library is a Python extension module +written in C.") + (license license:public-domain))) -- cgit v1.2.3 From 4df064f37ae3934e8f5a0672ea3f54b8f1130cde Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 14 May 2022 22:22:06 +0300 Subject: gnu: Add python-murmurhash. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-murmurhash): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1802867d17..3c4fa16d16 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31418,3 +31418,34 @@ (define-public python-murmurhash3 of fast and robust hash functions. This library is a Python extension module written in C.") (license license:public-domain))) + +(define-public python-murmurhash + (package + (name "python-murmurhash") + (version "1.0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "murmurhash" version)) + (sha256 + (base32 + "0vwkn98c703nvsigl2nz99rax2pafkx3djjfkgc49jiipmp3j2k3")))) + (build-system python-build-system) + (native-inputs (list python-cython python-pytest)) + (inputs (list python python-murmurhash3)) + (arguments + (list #:modules + '((ice-9 ftw) (ice-9 match) + (guix build utils) + (guix build python-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-source-file-times-to-1980 + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." + (lambda (file stat flag) + (utime file circa-1980 circa-1980) #t)))))))) + (home-page "https://github.com/explosion/murmurhash") + (synopsis "Cython bindings for MurmurHash2") + (description "This package provides Cython bindings for MurmurHash2.") + (license license:expat))) -- cgit v1.2.3 From 62f16063a1eae0be6242a27dead1e2430b40a2d6 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 2 May 2022 21:17:17 +0000 Subject: gnu: Add python-pyperf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyperf): 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 3c4fa16d16..95ed00da50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31144,6 +31144,53 @@ (define-public python-sre-yield than trying to just split strings.") (license license:asl2.0))) +(define-public python-pyperf + (package + (name "python-pyperf") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyperf" version)) + (sha256 + (base32 "189qf9wdbig0fk4n3bavx8acgdbay5lllfvw48jvbfaafb7y5hja")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Some of these tests fail with: + ;; + ;; ModuleNotFoundError: No module named 'pyperf' + ;; + ;; even when calling ‘add-installed-pythonpath’ in the ‘check’ + ;; phase. + (delete-file "pyperf/tests/test_examples.py"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; From tox.ini's ‘testenv.commands’. + (invoke "python" "-bb" "-Wd" + "-m" "unittest" "discover" + "-s" "pyperf/tests/" "-v"))))))) + (native-inputs + (list python-psutil)) + (home-page "https://github.com/psf/pyperf") + (synopsis "Toolkit for running Python benchmarks") + (description "The Python @code{pyperf} module is a toolkit for writing, +running and analyzing benchmarks. It features a simple API that can: + +@itemize +@item automatically calibrate a benchmark for a time budget; +@item spawn multiple worker processes; +@item compute the mean and standard deviation; +@item detect if a benchmark result seems unstable; +@item store benchmark results in JSON format; +@item support multiple units: seconds, bytes and integer. +@end itemize") + (license license:expat))) + (define-public python-pydispatcher (package (name "python-pydispatcher") -- cgit v1.2.3 From 3a36e5409c8f6513fb8858f199065d28f227e80a Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 2 May 2022 21:17:23 +0000 Subject: gnu: Add python-pyvips. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyvips): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 95ed00da50..78954db2e3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -179,6 +179,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages inkscape) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) #:use-module (gnu packages jupyter) #:use-module (gnu packages kerberos) @@ -7739,6 +7740,65 @@ (define-public python-imageio data, and scientific formats.") (license license:bsd-2))) +(define-public python-pyvips + (package + (name "python-pyvips") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyvips" version)) + (sha256 + (base32 "0lq71iiic4pc8qhxr60gi141w25pjnn4vsh05d5l0fjkgjsv137b")))) + (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + ;; Maybe switch to API mode (i.e., build the C extension)? + ;; It is advertised as faster to start up and run. + ;; However, even with ‘pkg-config’ and ‘python-pkgconfig’ in + ;; ‘native-inputs’, the API mode build fails with: + ;; + ;; Falling back to ABI mode. Details: unable to find pkg-config package "vips" + ;; + ;; The build doesn't actually fail without the below + ;; substitution, it's just slower because ‘setup.py’ tries + ;; (unsuccessfully) to download the Python ‘pkgconfig’ module. + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "setup.py" + (("^( +setup_)API\\(\\)\n" _ prefix) + (string-append prefix "ABI()\n"))))) + (add-after 'unpack 'fix-paths + (lambda _ + (substitute* "pyvips/__init__.py" + (("^( +_vips_libname) = '(libvips.so.42)'" + _ var libname) + (format #f "~a = '~a/lib/~a'" + var #$(this-package-input "vips") libname)) + (("^( +_gobject_libname) = '(libgobject-2.0.so.0)'" + _ var libname) + (format #f "~a = '~a/lib/~a'" + var #$(this-package-input "glib") libname))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "setup.py" "test"))))))) + (native-inputs + (list python-pyperf + python-pytest + python-pytest-flake8 + python-pytest-runner)) + (inputs + (list glib vips)) + (propagated-inputs + (list python-cffi)) + (home-page "https://github.com/libvips/pyvips") + (synopsis "Python bindings for VIPS") + (description "The @code{pyvips} package provides Python bindings for VIPS, +a multithreaded image-processing system with low memory needs.") + (license license:expat))) + (define-public python-pycparser (package (name "python-pycparser") -- cgit v1.2.3 From e09496eb5dd51fb924fd4d98d7c21c41043df926 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Mon, 2 May 2022 21:17:33 +0000 Subject: gnu: Add python-scooby. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyvips-for-python-scooby, python-scooby): New variables. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 78954db2e3..ea1261d17e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -122,6 +122,7 @@ ;;; Copyright © 2022 Wamm K. D. ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Artyom V. Poptsov +;;; Copyright © 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -31556,3 +31557,83 @@ (define-public python-murmurhash (synopsis "Cython bindings for MurmurHash2") (description "This package provides Cython bindings for MurmurHash2.") (license license:expat))) + +;; Scooby requires for its test suite a ‘pyvips’ package that is missing its +;; VIPS dependency. +(define python-pyvips-for-python-scooby + (package + (inherit python-pyvips) + (name "python-pyvips-for-python-scooby") + (arguments + (substitute-keyword-arguments (package-arguments python-pyvips) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'fix-paths) + ;; The checks won't succeed without VIPS. + (delete 'check) + (delete 'sanity-check))))) + (inputs + (modify-inputs (package-inputs python-pyvips) + (delete "vips"))) + (synopsis "pyvips for Scooby's test suite"))) + +(define-public python-scooby + (package + (name "python-scooby") + (version "0.5.12") + (source + ;; The PyPI tarball does not contain the tests. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/banesullivan/scooby") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gkpmz8wl3jg8ylf1na35308sznw2g9wx33zqlyq5i2gpy2ml9mw")))) + (build-system python-build-system) + (native-inputs + (list python-beautifulsoup4 + python-numpy + python-pytest + python-pytest-cov + python-pyvips-for-python-scooby + python-scipy)) + (propagated-inputs + (list python-psutil)) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "tests/test_scooby.py" + ;; The test suite uses the no-version PyPI package + ;; (https://pypi.org/project/no-version/), + ;; but it doesn't seem worth packaging in Guix just for this. + (("scooby\\.report\\.VERSION_NOT_FOUND") + "scooby.report.MODULE_NOT_FOUND") + (("^ +import no_version # noqa.*") "")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest"))))))) + (home-page "https://github.com/banesullivan/scooby") + (synopsis "Report hardware information and Python package versions") + (description + "The Scooby package reports the following information about the currently +running system: + +@itemize +@item operating system name; +@item hardware information including machine type (e.g., @samp{i386}, +@samp{x86_64}, etc.), CPU count and total RAM; +@item Python environment (e.g., Python, IPython, etc.); +@item file system name; +@item Python version; +@item versions of specified Python packages. +@end itemize + +It can generate reports as HTML tables or plain text lists. + +Scooby has no required dependencies, and only few optional dependencies.") + (license license:expat))) -- cgit v1.2.3 From 1ffee0cf985399406ca79c3d14fe4b1c2fd85455 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 16 May 2022 22:51:53 -0400 Subject: gnu: python-tldr: Update to 3.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-tldr): Update to 3.1.0. [phases]: Add phase to build docs. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 11 +++++++---- 1 file changed, 7 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 ea1261d17e..ddb7e9b0bb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23982,7 +23982,7 @@ (define-public python2-tldextract (define-public python-tldr (package (name "python-tldr") - (version "1.2.1") + (version "3.1.0") (source (origin ;; There's no test in PyPI. @@ -23992,20 +23992,23 @@ (define-public python-tldr (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0n9wqvjxspm18vlxf9j9slrcydshk4rkv5nwkrqhfq606n6zvks4")))) + (base32 "1hxmprqg8c4cvs19n7f80f3y7jj74i8sc2dmq2gdjmsdrb54bbzc")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (invoke "make" "-C" "docs"))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? ;; This test fails. It tries to open a network socket. (invoke "pytest" "-vv" "-k" "not test_error_message"))))))) (native-inputs - (list python-pytest python-pytest-runner)) + (list python-pytest python-pytest-runner python-sphinx-argparse)) (inputs - (list python-argcomplete python-colorama python-termcolor)) + (list python-argcomplete python-colorama python-termcolor python-shtab)) (home-page "https://github.com/tldr-pages/tldr-python-client") (synopsis "Python command-line client for tldr pages") (description "This package provides the @code{tldr} command allowing users -- cgit v1.2.3 From bb03318a59560e0e7c8f66fa55b48cc030a787f7 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Mon, 16 May 2022 22:57:39 -0400 Subject: gnu: python-tldr: Use g-exp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-tldr)[arguments]: Rewrite with (guix gexp). Signed-off-by: Ludovic Courtès --- 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 ddb7e9b0bb..0148f482fc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23995,16 +23995,16 @@ (define-public python-tldr (base32 "1hxmprqg8c4cvs19n7f80f3y7jj74i8sc2dmq2gdjmsdrb54bbzc")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - (invoke "make" "-C" "docs"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; This test fails. It tries to open a network socket. - (invoke "pytest" "-vv" "-k" "not test_error_message"))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-doc + (lambda _ + (invoke "make" "-C" "docs"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; This test fails. It tries to open a network socket. + (invoke "pytest" "-vv" "-k" "not test_error_message"))))))) (native-inputs (list python-pytest python-pytest-runner python-sphinx-argparse)) (inputs -- cgit v1.2.3 From d442fe5eeef37ed70eff4f5ff95ad6dcd6f835a9 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Thu, 12 May 2022 22:43:29 +0300 Subject: gnu: Add python-cymem MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-cymem): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0148f482fc..7e1f16649c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31640,3 +31640,46 @@ (define-public python-scooby Scooby has no required dependencies, and only few optional dependencies.") (license license:expat))) + +(define-public python-cymem + (package + (name "python-cymem") + (version "2.0.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "cymem" version)) + (sha256 + (base32 + "0pkyy60zk9654sj991w111p1l0m8wvz36nslw96x6nb9h6sjb5qn")))) + (build-system python-build-system) + (native-inputs + (list python-cython + python-pytest)) + (inputs + (list python)) + (arguments + (list + #:modules '((ice-9 ftw) + (ice-9 match) + (guix build utils) + (guix build python-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-source-file-times-to-1980 + ;; XXX One of the tests uses a ZIP library to pack up some of the + ;; source tree, and fails with "ZIP does not support timestamps + ;; before 1980". Work around this by setting the file times in the + ;; source tree to sometime in early 1980. + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." (lambda (file stat flag) + (utime file circa-1980 circa-1980) + #t)))))))) + (home-page "https://github.com/explosion/cymem") + (synopsis "Cython memory pool for RAII-style memory management") + (description + "Cymem provides two small memory-management helpers for Cython. They make it +easy to tie memory to a Python object's life-cycle, so that the memory is freed +when the object is garbage collected.") + (license license:expat))) + -- cgit v1.2.3 From 02a0c1fad9086dae50572a1e9c1fc97296d55c07 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 21 May 2022 11:37:47 +0300 Subject: gnu: Add python-preshed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-preshed): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e1f16649c..a661b1403f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31683,3 +31683,35 @@ (define-public python-cymem when the object is garbage collected.") (license license:expat))) +(define-public python-preshed + (package + (name "python-preshed") + (version "3.0.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "preshed" version)) + (sha256 + (base32 + "0akpydd23xqxx9d04drsnw9140rb3cv07r1zpzqz5wm0lf47afzv")))) + (build-system python-build-system) + (native-inputs (list python-cython python-cymem python-pytest)) + (inputs (list python python-cymem python-murmurhash)) + (arguments + (list #:modules + '((ice-9 ftw) (ice-9 match) + (guix build utils) + (guix build python-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-source-file-times-to-1980 + (lambda _ + (let ((circa-1980 (* 10 366 24 60 60))) + (ftw "." + (lambda (file stat flag) + (utime file circa-1980 circa-1980) #t)))))))) + (home-page "https://github.com/explosion/preshed") + (synopsis "Cython hash tables that assume keys are pre-hashed") + (description + "Simple but high performance Cython hash table mapping pre-randomized keys +to void* values.") + (license license:expat))) -- cgit v1.2.3 From 578d1b6374df8f5f0239f62409e326ae138acd15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:01 +0200 Subject: gnu: Add python-fastbencode. * gnu/packages/python-xyz.scm (python-fastbencode): New public variable. --- gnu/packages/python-xyz.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 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 a661b1403f..6ca759e2e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018, 2021 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller -;;; Copyright © 2016–2021 Tobias Geerinckx-Rice +;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Frederick M. Muriithi @@ -13725,6 +13725,34 @@ (define-public python-json-spec JSON Reference and JSON Pointer.") (license license:bsd-3))) +(define-public python-fastbencode + (package + (name "python-fastbencode") + (version "0.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fastbencode" version)) + (sha256 + (base32 "1r66w3vpmvfmssshjpgqaj2m14c8p94nymr96mwn61idajz9mg5n")))) + (build-system python-build-system) + (home-page "https://github.com/breezy-team/fastbencode") + (synopsis "Python Bencode (de)serializer with optional fast C extensions") + (description + "The fastbencode Python package implements the bencode serialization +format for storing and transmitting loosely structured data, originally used +by BitTorrent. + +The format can encode four different types of values: byte strings, integers, +lists, and dictionaries (associative arrays). It's simple and unaffected by +endianness, + +This package includes both a pure-Python version and an optional C extension +based on Cython. Both provide the same functionality, but the C version has +significantly better performance.") + (license (list license:expat ; _bencode_py.py + license:gpl2+)))) ; __init__.py + (define-public python-fastjsonschema (package (name "python-fastjsonschema") -- cgit v1.2.3 From a9b3854eb7d889f25bcc1c94beebb8de02ba3f43 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:05 +0200 Subject: gnu: python-cli-helpers: Update to 2.2.1. * gnu/packages/python-xyz.scm (python-cli-helpers): Update to 2.2.1. [propagated-inputs]: Remove python-terminaltables. --- 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 6ca759e2e2..22bb8e715f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3592,7 +3592,7 @@ (define-public python2-pyld (define-public python-cli-helpers (package (name "python-cli-helpers") - (version "2.0.1") + (version "2.2.1") (source (origin ;; There's no source tarball on PyPI. @@ -3602,13 +3602,12 @@ (define-public python-cli-helpers (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bg2iw9l5dip0kbs00hajdk2v18wvhssbnq8hdf71278qf0wks5l")))) + (base32 "1hzavh9v9lkd1dn9f0nvg80f7v4banxvcrj10zy72przqz51k1sb")))) (build-system python-build-system) (native-inputs (list python-pytest)) (propagated-inputs - (list python-wcwidth python-configobj python-tabulate - python-terminaltables)) + (list python-wcwidth python-configobj python-tabulate)) (home-page "https://github.com/dbcli/cli_helpers") (synopsis "Helpers for building command-line apps") (description -- cgit v1.2.3 From 39bf5220750ef7106a1a323e9e641ab83425f64d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:00 +0200 Subject: gnu: pelican: Update to 4.7.2. * gnu/packages/python-xyz.scm (pelican): Update to 4.7.2. --- 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 22bb8e715f..cdfcf9f625 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5643,13 +5643,13 @@ (define-public python2-blinker (define-public pelican (package (name "pelican") - (version "4.7.1") + (version "4.7.2") (source (origin (method url-fetch) (uri (pypi-uri "pelican" version)) (sha256 - (base32 "1sfckd3fhgnj305002fi3fdhkynric1ck7a5i8qany7k3vdsbasv")))) + (base32 "0m1kndc98hhnlq0yl05f4lzccw555pkxnrajj6lks18yh491kw8w")))) (build-system python-build-system) (inputs (list python-blinker -- cgit v1.2.3 From 0504acace738324709327775cc0635b858f2041b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Wed, 25 May 2022 21:49:59 -0300 Subject: gnu: python-funcparserlib: Update to 1.0.0. * gnu/packages/python-xyz.scm (python-funcparserlib): Update to 1.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cdfcf9f625..44eeb0d7fe 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26482,13 +26482,13 @@ (define-public python-fastentrypoints (define-public python-funcparserlib (package (name "python-funcparserlib") - (version "1.0.0a0") ; last stable release was in 2013 + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "funcparserlib" version)) (sha256 - (base32 "0ama5w5lswxlp3l4qfqq3zlg7i6qkw45jfl1f7p8w1vnj8m47yz6")))) + (base32 "0swbqf53x7lfnczvi566s1g3nkf5mfrxz7sbpyymricz57a3vlvx")))) (build-system python-build-system) (arguments `(#:tests? #f)) ; no tests in PyPI and no setup.py in GitHub -- cgit v1.2.3 From 36fde042af0f420ee3a385062612b2a2c2f2f7c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 May 2022 23:07:56 +0200 Subject: gnu: python-peachpy: Update to 913d74c. Fixes . Reported by Sebastian Gibb . * gnu/packages/python-xyz.scm (python-peachpy): Update to 913d74c. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 44eeb0d7fe..1c783d2dcb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29614,9 +29614,9 @@ (define-public python-opcodes (define-public python-peachpy ;; There is no tag in this repo. - (let ((commit "906d578266dc7188bf61e4cdbc9f8ea7d69edec0") + (let ((commit "913d74c35a6b1d330e90bfc055208ce5b06b35a0") (version "0.2.0") ;from 'peachpy/__init__.py' - (revision "1")) + (revision "2")) (package (name "python-peachpy") (version (git-version version revision commit)) @@ -29627,7 +29627,7 @@ (define-public python-peachpy (file-name (git-file-name name version)) (sha256 (base32 - "1yy62k3cjr6556nbp651w6v4hzl7kz4y75wy2dfqgndgbnixskx2")) + "1wnqxspxsacw4556q0b9fbw11nhrkgn6gs8g43jdnpa35f3z9kb6")) (patches (search-patches "python-peachpy-determinism.patch")))) (build-system python-build-system) (arguments -- cgit v1.2.3 From 4f122abfe0732e40f9422cc90c6c067d2825cf0a Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 21 May 2022 23:27:59 +0300 Subject: gnu: Add python-catalogue. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-catalogue): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1c783d2dcb..32bdd1b651 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31742,3 +31742,29 @@ (define-public python-preshed "Simple but high performance Cython hash table mapping pre-randomized keys to void* values.") (license license:expat))) + +(define-public python-catalogue + (package + (name "python-catalogue") + (version "2.0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "catalogue" version)) + (sha256 + (base32 + "0srdxiil2xys8q1gpc1nvzhvis3a33d8a7amk2i1rlpbg6p36pak")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (inputs (list python python-zipp python-typing-extensions python-mypy)) + (home-page "https://github.com/explosion/catalogue") + (synopsis "Lightweight function registries for your library") + (description + "\"catalogue\" is a tiny, zero-dependencies library that +makes it easy to add function (or object) registries to your code. Function +registries are helpful when you have objects that need to be both easily +serializable and fully customizable. Instead of passing a function into your +object, you pass in an identifier name, which the object can use to lookup the +function from the registry. This makes the object easy to serialize, because the +name is a simple string. If you instead saved the function, you'd have to use +Pickle for serialization, which has many drawbacks.") + (license license:expat))) -- cgit v1.2.3 From 6caac30e444ef9d0ca7e303ff72be1139453e833 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sun, 22 May 2022 09:34:05 +0300 Subject: gnu: Add python-wasabi. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-wasabi): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 32bdd1b651..c010d87a01 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31768,3 +31768,22 @@ (define-public python-catalogue name is a simple string. If you instead saved the function, you'd have to use Pickle for serialization, which has many drawbacks.") (license license:expat))) + +(define-public python-wasabi + (package + (name "python-wasabi") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "wasabi" version)) + (sha256 + (base32 + "1kwqfalq7qxs9f7xb2m055g01qpbznyzxl7sjnzjdvvhkczg39md")))) + (build-system python-build-system) + (native-inputs (list python-pytest)) + (home-page "https://github.com/ines/wasabi") + (synopsis "Console printing and formatting toolkit") + (description + "This package provides a lightweight console printing and formatting +toolkit for Python.") + (license license:expat))) -- cgit v1.2.3 From 5bfb7ebe5dd3011d766a98cb9875399fb836c4b1 Mon Sep 17 00:00:00 2001 From: Pradana AUMARS Date: Sun, 22 May 2022 15:45:04 +0200 Subject: gnu: Add python-srt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz (python-srt): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 20 +++++++++++++++++++- 1 file changed, 19 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 c010d87a01..04726c7828 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -107,7 +107,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Simon Streit ;;; Copyright © 2021 Daniel Meißner -;;; Copyright © 2021 Pradana Aumars +;;; Copyright © 2021, 2022 Pradana Aumars ;;; Copyright © 2021, 2022 Felix Gruber ;;; Copyright © 2021 Sébastien Lerique ;;; Copyright © 2021 Raphaël Mélotte @@ -31787,3 +31787,21 @@ (define-public python-wasabi "This package provides a lightweight console printing and formatting toolkit for Python.") (license license:expat))) + +(define-public python-srt + (package + (name "python-srt") + (version "3.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "srt" version)) + (sha256 + (base32 + "0l24710spxarijmv3h7iicvx0lv6m3d4xg77nd9kyv8jwifav93s")))) + (build-system python-build-system) + (home-page "https://github.com/cdown/srt") + (synopsis "SRT parsing library") + (description + "This package provides a Python library for parsing, modifying, and +composing subtitles in the SRT file format.") + (license license:expat))) -- cgit v1.2.3 From cfc6bcee4c31c3826657a0bab426142800c9bec3 Mon Sep 17 00:00:00 2001 From: "Wamm K. D" Date: Thu, 19 May 2022 01:05:22 -0500 Subject: gnu: Add python-gatt. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-gatt): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 04726c7828..fe1896efca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31805,3 +31805,36 @@ (define-public python-srt "This package provides a Python library for parsing, modifying, and composing subtitles in the SRT file format.") (license license:expat))) + +(define-public python-gatt + (package + (name "python-gatt") + (version "0.2.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "gatt" version)) + (sha256 + (base32 + "0fjf066jixk30fr8xwfalwfnhqpr56yv0cccyypnx2qp9bi9svb2")))) + (propagated-inputs (list python-dbus python-pygobject)) + (build-system python-build-system) + (home-page "https://github.com/getsenic/gatt-python") + (synopsis "Bluetooth GATT SDK for Python") + (description "The Bluetooth @acronym{GATT, Generic ATTribute Profile} +@acronym{SDK, Software Development Kit} for Python helps you implement and +communicate with any Bluetooth Low Energy device that has a GATT +profile. It supports: + +@itemize @bullet +@item Discovering nearby Bluetooth Low Energy devices +@item Connecting and disconnecting devices +@item Implementing your custom GATT profile +@item Accessing all GATT services +@item Accessing all GATT characteristics +@item Reading characteristic values +@item Writing characteristic values +@item Subscribing for characteristic value change notifications +@end itemize + +Currently, Linux is the only platform supported by this library.") + (license license:expat))) -- cgit v1.2.3 From 92a83f38b50535694c2b62e17aa4a509b0a63a65 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 29 May 2022 21:29:43 +0200 Subject: gnu: python-ua-parser: Update to 0.10.0. * gnu/packages/python-xyz.scm (python-ua-parser): Update to 0.10.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 fe1896efca..58599304e5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9751,14 +9751,14 @@ (define-public python2-urwidtrees (define-public python-ua-parser (package (name "python-ua-parser") - (version "0.8.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (pypi-uri "ua-parser" version)) (sha256 (base32 - "1jwdf58rhchjzzrad405pviv0iq24xa2xmmmdgcm2c8s6b4wzfwp")))) + "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no test suite in release -- cgit v1.2.3 From 31a9d8677c86c4fcccecc3f0eadc373904a0f27c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 29 May 2022 21:30:45 +0200 Subject: gnu: python-user-agents: Update to 2.2.0. * gnu/packages/python-xyz.scm (python-user-agents): Update to 2.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 58599304e5..38c5fbb808 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9776,14 +9776,14 @@ (define-public python2-ua-parser (define-public python-user-agents (package (name "python-user-agents") - (version "1.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (pypi-uri "user-agents" version)) (sha256 (base32 - "0fc00cd3j8dahq1zzn8pkgfgd7lq37bp2scmdma2n1c049vicgb4")))) + "09mddriffm9rkwr30081fy9n3cn976ms8pwc8p8hhlxnilbjavfk")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;missing devices.json test file in release -- cgit v1.2.3 From d1f4b6dc8326f2d99c3692f109b2ce5c608d53bc Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 29 May 2022 22:19:52 +0200 Subject: gnu: python-translate-toolkit: Update to 3.6.2. * gnu/packages/python-xyz.scm (python-translate-toolkit): Update to 3.6.2. --- 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 38c5fbb808..acd5954fb6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20802,13 +20802,13 @@ (define-public python-factory-boy (define-public python-translate-toolkit (package (name "python-translate-toolkit") - (version "3.5.1") + (version "3.6.2") (source (origin (method url-fetch) (uri (pypi-uri "translate-toolkit" version ".tar.gz")) (sha256 - (base32 "020pp7pbpnavxd41z90vyzzx06ci57mx9drkgbsb89wxxx4gal9v")))) + (base32 "0m4cpsp7x7h5m5agg4ybscf7y86wla46q2lvxpi2myplb6qlgcli")))) (build-system python-build-system) (native-inputs (list python-pytest python-sphinx)) -- cgit v1.2.3 From 1257c4c663b83c3724b4f003b0f55ea418385bef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 May 2022 22:13:51 +0200 Subject: gnu: Add python-session-info. * gnu/packages/python-xyz.scm (python-session-info): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index acd5954fb6..9c0851ea44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10485,6 +10485,25 @@ (define-public python2-seaborn (base32 "1bjnshjz4d6z3vrwfwall1a3yh8h3a1h47c3fg7458x9426alcys"))))))) +(define-public python-session-info + (package + (name "python-session-info") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "session_info" version)) + (sha256 + (base32 + "1dxnrgaxd2nb44n423mnrx119hmnh2yxdnzaw8mg60x7rh1mxniw")))) + (build-system python-build-system) + (propagated-inputs (list python-stdlib-list)) + (home-page "https://gitlab.com/joelostblom/session_info") + (synopsis "Output version information for modules currently loaded") + (description + "This package outputs version information for modules loaded in the current +session, Python, and the OS.") + (license license:bsd-3))) + (define-public python-mpmath (package (name "python-mpmath") -- cgit v1.2.3 From 7c8f3dfa34bf644066035a352ddf8f5191b3ec80 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 May 2022 22:40:02 +0200 Subject: gnu: python-dask: Update to 2022.05.2. * gnu/packages/python-xyz.scm (python-dask): Update to 2022.05.2. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9c0851ea44..4a5db7c87b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24844,16 +24844,16 @@ (define-public python-fsspec (define-public python-dask (package (name "python-dask") - (version "2021.11.2") + (version "2022.05.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dask/dask/") - (commit "5a8275dd53193b47457cdfadc0e2356ea3eb6ccd"))) + (commit "8db1597c9745543df3129399bead5fbc95a54571"))) (file-name (git-file-name name version)) (sha256 - (base32 "0h8w7c03mn6s2mmwbqd2sqay3k4vaqiwlsbvliziggw28042zfw2")) + (base32 "1xfk3wml972z502w5ii5mn03ls3rg5p4hqgl0hkicgpmzlyz9kph")) (snippet ;; Delete generated copy of python-versioneer. We recreate it below. '(delete-file "versioneer.py")))) -- cgit v1.2.3 From f12d08c6d2a306d1e103af44e2260b8aa7f1d91d Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 17 May 2022 20:46:09 +0100 Subject: gnu: python-click@8: Remove redundant package. The python-click package is already version 8. * gnu/packages/python-xyz.scm (python-click-8): Remove variable. (python-proselint)[propagated-inputs]: Depend on python-click. --- gnu/packages/python-xyz.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4a5db7c87b..a8ad4dd778 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -61,7 +61,7 @@ ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2019, 2020 Alex Griffin -;;; Copyright © 2019, 2020, 2021 Pierre Langlois +;;; Copyright © 2019, 2020, 2021, 2022 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019, 2020, 2021 Giacomo Leidi ;;; Copyright © 2019 Wiktor Żelazny @@ -3657,18 +3657,6 @@ (define-public python-click-5 (base32 "0njsm0wn31l21bi118g5825ma5sa3rwn7v2x4wjd7yiiahkri337")))) (arguments `()))) -(define-public python-click-8 - (package (inherit python-click) - (name "python-click") - (version "8.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "click" version)) - (sha256 - (base32 "0whs38a2i0561kwbgigs6vic9r0a1887m2v1aw3rmv6r2kz0g5s7")))) - (arguments `()))) - (define-public python-cligj (package (name "python-cligj") @@ -18375,7 +18363,7 @@ (define-public python-proselint (lambda _ (setenv "HOME" "/tmp")))))) (propagated-inputs - (list python-click-8 python-future python-six)) + (list python-click python-future python-six)) (home-page "https://github.com/amperser/proselint") (synopsis "Linter for prose") (description "@code{python-proselint} is a linter for English prose, that -- cgit v1.2.3 From b8fc3403d3c09c00a4b0ab68c9f4f296928479b9 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 17 May 2022 20:46:53 +0100 Subject: gnu: gandi.cli: Fix by downgrading python-click. * gnu/packages/python-xyz.scm (python-click-7): New variable. * gnu/packages/networking.scm (gandi.cli)[inputs]: Depend on python-click-7. --- gnu/packages/networking.scm | 3 ++- gnu/packages/python-xyz.scm | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 99145b2b47..2d1cb50f4a 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -48,6 +48,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2022 Simon South +;;; Copyright © 2022 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1655,7 +1656,7 @@ (define-public gandi.cli (propagated-inputs (list openssh)) ; used by gandi/cli/modules/iass.py (inputs - (list openssl python-click python-ipy python-pyyaml python-requests)) + (list openssl python-click-7 python-ipy python-pyyaml python-requests)) (home-page "https://cli.gandi.net") (synopsis "Command-line interface to the Gandi.net Web API") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8ad4dd778..9ba7266fa9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3645,6 +3645,18 @@ (define-public python-click with sensible defaults out of the box.") (license license:bsd-3))) +(define-public python-click-7 + (package (inherit python-click) + (name "python-click") + (version "7.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "click" version)) + (sha256 + (base32 "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj")))) + (arguments `()))) + (define-public python-click-5 (package (inherit python-click) (name "python-click") -- cgit v1.2.3 From 098d0012f56b7eb654a0e8412d5030584b163c12 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 30 May 2022 23:30:24 +0200 Subject: gnu: python-fsspec: Update to 2022.5.0. * gnu/packages/python-xyz.scm (python-fsspec): Update to 2022.5.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 9ba7266fa9..3ac9adee1e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24821,14 +24821,14 @@ (define-public python-partd (define-public python-fsspec (package (name "python-fsspec") - (version "0.6.1") + (version "2022.5.0") (source (origin (method url-fetch) (uri (pypi-uri "fsspec" version)) (sha256 (base32 - "1g9ba8v04s1nrh7pvzfm2md7ivl2mrz3hcq3y9d1a44gd62h17zj")))) + "1d43qiz8g395042a52yswz6j7q41gvrv3k53wvxn1rs4bk3mjm3s")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; there are none (home-page "https://github.com/intake/filesystem_spec") -- cgit v1.2.3 From b2515311f3b3700bf1ca3710796bb8b482688a73 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:39:57 -0400 Subject: gnu: Remove python2-readlike. * gnu/packages/python-xyz.scm (python2-readlike): Delete variable. --- 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 3ac9adee1e..2d8fd4a86a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24939,9 +24939,6 @@ (define-public python-readlike are not supported.") (license license:expat))) -(define-public python2-readlike - (package-with-python2 python-readlike)) - (define-public python-reparser (package (name "python-reparser") -- cgit v1.2.3 From a12716ed27581b7c5ceb5d20aa1d99c86803bc5d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:21 -0400 Subject: gnu: Remove python2-ipython-genutils. * gnu/packages/python-xyz.scm (python2-ipython-genutils): Delete variable. --- 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 2d8fd4a86a..9c14a83d30 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8924,9 +8924,6 @@ (define-public python-ipython-genutils away.") (license license:bsd-3))) -(define-public python2-ipython-genutils - (package-with-python2 python-ipython-genutils)) - ;;; Variant used to break a cycle with python-ipykernel. (define-public python-ipyparallel-bootstrap (hidden-package -- cgit v1.2.3 From 39d627447c4b554f82ffeeade246ca79a8f1d7b5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:30 -0400 Subject: gnu: Remove python2-coloredlogs. * gnu/packages/python-xyz.scm (python2-coloredlogs): Delete variable. --- 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 9c14a83d30..cd7705456f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2512,9 +2512,6 @@ (define-public python-coloredlogs messages in color.") (license license:expat))) -(define-public python2-coloredlogs - (package-with-python2 python-coloredlogs)) - (define-public python-editorconfig (package (name "python-editorconfig") -- cgit v1.2.3 From fdf3f8d6d0a0890066827f23147c1dac69c57d6a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:34 -0400 Subject: gnu: Remove python2-pythondialog. * gnu/packages/python-xyz.scm (python2-pythondialog): Delete variable. --- gnu/packages/python-xyz.scm | 57 +++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd7705456f..bfcbbd9fb7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14540,48 +14540,33 @@ (define-public python-pythondialog (package (name "python-pythondialog") (version "3.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pythondialog" version)) - (sha256 - (base32 - "1728ghsran47jczn9bhlnkvk5bvqmmbihabgif5h705b84r1272c")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "pythondialog" version)) + (sha256 + (base32 + "1728ghsran47jczn9bhlnkvk5bvqmmbihabgif5h705b84r1272c")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((dialog (assoc-ref inputs "dialog"))) - ;; Since this library really wants to grovel the search path, we - ;; must hardcode dialog's store path into it. - (substitute* "dialog.py" - (("os.getenv\\(\"PATH\", \":/bin:/usr/bin\"\\)") - (string-append "os.getenv(\"PATH\") + \":" dialog "/bin\""))) - #t)))) - #:tests? #f)) ; no test suite - (propagated-inputs - (list dialog)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let* ((dialog (assoc-ref inputs "dialog"))) + (substitute* "dialog.py" + (("os.getenv\\(\"PATH\", \":/bin:/usr/bin\"\\)") (string-append + "os.getenv(\"PATH\") + \":" + dialog + "/bin\""))) + #t)))) + #:tests? #f)) + (propagated-inputs (list dialog)) (home-page "http://pythondialog.sourceforge.net/") (synopsis "Python interface to the UNIX dialog utility") - (description "A Python wrapper for the dialog utility. Its purpose is to + (description + "A Python wrapper for the dialog utility. Its purpose is to provide an easy to use, pythonic and comprehensive Python interface to dialog. This allows one to make simple text-mode user interfaces on Unix-like systems") - (license license:lgpl2.1) - (properties `((python2-variant . ,(delay python2-pythondialog)))))) - -(define-public python2-pythondialog - (let ((base (package-with-python2 (strip-python2-variant python-pythondialog)))) - (package - (inherit base) - (version (package-version python-pythondialog)) - (source (origin - (method url-fetch) - (uri (pypi-uri "python2-pythondialog" version)) - (sha256 - (base32 - "0d8k7lxk50imdyx85lv8j98i4c93a71iwpapnl1506rpkbm9qvd9"))))))) + (license license:lgpl2.1))) (define-public python-configobj (package -- cgit v1.2.3 From 66fc746068bc92bf992f30688f34144370b727bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:40 -0400 Subject: gnu: Remove python2-straight-plugin. * gnu/packages/python-xyz.scm (python2-straight-plugin): Delete variable. --- 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 bfcbbd9fb7..80974120a8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11844,9 +11844,6 @@ (define-public python-straight-plugin add functionality and customization to your projects with their own plugins.") (license license:expat))) -(define-public python2-straight-plugin - (package-with-python2 python-straight-plugin)) - (define-public python-pysendfile (package (name "python-pysendfile") -- cgit v1.2.3 From c3f1148cf28b474b601e83b4d01ff888090c1450 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:44 -0400 Subject: gnu: Remove python2-enum. * gnu/packages/python-xyz.scm (python2-enum): Delete variable. --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 80974120a8..ebfc812067 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3016,28 +3016,6 @@ (define-public python2-pybugz (home-page "http://www.liquidx.net/pybugz/") (license license:gpl2))) -(define-public python2-enum - (package - (name "python2-enum") - (version "0.4.6") - (source (origin - (method url-fetch) - (uri (pypi-uri "enum" version)) - (sha256 - (base32 - "13lk3yrwj42vl30kw3c194f739nrfrdg64s6i0v2p636n4k8brsl")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://pypi.org/project/enum/") - (synopsis "Robust enumerated type support in Python") - (description - "This provides a module for robust enumerations in Python. It has -been superseded by the Python standard library and is provided only for -compatibility.") - ;; Choice of either license. - (license (list license:gpl3+ license:psfl)))) - (define-public python-enum34 (package (name "python-enum34") -- cgit v1.2.3 From 63a2d6b094fd041580aa1fee2b233be37d850742 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:50 -0400 Subject: gnu: Remove python2-uniseg. * gnu/packages/python-xyz.scm (python2-uniseg): Delete variable. --- 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 ebfc812067..298f805a4e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2096,9 +2096,6 @@ (define-public python-uniseg @end enumerate") (license license:expat))) -(define-public python2-uniseg - (package-with-python2 python-uniseg)) - (define-public python-humanfriendly (package (name "python-humanfriendly") -- cgit v1.2.3 From 2d9a73171cdacbec4bfbec326207265a5b45d8b6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:40:59 -0400 Subject: gnu: Remove python2-argcomplete. * gnu/packages/python-xyz.scm (python2-argcomplete): Delete variable. --- gnu/packages/python-xyz.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 298f805a4e..5839b0d7dd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19452,22 +19452,7 @@ (define-public python-argcomplete particularly useful for programs with many options or sub-parsers that can dynamically suggest completions ; for example, when browsing resources over the network.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-argcomplete)))))) - -(define-public python2-argcomplete - (let ((variant (package-with-python2 - (strip-python2-variant python-argcomplete)))) - (package/inherit variant - (arguments - (substitute-keyword-arguments (package-arguments variant) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'set-my-HOME - (lambda _ (setenv "HOME" "/tmp"))))))) - (native-inputs - `(("python2-importlib-metadata" ,python2-importlib-metadata) - ,@(package-native-inputs variant)))))) + (license license:asl2.0))) (define-public python-csscompressor (package -- cgit v1.2.3 From d96f7625e4b4998d68f55c7bed6218629a34de44 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:14 -0400 Subject: gnu: Remove python2-pkginfo. * gnu/packages/python-xyz.scm (python2-pkginfo): Delete variable. --- 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 5839b0d7dd..599cf61839 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21913,9 +21913,6 @@ (define-public python-pkginfo created by running @code{python setup.py develop}).") (license license:expat))) -(define-public python2-pkginfo - (package-with-python2 python-pkginfo)) - (define-public python-twine (package (name "python-twine") -- cgit v1.2.3 From 03ecf0a3f4109c3b018c5659f1866042756d5619 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:17 -0400 Subject: gnu: Remove python2-mmtk. * gnu/packages/python-xyz.scm (python2-mmtk): Delete variable. --- gnu/packages/python-xyz.scm | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 599cf61839..38d84b3680 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22474,48 +22474,6 @@ (define-public python2-scientific not actively maintained and works only with Python 2 and NumPy < 1.9.") (license license:cecill-c))) -(define-public python2-mmtk - (package - (name "python2-mmtk") - (version "2.7.12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/khinsen/MMTK") - (commit (string-append "rel" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1fqwh3ba9jd42nigvn5shndgwb1zy7kh9520ncvqci7n8ffjr6p1")))) - (build-system python-build-system) - (native-inputs - (list netcdf)) - (propagated-inputs - `(("python-scientific" ,python2-scientific) - ("python-tkinter" ,python-2 "tk"))) - (arguments - `(#:python ,python-2 - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'build 'includes-from-scientific - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p "Include/Scientific") - (copy-recursively - (string-append - (assoc-ref inputs "python-scientific") - "/include/python2.7/Scientific") - "Include/Scientific")))))) - (home-page "http://dirac.cnrs-orleans.fr/MMTK") - (synopsis "Python library for molecular simulation") - (description "MMTK is a library for molecular simulations with an emphasis -on biomolecules. It provides widely used methods such as Molecular Dynamics -and normal mode analysis, but also basic routines for implementing new methods -for simulation and analysis. The library is currently not actively maintained -and works only with Python 2 and NumPy < 1.9.") - (license license:cecill-c))) - (define-public python-phonenumbers (package (name "python-phonenumbers") -- cgit v1.2.3 From ff4d3b7cb6372ff2c76010c30fe4b14d2805086d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:24 -0400 Subject: gnu: Remove python2-s3cmd. * gnu/packages/python-xyz.scm (python2-s3cmd): Delete variable. --- gnu/packages/python-xyz.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38d84b3680..6d6b030aea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16834,43 +16834,6 @@ (define-public python-magic (define-public python2-magic (package-with-python2 python-magic)) -(define-public python2-s3cmd - (package - (name "python2-s3cmd") - (version "1.6.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/s3tools/s3cmd/" version "/" - "s3cmd-" version ".tar.gz")) - (sha256 - (base32 - "0ki1rzhm5icvi9ry5jswi4b22yqwyj0d2wsqsgilwx6qhi7pjxa6")))) - (build-system python-build-system) - (arguments - ;; s3cmd is written for python2 only and contains no tests. - `(#:python ,python-2 - #:tests? #f)) - (propagated-inputs - (list python2-dateutil - ;; The python-file package also provides a magic.py module. - ;; This is an unfortunate state of affairs; however, s3cmd - ;; fails to install if it cannot find specifically the - ;; python-magic package. Thus we include it, instead of using - ;; python-file. Ironically, s3cmd sometimes works better - ;; without libmagic bindings at all: - ;; https://github.com/s3tools/s3cmd/issues/198 - python2-magic)) - (home-page "https://s3tools.org/s3cmd") - (synopsis "Command line tool for S3-compatible storage services") - (description - "S3cmd is a command line tool for uploading, retrieving and managing data -in storage services that are compatible with the Amazon Simple Storage -Service (S3) protocol, including S3 itself. It supports rsync-like backup, -GnuPG encryption, and more. It also supports management of Amazon's -CloudFront content delivery network.") - (license license:gpl2+))) - (define-public python-pkgconfig (package (name "python-pkgconfig") -- cgit v1.2.3 From ff6c3bace1677596ccf4fc87908ac8cdd904c91d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:27 -0400 Subject: gnu: Remove python2-clint. * gnu/packages/python-xyz.scm (python2-clint): Delete variable. --- 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 6d6b030aea..cdd6d85d45 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15003,9 +15003,6 @@ (define-public python-clint output, progress bar display, and pipes.") (license license:isc))) -(define-public python2-clint - (package-with-python2 python-clint)) - (define-public python-rply (package (name "python-rply") -- cgit v1.2.3 From fa94ed517368f9babc55375c758ea9e58b94bfcb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:31 -0400 Subject: gnu: Remove python2-exif-read. * gnu/packages/python-xyz.scm (python2-exif-read): Delete variable. --- 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 cdd6d85d45..286563ad9c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3538,9 +3538,6 @@ (define-public python-exif-read files.") (license license:bsd-3))) -(define-public python2-exif-read - (package-with-python2 python-exif-read)) - (define-public python-pyld (package (name "python-pyld") -- cgit v1.2.3 From e75781ce7aabc96c1120680de8ff684c26b8a964 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:34 -0400 Subject: gnu: Remove python2-activepapers. * gnu/packages/python-xyz.scm (python2-activepapers): Delete variable. --- gnu/packages/python-xyz.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 286563ad9c..4e2d615c8d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22290,25 +22290,8 @@ (define-public python-activepapers combine data, code, and documentation in single-file packages, suitable for publication as supplementary material or on repositories such as figshare or Zenodo.") - (properties `((python2-variant . ,(delay python2-activepapers)))) (license license:bsd-3))) -(define-public python2-activepapers - (let ((base (package-with-python2 - (strip-python2-variant python-activepapers)))) - (package/inherit base - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - `(modify-phases ,phases - (delete 'delete-python2-code) - (add-after 'unpack 'delete-python3-code - (lambda _ - (for-each delete-file - '("lib/activepapers/builtins3.py" - "lib/activepapers/standardlib3.py" - "lib/activepapers/utility3.py"))))))))))) - (define-public python-semver (package (name "python-semver") -- cgit v1.2.3 From 61504ff725d8a2d3ce38a4333a60f893c848af15 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:43 -0400 Subject: gnu: Remove python2-argparse. * gnu/packages/python-xyz.scm (python2-argparse): Delete variable. --- gnu/packages/python-xyz.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e2d615c8d..9e5d2581c8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20465,27 +20465,6 @@ (define-public python-mando (define-public python2-mando (package-with-python2 python-mando)) -(define-public python2-argparse - (package - (name "python2-argparse") - (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "argparse" version)) - (sha256 - (base32 - "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://github.com/ThomasWaldmann/argparse/") - (synopsis "Python command-line parsing library") - (description - "This package is mostly for people who want to have @code{argparse} on - older Pythons because it was not part of the standard library back then.") - (license license:psfl))) - (define-public python-mwclient (package (name "python-mwclient") -- cgit v1.2.3 From 54ca8f4c418b626eed17265ab4be8ad909c2a495 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:49 -0400 Subject: gnu: Remove python2-rencode. * gnu/packages/python-xyz.scm (python2-rencode): Delete variable. --- 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 9e5d2581c8..30220bfc60 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21668,9 +21668,6 @@ (define-public python-rencode pure Python module.") (license license:bsd-3))) -(define-public python2-rencode - (package-with-python2 python-rencode)) - (define-public python-xenon (package (name "python-xenon") -- cgit v1.2.3 From a00ab19763ff063225736f12ad63624c0a3bf550 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:41:53 -0400 Subject: gnu: Remove python2-parallel. * gnu/packages/python-xyz.scm (python2-parallel): Delete variable. --- 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 30220bfc60..e6cbddcdde 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28419,9 +28419,6 @@ (define-public python-parallel applications with variable CPU loads).") (license license:bsd-3))) -(define-public python2-parallel - (package-with-python2 python-parallel)) - (define-public python-djvulibre (package (name "python-djvulibre") -- cgit v1.2.3 From de0ae971915e8e0c3733f0136ffba7b33a4bca1b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:00 -0400 Subject: gnu: Remove python2-colorspacious. * gnu/packages/python-xyz.scm (python2-colorspacious): Delete variable. --- 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 e6cbddcdde..94d1c0a624 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6582,9 +6582,6 @@ (define-public python-colorspacious convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc.") (license license:expat))) -(define-public python2-colorspacious - (package-with-python2 python-colorspacious)) - (define-public python-proto-matcher (package (name "python-proto-matcher") -- cgit v1.2.3 From 8ac3ebf1b4924cb22da7e5048de9846493239081 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:14 -0400 Subject: gnu: Remove python2-mako. * gnu/packages/python-xyz.scm (python2-mako): Delete variable. --- 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 94d1c0a624..a6639dd46b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15852,9 +15852,6 @@ (define-public python-mako templates into Python modules.") (license license:expat))) -(define-public python2-mako - (package-with-python2 python-mako)) - (define-public python-waitress (package (name "python-waitress") -- cgit v1.2.3 From 2644fac20ee5bc7370186fadbd021b2395ca11b2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:18 -0400 Subject: gnu: Remove python2-polib. * gnu/packages/python-xyz.scm (python2-polib): Delete variable. --- gnu/packages/python-xyz.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a6639dd46b..bb20cfb52b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3114,13 +3114,6 @@ (define-public python-polib existing ones.") (license license:expat))) -(define-public python2-polib - (let ((base (package-with-python2 (strip-python2-variant python-polib)))) - (package/inherit base - (arguments `(,@(package-arguments base) - ;; Tests don't work with python2. - #:tests? #f))))) - (define-public python-polling2 (package (name "python-polling2") -- cgit v1.2.3 From 52abcbbdc03177f70b4a09946265866f402b1375 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:22 -0400 Subject: gnu: Remove python2-quex-0.67.3. * gnu/packages/python-xyz.scm (python2-quex-0.67.3): Delete variable. --- gnu/packages/python-xyz.scm | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bb20cfb52b..3f16b211c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23094,48 +23094,6 @@ (define-public python-pyinotify (define-public python2-pyinotify (package-with-python2 python-pyinotify)) -;; Ada parser uses this version. -(define-public python2-quex-0.67.3 - (package - (name "python2-quex") - (version "0.67.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/quex/HISTORY/" - (version-major+minor version) - "/quex-" version ".zip")) - (sha256 - (base32 - "14gv8ll3ipqv4kyc2xiy891nrmjl4ic823zfyx8hassagyclyppw")))) - (build-system python-build-system) - (native-inputs - (list unzip)) - (arguments - `(#:python ,python-2 - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share/quex (string-append out "/share/quex")) - (bin (string-append out "/bin"))) - (copy-recursively "." share/quex) - (mkdir-p bin) - (symlink (string-append share/quex "/quex-exe.py") - (string-append bin "/quex")) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "QUEX_PATH") - (files '("share/quex"))))) - (home-page "http://quex.sourceforge.net/") - (synopsis "Lexical analyzer generator in Python") - (description "@code{quex} is a lexical analyzer generator in Python.") - (license license:lgpl2.1+))) ; Non-military (define-public python2-quex (package (inherit python2-quex-0.67.3) -- cgit v1.2.3 From b199a48ef69d1d90d19b7f37763e19e05e1352da Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:41 -0400 Subject: gnu: Remove python2-netaddr. * gnu/packages/python-xyz.scm (python2-netaddr): Delete variable. --- 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 3f16b211c2..f538d59298 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12195,9 +12195,6 @@ (define-public python-netaddr and MAC network addresses.") (license license:bsd-3))) -(define-public python2-netaddr - (package-with-python2 python-netaddr)) - (define-public python2-pyroute2 (package (name "python2-pyroute2") -- cgit v1.2.3 From 714125fbd028946039ef93f42f0e396f954c3ecf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:48 -0400 Subject: gnu: Remove python2-kivy. * gnu/packages/python-xyz.scm (python2-kivy): Delete variable. --- 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 f538d59298..6f798ff8e9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18699,9 +18699,6 @@ (define-public python-kivymd Design spec without sacrificing ease of use or application performance.") (license license:expat))) -(define-public python2-kivy - (package-with-python2 python-kivy)) - (define-public python-binaryornot (package (name "python-binaryornot") -- cgit v1.2.3 From 2b612f1589beb4d5d99ff56f3d71adce55cdbacc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:42:54 -0400 Subject: gnu: Remove python2-kazoo. * gnu/packages/python-xyz.scm (python2-kazoo): Delete variable. --- 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 6f798ff8e9..cb4dd22383 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17446,9 +17446,6 @@ (define-public python-kazoo programming errors.") (license license:asl2.0))) -(define-public python2-kazoo - (package-with-python2 python-kazoo)) - (define-public python-pykafka (package (name "python-pykafka") -- cgit v1.2.3 From 6a16599d391912ab8edaa605d34c5055c4b10bf0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:09 -0400 Subject: gnu: Remove python2-prompt-toolkit. * gnu/packages/python-xyz.scm (python2-prompt-toolkit): Delete variable. --- 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 cb4dd22383..1540cffce5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18286,9 +18286,6 @@ (define-public python-prompt-toolkit-2 (list python-wcwidth python-six python-pygments)) (properties '()))) -(define-public python2-prompt-toolkit - (package-with-python2 python-prompt-toolkit-2)) - (define-public python-prompt-toolkit-1 (package (inherit python-prompt-toolkit-2) (version "1.0.15") -- cgit v1.2.3 From a5581a11354b813bac186da74acdfdd98c01fe3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:14 -0400 Subject: gnu: Remove python2-editor. * gnu/packages/python-xyz.scm (python2-editor): Delete variable. --- 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 1540cffce5..8d4a029257 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16348,9 +16348,6 @@ (define-public python-editor programmatically interfacing with your system's $EDITOR.") (license license:asl2.0))) -(define-public python2-editor - (package-with-python2 python-editor)) - (define-public python-multiprocessing-logging (package (name "python-multiprocessing-logging") -- cgit v1.2.3 From 38d6bfb6d611d069a5f615d1a4843e76705fed80 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:21 -0400 Subject: gnu: Remove python2-kitchen. * gnu/packages/python-xyz.scm (python2-kitchen): Delete variable. --- 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 8d4a029257..891d7dbfe2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3821,9 +3821,6 @@ (define-public python-kitchen ;; kitchen/pycompat25/defaultdict.py: license:psfl)))) -(define-public python2-kitchen - (package-with-python2 python-kitchen)) - (define-public python-roman (package (name "python-roman") -- cgit v1.2.3 From d8ca68f389a6189dca34bb47177ef1c5721438b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:24 -0400 Subject: gnu: Remove python2-dns-lexicon. * gnu/packages/python-xyz.scm (python2-dns-lexicon): Delete variable. --- 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 891d7dbfe2..d790f0c233 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23881,9 +23881,6 @@ (define-public python-dns-lexicon Let's Encrypt.") (license license:expat))) -(define-public python2-dns-lexicon - (package-with-python2 python-dns-lexicon)) - (define-public python-cfgv (package (name "python-cfgv") -- cgit v1.2.3 From 9352fc5347fe77638ed001164a16a6efc80cde2c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:31 -0400 Subject: gnu: Remove python2-shedskin. * gnu/packages/python-xyz.scm (python2-shedskin): Delete variable. --- gnu/packages/python-xyz.scm | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d790f0c233..d1b2ed09bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16958,44 +16958,6 @@ (define-public python-cysignals (define-public python2-cysignals (package-with-python2 python-cysignals)) -(define-public python2-shedskin - (package - (name "python2-shedskin") - (version "0.9.4") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/shedskin/shedskin/" - "releases/download/v" version - "/shedskin-" version ".tgz")) - (sha256 - (base32 - "0nzwrzgw1ga8rw6f0ryq7zr9kkiavd1cqz5hzxkcbicl1dk7kz41")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-resulting-include-libs - (lambda* (#:key inputs #:allow-other-keys) - (let ((libgc (assoc-ref inputs "libgc")) - (pcre (assoc-ref inputs "pcre"))) - (substitute* "shedskin/makefile.py" - (("variable == 'CCFLAGS':[ ]*") - (string-append "variable == 'CCFLAGS':\n" - " line += ' -I " pcre "/include" - " -I " libgc "/include'")) - (("variable == 'LFLAGS':[ ]*") - (string-append "variable == 'LFLAGS':\n" - " line += ' -L" pcre "/lib" - " -L " libgc "/lib'"))) - #t)))))) - (inputs (list pcre libgc)) - (home-page "https://shedskin.github.io/") - (synopsis "Experimental Python-2 to C++ Compiler") - (description (string-append "This is an experimental compiler for a subset of -Python. It generates C++ code and a Makefile.")) - (license (list license:gpl3 license:bsd-3 license:expat)))) - (define-public python-rope (package (name "python-rope") -- cgit v1.2.3 From d09044194dfe64e3ab1dabbbcf98b5b5f5dabc74 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:38 -0400 Subject: gnu: Remove python2-unicodecsv. * gnu/packages/python-xyz.scm (python2-unicodecsv): Delete variable. --- gnu/packages/python-xyz.scm | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d1b2ed09bf..181e7a937d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16600,33 +16600,6 @@ (define-public python-jellyfish encoding algorithms to do fuzzy string matching.") (license license:bsd-2))) -(define-public python2-unicodecsv - (package - (name "python2-unicodecsv") - (version "0.14.1") - (source (origin - (method git-fetch) - ;; The test suite is not included in the PyPi release. - ;; https://github.com/jdunck/python-unicodecsv/issues/19 - (uri (git-reference - (url "https://github.com/jdunck/python-unicodecsv") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15hx2k41a2lpv4hcml9zp4cvlx1171mnb5s4s13xc1pxkq3vgdjy")))) - (build-system python-build-system) - (arguments - `(;; It supports Python 3, but Python 3 can already do Unicode CSV. - #:python ,python-2)) - (native-inputs - (list python2-unittest2)) - (home-page "https://github.com/jdunck/python-unicodecsv") - (synopsis "Unicode CSV module for Python 2") - (description "Unicodecsv is a drop-in replacement for Python 2.7's CSV -module, adding support for Unicode strings.") - (license license:bsd-2))) - (define-public python-pdfminer-six (package (name "python-pdfminer-six") -- cgit v1.2.3 From 77d25a62f271e47c343d62314d32b86ce0d1cede Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:41 -0400 Subject: gnu: Remove python2-cliapp. * gnu/packages/python-xyz.scm (python2-cliapp): Delete variable. --- 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 181e7a937d..c44b2934dd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20033,9 +20033,6 @@ (define-public python-cliapp as parsing the command line for options, and iterating over input files.") (license license:gpl2+))) -(define-public python2-cliapp - (package-with-python2 python-cliapp)) - (define-public python-ttystatus (package (name "python-ttystatus") -- cgit v1.2.3 From 0202863b7692c9f2048829d093e7e15d808f6d92 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:51 -0400 Subject: gnu: Remove python2-text-unidecode. * gnu/packages/python-xyz.scm (python2-text-unidecode): Delete variable. --- 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 c44b2934dd..599354e18b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3892,9 +3892,6 @@ (define-public python-text-unidecode ;; The user can choose either license. (license (list license:clarified-artistic license:gpl2+)))) -(define-public python2-text-unidecode - (package-with-python2 python-text-unidecode)) - (define-public python-pyjwt (package (name "python-pyjwt") -- cgit v1.2.3 From 2841af8b9650f427b21e026aeca2def79aaa99ac Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:43:58 -0400 Subject: gnu: Remove python2-invoke. * gnu/packages/python-xyz.scm (python2-invoke): Delete variable. --- gnu/packages/python-xyz.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 599354e18b..9b55cf3e7c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19865,19 +19865,6 @@ (define-public python-invoke instead of servers and network commands.") (license license:bsd-3))) -(define-public python2-invoke - (let ((parent (package-with-python2 python-invoke))) - (package - (inherit parent) - (arguments - (substitute-keyword-arguments (package-arguments parent) - ((#:phases phases #t) - `(modify-phases ,phases - (delete 'delete-python2-code) - (add-after 'unpack 'delete-python3-code - (lambda _ - (delete-file-recursively "invoke/vendor/yaml3")))))))))) - (define-public python-automat (package (name "python-automat") -- cgit v1.2.3 From 5045ff299c484dbcf9752a5917065dfdc59ea188 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:04 -0400 Subject: gnu: Remove python2-validictory. * gnu/packages/python-xyz.scm (python2-validictory): Delete variable. --- 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 9b55cf3e7c..2c1e745da6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19168,9 +19168,6 @@ (define-public python-validictory useful as a validator for JSON data.") (license license:expat))) -(define-public python2-validictory - (package-with-python2 python-validictory)) - (define-public python-pyelftools (package (name "python-pyelftools") -- cgit v1.2.3 From c93397ce1927ad9268f7cd0f6dd497b90625c4e4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:25 -0400 Subject: gnu: Remove python2-pycosat. * gnu/packages/python-xyz.scm (python2-pycosat): Delete variable. --- 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 2c1e745da6..9804c3751b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19745,9 +19745,6 @@ (define-public python-pycosat Problem} (SAT) solver.") (license license:expat))) -(define-public python2-pycosat - (package-with-python2 python-pycosat)) - (define-public python2-ruamel.ordereddict (package (name "python2-ruamel.ordereddict") -- cgit v1.2.3 From e44c586513f8b6dbccdeb0242dde019413a85ee8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:29 -0400 Subject: gnu: Remove python2-miniboa. * gnu/packages/python-xyz.scm (python2-miniboa): Delete variable. --- 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 9804c3751b..b8af31ecaa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3294,9 +3294,6 @@ (define-public python-miniboa server.") (license license:asl2.0))) -(define-public python2-miniboa - (package-with-python2 python-miniboa)) - (define-public python-pafy (package (name "python-pafy") -- cgit v1.2.3 From f24ad69f38b62b2bf6e2ad89973fc286942ed028 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:36 -0400 Subject: gnu: Remove python2-semver. * gnu/packages/python-xyz.scm (python2-semver): Delete variable. --- 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 b8af31ecaa..a08a6fa902 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22170,9 +22170,6 @@ (define-public python-semver @url{Semantic Versioning, http://semver.org/}.") (license license:bsd-3))) -(define-public python2-semver - (package-with-python2 python-semver)) - (define-public python-pyro4 (package (name "python-pyro4") -- cgit v1.2.3 From f5bf1eab9891a64129d11534526eaeb0caf081ae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:40 -0400 Subject: gnu: Remove python2-configobj. * gnu/packages/python-xyz.scm (python2-configobj): Delete variable. --- 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 a08a6fa902..7518992755 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14539,9 +14539,6 @@ (define-public python-configobj (home-page "https://github.com/DiffSK/configobj") (license license:bsd-3))) -(define-public python2-configobj - (package-with-python2 python-configobj)) - (define-public python-configargparse (package (name "python-configargparse") -- cgit v1.2.3 From ce7fa258e5f354dbc1229c5634887af85c44bc09 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:44 -0400 Subject: gnu: Remove python2-verboselogs. * gnu/packages/python-xyz.scm (python2-verboselogs): Delete variable. --- 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 7518992755..d477a74bcb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2480,9 +2480,6 @@ (define-public python-verboselogs add the log levels NOTICE, SPAM, SUCCESS and VERBOSE.") (license license:expat))) -(define-public python2-verboselogs - (package-with-python2 python-verboselogs)) - (define-public python-coloredlogs (package (name "python-coloredlogs") -- cgit v1.2.3 From e3bbddc406d66450505e67fd1bed291f0000ef85 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:48 -0400 Subject: gnu: Remove python2-glob2. * gnu/packages/python-xyz.scm (python2-glob2): Delete variable. --- 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 d477a74bcb..47b02247d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23189,9 +23189,6 @@ (define-public python-glob2 Glob2 currently based on the glob code from Python 3.3.1.") (license license:bsd-2))) -(define-public python2-glob2 - (package-with-python2 python-glob2)) - (define-public python-gipc (package (name "python-gipc") -- cgit v1.2.3 From a969dd23c1eb2635c524dc83208de616e0371d3f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:52 -0400 Subject: gnu: Remove python2-funcy. * gnu/packages/python-xyz.scm (python2-funcy): Delete variable. --- 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 47b02247d3..13d2dc0608 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22570,9 +22570,6 @@ (define-public python-funcy @end enumerate") (license license:bsd-3))) -(define-public python2-funcy - (package-with-python2 python-funcy)) - (define-public python-isoweek (package (name "python-isoweek") -- cgit v1.2.3 From 1351249e9625d3d02597b6665af26ca7d3eb6a99 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:44:56 -0400 Subject: gnu: Remove python2-phonenumbers. * gnu/packages/python-xyz.scm (python2-phonenumbers): Delete variable. --- 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 13d2dc0608..2bd2b1ef79 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22277,9 +22277,6 @@ (define-public python-phonenumbers "This package provides a Python port of Google's libphonenumber library.") (license license:asl2.0))) -(define-public python2-phonenumbers - (package-with-python2 python-phonenumbers)) - (define-public python-heapdict (package (name "python-heapdict") -- cgit v1.2.3 From 08b026b3e3206dce0053c1998309859008d5458d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:00 -0400 Subject: gnu: Remove python2-tracing. * gnu/packages/python-xyz.scm (python2-tracing): Delete variable. --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2bd2b1ef79..4900efee57 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20040,32 +20040,6 @@ (define-public python-ttystatus (define-public python2-ttystatus (package-with-python2 python-ttystatus)) -(define-public python2-tracing - (package - (name "python2-tracing") - (version "0.10") - (source - (origin - (method url-fetch) - (uri (string-append - "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/python-tracing/snapshot/tracing-" - version ".tar.gz")) - (sha256 - (base32 - "06cw4zg42fsvqy372vi2whj26w56vzg5axhzwdjc2bgwf03garbw")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://liw.fi/tracing/") - (synopsis "Python debug logging helper") - (description "@code{python2-tracing} is a python library for - logging debug messages. It provides a way to turn debugging messages - on and off, based on the filename they occur in. It is much faster - than using @code{logging.Filter} to accomplish the same thing, which - matters when code is run in production mode. The actual logging still - happens using the @code{logging} library.") - (license license:gpl3+))) - (define-public python-astroid (package (name "python-astroid") -- cgit v1.2.3 From 42aa6229eb2e63c8082a8e1fe7be34f3818da421 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:13 -0400 Subject: gnu: Remove python2-anyjson. * gnu/packages/python-xyz.scm (python2-anyjson): Delete variable. --- gnu/packages/python-xyz.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4900efee57..fcfd73ae16 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15953,17 +15953,7 @@ (define-public python-anyjson (description "Anyjson loads whichever is the fastest JSON module installed and provides a uniform API regardless of which JSON implementation is used.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-anyjson)))))) - -(define-public python2-anyjson - (let ((anyjson (package-with-python2 - (strip-python2-variant python-anyjson)))) - (package/inherit anyjson - (arguments `(;; Unlike the python 3 variant, we do run tests. See above! - #:tests? #t - ,@(package-arguments anyjson))) - (native-inputs `(("python2-nose" ,python2-nose)))))) + (license license:bsd-3))) (define-public python-amqp (package -- cgit v1.2.3 From 55383ea50bd6c2827712b64c2879105388cadcf4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:23 -0400 Subject: gnu: Remove python2-libarchive-c. * gnu/packages/python-xyz.scm (python2-libarchive-c): Delete variable. --- 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 fcfd73ae16..4d16b16c56 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13398,9 +13398,6 @@ (define-public python-libarchive-c Python's @code{ctypes} foreign function interface (FFI).") (license license:lgpl2.0+))) -(define-public python2-libarchive-c - (package-with-python2 python-libarchive-c)) - (define-public python-file (package/inherit file (name "python-file") -- cgit v1.2.3 From 1e6e65fc32a83d1515d63ef92f88bdedda69e5c8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:28 -0400 Subject: gnu: Remove python2-xopen. * gnu/packages/python-xyz.scm (python2-xopen): Delete variable. --- gnu/packages/python-xyz.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4d16b16c56..3efdfe606a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19397,13 +19397,6 @@ (define-public python-xopen possible on all supported Python versions.") (license license:expat))) -(define-public python2-xopen - (let ((base (package-with-python2 - (strip-python2-variant python-xopen)))) - (package/inherit base - (propagated-inputs `(("python2-bz2file" ,python2-bz2file) - ,@(package-propagated-inputs base)))))) - (define-public python-cheetah (package (name "python-cheetah") -- cgit v1.2.3 From f94f66b174d62cc9c829b7405ebf216fd4e9db71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:35 -0400 Subject: gnu: Remove python2-quex. * gnu/packages/python-xyz.scm (python2-quex): Delete variable. --- gnu/packages/python-xyz.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3efdfe606a..0aa870dc06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22923,19 +22923,6 @@ (define-public python2-pyinotify (package-with-python2 python-pyinotify)) -(define-public python2-quex - (package (inherit python2-quex-0.67.3) - (name "python2-quex") - (version "0.68.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/quex/DOWNLOAD/quex-" version ".tar.gz")) - (sha256 - (base32 - "0svc9nla3b9145d6b7fb9dizx412l3difzqw0ilh9lz52nsixw8j")) - (file-name (string-append name "-" version ".tar.gz")))))) - (define-public python-more-itertools (package (name "python-more-itertools") -- cgit v1.2.3 From 72b519f4c935fdc150e567b034a2014f2fe4fe6b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:39 -0400 Subject: gnu: Remove python2-file. * gnu/packages/python-xyz.scm (python2-file): Delete variable. --- 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 0aa870dc06..bd312c36a6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13430,9 +13430,6 @@ (define-public python-file developed separately, both serve the same purpose: provide Python bindings for libmagic."))) -(define-public python2-file - (package-with-python2 python-file)) - (define-public python-pydevd ;; Use the latest commit, which includes cleanups that removes Python 2 ;; syntax that would fail to build. -- cgit v1.2.3 From 7a184a00aed417bb86237b76de2710b796352374 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:43 -0400 Subject: gnu: Remove python2-jsonrpclib-pelix. * gnu/packages/python-xyz.scm (python2-jsonrpclib-pelix): Delete variable. --- 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 bd312c36a6..9155c74e9d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21800,9 +21800,6 @@ (define-public python-jsonrpclib-pelix services.") (license license:asl2.0))) -(define-public python2-jsonrpclib-pelix - (package-with-python2 python-jsonrpclib-pelix)) - (define-public python-setuptools-scm-git-archive (package (name "python-setuptools-scm-git-archive") -- cgit v1.2.3 From d456a036db42ea04dc380af38601d797b52accff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:46 -0400 Subject: gnu: Remove python2-munch. * gnu/packages/python-xyz.scm (python2-munch): Delete variable. --- 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 9155c74e9d..6ed2732ce0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6024,9 +6024,6 @@ (define-public python-munch objects.") (license license:expat))) -(define-public python2-munch - (package-with-python2 python-munch)) - (define-public python-colormath (package (name "python-colormath") -- cgit v1.2.3 From f3661413b2df2903c01c168da376eb18aa0988c0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:50 -0400 Subject: gnu: Remove python2-pycountry. * gnu/packages/python-xyz.scm (python2-pycountry): Delete variable. --- 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 6ed2732ce0..d920828939 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19683,9 +19683,6 @@ (define-public python-pycountry through a Python API.") (license license:lgpl2.1+))) -(define-public python2-pycountry - (package-with-python2 python-pycountry)) - (define-public python-pycosat (package (name "python-pycosat") -- cgit v1.2.3 From 8b3125c0692eadd232befd6c2648bf2ab4c57def Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:45:57 -0400 Subject: gnu: Remove python2-user-agents. * gnu/packages/python-xyz.scm (python2-user-agents): Delete variable. --- 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 d920828939..04afc5131b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9737,9 +9737,6 @@ (define-public python-user-agents parsing (browser/HTTP) user agent strings.") (license license:expat))) -(define-public python2-user-agents - (package-with-python2 python-user-agents)) - (define-public python-pydbus (package (name "python-pydbus") -- cgit v1.2.3 From 72fe78ab85afb6522269bc4d294d882d98cd9d4f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:02 -0400 Subject: gnu: Remove python2-ratelimiter. * gnu/packages/python-xyz.scm (python2-ratelimiter): Delete variable. --- 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 04afc5131b..8ef36eb922 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21765,9 +21765,6 @@ (define-public python-ratelimiter executed more than a given number of times during a given period.") (license license:asl2.0))) -(define-public python2-ratelimiter - (package-with-python2 python-ratelimiter)) - (define-public python-jsonrpclib-pelix (package (name "python-jsonrpclib-pelix") -- cgit v1.2.3 From 69655554e2b9c093195f857513dcb7c1102e25d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:15 -0400 Subject: gnu: Remove python2-prettytable. * gnu/packages/python-xyz.scm (python2-prettytable): Delete variable. --- 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 8ef36eb922..528063ae78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12467,9 +12467,6 @@ (define-public python-prettytable printing of sub-tables by specifying a row range.") (license license:bsd-3))) -(define-public python2-prettytable - (package-with-python2 python-prettytable)) - (define-public python-curio (package (name "python-curio") -- cgit v1.2.3 From 8f279ececf8e8cf89d70055331941b8b95fd43ad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:18 -0400 Subject: gnu: Remove python2-jsonrpclib. * gnu/packages/python-xyz.scm (python2-jsonrpclib): Delete variable. --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 528063ae78..3598b86d15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17385,29 +17385,6 @@ (define-public python-wcwidth (define-public python2-wcwidth (package-with-python2 python-wcwidth)) -(define-public python2-jsonrpclib - (package - (name "python2-jsonrpclib") - (version "0.1.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "jsonrpclib" version)) - (sha256 - (base32 - "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z")))) - (build-system python-build-system) - (arguments - `(#:tests? #f - #:python ,python-2)) - (home-page "https://github.com/joshmarshall/jsonrpclib/") - (synopsis "Implementation of JSON-RPC specification for Python") - (description - "This library is an implementation of the JSON-RPC specification. -It supports both the original 1.0 specification, as well as the -new (proposed) 2.0 spec, which includes batch submission, keyword arguments, -etc.") - (license license:asl2.0))) - (define-public python-chai (package (name "python-chai") -- cgit v1.2.3 From 20f94ed992f4d377021ae395f3e9c48a0d20685d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:24 -0400 Subject: gnu: Remove python2-translitcodec. * gnu/packages/python-xyz.scm (python2-translitcodec): Delete variable. --- 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 3598b86d15..a12dc2df50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16174,9 +16174,6 @@ (define-public python-translitcodec ISO 8859, etc.).") (license license:expat))) -(define-public python2-translitcodec - (package-with-python2 python-translitcodec)) - (define-public python-anyqt (package (name "python-anyqt") -- cgit v1.2.3 From 4d235ef857b82ea2bcfd0ce5d45f85dcf760b4f2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:46 -0400 Subject: gnu: Remove python2-isoweek. * gnu/packages/python-xyz.scm (python2-isoweek): Delete variable. --- 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 a12dc2df50..de31e9512d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22494,9 +22494,6 @@ (define-public python-isoweek Week instances stringify to this form.") (license license:bsd-3))) -(define-public python2-isoweek - (package-with-python2 python-isoweek)) - (define-public python-pyzbar (package (name "python-pyzbar") -- cgit v1.2.3 From ece691528c39932cc27c7fbaed7dd9a390163933 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:53 -0400 Subject: gnu: Remove python2-tblib. * gnu/packages/python-xyz.scm (python2-tblib): Delete variable. --- 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 de31e9512d..d4e2f47653 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16977,9 +16977,6 @@ (define-public python-tblib @end enumerate\n") (license license:bsd-3))) -(define-public python2-tblib - (package-with-python2 python-tblib)) - (define-public python-tftpy (package (name "python-tftpy") -- cgit v1.2.3 From 4ac9208922c7a50ba6c98e98ab90a1b875c94b71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:46:56 -0400 Subject: gnu: Remove python2-smmap. * gnu/packages/python-xyz.scm (python2-smmap): Delete variable. --- 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 d4e2f47653..cc8c4c4c7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21315,9 +21315,6 @@ (define-public python-smmap window memory map manager.") (license license:bsd-3))) -(define-public python2-smmap - (package-with-python2 python-smmap)) - (define-public python-regex (package (name "python-regex") -- cgit v1.2.3 From 87ef43f0152abc554584eb9137637d4467557a1b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:47:04 -0400 Subject: gnu: Remove python2-isort. * gnu/packages/python-xyz.scm (python2-isort): Delete variable. --- gnu/packages/python-xyz.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cc8c4c4c7e..939cef37bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20115,16 +20115,7 @@ (define-public python-isort imports alphabetically, and automatically separated into sections. It provides a command line utility, a python library and plugins for various editors.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-isort)))))) - -(define-public python2-isort - (let ((base (package-with-python2 - (strip-python2-variant python-isort)))) - (package/inherit base - (native-inputs - `(("python2-futures" ,python2-futures) - ,@(package-native-inputs base)))))) + (license license:expat))) (define-public python2-backports-functools-lru-cache (package -- cgit v1.2.3 From 08b98d7ce38627ccf63279e708ade2344b52a077 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:22 -0400 Subject: gnu: Remove python2-random2. * gnu/packages/python-xyz.scm (python2-random2): Delete variable. --- 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 939cef37bf..8c3d4556a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18984,9 +18984,6 @@ (define-public python-random2 between the different Python versions.") (license license:psfl))) -(define-public python2-random2 - (package-with-python2 python-random2)) - (define-public python-snowballstemmer (package (name "python-snowballstemmer") -- cgit v1.2.3 From 85fcfd59d439d1c480e1eb3cd4719ab8f718ae33 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:33 -0400 Subject: gnu: Remove python2-pynamecheap. * gnu/packages/python-xyz.scm (python2-pynamecheap): Delete variable. --- 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 8c3d4556a9..b8cdb326d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23613,9 +23613,6 @@ (define-public python-pynamecheap "PyNamecheap is a Namecheap API client in Python.") (license license:expat))) -(define-public python2-pynamecheap - (package-with-python2 python-pynamecheap)) - (define-public python-dns-lexicon (package (name "python-dns-lexicon") -- cgit v1.2.3 From 359d5ebf10a29fb7acffcd787ff46786f03dba56 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:37 -0400 Subject: gnu: Remove python2-reparser. * gnu/packages/python-xyz.scm (python2-reparser): Delete variable. --- gnu/packages/python-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b8cdb326d8..1756b67953 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24447,14 +24447,6 @@ (define-public python-reparser on regular expressions.") (license license:expat))) -(define-public python2-reparser - (let ((reparser (package-with-python2 - (strip-python2-variant python-reparser)))) - (package/inherit reparser - (propagated-inputs - `(("python2-enum34" ,python2-enum34) - ,@(package-propagated-inputs reparser)))))) - (define-public python-retrying (package (name "python-retrying") -- cgit v1.2.3 From 8f3d4178e7abe9747d0f50f9b3fadd2af31f1671 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:44 -0400 Subject: gnu: Remove python2-gyp. * gnu/packages/python-xyz.scm (python2-gyp): Delete variable. --- 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 1756b67953..d42434bd87 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22374,9 +22374,6 @@ (define-public python-gyp files, and Makefiles.") (license license:bsd-3)))) -(define-public python2-gyp - (package-with-python2 python-gyp)) - (define-public python-whatever (package (name "python-whatever") -- cgit v1.2.3 From 83462e1f4cc303dbbd168392c8166b3b6e2dada0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:50 -0400 Subject: gnu: Remove python2-schema. * gnu/packages/python-xyz.scm (python2-schema): Delete variable. --- 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 d42434bd87..634f31baf4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3773,9 +3773,6 @@ (define-public python-schema something else) to Python data-types.") (license license:psfl))) -(define-public python2-schema - (package-with-python2 python-schema)) - (define-public python-schema-0.5 (package (inherit python-schema) (version "0.5.0") -- cgit v1.2.3 From 62aeb46d0d71053e7213fcd1dc4c428cb4503773 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:21:57 -0400 Subject: gnu: Remove python2-args. * gnu/packages/python-xyz.scm (python2-args): Delete variable. --- 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 634f31baf4..4a1c01dffa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14923,9 +14923,6 @@ (define-public python-args "This library provides a Python module to parse command-line arguments.") (license license:bsd-3))) -(define-public python2-args - (package-with-python2 python-args)) - (define-public python-clint (package (name "python-clint") -- cgit v1.2.3 From 2c7bdb3f250ea26c4b7f428a665fd6df538a47a0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:12 -0400 Subject: gnu: Remove python2-pip. * gnu/packages/python-xyz.scm (python2-pip): Delete variable. --- 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 4a1c01dffa..880da9784d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13177,9 +13177,6 @@ (define-public python-pip Python Package Index (PyPI).") (license license:expat))) -(define-public python2-pip - (package-with-python2 python-pip)) - ;;; Variant used to break a dependency cycle with ;;; python-pytest-perf-bootstrap. (define-public python-pip-run-bootstrap -- cgit v1.2.3 From b37fa3b15f2f8dc09553ec63753889684fa3e76d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:16 -0400 Subject: gnu: Remove python2-schedule. * gnu/packages/python-xyz.scm (python2-schedule): Delete variable. --- 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 880da9784d..41d137b5ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2744,9 +2744,6 @@ (define-public python-schedule human-friendly syntax.") (license license:expat))) -(define-public python2-schedule - (package-with-python2 python-schedule)) - (define-public python-scour (package (name "python-scour") -- cgit v1.2.3 From 0769dda0201b6df61749ebefeb8c1a962228afc5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:19 -0400 Subject: gnu: Remove python2-ua-parser. * gnu/packages/python-xyz.scm (python2-ua-parser): Delete variable. --- 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 41d137b5ca..bb279c089a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9705,9 +9705,6 @@ (define-public python-ua-parser "@code{ua-parser} is a Python port of Browserscope's user agent parser.") (license license:asl2.0))) -(define-public python2-ua-parser - (package-with-python2 python-ua-parser)) - (define-public python-user-agents (package (name "python-user-agents") -- cgit v1.2.3 From 6e82d2fa0d5f250332e05e757843684c2475a44d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:23 -0400 Subject: gnu: Remove python2-xdo. * gnu/packages/python-xyz.scm (python2-xdo): Delete variable. --- 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 bb279c089a..2b91bc0be9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15734,9 +15734,6 @@ (define-public python-xdo python-xdo for newer bindings.)") (license license:bsd-3))) -(define-public python2-xdo - (package-with-python2 python-xdo)) - (define-public python-xdoctest (package (name "python-xdoctest") -- cgit v1.2.3 From 3ce963254b8349c85157e9fcecc8e8afbe4236ac Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:33 -0400 Subject: gnu: python-seaborn: Update to 0.11.2. * gnu/packages/python-xyz.scm (python-seaborn): Update to 0.11.2. --- gnu/packages/python-xyz.scm | 71 ++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2b91bc0be9..7601f45883 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10349,48 +10349,39 @@ (define-public python-seaborn (package (name "python-seaborn") (version "0.11.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "seaborn" version)) - (sha256 - (base32 "1xpl3zb945sihsiwm9q1yyx84sakk1phcg0fprj6i0j0dllfjifg")) - (patches (search-patches "python-seaborn-kde-test.patch" - "python-seaborn-2690.patch")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "seaborn" version)) + (sha256 + (base32 + "1xpl3zb945sihsiwm9q1yyx84sakk1phcg0fprj6i0j0dllfjifg")) + (patches (search-patches "python-seaborn-kde-test.patch" + "python-seaborn-2690.patch")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-more-tests - (lambda _ - (substitute* "seaborn/tests/test_distributions.py" - (("get_contour_color\\(ax\\.collections\\[0\\]\\)") - "get_contour_color(ax.collections[0])") - (("c\\.get_color\\(\\)") "get_contour_color(c)") - - ;; These three are borked and have been fixed upstream, but - ;; there's no simple patch we could apply here, so we just - ;; disable them. - (("def test_hue_ignores_cmap") - "def skip_test_hue_ignores_cmap") - (("def test_fill_artists") - "def skip_test_fill_artists") - (("def test_with_rug") - "def skip_test_with_rug")))) - (add-before 'check 'start-xserver - (lambda _ - ;; There must be a running X server and make check doesn't - ;; start one. Therefore we must do it. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "seaborn"))))))) - (propagated-inputs - (list python-pandas python-matplotlib python-numpy python-scipy)) - (native-inputs - (list python-pytest xorg-server-for-tests)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-more-tests + (lambda _ + (substitute* "seaborn/tests/test_distributions.py" + (("get_contour_color\\(ax\\.collections\\[0\\]\\)") + "get_contour_color(ax.collections[0])") + (("c\\.get_color\\(\\)") "get_contour_color(c)") + (("def test_hue_ignores_cmap") + "def skip_test_hue_ignores_cmap") + (("def test_fill_artists") + "def skip_test_fill_artists") + (("def test_with_rug") "def skip_test_with_rug")))) + (add-before 'check 'start-xserver + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "seaborn"))))))) + (propagated-inputs (list python-pandas python-matplotlib python-numpy + python-scipy)) + (native-inputs (list python-pytest xorg-server-for-tests)) (home-page "https://seaborn.pydata.org/") (synopsis "Statistical data visualization") (description -- cgit v1.2.3 From 08a63ca93e76ed6fde37024ff522effbfdf0766d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:37 -0400 Subject: gnu: Remove python2-zeroconf. * gnu/packages/python-xyz.scm (python2-zeroconf): Delete variable. --- gnu/packages/python-xyz.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7601f45883..821c330670 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25069,42 +25069,6 @@ (define-public python-zeroconf (Bonjour/Avahi compatible).") (license license:lgpl2.1+))) -(define-public python2-zeroconf - (package - (name "python2-zeroconf") - - ;; This is the last version that supports Python 2.x. - (version "0.19.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "zeroconf" version)) - (sha256 - (base32 - "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-requires - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "setup.py" - (("enum-compat") - "enum34")) - #t))))) - (native-inputs - `(("python2-six" ,python2-six) - ("python2-enum32" ,python2-enum34) - ("python2-netifaces" ,python2-netifaces) - ("python2-typing" ,python2-typing))) - (home-page "https://github.com/jstasiak/python-zeroconf") - (synopsis "Pure Python mDNS service discovery") - (description - "Pure Python multicast DNS (mDNS) service discovery library (Bonjour/Avahi -compatible).") - (license license:lgpl2.1+))) - (define-public python-bsddb3 (package (name "python-bsddb3") -- cgit v1.2.3 From 994f5a2843a7b5a4539e28ac71cdedb9a87c087a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:40 -0400 Subject: gnu: Remove python2-botocore. * gnu/packages/python-xyz.scm (python2-botocore): Delete variable. --- 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 821c330670..838c0b1001 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15626,9 +15626,6 @@ (define-public python-botocore interface to the Amazon Web Services (AWS) API.") (license license:asl2.0))) -(define-public python2-botocore - (package-with-python2 python-botocore)) - (define-public python-boto3 (package (name "python-boto3") -- cgit v1.2.3 From 76e08a34c8f0d5a49f36909ba7e247894b23ae8f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:43 -0400 Subject: gnu: Remove python2-email-validator. * gnu/packages/python-xyz.scm (python2-email-validator): Delete variable. --- 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 838c0b1001..996e2574e8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17902,9 +17902,6 @@ (define-public python-email-validator "This library validates email address syntax and deliverability.") (license license:cc0))) -(define-public python2-email-validator - (package-with-python2 python-email-validator)) - (define-public python-ukpostcodeparser (package (name "python-ukpostcodeparser") -- cgit v1.2.3 From bb5a50d6a274bb2724ee365191bd6ab9083abd6b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:22:56 -0400 Subject: gnu: Remove python2-pyjwt. * gnu/packages/python-xyz.scm (python2-pyjwt): Delete variable. --- 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 996e2574e8..4a2e3434a3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3917,9 +3917,6 @@ (define-public python-pyjwt "PyJWT is a JSON Web Token implementation written in Python.") (license license:expat))) -(define-public python2-pyjwt - (package-with-python2 python-pyjwt)) - (define-public python-pymsgbox (package (name "python-pymsgbox") -- cgit v1.2.3 From 5ab8206491589e9e951498faba25de117c058ee8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:23:07 -0400 Subject: gnu: Remove python2-distutils-extra. * gnu/packages/python-xyz.scm (python2-distutils-extra): Delete variable. --- 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 4a2e3434a3..8188ff6333 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7234,9 +7234,6 @@ (define-public python-distutils-extra Python's distutils.") (license license:gpl2))) -(define-public python2-distutils-extra - (package-with-python2 python-distutils-extra)) - (define-public python2-elib.intl (package (name "python2-elib.intl") -- cgit v1.2.3 From 273ec2dc3b2c38a136cd7e184a625ea74b46ce88 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:23:11 -0400 Subject: gnu: Remove python2-schematics. * gnu/packages/python-xyz.scm (python2-schematics): Delete variable. --- 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 8188ff6333..8bfc64a4d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18724,9 +18724,6 @@ (define-public python-schematics (description "Python Data Structures for Humans.") (license license:bsd-3))) -(define-public python2-schematics - (package-with-python2 python-schematics)) - (define-public python-odfpy (package (name "python-odfpy") -- cgit v1.2.3 From 23936586f4dc1b4aa07cddc1ef4470811d1ec242 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:23:14 -0400 Subject: gnu: Remove python2-rsa. * gnu/packages/python-xyz.scm (python2-rsa): Delete variable. --- 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 8bfc64a4d1..3198a71e67 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15300,9 +15300,6 @@ (define-public python-rsa (home-page "https://stuvel.eu/rsa") (license license:asl2.0))) -(define-public python2-rsa - (package-with-python2 python-rsa)) - (define-public python-pluggy (package (name "python-pluggy") -- cgit v1.2.3 From ae657ec626e58c095d072a4fdbef9b94f904e0ca Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:23:31 -0400 Subject: gnu: Remove python2-grako. * gnu/packages/python-xyz.scm (python2-grako): Delete variable. --- 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 3198a71e67..de65a8626e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8150,9 +8150,6 @@ (define-public python-grako memoizing PEG/Packrat parser in Python.") (license license:bsd-3))) -(define-public python2-grako - (package-with-python2 python-grako)) - (define-public python-grandalf (package (name "python-grandalf") -- cgit v1.2.3 From accabb385a5539237047e98daa8f7753cf4d7234 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:23:38 -0400 Subject: gnu: Remove python2-whatever. * gnu/packages/python-xyz.scm (python2-whatever): Delete variable. --- 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 de65a8626e..db844c2b25 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22354,9 +22354,6 @@ (define-public python-whatever functions by partial application of operators.") (license license:bsd-3))) -(define-public python2-whatever - (package-with-python2 python-whatever)) - (define-public python-funcy (package (name "python-funcy") -- cgit v1.2.3 From 1962c0dd71ad27e94d5159ff6a3eef5351de11d5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:23:50 -0400 Subject: gnu: Remove python2-blosc. * gnu/packages/python-xyz.scm (python2-blosc): Delete variable. --- 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 db844c2b25..79f5b0efff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24226,9 +24226,6 @@ (define-public python-blosc This Python package wraps the Blosc library.") (license license:bsd-3))) -(define-public python2-blosc - (package-with-python2 python-blosc)) - (define-public python-partd (package (name "python-partd") -- cgit v1.2.3 From 15e9d9aab3290bf560f3d93b5f084b09bf1bec21 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:02 -0400 Subject: gnu: Remove python2-xcffib. * gnu/packages/python-xyz.scm (python2-xcffib): Delete variable. --- 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 79f5b0efff..9c7569901e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7974,9 +7974,6 @@ (define-public python-xcffib support for Python 3 and PyPy. It is based on cffi.") (license license:expat))) -(define-public python2-xcffib - (package-with-python2 python-xcffib)) - (define-public python-cairocffi (package (name "python-cairocffi") -- cgit v1.2.3 From 8084ae2e6abf382d42dc739d428a7f09db0f98a4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:05 -0400 Subject: gnu: Remove python2-pyev. * gnu/packages/python-xyz.scm (python2-pyev): Delete variable. --- 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 9c7569901e..8549773944 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19114,9 +19114,6 @@ (define-public python-pyev (description "Pyev provides a Python interface to libev.") (license license:gpl3))) -(define-public python2-pyev - (package-with-python2 python-pyev)) - (define-public python-imagesize (package (name "python-imagesize") -- cgit v1.2.3 From d9205205609a4cb3ec17fabe02f53193d2ba4eb4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:09 -0400 Subject: gnu: Remove python2-capturer. * gnu/packages/python-xyz.scm (python2-capturer): Delete variable. --- 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 8549773944..dc82d71baa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2424,9 +2424,6 @@ (define-public python-capturer for additional processing.") (license license:expat))) -(define-public python2-capturer - (package-with-python2 python-capturer)) - (define-public python-case (package (name "python-case") -- cgit v1.2.3 From c6f247617187e45ad7421b05a22e245ab65f4fd8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:15 -0400 Subject: gnu: Remove python2-drmaa. * gnu/packages/python-xyz.scm (python2-drmaa): Delete variable. --- 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 dc82d71baa..db564e2d65 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8118,9 +8118,6 @@ (define-public python-drmaa Python language binding specification.") (license license:bsd-3))) -(define-public python2-drmaa - (package-with-python2 python-drmaa)) - (define-public python-grako (package (name "python-grako") -- cgit v1.2.3 From b2750c2172e493d65915706c9fd37b9a1bebd176 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:19 -0400 Subject: gnu: Remove python2-sympy. * gnu/packages/python-xyz.scm (python2-sympy): Delete variable. --- gnu/packages/python-xyz.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db564e2d65..b268695b3c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10547,17 +10547,6 @@ (define-public python-sympy as possible in order to be comprehensible and easily extensible.") (license license:bsd-3))) -(define-public python2-sympy - (package - (inherit (package-with-python2 python-sympy)) - (version "1.5.1") ; last release for python2 - (source - (origin - (method url-fetch) - (uri (pypi-uri "sympy" version)) - (sha256 - (base32 "0zjfbxlkazzh9z22gf62azrkipb2xw7mpzjz3wl1az9893bh2yfp")))))) - (define-public python-q (package (name "python-q") -- cgit v1.2.3 From 538eadceb27fe43324dab94fdd873b8cda787b56 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:22 -0400 Subject: gnu: Remove python2-pybugz. * gnu/packages/python-xyz.scm (python2-pybugz): Delete variable. --- gnu/packages/python-xyz.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b268695b3c..481e9f90c0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2976,34 +2976,6 @@ (define-public python2-element-tree "http://docs.python.org/2/license.html" "Like \"CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\".")))) -(define-public python2-pybugz - (package - (name "python2-pybugz") - (version "0.6.11") - (source (origin - (method url-fetch) - (uri (string-append - "http://bits.liquidx.net/projects/pybugz/pybugz-" - version ".tar.gz")) - (sha256 - (base32 - "17ni00p08gp5lkxlrrcnvi3x09fmajnlbz4da03qcgl9q21ym4jd")) - (patches (search-patches "pybugz-stty.patch" - "pybugz-encode-error.patch")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 ; SyntaxError with Python 3 - #:tests? #f)) ; no 'test' sub-command - (propagated-inputs - `(("element-tree" ,python2-element-tree))) - (synopsis "Python and command-line interface to Bugzilla") - (description - "PyBugz is a Python library and command-line tool to query the Bugzilla -bug tracking system. It is meant as an aid to speed up interaction with the -bug tracker.") - (home-page "http://www.liquidx.net/pybugz/") - (license license:gpl2))) - (define-public python-enum34 (package (name "python-enum34") -- cgit v1.2.3 From 4dac0380f41220663ed27e148d6522ba10a3057d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:27 -0400 Subject: gnu: Remove python2-bz2file. * gnu/packages/python-xyz.scm (python2-bz2file): Delete variable. --- 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 481e9f90c0..150579b291 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16711,9 +16711,6 @@ (define-public python-bz2file development version of CPython that are not available in older releases.") (license license:asl2.0))) -(define-public python2-bz2file - (package-with-python2 python-bz2file)) - (define-public python-future (package (name "python-future") -- cgit v1.2.3 From 627b81c15993e4622c2f8e05e56b1f8878bf534a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:40 -0400 Subject: gnu: Remove python2-ttystatus. * gnu/packages/python-xyz.scm (python2-ttystatus): Delete variable. --- 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 150579b291..1128817bea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19868,9 +19868,6 @@ (define-public python-ttystatus if it does not fit, and resized if the terminal size changes.") (license license:gpl3+))) -(define-public python2-ttystatus - (package-with-python2 python-ttystatus)) - (define-public python-astroid (package (name "python-astroid") -- cgit v1.2.3 From a1f4dcacb3821721522ddf6012fdd35ed349900c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:44 -0400 Subject: gnu: Remove python2-pystache. * gnu/packages/python-xyz.scm (python2-pystache): Delete variable. --- gnu/packages/python-xyz.scm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1128817bea..6b54bf2f94 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4202,20 +4202,7 @@ (define-public python-pystache (description "Pystache is a Python implementation of the framework agnostic, logic-free templating system Mustache.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pystache)))))) - -(define-public python2-pystache - (let ((base (package-with-python2 - (strip-python2-variant python-pystache)))) - (package/inherit base - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "python" "test_pystache.py"))))))))) + (license license:expat))) (define-public python-pystitcher (package -- cgit v1.2.3 From fc43de306371a52c0865d103a865daf14ae3c9ad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:51 -0400 Subject: gnu: Remove python2-rply. * gnu/packages/python-xyz.scm (python2-rply): Delete variable. --- 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 6b54bf2f94..b78a497cb5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14884,9 +14884,6 @@ (define-public python-rply with a new public API, and RPython support.") (license license:bsd-3))) -(define-public python2-rply - (package-with-python2 python-rply)) - (define-public python-hy (package (name "python-hy") -- cgit v1.2.3 From da2f9c95ab021c3db47e525b88a0f37772c04b45 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:24:55 -0400 Subject: gnu: Remove python2-serpent. * gnu/packages/python-xyz.scm (python2-serpent): Delete variable. --- gnu/packages/python-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b78a497cb5..2ef1e24248 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1903,16 +1903,8 @@ (define-public python-serpent Because only safe literals are encoded, it is safe to send serpent data to other machines, such as over the network.") - (properties `((python2-variant . ,(delay python2-serpent)))) (license license:expat))) -(define-public python2-serpent - (let ((base (package-with-python2 (strip-python2-variant python-serpent)))) - (package/inherit base - (propagated-inputs - `(("python-enum34" ,python2-enum34) - ,@(package-propagated-inputs base)))))) - (define-public python-setuptools (package (name "python-setuptools") -- cgit v1.2.3 From 04624f006f447b28319901d7f5d5858000ea8bf1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:25:11 -0400 Subject: gnu: Remove python2-incremental. * gnu/packages/python-xyz.scm (python2-incremental): Delete variable. --- 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 2ef1e24248..079b943c0e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19618,9 +19618,6 @@ (define-public python-incremental projects.") (license license:expat))) -(define-public python2-incremental - (package-with-python2 python-incremental)) - (define-public python-invoke (package (name "python-invoke") -- cgit v1.2.3 From ff1b08f7c49ad0d7029093847b7c697fee4a04ce Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:25:38 -0400 Subject: gnu: Remove python2-steadymark. * gnu/packages/python-xyz.scm (python2-steadymark): Delete variable. --- gnu/packages/python-xyz.scm | 37 ------------------------------------- 1 file changed, 37 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 079b943c0e..3e9d53b720 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20579,43 +20579,6 @@ (define-public python-misaka (define-public python2-misaka (package-with-python2 python-misaka)) -(define-public python2-steadymark - ;; This is forced into being a python2 only variant - ;; due to its dependence on couleur that has no support - ;; for python3 - (package - (name "python2-steadymark") - (version "0.7.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "steadymark" version)) - (sha256 - (base32 - "1640i9g8dycql3cc8j0bky0jkzj0q39blfbp4lsgpkprkfgcdk8v")))) - (build-system python-build-system) - (native-inputs - (list python2-couleur python2-sure python2-misaka)) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-setup-py - (lambda _ - ;; Update requirements from dependency==version - ;; to dependency>=version - (substitute* "setup.py" - (("==") ">=")) - #t))))) - (home-page "https://github.com/gabrielfalcao/steadymark") - (synopsis "Markdown-based test runner for python") - (description - "@code{Steadymark} allows documentation to be written in github-flavoured - markdown. The documentation may contain snippets of code surrounded by python - code blocks and @code{Steadymark} will find these snippets and run them, making - sure that there are no old malfunctional examples in the documentation examples.") - (license license:expat))) - (define-public python-jsonpointer (package (name "python-jsonpointer") -- cgit v1.2.3 From 34f6230b886866a50cdb0e0c06bfb7f605df04f3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:25:45 -0400 Subject: gnu: Remove python2-waitress. * gnu/packages/python-xyz.scm (python2-waitress): Delete variable. --- 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 3e9d53b720..dc9ffa382d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15717,9 +15717,6 @@ (define-public python-waitress server with very acceptable performance.") (license license:zpl2.1))) -(define-public python2-waitress - (package-with-python2 python-waitress)) - (define-public python-whichcraft (package (name "python-whichcraft") -- cgit v1.2.3 From 3fbcab1e38e42848175f7cd3583b76637f2f4d80 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:25:49 -0400 Subject: gnu: Remove python2-radon. * gnu/packages/python-xyz.scm (python2-radon): Delete variable. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dc9ffa382d..4b32d406c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20481,17 +20481,8 @@ (define-public python-radon @item Halstead metrics (all of them) @item the Maintainability Index (a Visual Studio metric) @end itemize") - (properties `((python2-variant . ,(delay python2-radon)))) (license license:expat))) -(define-public python2-radon - (let ((base (package-with-python2 (strip-python2-variant python-radon)))) - (package/inherit base - (propagated-inputs - `(("python-configparser" ,python2-configparser) - ("python-future" ,python2-future) - ,@(package-propagated-inputs base)))))) - (define-public python-sure (package (name "python-sure") -- cgit v1.2.3 From 5bc038d2229d3f9059c28090f17108ee851f26bc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 21:25:58 -0400 Subject: gnu: Remove python2-mimeparse. * gnu/packages/python-xyz.scm (python2-mimeparse): Delete variable. --- 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 4b32d406c3..b13a7f1714 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3227,9 +3227,6 @@ (define-public python-mimeparse matching them against a list of media-ranges.") (license license:expat))) -(define-public python2-mimeparse - (package-with-python2 python-mimeparse)) - (define-public python-miniboa (package (name "python-miniboa") -- cgit v1.2.3 From 6b90432e79b9c49584099170d05dca2ccdc77bef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:20:41 -0400 Subject: gnu: Remove python2-objgraph. * gnu/packages/python-xyz.scm (python2-objgraph): Delete variable. --- 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 b13a7f1714..fa326cb2f7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16928,9 +16928,6 @@ (define-public python-objgraph graphviz.") (license license:expat))) -(define-public python2-objgraph - (package-with-python2 python-objgraph)) - (define-public python-gevent (package (name "python-gevent") -- cgit v1.2.3 From 87bd8bd1dd88c4c4683275f99e67d1b54e6f79c1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:20:54 -0400 Subject: gnu: Remove python2-yapf. * gnu/packages/python-xyz.scm (python2-yapf): Delete variable. --- 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 fa326cb2f7..0adfbfca44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22119,9 +22119,6 @@ (define-public python-yapf style guide, even if the original code didn't violate the style guide.") (license license:asl2.0))) -(define-public python2-yapf - (package-with-python2 python-yapf)) - (define-public python-yq (package (name "python-yq") -- cgit v1.2.3 From 8b9bda873dc11ff6b73888c1745c15e9618b1778 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:01 -0400 Subject: gnu: Remove python2-misaka. * gnu/packages/python-xyz.scm (python2-misaka): Delete variable. --- 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 0adfbfca44..b109662ec3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20558,9 +20558,6 @@ (define-public python-misaka renderers (e.g. man pages or LaTeX).") (license license:expat))) -(define-public python2-misaka - (package-with-python2 python-misaka)) - (define-public python-jsonpointer (package (name "python-jsonpointer") -- cgit v1.2.3 From 9c054861a1aa4d02af55182ec0b40ea02d89bfdf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:11 -0400 Subject: gnu: Remove python2-mpmath. * gnu/packages/python-xyz.scm (python2-mpmath): Delete variable. --- 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 b109662ec3..fa3cc12c44 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10391,9 +10391,6 @@ (define-public python-mpmath more advanced mathematics.") (license license:bsd-3))) -(define-public python2-mpmath - (package-with-python2 python-mpmath)) - (define-public python-bigfloat (package (name "python-bigfloat") -- cgit v1.2.3 From 5571221cb665e96dbf7a79459e317c582a1cf0b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:18 -0400 Subject: gnu: Remove python2-binaryornot. * gnu/packages/python-xyz.scm (python2-binaryornot): Delete variable. --- gnu/packages/python-xyz.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fa3cc12c44..fc2806a22f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18451,15 +18451,7 @@ (define-public python-binaryornot (synopsis "Package to check if a file is binary or text") (description "Ultra-lightweight pure Python package to check if a file is binary or text.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-binaryornot)))))) - -(define-public python2-binaryornot - (let ((base (package-with-python2 (strip-python2-variant python-binaryornot)))) - (package/inherit base - (propagated-inputs - `(("python2-enum34" ,python2-enum34) - ,@(package-propagated-inputs base)))))) + (license license:bsd-3))) (define-public binwalk (package -- cgit v1.2.3 From 46de9d31619af0cf71a12f33847788705e640fa1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:31 -0400 Subject: gnu: Remove python2-cheetah. * gnu/packages/python-xyz.scm (python2-cheetah): Delete variable. --- 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 fc2806a22f..995f5aaf03 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19269,9 +19269,6 @@ (define-public python-cheetah @end enumerate") (license (license:x11-style "file://LICENSE")))) -(define-public python2-cheetah - (package-with-python2 python-cheetah)) - (define-public python-dulwich (package (name "python-dulwich") -- cgit v1.2.3 From f243080d73ae74e658a77dd637d4e69bb2326e4d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:35 -0400 Subject: gnu: Remove python2-ruamel.ordereddict. * gnu/packages/python-xyz.scm (python2-ruamel.ordereddict): Delete variable. --- gnu/packages/python-xyz.scm | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 995f5aaf03..e9e38dc92e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19520,40 +19520,6 @@ (define-public python-pycosat Problem} (SAT) solver.") (license license:expat))) -(define-public python2-ruamel.ordereddict - (package - (name "python2-ruamel.ordereddict") - (version "0.4.9") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ruamel.ordereddict" version)) - (sha256 - (base32 - "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "python" "test/testordereddict.py")))))) - (home-page "https://bitbucket.org/ruamel/ordereddict") - (synopsis "Version of dict that keeps keys in insertion order") - (description - "This is an implementation of an ordered dictionary with @dfn{Key - Insertion Order} (KIO: updates of values do not affect the position of the - key), @dfn{Key Value Insertion Order} (KVIO, an existing key's position is - removed and put at the back). The standard library module @code{OrderedDict}, - implemented later, implements a subset of @code{ordereddict} functionality. - Sorted dictionaries are also provided. Currently only with @dfn{Key Sorted - Order} (KSO, no sorting function can be specified, but a transform can be - specified to apply on the key before comparison (e.g. @code{string.lower})).") - (license license:expat))) - (define-public python-pypeg2 (package (name "python-pypeg2") -- cgit v1.2.3 From 7f7716a0e7074bc53e1ab0e79067e7cbd0929cb2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:47 -0400 Subject: gnu: Remove python2-blinker. * gnu/packages/python-xyz.scm (python2-blinker): Delete variable. --- 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 e9e38dc92e..8682c11437 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5523,9 +5523,6 @@ (define-public python-blinker interested parties to subscribe to events, or \"signals\".") (license license:expat))) -(define-public python2-blinker - (package-with-python2 python-blinker)) - (define-public pelican (package (name "pelican") -- cgit v1.2.3 From 5b93a4325a286a65ff5efb4ffd887c9959b63b72 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:21:53 -0400 Subject: gnu: Remove python2-termcolor. * gnu/packages/python-xyz.scm (python2-termcolor): Delete variable. --- 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 8682c11437..b2ddec4b17 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13222,9 +13222,6 @@ (define-public python-termcolor "This package provides ANSII Color formatting for output in terminals.") (license license:expat))) -(define-public python2-termcolor - (package-with-python2 python-termcolor)) - (define-public python-terminaltables (package (name "python-terminaltables") -- cgit v1.2.3 From f0713c6fe7b484e6321156d74014969a23e95516 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:06 -0400 Subject: gnu: Remove python2-booleanoperations. * gnu/packages/python-xyz.scm (python2-booleanoperations): Delete variable. --- gnu/packages/python-xyz.scm | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b2ddec4b17..a7b03b0e46 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21626,31 +21626,6 @@ (define-public python-pyclipper (define-public python2-pyclipper (package-with-python2 python-pyclipper)) -(define-public python2-booleanoperations - (package - (name "python2-booleanoperations") - (version "0.7.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "booleanOperations" version ".zip")) - (sha256 - (base32 - "1hw42fazdpvsn77glx96hwsj9l17mvx37sc5707s08y5w6fx16mn")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (native-inputs - (list unzip python2-pytest python2-pytest-runner)) - (propagated-inputs - (list python2-fonttools python2-pyclipper python2-ufolib)) - (home-page "https://github.com/typemytype/booleanOperations") - (synopsis "Boolean operations on paths") - (description - "BooleanOperations provides a Python library that enables -boolean operations on paths.") - (license license:expat))) - (define-public python-tempdir (package (name "python-tempdir") -- cgit v1.2.3 From 754d176b07fd3536e139751a63b41d865285ea71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:12 -0400 Subject: gnu: Remove python2-dirsync. * gnu/packages/python-xyz.scm (python2-dirsync): Delete variable. --- 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 a7b03b0e46..48bce48b83 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20153,9 +20153,6 @@ (define-public python-dirsync (description "Advanced directory tree synchronisation tool.") (license license:expat))) -(define-public python2-dirsync - (package-with-python2 python-dirsync)) - (define-public python-levenshtein (package (name "python-levenshtein") -- cgit v1.2.3 From 30ea94bae1a3e57dd78dea0cdd3f01105ce1dbac Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:16 -0400 Subject: gnu: Remove python2-rfc3986. * gnu/packages/python-xyz.scm (python2-rfc3986): Delete variable. --- 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 48bce48b83..71a6d310c7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20594,9 +20594,6 @@ (define-public python-rfc3986 which adds support for zone identifiers to IPv6 addresses.") (license license:asl2.0))) -(define-public python2-rfc3986 - (package-with-python2 python-rfc3986)) - (define-public python-rfc3987 (package (name "python-rfc3987") -- cgit v1.2.3 From d33297e7d6ce99bbc828d0b0a07a6e2221a18973 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:24 -0400 Subject: gnu: Remove python2-feedgenerator. * gnu/packages/python-xyz.scm (python2-feedgenerator): Delete variable. --- 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 71a6d310c7..445b5cd02b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5259,9 +5259,6 @@ (define-public python-feedgenerator which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") (license license:bsd-3))) -(define-public python2-feedgenerator - (package-with-python2 python-feedgenerator)) - (define-public python-lsp-jsonrpc (package (name "python-lsp-jsonrpc") -- cgit v1.2.3 From 81db76247cb105768b01bbbf42696ff76a27ac00 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:27 -0400 Subject: gnu: Remove python2-ipaddr. * gnu/packages/python-xyz.scm (python2-ipaddr): Delete variable. --- gnu/packages/python-xyz.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 445b5cd02b..967aa2b410 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12824,34 +12824,6 @@ (define-public python-asn1tools for OER and UPER.") (license license:expat))) -(define-public python2-ipaddr - (package - (name "python2-ipaddr") - (version "2.1.11") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ipaddr" version)) - (sha256 - (base32 "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 ;version 2 only - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ (invoke "python" "ipaddr_test.py")))))) - (home-page "https://github.com/google/ipaddr-py") - (synopsis "IP address manipulation library") - (description - "Ipaddr is a Python@tie{}2 library for creating and manupilating IPv4 and -IPv6 addresses and networks. - -For new implementations you may prefer to use the standard module -@code{ipaddress}, which was introduced in Python 3.3 and backported to older -versions of Python.") - (license license:asl2.0))) - (define-public python-idna (package (name "python-idna") -- cgit v1.2.3 From 2ab90fcf3aa6a33cad2126eb3c251d8856ffde3e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:31 -0400 Subject: gnu: Remove python2-autopep8. * gnu/packages/python-xyz.scm (python2-autopep8): Delete variable. --- 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 967aa2b410..e72449ae00 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7114,9 +7114,6 @@ (define-public python-autopep8 (license (license:non-copyleft "https://github.com/hhatto/autopep8/blob/master/LICENSE")))) -(define-public python2-autopep8 - (package-with-python2 python-autopep8)) - (define-public python-distlib (package (name "python-distlib") -- cgit v1.2.3 From 9d6953aa5d08b137d47d9730d328a29317e9bccc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:43 -0400 Subject: gnu: Remove python2-humanfriendly. * gnu/packages/python-xyz.scm (python2-humanfriendly): Delete variable. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e72449ae00..ebe975073e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2111,17 +2111,8 @@ (define-public python-humanfriendly numbers, file sizes, and timespans, timers for long-running operations, menus to allow the user to choose from a list of options, and terminal interaction helpers.") - (properties `((python2-variant . ,(delay python2-humanfriendly)))) (license license:expat))) -(define-public python2-humanfriendly - (let ((base (package-with-python2 - (strip-python2-variant python-humanfriendly)))) - (package/inherit base - (propagated-inputs - `(("python2-monotonic" ,python2-monotonic) - ,@(package-propagated-inputs base)))))) - (define-public python-textparser (package (name "python-textparser") -- cgit v1.2.3 From a8c28b8391dc6cf307ee3a1a3362fc77f9ef2349 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:52 -0400 Subject: gnu: Remove python2-consul. * gnu/packages/python-xyz.scm (python2-consul): Delete variable. --- 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 ebe975073e..29d3309648 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18546,9 +18546,6 @@ (define-public python-consul discovery, monitoring and configuration.") (license license:expat))) -(define-public python2-consul - (package-with-python2 python-consul)) - (define-public python-schematics (package (name "python-schematics") -- cgit v1.2.3 From 41e7bfb458909b13413edcaaf8f4fd913fa58ecb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:22:56 -0400 Subject: gnu: Remove python2-flex. * gnu/packages/python-xyz.scm (python2-flex): Delete variable. --- 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 29d3309648..cba4a76af8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20794,9 +20794,6 @@ (define-public python-flex (description "@code{flex} can be used to validate Swagger schemata.") (license license:bsd-3))) -(define-public python2-flex - (package-with-python2 python-flex)) - (define-public python-marshmallow (package (name "python-marshmallow") -- cgit v1.2.3 From fc90a42f5f11cbe082369732feb773cf4ac4be0d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:23:02 -0400 Subject: gnu: Remove python2-numexpr. * gnu/packages/python-xyz.scm (python2-numexpr): Delete variable. --- 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 cba4a76af8..c7628d010b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6418,9 +6418,6 @@ (define-public python-numexpr transcendental functions).") (license license:expat))) -(define-public python2-numexpr - (package-with-python2 python-numexpr)) - (define-public python-cycler (package (name "python-cycler") -- cgit v1.2.3 From 9e1ee95c1751f97f987f9200d9434b61ea038e9a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:23:06 -0400 Subject: gnu: Remove python2-texttable. * gnu/packages/python-xyz.scm (python2-texttable): Delete variable. --- 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 c7628d010b..e589cb154f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14504,9 +14504,6 @@ (define-public python-texttable tables.") (license license:expat))) -(define-public python2-texttable - (package-with-python2 python-texttable)) - (define-public python-atomicwrites (package (name "python-atomicwrites") -- cgit v1.2.3 From 3cf21db34a34b38af993302c61a80f9f4c5b224f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:23:12 -0400 Subject: gnu: Remove python2-simplegeneric. * gnu/packages/python-xyz.scm (python2-simplegeneric): Delete variable. --- 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 e589cb154f..b79b99be62 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8743,9 +8743,6 @@ (define-public python-simplegeneric standard library.") (license license:zpl2.1))) -(define-public python2-simplegeneric - (package-with-python2 python-simplegeneric)) - (define-public python-ipython-genutils ;; TODO: This package is retired, check if can be removed, see description. (package -- cgit v1.2.3 From 1d8b2a07d920ffabb06a802e44d2d2c9574dc73d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:25:06 -0400 Subject: gnu: Remove python2-dnspython-1.16. * gnu/packages/python-xyz.scm (python2-dnspython-1.16): Delete variable. --- 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 b79b99be62..4027a63d88 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17684,9 +17684,6 @@ (define-public python-dnspython-1.16 "1yaw7irazy42n0kdhlk7wyg8ki34rxcnc5xbc1wfwy245b0wbxab")))) (native-inputs '()))) -(define-public python2-dnspython-1.16 - (package-with-python2 python-dnspython-1.16)) - (define-public python-py3dns (package (name "python-py3dns") -- cgit v1.2.3 From 4a37995b04c7dbd46b40be5d342145b825b098e5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:28:27 -0400 Subject: gnu: Remove python2-pyclipper. * gnu/packages/python-xyz.scm (python2-pyclipper): Delete variable. --- 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 4027a63d88..a8b1099470 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21556,9 +21556,6 @@ (define-public python-pyclipper Angus Johnson's polygon clipping Clipper library (ver. 6.4.2).") (license license:expat))) -(define-public python2-pyclipper - (package-with-python2 python-pyclipper)) - (define-public python-tempdir (package (name "python-tempdir") -- cgit v1.2.3 From 90e2ad11c7220327779c78672fea80421b179237 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:35:25 -0400 Subject: gnu: Remove ptpython-2. * gnu/packages/python-xyz.scm (ptpython-2): Delete variable. (ptpython)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a8b1099470..b6a61f5e08 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18033,13 +18033,7 @@ (define-public ptpython It supports syntax highlighting, multiline editing, autocompletion, mouse, color schemes, bracketed paste, Vi and Emacs keybindings, Chinese characters etc.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay ptpython-2)))))) - -(define-public ptpython-2 - (let ((base (package-with-python2 (strip-python2-variant ptpython)))) - (package/inherit base - (name "ptpython2")))) + (license license:bsd-3))) (define-public python-easyprocess (package -- cgit v1.2.3 From 60d41d55eb33241330d2ab8bc159a6e20865f3f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:38:54 -0400 Subject: gnu: Remove python2-locket. * gnu/packages/python-xyz.scm (python2-locket): Delete variable. --- 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 b6a61f5e08..3f3a9bf364 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23892,9 +23892,6 @@ (define-public python-locket they use the same path.") (license license:bsd-2))) -(define-public python2-locket - (package-with-python2 python-locket)) - (define-public python-blosc (package (name "python-blosc") -- cgit v1.2.3 From 089caa19c78fd27034bb7bd29b83fc24fb452444 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:38:58 -0400 Subject: gnu: Remove python2-jsonpatch. * gnu/packages/python-xyz.scm (python2-jsonpatch): Delete variable. --- 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 3f3a9bf364..0888662ec2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20482,9 +20482,6 @@ (define-public python-jsonpatch applying JSON Patches according to RFC 6902.") (license license:bsd-3))) -(define-public python2-jsonpatch - (package-with-python2 python-jsonpatch)) - (define-public python-jsonpatch-0.4 (package (inherit python-jsonpatch) (name "python-jsonpatch") -- cgit v1.2.3 From c83f305075878bfd4e29949b94e82bd2eda99263 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:39:16 -0400 Subject: gnu: Remove python2-ansi2html. * gnu/packages/python-xyz.scm (python2-ansi2html): Delete variable. --- 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 0888662ec2..7628e918f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19347,9 +19347,6 @@ (define-public python-ansi2html converting text with ANSI color codes to HTML or LaTeX.") (license license:gpl3+))) -(define-public python2-ansi2html - (package-with-python2 python-ansi2html)) - (define-public python-easy-ansi (package (name "python-easy-ansi") -- cgit v1.2.3 From c76c7556cdf8b1cdd98d4b7a7e8144d419a92212 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:44:33 -0400 Subject: gnu: Remove python-prompt-toolkit-1. * gnu/packages/python-xyz.scm (python-prompt-toolkit-1): Delete variable. (python2-prompt-toolkit-1): Likewise. --- gnu/packages/python-xyz.scm | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7628e918f0..5d633919ab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17956,20 +17956,6 @@ (define-public python-prompt-toolkit-2 (list python-wcwidth python-six python-pygments)) (properties '()))) -(define-public python-prompt-toolkit-1 - (package (inherit python-prompt-toolkit-2) - (version "1.0.15") - (source - (origin - (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version ".tar.gz")) - (sha256 - (base32 - "05v9h5nydljwpj5nm8n804ms0glajwfy1zagrzqrg91wk3qqi1c5")))))) - -(define-public python2-prompt-toolkit-1 - (package-with-python2 python-prompt-toolkit-1)) - (define-public python-jedi (package (name "python-jedi") -- cgit v1.2.3 From 0d21cf9f565f9dd7843fd0a12ce0c1724439a7a0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:48:51 -0400 Subject: gnu: Remove python2-xlib. * gnu/packages/python-xyz.scm (python2-xlib): Delete variable. --- 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 5d633919ab..e502626ddd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10528,9 +10528,6 @@ (define-public python-xlib low-level X clients. It is written entirely in Python.") (license license:gpl2+))) -(define-public python2-xlib - (package-with-python2 python-xlib)) - (define-public python-singledispatch (package (name "python-singledispatch") -- cgit v1.2.3 From b05d8d8bf30b08b2e20a65ded0194ad448483cad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:48:55 -0400 Subject: gnu: Remove python2-pysnptools. * gnu/packages/python-xyz.scm (python2-pysnptools): Delete variable. --- 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 e502626ddd..b9cb3343d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6849,9 +6849,6 @@ (define-public python-pysnptools operators such as union, intersection, and difference.") (license license:asl2.0))) -(define-public python2-pysnptools - (package-with-python2 python-pysnptools)) - (define-public python-pykdtree (package (name "python-pykdtree") -- cgit v1.2.3 From 3598e53ec934fb97ca70acec1ee6cb2b937b88a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:48:59 -0400 Subject: gnu: Remove python2-qrcode. * gnu/packages/python-xyz.scm (python2-qrcode): Delete variable. --- 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 b9cb3343d1..4d397fefae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19280,9 +19280,6 @@ (define-public python-qrcode console.") (license license:bsd-3))) -(define-public python2-qrcode - (package-with-python2 python-qrcode)) - (define-public python-rst2ansi (package (name "python-rst2ansi") -- cgit v1.2.3 From 487177f00eb961733af567350b2772bfeb69c7c6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:49:03 -0400 Subject: gnu: Remove python2-tabulate. * gnu/packages/python-xyz.scm (python2-tabulate): Delete variable. --- 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 4d397fefae..d5abea46f4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17113,9 +17113,6 @@ (define-public python-tabulate data in Python.") (license license:expat))) -(define-public python2-tabulate - (package-with-python2 python-tabulate)) - (define-public python-kazoo (package (name "python-kazoo") -- cgit v1.2.3 From 8c85b4ed8fc1fa4f4ab6dce7e492da4858a56e1d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:49:06 -0400 Subject: gnu: Remove python2-markdown. * gnu/packages/python-xyz.scm (python2-markdown): Delete variable. --- gnu/packages/python-xyz.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d5abea46f4..cbaae6c1a7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11448,21 +11448,8 @@ (define-public python-markdown Markdown. The library features international input, various Markdown extensions, and several HTML output formats. A command line wrapper markdown_py is also provided to convert Markdown files to HTML.") - (properties `((python2-variant . ,(delay python2-markdown)))) (license license:bsd-3))) -;; Markdown 3.2 dropped support for Python 2. -(define-public python2-markdown - (let ((base (package-with-python2 (strip-python2-variant python-markdown)))) - (package - (inherit base) - (version "3.1.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "Markdown" version)) - (sha256 - (base32 - "0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f"))))))) (define-public python-ptyprocess (package -- cgit v1.2.3 From 90dd2a406db42309e87048ede38601c0af8e6612 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:51:31 -0400 Subject: gnu: Remove python2-jsonpatch-0.4. * gnu/packages/python-xyz.scm (python2-jsonpatch-0.4): Delete variable. --- 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 cbaae6c1a7..972828c0c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20455,9 +20455,6 @@ (define-public python-jsonpatch-0.4 (base32 "1fq02y57kinyknxjcav0slcb0k9mwdffqw2hnlhdkpj7palh2mwk")))))) -(define-public python2-jsonpatch-0.4 - (package-with-python2 python-jsonpatch-0.4)) - (define-public python-rfc3986 (package (name "python-rfc3986") -- cgit v1.2.3 From 25632fa151c0a630ed82c3e63bda51eb0160a337 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:54:53 -0400 Subject: gnu: Remove python2-netifaces. * gnu/packages/python-xyz.scm (python2-netifaces): Delete variable. --- 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 972828c0c4..12fd7ddebb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9848,9 +9848,6 @@ (define-public python-netifaces interfaces in an easy and portable manner.") (license license:expat))) -(define-public python2-netifaces - (package-with-python2 python-netifaces)) - (define-public python-networkx (package (name "python-networkx") -- cgit v1.2.3 From 451681e2244b314afd24d7c80f6cf452a7d2778f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:54:56 -0400 Subject: gnu: Remove python2-pyinotify. * gnu/packages/python-xyz.scm (python2-pyinotify): Delete variable. --- 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 12fd7ddebb..e1acb9defb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22446,9 +22446,6 @@ (define-public python-pyinotify file system events on Linux.") (license license:expat))) -(define-public python2-pyinotify - (package-with-python2 python-pyinotify)) - (define-public python-more-itertools (package -- cgit v1.2.3 From 8e25d494a17e5a5dfa4591081686d6d394beaa4c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:55:11 -0400 Subject: gnu: Remove python2-msgpack. * gnu/packages/python-xyz.scm (python2-msgpack): Delete variable. --- 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 e1acb9defb..80c6dcb5e7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12006,9 +12006,6 @@ (define-public python-msgpack-transitional ((".fromstring\\(") ".frombytes(")) #t)))))))) -(define-public python2-msgpack - (package-with-python2 python-msgpack)) - (define-public python-netaddr (package (name "python-netaddr") -- cgit v1.2.3 From 5dce1d8b40cebd87ddaa2153828898a0264aa6fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:55:14 -0400 Subject: gnu: Remove python2-element-tree. * gnu/packages/python-xyz.scm (python2-element-tree): Delete variable. --- gnu/packages/python-xyz.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 80c6dcb5e7..30f0ad7c38 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2935,30 +2935,6 @@ (define-public python-empy commands.") (license license:lgpl2.1+))) -(define-public python2-element-tree - (package - (name "python2-element-tree") - (version "1.2.6") - (source (origin - (method url-fetch) - (uri (string-append - "http://effbot.org/media/downloads/elementtree-" - version "-20050316.tar.gz")) - (sha256 - (base32 - "016bphqnlg0l4vslahhw4r0aanw95bpypy65r1i1acyb2wj5z7dj")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 ; seems to be part of Python 3 - #:tests? #f)) ; no 'test' sub-command - (synopsis "Toolkit for XML processing in Python") - (description - "ElementTree is a Python library supporting lightweight XML processing.") - (home-page "https://effbot.org/zone/element-index.htm") - (license (license:x11-style - "http://docs.python.org/2/license.html" - "Like \"CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\".")))) - (define-public python-enum34 (package (name "python-enum34") -- cgit v1.2.3 From 37e8d6cd9ccafdca912bf11f74f029e07e7a2012 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:55:18 -0400 Subject: gnu: Remove python2-joblib. * gnu/packages/python-xyz.scm (python2-joblib): Delete variable. --- gnu/packages/python-xyz.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 30f0ad7c38..f205acc212 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4219,17 +4219,6 @@ (define-public python-joblib logging and tracing of the execution.") (license license:bsd-3))) -;; Newer versions of joblib don't support Python 2. -(define-public python2-joblib - (package - (inherit (package-with-python2 python-joblib)) - (version "0.14.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "joblib" version)) - (sha256 - (base32 - "1j464w137w6s367gl697j1l63g52akydrxgv4czlck36ynjfwc06")))))) (define-public python-daemon (package -- cgit v1.2.3 From ca01fd0084d0d76670209ea9bac3df18f397488a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:55:32 -0400 Subject: gnu: Remove python2-cram. * gnu/packages/python-xyz.scm (python2-cram): Delete variable. --- 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 f205acc212..081a455d04 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11501,9 +11501,6 @@ (define-public python-cram output.") (license license:gpl2+))) -(define-public python2-cram - (package-with-python2 python-cram)) - (define-public python-crccheck (package (name "python-crccheck") -- cgit v1.2.3 From ce6d29988816bb9e0c5f8da775405527f22f2e63 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:55:45 -0400 Subject: gnu: Remove python2-cloudpickle. * gnu/packages/python-xyz.scm (python2-cloudpickle): Delete variable. --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 081a455d04..ed0c6d22fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23754,30 +23754,8 @@ (define-public python-cloudpickle is especially useful for cluster computing where Python expressions are shipped over the network to execute on remote hosts, possibly close to the data.") - (properties `((python2-variant . ,(delay python2-cloudpickle)))) (license license:bsd-3))) -(define-public python2-cloudpickle - (let ((base (package-with-python2 (strip-python2-variant python-cloudpickle)))) - (package/inherit base - (version "1.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cloudpickle" version)) - (sha256 - (base32 - "0lx7gy9clp427qwcm7b23zdsldpr03gy3vxxhyi8fpbhwz859brq")))) - (native-inputs - `(;; For tests. - ("python-mock" ,python2-mock) - ("python-psutil" ,python2-psutil) - ("python-pytest" ,python2-pytest) - ("python-tornado" ,python2-tornado))) - (propagated-inputs - `(("python-futures" ,python2-futures) - ,@(package-propagated-inputs base)))))) - (define-public python-locket (package (name "python-locket") -- cgit v1.2.3 From 79884ad0da33455c9f2779800427015d47324e41 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:41 -0400 Subject: gnu: Remove python2-tldextract. * gnu/packages/python-xyz.scm (python2-tldextract): Delete variable. --- 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 ed0c6d22fb..57371a3bca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23069,9 +23069,6 @@ (define-public python-tldextract Public Suffix List's private domains as well.") (license license:bsd-3))) -(define-public python2-tldextract - (package-with-python2 python-tldextract)) - (define-public python-tldr (package (name "python-tldr") -- cgit v1.2.3 From be3db968b39b21bae0d24a6ff3457c7f5beabb87 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:45 -0400 Subject: gnu: Remove python2-notify2. * gnu/packages/python-xyz.scm (python2-notify2): Delete variable. --- 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 57371a3bca..231c0adeb9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9698,9 +9698,6 @@ (define-public python-notify2 (license (list license:bsd-2 license:lgpl2.1+)))) -(define-public python2-notify2 - (package-with-python2 python-notify2)) - ;; beautifulsoup4 has a totally different namespace than 3.x, ;; and pypi seems to put it under its own name, so I guess we should too (define-public python-beautifulsoup4 -- cgit v1.2.3 From 7d42c04f09804e8df9f277a13a7b1154cf0e3b3f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:48 -0400 Subject: gnu: Remove python2-pydiff. * gnu/packages/python-xyz.scm (python2-pydiff): Delete variable. --- 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 231c0adeb9..e5817d63b4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21097,9 +21097,6 @@ (define-public python-pydiff ignoring formatting changes.") (license license:expat))) -(define-public python2-pydiff - (package-with-python2 python-pydiff)) - (define-public python-pydub (package (name "python-pydub") -- cgit v1.2.3 From 2dc5af1fc9e4f851d99e496deca4214cab700659 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:52 -0400 Subject: gnu: Remove python2-parso. * gnu/packages/python-xyz.scm (python2-parso): Delete variable. --- 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 e5817d63b4..bb5ca24cdb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22526,9 +22526,6 @@ (define-public python-parso Parso is also able to list multiple syntax errors in your Python file.") (license license:expat))) -(define-public python2-parso - (package-with-python2 python-parso)) - (define-public python-async-generator (package (name "python-async-generator") -- cgit v1.2.3 From 3893e94b369302afcbcbadbb1d77dd2ee985ac98 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 22:59:58 -0400 Subject: gnu: Remove python2-vcversioner. * gnu/packages/python-xyz.scm (python2-vcversioner): Delete variable. --- 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 bb5ca24cdb..f4fbba3a4f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3590,9 +3590,6 @@ (define-public python-vcversioner (home-page "https://github.com/habnabit/vcversioner") (license license:isc))) -(define-public python2-vcversioner - (package-with-python2 python-vcversioner)) - (define-public python-jdcal (package (name "python-jdcal") -- cgit v1.2.3 From f137896cfda05ec3a6dc9251cb9cc885e601cafd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:02 -0400 Subject: gnu: Remove python2-extras. * gnu/packages/python-xyz.scm (python2-extras): Delete variable. --- 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 f4fbba3a4f..ef20e46128 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3165,9 +3165,6 @@ (define-public python-extras "Extras is a set of extensions to the Python standard library.") (license license:expat))) -(define-public python2-extras - (package-with-python2 python-extras)) - (define-public python-mimeparse (package (name "python-mimeparse") -- cgit v1.2.3 From 979af29d5c3db3b3a9671b122ccbbbec2a9e6c9f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:09 -0400 Subject: gnu: Remove python2-inflection. * gnu/packages/python-xyz.scm (python2-inflection): Delete variable. --- 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 ef20e46128..7cc84e5368 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17157,9 +17157,6 @@ (define-public python-inflection underscored string.") (license license:expat))) -(define-public python2-inflection - (package-with-python2 python-inflection)) - (define-public python-pylev (package (name "python-pylev") -- cgit v1.2.3 From ff70ce499bd391ddd4e09dc9186754ddde885cb7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:34 -0400 Subject: gnu: Remove python2-execnet. * gnu/packages/python-xyz.scm (python2-execnet): Delete variable. --- 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 7cc84e5368..d0b9c0201e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14652,9 +14652,6 @@ (define-public python-execnet (home-page "https://codespeak.net/execnet/") (license license:expat))) -(define-public python2-execnet - (package-with-python2 python-execnet)) - (define-public python-icalendar (package (name "python-icalendar") -- cgit v1.2.3 From 552076fddf9363fde88cfc4bec9d70d79ca589a2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:43 -0400 Subject: gnu: Remove python2-scientific. * gnu/packages/python-xyz.scm (python2-scientific): Delete variable. --- gnu/packages/python-xyz.scm | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d0b9c0201e..34a41cfec2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21652,45 +21652,6 @@ (define-public python2-pyro is the new Pyro version that is actively developed.") (license license:expat))) -(define-public python2-scientific - (package - (name "python2-scientific") - (version "2.9.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/khinsen/ScientificPython") - (commit (string-append "rel" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16l48aj9fps9r7jyk8gpxppwrv0fqvlc13sayxskz28r5s6sjwbl")))) - (build-system python-build-system) - (inputs - (list netcdf)) - (propagated-inputs - (list python2-numpy-1.8 python2-pyro)) - (arguments - ;; ScientificPython is not compatible with Python 3 - `(#:python ,python-2 - #:tests? #f ; No test suite - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda* (#:key inputs #:allow-other-keys) - (invoke "python" "setup.py" "build" - (string-append "--netcdf_prefix=" - (assoc-ref inputs "netcdf")))))))) - (home-page "http://dirac.cnrs-orleans.fr/ScientificPython") - (synopsis "Python modules for scientific computing") - (description "ScientificPython is a collection of Python modules that are -useful for scientific computing. Most modules are rather general (Geometry, -physical units, automatic derivatives, ...) whereas others are more -domain-specific (e.g. netCDF and PDB support). The library is currently -not actively maintained and works only with Python 2 and NumPy < 1.9.") - (license license:cecill-c))) - (define-public python-phonenumbers (package (name "python-phonenumbers") -- cgit v1.2.3 From 9549a466b89377b0f965e63b7133e2f411321953 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:47 -0400 Subject: gnu: Remove python2-automat. * gnu/packages/python-xyz.scm (python2-automat): Delete variable. --- 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 34a41cfec2..321ff5703e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19461,9 +19461,6 @@ (define-public python-automat transducers).") (license license:expat))) -(define-public python2-automat - (package-with-python2 python-automat)) - (define-public python-m2r (package (name "python-m2r") -- cgit v1.2.3 From a38349bc66efbb9f24213510ee0bf6240c673d90 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:54 -0400 Subject: gnu: Remove python2-mando. * gnu/packages/python-xyz.scm (python2-mando): Delete variable. --- 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 321ff5703e..67b485a480 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19867,9 +19867,6 @@ (define-public python-mando applications in seconds while maintaining all the flexibility.") (license license:expat))) -(define-public python2-mando - (package-with-python2 python-mando)) - (define-public python-mwclient (package (name "python-mwclient") -- cgit v1.2.3 From 9d9855f6b839d2cba9e537a06255c15656f4059f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:00:58 -0400 Subject: gnu: Remove python2-pexpect. * gnu/packages/python-xyz.scm (python2-pexpect): Delete variable. --- 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 67b485a480..3025300a8e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8222,9 +8222,6 @@ (define-public python-pexpect child application and control it as if a human were typing commands.") (license license:isc))) -(define-public python2-pexpect - (package-with-python2 python-pexpect)) - (define-public python-setuptools-scm (package (name "python-setuptools-scm") -- cgit v1.2.3 From 5afc4b537e70ad969f9e240a51c0cefab2db91cc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:01 -0400 Subject: gnu: Remove python2-couleur. * gnu/packages/python-xyz.scm (python2-couleur): Delete variable. --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3025300a8e..b831c864d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20272,32 +20272,6 @@ (define-public python-sure (define-public python2-sure (package-with-python2 python-sure)) -(define-public python2-couleur - ;; This package does not seem to support python3 at all, hence, - ;; only the python2 variant definition is provided. - (package - (name "python2-couleur") - (version "0.6.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "couleur" version)) - (sha256 - (base32 - "1qqaxyqz74wvid0cr119dhcwz0h0if5b5by44zl49pd5z65v58k1")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://github.com/gabrielfalcao/couleur") - (synopsis - "ANSI terminal tool for python, colored shell and other handy fancy features") - (description - "@code{Couleur} provides python programs a way to use the ANSI features in a unix - terminal such as coloured output in the shell, overwriting output, indentation, etc.") - ;; README.md says ASL2.0, but all source code headers are LGPL3+. - ;; https://github.com/gabrielfalcao/couleur/issues/11 - (license license:lgpl3+))) - (define-public python-misaka (package (name "python-misaka") -- cgit v1.2.3 From 15558b09beed1ff84464384706ee2c8fd18913c0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:05 -0400 Subject: gnu: Remove python2-dogtail. * gnu/packages/python-xyz.scm (python2-dogtail): Delete variable. --- 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 b831c864d1..0623e4fdd3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2902,9 +2902,6 @@ (define-public python-dogtail other Python program.") (license license:gpl2+))) -(define-public python2-dogtail - (package-with-python2 python-dogtail)) - (define-public python-empy (package (name "python-empy") -- cgit v1.2.3 From 5478ffa1ba8dee7548fe558fca18cfa742e22c6e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:08 -0400 Subject: gnu: Remove python2-magic. * gnu/packages/python-xyz.scm (python2-magic): Delete variable. --- 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 0623e4fdd3..c41eaae45f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16474,9 +16474,6 @@ (define-public python-magic the same purpose: to provide Python bindings for libmagic.") (license license:expat))) -(define-public python2-magic - (package-with-python2 python-magic)) - (define-public python-pkgconfig (package (name "python-pkgconfig") -- cgit v1.2.3 From e0996a01534c7a5c1c0cc7afdc29d07134b47a54 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:21 -0400 Subject: gnu: Remove python2-fusepy. * gnu/packages/python-xyz.scm (python2-fusepy): Delete variable. --- 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 c41eaae45f..dddc463228 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22662,9 +22662,6 @@ (define-public python-fusepy MacFUSE. The binding is created using the standard @code{ctypes} library.") (license license:isc))) -(define-public python2-fusepy - (package-with-python2 python-fusepy)) - (define-public python-fusepyng (package (name "python-fusepyng") -- cgit v1.2.3 From 05f8ac96551bf7eb257721b4ee8d94505d9cc6f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:24 -0400 Subject: gnu: Remove python2-wrapt. * gnu/packages/python-xyz.scm (python2-wrapt): Delete variable. --- 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 dddc463228..cf20324592 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12032,9 +12032,6 @@ (define-public python-wrapt wrappers and decorator functions.") (license license:bsd-2))) -(define-public python2-wrapt - (package-with-python2 python-wrapt)) - (define-public python-commentjson (package (name "python-commentjson") -- cgit v1.2.3 From e6e55d7efb25f48cd90da2331c232076af542658 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:37 -0400 Subject: gnu: Remove python2-pyasn1-modules. * gnu/packages/python-xyz.scm (python2-pyasn1-modules): Delete variable. --- 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 cf20324592..5edeef44f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12678,9 +12678,6 @@ (define-public python-pyasn1-modules implementations of ASN.1-based codecs and protocols.") (license license:bsd-3))) -(define-public python2-pyasn1-modules - (package-with-python2 python-pyasn1-modules)) - (define-public python-ipaddress (package (name "python-ipaddress") -- cgit v1.2.3 From c80cd05540493c06abebbbcb86ce1dbe278cfc88 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:01:57 -0400 Subject: gnu: Remove python2-xlrd. * gnu/packages/python-xyz.scm (python2-xlrd): Delete variable. --- 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 5edeef44f0..ce12ac2ded 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12185,9 +12185,6 @@ (define-public python-xlrd Unicode-aware. It is not intended as an end-user tool.") (license license:bsd-3))) -(define-public python2-xlrd - (package-with-python2 python-xlrd)) - ;;; Note: this package is unmaintained since 2018 (archived on GitHub). (define-public python-xlwt (package -- cgit v1.2.3 From fc06b4cbd699776042bf5ba59b17861f65e95c3a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:03 -0400 Subject: gnu: Remove python2-h5py. * gnu/packages/python-xyz.scm (python2-h5py): Delete variable. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ce12ac2ded..c4c62fa50f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1523,21 +1523,7 @@ (define-public python-h5py complete wrapping of the HDF5 API, while the high-level component supports access to HDF5 files, datasets and groups using established Python and NumPy concepts.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-h5py)))))) - -(define-public python2-h5py - (let ((base (package-with-python2 (strip-python2-variant python-h5py)))) - (package - (inherit base) - (version "2.10.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "h5py" version)) - (sha256 - (base32 - "0baipzv8n93m0dq0riyi8rfhzrjrfrfh8zqhszzp1j2xjac2fhc4"))))))) + (license license:bsd-3))) (define-public python-hnswlib (package -- cgit v1.2.3 From b5891dab65e853e12382167b1126756fe3de96b7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:11 -0400 Subject: gnu: Remove python2-colorama. * gnu/packages/python-xyz.scm (python2-colorama): Delete variable. --- 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 c4c62fa50f..d7cd2dbcaf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14944,9 +14944,6 @@ (define-public python-colorama (home-page "https://pypi.org/project/colorama/") (license license:bsd-3))) -(define-public python2-colorama - (package-with-python2 python-colorama)) - ;; awscli and botocore do not accept version 0.4.4 (define-public python-colorama-for-awscli (package -- cgit v1.2.3 From dd10d66a4c06f4affc209637cc7b006c60de5a74 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:15 -0400 Subject: gnu: Remove python2-flake8-polyfill. * gnu/packages/python-xyz.scm (python2-flake8-polyfill): Delete variable. --- 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 d7cd2dbcaf..cf26c2d4ae 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11162,9 +11162,6 @@ (define-public python-flake8-polyfill plugins that intend to support Flake8 2.x and 3.x simultaneously.") (license license:expat))) -(define-public python2-flake8-polyfill - (package-with-python2 python-flake8-polyfill)) - (define-public python-flake8-print (package (name "python-flake8-print") -- cgit v1.2.3 From 7f3aec372a6122ad06d3f8ac620e101891a6f4c3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:24 -0400 Subject: gnu: Remove python2-elib.intl. * gnu/packages/python-xyz.scm (python2-elib.intl): Delete variable. --- gnu/packages/python-xyz.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cf26c2d4ae..93100f6366 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7097,34 +7097,6 @@ (define-public python-distutils-extra Python's distutils.") (license license:gpl2))) -(define-public python2-elib.intl - (package - (name "python2-elib.intl") - (version "0.0.3") - (source - (origin - ;; This project doesn't tag releases or publish tarballs, so we take - ;; source from a (semi-arbitrary, i.e. latest as of now) git commit. - (method git-fetch) - (uri (git-reference - (url "https://github.com/dieterv/elib.intl") - (commit "d09997cfef"))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0y7vzff9xgbnaay7m0va1arl6g68ncwrvbgwl7jqlclsahzzb09d")))) - (build-system python-build-system) - (arguments - ;; incompatible with Python 3 (exception syntax) - `(#:python ,python-2 - #:tests? #f)) - (home-page "https://github.com/dieterv/elib.intl") - (synopsis "Enhanced internationalization for Python") - (description - "The elib.intl module provides enhanced internationalization (I18N) -services for your Python modules and applications.") - (license license:lgpl3+))) - (define-public python-olefile (package (name "python-olefile") -- cgit v1.2.3 From 25ed723d5e0ebbbad84271ed9b6cf723cc67cff6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:44 -0400 Subject: gnu: Remove python2-pyroute2. * gnu/packages/python-xyz.scm (python2-pyroute2): Delete variable. --- gnu/packages/python-xyz.scm | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 93100f6366..b535610245 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11928,41 +11928,6 @@ (define-public python-netaddr and MAC network addresses.") (license license:bsd-3))) -(define-public python2-pyroute2 - (package - (name "python2-pyroute2") - (version "0.5.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyroute2" version)) - (sha256 - (base32 - "1gmz4r1w0yzj6fjjypnalmfyy0lnfznydyn62gi3wk50j5hhxbny")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) ;Python 3.x is not supported - (home-page "https://github.com/svinota/pyroute2") - (synopsis "Python netlink library") - (description - "Pyroute2 is a pure Python netlink library with minimal dependencies. -Supported netlink families and protocols include: -@itemize -@item rtnl, network settings - addresses, routes, traffic controls -@item nfnetlink - netfilter API: ipset, nftables, ... -@item ipq - simplest userspace packet filtering, iptables QUEUE target -@item devlink - manage and monitor devlink-enabled hardware -@item generic - generic netlink families - @itemize - @item nl80211 - wireless functions API (basic support) - @item taskstats - extended process statistics - @item acpi_events - ACPI events monitoring - @item thermal_events - thermal events monitoring - @item VFS_DQUOT - disk quota events monitoring - @end itemize -@end itemize") - (license license:gpl2+))) - (define-public python-wrapt (package (name "python-wrapt") -- cgit v1.2.3 From 16ccac5a1b43300e1dacdbc6cb02390633a80cc4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:47 -0400 Subject: gnu: Remove python2-psutil. * gnu/packages/python-xyz.scm (python2-psutil): Delete variable. --- gnu/packages/python-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b535610245..0637ca81b2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1118,16 +1118,8 @@ (define-public python-psutil It implements many functionalities offered by command line tools such as: ps, top, lsof, netstat, ifconfig, who, df, kill, free, nice, ionice, iostat, iotop, uptime, pidof, tty, taskset, pmap.") - (properties `((python2-variant . ,(delay python2-psutil)))) (license license:bsd-3))) -(define-public python2-psutil - (let ((base (package-with-python2 (strip-python2-variant python-psutil)))) - (package/inherit base - (propagated-inputs - `(("python2-enum34" ,python2-enum34) ;optional - ,@(package-propagated-inputs base)))))) - (define-public python-shapely (package (name "python-shapely") -- cgit v1.2.3 From 3143a4166eefb7c870154625fa680561f09e838a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:54 -0400 Subject: gnu: Remove python2-tempdir. * gnu/packages/python-xyz.scm (python2-tempdir): Delete variable. --- 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 0637ca81b2..b2d74108d2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21322,9 +21322,6 @@ (define-public python-tempdir particularly convenient for use in tests.") (license license:expat))) -(define-public python2-tempdir - (package-with-python2 python-tempdir)) - (define-public python-tempora (package (name "python-tempora") -- cgit v1.2.3 From 061d33df7304e08125b91a3ae8e53ab56575296c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:02:58 -0400 Subject: gnu: Remove python2-djvulibre. * gnu/packages/python-xyz.scm (python2-djvulibre): Delete variable. --- 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 b2d74108d2..f0c71d0726 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27400,9 +27400,6 @@ (define-public python-djvulibre (home-page "https://jwilk.net/software/python-djvulibre") (license license:gpl2))) -(define-public python2-djvulibre - (package-with-python2 python-djvulibre)) - (define-public python-versioneer (package (name "python-versioneer") -- cgit v1.2.3 From c8638b6db6437eb4ed323a1ae411eb21b5c79b8c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:17 -0400 Subject: gnu: Remove python2-urwidtrees. * gnu/packages/python-xyz.scm (python2-urwidtrees): Delete variable. --- 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 f0c71d0726..161042124a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9486,9 +9486,6 @@ (define-public python-urwidtrees toolkit. Use it to build trees of widgets.") (license license:gpl3+))) -(define-public python2-urwidtrees - (package-with-python2 python-urwidtrees)) - (define-public python-ua-parser (package (name "python-ua-parser") -- cgit v1.2.3 From d0d907dff8e6684d0d15e4567757fb3c41ae6564 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:30 -0400 Subject: gnu: Remove python2-clyent. * gnu/packages/python-xyz.scm (python2-clyent): Delete variable. --- 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 161042124a..a4392bcd15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1242,9 +1242,6 @@ (define-public python-clyent by @code{binstar}, @code{binstar-build}, and @code{chalmers}.") (license license:bsd-3))) -(define-public python2-clyent - (package-with-python2 python-clyent)) - (define-public python-babel (package (name "python-babel") -- cgit v1.2.3 From 745be53c5f6bdbd221e6e3f33e04e5016b7c7c15 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:36 -0400 Subject: gnu: Remove python2-constantly. * gnu/packages/python-xyz.scm (python2-constantly): Delete variable. --- 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 a4392bcd15..99c3e8d1ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19388,9 +19388,6 @@ (define-public python-constantly and bit flag values.") (license license:expat))) -(define-public python2-constantly - (package-with-python2 python-constantly)) - (define-public python-attrs (package (name "python-attrs") -- cgit v1.2.3 From 9702e5f26cf4bac6ceb909c271d39c6889e52663 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:42 -0400 Subject: gnu: Remove python2-pep517. * gnu/packages/python-xyz.scm (python2-pep517): Delete variable. --- gnu/packages/python-xyz.scm | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 99c3e8d1ac..a6b36ea44a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10807,30 +10807,15 @@ (define-public python-pep517 (inherit python-pep517-bootstrap) (name "python-pep517") (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (delete-file "pytest.ini") - ;; This test tries to connect to the internet - (delete-file "tests/test_meta.py") - (if tests? - (invoke "pytest") - #t)))))) - (native-inputs - (list python-mock python-pytest python-testpath)) - (properties `((python2-variant . ,(delay python2-pep517)))))) + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (delete-file "pytest.ini") + (delete-file "tests/test_meta.py") + (if tests? + (invoke "pytest") #t)))))) + (native-inputs (list python-mock python-pytest python-testpath)))) -;; Skip the tests so we don't create a cyclical dependency with pytest. -(define-public python2-pep517 - (let ((base (package-with-python2 - (strip-python2-variant python-pep517)))) - (package/inherit base - (name "python2-pep517") - (arguments - `(#:tests? #f - ,@(package-arguments base))) - (native-inputs `())))) (define-public python-pep621 (package -- cgit v1.2.3 From 5f33d83bf820e3284c1cc72686bd041033ffa4d6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:45 -0400 Subject: gnu: Remove python2-q. * gnu/packages/python-xyz.scm (python2-q): Delete variable. --- 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 a6b36ea44a..eb543ac5b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10376,9 +10376,6 @@ (define-public python-q falling into the Python interpreter.") (license license:asl2.0))) -(define-public python2-q - (package-with-python2 python-q)) - (define-public python-xlib (package (name "python-xlib") -- cgit v1.2.3 From 27bdd10b92bee9db0e590e46eec42757478bedc4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:51 -0400 Subject: gnu: Remove python2-rst.linker. * gnu/packages/python-xyz.scm (python2-rst.linker): Delete variable. --- 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 eb543ac5b6..ff905a09eb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5125,9 +5125,6 @@ (define-public python-rst.linker augment the changelog, but it can be used for other documents, too.") (license license:expat))) -(define-public python2-rst.linker - (package-with-python2 python-rst.linker)) - (define-public python-sshpubkeys (package (name "python-sshpubkeys") -- cgit v1.2.3 From f64aac1e4ae04d00de88736b92349c8361e4995e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:03:54 -0400 Subject: gnu: Remove python2-pathlib. * gnu/packages/python-xyz.scm (python2-pathlib): Delete variable. --- 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 ff905a09eb..7f00cefe2a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16093,9 +16093,6 @@ (define-public python-pathlib anymore.") (license license:expat))) -(define-public python2-pathlib - (package-with-python2 python-pathlib)) - (define-public python2-pathlib2 (package (name "python2-pathlib2") -- cgit v1.2.3 From b95b97530565cd6a604c03089b54f5f328a54e28 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:04:10 -0400 Subject: gnu: Remove python2-whoosh. * gnu/packages/python-xyz.scm (python2-whoosh): Delete variable. --- gnu/packages/python-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7f00cefe2a..5b4861266b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16007,14 +16007,6 @@ (define-public python-whoosh checking library.") (license license:bsd-2))) -(define-public python2-whoosh - (let ((whoosh (package-with-python2 (strip-python2-variant python-whoosh)))) - (package/inherit whoosh - (propagated-inputs - `(("python2-backport-ssl-match-hostname" - ,python2-backport-ssl-match-hostname) - ,@(package-propagated-inputs whoosh)))))) - (define-public python-codespell (package (name "python-codespell") -- cgit v1.2.3 From ddd1154db6c4384339d510cf4cfb853eeefec37a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:04:19 -0400 Subject: gnu: Remove python2-openpyxl. * gnu/packages/python-xyz.scm (python2-openpyxl): Delete variable. --- gnu/packages/python-xyz.scm | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5b4861266b..2f2c960656 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2565,37 +2565,16 @@ (define-public python-openpyxl (replace 'check (lambda _ (invoke "pytest")))))) - (native-inputs - ;; For the test suite. - (list python-lxml python-pillow python-pytest)) - (propagated-inputs - (list python-et-xmlfile python-jdcal)) + (native-inputs (list python-lxml python-pillow python-pytest)) + (propagated-inputs (list python-et-xmlfile python-jdcal)) (home-page "https://openpyxl.readthedocs.io") (synopsis "Python library to read/write Excel 2010 XLSX/XLSM files") - (description "This Python library allows reading and writing to the Excel XLSX, XLSM, + (description + "This Python library allows reading and writing to the Excel XLSX, XLSM, XLTX and XLTM file formats that are defined by the Office Open XML (OOXML) standard.") - (properties `((python2-variant . ,(delay python2-openpyxl)))) (license license:expat))) -(define-public python2-openpyxl - (let ((base (package-with-python2 - (strip-python2-variant python-openpyxl)))) - (package - (inherit base) - ;; This is the latest version that has python2 support - (version "2.6.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "openpyxl" version)) - (sha256 - (base32 - "1qzjj8nwj4dn0mhq1j64f136afiqqb81lvqiikipz3g1g0b80lqx")))) - (arguments - `(#:python ,python-2 - #:tests? #f))))) ; No test suite. - (define-public python-eventlet (package (name "python-eventlet") -- cgit v1.2.3 From 76cebcc03dd563aca4c62ac74f14512a3c0fd18e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:04:25 -0400 Subject: gnu: Remove python2-validate-email. * gnu/packages/python-xyz.scm (python2-validate-email): Delete variable. --- 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 2f2c960656..e694ba0feb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20437,9 +20437,6 @@ (define-public python-validate-email address is valid and really exists.") (license license:lgpl3+))) -(define-public python2-validate-email - (package-with-python2 python-validate-email)) - (define-public python-flex (package (name "python-flex") -- cgit v1.2.3 From abb9adfff89d33415b53ef758e6323bc1de46330 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:04:36 -0400 Subject: gnu: Remove python2-setproctitle. * gnu/packages/python-xyz.scm (python2-setproctitle): Delete variable. --- gnu/packages/python-xyz.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e694ba0feb..cd60cd201d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18580,15 +18580,7 @@ (define-public python-setproctitle example when a master process is forked: changing the children's title allows identifying the task each process is busy with. The technique is used by PostgreSQL and the OpenSSH Server for example.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-setproctitle)))))) - -(define-public python2-setproctitle - (let ((base (package-with-python2 - (strip-python2-variant python-setproctitle)))) - (package/inherit base - (native-inputs `(("python2-nose" ,python2-nose) - ,@(package-native-inputs base)))))) + (license license:bsd-3))) (define-public python-validictory (package -- cgit v1.2.3 From 748f3ef4834364df041f6b385caa615af8889a58 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:04:44 -0400 Subject: gnu: Remove python2-fuzzywuzzy. * gnu/packages/python-xyz.scm (python2-fuzzywuzzy): Delete variable. --- 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 cd60cd201d..ca0d483e34 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25610,9 +25610,6 @@ (define-public python-fuzzywuzzy sequences.") (license license:gpl2))) -(define-public python2-fuzzywuzzy - (package-with-python2 python-fuzzywuzzy)) - (define-public python-block-tracing (package (name "python-block-tracing") -- cgit v1.2.3 From 4087be253b2b60c5bc73ebf6a931a03e8e5041b2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:05:33 -0400 Subject: gnu: Remove python2-schema-0.5. * gnu/packages/python-xyz.scm (python2-schema-0.5): Delete variable. --- 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 ca0d483e34..9f00dbc889 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3651,9 +3651,6 @@ (define-public python-schema-0.5 (base32 "10zqvpaky51kgb8nd42bk7jwl8cn2zvayxjpdc1wwmpybj92x67s")))))) -(define-public python2-schema-0.5 - (package-with-python2 python-schema-0.5)) - (define-public python-kitchen (package (name "python-kitchen") -- cgit v1.2.3 From 810f12114a33dad2b833ea90a59935138d6b8252 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:08:40 -0400 Subject: gnu: Remove python2-pyro. * gnu/packages/python-xyz.scm (python2-pyro): Delete variable. --- gnu/packages/python-xyz.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f00dbc889..6b2e233165 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21403,35 +21403,6 @@ (define-public python-pyro4 objects on other machines, also known as remote procedure calls (RPC).") (license license:expat))) -(define-public python2-pyro - (package - (name "python2-pyro") - (version "3.16") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Pyro" version)) - (file-name (string-append "Pyro-" version ".tar.gz")) - (sha256 - (base32 - "0y75wzdqbjy565rpxaxscav4j8xg060sa90lnmb7aypgaf251v8v")))) - (build-system python-build-system) - (arguments - ;; Pyro is not compatible with Python 3 - `(#:python ,python-2 - ;; Pyro has no test cases for automatic execution - #:tests? #f)) - (home-page "https://pythonhosted.org/Pyro/") - (synopsis "Distributed object manager for Python") - (description "Pyro is a Distributed Object Technology system -written in Python that is designed to be easy to use. It resembles -Java's Remote Method Invocation (RMI). It has less similarity to CORBA, -which is a system and language independent Distributed Object Technology -and has much more to offer than Pyro or RMI. Pyro 3.x is no -longer maintained. New projects should use Pyro4 instead, which -is the new Pyro version that is actively developed.") - (license license:expat))) - (define-public python-phonenumbers (package (name "python-phonenumbers") -- cgit v1.2.3 From 53ef4cc4048817656506b06c53b6e9fee196361a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:08:44 -0400 Subject: gnu: Remove python2-lazy-object-proxy. * gnu/packages/python-xyz.scm (python2-lazy-object-proxy): Delete variable. --- 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 6b2e233165..11f2433067 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17382,9 +17382,6 @@ (define-public python-lazy-object-proxy until the object is actually required, and caches the result of said call.") (license license:bsd-2))) -(define-public python2-lazy-object-proxy - (package-with-python2 python-lazy-object-proxy)) - (define-public python-dnspython (package (name "python-dnspython") -- cgit v1.2.3 From 242d07cad01b267792b9f39b2002e80975401c7f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:08:59 -0400 Subject: gnu: Remove python2-astor. * gnu/packages/python-xyz.scm (python2-astor): Delete variable. --- 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 11f2433067..0ff7913538 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23776,9 +23776,6 @@ (define-public python-astor source via the Abstract Syntax Tree.") (license license:bsd-3))) -(define-public python2-astor - (package-with-python2 python-astor)) - (define-public python-astunparse (package (name "python-astunparse") -- cgit v1.2.3 From 01bbf6fd67e2c609f5630362a1e895c2c5ea863b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:09:03 -0400 Subject: gnu: Remove python2-requests-file. * gnu/packages/python-xyz.scm (python2-requests-file): Delete variable. --- 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 0ff7913538..a2d1ef9b31 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22688,9 +22688,6 @@ (define-public python-requests-file library to allow local file system access via @code{file://} URLs.") (license license:asl2.0))) -(define-public python2-requests-file - (package-with-python2 python-requests-file)) - (define-public python-identify (package (name "python-identify") -- cgit v1.2.3 From 6b3cd3c779a6181cbb0a99098ab05bb859ec6b85 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:09:29 -0400 Subject: gnu: Remove python2-backports-abc. * gnu/packages/python-xyz.scm (python2-backports-abc): Delete variable. --- 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 a2d1ef9b31..8b12d9b913 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10431,9 +10431,6 @@ (define-public python-backports-abc @code{collections.abc} module in Python-3.5.") (license license:psfl))) -(define-public python2-backports-abc - (package-with-python2 python-backports-abc)) - (define-public python-backports-csv (package (name "python-backports-csv") -- cgit v1.2.3 From fb081632a33e1fa70ea9ace25881fe2147f962aa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:09:46 -0400 Subject: gnu: Remove python2-singledispatch. * gnu/packages/python-xyz.scm (python2-singledispatch): Delete variable. --- 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 8b12d9b913..e22ff9dc9e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10408,9 +10408,6 @@ (define-public python-singledispatch 2.6-3.3.") (license license:expat))) -(define-public python2-singledispatch - (package-with-python2 python-singledispatch)) - ;; the python- version can be removed with python-3.5 (define-public python-backports-abc (package -- cgit v1.2.3 From a5071d3ab93c545a1e3c827de559e8fc30934ed0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:10:03 -0400 Subject: gnu: Remove python2-waf. * gnu/packages/python-xyz.scm (python2-waf): Delete variable. --- 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 e22ff9dc9e..30c2540dd9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10529,9 +10529,6 @@ (define-public python-waf applications.") (license license:bsd-3))) -(define-public python2-waf - (package-with-python2 python-waf)) - (define-public python-pyzmq (package (name "python-pyzmq") -- cgit v1.2.3 From cff40b61c2639e657b9ad0e6438a0e8bca6dd5ce Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:10:12 -0400 Subject: gnu: Remove python2-pyrsistent. * gnu/packages/python-xyz.scm (python2-pyrsistent): Delete variable. --- 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 30c2540dd9..7da5570a90 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3373,9 +3373,6 @@ (define-public python-pyrsistent structure is left untouched.") (license license:expat))) -(define-public python2-pyrsistent - (package-with-python2 python-pyrsistent)) - (define-public python-exif-read (package (name "python-exif-read") -- cgit v1.2.3 From 09fb006f8694aa6aec493e01efa65296545d6713 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:10:28 -0400 Subject: gnu: Remove python2-sure. * gnu/packages/python-xyz.scm (python2-sure): Delete variable. --- 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 7da5570a90..3c4f2815ed 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20075,9 +20075,6 @@ (define-public python-sure Sure is heavily inspired by @code{RSpec Expectations} and @code{should.js}.") (license license:gpl3+))) -(define-public python2-sure - (package-with-python2 python-sure)) - (define-public python-misaka (package (name "python-misaka") -- cgit v1.2.3 From a5815cc1bb59d028bfa4bacb65b735df8d5367ab Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:10:36 -0400 Subject: gnu: Remove python2-attrs. * gnu/packages/python-xyz.scm (python2-attrs): Delete variable. --- 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 3c4f2815ed..3f62b0f3b2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19336,9 +19336,6 @@ (define-public python-attrs protocols.") (license license:expat))) -(define-public python2-attrs - (package-with-python2 python-attrs)) - (define-public python-attrs-bootstrap (package (inherit python-attrs) -- cgit v1.2.3 From b8859d30b7453621a53520fb93421d7ceccb87ee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:10:41 -0400 Subject: gnu: Remove python2-pkgconfig. * gnu/packages/python-xyz.scm (python2-pkgconfig): Delete variable. --- 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 3f62b0f3b2..6c1cc59035 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16336,9 +16336,6 @@ (define-public python-pkgconfig LDFLAGS and parse the output to build extensions with setup.py.") (license license:expat))) -(define-public python2-pkgconfig - (package-with-python2 python-pkgconfig)) - (define-public python-bz2file (package (name "python-bz2file") -- cgit v1.2.3 From 9b0da239eb58f0649d6db2641b05922579882df8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:10:44 -0400 Subject: gnu: Remove python2-pbkdf2. * gnu/packages/python-xyz.scm (python2-pbkdf2): Delete variable. --- 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 6c1cc59035..5ff4491d3f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18976,9 +18976,6 @@ (define-public python-pbkdf2 a file-like object from which an arbitrarily-sized key can be read.") (license license:expat))) -(define-public python2-pbkdf2 - (package-with-python2 python-pbkdf2)) - (define-public python-qrcode (package (name "python-qrcode") -- cgit v1.2.3 From c3a8ee49bc924fdeec6b5258c573e93231e2d0bd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:11:02 -0400 Subject: gnu: Remove python2-pylzma. * gnu/packages/python-xyz.scm (python2-pylzma): Delete variable. --- 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 5ff4491d3f..1342bb10a8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24207,9 +24207,6 @@ (define-public python-pylzma by Igor Pavlov.") (license license:lgpl2.1+))) -(define-public python2-pylzma - (package-with-python2 python-pylzma)) - (define-public python-ifaddr (package (name "python-ifaddr") -- cgit v1.2.3 From 08063afd31562f71b7b3e12c270ab46230fa9b6a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:11:08 -0400 Subject: gnu: Remove python2-futures. * gnu/packages/python-xyz.scm (python2-futures): Delete variable. --- gnu/packages/python-xyz.scm | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1342bb10a8..7d8eb7c2ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14687,35 +14687,6 @@ (define-public python2-subprocess32 otherwise matches 3.2’s API.") (license license:psfl))) -(define-public python2-futures - (package - (name "python2-futures") - (version "3.2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "futures" version)) - (sha256 - (base32 - "0rdjmmsab550kxsssdq49jcniz77zlkpw4pvi9hvib3lsskjmh4y")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "python" "test_futures.py") - #t))))) - (home-page "https://github.com/agronholm/pythonfutures") - (synopsis - "Backport of the concurrent.futures package from Python 3.2") - (description - "The concurrent.futures module provides a high-level interface for -asynchronously executing callables. This package backports the -concurrent.futures package from Python 3.2") - (license license:bsd-3))) - (define-public python-promise (package (name "python-promise") -- cgit v1.2.3 From 0438c799af9190fe1c9b9323a50990668e7f06b6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:11:15 -0400 Subject: gnu: Remove python2-et-xmlfile. * gnu/packages/python-xyz.scm (python2-et-xmlfile): Delete variable. --- 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 7d8eb7c2ea..41fd1efe31 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2541,9 +2541,6 @@ (define-public python-et-xmlfile of @code{xmlfile}.") (license license:expat))) -(define-public python2-et-xmlfile - (package-with-python2 python-et-xmlfile)) - (define-public python-openpyxl (package (name "python-openpyxl") -- cgit v1.2.3 From 3beeb2a8191f3982ba7032879cb68881d689bc28 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:11:24 -0400 Subject: gnu: Remove python2-m2r. * gnu/packages/python-xyz.scm (python2-m2r): Delete variable. --- 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 41fd1efe31..b7b04f2445 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19250,9 +19250,6 @@ (define-public python-m2r reST format.") (license license:expat))) -(define-public python2-m2r - (package-with-python2 python-m2r)) - (define-public python-constantly (package (name "python-constantly") -- cgit v1.2.3 From 85af3513d7ce18c4d34e8e661ebe96d6790fda28 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:11:34 -0400 Subject: gnu: Remove python2-jdcal. * gnu/packages/python-xyz.scm (python2-jdcal): Delete variable. --- 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 b7b04f2445..a6e2eeaf43 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3557,9 +3557,6 @@ (define-public python-jdcal between Julian dates and Gregorian dates.") (license license:bsd-2))) -(define-public python2-jdcal - (package-with-python2 python-jdcal)) - (define-public python-jsondiff (package (name "python-jsondiff") -- cgit v1.2.3 From b684e7c82771fd249daa82bac3ff64f5c13ec10f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:11:53 -0400 Subject: gnu: Remove python2-rfc3987. * gnu/packages/python-xyz.scm (python2-rfc3987): Delete variable. --- 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 a6e2eeaf43..896d26f7db 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20162,9 +20162,6 @@ (define-public python-rfc3987 validation of URIs (see RFC 3986) and IRIs (see RFC 3987).") (license license:gpl3+))) -(define-public python2-rfc3987 - (package-with-python2 python-rfc3987)) - ;; The latest commit contains fixes for building with both python3 and python2. (define-public python-rfc6555 (let ((commit "1a181b432312731f6742a5eb558dae4761d32361") -- cgit v1.2.3 From 9c4efa2f1148a0ed1ff9e50b19f48567c4859f94 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:14 -0400 Subject: gnu: Remove python2-jsonpointer. * gnu/packages/python-xyz.scm (python2-jsonpointer): Delete variable. --- 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 896d26f7db..557997a0d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20075,9 +20075,6 @@ (define-public python-jsonpointer by path in a JSON document (see RFC 6901).") (license license:bsd-3))) -(define-public python2-jsonpointer - (package-with-python2 python-jsonpointer)) - (define-public python-jsonpatch (package (name "python-jsonpatch") -- cgit v1.2.3 From 862f56e8cb07df8c919ca641de9604294621efa4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:17 -0400 Subject: gnu: Remove python2-semantic-version. * gnu/packages/python-xyz.scm (python2-semantic-version): Delete variable. --- 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 557997a0d8..5d9a714dc0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1852,9 +1852,6 @@ (define-public python-semantic-version version identifier.") (license license:bsd-3))) -(define-public python2-semantic-version - (package-with-python2 python-semantic-version)) - (define-public python-serpent (package (name "python-serpent") -- cgit v1.2.3 From 2f049c3ac40a56631b6de740f8ae729114420a82 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:26 -0400 Subject: gnu: Remove python2-stemming. * gnu/packages/python-xyz.scm (python2-stemming): Delete variable. --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d9a714dc0..b1918cd299 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19794,29 +19794,6 @@ (define-public python-scandir (define-public python2-scandir (package-with-python2 python-scandir)) -(define-public python2-stemming - (package - (name "python2-stemming") - (version "1.0.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "stemming" version)) - (sha256 - (base32 "0ldwa24gnnxhniv0fhygkpc2mwgd93q10ag8rvzayv6hw418frsr")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (home-page "https://bitbucket.org/mchaput/stemming/overview") - (synopsis "Python implementations of various stemming algorithms") - (description - "Python implementations of the Porter, Porter2, Paice-Husk, and Lovins - stemming algorithms for English. These implementations are straightforward and - efficient, unlike some Python versions of the same algorithms available on the - Web. This package is an extraction of the stemming code included in the Whoosh - search engine.") - (license license:public-domain))) - (define-public python-factory-boy (package (name "python-factory-boy") -- cgit v1.2.3 From 722fb58519fbd40fc1d4fabb7eb3845950ce7414 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:29 -0400 Subject: gnu: Remove python2-pep8. * gnu/packages/python-xyz.scm (python2-pep8): Delete variable. --- 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 b1918cd299..bb502df4b3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10727,9 +10727,6 @@ (define-public python-pep8 PEP 8.") (license license:expat))) -(define-public python2-pep8 - (package-with-python2 python-pep8)) - (define-public python-pep8-naming (package (name "python-pep8-naming") -- cgit v1.2.3 From 764e195c784d634be95013e866c3aaa5836c257c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:36 -0400 Subject: gnu: Remove python2-regex. * gnu/packages/python-xyz.scm (python2-regex): Delete variable. --- 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 bb502df4b3..2b5dbb79ab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20588,9 +20588,6 @@ (define-public python-regex functionality like full case-folding for case-insensitive matches in Unicode.") (license license:psfl))) -(define-public python2-regex - (package-with-python2 python-regex)) - (define-public python-pyopengl (package (name "python-pyopengl") -- cgit v1.2.3 From 9075726baa293f8ed9cbd602c0eabe84fb77a22b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:45 -0400 Subject: gnu: Remove python2-socksipy-branch. * gnu/packages/python-xyz.scm (python2-socksipy-branch): Delete variable. --- 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 2b5dbb79ab..31f8ac2a39 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6815,9 +6815,6 @@ (define-public python-socksipy-branch as the original project seems to have been abandoned circa 2007.") (license license:bsd-3))) -(define-public python2-socksipy-branch - (package-with-python2 python-socksipy-branch)) - (define-public python-socksipychain (package (name "python-socksipychain") -- cgit v1.2.3 From 3cf5dfe72ca44f20ecee8837178de141a39fdab2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:12:58 -0400 Subject: gnu: Remove python2-setuptools-scm-git-archive. * gnu/packages/python-xyz.scm (python2-setuptools-scm-git-archive): Delete variable. --- 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 31f8ac2a39..5cc9674499 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21025,9 +21025,6 @@ (define-public python-setuptools-scm-git-archive belong to tagged versions.") (license license:expat))) -(define-public python2-setuptools-scm-git-archive - (package-with-python2 python-setuptools-scm-git-archive)) - (define-public python-setuptools-git (package (name "python-setuptools-git") -- cgit v1.2.3 From 68f71a2bfded463ceb4bb57a6ba9f7e5d0aea6a1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:09 -0400 Subject: gnu: Remove python2-ukpostcodeparser. * gnu/packages/python-xyz.scm (python2-ukpostcodeparser): Delete variable. --- 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 5cc9674499..e678e95ae7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17461,9 +17461,6 @@ (define-public python-ukpostcodeparser parsing UK postcodes.") (license license:expat))) -(define-public python2-ukpostcodeparser - (package-with-python2 python-ukpostcodeparser)) - (define-public python-faker (package (name "python-faker") -- cgit v1.2.3 From 59a04f3229ebff19bc2c6bcc0b8626ed0db55803 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:13 -0400 Subject: gnu: Remove python2-pyld. * gnu/packages/python-xyz.scm (python2-pyld): Delete variable. --- 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 e678e95ae7..865dd80b10 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3403,9 +3403,6 @@ (define-public python-pyld "PyLD is an implementation of the JSON-LD specification.") (license license:bsd-3))) -(define-public python2-pyld - (package-with-python2 python-pyld)) - (define-public python-cli-helpers (package (name "python-cli-helpers") -- cgit v1.2.3 From c7353caca5ff7dc5e7e76ec5d164535d7b08425e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:25 -0400 Subject: gnu: Remove python2-mechanize. * gnu/packages/python-xyz.scm (python2-mechanize): Delete variable. --- 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 865dd80b10..5f8ba8855b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2720,9 +2720,6 @@ (define-public python-mechanize after Andy Lester’s Perl module WWW::Mechanize.") (license license:bsd-3))) -(define-public python2-mechanize - (package-with-python2 python-mechanize)) - (define-public python-simpleaudio (package (name "python-simpleaudio") -- cgit v1.2.3 From 059365b96904c788d06a995d61d9e00d40a44963 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:31 -0400 Subject: gnu: Remove python2-parse-type. * gnu/packages/python-xyz.scm (python2-parse-type): Delete variable. --- gnu/packages/python-xyz.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5f8ba8855b..66cfbb77f6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2922,20 +2922,9 @@ (define-public python-parse-type (native-inputs (list python-pytest)) (home-page "https://github.com/jenisys/parse_type") (synopsis "Extended parse module") - (description - "Parse_type extends the python parse module.") - (properties - `((python2-variant . ,(delay python2-parse-type)))) + (description "Parse_type extends the python parse module.") (license license:bsd-3))) -(define-public python2-parse-type - (let ((base (package-with-python2 - (strip-python2-variant python-parse-type)))) - (package/inherit base - (propagated-inputs - `(("python2-enum34" ,python2-enum34) - ,@(package-propagated-inputs base)))))) - (define-public python-parse (package (name "python-parse") -- cgit v1.2.3 From 4392bf589f0a654f71e245794bcafc1351f28943 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:42 -0400 Subject: gnu: Remove python2-ptyprocess. * gnu/packages/python-xyz.scm (python2-ptyprocess): Delete variable. --- 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 66cfbb77f6..c45f8ef436 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11276,9 +11276,6 @@ (define-public python-ptyprocess pseudo terminal (pty), and interact with both the process and its pty.") (license license:isc))) -(define-public python2-ptyprocess - (package-with-python2 python-ptyprocess)) - (define-public python-cram (package (name "python-cram") -- cgit v1.2.3 From 87465a718a3cd0bf3b73d254eb2b281173bd78c8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:49 -0400 Subject: gnu: Remove python2-flake8. * gnu/packages/python-xyz.scm (python2-flake8): Delete variable. --- gnu/packages/python-xyz.scm | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c45f8ef436..b38ecc6908 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10862,35 +10862,20 @@ (define-public python-flake8 "0y732h02n2aih8gzyfj4bbhg4jgahyv84mjwfindk2g6w45rka0s")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v")))))) - (propagated-inputs - (list python-pycodestyle python-entrypoints python-pyflakes - python-mccabe)) - (native-inputs - (list python-mock python-pytest)) + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v")))))) + (propagated-inputs (list python-pycodestyle python-entrypoints + python-pyflakes python-mccabe)) + (native-inputs (list python-mock python-pytest)) (home-page "https://gitlab.com/pycqa/flake8") - (synopsis - "The modular source code checker: pep8, pyflakes and co") + (synopsis "The modular source code checker: pep8, pyflakes and co") (description - "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") - (properties `((python2-variant . ,(delay python2-flake8)))) + "Flake8 is a wrapper around PyFlakes, pep8 and python-mccabe.") (license license:expat))) -(define-public python2-flake8 - (let ((base (package-with-python2 (strip-python2-variant python-flake8)))) - (package/inherit base - (propagated-inputs - `(("python2-configparser" ,python2-configparser) - ("python2-enum34" ,python2-enum34) - ("python2-functools32" ,python2-functools32) - ("python2-typing" ,python2-typing) - ,@(package-propagated-inputs base)))))) - (define-public python-flake8-3.8 (package (inherit python-flake8) -- cgit v1.2.3 From b1f059ddf63de4db7aa1391ac6b91b31692d9e4b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:13:58 -0400 Subject: gnu: Remove python2-virtualenv. * gnu/packages/python-xyz.scm (python2-virtualenv): Delete variable. --- gnu/packages/python-xyz.scm | 8 -------- 1 file changed, 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b38ecc6908..6aacb472df 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3937,14 +3937,6 @@ (define-public python-virtualenv "Virtualenv is a tool to create isolated Python environments.") (license license:expat))) -(define-public python2-virtualenv - (let ((base (package-with-python2 (strip-python2-variant python-virtualenv)))) - (package - (inherit base) - (propagated-inputs - (modify-inputs (package-propagated-inputs base) - (prepend python2-contextlib2)))))) - (define-public python-markupsafe (package (name "python-markupsafe") -- cgit v1.2.3 From a53d1098dc6b70c721fddc619de9c41106503d2b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:14:13 -0400 Subject: gnu: Remove python2-pyasn1. * gnu/packages/python-xyz.scm (python2-pyasn1): Delete variable. --- 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 6aacb472df..402b1b9871 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12442,9 +12442,6 @@ (define-public python-pyasn1 suitable for a wide range of protocols based on the ASN.1 specification.") (license license:bsd-2))) -(define-public python2-pyasn1 - (package-with-python2 python-pyasn1)) - (define-public python-pyasn1-modules (package (name "python-pyasn1-modules") -- cgit v1.2.3 From 4f18b13436f52c107e66056a9dd3a13bb99c8030 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:35:12 -0400 Subject: gnu: Remove python2-matplotlib. * gnu/packages/python-xyz.scm (python2-matplotlib): Delete variable. * tests/profiles.scm ("package->manifest-entry, search paths"): Use python 3 matplotlib in test. --- gnu/packages/python-xyz.scm | 48 +-------------------------------------------- tests/profiles.scm | 2 +- 2 files changed, 2 insertions(+), 48 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 402b1b9871..8981ca0e47 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6518,53 +6518,7 @@ (define-public python-matplotlib across platforms. Matplotlib can be used in Python scripts, the python and ipython shell, web application servers, and six graphical user interface toolkits.") - (license license:psfl) - (properties `((python2-variant . ,(delay python2-matplotlib)))))) - -(define-public python2-matplotlib - (let ((matplotlib (package-with-python2 - (strip-python2-variant python-matplotlib)))) - (package/inherit matplotlib - (version "2.2.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "matplotlib" version)) - (sha256 - (base32 - "1sk05fdai9rw35l983rw2ymvz0nafs7szs7yz4nxrpyr1j27l0x3")))) - (arguments - (substitute-keyword-arguments (package-arguments matplotlib) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'install 'create-init-file - (lambda _ - (with-output-to-file - (string-append - #$output - "/lib/python2.7/site-packages/mpl_toolkits/__init__.py") - (lambda _ (display ""))))) - (delete 'fix-and-disable-failing-tests) - (delete 'check))))) ; These tests weren't run the the past. - (native-inputs - `(("pkg-config" ,pkg-config))) - (propagated-inputs - `(("gobject-introspection" ,gobject-introspection) - ("python2-backports-functools-lru-cache" ,python2-backports-functools-lru-cache) - ("python2-certifi" ,python2-certifi) - ("python2-cycler" ,python2-cycler) - ("python2-dateutil" ,python2-dateutil) - ("python2-functools32" ,python2-functools32) - ("python2-kiwisolver" ,python2-kiwisolver) - ("python2-numpy" ,python2-numpy) - ("python2-pillow" ,python2-pillow) - ("python2-pycairo" ,python2-pycairo) - ("python2-pygobject-2" ,python2-pygobject-2) - ("python2-pyparsing" ,python2-pyparsing) - ("python2-pytz" ,python2-pytz) - ("python2-six" ,python2-six) - ("python2-subprocess32" ,python2-subprocess32) - ("python2-tkinter" ,python-2 "tk")))))) + (license license:psfl))) (define-public python-matplotlib-documentation (package diff --git a/tests/profiles.scm b/tests/profiles.scm index d59d75985f..7418b7470f 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -471,7 +471,7 @@ (define (find-input package) (test-assert "package->manifest-entry, search paths" ;; See . - (let ((mpl (@ (gnu packages python-xyz) python2-matplotlib))) + (let ((mpl (@ (gnu packages python-xyz) python-matplotlib))) (lset= eq? (package-transitive-native-search-paths mpl) (manifest-entry-search-paths -- cgit v1.2.3 From 5ab0cbd0f1e0fa7cca3052a51f032460fb3bb17c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:37:03 -0400 Subject: gnu: Remove python2-numpy. * gnu/packages/python-xyz.scm (python2-numpy): Delete variable. (python2-numpy-1.8): Likewise. (python-numpy)[properties]: Delete field. * gnu/packages/maths.scm (flann): Delete comment. * gnu/packages/chemistry.scm (with-numpy-1.8): Delete procedure. --- gnu/packages/chemistry.scm | 3 -- gnu/packages/maths.scm | 1 - gnu/packages/python-xyz.scm | 69 --------------------------------------------- 3 files changed, 73 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index e5b6309585..735d599d2d 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm @@ -303,9 +303,6 @@ (define-public molequeue staged, and output files collected using a standard interface.") (license license:bsd-3))) -(define with-numpy-1.8 - (package-input-rewriting `((,python2-numpy . ,python2-numpy-1.8)))) - (define-public tng (package (name "tng") diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 16faf1ec18..9cecf5cc40 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5366,7 +5366,6 @@ (define-public flann ;; Disable it for now. ;;("octave" ,octave-cli) ("python" ,python-2) ; print syntax - ;; ("python2-numpy" ,python2-numpy) ; only required for the tests ("zlib" ,zlib))) (arguments `(;; The 'share/flann/octave' contains a .mex file, which is an ELF file diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8981ca0e47..df27279e6d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5614,7 +5614,6 @@ (define-public python-numpy object, sophisticated (broadcasting) functions, tools for integrating C/C++ and Fortran code, useful linear algebra, Fourier transform, and random number capabilities.") - (properties `((python2-variant . ,(delay python2-numpy)))) (license license:bsd-3))) (define-public python-numpy-next @@ -5726,74 +5725,6 @@ (define-public python-numpy-documentation (description "This package provides the complete NumPy documentation in the Texinfo, HTML, and PDF formats."))) -;; Numpy 1.16.x are the last versions that support Python 2. -(define-public python2-numpy - (let ((numpy (package-with-python2 - (strip-python2-variant python-numpy)))) - (package - (inherit numpy) - (name "python2-numpy") - (version "1.16.5") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/numpy/numpy/releases/download/v" - version "/numpy-" version ".tar.gz")) - (sha256 - (base32 - "0lg1cycxzi4rvvrd5zxinpdz0ni792fpx6xjd75z1923zcac8qrb")))) - (arguments - (substitute-keyword-arguments (package-arguments numpy) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'unpack 'delete-failing-tests - (lambda _ - ;; There's just one failing test here. - (delete-file "numpy/linalg/tests/test_linalg.py") - ;; ...and this one depends on the previous one. - (delete-file "numpy/matrixlib/tests/test_matrix_linalg.py"))) - (replace 'check - ;; Older versions don't cope well with the extra Pytest - ;; options, so remove them. - (lambda* (#:key tests? outputs inputs #:allow-other-keys) - (when tests? - (invoke "./runtests.py" "-vv" "--no-build" "--mode=fast" - "-j" (number->string (parallel-job-count)))))))))) - (native-inputs - (list python2-cython python2-pytest gfortran))))) - -;; NOTE: NumPy 1.8 is packaged only for Python 2 because it is of -;; interest only for legacy code going back to NumPy's predecessor -;; Numeric. -(define-public python2-numpy-1.8 - (package - (inherit python2-numpy) - (version "1.8.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/numpy/numpy") - (commit (string-append "v" version)))) - (file-name (git-file-name "numpy" version)) - (sha256 - (base32 - "0ikgi15rsqwbkfsjjxrwh40lqyal2wvyp3923y6w6ch3dcr82sfk")))) - (arguments (substitute-keyword-arguments (package-arguments python2-numpy) - ((#:tests? _ #f) #f) ;disable tests - ((#:phases phases) - #~(modify-phases #$phases - (delete 'delete-failing-tests))))) - (native-inputs '()) - (description "NumPy is the fundamental package for scientific computing -with Python. It contains among other things: a powerful N-dimensional array -object, sophisticated (broadcasting) functions, tools for integrating C/C++ -and Fortran code, useful linear algebra, Fourier transform, and random number -capabilities. Version 1.8 is the last one to contain the numpy.oldnumeric API -that includes the compatibility layer numpy.oldnumeric with NumPy's predecessor -Numeric.") - (license license:bsd-3))) - (define-public python-munch (package (name "python-munch") -- cgit v1.2.3 From d2d222ddc2ab233bf039e9bdb98ffd348a100c5c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:41:12 -0400 Subject: gnu: Remove python2-numpydoc. * gnu/packages/python-xyz.scm (python2-numpydoc): Delete variable. (python-numpy)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index df27279e6d..aad5dabe18 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6170,25 +6170,7 @@ (define-public python-numpydoc (home-page "https://pypi.org/project/numpydoc/") (synopsis "Numpy's Sphinx extensions") (description "Sphinx extension to support docstrings in Numpy format.") - (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-numpydoc)))))) - -(define-public python2-numpydoc - (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)))))) + (license license:bsd-2))) (define-public python-numexpr (package -- cgit v1.2.3 From 0d74e94f1023091a6fec4626212147233ccf6c7b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:46:02 -0400 Subject: gnu: Remove python2-cleo. * gnu/packages/python-xyz.scm (python2-cleo): Delete variable. --- 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 aad5dabe18..3341330fe7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16789,9 +16789,6 @@ (define-public python-cleo docstring and colored output.") (license license:expat))) -(define-public python2-cleo - (package-with-python2 python-cleo)) - (define-public python-tomlkit (package (name "python-tomlkit") -- cgit v1.2.3 From c75c1e811e6e602f30bdd2da1e32e93cedb074e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:46:12 -0400 Subject: gnu: Remove python2-entrypoints. * gnu/packages/python-xyz.scm (python2-entrypoints): Delete variable. --- gnu/packages/python-xyz.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3341330fe7..9b6d3eb569 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13250,15 +13250,7 @@ (define-public python-entrypoints @code{console_scripts} entry points, which define shell commands by identifying a Python function to run. The @code{entrypoints} module contains functions to find and load entry points.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-entrypoints)))))) - -(define-public python2-entrypoints - (package - (inherit (package-with-python2 - (strip-python2-variant python-entrypoints))) - (propagated-inputs - (list python2-configparser)))) + (license license:expat))) (define-public python-epc (package -- cgit v1.2.3 From bec1c898917d571cc099bda20472bac4377fb22a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:46:33 -0400 Subject: gnu: Remove python2-mccabe. * gnu/packages/python-xyz.scm (python2-mccabe): Delete variable. --- gnu/packages/python-xyz.scm | 3 --- guix/lint.scm | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b6d3eb569..76fe4d6158 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10706,9 +10706,6 @@ (define-public python-mccabe cyclomatic complexity of Python source code.") (license license:expat))) -(define-public python2-mccabe - (package-with-python2 python-mccabe)) - (define-public python-flake8 (package (name "python-flake8") diff --git a/guix/lint.scm b/guix/lint.scm index 375f189335..aa16efe6db 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -494,16 +494,16 @@ (define (check-inputs-should-be-native package) "m4" "qttools" "yasm" "nasm" "fasm" - "python-coverage" "python2-coverage" - "python-cython" "python2-cython" - "python-docutils" "python2-docutils" - "python-mock" "python2-mock" - "python-nose" "python2-nose" - "python-pbr" "python2-pbr" - "python-pytest" "python2-pytest" - "python-pytest-cov" "python2-pytest-cov" - "python-setuptools-scm" "python2-setuptools-scm" - "python-sphinx" "python2-sphinx" + "python-coverage" + "python-cython" + "python-docutils" + "python-mock" + "python-nose" + "python-pbr" + "python-pytest" + "python-pytest-cov" + "python-setuptools-scm" + "python-sphinx" "scdoc" "swig" "qmake" -- cgit v1.2.3 From 6ce91100d6c778af97c12c74de44381dbb4da823 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:46:44 -0400 Subject: gnu: Remove python2-networkx. * gnu/packages/python-xyz.scm (python2-networkx): Delete variable. --- gnu/packages/python-xyz.scm | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 76fe4d6158..b1044fb540 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9559,37 +9559,17 @@ (define-public python-networkx (lambda* (#:key tests? #:allow-other-keys) (if tests? (invoke "pytest" "-vv" "--pyargs" "networkx") - (format #t "test suite not run~%")) - #t))))) - ;; python-decorator is needed at runtime. - (propagated-inputs - (list python-decorator)) - (native-inputs - (list python-pytest)) + (format #t "test suite not run~%")) #t))))) + (propagated-inputs (list python-decorator)) + (native-inputs (list python-pytest)) (home-page "https://networkx.github.io/") - (synopsis "Python module for creating and manipulating graphs and networks") + (synopsis + "Python module for creating and manipulating graphs and networks") (description - "NetworkX is a Python package for the creation, manipulation, and study + "NetworkX is a Python package for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks.") - (properties `((python2-variant . ,(delay python2-networkx)))) (license license:bsd-3))) -;; NetworkX 2.2 is the last version with support for Python 2. -(define-public python2-networkx - (let ((base (package-with-python2 (strip-python2-variant python-networkx)))) - (package - (inherit base) - (version "2.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "networkx" version ".zip")) - (sha256 - (base32 - "12swxb15299v9vqjsq4z8rgh5sdhvpx497xwnhpnb0gynrx6zra5")))) - (arguments - `(#:python ,python-2)) - (native-inputs - (list python2-nose unzip))))) (define-public python-datrie (package -- cgit v1.2.3 From 674c7b765a19c3da6cff639639c01ea4111936a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:46:51 -0400 Subject: gnu: Remove python2-pycodestyle. * gnu/packages/python-xyz.scm (python2-pycodestyle): Delete variable. --- 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 b1044fb540..e47d1ca8bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6710,9 +6710,6 @@ (define-public python-pycodestyle @url{http://www.python.org/dev/peps/pep-0008/,PEP 8}.") (license license:expat))) -(define-public python2-pycodestyle - (package-with-python2 python-pycodestyle)) - (define-public python-pycodestyle-2.6 (package (inherit python-pycodestyle) -- cgit v1.2.3 From c0a8ddc36d6ca8df9486159dd0f66b40ece66a0d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:47:00 -0400 Subject: gnu: Remove python2-pyserial. * gnu/packages/python-xyz.scm (python2-pyserial): Delete variable. --- 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 e47d1ca8bf..3e43add789 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17620,9 +17620,6 @@ (define-public python-pyserial and/or Xon/Xoff. The port is accessed in RAW mode.") (license license:bsd-3))) -(define-public python2-pyserial - (package-with-python2 python-pyserial)) - (define-public python-pyserial-asyncio (package (name "python-pyserial-asyncio") -- cgit v1.2.3 From 2f7eee37b946ec726bdefa97a1d0a622090b2cb5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:47:23 -0400 Subject: gnu: Remove python2-cycler. * gnu/packages/python-xyz.scm (python2-cycler): Delete variable. --- 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 3e43add789..cbd463459c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6225,9 +6225,6 @@ (define-public python-cycler @code{Cycler} class was developed.") (license license:bsd-3))) -(define-public python2-cycler - (package-with-python2 python-cycler)) - (define-public python-colorspacious (package (name "python-colorspacious") -- cgit v1.2.3 From ffec658a72bf1053842d9237b939c86779f497da Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:47:34 -0400 Subject: gnu: Remove python2-future. * gnu/packages/python-xyz.scm (python2-future): Delete variable. --- 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 cbd463459c..5c8bf5412d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16140,9 +16140,6 @@ (define-public python-future to support both Python 2 and Python 3 with minimal overhead.") (license license:expat))) -(define-public python2-future - (package-with-python2 python-future)) - (define-public python-cysignals (package (name "python-cysignals") -- cgit v1.2.3 From 4c17f2b3fe209296ba6f1f9dabde9d3a4b0ce7c0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:47:43 -0400 Subject: gnu: Remove python2-mistune. * gnu/packages/python-xyz.scm (python2-mistune): Delete variable. --- 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 5c8bf5412d..72868cd482 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11024,9 +11024,6 @@ (define-public python-mistune Python.") (license license:bsd-3))) -(define-public python2-mistune - (package-with-python2 python-mistune)) - ;; 2.0 is not released yet, but some packages have started using it. (define-public python-mistune-next (package -- cgit v1.2.3 From 4a2e05d1483e9775cb11daaeb236609d45c49690 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:47:46 -0400 Subject: gnu: Remove python2-cysignals. * gnu/packages/python-xyz.scm (python2-cysignals): Delete variable. --- 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 72868cd482..158caca68c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16177,9 +16177,6 @@ (define-public python-cysignals respectively.") (license license:lgpl3+))) -(define-public python2-cysignals - (package-with-python2 python-cysignals)) - (define-public python-rope (package (name "python-rope") -- cgit v1.2.3 From f283842e3c9125b7d8f1d356509e6c92d810cd4d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:48:21 -0400 Subject: gnu: Remove python2-pytidylib. * gnu/packages/python-xyz.scm (python2-pytidylib): Delete variable. --- 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 158caca68c..9b04da8acd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26152,9 +26152,6 @@ (define-public python-pytidylib allows you, from Python code, to “fix” invalid (X)HTML markup.") (license license:expat))) -(define-public python2-pytidylib - (package-with-python2 python-pytidylib)) - (define-public python-mujson (package (name "python-mujson") -- cgit v1.2.3 From 5bd5443ededb922cbbd74e3b271770ca4ddc6bf5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:48:33 -0400 Subject: gnu: Remove python2-docutils. * gnu/packages/python-xyz.scm (python2-docutils): Delete variable. (python2-docutils-0.14): Likewise. --- gnu/packages/python-xyz.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b04da8acd..6a796b92ad 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4310,9 +4310,6 @@ (define-public python-docutils ;; licensed under the PFSL, BSD 2-clause, and GPLv3+ licenses. (license (list license:public-domain license:psfl license:bsd-2 license:gpl3+)))) -(define-public python2-docutils - (package-with-python2 python-docutils)) - ;; awscli refuses to be built with docutils < 0.16. (define-public python-docutils-0.15 (package @@ -4327,18 +4324,6 @@ (define-public python-docutils-0.15 ;; tests contain Python 2 syntax. (arguments '(#:tests? #false)))) -;; python2-sphinx fails its test suite with newer versions. -(define-public python2-docutils-0.14 - (package - (inherit python2-docutils) - (version "0.14") - (source (origin - (method url-fetch) - (uri (pypi-uri "docutils" version)) - (sha256 - (base32 - "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji")))))) - (define-public python-restructuredtext-lint (package (name "python-restructuredtext-lint") -- cgit v1.2.3 From 787e582c47f4de3bb8dea14a2041c272d8240d0f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:49:25 -0400 Subject: gnu: Remove python2-translate-toolkit. * gnu/packages/python-xyz.scm (python2-translate-toolkit): Delete variable. --- gnu/packages/python-xyz.scm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6a796b92ad..dba156eaa8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19605,18 +19605,6 @@ (define-public python-translate-toolkit several utilities, as well as an API for building localization tools.") (license license:gpl2+))) -;; Required for virtaal, newer versions do not build with python2 -(define-public python2-translate-toolkit - (package-with-python2 - (package - (inherit python-translate-toolkit) - (version "2.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "translate-toolkit" version ".tar.bz2")) - (sha256 - (base32 "1vlkwrg83vb17jc36pmwh2b7jphwf390lz0jw8hakcg16qhwypvq"))))))) (define-public python-packaging (package/inherit python-packaging-bootstrap -- cgit v1.2.3 From 64c86457db9dceafc3453967e9f6c6fec776ab13 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:49:31 -0400 Subject: gnu: Remove python2-subprocess32. * gnu/packages/python-xyz.scm (python2-subprocess32): Delete variable. * gnu/packages/patches/python2-subprocess32-disable-input-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - .../python2-subprocess32-disable-input-test.patch | 18 ----------- gnu/packages/python-xyz.scm | 37 ---------------------- 3 files changed, 56 deletions(-) delete mode 100644 gnu/packages/patches/python2-subprocess32-disable-input-test.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 1a0b998de3..a4d5235be6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1721,7 +1721,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ %D%/packages/patches/python-seaborn-kde-test.patch \ %D%/packages/patches/python-seaborn-2690.patch \ - %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \ diff --git a/gnu/packages/patches/python2-subprocess32-disable-input-test.patch b/gnu/packages/patches/python2-subprocess32-disable-input-test.patch deleted file mode 100644 index 05b4eef1ba..0000000000 --- a/gnu/packages/patches/python2-subprocess32-disable-input-test.patch +++ /dev/null @@ -1,18 +0,0 @@ -This test tries to send a KeyboardInterrupt, which does -not work in the build environment. - ---- a/test_subprocess32.py 2017-03-06 22:21:49.334045485 +0100 -+++ b/test_subprocess32.py 2017-03-06 22:22:02.490439949 +0100 -@@ -1299,12 +1299,6 @@ - getattr(p, method)(*args) - return p - -- def test_send_signal(self): -- p = self._kill_process('send_signal', signal.SIGINT) -- _, stderr = p.communicate() -- self.assertIn('KeyboardInterrupt', stderr) -- self.assertNotEqual(p.wait(), 0) -- - def test_kill(self): - p = self._kill_process('kill') - _, stderr = p.communicate() diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dba156eaa8..31c597a859 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14401,43 +14401,6 @@ (define-public python2-functools32 3.2.3 for use with older versions of Python and PyPy.") (license license:expat))) -(define-public python2-subprocess32 - (package - (name "python2-subprocess32") - (version "3.2.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "subprocess32" version)) - (sha256 - (base32 - "14350dhhlhyz5gqzi3lihn9m6lvskx5mcb20srx1kgsk9i50li8y")) - (patches - (search-patches "python2-subprocess32-disable-input-test.patch")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - ;; The test suite fails with Python > 2.7.13: - ;; import test.support - ;; ImportError: No module named support - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-/bin/sh - (lambda _ - (substitute* '("subprocess32.py" - "test_subprocess32.py") - (("/bin/sh") (which "sh"))) - #t))))) - (home-page "https://github.com/google/python-subprocess32") - (synopsis "Backport of the subprocess module from Python 3.2") - (description - "This is a backport of the @code{subprocess} standard library module -from Python 3.2 and 3.3 for use on Python 2. It includes bugfixes and some -new features. On POSIX systems it is guaranteed to be reliable when used -in threaded applications. It includes timeout support from Python 3.3 but -otherwise matches 3.2’s API.") - (license license:psfl))) - (define-public python-promise (package (name "python-promise") -- cgit v1.2.3 From ff37995afc60de2412b60fd88b7a3a2025194a71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:49:35 -0400 Subject: gnu: Remove python2-pyflakes. * gnu/packages/python-xyz.scm (python2-pyflakes): Delete variable. --- 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 31c597a859..26c39d0f6d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10629,9 +10629,6 @@ (define-public python-pyflakes "Pyflakes statically checks Python source code for common errors.") (license license:expat))) -(define-public python2-pyflakes - (package-with-python2 python-pyflakes)) - (define-public python-pyflakes-2.2 (package (inherit python-pyflakes) -- cgit v1.2.3 From 89f3f16a8435145cbc75d040441a498e6497873a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 23:49:41 -0400 Subject: gnu: Remove python2-pympler. * gnu/packages/python-xyz.scm (python2-pympler): Delete variable. --- 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 26c39d0f6d..2255d0c082 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3822,9 +3822,6 @@ (define-public python-pympler visualisation and class tracker statistics.") (license license:asl2.0))) -(define-public python2-pympler - (package-with-python2 python-pympler)) - (define-public python-itsdangerous (package (name "python-itsdangerous") -- cgit v1.2.3 From 99c68135469e53eace92877f7279b4175ef80c8b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 08:29:10 -0400 Subject: gnu: python-pygments: Update to 2.12.0. * gnu/packages/python-xyz.scm (python-pygments): Update to 2.12.0. (python2-pygments): Delete variable. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2255d0c082..5b210bc4d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4438,21 +4438,7 @@ (define-public python-pygments (synopsis "Syntax highlighting") (description "Pygments is a syntax highlighting package written in Python.") - (license license:bsd-2) - (properties `((python2-variant . ,(delay python2-pygments)))))) - -;; Pygments 2.6 and later does not support Python 2. -(define-public python2-pygments - (let ((base (package-with-python2 (strip-python2-variant python-pygments)))) - (package - (inherit base) - (version "2.5.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "Pygments" version)) - (sha256 - (base32 - "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q"))))))) + (license license:bsd-2))) (define-public python-pygments-github-lexers (package -- cgit v1.2.3 From 6d398096e23dc940437c990c86f7043c78a77f8f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 08:34:23 -0400 Subject: gnu: python-urwid-readline: Update to 0.13. * gnu/packages/python-xyz.scm (python-urwid-readline): Update to 0.13. Re-indent propagated-inputs and native-inputs. [phases]: Delete trailing #t. {check}: Invoke pytest directly, with increased verbosity. --- gnu/packages/python-xyz.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5b210bc4d9..80cdf15928 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9150,7 +9150,7 @@ (define-public python2-urwid (define-public python-urwid-readline (package (name "python-urwid-readline") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) @@ -9160,7 +9160,7 @@ (define-public python-urwid-readline (file-name (git-file-name name version)) (sha256 (base32 - "0sq5qgxj7gcfww3ww7idr87isnmp0hi36n241b3q395x1zafdv22")))) + "0y9k86p31mlr9rwnrbljvfgl183r5j60yaj0r3scljn1m0mlg8qg")))) (build-system python-build-system) (arguments `(#:phases @@ -9168,12 +9168,9 @@ (define-public python-urwid-readline (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "python" "-m" "pytest")) - #t))))) - (propagated-inputs - (list python-urwid)) - (native-inputs - (list python-pytest)) + (invoke "pytest" "-vv"))))))) + (propagated-inputs (list python-urwid)) + (native-inputs (list python-pytest)) (home-page "https://github.com/rr-/urwid_readline") (synopsis "Text input widget for urwid that supports readline shortcuts") (description -- cgit v1.2.3 From 60965e70ed41c2086352f11ad3eedd69b59aec44 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 30 Apr 2022 10:32:34 -0400 Subject: gnu: dosage: Remove python2 inputs. * gnu/packages/python-xyz.scm (dosage)[propagated-inputs]: Remove python2-backports-functools-lru-cache and python2-backports-shutil-get-terminal-size. --- gnu/packages/python-xyz.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 80cdf15928..f605d146c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2492,9 +2492,7 @@ (define-public dosage "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0")))) (build-system python-build-system) (propagated-inputs - (list python2-backports-functools-lru-cache - python2-backports-shutil-get-terminal-size - python-cached-property + (list python-cached-property python-colorama python-imagesize python-importlib-metadata -- cgit v1.2.3 From c339c84f0f22c2e83dcf69bab6697ce034cdefda Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 00:02:41 -0400 Subject: gnu: Remove python2-backports-shutil-get-terminal-size. * gnu/packages/python-xyz.scm (python2-backports-shutil-get-terminal-size): Delete variable. --- gnu/packages/python-xyz.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f605d146c4..b5bebb98c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10223,36 +10223,6 @@ (define-public python2-backports-csv ;; module "backports". (delete 'sanity-check)))))) -(define-public python2-backports-shutil-get-terminal-size - (package - (name "python2-backports-shutil-get-terminal-size") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "backports.shutil_get_terminal_size" version)) - (sha256 - (base32 - "107cmn7g3jnbkp826zlj8rrj19fam301qvaqf0f3905f5217lgki")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "py.test" "-v")))))) - (native-inputs - (list python2-pytest)) - (home-page "https://github.com/chrippa/backports.shutil_get_terminal_size") - (synopsis "Backport of Python 3.3's @code{shutil.get_terminal_size}") - (description - "This package provides a backport of the @code{get_terminal_size -function} from Python 3.3's @code{shutil}. -Unlike the original version it is written in pure Python rather than C, -so it might be a tiny bit slower.") - (license license:expat))) - (define-public python-waf (package (name "python-waf") -- cgit v1.2.3 From cdbfe93f164c1621be4e0e0558c3529ff0c720c8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 30 Apr 2022 00:11:11 -0400 Subject: gnu: Remove python2-pluggy. * gnu/packages/python-xyz.scm (python2-pluggy): Delete variable. (python2-pluggy-bootstrap): Likewise. (python-pluggy)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b5bebb98c3..74d0e4379c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14565,31 +14565,8 @@ (define-public python-pluggy (description "Pluggy is an extraction of the plugin manager as used by Pytest but stripped of Pytest specific details.") (home-page "https://pypi.org/project/pluggy/") - (properties `((python2-variant . ,(delay python2-pluggy)))) (license license:expat))) -(define-public python2-pluggy - (let ((base (package-with-python2 (strip-python2-variant - python-pluggy)))) - (package/inherit - base - (propagated-inputs - `(("python-importlib-metadata" ,python2-importlib-metadata)))))) - -;; This package requires python2-importlib-metadata, but that package -;; ends up needing python2-pluggy via python2-pytest, so we need this -;; variant to solve the circular dependency. -(define-public python2-pluggy-bootstrap - (hidden-package - (package/inherit - python2-pluggy - (name "python2-pluggy-bootstrap") - (arguments - `(#:tests? #f - ,@(package-arguments python2-pluggy))) - (propagated-inputs - `(("python-importlib-metadata" ,python2-importlib-metadata-bootstrap)))))) - (define-public python-plumbum (package (name "python-plumbum") -- cgit v1.2.3 From 191207aae237bb7a797dc29a8935c79f71dd8b71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:47:37 -0400 Subject: gnu: Remove python2-docopt. * gnu/packages/python-xyz.scm (python2-docopt): Delete variable. --- 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 74d0e4379c..b3af73a99e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13712,9 +13712,6 @@ (define-public python-docopt @code{argparse}.") (license license:expat))) -(define-public python2-docopt - (package-with-python2 python-docopt)) - (define-public python-pythonanywhere (package (name "python-pythonanywhere") -- cgit v1.2.3 From 2d9550cf6a1e84a334aed1af04a1832d530b2f06 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:47:54 -0400 Subject: gnu: Remove python2-decorator. * gnu/packages/python-xyz.scm (python2-decorator): Delete variable. --- gnu/packages/python-xyz.scm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b3af73a99e..8197201aed 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7661,21 +7661,8 @@ (define-public python-decorator 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) - (properties `((python2-variant . ,(delay python2-decorator)))))) + (license license:expat))) -;; Version 5 does not support Python 2 -(define-public python2-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.2.3 From f3412d78c5931f233d3280d02de2ee72ac5557bf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:48:06 -0400 Subject: gnu: Remove python2-beautifulsoup4. * gnu/packages/python-xyz.scm (python2-beautifulsoup4): Delete variable. --- gnu/packages/python-xyz.scm | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8197201aed..9fe692ef88 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9400,22 +9400,7 @@ (define-public python-beautifulsoup4 searching, and modifying a parse tree, providing a toolkit for dissecting a document and extracting what you need. It automatically converts incoming documents to Unicode and outgoing documents to UTF-8.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-beautifulsoup4)))))) - -(define-public python2-beautifulsoup4 - (let ((base (package-with-python2 - (strip-python2-variant python-beautifulsoup4)))) - (package/inherit base - (version "4.9.3") ;last version to support Python 2 - (source - (origin - (method url-fetch) - (uri (pypi-uri "beautifulsoup4" version)) - (sha256 - (base32 - "09gbd49mwz86k572r1231x2rdp82p42zlnw0bz9b9mfi58r9wwl4")))) - (arguments `(#:python ,python-2))))) + (license license:expat))) (define-public python-soupsieve (package -- cgit v1.2.3 From 1630806fa8431d212ce2ee79f55e73dca920e08d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:48:25 -0400 Subject: gnu: Remove python2-clikit. * gnu/packages/python-xyz.scm (python2-clikit): Delete variable. --- gnu/packages/python-xyz.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9fe692ef88..04b9a2e8a4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16699,18 +16699,8 @@ (define-public python-clikit (description "CliKit is a group of utilities to build testable command line interfaces.") - (properties `((python2-variant . ,(delay python2-clikit)))) (license license:expat))) -(define-public python2-clikit - (let ((base (package-with-python2 (strip-python2-variant python-clikit)))) - (package/inherit - base - (propagated-inputs - `(("python-enum34" ,python2-enum34) - ("python-typing" ,python2-typing) - ,@(package-propagated-inputs base)))))) - (define-public python-msgpack-python (package (name "python-msgpack-python") -- cgit v1.2.3 From 9374dbf3ee650e9daf6ffba3df10c54892f05b2e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:48:32 -0400 Subject: gnu: Remove python2-funcsigs-bootstrap. * gnu/packages/python-xyz.scm (python2-funcsigs-bootstrap): Delete variable. --- gnu/packages/python-xyz.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 04b9a2e8a4..50e5879b0c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3219,15 +3219,6 @@ (define-public python2-funcsigs "Backport of @code{funcsigs} which was introduced in Python 3.3.") (license license:asl2.0))) -(define-public python2-funcsigs-bootstrap - (package - (inherit python2-funcsigs) - (name "python2-funcsigs-bootstrap") - (native-inputs `()) - (arguments - `(#:tests? #f - ,@(package-arguments python2-funcsigs))))) - (define-public python-py (package (name "python-py") -- cgit v1.2.3 From e8a4b28581a6b1c92b79a6a8ca06381ee65c454d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:48:38 -0400 Subject: gnu: Remove python2-snowballstemmer. * gnu/packages/python-xyz.scm (python2-snowballstemmer): Delete variable. --- 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 50e5879b0c..c76ab8878c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18050,9 +18050,6 @@ (define-public python-snowballstemmer English stemmer.") (license license:bsd-3))) -(define-public python2-snowballstemmer - (package-with-python2 python-snowballstemmer)) - (define-public python-setproctitle (package (name "python-setproctitle") -- cgit v1.2.3 From 01dff5c377e6c22c6b8311f05dc5d4e385551545 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:48:54 -0400 Subject: gnu: Remove python2-packaging. * gnu/packages/python-xyz.scm (python2-packaging): Delete variable. --- 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 c76ab8878c..5c061ae3b4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19465,9 +19465,6 @@ (define-public python-packaging ;; licenses. (license (list license:asl2.0 license:bsd-2)))) -(define-public python2-packaging - (package-with-python2 python-packaging)) - ;; TODO(staging): merge with python-packaging-bootstrap. (define-public python-packaging-next (package -- cgit v1.2.3 From a3f8802a90b85a6794e0c49790c6aabae81cc4e3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:48:57 -0400 Subject: gnu: Remove python2-backpack. * gnu/packages/python-xyz.scm (python2-backpack): Delete variable. --- 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 5c061ae3b4..b4ca9ea7b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17150,9 +17150,6 @@ (define-public python-backpack collections of data.") (license license:expat))) -(define-public python2-backpack - (package-with-python2 python-backpack)) - (define-public python-prompt-toolkit (package (name "python-prompt-toolkit") -- cgit v1.2.3 From b3aefaf48bb7544613b0b070c3a48f8e37e6c5b6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:49:04 -0400 Subject: gnu: Remove python2-urwid. * gnu/packages/python-xyz.scm (python2-urwid): Delete variable. --- gnu/packages/python-xyz.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b4ca9ea7b6..c8c30bcfda 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9106,23 +9106,8 @@ (define-public python-urwid (description "Urwid is a curses-based UI/widget library for Python. It includes many features useful for text console applications.") - (properties `((python2-variant . ,(delay python2-urwid)))) (license license:lgpl2.1+))) -(define-public python2-urwid - (let ((base (package-with-python2 - (strip-python2-variant python-urwid)))) - (package - (inherit base) - (version "2.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "urwid" version)) - (sha256 - (base32 - "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8"))))))) - (define-public python-urwid-readline (package (name "python-urwid-readline") -- cgit v1.2.3 From 1fc39b25bcb0812e4a3d36879d866ceaef30c2e9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:49:10 -0400 Subject: gnu: Remove python2-diff-match-patch. * gnu/packages/python-xyz.scm (python2-diff-match-patch): Delete variable. --- 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 c8c30bcfda..8ebbb1edc5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19272,9 +19272,6 @@ (define-public python-diff-match-patch perform the operations required for synchronizing plain text.") (license license:asl2.0))) -(define-public python2-diff-match-patch - (package-with-python2 python-diff-match-patch)) - (define-public python-dirsync (package (name "python-dirsync") -- cgit v1.2.3 From a8c87c9f06462a110913f0bf0dee7c011deb4889 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:49:15 -0400 Subject: gnu: Remove python2-jinja2. * gnu/packages/python-xyz.scm (python2-jinja2): Delete variable. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8ebbb1edc5..2337f4c3f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3991,22 +3991,8 @@ (define-public python-jinja2 (description "Jinja2 is a small but fast and easy to use stand-alone template engine written in pure Python.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-jinja2)))))) + (license license:bsd-3))) -;; Version 2.11.3 is the last to support Python 2. -(define-public python2-jinja2 - (package - (inherit (package-with-python2 - (strip-python2-variant python-jinja2))) - (version "2.11.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Jinja2" version)) - (sha256 - (base32 - "1iiklf3wns67y5lfcacxma5vxfpb7h2a67xbghs01s0avqrq9md6")))))) (define-public python-jinja2-time (package -- cgit v1.2.3 From 29618c72d5441fda71237e50d266cb33050b60cd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:49:35 -0400 Subject: gnu: Remove python2-twodict. * gnu/packages/python-xyz.scm (python2-twodict): Delete variable. --- gnu/packages/python-xyz.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2337f4c3f5..c6c63ebab0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -505,21 +505,6 @@ (define-public python-twodict features of the Python's built-in dict.") (license license:unlicense))) -(define-public python2-twodict - (package - (inherit python-twodict) - (name "python2-twodict") - (version "1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "twodict" version)) - (sha256 - (base32 "0ifv7dv18jn2lg0a3l6zdlvmmlda2ivixfjbsda58a2ay6kxznr0")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)))) - (define-public python-argopt (package (name "python-argopt") -- cgit v1.2.3 From de39a426bda295bd9a9075c53683fc208cdb6154 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:49:38 -0400 Subject: gnu: Remove python2-vobject. * gnu/packages/python-xyz.scm (python2-vobject): Delete variable. --- 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 c6c63ebab0..c2f911549b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15450,9 +15450,6 @@ (define-public python-vobject (home-page "https://eventable.github.io/vobject/") (license license:asl2.0))) -(define-public python2-vobject - (package-with-python2 python-vobject)) - (define-public python-munkres (package (name "python-munkres") -- cgit v1.2.3 From e9d63dbd23c7fe5754dfc1a906a4521e33f80277 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:31 -0400 Subject: gnu: Remove python2-markupsafe. * gnu/packages/python-xyz.scm (python2-markupsafe): Delete variable. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c2f911549b..ba71259c26 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3933,22 +3933,8 @@ (define-public python-markupsafe (description "Markupsafe provides an XML/HTML/XHTML markup safe string implementation for Python.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-markupsafe)))))) + (license license:bsd-3))) -;; Version 1.1.1 is the last to support Python 2. -(define-public python2-markupsafe - (package - (inherit (package-with-python2 - (strip-python2-variant python-markupsafe))) - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "MarkupSafe" version)) - (sha256 - (base32 - "0sqipg4fk7xbixqd8kq6rlkxj664d157bdwbh93farcphf92x1r9")))))) (define-public python-jinja2 (package -- cgit v1.2.3 From 3dd350f5277358bb42aa32a22f3eeb1667e17ab1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:40 -0400 Subject: gnu: Remove python2-chardet. * gnu/packages/python-xyz.scm (python2-chardet): Delete variable. --- 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 ba71259c26..97a81980a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13559,9 +13559,6 @@ (define-public python-chardet automatically detect a wide range of file encodings.") (license license:lgpl2.1+))) -(define-public python2-chardet - (package-with-python2 python-chardet)) - (define-public python-charset-normalizer (package (name "python-charset-normalizer") -- cgit v1.2.3 From 8577f93ba3eb076bfb0d437db506f6e44629a64b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:46 -0400 Subject: gnu: Remove python2-imagesize. * gnu/packages/python-xyz.scm (python2-imagesize): Delete variable. --- 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 97a81980a5..b7acb78f9e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18151,9 +18151,6 @@ (define-public python-imagesize PNG, JPEG, JPEG2000 and GIF files in pure Python.") (license license:expat))) -(define-public python2-imagesize - (package-with-python2 python-imagesize)) - (define-public python-termstyle (package (name "python-termstyle") -- cgit v1.2.3 From 8710fb9462912b733a5eee1609318be7e73075fa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:54 -0400 Subject: gnu: Remove python2-babel. * gnu/packages/python-xyz.scm (python2-babel): Delete variable. --- gnu/packages/python-xyz.scm | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b7acb78f9e..b03091668f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1259,39 +1259,6 @@ (define-public python-babel etc.") (license license:bsd-3))) -(define-public python2-babel - (package - (name "python2-babel") - (version "2.9.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Babel" version)) - (sha256 - (base32 - "018yg7g2pa6vjixx1nx41cfispgfi0azzp0a1chlycbj8jsil0ys")))) - (build-system python-build-system) - (native-inputs - (list python2-freezegun python2-pytest tzdata-for-tests)) - (propagated-inputs - (list python2-pytz)) - (arguments - `(#:python ,python-2 - #:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) - (home-page "https://babel.pocoo.org/") - (synopsis - "Tools for internationalizing Python applications") - (description - "Babel is composed of two major parts: -- tools to build and work with gettext message catalogs -- a Python interface to the CLDR (Common Locale Data Repository), providing -access to various locale display names, localized number and date formatting, -etc.") - (license license:bsd-3))) - (define-public python2-backport-ssl-match-hostname (package (name "python2-backport-ssl-match-hostname") -- cgit v1.2.3 From 139b97b65e0817e91bced3aa326781b014849f14 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:51:57 -0400 Subject: gnu: Remove python2-levenshtein. * gnu/packages/python-xyz.scm (python2-levenshtein): Delete variable. --- 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 b03091668f..038f54ec74 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19231,9 +19231,6 @@ (define-public python-levenshtein It supports both normal and Unicode strings.") (license license:gpl2+))) -(define-public python2-levenshtein - (package-with-python2 python-levenshtein)) - (define-public python-scandir (package (name "python-scandir") -- cgit v1.2.3 From d6c43683cf6ea671c6702d0c49b4854ace8b2db5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:52:08 -0400 Subject: gnu: Remove python2-pyaml. * gnu/packages/python-xyz.scm (python2-pyaml): Delete variable. --- 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 038f54ec74..ae7c51a5a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17010,9 +17010,6 @@ (define-public python-pyaml YAML-serialized data.") (license license:wtfpl2))) -(define-public python2-pyaml - (package-with-python2 python-pyaml)) - (define-public python-pyyaml-env-tag (package (name "python-pyyaml-env-tag") -- cgit v1.2.3 From 3bf50750fcf4630bb1f7e1cc447cb0dd420fbab3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:52:49 -0400 Subject: gnu: Remove python2-simplejson. * gnu/packages/python-xyz.scm (python2-simplejson): Delete variable. --- 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 ae7c51a5a9..3a2cd2c1b2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2724,9 +2724,6 @@ (define-public python-simplejson Python 3.3+.") (license license:x11))) -(define-public python2-simplejson - (package-with-python2 python-simplejson)) - (define-public python-pyicu (package -- cgit v1.2.3 From 42333736e05161d29aac60b6a810f56160987057 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:52:52 -0400 Subject: gnu: Remove python2-pylev. * gnu/packages/python-xyz.scm (python2-pylev): Delete variable. --- 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 3a2cd2c1b2..667e2ceaf7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16447,9 +16447,6 @@ (define-public python-pylev @url{http://en.wikipedia.org/wiki/Levenshtein_distance}.") (license license:bsd-3))) -(define-public python2-pylev - (package-with-python2 python-pylev)) - (define-public python-cleo (package (name "python-cleo") -- cgit v1.2.3 From 018c96f0c780b1605923c427a3b6f6a0600669cf Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:53:06 -0400 Subject: gnu: Remove python2-soupsieve. * gnu/packages/python-xyz.scm (python2-soupsieve): Delete variable. --- gnu/packages/python-xyz.scm | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 667e2ceaf7..9ba7e9ce76 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9328,25 +9328,8 @@ (define-public python-soupsieve CSS selectors. Soup Sieve currently provides selectors from the CSS level 1 specifications up through the latest CSS level 4 drafts and beyond (though some are not yet implemented).") - (properties `((python2-variant . ,(delay python2-soupsieve)))) (license license:expat))) -;; This is the last version that supports python-2 -(define-public python2-soupsieve - (let ((base (package-with-python2 (strip-python2-variant python-soupsieve)))) - (package - (inherit base) - (version "1.9.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "soupsieve" version)) - (sha256 - (base32 - "1apgqxngi1216h1cyvrvj9gy3wf45mh1lz4n76j26jf3k36bm1br")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs base) - (prepend python2-backports-functools-lru-cache)))))) (define-public python-netifaces (package -- cgit v1.2.3 From 677ed5345309e64b5f7c3425b67cc8cd97dabc87 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:53:19 -0400 Subject: gnu: Remove python2-atomicwrites. * gnu/packages/python-xyz.scm (python2-atomicwrites): Delete variable. --- 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 9ba7e9ce76..875ef1753c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13823,9 +13823,6 @@ (define-public python-atomicwrites (home-page "https://github.com/untitaker/python-atomicwrites") (license license:expat))) -(define-public python2-atomicwrites - (package-with-python2 python-atomicwrites)) - (define-public python-atomicwrites-1.4 (package (inherit python-atomicwrites) -- cgit v1.2.3 From 46933e2b7e222f12313237e2601054036f7c8641 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:53:43 -0400 Subject: gnu: Remove python2-importlib-metadata. * gnu/packages/python-xyz.scm (python2-importlib-metadata): Delete variable. (python2-importlib-metadata-bootstrap): Likewise. --- gnu/packages/python-xyz.scm | 44 -------------------------------------------- 1 file changed, 44 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 875ef1753c..577f6d3ce2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8012,52 +8012,8 @@ (define-public python-importlib-metadata @code{pkg_resources} entry point API and metadata API. Along with @code{importlib.resources} in Python 3.7 and newer, this can eliminate the need to use the older and less efficient @code{pkg_resources} package.") - (properties `((python2-variant . ,(delay python2-importlib-metadata)))) (license license:asl2.0))) -(define-public python2-importlib-metadata - (let ((base (package-with-python2 (strip-python2-variant - python-importlib-metadata)))) - (package/inherit base - (name "python2-importlib-metadata") - (version "1.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "importlib_metadata" version)) - (sha256 - (base32 - "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86")))) - (arguments (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) ;reset standard phases - #~%standard-phases))) - (native-inputs - `(("python-setuptools-scm" ,python2-setuptools-scm) - ("python-pyfakefs" ,python2-pyfakefs-bootstrap) - ("python-packaging" ,python2-packaging-bootstrap))) - (propagated-inputs - `(("python-configparser" ,python2-configparser) - ("python-contextlib2" ,python2-contextlib2) - ("python-importlib-resources" ,python2-importlib-resources) - ("python-pathlib2" ,python2-pathlib2) - ,@(package-propagated-inputs base)))))) - -;; This package is used by python2-pytest, and thus must not depend on it. -(define-public python2-importlib-metadata-bootstrap - (hidden-package - (package/inherit - python2-importlib-metadata - (name "python2-importlib-metadata-bootstrap") - (arguments - `(#:tests? #f - ,@(package-arguments python2-importlib-metadata))) - (propagated-inputs - `(("python-zipp" ,python2-zipp-bootstrap) - ("python-pathlib2" ,python2-pathlib2-bootstrap) - ("python-configparser" ,python2-configparser) - ("python-contextlib2" ,python2-contextlib2-bootstrap) - ("python-importlib-resources" ,python2-importlib-resources-bootstrap)))))) - (define-public python-importmagic (package (name "python-importmagic") -- cgit v1.2.3 From 80e3ab8d1ee13ab24c29be03c66f6ec6c3b72ec2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 02:53:51 -0400 Subject: gnu: Remove python2-pyicu. * gnu/packages/python-xyz.scm (python2-pyicu): Delete variable. --- 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 577f6d3ce2..7478d29065 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2747,9 +2747,6 @@ (define-public python-pyicu "PyICU is a python extension wrapping the ICU C++ API.") (license license:x11))) -(define-public python2-pyicu - (package-with-python2 python-pyicu)) - (define-public python-dogtail (package (name "python-dogtail") -- cgit v1.2.3 From 9bf8cc112cbc9fb3936cc8cfb0693cc67602749b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:07:49 -0400 Subject: gnu: Remove python2-unidecode. * gnu/packages/python-xyz.scm (python2-unidecode): Delete variable. --- 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 7478d29065..c515954b48 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3622,9 +3622,6 @@ (define-public python-unidecode somewhat intelligible.") (license license:gpl2+))) -(define-public python2-unidecode - (package-with-python2 python-unidecode)) - (define-public python-text-unidecode (package (name "python-text-unidecode") -- cgit v1.2.3 From f14f81e497c0d93ac9e9bf145e2b7df54da94617 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:07:53 -0400 Subject: gnu: Remove python2-configparser. * gnu/packages/python-xyz.scm (python2-configparser): Delete variable. --- 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 c515954b48..cb18fec830 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18943,9 +18943,6 @@ (define-public python-configparser in other versions.") (license license:expat))) -(define-public python2-configparser - (package-with-python2 python-configparser)) - (define-public python-iniconfig (package (name "python-iniconfig") -- cgit v1.2.3 From ca7117a9ddc6a62c0ccd0d23112a632db0d9c2d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:08:15 -0400 Subject: gnu: Remove python2-importlib-resources. * gnu/packages/python-xyz.scm (python2-importlib-resources): Delete variable. (python2-importlib-resources-bootstrap): Likewise. (python-importlib-resources)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 57 +++++---------------------------------------- 1 file changed, 6 insertions(+), 51 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cb18fec830..a3c525b2f1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7899,66 +7899,21 @@ (define-public python-importlib-resources (package (name "python-importlib-resources") (version "3.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "importlib_resources" version)) - (sha256 - (base32 - "1hq626mx5jl9zfl0wdrjkxsnh8qd98fqv322n68b9251xjk4bxqr")))) - (build-system python-build-system) - (native-inputs - (list python-setuptools-scm python-toml)) - (home-page "http://importlib-resources.readthedocs.io/") - (synopsis "Read resources from Python packages") - (description - "@code{importlib_resources} is a backport of Python 3's standard library -@code{importlib.resources} module for Python 2.7, and Python 3.") - (properties `((python2-variant . ,(delay python2-importlib-resources)))) - (license license:asl2.0))) - -(define-public python2-importlib-resources - (package - (name "python2-importlib-resources") - (version "1.0.2") (source (origin (method url-fetch) (uri (pypi-uri "importlib_resources" version)) (sha256 (base32 - "0y3hg12iby1qyaspnbisz4s4vxax7syikk3skznwqizqyv89y9yk")))) + "1hq626mx5jl9zfl0wdrjkxsnh8qd98fqv322n68b9251xjk4bxqr")))) (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases (modify-phases %standard-phases - ;; The build system tests for python-wheel, but it is - ;; not required for Guix nor the test suite. Just drop - ;; it to make bootstrapping pytest easier. - (add-after 'unpack 'drop-wheel-dependency - (lambda _ - (substitute* "setup.cfg" - (("^[[:blank:]]+wheel") - "")) - #t))))) - (propagated-inputs - (list python2-pathlib2 python2-typing)) - (home-page "https://gitlab.com/python-devs/importlib_resources") - (synopsis "Backport of @code{importlib.resources} from Python 3.7") + (native-inputs (list python-setuptools-scm python-toml)) + (home-page "http://importlib-resources.readthedocs.io/") + (synopsis "Read resources from Python packages") (description - "This package provides an implementation of @code{importlib.resources} -for older versions of Python.") + "@code{importlib_resources} is a backport of Python 3's standard library +@code{importlib.resources} module for Python 2.7, and Python 3.") (license license:asl2.0))) -;; For importlib-metadata-bootstrap below. -(define-public python2-importlib-resources-bootstrap - (hidden-package - (package/inherit - python2-importlib-resources - (name "python2-importlib-resources-bootstrap") - (propagated-inputs - `(("python-pathlib2-bootstrap" ,python2-pathlib2-bootstrap) - ("python-typing" ,python2-typing)))))) - (define-public python-importlib-metadata (package (name "python-importlib-metadata") -- cgit v1.2.3 From 5f973da340d149b07f8a1401c9fa77aa45f02621 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:08:37 -0400 Subject: gnu: Remove python2-pysocks. * gnu/packages/python-xyz.scm (python2-pysocks): Delete variable. --- 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 a3c525b2f1..b47096d5ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20072,9 +20072,6 @@ (define-public python-pysocks version of @code{SocksiPy} with bug fixes and extra features.") (license license:bsd-3))) -(define-public python2-pysocks - (package-with-python2 python-pysocks)) - (define-public python-pydiff (package (name "python-pydiff") -- cgit v1.2.3 From 6d22dc676a4e1ad9d5aea7a47f95a1242ada957a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:08:52 -0400 Subject: gnu: Remove python2-backports-functools-lru-cache. * gnu/packages/python-xyz.scm (python2-backports-functools-lru-cache): Delete variable. --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b47096d5ce..aa9b33165b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18854,29 +18854,6 @@ (define-public python-isort editors.") (license license:expat))) -(define-public python2-backports-functools-lru-cache - (package - (name "python2-backports-functools-lru-cache") - (version "1.6.1") - (source - (origin - (method url-fetch) - ;; only the pypi tarballs contain the necessary metadata - (uri (pypi-uri "backports.functools_lru_cache" version)) - (sha256 - (base32 - "0jidrkk2w6bhjm197plxiaxrav64mgcrign0bfyr7md2ilc5zplg")))) - (build-system python-build-system) - (native-inputs - (list python2-setuptools-scm)) - (arguments - `(#:python ,python-2)) - (home-page "https://github.com/jaraco/backports.functools_lru_cache") - (synopsis "Backport of functools.lru_cache from Python 3.3") - (description "@code{python2-backports-functools-lru-cache} is a backport - of @code{functools.lru_cache} from python 3.3.") - (license license:expat))) - (define-public python-configparser (package (name "python-configparser") -- cgit v1.2.3 From 206c05deadb3113632b759bd613d80c246d72122 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:15:05 -0400 Subject: gnu: Remove python2-pathlib2. * gnu/packages/python-xyz.scm (python2-pathlib2): Delete variable. (python2-pathlib2-bootstrap): Likewise. --- gnu/packages/python-xyz.scm | 47 --------------------------------------------- 1 file changed, 47 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aa9b33165b..3a92429b96 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15401,53 +15401,6 @@ (define-public python-pathlib anymore.") (license license:expat))) -(define-public python2-pathlib2 - (package - (name "python2-pathlib2") - (version "2.3.5") - (source (origin - (method url-fetch) - (uri (pypi-uri "pathlib2" version)) - (sha256 - (base32 - "0s4qa8c082fdkb17izh4mfgwrjd1n5pya18wvrbwqdvvb5xs9nbc")))) - (build-system python-build-system) - ;; We only need the the Python 2 variant, since for Python 3 our minimum - ;; version is 3.4 which already includes this package as part of the - ;; standard library. - (arguments - `(#:python ,python-2)) - (propagated-inputs - (list python2-scandir python2-six)) - (home-page "https://pypi.org/project/pathlib2/") - (synopsis "Object-oriented file system paths - backport of standard -pathlib module") - (description "The goal of pathlib2 is to provide a backport of standard -pathlib module which tracks the standard library module, so all the newest -features of the standard pathlib can be used also on older Python versions. - -Pathlib offers a set of classes to handle file system paths. It offers the -following advantages over using string objects: - -@enumerate -@item No more cumbersome use of os and os.path functions. Everything can -be done easily through operators, attribute accesses, and method calls. -@item Embodies the semantics of different path types. For example, -comparing Windows paths ignores casing. -@item Well-defined semantics, eliminating any inconsistencies or -ambiguities (forward vs. backward slashes, etc.). -@end enumerate") - (license license:expat))) - -(define-public python2-pathlib2-bootstrap - (hidden-package - (package - (inherit python2-pathlib2) - (name "python2-pathlib2-bootstrap") - (propagated-inputs - `(("python2-scandir" ,python2-scandir) - ("python2-six" ,python2-six-bootstrap)))))) - (define-public python-jellyfish (package (name "python-jellyfish") -- cgit v1.2.3 From 405a7b3f47d54ce794b6bf1506547bb722e6d46e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:15:11 -0400 Subject: gnu: Remove python2-typing. * gnu/packages/python-xyz.scm (python2-typing): Delete variable. --- gnu/packages/python-xyz.scm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3a92429b96..b67dbaad91 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21087,28 +21087,6 @@ (define-public python-typeguard with PEP 484 argument (and return) type annotations.") (license license:expat))) -(define-public python2-typing - (package - (name "python2-typing") - (version "3.10.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "typing" version)) - (sha256 - (base32 "0c5il4d68fd4qrm5k3dps70j0xz0n5krj6lhwn9vzpal3whsvd0k")))) - (build-system python-build-system) - (arguments (list #:python python-2)) - (home-page "https://docs.python.org/3/library/typing.html") - (synopsis "Type hints for Python") - (description "This is a backport of the standard library @code{typing} -module to Python versions older than 3.5. Typing defines a standard notation -for Python function and variable type annotations. The notation can be used -for documenting code in a concise, standard format, and it has been designed -to also be used by static and runtime type checkers, static analyzers, IDEs -and other tools.") - (license license:psfl))) - (define-public python-typing-extensions (package (name "python-typing-extensions") -- cgit v1.2.3 From dd915ae36952f31ecf68b9b72c6e630b5abfd75d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:15:29 -0400 Subject: gnu: Remove python2-contextlib2. * gnu/packages/python-xyz.scm (python2-contextlib2): Delete variable. (python2-contextlib2-bootstrap): Likewise. --- gnu/packages/python-xyz.scm | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b67dbaad91..1568ed486d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13656,34 +13656,8 @@ (define-public python-contextlib2 provides utilities for common tasks involving decorators and context managers. It also contains additional features that are not part of the standard library.") - (properties `((python2-variant . ,(delay python2-contextlib2)))) (license license:psfl))) -(define-public python2-contextlib2 - (let ((base (package-with-python2 - (strip-python2-variant python-contextlib2)))) - (package/inherit base - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - `(modify-phases ,phases - (replace 'check - (lambda _ (invoke "python" "test_contextlib2.py" "-v"))))))) - (native-inputs - `(("python2-unittest2" ,python2-unittest2)))))) - -;; This package is used by python2-pytest via python2-importlib-metadata, -;; and thus can not depend on python-unittest2 (which depends on pytest). -(define-public python2-contextlib2-bootstrap - (hidden-package - (package/inherit - python2-contextlib2 - (name "python2-contextlib2-bootstrap") - (arguments - `(#:tests? #f - ,@(package-arguments python2-contextlib2))) - (native-inputs '())))) - (define-public python-texttable (package (name "python-texttable") -- cgit v1.2.3 From 6bafe76c351c375746b69ff30657c2295d4a4cfa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:19:54 -0400 Subject: gnu: Remove python2-ipaddress. * gnu/packages/python-xyz.scm (python2-ipaddress): Delete variable. --- 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 1568ed486d..56a8edc864 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12004,9 +12004,6 @@ (define-public python-ipaddress IPv6 addresses and networks.") (license license:psfl))) -(define-public python2-ipaddress - (package-with-python2 python-ipaddress)) - (define-public python-asn1tools (package (name "python-asn1tools") -- cgit v1.2.3 From c7f95514c25bcdd8e6c9c7a105428ed007c1ac37 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:19:58 -0400 Subject: gnu: Remove python2-scandir. * gnu/packages/python-xyz.scm (python2-scandir): Delete variable. --- 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 56a8edc864..a370e5e095 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19033,9 +19033,6 @@ (define-public python-scandir This package is part of the Python standard library since version 3.5.") (license license:bsd-3))) -(define-public python2-scandir - (package-with-python2 python-scandir)) - (define-public python-factory-boy (package (name "python-factory-boy") -- cgit v1.2.3 From 4687f296e35f9e763dd56078d93990c7d545803e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:20:13 -0400 Subject: gnu: Remove python2-backport-ssl-match-hostname. * gnu/packages/python-xyz.scm (python2-backport-ssl-match-hostname): Delete variable. --- gnu/packages/python-xyz.scm | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a370e5e095..88c882eafa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1259,30 +1259,6 @@ (define-public python-babel etc.") (license license:bsd-3))) -(define-public python2-backport-ssl-match-hostname - (package - (name "python2-backport-ssl-match-hostname") - (version "3.5.0.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "backports.ssl_match_hostname" version)) - (sha256 - (base32 - "1wndipik52cyqy0677zdgp90i435pmvwd89cz98lm7ri0y3xjajh")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:tests? #f)) ; no test target - (home-page "https://bitbucket.org/brandon/backports.ssl_match_hostname") - (synopsis "Backport of ssl.match_hostname() function from Python 3.5") - (description - "This backport brings the ssl.match_hostname() function to users of -earlier versions of Python. The function checks the hostname in the -certificate returned by the server to which a connection has been established, -and verifies that it matches the intended target hostname.") - (license license:psfl))) - (define-public python-bidict (package (name "python-bidict") -- cgit v1.2.3 From afdf9e409017a14505c5a463cfd7c87e06c5ef78 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:20:49 -0400 Subject: gnu: Remove python2-idna. * gnu/packages/python-xyz.scm (python2-idna): Delete variable. --- 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 88c882eafa..9974263a4e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12026,9 +12026,6 @@ (define-public python-idna specification.") (license license:bsd-4))) -(define-public python2-idna - (package-with-python2 python-idna)) - (define-public python-libsass (package (name "python-libsass") -- cgit v1.2.3 From cd78abdbe7b26e8e31b5918760f2b2b3948008dc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 May 2022 03:21:01 -0400 Subject: gnu: Remove python2-pretend. * gnu/packages/python-xyz.scm (python2-pretend): Delete variable. --- 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 9974263a4e..31b8791d5a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12195,9 +12195,6 @@ (define-public python-pretend responses, rather than doing any computation.") (license license:bsd-3))) -(define-public python2-pretend - (package-with-python2 python-pretend)) - (define-public python-pip (package (name "python-pip") -- cgit v1.2.3 From 9022934059f0159007b3eda737d97971eaa39bc1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 22:48:30 -0400 Subject: gnu: Remove python2-seaborn. * gnu/packages/python-xyz.scm (python2-seaborn): Delete variable. --- gnu/packages/python-xyz.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31b8791d5a..3e8d10d8bc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9653,21 +9653,8 @@ (define-public python-seaborn graphics in Python. It is built on top of matplotlib and tightly integrated with the PyData stack, including support for numpy and pandas data structures and statistical routines from scipy and statsmodels.") - (properties `((python2-variant . ,(delay python2-seaborn)))) (license license:bsd-3))) -;; 0.9.1 is the last release with support for Python 2. -(define-public python2-seaborn - (let ((base (package-with-python2 (strip-python2-variant python-seaborn)))) - (package - (inherit base) - (version "0.9.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "seaborn" version)) - (sha256 - (base32 - "1bjnshjz4d6z3vrwfwall1a3yh8h3a1h47c3fg7458x9426alcys"))))))) (define-public python-session-info (package -- cgit v1.2.3 From e3b18cfbb7751397ab273bb503b7e19c20c5d2e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 15 May 2022 22:41:27 -0400 Subject: gnu: python-gamera: Update to 4.0.0. * gnu/packages/python-xyz.scm (python2-gamera): Rename to... (python-gamera): ... this. Update to 4.0.0. [python]: Delete argument. [phases]{check}: New override. [native-inputs]: Add python-pytest. --- gnu/packages/python-xyz.scm | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3e8d10d8bc..74b927eab2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -26357,17 +26357,17 @@ (define-public python-versioneer process.") (license license:public-domain))) -(define-public python2-gamera +(define-public python-gamera (package - (name "python2-gamera") - (version "3.4.4") + (name "python-gamera") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "https://gamera.informatik.hsnr.de/download/" "gamera-" version ".tar.gz")) (sha256 - (base32 "1g4y1kxk1hmxfsiz682hbxvwryqilnb21ci509m559yp7hcliiyy")) + (base32 "0fhlwbvpm3k54n4aa1y6qd348jqrb54ak9p0ic16drx7f07dsq05")) (modules '((guix build utils))) (snippet '(begin @@ -26377,17 +26377,33 @@ (define-public python2-gamera "src/libtiff" "src/zlib-1.2.8")))))) (build-system python-build-system) - (inputs - (list libpng libtiff zlib)) (arguments - `(#:python ,python-2 - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'disable-wx-support (lambda _ (substitute* "setup.py" (("no_wx = False") - "no_wx = True"))))))) + "no_wx = True")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Some tests require a writable HOME directory and test + ;; directory. + (setenv "HOME" "/tmp") + (mkdir "tests/tmp") ;the code assumes this directory exists + ;; (for-each make-file-writable (find-files "tests")) + (with-directory-excursion "tests" + (invoke "pytest" "-vv" + ;; This test causes gamera/gendoc.py to be loaded, + ;; which fails due to the missing docutils, pygments + ;; and silvercity (very old, unpackaged) libraries. + "--ignore" "test_plugins.py" + ;; This test triggers a segfault (see: + ;; https://github.com/hsnr-gamera/gamera-4/issues/47). + "--ignore" "test_rle.py")))))))) + (native-inputs (list python-pytest)) + (inputs (list libpng libtiff zlib)) (synopsis "Framework for building document analysis applications") (description "Gamera is a toolkit for building document image recognition systems.") -- cgit v1.2.3 From 493ee41adaeaddc7e750eb16290cc2f43e842684 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 22:57:19 -0400 Subject: gnu: Remove python2-pillow. * gnu/packages/python-xyz.scm (python2-pillow): Delete variable. --- gnu/packages/python-xyz.scm | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74b927eab2..12ac929c51 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6862,24 +6862,6 @@ (define-public python-pillow "http://www.pythonware.com/products/pil/license.htm" "The PIL Software License")))) -(define-public python2-pillow - (package-with-python2 - (package - (inherit (strip-python2-variant python-pillow)) - ;; Version 6 is the last series with Python 2 support. - (version "6.2.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Pillow" version)) - (sha256 - (base32 - "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv")))) - (arguments - (substitute-keyword-arguments (package-arguments python-pillow) - ;; FIXME: One of the tests is failing. - ((#:tests? _ #f) #f)))))) - (define-public python-pillow-2.9 (package (inherit python-pillow) -- cgit v1.2.3 From dba760f78cc831f6415d3c81a8a88d00183c7aee Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 22:57:22 -0400 Subject: gnu: python-pillow: Update to 9.0.0. * gnu/packages/python-xyz.scm (python-pillow): Update to 9.0.0. --- gnu/packages/python-xyz.scm | 71 ++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 39 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 12ac929c51..3c30886cd8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6808,45 +6808,39 @@ (define-public python-pillow (package (name "python-pillow") (version "9.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Pillow" version)) - (sha256 - (base32 - "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "src/thirdparty"))))) + (source (origin + (method url-fetch) + (uri (pypi-uri "Pillow" version)) + (sha256 + (base32 + "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "src/thirdparty"))))) (build-system python-build-system) - (native-inputs - (list python-pytest)) - (inputs - (list freetype - lcms - libjpeg-turbo - libtiff - libwebp - openjpeg - zlib)) - (propagated-inputs - (list python-olefile)) + (native-inputs (list python-pytest)) + (inputs (list freetype + lcms + libjpeg-turbo + libtiff + libwebp + openjpeg + zlib)) + (propagated-inputs (list python-olefile)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-ldconfig - (lambda _ - (substitute* "setup.py" - (("\\['/sbin/ldconfig', '-p'\\]") "['true']")))) - (replace 'check - (lambda* (#:key outputs inputs tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - ;; Make installed package available for running the tests. - (add-installed-pythonpath inputs outputs) - (invoke "python" "selftest.py" "--installed") - (invoke "python" "-m" "pytest" "-vv"))))))) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-ldconfig + (lambda _ + (substitute* "setup.py" + (("\\['/sbin/ldconfig', '-p'\\]") "['true']")))) + (replace 'check + (lambda* (#:key outputs inputs tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + (add-installed-pythonpath inputs outputs) + (invoke "python" "selftest.py" "--installed") + (invoke "python" "-m" "pytest" "-vv"))))))) (home-page "https://python-pillow.org") (synopsis "Fork of the Python Imaging Library") (description @@ -6856,8 +6850,7 @@ (define-public python-pillow capabilities. The core image library is designed for fast access to data stored in a few basic pixel formats. It should provide a solid foundation for a general image processing tool.") - (properties `((python2-variant . ,(delay python2-pillow)) - (cpe-name . "pillow"))) + (properties `((cpe-name . "pillow"))) (license (license:x11-style "http://www.pythonware.com/products/pil/license.htm" "The PIL Software License")))) -- cgit v1.2.3 From 030e5793d64984910c61000bac17577141004fef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 May 2022 23:01:03 -0400 Subject: gnu: Remove python2-olefile. * gnu/packages/python-xyz.scm (python2-olefile): Delete variable. --- 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 3c30886cd8..1f72d1a284 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6750,9 +6750,6 @@ (define-public python-olefile the OleFileIO module from PIL, the Python Image Library.") (license license:bsd-3))) -(define-public python2-olefile - (package-with-python2 python-olefile)) - (define-public python-pypdf3 (package (name "python-pypdf3") -- cgit v1.2.3 From 6a778b47052d27e4edb242c32fccd9339c7d5a12 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 6 May 2022 00:03:20 -0400 Subject: gnu: python-fastbencode: Build C extensions. * gnu/packages/python-xyz.scm (python-fastbencode) [source]: Delete pre-generated C source files in snippet. [native-inputs]: Add python-cython. --- gnu/packages/python-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1f72d1a284..2c141b104c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12663,9 +12663,13 @@ (define-public python-fastbencode (origin (method url-fetch) (uri (pypi-uri "fastbencode" version)) + (modules '((guix build utils))) + ;; Delete pre-generated Cython C files. + (snippet '(for-each delete-file (find-files "." "\\.c$"))) (sha256 (base32 "1r66w3vpmvfmssshjpgqaj2m14c8p94nymr96mwn61idajz9mg5n")))) (build-system python-build-system) + (native-inputs (list python-cython)) (home-page "https://github.com/breezy-team/fastbencode") (synopsis "Python Bencode (de)serializer with optional fast C extensions") (description -- cgit v1.2.3 From 26d35cb40d32d9717160051851a1308365849656 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:49:02 -0400 Subject: gnu: Remove python2-functools32. * gnu/packages/python-xyz.scm (python2-functools32): Delete variable. --- gnu/packages/python-xyz.scm | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2c141b104c..a157f67e78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13975,29 +13975,6 @@ (define-public python-hissp to the Python ecosystem.") (license license:asl2.0))) -(define-public python2-functools32 - (package - (name "python2-functools32") - (version "3.2.3-2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "functools32" version)) - (sha256 - (base32 - "0v8ya0b58x47wp216n1zamimv4iw57cxz3xxhzix52jkw3xks9gn")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:tests? #f)) ; no test target - (home-page "https://github.com/MiCHiLU/python-functools32") - (synopsis - "Backport of the functools module from Python 3.2.3") - (description - "This package is a backport of the @code{functools} module from Python -3.2.3 for use with older versions of Python and PyPy.") - (license license:expat))) - (define-public python-promise (package (name "python-promise") -- cgit v1.2.3 From c71ab167f2ebfa0200c4e9bcc21e34adca26d053 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:54:21 -0400 Subject: gnu: Remove python2-funcsigs. * gnu/packages/python-xyz.scm (python2-funcsigs): Delete variable. --- gnu/packages/python-xyz.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a157f67e78..66ef65fdbd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3120,27 +3120,6 @@ (define-public python-miniupnpc (home-page "http://miniupnp.free.fr") (license license:bsd-3))) -(define-public python2-funcsigs - (package - (name "python2-funcsigs") - (version "1.0.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "funcsigs" version)) - (sha256 - (base32 - "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2)) - (native-inputs - (list python2-unittest2)) - (home-page "http://funcsigs.readthedocs.org") - (synopsis "Python function signatures from PEP362") - (description - "Backport of @code{funcsigs} which was introduced in Python 3.3.") - (license license:asl2.0))) - (define-public python-py (package (name "python-py") -- cgit v1.2.3 From 8a60b34e2b65e8f4a35422bd5a34e1695e222a24 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:54:46 -0400 Subject: gnu: Remove python2-sortedcontainers. * gnu/packages/python-xyz.scm (python2-sortedcontainers): Delete variable. --- 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 66ef65fdbd..2ad95ff251 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22362,9 +22362,6 @@ (define-public python-sortedcontainers pure-Python.") (license license:asl2.0))) -(define-public python2-sortedcontainers - (package-with-python2 python-sortedcontainers)) - (define python-cloudpickle-testpkg (package (name "python-cloudpickle-testpkg") -- cgit v1.2.3 From 22e269f566ea31e339b6afe3ce80000e88735a5c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:58:25 -0400 Subject: gnu: Remove python2-traceback2. * gnu/packages/python-xyz.scm (python2-traceback2): Delete variable. --- 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 2ad95ff251..fea173baa2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20060,9 +20060,6 @@ (define-public python-traceback2 interpreter when it prints a stack trace.") (license license:psfl))) -(define-public python2-traceback2 - (package-with-python2 python-traceback2)) - (define-public python-ratelimiter (package (name "python-ratelimiter") -- cgit v1.2.3 From ceee9eb31276b5758155377e1f59a78c7030c543 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 20:58:47 -0400 Subject: gnu: Remove python2-linecache2. * gnu/packages/python-xyz.scm (python2-linecache2): Delete variable. --- 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 fea173baa2..3c4d9f73b7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20029,9 +20029,6 @@ (define-public python-linecache2 lines are read from a single file.") (license license:psfl))) -(define-public python2-linecache2 - (package-with-python2 python-linecache2)) - (define-public python-traceback2 (package (name "python-traceback2") -- cgit v1.2.3 From 5551922a24350d525046afd1d58ed2449946edde Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 21:50:51 -0400 Subject: gnu: Remove python2-enum34. * gnu/packages/python-xyz.scm (python2-enum34): Delete variable. --- 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 3c4d9f73b7..9307adb536 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2816,9 +2816,6 @@ (define-public python-enum34 backported for previous versions of Python from 2.4 to 3.3.") (license license:bsd-3))) -(define-public python2-enum34 - (package-with-python2 python-enum34)) - (define-public python-parse-type (package (name "python-parse-type") -- cgit v1.2.3 From 17375266ea2e94726bf3d28c1d4fb3899c115377 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 12 May 2022 21:52:31 -0400 Subject: gnu: Remove python2-appdirs. * gnu/packages/python-xyz.scm (python2-appdirs): Delete variable. --- 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 9307adb536..33137bf050 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11095,9 +11095,6 @@ (define-public python-appdirs should be stored on various operating systems.") (license license:expat))) -(define-public python2-appdirs - (package-with-python2 python-appdirs)) - (define-public python-gorilla (package (name "python-gorilla") -- cgit v1.2.3 From affa792b5e48ac4f1355412338ef819f7a5088e0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 13:48:19 -0400 Subject: gnu: Remove python2-more-itertools. * gnu/packages/python-xyz.scm (python2-more-itertools): Delete variable. (python-jsonpatch)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 33137bf050..2c081908f3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21091,26 +21091,8 @@ (define-public python-more-itertools number of iterator building blocks inspired by constructs from APL, Haskell, and SML. @code{more-itertools} includes additional building blocks for working with iterables.") - (properties `((python2-variant . ,(delay python2-more-itertools)))) (license license:expat))) -;; The 5.x series are the last versions supporting Python 2.7. -(define-public python2-more-itertools - (package - (inherit python-more-itertools) - (name "python2-more-itertools") - (version "5.0.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "more-itertools" version)) - (sha256 - (base32 - "1r12cm6mcdwdzz7d47a6g4l437xsvapdlgyhqay3i2nrlv03da9q")))) - (arguments - `(#:python ,python-2)) - (propagated-inputs - `(("python2-six" ,python2-six-bootstrap))))) - (define-public python-latexcodec (package (name "python-latexcodec") -- cgit v1.2.3 From fdf967e8fe0f4393d1788d0e103c6eb78d2aec86 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 13:48:50 -0400 Subject: gnu: Remove python2-tlsh. * gnu/packages/python-xyz.scm (python2-tlsh): Delete variable. --- gnu/packages/python-xyz.scm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2c081908f3..5fa13f01a4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12269,11 +12269,6 @@ (define-public python-tlsh a hash value.") (license license:asl2.0))) -(define-public python2-tlsh - (package/inherit python-tlsh - (name "python2-tlsh") - (inputs `(("python" ,python-2))))) - (define-public python-termcolor (package (name "python-termcolor") -- cgit v1.2.3 From 425783b5dcec38842718829c9fe56741bbcfc567 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 13:50:50 -0400 Subject: gnu: Remove python2-cython. * gnu/packages/python-xyz.scm (python2-cython): Delete variable. (python-feedgenerator)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5fa13f01a4..e1627a960a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5313,42 +5313,7 @@ (define-public python-cython (description "Cython is an optimising static compiler for both the Python programming language and the extended Cython programming language. It makes writing C extensions for Python as easy as Python itself.") - (license license:asl2.0) - (properties `((python2-variant . ,(delay python2-cython)))))) - -(define-public python2-cython - (let ((base (package-with-python2 (strip-python2-variant python-cython)))) - (package/inherit base - (name "python2-cython") - (inputs - `(("python-2" ,python-2))) ;this is not automatically changed - (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'check 'adjust-test_embed - (lambda _ - (substitute* "runtests.py" - ;; test_embed goes great lengths to find the static libpythonX.Y.a - ;; so it can give the right -L flag to GCC when embedding static - ;; builds of Python. It is unaware that the Python "config" - ;; directory (where the static library lives) was renamed in - ;; Python 3, and falls back to sysconfig.get_config_var('LIBDIR'), - ;; which works fine, because that is where the shared library is. - ;; - ;; It also appears to be unaware that the Makefile in Demos/embed - ;; already unconditionally pass the static library location to GCC, - ;; after checking sysconfig.get_config_var('LIBPL). - ;; - ;; The effect is that the linker is unable to resolve libexpat - ;; symbols when building for Python 2, because neither the Python 2 - ;; shared library nor Expat is available. To fix it, we can either - ;; add Expat as an input and make it visible to the linker, or just - ;; prevent it from overriding the Python shared library location. - ;; The end result is identical, so we take the easy route. - ((" or libname not in os\\.listdir\\(libdir\\)") - "")) - #t))))))))) + (license license:asl2.0))) (define-public python-cython-3 (package -- cgit v1.2.3 From 61d0c52b9d0bba9425df76781d58618cb655c4f3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:00:50 -0400 Subject: gnu: Remove python2-attrs-bootstrap. * gnu/packages/python-xyz.scm (python2-attrs-bootstrap): Delete variable. --- 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 e1627a960a..9b78bee8e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18413,9 +18413,6 @@ (define-public python-attrs-bootstrap (native-inputs `()) (arguments `(#:tests? #f)))) -(define-public python2-attrs-bootstrap - (package-with-python2 python-attrs-bootstrap)) - (define-public python-cliapp (package (name "python-cliapp") -- cgit v1.2.3 From 9c19bdbf5cb0da0579db19d2759b91f28fc00220 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:06:14 -0400 Subject: gnu: python-setproctitle: Delete obsolete phase. * gnu/packages/python-xyz.scm (python-setproctitle) [phases]{patch-Makefile}: Delete phase. --- gnu/packages/python-xyz.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9b78bee8e2..d3e3da4e05 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17608,17 +17608,6 @@ (define-public python-setproctitle (arguments '(#:phases (modify-phases %standard-phases - (add-before 'check 'patch-Makefile - ;; Stricly this is only required for the python2 variant. - ;; But adding a phase in an inherited package seems to be - ;; cumbersum. So we patch even for python3. - (lambda _ - (let ((nose (assoc-ref %build-inputs "python2-nose"))) - (when nose - (substitute* "Makefile" - (("\\$\\(PYTHON\\) [^ ]which nosetests[^ ] ") - (string-append nose "/bin/nosetests ")))) - #t))) (replace 'check (lambda _ (setenv "PYTHON" (or (which "python3") (which "python"))) -- cgit v1.2.3 From 88739a96be164e19dbe79c690e94f90cb025d69e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:10:52 -0400 Subject: gnu: Remove python2-pyyaml. * gnu/packages/python-xyz.scm (python2-pyyaml): Delete variable. (python-jsonschema)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d3e3da4e05..2aea3d6c25 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3746,8 +3746,7 @@ (define-public python-pyyaml complete YAML 1.1 parser, Unicode support, pickle support, capable extension API, and sensible error messages. PyYAML supports standard YAML tags and provides Python-specific tags that represent an arbitrary Python object.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-pyyaml)))))) + (license license:expat))) (define-public python-pyyaml-5 (package @@ -3761,19 +3760,6 @@ (define-public python-pyyaml-5 (base32 "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))))) -(define-public python2-pyyaml - (let ((base (package-with-python2 (strip-python2-variant python-pyyaml)))) - (package - (inherit base) - (version "5.4.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "PyYAML" version)) - (sha256 - (base32 - "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))))) - (define-public python-vine (package (name "python-vine") -- cgit v1.2.3 From e5c6816ddffd597f6f203a5ba686c0113ecd9f33 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:35:25 -0400 Subject: gnu: Remove python2-wcwidth. * gnu/packages/python-xyz.scm (python2-wcwidth): Delete variable. --- 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 2aea3d6c25..83200aa813 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16024,9 +16024,6 @@ (define-public python-wcwidth specified in POSIX.1-2001 and POSIX.1-2008.") (license license:expat))) -(define-public python2-wcwidth - (package-with-python2 python-wcwidth)) - (define-public python-chai (package (name "python-chai") -- cgit v1.2.3 From 9165283a1cdd087d76b70563315eb59e8a608704 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:36:29 -0400 Subject: gnu: Remove python2-setuptools-scm. * gnu/packages/python-xyz.scm (python2-setuptools-scm): Delete variable. (python-lfdfiles)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 83200aa813..cd5bf33981 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7713,21 +7713,7 @@ (define-public python-setuptools-scm "Setuptools_scm handles managing your Python package versions in @dfn{software configuration management} (SCM) metadata instead of declaring them as the version argument or in a SCM managed file.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-setuptools-scm)))))) - -(define-public python2-setuptools-scm - (let ((base (package-with-python2 - (strip-python2-variant python-setuptools-scm)))) - (package/inherit base - (version "5.0.2") ;no python 2 support in version 6 - (source (origin - (method url-fetch) - (uri (pypi-uri "setuptools_scm" version)) - (sha256 - (base32 - "1j75i8avp9fhrkpbabsa8vyvbi49kmxlq6l10xir9qs96kfwx843")))) - (propagated-inputs '())))) + (license license:expat))) (define-public python-sexpdata (package -- cgit v1.2.3 From 25a1d0f63d52c244e813aa49234e602ae54eb54f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 15:37:45 -0400 Subject: gnu: Remove python2-py. * gnu/packages/python-xyz.scm (python2-py): Delete variable. --- 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 cd5bf33981..daf721e89d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3144,9 +3144,6 @@ (define-public python-py code introspection, and logging.") (license license:expat))) -(define-public python2-py - (package-with-python2 python-py)) - ;; Recent versions of python-fixtures and python-testrepository need ;; python-pbr for packaging, which itself needs these two packages for ;; testing. -- cgit v1.2.3 From b89669f0346888a556061cb35b4a74b13ee3daa4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 16:27:37 -0400 Subject: gnu: Remove python2-fonttools. * gnu/packages/python-xyz.scm (python2-fonttools): Delete variable. (python-fonttools)[properties]: Delete field. --- gnu/packages/python-xyz.scm | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index daf721e89d..fbb0fc399b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10921,8 +10921,7 @@ (define-public python-fonttools of AFM files, reading (and partially writing) of PS Type 1 fonts. The package also contains a tool called “TTX” which converts TrueType/OpenType fonts to and from an XML-based format.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-fonttools))))))) + (license license:expat)))) ;;; Rename 'python-fonttools' in next cycle, renaming the current ;;; 'python-fonttools' to 'python-fonttools-minimal'. @@ -10962,19 +10961,6 @@ (define-public python-fonttools-full python-zopfli)) (properties (alist-delete 'hidden? (package-properties python-fonttools))))) -;; Fonttools 4.x dropped support for Python 2, so stick with 3.x here. -(define-public python2-fonttools - (let ((base (package-with-python2 (strip-python2-variant python-fonttools)))) - (package - (inherit base) - (version "3.44.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "fonttools" version ".zip")) - (sha256 - (base32 - "0v6399g755f2hn1ry62i5b6gdinf2fpx2966v3bxh6bjw1accb5p"))))))) - (define-public python-fonttools-next (package (inherit python-fonttools-full) -- cgit v1.2.3 From a55151703f060239ef1bcd080e29bdcddc4e21d7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 16:34:56 -0400 Subject: gnu: python2-six: Disable tests. * gnu/packages/python-xyz.scm (python2-six)[native-inputs]: Clear. [phases]: Delete check phase. --- gnu/packages/python-xyz.scm | 11 ++++++++++- 1 file changed, 10 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 fbb0fc399b..74becc7997 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2573,7 +2573,16 @@ (define-public python-six `(("python-pytest" ,python-pytest-bootstrap))))) (define-public python2-six - (package-with-python2 python-six)) + (let ((base (package-with-python2 python-six))) + (package + (inherit base) + ;; Reduce Python 2 closure by disabling tests and removing the native + ;; inputs. + (arguments (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + `(modify-phases ,phases + (delete 'check))))) + (native-inputs '())))) (define-public python-schedule (package -- cgit v1.2.3 From 0740b12df3ca5c173f6ec4ae0aa41e0109337f6d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 13 May 2022 16:36:49 -0400 Subject: gnu: Remove python2-backports-csv. * gnu/packages/python-xyz.scm (python2-backports-csv): Delete variable. --- gnu/packages/python-xyz.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74becc7997..0435b2c7f4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9824,16 +9824,6 @@ (define-public python-backports-csv Python 2 and Python 3.") (license license:psfl))) -(define-public python2-backports-csv - (package - (inherit (package-with-python2 python-backports-csv)) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The sanity-check attempts attempts to import the non-existent - ;; module "backports". - (delete 'sanity-check)))))) - (define-public python-waf (package (name "python-waf") -- cgit v1.2.3 From 5d8fb87127beee50671a9506013be541a8b45ea8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 14 May 2022 11:24:10 -0400 Subject: gnu: Remove python2-setuptools. * gnu/packages/python-xyz.scm (python2-setuptools): Delete variable. (python-setuptools)[properties]: Delete field. * gnu/packages/syncthing.scm (syncthing-gtk): Delete commented native input. * guix/lint.scm (check-inputs-should-not-be-an-input-at-all): Remove obsolete entries. --- gnu/packages/python-xyz.scm | 57 --------------------------------------------- gnu/packages/syncthing.scm | 2 -- guix/lint.scm | 4 +--- 3 files changed, 1 insertion(+), 62 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0435b2c7f4..d59d353009 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1843,63 +1843,6 @@ (define-public python-setuptools (license (list license:psfl ;setuptools itself license:expat ;six, appdirs, pyparsing license:asl2.0 ;packaging is dual ASL2/BSD-2 - license:bsd-2)) - (properties `((python2-variant . ,(delay python2-setuptools)))))) - -;; Newer versions of setuptools no longer support Python 2. -(define-public python2-setuptools - (package - (name "python2-setuptools") - (version "41.0.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "setuptools" version ".zip")) - (sha256 - (base32 - "04sns22y2hhsrwfy1mha2lgslvpjsjsz8xws7h2rh5a7ylkd28m2")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove included binaries which are used to build self-extracting - ;; installers for Windows. - ;; TODO: Find some way to build them ourself so we can include them. - (for-each delete-file (find-files "setuptools" "^(cli|gui).*\\.exe$")) - #t)))) - (build-system python-build-system) - ;; FIXME: Tests require pytest, which itself relies on setuptools. - ;; One could bootstrap with an internal untested setuptools. - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'compatibility-fixes - (lambda _ - ;; HTMLParser no longer exists. - (substitute* "setuptools/py33compat.py" - (("html_parser.HTMLParser\\(\\).unescape") - "html.unescape")) - ;; This needs distutils.msvc9compiler - (delete-file "setuptools/tests/test_msvc.py")))))) - (native-inputs - (list unzip)) - (home-page "https://pypi.org/project/setuptools/") - (synopsis - "Library designed to facilitate packaging Python projects") - (description - "Setuptools is a fully-featured, stable library designed to facilitate -packaging Python projects, where packaging includes: -Python package and module definitions, -distribution package metadata, -test hooks, -project installation, -platform-specific details, -Python 3 support.") - ;; TODO: setuptools now bundles the following libraries: - ;; packaging, pyparsing, six and appdirs. How to unbundle? - (license (list license:psfl ; setuptools itself - license:expat ; six, appdirs, pyparsing - license:asl2.0 ; packaging is dual ASL2/BSD-2 license:bsd-2)))) (define-public python-setuptools-declarative-requirements diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 6002c10560..4dfa62c017 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -202,8 +202,6 @@ (define-public syncthing-gtk python-pygobject psmisc syncthing)) - ;; (native-inputs - ;; `(("python2-setuptools" ,python2-setuptools))) (home-page "https://github.com/syncthing/syncthing-gtk") (synopsis "GTK3 based GUI and notification area icon for Syncthing") (description "@code{syncthing-gtk} is a GTK3 Python based GUI and diff --git a/guix/lint.scm b/guix/lint.scm index aa16efe6db..73581b518f 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -523,9 +523,7 @@ (define (check-inputs-should-not-be-an-input-at-all package) ;; Emit a warning if some inputs of PACKAGE are likely to should not be ;; an input at all. (let ((input-names '("python-setuptools" - "python2-setuptools" - "python-pip" - "python2-pip"))) + "python-pip"))) (map (lambda (input) (make-warning package -- cgit v1.2.3 From 96c0c18c3e65b59f365b06e478fbcb71f272ed25 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 14 May 2022 11:26:05 -0400 Subject: gnu: Remove python-prompt-toolkit-2. * gnu/packages/python-xyz.scm (python-prompt-toolkit-2): Delete variable. (python-prompt-toolkit)[properties]: Delete field. (python-jupyter-console): Replace python-prompt-toolkit-2 with python-prompt-toolkit. --- gnu/packages/python-xyz.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d59d353009..8088761f0f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16623,8 +16623,7 @@ (define-public python-prompt-toolkit highlighting while typing, out-of-the-box multi-line input editing, advanced code completion, incremental search, support for Chinese double-width characters, mouse support, and auto suggestions.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python-prompt-toolkit-2)))))) + (license license:bsd-3))) (define-public python-proselint (package @@ -16653,21 +16652,6 @@ (define-public python-proselint scans through a file and detects issues.") (license license:bsd-3))) -(define-public python-prompt-toolkit-2 - (package (inherit python-prompt-toolkit) - (name "python-prompt-toolkit") - (version "2.0.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "prompt_toolkit" version)) - (sha256 - (base32 - "0fgacqk73w7s932vy46pan2yp8rvjmlkag20xvaydh9mhf6h85zx")))) - (propagated-inputs - (list python-wcwidth python-six python-pygments)) - (properties '()))) - (define-public python-jedi (package (name "python-jedi") -- cgit v1.2.3 From 4f3011f21c46c2eec6fa4256bfb00052aa9512c9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 1 Jun 2022 11:36:10 -0400 Subject: gnu: Add python-jsonschema-next. * gnu/packages/python-xyz.scm (python-jsonschema-next): New variable. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8088761f0f..91bed915d8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3424,6 +3424,42 @@ (define-public python-jsonschema "Jsonschema is an implementation of JSON Schema for Python.") (license license:expat))) +;;; TODO: Make the default python-jsonschema on core-updates +(define-public python-jsonschema-next + (package + (inherit python-jsonschema) + (version "4.5.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jsonschema" version)) + (sha256 + (base32 "1z0x22691jva7lwfcfh377jdmlz68zhiawxzl53k631l34k8hvbw")))) + (arguments + (substitute-keyword-arguments (package-arguments python-jsonschema) + ((#:phases phases) + #~(modify-phases #$phases + ;; XXX: PEP 517 manual build/install procedures copied from + ;; python-isort. + (replace 'build + (lambda _ + ;; ZIP does not support timestamps before 1980. + (setenv "SOURCE_DATE_EPOCH" "315532800") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output whl)))))))) + (native-inputs (list python-pypa-build + python-setuptools-scm + python-twisted)) + (propagated-inputs + (list python-attrs + python-importlib-metadata + python-pyrsistent + python-typing-extensions)))) + (define-public python-schema (package (name "python-schema") -- cgit v1.2.3 From bf9da5ccc908376c84d0dfc7f1531fb479d23134 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 2 Jun 2022 10:55:26 +0200 Subject: gnu: Remove python-atomicwrites-1.4. * gnu/packages/python-xyz.scm (python-atomicwrites-1.4): Remove variable. * gnu/packages/matrix.scm (python-matrix-nio)[propagated-inputs]: Replace python-atomicwrites-1.4 with python-atomicwrites. --- gnu/packages/matrix.scm | 2 +- gnu/packages/python-xyz.scm | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 9ac999b5fd..2ba6d8ba1f 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -211,7 +211,7 @@ (define-public python-matrix-nio (list python-aiofiles python-aiohttp python-aiohttp-socks - python-atomicwrites-1.4 + python-atomicwrites python-cachetools python-future python-h11 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 91bed915d8..f54bf340f5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13498,17 +13498,6 @@ (define-public python-atomicwrites (home-page "https://github.com/untitaker/python-atomicwrites") (license license:expat))) -(define-public python-atomicwrites-1.4 - (package - (inherit python-atomicwrites) - (version "1.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "atomicwrites" version)) - (sha256 - (base32 - "0yla2svfhfqrcj8qbyqzx7wi4jy0dwcxvlkg0k3zjd54s5m3jw5f")))))) - (define-public python-qstylizer (package (name "python-qstylizer") -- cgit v1.2.3 From af0b3fdbf98004e87dc4270b3a424fd09b70665b Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 27 May 2022 00:26:52 -0500 Subject: gnu: python-shellingham: Update to 1.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-shellingham): Update to 1.4.0. [arguments]: Remove arguments block since upstream now includes a setup.py file. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f54bf340f5..979a11a5a6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16067,25 +16067,14 @@ (define-public python-tomlkit (define-public python-shellingham (package (name "python-shellingham") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "shellingham" version)) (sha256 - (base32 "07kmia2hvd2q7wik89m82hig9mqr2faynvy38vxq5fm0ps11jv2p")))) + (base32 "07hpndvcv9mf9hp54b4apzpwzmzfzl8ryaacsfdq4139im2w4ma8")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'restore-setup.py - ;; setup.py will return in the next release. - ;; - (lambda _ - (with-output-to-file "setup.py" - (lambda _ - (display "from setuptools import setup\nsetup()\n"))) - #t))))) (home-page "https://github.com/sarugaku/shellingham") (synopsis "Tool to detect surrounding shell") (description -- cgit v1.2.3 From ddb7e35bc4eb177d3cfe78973265851b8ab67361 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Mon, 30 May 2022 22:57:49 +0300 Subject: gnu: Add python-musical-scales * gnu/packages/python-xyz.scm (python-musical-scales): New variable. Signed-off-by: Mathieu Othacehe --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 979a11a5a6..bcc65e289f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -29293,3 +29293,24 @@ (define-public python-gatt Currently, Linux is the only platform supported by this library.") (license license:expat))) + +(define-public python-musical-scales + (package + (name "python-musical-scales") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "musical-scales" version)) + (sha256 + (base32 + "1ckn8n37i7b65h0i385ycn0w8sg9na0iabz0kmhxxc1wj0hddkw9")))) + (build-system python-build-system) + (native-inputs (list python-wheel)) + (home-page "https://github.com/hmillerbakewell/musical-scale") + (synopsis "Retrieve a scale based on a given mode and starting note") + (description + "Retrieve a scale based on a given mode and starting note. +Information about these scales can be +@url{https://en.wikipedia.org/wiki/List_of_musical_scales_and_modes, found on +Wikipedia}.") + (license license:expat))) -- cgit v1.2.3 From 54d2664339a4a44678372a4ff582c649bb568696 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 27 May 2022 00:24:37 -0500 Subject: gnu: python-pyflakes: Update to 2.4.0. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.4.0. Signed-off-by: Mathieu Othacehe --- 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 bcc65e289f..c0870cab7d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10142,14 +10142,14 @@ (define-public python-pep621 (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m")))) + "0k5jn8jpxni264wxf6cc3xcd1qckc0pww30bsd77mwzdf8l5ra05")))) (build-system python-build-system) (home-page "https://github.com/PyCQA/pyflakes") (synopsis "Passive checker of Python programs") -- cgit v1.2.3 From 5fd2868ef8a902af617909e9140b4ca2b3ebf30a Mon Sep 17 00:00:00 2001 From: Brian Kubisiak Date: Wed, 1 Jun 2022 18:56:40 -0700 Subject: gnu: python-sh: Update to 1.14.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-sh): Update to 1.14.2. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c0870cab7d..b8b3b00653 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1515,14 +1515,14 @@ (define-public python-pyls-black (define-public python-sh (package (name "python-sh") - (version "1.12.14") + (version "1.14.2") (source (origin (method url-fetch) (uri (pypi-uri "sh" version)) (sha256 (base32 - "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm")))) + "03gyss1rhj4in7pgysg4q0hxp3230whinlpy1532ljs99lrx0ywx")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 52cb6e6310b908d29948064d060b2abe0b576c0c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 5 Jun 2022 23:54:01 +0200 Subject: gnu: python-flake8: Update to 3.9.2. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.9.2. --- 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 b8b3b00653..0dfc6ca7e0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10193,13 +10193,13 @@ (define-public python-mccabe (define-public python-flake8 (package (name "python-flake8") - (version "3.9.1") + (version "3.9.2") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0y732h02n2aih8gzyfj4bbhg4jgahyv84mjwfindk2g6w45rka0s")))) + "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From e6df9f92f54d6c2be70d014a3a1506d0c4887968 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Jun 2022 15:30:22 +0200 Subject: gnu: python-rope: Update to 1.1.1. * gnu/packages/python-xyz.scm (python-rope): Update to 1.1.1. [arguments]: Add build phase to disable broken test. [native-inputs]: Add python-pytest and python-pytest-timeout. [description]: Remove explicit mention of Python 2. --- gnu/packages/python-xyz.scm | 19 ++++++++++++++++--- 1 file changed, 16 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 0dfc6ca7e0..1bed505a56 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15484,20 +15484,33 @@ (define-public python-cysignals (define-public python-rope (package (name "python-rope") - (version "0.19.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "rope" version)) (sha256 (base32 - "1nlhkmsfvn2p1msrmwqnypnvr993alzawnpc1605q7rfad3xgrk4")))) + "0bkzwkllxxdxd3w70xiy137lqvnlmmaplsc2ya3s23ss4kq8y10k")))) (build-system python-build-system) + (arguments + (list #:phases + `(modify-phases %standard-phases + (add-after 'unpack 'disable-broken-test + (lambda _ + (substitute* "ropetest/contrib/autoimporttest.py" + (("def test_search_module") + "def __notest_search_module") + (("def test_search_submodule") + "def __notest_search_submodule"))))))) + (native-inputs + (list python-pytest-timeout + python-pytest)) (home-page "https://github.com/python-rope/rope") (synopsis "Refactoring library for Python") (description "Rope is a refactoring library for Python. It facilitates the renaming, moving and extracting of attributes, functions, modules, fields -and parameters in Python 2 source code. These refactorings can also be applied +and parameters in Python source code. These refactorings can also be applied to occurrences in strings and comments.") (license license:lgpl3+))) -- cgit v1.2.3 From 1c7d5b1c822b4a0820e02afde3853eeb3093b2f3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 13:04:08 -0400 Subject: gnu: Add python-exodriver. * gnu/packages/python-xyz.scm (python-exodriver): New variable. --- gnu/packages/python-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1bed505a56..f9f5b26ea1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -187,6 +187,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages man) @@ -16966,6 +16967,59 @@ (define-public python-pymodbus @end itemize") (license license:bsd-3))) +(define-public python-exodriver + (package + (name "python-exodriver") + (version "2.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/labjack/exodriver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ikjz8147p14s814yabdq821y691klnr2yg54zgsymcc97kvwp2q")))) + (outputs (list "out" + "doc")) ;544 KiB of examples + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output) + "RUN_LDCONFIG=0" + "LINK_SO=1") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key make-flags #:allow-other-keys #:rest args) + (with-directory-excursion "liblabjackusb" + (apply (assoc-ref %standard-phases 'build) + `(,@args #:make-flags ,make-flags))))) + (replace 'install + (lambda* (#:key make-flags #:allow-other-keys #:rest args) + (with-directory-excursion "liblabjackusb" + (apply (assoc-ref %standard-phases 'install) + `(,@args #:make-flags ,make-flags))) + ;; Install udev rules. + (install-file "90-labjack.rules" + (string-append #$output "/lib/udev/rules.d")) + ;; Install examples. + (let ((doc (string-append #$output:doc "/share/doc/" #$name))) + (mkdir-p doc) + (copy-recursively "examples" + (string-append doc "/examples")))))))) + (inputs (list libusb)) + (home-page "https://github.com/labjack/exodriver") + (synopsis "USB driver for LabJack data acquisition instruments") + (description "This package provides @code{liblabjackusb}, a USB library for low-level +communication with the U3, U6, UE9, Digit, T4 and T7 LabJack data acquisition +instruments. A udev rule is also included to allow unprivileged users to +communicate with the instruments via USB.") + (license license:expat))) ;see README + (define-public python-kivy-garden (package (name "python-kivy-garden") -- cgit v1.2.3 From b9c8c3585bab79a44d820a43f9bf4597445e7929 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 13:32:34 -0400 Subject: gnu: Add python-labjack. * gnu/packages/python-xyz.scm (python-labjack): New variable. --- gnu/packages/python-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9f5b26ea1..feb211edb8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17020,6 +17020,38 @@ (define-public python-exodriver communicate with the instruments via USB.") (license license:expat))) ;see README +(define-public python-labjack + (package + (name "python-labjack") + (version "2.0.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "LabJackPython" version)) + (sha256 + (base32 + "013bjqdi05vlbdqprr6kqi8gs4qhqc7rnyp1klw8k6fng77rpdzz")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-liblabjackusb.so + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "." "\\.py$") + (("ctypes.CDLL\\(\"liblabjackusb.so\"") + (format #f "ctypes.CDLL(~s" + (search-input-file inputs + "lib/liblabjackusb.so"))))))))) + ;; exodriver is provided as a regular input, as only its shared object is + ;; used, not its Python API. + (inputs (list python-exodriver)) + (home-page "https://labjack.com/support/software/examples/ud/labjackpython") + (synopsis "Python library for LabJack U3, U6, UE9 and U12") + (description "This Python library allows communicating with the U3, U6, +UE9 and U12 LabJack data acquisition (DAQ) modules.") + (license license:expat))) ;see setup.py + (define-public python-kivy-garden (package (name "python-kivy-garden") -- cgit v1.2.3 From b995c1bd10e445cfdabadb1a5e30935729ce094c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 6 Jun 2022 22:18:36 +0300 Subject: gnu: python-flake8: Allow building with newer python-pyflakes. * gnu/packages/python-xyz.scm (python-flake8)[source]: Add snippet to remove upper bound on dependency python-pyflakes version. --- gnu/packages/python-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index feb211edb8..6132019a53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10200,7 +10200,14 @@ (define-public python-flake8 (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")))) + "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")) + (snippet + #~(begin + (use-modules (guix build utils)) + (substitute* "setup.cfg" + ;; Remove upper bound on pyflakes version. + (("(pyflakes >=.*), .*" _ pyflakes) + (string-append pyflakes "\n"))))))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 2aceb1e13ee994385bd20cfc8a59346366447199 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Fri, 27 May 2022 14:37:22 -0400 Subject: gnu: Add python-canopen. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-canopen): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6132019a53..17e9a922fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2072,6 +2072,30 @@ (define-public python-can sending and receiving messages on a CAN bus.") (license license:lgpl3+))) +(define-public python-canopen + (package + (name "python-canopen") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "canopen" version)) + (sha256 + (base32 "1nb543wb37kj95v6bhh272lm5gkpi41q3pnsl1fxlyizm2gamj5w")))) + (build-system python-build-system) + (native-inputs (list python-packaging)) + (propagated-inputs (list python-can)) + (home-page "https://github.com/christiansandberg/canopen") + (synopsis "CANopen stack implementation") + (description + "This package provides a Python implementation of the +@uref{https://www.can-cia.org/canopen/,CANopen standard} for +@acronym{CANs, controller-area networks}. The aim of the project is to +support the most common parts of the CiA 301 standard in a simple +Pythonic interface. It is mainly targeted for testing and automation +tasks rather than a standard compliant master implementation.") + (license license:expat))) + (define-public python-caniusepython3 (package (name "python-caniusepython3") -- cgit v1.2.3 From f08bfca0836ea515ea8ddcfb72d319fd6838908a Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Fri, 27 May 2022 14:57:26 -0400 Subject: gnu: Add python-progress. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-progress): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 17e9a922fb..9a84f9e534 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13883,6 +13883,25 @@ (define-public python-promise "Promises/A+ implementation for Python") (license license:expat))) +(define-public python-progress + (package + (name "python-progress") + (version "1.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "progress" version)) + (sha256 + (base32 "1k9lpb7lqr6mywpnqcz71y6qny54xlgprdp327za2gy0nnc6xj69")))) + (build-system python-build-system) + (home-page "http://github.com/verigak/progress/") + (synopsis "Progress reporting bars for Python") + (description "This Python package provides progress reporting for visual +of progress of long running operations. There are multiple choices of +progress bars and spinners, with customizable options, such as width, fill +character, and suffix.") + (license license:isc))) + (define-public python-progressbar2 (package (name "python-progressbar2") -- cgit v1.2.3 From b04c338265e77031a1b45f75d4b2b3a526c23e84 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 5 Jun 2022 21:20:36 -0400 Subject: gnu: python-msgpack: Update to 1.0.4. * gnu/packages/python-xyz.scm (python-msgpack): Update to 1.0.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 9a84f9e534..7c9c0b2cc6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11069,13 +11069,13 @@ (define-public python-llfuse (define-public python-msgpack (package (name "python-msgpack") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (pypi-uri "msgpack" version)) (sha256 (base32 - "07m84yisf8m6gr68ip9v6vzxax7kqbn8qxg7ir18clk1jgxwgzai")))) + "0pqzy1zclyhd42gfibhkcqymbspy5a6v421g87mh40h3iz0nkn7m")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) -- cgit v1.2.3 From 2660f99b5761d215555dc0f95a562ba68e4a0f77 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Mon, 6 Jun 2022 22:13:03 +0200 Subject: gnu: python-pycodestyle: Update to 2.8.0. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.8.0. [arguments]: Respect tests?. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 9 +++++---- 1 file changed, 5 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 7c9c0b2cc6..56a3972703 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6468,21 +6468,22 @@ (define-public python-socksipychain (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3")))) + "0zxyrg8029lzjhima6l5nk6y0z6lm5wfp9qchz3s33j3xx3mipgd")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs (list python-pytest)) (home-page "https://pycodestyle.readthedocs.io/") -- cgit v1.2.3 From 7e7c8b253cc520812dacfb3a33427a992f56b74c Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Mon, 6 Jun 2022 22:15:10 +0200 Subject: gnu: python-flake8: Update to 4.0.1. * gnu/packages/python-xyz.scm (python-flake8): Update to 4.0.1. [source]: Remove snippet. [arguments]: Respect tests?. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 56a3972703..b9af0d4a3f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10219,27 +10219,21 @@ (define-public python-mccabe (define-public python-flake8 (package (name "python-flake8") - (version "3.9.2") + (version "4.0.1") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0sspgh2ph7bb5fmf49mrdhi7n5m421kfkxk1n0vn4akgg20q6lh7")) - (snippet - #~(begin - (use-modules (guix build utils)) - (substitute* "setup.cfg" - ;; Remove upper bound on pyflakes version. - (("(pyflakes >=.*), .*" _ pyflakes) - (string-append pyflakes "\n"))))))) + "03c7mnk34wfz7a0m5zq0273y94awz69fy5iww8alh4a4v96h6vl0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-v")))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v"))))))) (propagated-inputs (list python-pycodestyle python-entrypoints python-pyflakes python-mccabe)) (native-inputs (list python-mock python-pytest)) -- cgit v1.2.3 From 49a47bdcc5fb6dd8363917ea005fb51155c8e266 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:22:35 +0300 Subject: gnu: python-flake8-polyfill: Fix building with python-flake8@4. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[source]: Add patch. * gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + .../python-flake8-polyfill-flake8-4-compat.patch | 32 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 3 +- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 68b317b32a..4e58df6ff7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1593,6 +1593,7 @@ dist_patch_DATA = \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/pthreadpool-system-libraries.patch \ %D%/packages/patches/python-chai-drop-python2.patch \ + %D%/packages/patches/python-flake8-polyfill-flake8-4-compat.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ diff --git a/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch new file mode 100644 index 0000000000..7f5babd07d --- /dev/null +++ b/gnu/packages/patches/python-flake8-polyfill-flake8-4-compat.patch @@ -0,0 +1,32 @@ +https://github.com/PyCQA/flake8-polyfill/commit/3cf414350e82ceb835ca2edbd5d5967d33e9ff35.patch + + +From 3cf414350e82ceb835ca2edbd5d5967d33e9ff35 Mon Sep 17 00:00:00 2001 +From: Ian Stapleton Cordasco +Date: Mon, 1 Nov 2021 19:18:04 -0500 +Subject: [PATCH] Skip unnecessary tests on Flake8 4.x+ + +--- + tests/test_stdin.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/test_stdin.py b/tests/test_stdin.py +index 4350967..212b309 100644 +--- a/tests/test_stdin.py ++++ b/tests/test_stdin.py +@@ -1,4 +1,5 @@ + """Tests for polyfill's stdin monkey patching.""" ++import flake8 + import pep8 + import pycodestyle + import pytest +@@ -6,6 +7,9 @@ + from flake8_polyfill import stdin + from flake8_polyfill import version + ++if (4, 0, 0) <= flake8.__version_info__: ++ pytestmark = pytest.mark.skip ++ + + def test_modules_dict(): + """Verify that it works the way we expect.""" diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b9af0d4a3f..d5ad05f4d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10359,7 +10359,8 @@ (define-public python-flake8-polyfill (uri (pypi-uri "flake8-polyfill" version)) (sha256 (base32 - "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")))) + "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")) + (patches (search-patches "python-flake8-polyfill-flake8-4-compat.patch")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3 From 0fd5222ad61fb1d2a776d018e1dd7161e50bea41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:24:14 +0300 Subject: gnu: python-flake8-polyfill: Honor tests? flag. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[arguments]: Adjust custom 'check phase to honor the #:tests? flag. --- 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 d5ad05f4d9..f4ae6a7e62 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10366,13 +10366,14 @@ (define-public python-flake8-polyfill '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; Be compatible with Pytest 4: ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 (substitute* "setup.cfg" (("\\[pytest\\]") "[tool:pytest]")) - (invoke "py.test" "-v")))))) + (when tests? + (invoke "py.test" "-v"))))))) (propagated-inputs (list python-flake8)) (native-inputs -- cgit v1.2.3 From 478d2e4b02b90591c558df5eb3218d61bba231a0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 7 Jun 2022 09:25:33 +0300 Subject: gnu: python-flake8-polyfill: Update home-page. * gnu/packages/python-xyz.scm (python-flake8-polyfill)[home-page]: Update to new upstream URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f4ae6a7e62..97335e34cb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10378,7 +10378,7 @@ (define-public python-flake8-polyfill (list python-flake8)) (native-inputs (list python-mock python-pep8 python-pycodestyle python-pytest)) - (home-page "https://gitlab.com/pycqa/flake8-polyfill") + (home-page "https://github.com/pycqa/flake8-polyfill") (synopsis "Polyfill package for Flake8 plugins") (description "This package that provides some compatibility helpers for Flake8 -- cgit v1.2.3 From e326552698845eb45582441c35e5dcc7733a1130 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:25:59 -0400 Subject: gnu: python-radon: Update to 5.1.0. * gnu/packages/python-xyz.scm (python-radon): Update to 5.1.0. [propagated-inputs]: Remove python-flake8-polyfill. --- gnu/packages/python-xyz.scm | 10 ++++------ 1 file changed, 4 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 97335e34cb..bef157cbe7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19033,14 +19033,14 @@ (define-public python-relatorio (define-public python-radon (package (name "python-radon") - (version "4.1.0") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "radon" version)) (sha256 (base32 - "0vfxxzbnz5lxfvp0yxp35g6c8qqnnbhi4dm7shkm1d3d4192q22n")))) + "1vmf56zsf3paa1jadjcjghiv2kxwiismyayq42ggnqpqwm98f7fb")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -19054,10 +19054,8 @@ (define-public python-radon (replace 'check (lambda _ (invoke "python" "radon/tests/run.py")))))) - (propagated-inputs - (list python-colorama python-flake8-polyfill python-mando)) - (native-inputs - (list python-pytest python-pytest-mock)) + (propagated-inputs (list python-colorama python-mando)) + (native-inputs (list python-pytest python-pytest-mock)) (home-page "https://radon.readthedocs.org/") (synopsis "Code Metrics in Python") (description "Radon is a Python tool which computes various code metrics. -- cgit v1.2.3 From e05cac9080d784882b71dc19cd3affe0fb16dbc0 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:28:36 -0400 Subject: gnu: python-pep8-naming: Update to 0.13.0. * gnu/packages/python-xyz.scm (python-pep8-naming): Update to 0.13.0. [propagated-inputs]: Remove python-flake8-polyfill. --- 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 bef157cbe7..9af1ddba78 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10082,17 +10082,16 @@ (define-public python-pep8 (define-public python-pep8-naming (package (name "python-pep8-naming") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "pep8-naming" version)) (sha256 (base32 - "04kyh9hkpyc8jzj16d1kkk29b5n8miqdvbs0zm035n1z5z5kx6hz")))) + "1dc0b6xw1cxp01v9zsv4ryk49rfs1lngfpvzsixgp8b7z3ffcf4z")))) (build-system python-build-system) - (propagated-inputs - (list python-flake8 python-flake8-polyfill)) + (propagated-inputs (list python-flake8)) (home-page "https://github.com/PyCQA/pep8-naming") (synopsis "Check PEP-8 naming conventions") (description -- cgit v1.2.3 From f4696aeb943c5ece7082b686786fcc0c26c7b88c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:28:57 -0400 Subject: gnu: Remove python-flake8-polyfill. This package is mostly useful for Flake8 version 2 or 3 (see: https://github.com/PyCQA/flake8-polyfill/pull/14#issuecomment-979161161). * gnu/packages/python-xyz.scm (python-flake8-polyfill): Delete variable. --- gnu/packages/python-xyz.scm | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9af1ddba78..9ce64f129f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10348,42 +10348,6 @@ (define-public python-flake8-implicit-str-concat unnecessary plus operators for explicit string literal concatenation.") (license license:expat))) -(define-public python-flake8-polyfill - (package - (name "python-flake8-polyfill") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "flake8-polyfill" version)) - (sha256 - (base32 - "1nlf1mkqw856vi6782qcglqhaacb23khk9wkcgn55npnjxshhjz4")) - (patches (search-patches "python-flake8-polyfill-flake8-4-compat.patch")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; Be compatible with Pytest 4: - ;; https://gitlab.com/pycqa/flake8-polyfill/merge_requests/7 - (substitute* "setup.cfg" - (("\\[pytest\\]") - "[tool:pytest]")) - (when tests? - (invoke "py.test" "-v"))))))) - (propagated-inputs - (list python-flake8)) - (native-inputs - (list python-mock python-pep8 python-pycodestyle python-pytest)) - (home-page "https://github.com/pycqa/flake8-polyfill") - (synopsis "Polyfill package for Flake8 plugins") - (description - "This package that provides some compatibility helpers for Flake8 -plugins that intend to support Flake8 2.x and 3.x simultaneously.") - (license license:expat))) - (define-public python-flake8-print (package (name "python-flake8-print") -- cgit v1.2.3 From 5022cf8e044cadaad41660f97c0a763ff0a81688 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 14:12:04 -0400 Subject: gnu: python-flake8: Update to 4.0.1. * gnu/packages/python-xyz.scm (python-flake8): Update to 4.0.1. [phases]{check}: Delete extraneous add-installed-pythonpath call. [propagated-inputs]: Re-indent. [native-inputs]: Remove python-mock. --- 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 9ce64f129f..eefb08ae6a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10229,13 +10229,15 @@ (define-public python-flake8 (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) (invoke "pytest" "-v"))))))) - (propagated-inputs (list python-pycodestyle python-entrypoints - python-pyflakes python-mccabe)) - (native-inputs (list python-mock python-pytest)) + (propagated-inputs + (list python-entrypoints + python-mccabe + python-pycodestyle + python-pyflakes)) + (native-inputs (list python-pytest)) (home-page "https://gitlab.com/pycqa/flake8") (synopsis "The modular source code checker: pep8, pyflakes and co") (description -- cgit v1.2.3 From 86a915433bfb9eccdcfa6239f95cd3acb87892ff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 15:49:46 -0400 Subject: gnu: xenon: Update to 0.9.0, rename and relocate. * gnu/packages/python-xyz.scm (python-xenon): Rename to... * gnu/packages/code.scm (xenon): ... this. Update to 0.9.0. [native-inputs]: Delete field. [inputs]: New field. [phases]: Delete argument. (python-xenon): Mark as deprecated. --- gnu/packages/code.scm | 30 +++++++++++++++++++++++++++++- gnu/packages/python-xyz.scm | 35 ----------------------------------- 2 files changed, 29 insertions(+), 36 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 1093bff028..4432e0b851 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2019 Hartmut Goebel -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2022 Maxim Cournoyer ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Julien Lepiller ;;; Copyright © 2021 lu hui @@ -67,6 +67,7 @@ (define-module (gnu packages code) #:use-module (gnu packages perl-compression) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages serialization) @@ -1045,3 +1046,30 @@ (define-public cscope Using cscope, you can easily search for where symbols are used and defined.") (license license:bsd-3))) + +(define-public xenon + (package + (name "xenon") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xenon" version)) + (sha256 + (base32 + "1f4gynjzfckm3rjfywwgz1c7icfx3zjqirf16aj73xv0c9ncpffj")))) + (build-system python-build-system) + (arguments (list #:tests? #f)) ;test suite not shipped with the PyPI archive + (inputs (list python-pyyaml python-radon python-requests)) + (home-page "https://xenon.readthedocs.org/") + (synopsis "Monitor code metrics for Python on your CI server") + (description + "Xenon is a monitoring tool based on Radon. It monitors code complexity. +Ideally, @code{xenon} is run every time code is committed. Through command +line options, various thresholds can be set for the complexity of code. It +will fail (i.e. it will exit with a non-zero exit code) when any of these +requirements is not met.") + (license license:expat))) + +(define-public python-xenon + (deprecated-package "python-xenon" xenon)) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eefb08ae6a..722322e001 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19746,41 +19746,6 @@ (define-public python-rencode pure Python module.") (license license:bsd-3))) -(define-public python-xenon - (package - (name "python-xenon") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "xenon" version)) - (sha256 - (base32 - "0nv207ql2wmh9q62503np056c4vf1c1hlsi5cvv5p5kx574k6r2y")))) - (build-system python-build-system) - (native-inputs - (list python-pyyaml python-radon python-requests python-flake8 - python-tox)) - (arguments - `(#:tests? #f ;test suite not shipped with the PyPI archive - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-test-requirements - (lambda _ - ;; Remove httpretty dependency for tests. - (substitute* "setup.py" - (("httpretty") "")) - #t))))) - (home-page "https://xenon.readthedocs.org/") - (synopsis "Monitor code metrics for Python on your CI server") - (description - "Xenon is a monitoring tool based on Radon. It monitors code complexity. -Ideally, @code{xenon} is run every time code is committed. Through command -line options, various thresholds can be set for the complexity of code. It -will fail (i.e. it will exit with a non-zero exit code) when any of these -requirements is not met.") - (license license:expat))) - (define-public python-pysocks (package (name "python-pysocks") -- cgit v1.2.3 From 8b2ce33ee202263a3cd28e8709d91ca85ac32557 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 17:22:21 -0400 Subject: gnu: nikola: Update to 8.2.2. * gnu/packages/python-xyz.scm (nikola): Update to 8.2.2. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 722322e001..508753fd50 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28263,13 +28263,13 @@ (define-public python-phpserialize (define-public nikola (package (name "nikola") - (version "8.1.3") + (version "8.2.2") (source (origin (method url-fetch) (uri (pypi-uri "Nikola" version)) (sha256 - (base32 "1vspzvi4039zgjc93bspqjb384r6c9ksvmidbp8csws2pdbc7sh5")))) + (base32 "1h96y4sfypp2fbqxa8xrqch5f7r3srm2ly222k9w2n143h2spx4m")))) (build-system python-build-system) (propagated-inputs (list python-babel @@ -28305,7 +28305,6 @@ (define-public nikola (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;;(add-installed-pythonpath inputs outputs) (invoke "pytest" "tests" "--no-cov" "-k" "not test_compiling_markdown[hilite]"))))))) (home-page "https://getnikola.com/") -- cgit v1.2.3 From e3d2650726e0345b52649558d9319da3e6a8898a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 21:43:58 -0400 Subject: gnu: python-pygit2: Update to 1.9.2 and enable tests. * gnu/packages/python-xyz.scm (python-pygit2): Update to 1.9.2. [tests?]: Delete argument. [phases]{check}: New phase override. [description]: Fix sentence. --- gnu/packages/python-xyz.scm | 13 ++++++++----- 1 file changed, 8 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 508753fd50..f58510ae8c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5662,24 +5662,27 @@ (define-public python-pyspnego (define-public python-pygit2 (package (name "python-pygit2") - (version "1.9.1") + (version "1.9.2") (source (origin (method url-fetch) (uri (pypi-uri "pygit2" version)) (sha256 - (base32 "1jdr6z1il03nifwgpcdf95w6xzzbfzdkcqq5dcqjaa0rnv1pjr7g")))) + (base32 "068bwhirigbh2435abyv4shdxgxvyfqf4dxfmhd4hihivwrl9290")))) (build-system python-build-system) (arguments - '(#:tests? #f)) ; tests don't run correctly in our environment + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v"))))))) (propagated-inputs (list python-cached-property python-cffi libgit2)) (native-inputs (list python-pytest)) (home-page "https://github.com/libgit2/pygit2") (synopsis "Python bindings for libgit2") - (description "Pygit2 is a set of Python bindings to the libgit2 shared -library, libgit2 implements Git plumbing.") + (description "Pygit2 is a set of Python bindings to the libgit2 shared library.") ;; GPL2.0 only, with linking exception. (license license:gpl2))) -- cgit v1.2.3 From ceeb2bfcaeb4380e01d26c8425e28b94ac13558a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 6 Jun 2022 22:33:20 -0400 Subject: gnu: offlate: Fix build. * gnu/packages/python-xyz.scm (offlate) [phases]{patch-for-pygit2}: New phase. --- gnu/packages/python-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f58510ae8c..2c76ff1922 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24334,7 +24334,13 @@ (define-public offlate (build-system python-build-system) (arguments ;; No tests - `(#:tests? #f)) + `(#:tests? #f + #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-pygit2 + (lambda _ + (substitute* "offlate/systems/git.py" + (("pygit2.remote.RemoteCallbacks") + "pygit2.RemoteCallbacks"))))))) (propagated-inputs (list python-android-stringslib python-dateutil -- cgit v1.2.3 From 96d47797dce361bd7f3b1ce860b1ec4851e2db5a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 6 Jun 2022 19:54:34 -0700 Subject: gnu: python-debian: Set version to build reproducibly. * gnu/packages/python-xyz.scm (python-debian)[arguments]: Add 'set-version phase. --- gnu/packages/python-xyz.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2c76ff1922..f3d7fab973 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12465,6 +12465,13 @@ (define-public python-debian (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'set-version + ;; for reproducible builds, otherwise python-debian + ;; generates a _version.py including the date + (lambda _ + (copy-file "lib/debian/_version.py.in" "lib/debian/_version.py") + (substitute* "lib/debian/_version.py" + (("__CHANGELOG_VERSION__") ,version)))) (add-after 'unpack 'remove-debian-specific-tests ;; python-apt, apt and dpkg are not yet available in guix, ;; and these tests heavily depend on them. -- cgit v1.2.3