From 2115bde3024b685087af70a20d7846498d6c9985 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 02:39:15 +0100 Subject: gnu: python-parse: Update to 1.8.2. * gnu/packages/patches/python-parse-too-many-fields.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/python.scm (python-parse): Update to 1.8.2. [source](patches): Remove. [arguments]: Use INVOKE instead of SYSTEM*. --- gnu/packages/python.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 3c816cda53..14a79a9b22 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1431,21 +1431,20 @@ backported for previous versions of Python from 2.4 to 3.3.") (define-public python-parse (package (name "python-parse") - (version "1.6.6") + (version "1.8.2") (source (origin (method url-fetch) (uri (pypi-uri "parse" version)) (sha256 (base32 - "0y31i3mwgv35qn0kzzjn9q8jqfdqmbi6sr6yfvn8rq4lqjm5lhvi")) - (patches (search-patches "python-parse-too-many-fields.patch")))) + "1lj9v1q4imszyhvipb6drsm3xdl35nan011mqxxas1yaypixsj40")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (zero? (system* "python" "test_parse.py"))))))) + (lambda _ (invoke "python" "test_parse.py")))))) (home-page "https://github.com/r1chardj0n3s/parse") (synopsis "Parse strings") (description -- cgit v1.2.3 From 557f8f212e9bfc28ce689a2ccbcc91c8dafe01b2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 02:42:17 +0100 Subject: gnu: python-parse-type: Update to 0.4.2. * gnu/packages/python.scm (python-parse-type): Update to 0.4.2. [source](uri): Use PYPI-URI. [arguments]: Remove field. --- gnu/packages/python.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 14a79a9b22..2129cbec07 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1386,26 +1386,15 @@ backported for previous versions of Python from 2.4 to 3.3.") (define-public python-parse-type (package (name "python-parse-type") - (version "0.3.4") + (version "0.4.2") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "parse_type/parse_type-" version ".tar.gz")) + (uri (pypi-uri "parse_type" version)) (sha256 (base32 - "0iv1c34npr4iynwpgv1vkjx9rjd18a85ir8c01gc5f7wp8iv7l1x")))) + "0g3b6gsdwnm8dpkh2vn34q6dzxm9gl908ggyzcv31n9xbp3vv5pm")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "tests/test_parse_type_parse.py" - ;; Newer Python versions don't have the problem this test tests. - (("self[.]assertRaises[(]parse.TooManyFields, p.parse, ''[)]") - "")) - #t))))) (propagated-inputs `(("python-six" ,python-six) ("python-parse" ,python-parse))) -- cgit v1.2.3 From b8509387d1e303b24204213c09fe82f35899ebff Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 03:01:48 +0100 Subject: gnu: python-pathpy: Update to 11.0. * gnu/packages/python.scm (python-pathpy): Update to 11.0. [source](uri): Use PYPI-URI. [outputs]: Remove field. [arguments]: Set #:tests? #f. Remove #:phases. --- gnu/packages/python.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 2129cbec07..1b5e3836d9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4270,15 +4270,14 @@ them as the version argument or in a SCM managed file.") (define-public python-pathpy (package (name "python-pathpy") - (version "8.1.1") + (version "11.0") (source (origin (method url-fetch) - (uri (string-append "https://pypi.python.org/packages/source/p/" - "path.py/path.py-" version ".tar.gz")) + (uri (pypi-uri "path.py" version)) (sha256 - (base32 "1p8s1l2vfkqhqxdhqlj0g1jjw4f1as2frr35sjcpjjpd5a89y41f")))) - (outputs '("out" "doc")) + (base32 "12s84maimiz61980q065rjgi8ang6xw2wwm64m0lmfks51dlw4qn")))) + ;; (outputs '("out" "doc")) (build-system python-build-system) (propagated-inputs `(("python-appdirs" ,python-appdirs))) @@ -4289,22 +4288,24 @@ them as the version argument or in a SCM managed file.") ("python-pytest" ,python-pytest) ("python-pytest-runner" ,python-pytest-runner))) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-doc - (lambda _ - (setenv "LANG" "en_US.UTF-8") - (zero? (system* "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))))))) + ;; FIXME: Documentation and tests require "jaraco.packaging". + `(#:tests? #f)) + ;; #:phases + ;; (modify-phases %standard-phases + ;; (add-after 'build 'build-doc + ;; (lambda _ + ;; (setenv "LANG" "en_US.UTF-8") + ;; (zero? (system* "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))))))) (home-page "https://github.com/jaraco/path.py") (synopsis "Python module wrapper for built-in os.path") (description -- cgit v1.2.3 From 76397e12ada2832279fbd37dc89d1484adb5b4b1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:35:38 +0100 Subject: gnu: python2-pathlib2: Propagate python2-six. * gnu/packages/python.scm (python2-pathlib2)[native-inputs]: Move to ... [propagated-inputs] ... here. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1b5e3836d9..82108baed1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8074,7 +8074,7 @@ anymore.") ;; standard library. (arguments `(#:python ,python-2)) - (native-inputs + (propagated-inputs `(("python2-six" ,python2-six))) (home-page "https://pypi.python.org/pypi/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard -- cgit v1.2.3 From f160557b955a27c681d4482e7b541966e31e3c78 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:47:22 +0100 Subject: gnu: python-ipython: Update to 5.5.0. * gnu/packages/python.scm (python-ipython): Update to 5.5.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 82108baed1..19f43dc27c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4496,13 +4496,13 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python-ipython (package (name "python-ipython") - (version "5.3.0") + (version "5.5.0") (source (origin (method url-fetch) (uri (pypi-uri "ipython" version ".tar.gz")) (sha256 - (base32 "079wyjir4a9qx6kvx096b1asm63djbidk65z3ykcbnlngmg62pmz")))) + (base32 "03qmzpfy00if10i9k8fjkam1s4xg22j73f933x5d228z9n4rwik6")))) (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs -- cgit v1.2.3 From ea3f45a5a0d9f55ca1df2c7f9d9fd45d624dd1a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 04:47:44 +0100 Subject: gnu: python2-pathlib2: Update to 2.3.0. * gnu/packages/python.scm (python2-pathlib2): Update to 2.3.0. [propagated-inputs]: Add PYTHON2-SCANDIR. --- gnu/packages/python.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 19f43dc27c..5b8c5081fc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -8061,13 +8061,13 @@ anymore.") (define-public python2-pathlib2 (package (name "python2-pathlib2") - (version "2.1.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "pathlib2" version)) (sha256 (base32 - "0p050msg5c8d0kadv702jnfshaxrb0il765cpkgnhn6mq5hakcyy")))) + "1cx5gs2v9j2vnzmcrbq5l8fq2mwrr1h6pyf1sjdji2w1bavm09fk")))) (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 @@ -8075,7 +8075,8 @@ anymore.") (arguments `(#:python ,python-2)) (propagated-inputs - `(("python2-six" ,python2-six))) + `(("python2-scandir" ,python2-scandir) + ("python2-six" ,python2-six))) (home-page "https://pypi.python.org/pypi/pathlib2/") (synopsis "Object-oriented file system paths - backport of standard pathlib module") -- cgit v1.2.3 From 71a2d4176bdf7d88fd9d342b95ae74ed9685ec8d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 05:01:16 +0100 Subject: gnu: python-scandir: Update to 1.7. * gnu/packages/python.scm (python-scandir): Update to 1.7. [description]: Mention that the Python3 variant is obsolete. --- gnu/packages/python.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5b8c5081fc..64f48fd352 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11083,13 +11083,13 @@ It supports both normal and Unicode strings.") (define-public python-scandir (package (name "python-scandir") - (version "1.4") + (version "1.7") (source (origin (method url-fetch) (uri (pypi-uri "scandir" version)) (sha256 - (base32 "0yjrgp0mxp3d8bjkq2m1ac2ys8n76wykksvgyjrnil9gr3fx7a5d")))) + (base32 "0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj")))) (build-system python-build-system) (home-page "https://github.com/benhoyt/scandir") (synopsis "Directory iteration function") @@ -11098,7 +11098,9 @@ It supports both normal and Unicode strings.") returning a list of bare filenames, it yields DirEntry objects that include file type and stat information along with the name. Using scandir() increases the speed of os.walk() by 2-20 times (depending on the platform and file -system) by avoiding unnecessary calls to os.stat() in most cases.") +system) by avoiding unnecessary calls to os.stat() in most cases. + +This package is part of the Python standard library since version 3.5.") (license license:bsd-3))) (define-public python2-scandir -- cgit v1.2.3 From cb723be5b98a57ae4f909022d1ce2b5d3bcdaabf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 26 Feb 2018 05:03:22 +0100 Subject: gnu: python-scandir: Run the test suite. * gnu/packages/python.scm (python-scandir)[arguments]: Replace CHECK-PHASE. --- gnu/packages/python.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 64f48fd352..4946d9afd7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11091,6 +11091,11 @@ It supports both normal and Unicode strings.") (sha256 (base32 "0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj")))) (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "test/run_tests.py")))))) (home-page "https://github.com/benhoyt/scandir") (synopsis "Directory iteration function") (description -- cgit v1.2.3 From 57e7d7486ba17d7b5407ebc429ce8553460371ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 24 Feb 2018 13:44:26 +0100 Subject: gnu: Use HTTPS for supported freedesktop.org home pages. * gnu/packages/fontutils.scm (fontconfig)[home-page]: Use HTTPS. * gnu/packages/freedesktop.scm (python-pyxdg, accountsservice) (modem-manager, telepathy-mission-control, telepathy-mission-control) (colord-gtk, desktop-file-utils)[home-page]: Likewise. * gnu/packages/ghostscript.scm (libspectre)[home-page]: Likewise. * gnu/packages/glib.scm (dbus, dbus-glib, telepathy-glib)[home-page]: Likewise. * gnu/packages/gnome.scm (shared-mime-info, hicolor-icon-theme) (libxklavier, colord, upower)[home-page]: Likewise. * gnu/packages/gstreamer.scm (orc, python-gst)[home-page]: Likewise. * gnu/packages/libcanberra.scm (sound-theme-freedesktop)[home-page]: Likewise. * gnu/packages/libreoffice.scm (libexttextcat)[home-page]: Likewise. * gnu/packages/polkit.scm (polkit-gnome, polkit-gnome)[home-page]: Likewise. * gnu/packages/pulseaudio.scm (pavucontrol)[home-page]: Likewise. * gnu/packages/python.scm (python-dbus)[home-page]: Likewise. * gnu/packages/xdisorg.scm (startup-notification)[home-page]: Likewise. --- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 14 +++++++------- gnu/packages/ghostscript.scm | 2 +- gnu/packages/glib.scm | 6 +++--- gnu/packages/gnome.scm | 10 +++++----- gnu/packages/gstreamer.scm | 4 ++-- gnu/packages/libcanberra.scm | 2 +- gnu/packages/libreoffice.scm | 2 +- gnu/packages/polkit.scm | 4 ++-- gnu/packages/pulseaudio.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a04441a005..a5e8c79371 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -290,7 +290,7 @@ high quality, anti-aliased and subpixel rendered text on a display.") ; The exact license is more X11-style than BSD-style. (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) - (home-page "http://www.freedesktop.org/wiki/Software/fontconfig"))) + (home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))) (define-public t1lib (package diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63adb4d076..3c83e668b0 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -409,7 +409,7 @@ manager for the current system.") `(("shared-mime-info" ,shared-mime-info) ;for tests ("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests ("python-nose" ,python-nose))) - (home-page "http://freedesktop.org/wiki/Software/pyxdg") + (home-page "https://www.freedesktop.org/wiki/Software/pyxdg") (synopsis "Implementations of freedesktop.org standards in Python") (description "PyXDG is a collection of implementations of freedesktop.org standards in @@ -740,7 +740,7 @@ message bus.") (inputs `(("shadow" ,shadow) ("polkit" ,polkit))) - (home-page "http://www.freedesktop.org/wiki/Software/AccountsService/") + (home-page "https://www.freedesktop.org/wiki/Software/AccountsService/") (synopsis "D-Bus interface for user account query and manipulation") (description "The AccountService project provides a set of D-Bus interfaces for querying @@ -840,7 +840,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.") ("libqmi" ,libqmi) ("polkit" ,polkit))) (synopsis "Mobile broadband modems manager") - (home-page "http://www.freedesktop.org/wiki/Software/ModemManager/") + (home-page "https://www.freedesktop.org/wiki/Software/ModemManager/") (description "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections. Whether built-in devices, USB @@ -882,7 +882,7 @@ modems and setup connections with them.") ("sqlite" ,sqlite) ("telepathy-glib" ,telepathy-glib))) (synopsis "Telepathy logger library") - (home-page "http://telepathy.freedesktop.org/") + (home-page "https://telepathy.freedesktop.org/") (description "Telepathy logger is a headless observer client that logs information received by the Telepathy framework. It features pluggable backends to log @@ -909,7 +909,7 @@ different sorts of messages in different formats.") ("python-dbus" ,python2-dbus))) (propagated-inputs `(("telepathy-glib" ,telepathy-glib))) - (home-page "http://telepathy.freedesktop.org/") + (home-page "https://telepathy.freedesktop.org/") (synopsis "Telepathy IRC connection manager") (description "Idle is an IRC connection manager for the Telepathy framework. This @@ -971,7 +971,7 @@ share connections to real-time communication services without conflicting.") `(("colord" ,colord) ("gtk+" ,gtk+))) (synopsis "GTK integration for libcolord") - (home-page "http://www.freedesktop.org/software/colord/") + (home-page "https://www.freedesktop.org/software/colord/") (description "This is a GTK+ convenience library for interacting with colord. It is useful for both applications which need colour management and applications that @@ -1068,7 +1068,7 @@ to applications simultaneously competing for fingerprint readers.") `(("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib))) - (home-page "http://www.freedesktop.org/wiki/Software/desktop-file-utils/") + (home-page "https://www.freedesktop.org/wiki/Software/desktop-file-utils/") (synopsis "Utilities for working with desktop entries") (description "This package contains a few command line utilities for working with diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 0561387931..6d2dd4c008 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -362,4 +362,4 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.") It provides a convenient easy to use API for handling and rendering Postscript documents.") (license license:gpl2+) - (home-page "http://www.freedesktop.org/wiki/Software/libspectre"))) + (home-page "https://www.freedesktop.org/wiki/Software/libspectre"))) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d32472b85e..45d0d891c4 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -124,7 +124,7 @@ ;; '--autolaunch'. ("libx11" ,libx11))) - (home-page "http://dbus.freedesktop.org/") + (home-page "https://www.freedesktop.org/wiki/Software/dbus/") (synopsis "Message bus for inter-process communication (IPC)") (description "D-Bus is a message bus system, a simple way for applications to @@ -461,7 +461,7 @@ translated.") (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) - (home-page "http://dbus.freedesktop.org/doc/dbus-glib/") + (home-page "https://dbus.freedesktop.org/doc/dbus-glib/") (synopsis "D-Bus GLib bindings") (description "GLib bindings for D-Bus. The package is obsolete and superseded @@ -662,7 +662,7 @@ useful for C++.") `(("dbus" ,dbus) ("dbus-glib" ,dbus-glib) ("glib" ,glib))) - (home-page "http://telepathy.freedesktop.org/wiki/") + (home-page "https://telepathy.freedesktop.org/wiki/") (synopsis "GLib Real-time communications framework over D-Bus") (description "Telepathy is a flexible, modular communications framework that enables real-time communication over D-Bus via pluggable protocol diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 43a3489021..f52f3227d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -947,7 +947,7 @@ guidelines.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://freedesktop.org/wiki/Software/shared-mime-info") + (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description "The shared-mime-info package contains the core database of common types @@ -972,7 +972,7 @@ database is translated at Transifex.") (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no check target - (home-page "http://icon-theme.freedesktop.org/releases/") + (home-page "https://icon-theme.freedesktop.org/releases/") (synopsis "Freedesktop icon theme") (description @@ -2322,7 +2322,7 @@ and objects.") ("libxkbfile" ,libxkbfile) ("xkbcomp" ,xkbcomp) ("xkeyboard-config" ,xkeyboard-config))) - (home-page "http://www.freedesktop.org/wiki/Software/LibXklavier/") + (home-page "https://www.freedesktop.org/wiki/Software/LibXklavier/") (synopsis "High-level API for X Keyboard Extension") (description "LibXklavier is a library providing high-level API for X Keyboard @@ -2828,7 +2828,7 @@ keyboard shortcuts.") ("sqlite" ,sqlite) ("polkit" ,polkit) ("sane-backends" ,sane-backends))) - (home-page "http://www.freedesktop.org/software/colord/") + (home-page "https://www.freedesktop.org/software/colord/") (synopsis "Color management service") (description "Colord is a system service that makes it easy to manage, install and generate color profiles to accurately color manage input and @@ -2964,7 +2964,7 @@ faster results and to avoid unnecessary server load.") `(("dbus-glib" ,dbus-glib) ("libgudev" ,libgudev) ("libusb" ,libusb))) - (home-page "http://upower.freedesktop.org/") + (home-page "https://upower.freedesktop.org/") (synopsis "System daemon for managing power devices") (description "UPower is an abstraction for enumerating power devices, diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5fad28952b..4ec5765bb1 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -87,7 +87,7 @@ "testsuite/exec_opcodes_sys.c") (("if \\(error\\) return 1;") "if (error) return 77;"))))))) - (home-page "http://gstreamer.freedesktop.org/modules/orc.html") + (home-page "https://gstreamer.freedesktop.org/modules/orc.html") (synopsis "Oil runtime compiler") (description "Orc is a just-in-time compiler implemented as a library and set of @@ -405,7 +405,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.") ("ffmpeg" ,ffmpeg) ("orc" ,orc) ("zlib" ,zlib))) - (home-page "http://gstreamer.freedesktop.org/") + (home-page "https://gstreamer.freedesktop.org/") (synopsis "Plugins for the GStreamer multimedia library") (description "This GStreamer plugin supports a large number of audio and video diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index b4ed90ebb4..e9d6ce594c 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -130,7 +130,7 @@ sounds for various system events.") ;; The license of the various sounds is given in the 'CREDITS' file. (license (list cc-by-sa4.0 cc-by3.0 gpl2 gpl2+)) - (home-page "http://www.freedesktop.org/wiki/Specifications/sound-theme-spec/"))) + (home-page "https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/"))) (define-public python-pycanberra (package diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9b60c06a8d..b7c675d274 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -428,7 +428,7 @@ standard 21.0.2.") (sha256 (base32 "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k")))) (build-system gnu-build-system) - (home-page "http://www.freedesktop.org/wiki/Software/libexttextcat/") + (home-page "https://www.freedesktop.org/wiki/Software/libexttextcat/") (synopsis "Text Categorization library") (description "Libexttextcat is an N-Gram-Based Text Categorization library primarily intended for language guessing.") diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 8fe37097e1..76a1aa21c4 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -122,7 +122,7 @@ out "/share/polkit-1/actions") make-flags) #t)))))) - (home-page "http://www.freedesktop.org/wiki/Software/polkit/") + (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to @@ -186,5 +186,5 @@ easily with PolicyKit.") (description "PolicyKit-gnome provides a D-Bus session bus service that is used to bring up authentication dialogs used for obtaining privileges.") - (home-page "http://www.freedesktop.org/wiki/Software/polkit/") + (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (license lgpl2.0+))) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 249afd3f68..903b22529d 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -229,7 +229,7 @@ sound server.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) - (home-page "http://freedesktop.org/software/pulseaudio/pavucontrol/") + (home-page "https://www.freedesktop.org/software/pulseaudio/pavucontrol/") (synopsis "PulseAudio volume control") (description "PulseAudio Volume Control (pavucontrol) provides a GTK+ diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4946d9afd7..4ccd6a7359 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4762,7 +4762,7 @@ toolkit. Use it to build trees of widgets.") (synopsis "Python bindings for D-bus") (description "python-dbus provides bindings for libdbus, the reference implementation of D-Bus.") - (home-page "http://www.freedesktop.org/wiki/Software/DBusBindings/") + (home-page "https://www.freedesktop.org/wiki/Software/DBusBindings/") (license license:expat))) (define-public python2-dbus diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index be2ee2d086..a3630b3cb9 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -406,7 +406,7 @@ tracking.") (inputs `(("libx11" ,libx11) ("xcb-util" ,xcb-util))) - (home-page "http://www.freedesktop.org/wiki/Software/startup-notification/") + (home-page "https://www.freedesktop.org/wiki/Software/startup-notification/") (synopsis "Application startup notification and feedback library") (description "Startup-notification contains a reference implementation of the startup -- cgit v1.2.3 From 335c9e39024302476edb35b139ba2350a5d76437 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 16:21:12 +0100 Subject: gnu: python-fixtures: Propagate python-pbr. * gnu/packages/check.scm (python-fixtures-bootstrap, python2-fixtures-bootstrap, python-testrepository-bootstrap, python2-testrepository-bootstrap): New public variables. (python-fixtures): Adjust accordingly. (python-testrepository): Likewise. [native-inputs]: Remove PYTHON-PBR-MINIMAL. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-FIXTURES and PYTHON-TESTREPOSITORY WITH PYTHON-FIXTURES-BOOTSTRAP and PYTHON-TESTREPOSITORY-BOOTSTRAP. --- gnu/packages/check.scm | 81 ++++++++++++++++++++++++++++++++++--------------- gnu/packages/python.scm | 4 +-- 2 files changed, 59 insertions(+), 26 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fbd2ac4f80..20845f82f6 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -962,18 +962,37 @@ protocol.") (define-public python2-subunit (package-with-python2 python-subunit)) -(define-public python-fixtures +;; Fixtures requires python-pbr at runtime, but pbr uses fixtures for its +;; own tests. Hence this bootstrap variant. +(define-public python-fixtures-bootstrap (package - (name "python-fixtures") + (name "python-fixtures-bootstrap") (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "fixtures" version)) - (sha256 - (base32 - "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) + (source (origin + (method url-fetch) + (uri (pypi-uri "fixtures" version)) + (sha256 + (base32 + "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) (build-system python-build-system) + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python-pbr-minimal" ,python-pbr-minimal) + ("python-six" ,python-six))) + (home-page "https://launchpad.net/python-fixtures") + (synopsis "Python test fixture library") + (description + "This package is only used for bootstrapping. Use the regular +python-fixtures package instead.") + (license (list license:bsd-3 license:asl2.0)))) ; at user's option + +(define-public python2-fixtures-bootstrap + (package-with-python2 python-fixtures-bootstrap)) + +(define-public python-fixtures + (package + (inherit python-fixtures-bootstrap) + (name "python-fixtures") (arguments '(#:phases (modify-phases %standard-phases @@ -982,25 +1001,23 @@ protocol.") (zero? (system* "python" "-m" "testtools.run" "fixtures.test_suite"))))))) (propagated-inputs - `(("python-six" ,python-six))) + ;; Fixtures uses pbr at runtime to check versions, etc. + `(("python-pbr" ,python-pbr) + ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) - ("python-pbr-minimal" ,python-pbr-minimal) ("python-testtools" ,python-testtools))) - (home-page "https://launchpad.net/python-fixtures") - (synopsis "Python test fixture library") (description "Fixtures provides a way to create reusable state, useful when writing -Python tests.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option +Python tests."))) (define-public python2-fixtures (package-with-python2 python-fixtures)) -(define-public python-testrepository +(define-public python-testrepository-bootstrap (package - (name "python-testrepository") - (version "0.0.20") + (name "python-testrepository-bootstrap") + (version "0.0.20") (source (origin (method url-fetch) @@ -1011,6 +1028,26 @@ Python tests.") (base32 "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) (build-system python-build-system) + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-fixtures" ,python-fixtures-bootstrap) + ("python-subunit" ,python-subunit) + ("python-testtools" ,python-testtools))) + (native-inputs + `(("python-mimeparse" ,python-mimeparse))) + (home-page "https://launchpad.net/testrepository") + (synopsis "Database for Python test results") + (description + "Bootstrap package for python-testrepository. Don't use this.") + (license (list license:bsd-3 license:asl2.0)))) ; at user's option + +(define-public python2-testrepository-bootstrap + (package-with-python2 python-testrepository-bootstrap)) + +(define-public python-testrepository + (package + (inherit python-testrepository-bootstrap) + (name "python-testrepository") (arguments ;; FIXME: Many tests are failing. '(#:tests? #f)) @@ -1019,14 +1056,10 @@ Python tests.") ("python-subunit" ,python-subunit) ("python-testtools" ,python-testtools))) (native-inputs - `(("python-pbr-minimal" ,python-pbr-minimal) ;; same as for building fixture - ("python-mimeparse" ,python-mimeparse))) - (home-page "https://launchpad.net/testrepository") - (synopsis "Database for Python test results") + `(("python-mimeparse" ,python-mimeparse))) (description "Testrepository provides a database of test results which can be used as part of a developer's workflow to check things such as what tests -have failed since the last commit or what tests are currently failing.") - (license (list license:bsd-3 license:asl2.0)))) ; at user's option +have failed since the last commit or what tests are currently failing."))) (define-public python2-testrepository (package-with-python2 python-testrepository)) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 4ccd6a7359..efe8e8c638 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1689,12 +1689,12 @@ code introspection, and logging.") (propagated-inputs `(("git" ,git))) ;; pbr actually uses the "git" binary. (native-inputs - `(("python-fixtures" ,python-fixtures) + `(("python-fixtures" ,python-fixtures-bootstrap) ;; discover, coverage, hacking, subunit ("python-mock" ,python-mock) ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) - ("python-testrepository" ,python-testrepository) + ("python-testrepository" ,python-testrepository-bootstrap) ("python-testresources" ,python-testresources) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools) -- cgit v1.2.3 From bc69104a442e1dd2338397a54a3a80eff170e78f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 17:09:43 +0100 Subject: gnu: python-testresources: Update to 2.0.1. * gnu/packages/check.scm (python-testresources-bootstrap, python2-testresources-bootstrap): New public variables. (python-testresources): Adjust accordingly. [propagated-inputs]: Add PYTHON-PBR. [native-inputs]: Add PYTHON-FIXTURES and PYTHON-TESTTOOLS. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-TESTRESOURCES with PYTHON-TESTRESOURCES-BOOTSTRAP. --- gnu/packages/check.scm | 47 +++++++++++++++++++++++++++++++++-------------- gnu/packages/python.scm | 2 +- 2 files changed, 34 insertions(+), 15 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index fbb89ce496..0a7d888d46 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -908,28 +908,47 @@ style tests.") (define-public python2-testscenarios (package-with-python2 python-testscenarios)) -(define-public python-testresources +;; Testresources requires python-pbr at runtime, but pbr needs it for its +;; own tests. Hence this bootstrap variant. +(define-public python-testresources-bootstrap (package - (name "python-testresources") - (version "0.2.7") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/testresources/testresources-" - version ".tar.gz")) - (sha256 - (base32 - "0cbj3plbllyz42c4b5xxgwaa7mml54lakslrn4kkhinxhdri22md")))) + (name "python-testresources-bootstrap") + (version "2.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "testresources" version)) + (sha256 + (base32 + "05s4dsli9g17m1r3b1gvwicbbgq011hnpb2b9qnj27ja2n11k7gf")))) (build-system python-build-system) + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-pbr" ,python-pbr-minimal))) (home-page "https://launchpad.net/testresources") (synopsis "Pyunit extension for managing test resources") (description - "Testresources is an extension to Python's unittest to allow declarative -use of resources by test cases.") + "This package is only here for bootstrapping purposes. Use the regular +testresources package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python2-testresources-bootstrap + (package-with-python2 python-testresources-bootstrap)) + +(define-public python-testresources + (package + (inherit python-testresources-bootstrap) + (name "python-testresources") + (propagated-inputs + `(("python-pbr" ,python-pbr))) + (arguments '()) + (native-inputs + `(("python-fixtures" ,python-fixtures) + ("python-testtols" ,python-testtools))) + (description + "Testresources is an extension to Python's unittest to allow declarative +use of resources by test cases."))) + (define-public python2-testresources (package-with-python2 python-testresources)) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index efe8e8c638..22160bcfaa 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1695,7 +1695,7 @@ code introspection, and logging.") ("python-six" ,python-six) ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository-bootstrap) - ("python-testresources" ,python-testresources) + ("python-testresources" ,python-testresources-bootstrap) ("python-testscenarios" ,python-testscenarios) ("python-testtools" ,python-testtools) ("python-virtualenv" ,python-virtualenv))) -- cgit v1.2.3 From 881ed3f8680a42327ce4efe7aaab04a2f3e65c6e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 18:20:07 +0100 Subject: gnu: python-extras: Update to 1.0.0. * gnu/packages/python.scm (python-extras): Update to 1.0.0. [source](uri): Use PYPI-URI. --- gnu/packages/python.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 22160bcfaa..f08d93dc78 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1500,19 +1500,17 @@ software.") (define-public python-extras (package (name "python-extras") - (version "0.0.3") + (version "1.0.0") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/e/extras/extras-" - version ".tar.gz")) + (uri (pypi-uri "extras" version)) (sha256 (base32 - "1h7zx4dfyclalg0fqnfjijpn0f793a9mx8sy3b27gd31nr6dhq3s")))) + "0khvm08rcwm62wc47j8niyl6h13f8w51c8669ifivjdr23g3cbhk")))) (build-system python-build-system) (arguments - ;; error in setup.cfg: command 'test' has no such option 'buffer' + ;; FIXME: Circular dependency on testtools. '(#:tests? #f)) (home-page "https://github.com/testing-cabal/extras") (synopsis "Useful extensions to the Python standard library") -- cgit v1.2.3 From 8b93f7e4371ac53d56314f8a6a4061566b92e28c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 18:33:09 +0100 Subject: gnu: python-testtools: Update to 2.3.0. * gnu/packages/check.scm (python-testtools-bootstrap, python2-testtools-bootstrap): New public variables. (python-testtools): Inherit. [arguments]: Remove old. Replace CHECK-PHASE with custom command. [propagated-inputs]: Add PYTHON-FIXTURES, PYTHON-PBR, PYTHON-SIX, PYTHON-TRACEBACK2 and PYTHON-UNITTEST2. [native-inputs]: Add PYTHON-TESTSCENARIOS-BOOTSTRAP. (python-testscenarios-bootstrap, python2-testscenarios-bootstrap): New public variables. (python-testscenarios): Adjust accordingly. [propagated-inputs]: Replace PYTHON-TESTTOOLS with PYTHON-TESTTOOLS-BOOTSTRAP. (python-subunit-bootstrap, python2-subunit-bootstrap): New public variables. (python-subunit): Inherit. (python-fixtures-bootstrap)[native-inputs]: Replace PYTHON-TESTTOOLS with PYTHON-TESTTOOLS-BOOTSTRAP. (python-testrepository-bootstrap)[native-inputs]: Replace PYTHON-SUBUNIT and PYTHON-TESTTOOLS with PYTHON-SUBUNIT-BOOTSTRAP and PYTHON-TESTTOOLS-BOOTSTRAP. * gnu/packages/python.scm (python-pbr)[native-inputs]: Replace PYTHON-TESTSCENARIOS and PYTHON-TESTTOOLS with PYTHON-TESTSCENARIOS-BOOTSTRAP and PYTHON-TESTTOOLS-BOOTSTRAP. --- gnu/packages/check.scm | 129 +++++++++++++++++++++++++++++++----------------- gnu/packages/python.scm | 4 +- 2 files changed, 87 insertions(+), 46 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0a7d888d46..6b6d0376e8 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -834,57 +834,68 @@ subprocess and see the output as well as any file modifications.") (define-public python2-scripttest (package-with-python2 python-scripttest)) -(define-public python-testtools +(define-public python-testtools-bootstrap (package - (name "python-testtools") - (version "1.4.0") + (name "python-testtools-bootstrap") + (version "2.3.0") (source (origin (method url-fetch) (uri (pypi-uri "testtools" version)) (sha256 (base32 - "1vw8yljnd75d396hhw6s2hrf4cclzy845ifd5am0lxsl235z3i8c")))) + "0n8519lk8aaa91vymz842831181wf7fss98hyllhygi3z1nfq9sq")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-module-imports - (lambda _ - (substitute* "setup.py" - (("'unittest2>=0.8.0',") "")) - (substitute* '("testtools/testcase.py" - "testtools/testsuite.py" - "testtools/run.py" - "testtools/tests/test_run.py" - "testtools/tests/test_testsuite.py" - "testtools/tests/test_deferredruntest.py") - ;; unittest2 is a backport of Python2.7 features to Python 2.4. - (("import unittest2 as unittest") "import unittest") - (("import unittest2") "import unittest as unittest2") - (("from unittest2 import") "from unittest import")) - (substitute* "testtools/tests/test_testresult.py" - ;; NUL in source code is not allowed (raises ValueError). - (("\\x00\\x04") "\\x04")) - #t))))) + (arguments '(#:tests? #f)) (propagated-inputs - `(("python-mimeparse" ,python-mimeparse) - ("python-extras" ,python-extras))) + `(("python-extras" ,python-extras) + ("python-fixtures" ,python-fixtures-bootstrap) + ("python-mimeparse" ,python-mimeparse) + ("python-pbr" ,python-pbr-minimal) + ("python-six" ,python-six) + ("python-traceback2" ,python-traceback2) + ("python-unittest2" ,python-unittest2))) (home-page "https://github.com/testing-cabal/testtools") (synopsis "Extensions to the Python standard library unit testing framework") + (description + "This package is only for bootstrapping. Do not use this.") + (license license:psfl))) + +(define-public python2-testtools-bootstrap + (package-with-python2 python-testtools-bootstrap)) + +(define-public python-testtools + (package + (inherit python-testtools-bootstrap) + (name "python-testtools") + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-m" "testtools.run" + "testtools.tests.test_suite")))))) + (propagated-inputs + `(("python-extras" ,python-extras) + ("python-fixtures" ,python-fixtures) + ("python-mimeparse" ,python-mimeparse) + ("python-pbr" ,python-pbr) + ("python-six" ,python-six) + ("python-traceback2" ,python-traceback2) + ("python-unittest2" ,python-unittest2))) + (native-inputs + `(("python-testscenarios" ,python-testscenarios-bootstrap))) (description "Testtools extends the Python standard library unit testing framework to provide matchers, more debugging information, and cross-Python -compatibility.") - (license license:psfl))) +compatibility."))) (define-public python2-testtools (package-with-python2 python-testtools)) -(define-public python-testscenarios +(define-public python-testscenarios-bootstrap (package - (name "python-testscenarios") + (name "python-testscenarios-bootstrap") (version "0.4") (source (origin @@ -897,14 +908,26 @@ compatibility.") "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) (build-system python-build-system) (propagated-inputs - `(("python-testtools" ,python-testtools))) + `(("python-testtools" ,python-testtools-bootstrap))) (home-page "https://launchpad.net/testscenarios") (synopsis "Pyunit extension for dependency injection") (description - "Testscenarios provides clean dependency injection for Python unittest -style tests.") + "This package is only for bootstrapping. Don't use this.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python2-testscenarios-bootstrap + (package-with-python2 python-testscenarios-bootstrap)) + +(define-public python-testscenarios + (package + (inherit python-testscenarios-bootstrap) + (name "python-testscenarios") + (propagated-inputs + `(("python-testtools" ,python-testtools))) + (description + "Testscenarios provides clean dependency injection for Python unittest +style tests."))) + (define-public python2-testscenarios (package-with-python2 python-testscenarios)) @@ -952,32 +975,50 @@ use of resources by test cases."))) (define-public python2-testresources (package-with-python2 python-testresources)) -(define-public python-subunit +(define-public python-subunit-bootstrap (package - (name "python-subunit") + (name "python-subunit-bootstrap") (version "1.2.0") (source (origin (method url-fetch) - (uri (pypi-uri name version)) + (uri (pypi-uri "python-subunit" version)) (sha256 (base32 "1yii2gx3z6323as3iraj1yphj76dy7i3h6kj63pnc5y0hwjs5sgx")))) (build-system python-build-system) (propagated-inputs `(("python-extras" ,python-extras) - ("python-testtools" ,python-testtools))) + ("python-testtools" ,python-testtools-bootstrap))) (native-inputs `(("python-fixtures" ,python-fixtures-bootstrap) ("python-hypothesis" ,python-hypothesis) - ("python-testscenarios" ,python-testscenarios))) + ("python-testscenarios" ,python-testscenarios-bootstrap))) (home-page "http://launchpad.net/subunit") (synopsis "Python implementation of the subunit protocol") (description - "Python-subunit is a Python implementation of the subunit test streaming -protocol.") + "This package is here for bootstrapping purposes only. Use the regular +python-subunit package instead.") (license (list license:bsd-3 license:asl2.0)))) ; at the user's option +(define-public python2-subunit-bootstrap + (package-with-python2 python-subunit-bootstrap)) + +(define-public python-subunit + (package + (inherit python-subunit-bootstrap) + (name "python-subunit") + (propagated-inputs + `(("python-extras" ,python-extras) + ("python-testtools" ,python-testtools))) + (native-inputs + `(("python-fixtures" ,python-fixtures) + ("python-hypothesis" ,python-hypothesis) + ("python-testscenarios" ,python-testscenarios))) + (description + "Python-subunit is a Python implementation of the subunit test streaming +protocol."))) + (define-public python2-subunit (package-with-python2 python-subunit)) @@ -1025,7 +1066,7 @@ python-fixtures package instead.") ("python-six" ,python-six))) (native-inputs `(("python-mock" ,python-mock) - ("python-testtools" ,python-testtools))) + ("python-testtools" ,python-testtools-bootstrap))) (description "Fixtures provides a way to create reusable state, useful when writing Python tests."))) @@ -1050,8 +1091,8 @@ Python tests."))) (arguments '(#:tests? #f)) (propagated-inputs `(("python-fixtures" ,python-fixtures-bootstrap) - ("python-subunit" ,python-subunit) - ("python-testtools" ,python-testtools))) + ("python-subunit" ,python-subunit-bootstrap) + ("python-testtools" ,python-testtools-bootstrap))) (native-inputs `(("python-mimeparse" ,python-mimeparse))) (home-page "https://launchpad.net/testrepository") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f08d93dc78..8285a4ea3c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1694,8 +1694,8 @@ code introspection, and logging.") ("python-sphinx" ,python-sphinx) ("python-testrepository" ,python-testrepository-bootstrap) ("python-testresources" ,python-testresources-bootstrap) - ("python-testscenarios" ,python-testscenarios) - ("python-testtools" ,python-testtools) + ("python-testscenarios" ,python-testscenarios-bootstrap) + ("python-testtools" ,python-testtools-bootstrap) ("python-virtualenv" ,python-virtualenv))) (synopsis "Enhance the default behavior of Python’s setuptools") (description -- cgit v1.2.3 From 3719d0edf2ecbcad7cb155548927004bc64cfc97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 27 Feb 2018 20:44:16 +0100 Subject: gnu: python-sphinx@1.6: Add python2 variant. * gnu/packages/python.scm (python-sphinx-1.6)[properties]: Declare python2 variant. (python2-sphinx-1.6): New public variable. --- gnu/packages/python.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 8285a4ea3c..5c6bc7f04e 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2412,7 +2412,17 @@ sources.") `(("python-pytest" ,python-pytest) ("imagemagick" ,imagemagick) ; for "convert" ,@(package-native-inputs python-sphinx))) - (properties '()))) + (properties `((python2-variant . ,(delay python2-sphinx-1.6)))))) + +(define-public python2-sphinx-1.6 + (let ((base (package-with-python2 (strip-python2-variant python-sphinx-1.6)))) + (package + (inherit base) + (propagated-inputs + `(("python2-typing" ,python2-typing) + ,@(package-propagated-inputs base))) + (native-inputs `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base)))))) (define-public python-sphinx-1.5.3 (package -- cgit v1.2.3 From 3e3302acc51aca4415b394b067e69249d3f11e06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 00:02:53 +0100 Subject: gnu: Add python-rfc3986. * gnu/packages/python.scm (python-rfc3986, python2-rfc3986): New public variables. --- gnu/packages/python.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c6bc7f04e..ee867517fc 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11500,6 +11500,48 @@ applying JSON Patches according to RFC 6902.") (define-public python2-jsonpatch-0.4 (package-with-python2 python-jsonpatch-0.4)) +(define-public python-rfc3986 + (package + (name "python-rfc3986") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "rfc3986" version)) + (sha256 + (base32 + "06wlmysw83f75ff84zr1yr6n0shvc2xn1n1sb4iwzqap9hf5fn44")))) + (build-system python-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-v"))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://rfc3986.readthedocs.io/") + (synopsis "Parse and validate URI references") + (description + "@code{rfc3986} is a Python implementation of RFC@tie{}3986 including +validation and authority parsing. This module also supports RFC@tie{}6874 +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 24f4400aa69925635c229d7f494eabf37e980cae Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Oct 2016 09:55:51 +0100 Subject: gnu: Add python-pyinotify. * gnu/packages/python.scm (python-pyinotify, python2-pyinotify): New variables. --- gnu/packages/python.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ee867517fc..a44c3a0fd0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -12896,3 +12896,25 @@ interpreter. bpython's main features are (("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub rest) (string-append name "2" (or sub "") rest "\n"))) #t)))))))) + +(define-public python-pyinotify + (package + (name "python-pyinotify") + (version "0.9.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "pyinotify" version)) + (sha256 + (base32 + "1x3i9wmzw33fpkis203alygfnrkcmq9w1aydcm887jh6frfqm6cw")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ;no tests + (home-page "https://github.com/seb-m/pyinotify") + (synopsis "Python library for monitoring inotify events") + (description + "@code{pyinotify} provides a Python interface for monitoring +filesystem events on Linux.") + (license license:expat))) + +(define-public python2-pyinotify + (package-with-python2 python-pyinotify)) -- cgit v1.2.3 From 0075644662acf58287f9ad825c5b8386b216a1fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 04:59:32 +0100 Subject: gnu: python-msgpack: Update to 0.5.6. * gnu/packages/python.scm (python-msgpack): Update to 0.5.6. [source, home-page]: Adjust to msgpack-python->msgpack rename. --- gnu/packages/python.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a44c3a0fd0..32fcea480b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5832,19 +5832,19 @@ should be stored on various operating systems.") (define-public python-msgpack (package (name "python-msgpack") - (version "0.4.8") + (version "0.5.6") (source (origin (method url-fetch) - (uri (pypi-uri "msgpack-python" version)) + (uri (pypi-uri "msgpack" version)) (sha256 (base32 - "11pqk5braa6wndpnr1dhg64js82vjgxnm0lzy73rwl831zgijaqs")))) + "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) (build-system python-build-system) (synopsis "MessagePack (de)serializer") (description "MessagePack is a fast, compact binary serialization format, suitable for similar data to JSON. This package provides CPython bindings for reading and writing MessagePack data.") - (home-page "https://pypi.python.org/pypi/msgpack-python/") + (home-page "https://pypi.python.org/pypi/msgpack/") (license license:asl2.0))) (define-public python2-msgpack -- cgit v1.2.3 From 2441239842fa6f786008e8c75651342b2c0172d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 05:04:26 +0100 Subject: gnu: python-msgpack: Run the tests. * gnu/packages/python.scm (python-msgpack)[arguments]: Add #:modules. Replace CHECK-PHASE with pytest invocation. [native-inputs]: Add PYTHON-PYTEST. --- gnu/packages/python.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 32fcea480b..80ea4caf76 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5840,6 +5840,26 @@ should be stored on various operating systems.") (base32 "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) (build-system python-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build python-build-system) + (ice-9 ftw) + (srfi srfi-1) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (let ((cwd (getcwd))) + (setenv "PYTHONPATH" + (string-append cwd "/build/" + (find (cut string-prefix? "lib" <>) + (scandir (string-append cwd "/build"))) + ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-v" "test"))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) (synopsis "MessagePack (de)serializer") (description "MessagePack is a fast, compact binary serialization format, suitable for similar data to JSON. This package provides CPython bindings for -- cgit v1.2.3 From 836de07a47aa4a982fe99b774da2db53e235f2ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 13:54:08 +0100 Subject: gnu: python-wrapt: Update to 1.10.11. * gnu/packages/python.scm (python-wrapt): Update to 1.10.11. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 80ea4caf76..fc906e6858 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5896,14 +5896,14 @@ and MAC network addresses.") (define-public python-wrapt (package (name "python-wrapt") - (version "1.10.8") + (version "1.10.11") (source (origin (method url-fetch) (uri (pypi-uri "wrapt" version)) (sha256 (base32 - "0wrcm1mydvfivbkzz0h81ygzdchnscshi6xvy5n3r21r9s0px8af")))) + "1ip3dwib39xhp79kblskgvz3fjzcwxgx3fs3ahdixhpjg7a61mfl")))) (build-system python-build-system) (arguments ;; Tests are not included in the tarball, they are only available in the -- cgit v1.2.3 From fb2477f6d2fc9e41b226dae1f88723fd92b03c1c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 14:17:55 +0100 Subject: gnu: python-psutil: Update to 5.4.3. * gnu/packages/python.scm (python-psutil): Update to 5.4.3. [properties]: Declare python2 variant. (python2-psutil): Propagate PYTHON2-ENUM34. --- gnu/packages/python.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fc906e6858..fa8f4902d2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -448,14 +448,14 @@ instead of @command{python3}."))) (define-public python-psutil (package (name "python-psutil") - (version "4.3.0") + (version "5.4.3") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 (base32 - "1w4r09fvn6kd80m5mx4ws1wz100brkaq6hzzpwrns8cgjzjpl6c6")))) + "063v69x7spyclyaxrd3gmzj3p16q5ayg97xqhwb1kyn22a9pwip2")))) (build-system python-build-system) (arguments ;; FIXME: some tests does not return and times out. @@ -470,10 +470,16 @@ limiting process resources and management of running processes. 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 - (package-with-python2 python-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 -- cgit v1.2.3 From a846f29dfff9c7420f44c577bd556f34ac9c6c56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 28 Feb 2018 15:26:01 +0100 Subject: gnu: python-netifaces: Update to 0.10.6. * gnu/packages/python.scm (python-netifaces): Update to 0.10.6. [source](uri): Use PYPI-URI. [home-page]: Update. --- gnu/packages/python.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fa8f4902d2..064d79002d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4862,20 +4862,16 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (define-public python-netifaces (package (name "python-netifaces") - (version "0.10.4") + (version "0.10.6") (source (origin (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/n/netifaces/netifaces-" - version - ".tar.gz")) + (uri (pypi-uri "netifaces" version)) (sha256 (base32 - "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln")))) + "1q7bi5k2r955rlcpspx4salvkkpk28jky67fjbpz2dkdycisak8c")))) (build-system python-build-system) - (home-page - "https://bitbucket.org/al45tair/netifaces") + (home-page "https://github.com/al45tair/netifaces") (synopsis "Python module for portable network interface information") (description -- cgit v1.2.3 From acb59d99dbb8779ecf41cdbba45d2ce8ba88f5ed Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 28 Feb 2018 23:20:02 -0500 Subject: gnu: Fix Borg crashes with Python msgpack > 0.5 The Python msgpack library changed its name, but borg (and possibly other packages) still uses the old name. Fixes . * gnu/packages/python.scm (python-msgpack-transitional): New variable. * gnu/packages/backup.scm (borg)[inputs]: Use it. --- gnu/packages/backup.scm | 5 ++++- gnu/packages/python.scm | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 48d4b08af6..2fafa2c4a6 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -547,7 +547,10 @@ detection, and lossless compression.") ("lz4" ,lz4) ("openssl" ,openssl) ("python-llfuse" ,python-llfuse) - ("python-msgpack" ,python-msgpack) + ;; The Python msgpack library changed its name so Borg requires this + ;; transitional package for now: + ;; + ("python-msgpack" ,python-msgpack-transitional) ("zstd" ,zstd))) (synopsis "Deduplicated, encrypted, authenticated and compressed backups") (description "Borg is a deduplicating backup program. Optionally, it diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 064d79002d..69101c78b9 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5869,6 +5869,24 @@ reading and writing MessagePack data.") (home-page "https://pypi.python.org/pypi/msgpack/") (license license:asl2.0))) +;; 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. +;; +(define-public python-msgpack-transitional + (package + (inherit python-msgpack) + (arguments + (substitute-keyword-arguments (package-arguments python-msgpack) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'configure-transitional + (lambda _ + ;; Keep using the old name. + (substitute* "setup.py" + (("TRANSITIONAL = False") + "TRANSITIONAL = 1")) + #t)))))))) + (define-public python2-msgpack (package-with-python2 python-msgpack)) -- cgit v1.2.3