From 1b2f753d9c73a5431ec1f5510449c480debf80ce Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 13 Nov 2017 23:24:11 +0100 Subject: gnu: Move web packages from python to python-web. This is in part to address . * gnu/packages/python.scm (python-httplib2, python2-httplib2) (python-sockjs-tornado, python2-sockjs-tornado) (python-flask-babel, python2-flask-babel) (python-html5lib, python2-html5lib) (python-html5lib-0.9, python2-html5lib-0.9) (python-html5-parser, python2-html5-parser) (python-webencodings, python2-webencodings) (python-openid, python2-openid, python-cssutils, python2-cssutils) (python-cssselect, python2-cssutils) (python-openid-cla, python2-openid-cla) (python-openid-teams, python2-openid-teams) (python-tornado, python2-tornado) (python-tornado-http-auth, python-terminado, python2-terminado) (python-webob, python2-webob, python-zope-event, python2-zope-event) (python-zope-interface, python2-zope-interface) (python-zope-exceptions, python2-zope-exceptions) (python-zope-testing, python2-zope-testing) (python-zope-testrunner, python2-zope-testrunner) (python-zope-i18nmessageid, python2-zope-i18nmessageid) (python-zope-schema, python2-zope-schema) (python-zope-configuration, python2-zope-configuration) (python-zope-proxy, python2-zope-proxy) (python-zope-location, python2-zope-location) (python-zope-security, python2-zope-security) (python-zope-component, python2-zope-component) (python-ndg-httpsclient, python2-ndg-httpsclient) (python-websocket-client, python2-websocket-client) (python-requests-toolbelt, python2-requests-toolbelt) (python-rauth, python2-rauth, python-urllib3, python2-urllib3) (awscli, python-wsgiproxy2, python2-wsgiproxy2) (python-pastedeploy, python2-pastedeploy) (python-webtest, python2-webtest, python-flask, python2-flask) (python-flast-wtf, python2-flask-wtf) (python-flask-multistatic, python2-flask-multistatic) (python-cookies, python2-cookies) (python-responses, python2-responses) (python-geventhttpclient, python2-geventhttpclient) (python-requests-oauthlib, python2-requests-oauthlib) (python-url, python2-url, python-cachecontrol, python2-cachecontrol) (python-betamax, python2-betamax) (python-betamax-matchers, python2-betamax-matchers) (python-s3transfer, python2-s3transfer) (python-flask-restful, python-flask-basicauth) (python-flask-sqlalchemy, python-flask-restplus) (python-flask-restful-swagger, python-htmlmin, python2-htmlmin) (python-flask-htmlmin, python2-flask-htmlmin) (python-flask-login, python2-flask-login) (python-oauth2client, python-flask-oidc) (python-webassets, python-cssmin, python2-cssmin) (python-elasticsearch, python2-elasticsearch) (python-flask-script, python2-flask-script) (python-flask-migrate, python2-flask-migrate) (python-genshi, python2-genshi) (python-flask-principal, python2-flask-principal) (python-flask-httpauth, python2-flask-httpauth) (python-uritemplate, python2-uritemplate): Move to... * gnu/packages/python-web.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/admin.scm, gnu/packages/backup.scm, gnu/packages/dav.scm, gnu/packages/django.scm, gnu/packages/docker.scm, gnu/packages/ebook.scm, gnu/packages/logging.scm, gnu/packages/mail.scm, gnu/packages/music.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/rdf.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm: Adjust accordingly. --- gnu/packages/openstack.scm | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 86d1ce9978..410a205849 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -21,6 +21,7 @@ (define-module (gnu packages openstack) #:use-module (gnu packages gnupg) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) @@ -249,46 +250,6 @@ tested on Python version 3.2, 2.7 and 2.6.") (define-public python2-os-testr (package-with-python2 python-os-testr)) -(define-public python-requests-mock - (package - (name "python-requests-mock") - (version "1.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "requests-mock" version)) - (sha256 - (base32 - "0jr997dvk6zbmhvbpcv3rajrgag69mcsm1ai3w3rgk2jdh6rg1mx")))) - (build-system python-build-system) - (propagated-inputs - `(("python-requests" ,python-requests) - ("python-six" ,python-six))) - (native-inputs - `(("python-pbr" ,python-pbr) - ("python-discover" ,python-discover) - ("python-docutils" ,python-docutils) - ("python-fixtures" ,python-fixtures) - ("python-mock" ,python-mock) - ("python-sphinx" ,python-sphinx) - ("python-testrepository" ,python-testrepository) - ("python-testtools" ,python-testtools))) - (home-page "https://requests-mock.readthedocs.org/") - (synopsis "Mock out responses from the requests package") - (description - "This module provides a building block to stub out the HTTP requests -portions of your testing code.") - (properties `((python2-variant . ,(delay python2-requests-mock)))) - (license asl2.0))) - -(define-public python2-requests-mock - (package (inherit (package-with-python2 - (strip-python2-variant python-requests-mock))) - (arguments - `(#:python ,python-2 - ;; FIXME: 'subunit.run discover: error: no such option: --list' - #:tests? #f)))) - (define-public python-stevedore (package (name "python-stevedore") -- cgit 1.4.1 From cc6f49121bcf2c5d342045f76c94f452f96e5f78 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 15 Nov 2017 14:10:30 +0100 Subject: gnu: Move crypto packages from python to python-crypto. * gnu/packages/python.scm (python-passlib, python2-passlib) (python-py-bcrypt, python2-py-bcrypt) (python-paramiko, python2-paramiko, python-ecdsa, python2-ecdsa) (python-pycrypto, python2-pycrypto, python-keyring, python2-keyring) (python-certifi, python2-certifi) (python-cryptography-vectors, python2-cryptography-vectors) (python-cryptography, python2-cryptography) (python-pyopenssl, python2-pyopenssl) (python-axolotl-curve25519, python2-axolotl-curve25519) (python-axolotl, python2-axolotl, python2-slowaes) (python-pyaes, python2-pyaes): Move to... * gnu/packages/python-crypto.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/admin.scm, gnu/packages/backup.scm, gnu/packages/crypto.scm, gnu/packages/finance.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/messaging.scm, gnu/packages/openstack.scm, gnu/packages/python-web.scm, gnu/packages/tls.scm, gnu/packages/xorg.scm: Adjust accordingly. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + gnu/packages/backup.scm | 1 + gnu/packages/crypto.scm | 1 + gnu/packages/finance.scm | 1 + gnu/packages/irc.scm | 3 +- gnu/packages/jrnl.scm | 3 +- gnu/packages/messaging.scm | 1 + gnu/packages/openstack.scm | 1 + gnu/packages/python-crypto.scm | 507 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/python-web.scm | 1 + gnu/packages/python.scm | 464 +------------------------------------ gnu/packages/tls.scm | 1 + gnu/packages/xorg.scm | 1 + 14 files changed, 522 insertions(+), 465 deletions(-) create mode 100644 gnu/packages/python-crypto.scm (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 84483da999..54d1ac91c9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -341,6 +341,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/protobuf.scm \ %D%/packages/pv.scm \ %D%/packages/python.scm \ + %D%/packages/python-crypto.scm \ %D%/packages/python-web.scm \ %D%/packages/tryton.scm \ %D%/packages/qt.scm \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index bed313b266..58ef7d7253 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 70dfb30c03..23b5b49ed4 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages rsync) #:use-module (gnu packages ssh) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index dce7d3534c..a821258aa8 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages readline) #:use-module (gnu packages search) #:use-module (gnu packages serialization) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2a83921d6a..e123434201 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages qt) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 5f031e3983..afa5f60eec 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Kevin Lemonnier -;;; Copyright © 2015 Ludovic Courtès +;;; Copyright © 2015, 2017 Ludovic Courtès ;;; Copyright © 2015, 2016, 2017 Efraim Flashner ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke @@ -51,6 +51,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages ruby) #:use-module (gnu packages qt) #:use-module (gnu packages tcl) diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index f26de0d4ab..a2ba7b8b9f 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -23,7 +23,8 @@ #:use-module (guix licenses) #:use-module (guix download) #:use-module (guix build-system python) - #:use-module (gnu packages python)) + #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto)) (define-public jrnl (package diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 72dbbcd1e9..c0db36585b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages tcl) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 410a205849..5f15b01032 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -21,6 +21,7 @@ (define-module (gnu packages openstack) #:use-module (gnu packages gnupg) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm new file mode 100644 index 0000000000..8e4616b188 --- /dev/null +++ b/gnu/packages/python-crypto.scm @@ -0,0 +1,507 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2015 Eric Dvorsak +;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2016, 2017 Marius Bakke +;;; Copyright © 2017 Ben Sturmfels +;;; Copyright © 2016 Sou Bunnbu +;;; Copyright © 2015 Cyril Roelandt +;;; Copyright © 2014, 2017 Eric Bavier +;;; Copyright © 2015, 2016 David Thompson +;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017 ng0 +;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus +;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2016, 2017 Arun Isaac +;;; Copyright © 2017 Carlo Zancanaro +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages python-crypto) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system python) + #:use-module (gnu packages) + #:use-module (gnu packages crypto) ;XXX: Move python-* here? + #:use-module (gnu packages libffi) + #:use-module (gnu packages multiprecision) + #:use-module (gnu packages protobuf) + #:use-module (gnu packages python) + #:use-module (gnu packages tls) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (srfi srfi-1)) + +(define-public python-passlib + (package + (name "python-passlib") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "passlib" version)) + (sha256 + (base32 + "1q2khqpj9rlcgdmkypjdq1kswvhjf72bq0zk2cv669cc2dj8z51x")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose))) + (propagated-inputs + `(("python-py-bcrypt" ,python-py-bcrypt))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'set-PYTHON_EGG_CACHE + ;; some tests require access to "$HOME/.cython" + (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) + (home-page "https://bitbucket.org/ecollins/passlib") + (synopsis + "Comprehensive password hashing framework") + (description + "Passlib is a password hashing library for Python 2 & 3, which provides +cross-platform implementations of over 30 password hashing algorithms, as well +as a framework for managing existing password hashes. It's designed to be +useful for a wide range of tasks, from verifying a hash found in /etc/shadow, +to providing full-strength password hashing for multi-user application.") + (license license:bsd-3))) + +(define-public python2-passlib + (package-with-python2 python-passlib)) + +(define-public python-py-bcrypt + (package + (name "python-py-bcrypt") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/p/py-bcrypt/py-bcrypt-" + version + ".tar.gz")) + (sha256 + (base32 + "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az")))) + (build-system python-build-system) + (home-page "https://code.google.com/p/py-bcrypt") + (synopsis + "Bcrypt password hashing and key derivation") + (description + "A python wrapper of OpenBSD's Blowfish password hashing code. This +system hashes passwords using a version of Bruce Schneier's Blowfish block +cipher with modifications designed to raise the cost of off-line password +cracking and frustrate fast hardware implementation. The computation cost of +the algorithm is parametised, so it can be increased as computers get faster. +The intent is to make a compromise of a password database less likely to +result in an attacker gaining knowledge of the plaintext passwords (e.g. using +John the Ripper).") + ;; "sha2.c" is under BSD-3; + ;; "blowfish.c" and "bcrypt.c" are under BSD-4; + ;; the rest is under ISC. + (license (list license:isc license:bsd-3 license:bsd-4)))) + +(define-public python2-py-bcrypt + (package-with-python2 python-py-bcrypt)) + +(define-public python-paramiko + (package + (name "python-paramiko") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "paramiko" version)) + (sha256 + (base32 + "04734n0wy3hxk6rij4fr29in5jmr70nxpc7pqi2ksbjysfz4kbjz")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "python" "test.py"))))))) + (propagated-inputs + `(("python-pyasn1" ,python-pyasn1) + ("python-cryptography" ,python-cryptography))) + (home-page "http://www.paramiko.org/") + (synopsis "SSHv2 protocol library") + (description "Paramiko is a python implementation of the SSHv2 protocol, +providing both client and server functionality. While it leverages a Python C +extension for low level cryptography (PyCrypto), Paramiko itself is a pure +Python interface around SSH networking concepts.") + (license license:lgpl2.1+))) + +(define-public python2-paramiko + (package-with-python2 python-paramiko)) + +(define-public python-ecdsa + (package + (name "python-ecdsa") + (version "0.13") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/e/ecdsa/ecdsa-" + version + ".tar.gz")) + (sha256 + (base32 + "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4")))) + (build-system python-build-system) + (inputs + `(("openssl" ,openssl))) + (home-page + "https://github.com/warner/python-ecdsa") + (synopsis + "ECDSA cryptographic signature library (pure python)") + (description + "This is an easy-to-use implementation of ECDSA cryptography (Elliptic +Curve Digital Signature Algorithm), implemented purely in Python. With this +library, you can quickly create keypairs (signing key and verifying key), sign +messages, and verify the signatures. The keys and signatures are very short, +making them easy to handle and incorporate into other protocols.") + (license license:expat))) + +(define-public python2-ecdsa + (package-with-python2 python-ecdsa)) + +;;; Pycrypto is abandoned upstream: +;;; +;;; https://github.com/dlitz/pycrypto/issues/173 +;;; +;;; TODO Remove this package from GNU Guix. +(define-public python-pycrypto + (package + (name "python-pycrypto") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pycrypto" version)) + (patches (search-patches "python-pycrypto-CVE-2013-7459.patch")) + (sha256 + (base32 + "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj")))) + (build-system python-build-system) + (inputs + `(("python" ,python) + ("gmp" ,gmp))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-build-env + ;; pycrypto runs an autoconf configure script behind the scenes + (lambda _ (setenv "CONFIG_SHELL" (which "bash")) #t))))) + (home-page "http://www.pycrypto.org/") + (synopsis "Cryptographic modules for Python") + (description + "Pycrypto is a collection of both secure hash functions (such as SHA256 +and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, +etc.). The package is structured to make adding new modules easy.") + (license license:public-domain))) + +(define-public python2-pycrypto + (let ((pycrypto (package-with-python2 python-pycrypto))) + (package (inherit pycrypto) + (inputs + `(("python" ,python-2) + ,@(alist-delete + "python" + (package-inputs pycrypto))))))) + +(define-public python-keyring + (package + (name "python-keyring") + (version "8.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "keyring" version)) + (sha256 + (base32 + "0482rmi2x6p78wl2kz8qzyq21xz1sbbfwnv5x7dggar4vkwxhzfx")))) + (build-system python-build-system) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) + (propagated-inputs + `(("python-pycrypto" ,python-pycrypto))) + (arguments + `(#:tests? #f)) ;TODO: tests require pytest + (home-page "https://github.com/jaraco/keyring") + (synopsis "Store and access your passwords safely") + (description + "The Python keyring lib provides a easy way to access the system keyring +service from python. It can be used in any application that needs safe +password storage.") + ;; "MIT" and PSF dual license + (license license:x11))) + +(define-public python2-keyring + (package-with-python2 python-keyring)) + +(define-public python-certifi + (package + (name "python-certifi") + (version "2017.1.23") + (source (origin + (method url-fetch) + (uri (pypi-uri "certifi" version)) + (sha256 + (base32 + "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1")))) + (build-system python-build-system) + (home-page "https://certifi.io/") + (synopsis "Python CA certificate bundle") + (description + "Certifi is a Python library that contains a CA certificate bundle, which +is used by the Requests library to verify HTTPS requests.") + (license license:asl2.0))) + +(define-public python2-certifi + (package-with-python2 python-certifi)) + +(define-public python-cryptography-vectors + (package + (name "python-cryptography-vectors") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cryptography_vectors" version)) + (sha256 + (base32 + "1qa117fs1yd50zn2cfxh7d9l999ds0z4h83m9m7j4fk6ffm33f5y")))) + (build-system python-build-system) + (home-page "https://github.com/pyca/cryptography") + (synopsis "Test vectors for the cryptography package") + (description + "This package contains test vectors for the cryptography package.") + ;; Distributed under either BSD-3 or ASL2.0 + (license (list license:bsd-3 license:asl2.0)))) + +(define-public python2-cryptography-vectors + (package-with-python2 python-cryptography-vectors)) + +(define-public python-cryptography + (package + (name "python-cryptography") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cryptography" version)) + (sha256 + (base32 + "0fnck37zyvbzmccbp7w3jy27jgmij1992j5wyy3gxhw6a11b4jyh")))) + (build-system python-build-system) + (inputs + `(("openssl" ,openssl))) + (propagated-inputs + `(("python-asn1crypto" ,python-asn1crypto) + ("python-cffi" ,python-cffi) + ("python-six" ,python-six) + ("python-idna" ,python-idna) + ("python-iso8601" ,python-iso8601))) + (native-inputs + `(("python-cryptography-vectors" ,python-cryptography-vectors) + ("python-hypothesis" ,python-hypothesis) + ("python-pretend" ,python-pretend) + ("python-pytz" ,python-pytz) + ("python-pytest" ,python-pytest-3.0))) + (home-page "https://github.com/pyca/cryptography") + (synopsis "Cryptographic recipes and primitives for Python") + (description + "cryptography is a package which provides cryptographic recipes and +primitives to Python developers. It aims to be the “cryptographic standard +library” for Python. The package includes both high level recipes, and low +level interfaces to common cryptographic algorithms such as symmetric ciphers, +message digests and key derivation functions.") + ;; Distributed under either BSD-3 or ASL2.0 + (license (list license:bsd-3 license:asl2.0)) + (properties `((python2-variant . ,(delay python2-cryptography)))))) + +(define-public python2-cryptography + (let ((crypto (package-with-python2 + (strip-python2-variant python-cryptography)))) + (package (inherit crypto) + (propagated-inputs + `(("python2-ipaddress" ,python2-ipaddress) + ("python2-backport-ssl-match-hostname" + ,python2-backport-ssl-match-hostname) + ("python2-enum34" ,python2-enum34) + ,@(package-propagated-inputs crypto)))))) + +(define-public python-pyopenssl + (package + (name "python-pyopenssl") + (version "17.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyOpenSSL" version)) + (sha256 + (base32 + "0xkc1wfnpg6abzllivg3ylhc63npjdy1v81f4kc08bm8cj80nqr9")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (zero? (system* "py.test" "-v" "-k" + (string-append + ;; This test tries to look up certificates from + ;; the compiled-in default path in OpenSSL, which + ;; does not exist in the build environment. + "not test_fallback_default_verify_paths " + ;; This test attempts to make a connection to + ;; an external web service. + "and not test_set_default_verify_paths")))))))) + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-six" ,python-six))) + (inputs + `(("openssl" ,openssl))) + (native-inputs + `(("python-flaky" ,python-flaky) + ("python-pretend" ,python-pretend) + ("python-pytest" ,python-pytest-3.0))) + (home-page "https://github.com/pyca/pyopenssl") + (synopsis "Python wrapper module around the OpenSSL library") + (description + "PyOpenSSL is a high-level wrapper around a subset of the OpenSSL +library.") + (license license:asl2.0))) + +(define-public python2-pyopenssl + (package-with-python2 python-pyopenssl)) + +(define-public python-axolotl-curve25519 + (package + (name "python-axolotl-curve25519") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tgalal/python-axolotl-curve25519") + (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2"))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra")))) + (build-system python-build-system) + (arguments + `(;; Prevent creation of the egg. This works around + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 + #:configure-flags '("--root=/"))) + (home-page "https://github.com/tgalal/python-axolotl-curve25519") + (synopsis "Python wrapper for curve25519 library") + (description "This is a python wrapper for the curve25519 library +with ed25519 signatures. The C code was pulled from +libaxolotl-android. At the moment this wrapper is meant for use by +python-axolotl.") + (license (list license:gpl3 ; Most files + license:bsd-3)))) ; curve/curve25519-donna.c + +(define-public python2-axolotl-curve25519 + (package-with-python2 python-axolotl-curve25519)) + +(define-public python-axolotl + (package + (name "python-axolotl") + (version "0.1.35") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/tgalal/python-axolotl/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Don't install tests + (add-before 'install 'remove-tests + (lambda _ + (for-each delete-file-recursively + '("axolotl/tests" "build/lib/axolotl/tests")) + #t))))) + (propagated-inputs + `(("python-axolotl-curve25519" ,python-axolotl-curve25519) + ("python-dateutil" ,python-dateutil) + ("python-protobuf" ,python-protobuf) + ("python-pycrypto" ,python-pycrypto))) + (home-page "https://github.com/tgalal/python-axolotl") + (synopsis "Python port of libaxolotl-android") + (description "This is a python port of libaxolotl-android. This +is a ratcheting forward secrecy protocol that works in synchronous and +asynchronous messaging environments.") + (license license:gpl3))) + +(define-public python2-axolotl + (package-with-python2 python-axolotl)) + +;; SlowAES isn't compatible with Python 3. +(define-public python2-slowaes + (package + (name "python2-slowaes") + (version "0.1a1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "slowaes" version)) + (sha256 + (base32 + "02dzajm83a7lqgxf6r3hgj64wfmcxz8gs4nvgxpvj5n19kjqlrc3")))) + (build-system python-build-system) + (arguments `(#:python ,python-2)) + (home-page "http://code.google.com/p/slowaes/") + (synopsis "Implementation of AES in Python") + (description "This package contains an implementation of AES in Python. +This implementation is slow (hence the project name) but still useful when +faster ones are not available.") + (license license:asl2.0))) + +(define-public python-pyaes + (package + (name "python-pyaes") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyaes" version)) + (sha256 + (base32 + "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw")))) + (build-system python-build-system) + (home-page "https://github.com/ricmoo/pyaes") + (synopsis "Implementation of AES in Python") + (description "This package contains a pure-Python implementation of the +AES block cipher algorithm and the common modes of operation (CBC, CFB, CTR, +ECB and OFB).") + (license license:expat))) + +(define-public python2-pyaes + (package-with-python2 python-pyaes)) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 84bd10b68c..664c1b8cdc 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages django) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0d5c09b86b..d8de3192c2 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -99,7 +99,7 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages protobuf) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages readline) @@ -468,143 +468,6 @@ pidof, tty, taskset, pmap.") (define-public python2-psutil (package-with-python2 python-psutil)) -(define-public python-passlib - (package - (name "python-passlib") - (version "1.7.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "passlib" version)) - (sha256 - (base32 - "1q2khqpj9rlcgdmkypjdq1kswvhjf72bq0zk2cv669cc2dj8z51x")))) - (build-system python-build-system) - (native-inputs - `(("python-nose" ,python-nose))) - (propagated-inputs - `(("python-py-bcrypt" ,python-py-bcrypt))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-PYTHON_EGG_CACHE - ;; some tests require access to "$HOME/.cython" - (lambda* _ (setenv "PYTHON_EGG_CACHE" "/tmp") #t))))) - (home-page "https://bitbucket.org/ecollins/passlib") - (synopsis - "Comprehensive password hashing framework") - (description - "Passlib is a password hashing library for Python 2 & 3, which provides -cross-platform implementations of over 30 password hashing algorithms, as well -as a framework for managing existing password hashes. It's designed to be -useful for a wide range of tasks, from verifying a hash found in /etc/shadow, -to providing full-strength password hashing for multi-user application.") - (license license:bsd-3))) - -(define-public python2-passlib - (package-with-python2 python-passlib)) - -(define-public python-py-bcrypt - (package - (name "python-py-bcrypt") - (version "0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/py-bcrypt/py-bcrypt-" - version - ".tar.gz")) - (sha256 - (base32 - "0y6smdggwi5s72v6p1nn53dg6w05hna3d264cq6kas0lap73p8az")))) - (build-system python-build-system) - (home-page "https://code.google.com/p/py-bcrypt") - (synopsis - "Bcrypt password hashing and key derivation") - (description - "A python wrapper of OpenBSD's Blowfish password hashing code. This -system hashes passwords using a version of Bruce Schneier's Blowfish block -cipher with modifications designed to raise the cost of off-line password -cracking and frustrate fast hardware implementation. The computation cost of -the algorithm is parametised, so it can be increased as computers get faster. -The intent is to make a compromise of a password database less likely to -result in an attacker gaining knowledge of the plaintext passwords (e.g. using -John the Ripper).") - ;; "sha2.c" is under BSD-3; - ;; "blowfish.c" and "bcrypt.c" are under BSD-4; - ;; the rest is under ISC. - (license (list license:isc license:bsd-3 license:bsd-4)))) - -(define-public python2-py-bcrypt - (package-with-python2 python-py-bcrypt)) - - -(define-public python-paramiko - (package - (name "python-paramiko") - (version "2.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "paramiko" version)) - (sha256 - (base32 - "04734n0wy3hxk6rij4fr29in5jmr70nxpc7pqi2ksbjysfz4kbjz")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "python" "test.py"))))))) - (propagated-inputs - `(("python-pyasn1" ,python-pyasn1) - ("python-cryptography" ,python-cryptography))) - (home-page "http://www.paramiko.org/") - (synopsis "SSHv2 protocol library") - (description "Paramiko is a python implementation of the SSHv2 protocol, -providing both client and server functionality. While it leverages a Python C -extension for low level cryptography (PyCrypto), Paramiko itself is a pure -Python interface around SSH networking concepts.") - (license license:lgpl2.1+))) - -(define-public python2-paramiko - (package-with-python2 python-paramiko)) - - -(define-public python-ecdsa - (package - (name "python-ecdsa") - (version "0.13") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/e/ecdsa/ecdsa-" - version - ".tar.gz")) - (sha256 - (base32 - "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4")))) - (build-system python-build-system) - (inputs - `(("openssl" ,openssl))) - (home-page - "https://github.com/warner/python-ecdsa") - (synopsis - "ECDSA cryptographic signature library (pure python)") - (description - "This is an easy-to-use implementation of ECDSA cryptography (Elliptic -Curve Digital Signature Algorithm), implemented purely in Python. With this -library, you can quickly create keypairs (signing key and verifying key), sign -messages, and verify the signatures. The keys and signatures are very short, -making them easy to handle and incorporate into other protocols.") - (license license:expat))) - -(define-public python2-ecdsa - (package-with-python2 python-ecdsa)) - (define-public python-ccm (package (name "python-ccm") @@ -1034,50 +897,6 @@ multiple Unicode code points, e.g. \"G\" + acute-accent) (define-public python2-uniseg (package-with-python2 python-uniseg)) -;;; Pycrypto is abandoned upstream: -;;; -;;; https://github.com/dlitz/pycrypto/issues/173 -;;; -;;; TODO Remove this package from GNU Guix. -(define-public python-pycrypto - (package - (name "python-pycrypto") - (version "2.6.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pycrypto" version)) - (patches (search-patches "python-pycrypto-CVE-2013-7459.patch")) - (sha256 - (base32 - "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj")))) - (build-system python-build-system) - (inputs - `(("python" ,python) - ("gmp" ,gmp))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'set-build-env - ;; pycrypto runs an autoconf configure script behind the scenes - (lambda _ (setenv "CONFIG_SHELL" (which "bash")) #t))))) - (home-page "http://www.pycrypto.org/") - (synopsis "Cryptographic modules for Python") - (description - "Pycrypto is a collection of both secure hash functions (such as SHA256 -and RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal, -etc.). The package is structured to make adding new modules easy.") - (license license:public-domain))) - -(define-public python2-pycrypto - (let ((pycrypto (package-with-python2 python-pycrypto))) - (package (inherit pycrypto) - (inputs - `(("python" ,python-2) - ,@(alist-delete - "python" - (package-inputs pycrypto))))))) - (define-public python-humanfriendly (package (name "python-humanfriendly") @@ -1228,36 +1047,6 @@ from the Python interpreter, or as a small part of a larger application.") `(("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) -(define-public python-keyring - (package - (name "python-keyring") - (version "8.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "keyring" version)) - (sha256 - (base32 - "0482rmi2x6p78wl2kz8qzyq21xz1sbbfwnv5x7dggar4vkwxhzfx")))) - (build-system python-build-system) - (native-inputs - `(("python-setuptools-scm" ,python-setuptools-scm))) - (propagated-inputs - `(("python-pycrypto" ,python-pycrypto))) - (arguments - `(#:tests? #f)) ;TODO: tests require pytest - (home-page "https://github.com/jaraco/keyring") - (synopsis "Store and access your passwords safely") - (description - "The Python keyring lib provides a easy way to access the system keyring -service from python. It can be used in any application that needs safe -password storage.") - ;; "MIT" and PSF dual license - (license license:x11))) - -(define-public python2-keyring - (package-with-python2 python-keyring)) - (define-public python-six (package (name "python-six") @@ -2669,27 +2458,6 @@ files.") (define-public python2-pyld (package-with-python2 python-pyld)) -(define-public python-certifi - (package - (name "python-certifi") - (version "2017.1.23") - (source (origin - (method url-fetch) - (uri (pypi-uri "certifi" version)) - (sha256 - (base32 - "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1")))) - (build-system python-build-system) - (home-page "https://certifi.io/") - (synopsis "Python CA certificate bundle") - (description - "Certifi is a Python library that contains a CA certificate bundle, which -is used by the Requests library to verify HTTPS requests.") - (license license:asl2.0))) - -(define-public python2-certifi - (package-with-python2 python-certifi)) - (define-public python-click (package (name "python-click") @@ -7616,124 +7384,6 @@ responses, rather than doing any computation.") (define-public python2-pretend (package-with-python2 python-pretend)) -(define-public python-cryptography-vectors - (package - (name "python-cryptography-vectors") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cryptography_vectors" version)) - (sha256 - (base32 - "1qa117fs1yd50zn2cfxh7d9l999ds0z4h83m9m7j4fk6ffm33f5y")))) - (build-system python-build-system) - (home-page "https://github.com/pyca/cryptography") - (synopsis "Test vectors for the cryptography package") - (description - "This package contains test vectors for the cryptography package.") - ;; Distributed under either BSD-3 or ASL2.0 - (license (list license:bsd-3 license:asl2.0)))) - -(define-public python2-cryptography-vectors - (package-with-python2 python-cryptography-vectors)) - -(define-public python-cryptography - (package - (name "python-cryptography") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cryptography" version)) - (sha256 - (base32 - "0fnck37zyvbzmccbp7w3jy27jgmij1992j5wyy3gxhw6a11b4jyh")))) - (build-system python-build-system) - (inputs - `(("openssl" ,openssl))) - (propagated-inputs - `(("python-asn1crypto" ,python-asn1crypto) - ("python-cffi" ,python-cffi) - ("python-six" ,python-six) - ("python-idna" ,python-idna) - ("python-iso8601" ,python-iso8601))) - (native-inputs - `(("python-cryptography-vectors" ,python-cryptography-vectors) - ("python-hypothesis" ,python-hypothesis) - ("python-pretend" ,python-pretend) - ("python-pytz" ,python-pytz) - ("python-pytest" ,python-pytest-3.0))) - (home-page "https://github.com/pyca/cryptography") - (synopsis "Cryptographic recipes and primitives for Python") - (description - "cryptography is a package which provides cryptographic recipes and -primitives to Python developers. It aims to be the “cryptographic standard -library” for Python. The package includes both high level recipes, and low -level interfaces to common cryptographic algorithms such as symmetric ciphers, -message digests and key derivation functions.") - ;; Distributed under either BSD-3 or ASL2.0 - (license (list license:bsd-3 license:asl2.0)) - (properties `((python2-variant . ,(delay python2-cryptography)))))) - -(define-public python2-cryptography - (let ((crypto (package-with-python2 - (strip-python2-variant python-cryptography)))) - (package (inherit crypto) - (propagated-inputs - `(("python2-ipaddress" ,python2-ipaddress) - ("python2-backport-ssl-match-hostname" - ,python2-backport-ssl-match-hostname) - ("python2-enum34" ,python2-enum34) - ,@(package-propagated-inputs crypto)))))) - -(define-public python-pyopenssl - (package - (name "python-pyopenssl") - (version "17.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyOpenSSL" version)) - (sha256 - (base32 - "0xkc1wfnpg6abzllivg3ylhc63npjdy1v81f4kc08bm8cj80nqr9")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (zero? (system* "py.test" "-v" "-k" - (string-append - ;; This test tries to look up certificates from - ;; the compiled-in default path in OpenSSL, which - ;; does not exist in the build environment. - "not test_fallback_default_verify_paths " - ;; This test attempts to make a connection to - ;; an external web service. - "and not test_set_default_verify_paths")))))))) - (propagated-inputs - `(("python-cryptography" ,python-cryptography) - ("python-six" ,python-six))) - (inputs - `(("openssl" ,openssl))) - (native-inputs - `(("python-flaky" ,python-flaky) - ("python-pretend" ,python-pretend) - ("python-pytest" ,python-pytest-3.0))) - (home-page "https://github.com/pyca/pyopenssl") - (synopsis "Python wrapper module around the OpenSSL library") - (description - "PyOpenSSL is a high-level wrapper around a subset of the OpenSSL -library.") - (license license:asl2.0))) - -(define-public python2-pyopenssl - (package-with-python2 python-pyopenssl)) - (define-public python-pip (package (name "python-pip") @@ -12197,75 +11847,6 @@ PNG, JPEG, JPEG2000 and GIF files in pure Python.") (define-public python2-imagesize (package-with-python2 python-imagesize)) -(define-public python-axolotl-curve25519 - (package - (name "python-axolotl-curve25519") - (version "0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tgalal/python-axolotl-curve25519") - (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2"))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra")))) - (build-system python-build-system) - (arguments - `(;; Prevent creation of the egg. This works around - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 - #:configure-flags '("--root=/"))) - (home-page "https://github.com/tgalal/python-axolotl-curve25519") - (synopsis "Python wrapper for curve25519 library") - (description "This is a python wrapper for the curve25519 library -with ed25519 signatures. The C code was pulled from -libaxolotl-android. At the moment this wrapper is meant for use by -python-axolotl.") - (license (list license:gpl3 ; Most files - license:bsd-3)))) ; curve/curve25519-donna.c - -(define-public python2-axolotl-curve25519 - (package-with-python2 python-axolotl-curve25519)) - -(define-public python-axolotl - (package - (name "python-axolotl") - (version "0.1.35") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/tgalal/python-axolotl/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Don't install tests - (add-before 'install 'remove-tests - (lambda _ - (for-each delete-file-recursively - '("axolotl/tests" "build/lib/axolotl/tests")) - #t))))) - (propagated-inputs - `(("python-axolotl-curve25519" ,python-axolotl-curve25519) - ("python-dateutil" ,python-dateutil) - ("python-protobuf" ,python-protobuf) - ("python-pycrypto" ,python-pycrypto))) - (home-page "https://github.com/tgalal/python-axolotl") - (synopsis "Python port of libaxolotl-android") - (description "This is a python port of libaxolotl-android. This -is a ratcheting forward secrecy protocol that works in synchronous and -asynchronous messaging environments.") - (license license:gpl3))) - -(define-public python2-axolotl - (package-with-python2 python-axolotl)) - (define-public python-termstyle (package (name "python-termstyle") @@ -12565,27 +12146,6 @@ console.") (define-public python2-qrcode (package-with-python2 python-qrcode)) -;; SlowAES isn't compatible with Python 3. -(define-public python2-slowaes - (package - (name "python2-slowaes") - (version "0.1a1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "slowaes" version)) - (sha256 - (base32 - "02dzajm83a7lqgxf6r3hgj64wfmcxz8gs4nvgxpvj5n19kjqlrc3")))) - (build-system python-build-system) - (arguments `(#:python ,python-2)) - (home-page "http://code.google.com/p/slowaes/") - (synopsis "Implementation of AES in Python") - (description "This package contains an implementation of AES in Python. -This implementation is slow (hence the project name) but still useful when -faster ones are not available.") - (license license:asl2.0))) - (define-public python-rst2ansi (package (name "python-rst2ansi") @@ -14616,28 +14176,6 @@ version of @code{SocksiPy} with bug fixes and extra features.") (define-public python2-pysocks (package-with-python2 python-pysocks)) -(define-public python-pyaes - (package - (name "python-pyaes") - (version "1.6.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyaes" version)) - (sha256 - (base32 - "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw")))) - (build-system python-build-system) - (home-page "https://github.com/ricmoo/pyaes") - (synopsis "Implementation of AES in Python") - (description "This package contains a pure-Python implementation of the -AES block cipher algorithm and the common modes of operation (CBC, CFB, CTR, -ECB and OFB).") - (license license:expat))) - -(define-public python2-pyaes - (package-with-python2 python-pyaes)) - (define-public python-pydiff (package (name "python-pydiff") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 34de680a7d..427b5dfab9 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages texinfo) #:use-module (gnu packages base) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 8435a463b4..81f4e5d103 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -67,6 +67,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages qt) #:use-module (gnu packages spice) #:use-module (gnu packages video) -- cgit 1.4.1 From ac257f127ac5e1fd4758d3a05e4a19fde3af4e01 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 17 Nov 2017 21:42:23 +0100 Subject: gnu: Move testing packages from python.scm to check.scm. * gnu/packages/python.scm (python-behave-web-api, python2-behave-web-api, python-mock, python2-mock, python-mock-2, python-nose, python2-nose, python-nose2, python2-nose2, python-unittest2, python2-unittest2, python-pytest, python2-pytest, python-pytest-3.0, python2-pytest-3.0, python-pytest-cov, python2-pytest-cov, python-pytest-runner, python2-pytest-runner, python-pytest-mock, python2-pytest-mock, python-pytest-xdist, python2-pytest-xdist, python-scripttest, python2-scripttest, python-testtools, python2-testtools, python-testscenarios, python2-testscenarios, python-testresources, python2-testresources, python-subunit, python2-subunit, python-fixtures, python2-fixtures, python-testrepository, python2-testrepository, python-coverage, python2-coverage, python-cov-core, python2-cov-core, python-testpath, python2-testpath, python-testlib, python2-testlib, python-pytest-cache, python2-pytest-cache, python-pytest-localserver, python-pytest-xprocess, python-pytest-subtesthack, python2-pytest-subtesthack, python-hypothesis, python2-hypothesis, python-lit, python2-lit, python-pytest-pep8, python2-pytest-pep8, python-pytest-flakes, python2-pytest-flakes, python2-coverage-test-runner, python-pylint, python2-pylint, python-paramunittest, python2-python-paramunittest, python-pytest-warnings, python2-pytest-warnings, python-pytest-capturelog, python2-pytest-capturelog, python-pytest-catchlog, python2-pytest-catchlog, python-nosexcover, python2-nosexcover, python-discover, python2-discover, behave, python-rednose, python2-rednose, python-nose-randomly, python2-nose-randomly, python-nose-timer, python2-nose-timer): Move from here... * gnu/packages/check.scm: ...to here. * gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/backup.scm, gnu/packages/bioinformatics.scm, gnu/packages/calendar.scm, gnu/packages/dav.scm, gnu/packages/django.scm, gnu/packages/freedesktop.scm, gnu/packages/haskell.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/ldc.scm, gnu/packages/libffi.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/rdf.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm: Adjust accordingly. --- gnu/packages/admin.scm | 1 + gnu/packages/android.scm | 1 + gnu/packages/backup.scm | 1 + gnu/packages/bioinformatics.scm | 1 + gnu/packages/calendar.scm | 1 + gnu/packages/check.scm | 1374 ++++++++++++++++++++++++++++++++++- gnu/packages/dav.scm | 1 + gnu/packages/django.scm | 1 + gnu/packages/freedesktop.scm | 1 + gnu/packages/haskell.scm | 1 + gnu/packages/image.scm | 1 + gnu/packages/irc.scm | 1 + gnu/packages/jrnl.scm | 1 + gnu/packages/ldc.scm | 1 + gnu/packages/libffi.scm | 1 + gnu/packages/mail.scm | 1 + gnu/packages/mpd.scm | 1 + gnu/packages/openstack.scm | 1 + gnu/packages/package-management.scm | 1 + gnu/packages/password-utils.scm | 1 + gnu/packages/python-crypto.scm | 1 + gnu/packages/python-web.scm | 1 + gnu/packages/python.scm | 1344 +--------------------------------- gnu/packages/rdf.scm | 1 + gnu/packages/statistics.scm | 1 + gnu/packages/storage.scm | 1 + gnu/packages/time.scm | 1 + gnu/packages/tls.scm | 1 + gnu/packages/tor.scm | 1 + gnu/packages/tryton.scm | 1 + gnu/packages/vpn.scm | 1 + 31 files changed, 1396 insertions(+), 1351 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 58ef7d7253..cd2b9a6335 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -46,6 +46,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages ncurses) #:use-module (gnu packages readline) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index d9be335be0..b3ac4d1741 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -29,6 +29,7 @@ #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages gnupg) #:use-module (gnu packages python) #:use-module (gnu packages ssh) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 23b5b49ed4..c83809cdf2 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages acl) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fb09ebe9ce..027f9d4e3d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cpio) #:use-module (gnu packages cran) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index f208bc0803..23e2da05ea 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -31,6 +31,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system python) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages databases) #:use-module (gnu packages dav) #:use-module (gnu packages freedesktop) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 1d2ac20326..f0a480d507 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1,16 +1,29 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov +;;; Copyright © 2014 David Thompson ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015 Eric Bavier +;;; Copyright © 2014, 2015 Eric Bavier +;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2015, 2017 Cyril Roelandt +;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2015, 2016 Efraim Flashner +;;; Copyright © 2016, 2017 Leo Famulari +;;; Copyright © 2016 Christopher Allan Webber +;;; Copyright © 2016, 2017 Danny Milosavljevic ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Lukas Gradl +;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice +;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2017 Thomas Danckaert +;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 ng0 -;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2016, 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,9 +43,12 @@ (define-module (gnu packages check) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages python) + #:use-module (gnu packages python-web) #:use-module (guix utils) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -63,7 +79,7 @@ developer. Tests are run in a separate address space, so Check can catch both assertion failures and code errors that cause segmentation faults or other signals. The output from unit tests can be used within source code editors and IDEs.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) ;; XXX: Some packages require this newer version. Incorporate this ;; into the main 'check' package during the next rebuild cycle. @@ -107,7 +123,7 @@ source code editors and IDEs.") "CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers with basic testing functionality with a flexible variety of user interfaces.") - (license gpl2+))) + (license license:gpl2+))) (define-public cppunit (package @@ -132,7 +148,7 @@ with a flexible variety of user interfaces.") (description "CppUnit is the C++ port of the famous JUnit framework for unit testing. Test output is in XML for automatic testing and GUI based for supervised tests.") - (license lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball + (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball (define-public catch-framework (package @@ -170,7 +186,7 @@ supervised tests.") (description "Catch stands for C++ Automated Test Cases in Headers and is a multi-paradigm automated test framework for C++ and Objective-C.") - (license boost1.0))) + (license license:boost1.0))) (define-public cmdtest (package @@ -215,7 +231,7 @@ multi-paradigm automated test framework for C++ and Objective-C.") given a command line and input files, and the expected output, and it verifies that the command line produces the expected output. If not, it reports a problem, and shows the differences.") - (license gpl3+))) + (license license:gpl3+))) (define-public cmocka (package @@ -239,7 +255,7 @@ mock objects. It only requires the standard C library, and works with different compilers. Cmocka supports several different message output formats like Test Anything Protocol, Subunit, xUnit XML or the original cmockery output format.") - (license asl2.0))) + (license license:asl2.0))) (define-public cppcheck (package @@ -260,7 +276,7 @@ C/C++ compilers and many other analysis tools it does not detect syntax errors in the code. Cppcheck primarily detects the types of bugs that the compilers normally do not detect. The goal is to detect only real errors in the code (i.e. have zero false positives).") - (license gpl3+))) + (license license:gpl3+))) (define-public googletest (package @@ -285,7 +301,7 @@ normally do not detect. The goal is to detect only real errors in the code (description "Google Test features an XUnit test framework, automated test discovery, death tests, assertions, parameterized tests and XML test report generation.") - (license bsd-3))) + (license license:bsd-3))) (define-public cpputest (package @@ -308,7 +324,7 @@ generation.") "CppUTest is a C/C++ based unit xUnit test framework. It is written in C++ but is used in C and C++ projects and frequently used in embedded systems but it works for any C/C++ project.") - (license bsd-3))) + (license license:bsd-3))) (define-public python-parameterized (package @@ -328,7 +344,1335 @@ but it works for any C/C++ project.") (description "Parameterized is a Python library that aims to fix parameterized testing for every Python test framework. It supports nose, py.test, and unittest.") - (license bsd-2))) + (license license:bsd-2))) (define-public python2-parameterized (package-with-python2 python-parameterized)) + +(define-public python-mock + (package + (name "python-mock") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mock" version)) + (sha256 + (base32 + "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq")))) + (build-system python-build-system) + (arguments '(#:test-target "check")) + (home-page "https://github.com/testing-cabal/mock") + (synopsis "Python mocking and patching library for testing") + (description + "Mock is a library for testing in Python. It allows you to replace parts +of your system under test with mock objects and make assertions about how they +have been used.") + (license license:expat))) + +(define-public python2-mock + (package-with-python2 python-mock)) + +;;; Some packages (notably, certbot and python-acme) rely on this newer version +;;; of python-mock. However, a large number of packages fail to build with +;;; mock@2, so we add a new variable for now. Also, there may be a dependency +;;; cycle between mock and six, so we avoid creating python2-mock@2 for now. +(define-public python-mock-2 + (package + (inherit python-mock) + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mock" version)) + (sha256 + (base32 + "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i")))) + (propagated-inputs + `(("python-pbr" ,python-pbr-minimal) + ,@(package-propagated-inputs python-mock))))) + +(define-public python-nose + (package + (name "python-nose") + (version "1.3.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nose" version)) + (sha256 + (base32 + "164a43k7k2wsqqk1s6vavcdamvss4mz0vd6pwzv2h9n8rgwzxgzi")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; FIXME: test suite fails + (home-page "http://readthedocs.org/docs/nose/") + (synopsis "Python testing library") + (description + "Nose extends the unittest library to make testing easier.") + (license license:lgpl2.0+))) + +(define-public python2-nose + (package-with-python2 python-nose)) + +(define-public python-nose2 + (package + (name "python-nose2") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nose2" version)) + (sha256 + (base32 + "1x4zjq1zlyrh8b9ba0cmafd3w94pxhid408kibyjd3s6h1lap6s7")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) ; 'module' object has no attribute 'collector' + (propagated-inputs + `(("python-cov-core" ,python-cov-core) + ("python-pytest-cov" ,python-pytest-cov) + ("python-six" ,python-six))) + (home-page "https://github.com/nose-devs/nose2") + (synopsis "Next generation of nicer testing for Python") + (description + "Nose2 is the next generation of nicer testing for Python, based on the +plugins branch of unittest2. Nose2 aims to improve on nose by providing a +better plugin api, being easier for users to configure, and simplifying internal +interfaces and processes.") + (license license:bsd-2))) + +(define-public python2-nose2 + (package-with-python2 python-nose2)) + +(define-public python-unittest2 + (package + (name "python-unittest2") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-" + version ".tar.gz")) + (sha256 + (base32 + "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q")))) + (build-system python-build-system) + (home-page "http://pypi.python.org/pypi/unittest2") + (synopsis "Python unit testing library") + (description + "Unittest2 is a replacement for the unittest module in the Python +standard library.") + (license license:psfl))) + +(define-public python2-unittest2 + (package (inherit python-unittest2) + (name "python2-unittest2") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/u/unittest2/unittest2-" + version ".tar.gz")) + (sha256 + (base32 + "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212")) + (patches + (search-patches "python2-unittest2-remove-argparse.patch")))) + (propagated-inputs + `(("python2-six" ,python2-six) + ("python2-traceback2" ,python2-traceback2))) + (arguments + `(#:python ,python-2 + #:tests? #f)))) ; no setup.py test command + +(define-public python-pytest + (package + (name "python-pytest") + (version "2.7.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/p/pytest/pytest-" + version ".tar.gz")) + (sha256 + (base32 + "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm")) + (modules '((guix build utils))) + (snippet + ;; One of the tests involves the /usr directory, so it fails. + '(substitute* "testing/test_argcomplete.py" + (("def test_remove_dir_prefix\\(self\\):") + "@pytest.mark.xfail\n def test_remove_dir_prefix(self):"))))) + (build-system python-build-system) + (propagated-inputs + `(("python-py" ,python-py))) + (native-inputs + `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. + ("bash" ,bash) + ("python-nose" ,python-nose) + ("python-mock" ,python-mock))) + (home-page "http://pytest.org") + (synopsis "Python testing library") + (description + "Pytest is a testing tool that provides auto-discovery of test modules +and functions, detailed info on failing assert statements, modular fixtures, +and many external plugins.") + (license license:expat))) + +(define-public python2-pytest + (package-with-python2 python-pytest)) + +;; Some packages require a newer pytest. +(define-public python-pytest-3.0 + (package + (inherit python-pytest) + (name "python-pytest") + (version "3.0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest" version)) + (sha256 + (base32 + "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-invalid-test + (lambda _ + (substitute* "testing/test_argcomplete.py" + (("def test_remove_dir_prefix" line) + (string-append "@pytest.mark.skip" + "(reason=\"Assumes that /usr exists.\")\n " + line))) + #t))))) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ,@(package-native-inputs python-pytest))) + (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) + +(define-public python2-pytest-3.0 + (let ((base (package-with-python2 + (strip-python2-variant python-pytest-3.0)))) + (package (inherit base) + (native-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base)))))) + +(define-public python-pytest-cov + (package + (name "python-pytest-cov") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-cov" version)) + (sha256 + (base32 + "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k")))) + (build-system python-build-system) + (arguments + `(#: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" + (zero? (system* "python" "./setup.py" "check" + "--strict" "--metadata"))))))) + (propagated-inputs + `(("python-coverage" ,python-coverage) + ("python-pytest" ,python-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 python2-pytest-cov + (package-with-python2 python-pytest-cov)) + +(define-public python-pytest-runner + (package + (name "python-pytest-runner") + (version "2.11.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-runner" version)) + (sha256 + (base32 + "1cw978kqqcq916b9gfns1qjqvg33c5ail5jhw9054dsynkm32flq")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; The fancy way of setting the version with setuptools_scm does not + ;; seem to work here. + (add-after 'unpack 'set-version + (lambda _ + (substitute* "docs/conf.py" + (("version = setuptools_scm\\.get_version\\(root='\\.\\.')") + (string-append "version = \"" ,version "\""))) + #t))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/pytest-dev/pytest-runner") + (synopsis "Invoke py.test as a distutils command") + (description + "This package provides a @command{pytest-runner} command that +@file{setup.py} files can use to run tests.") + (license license:expat))) + +(define-public python2-pytest-runner + (package-with-python2 python-pytest-runner)) + +(define-public python-pytest-mock + (package + (name "python-pytest-mock") + (version "1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-mock" version ".zip")) + (sha256 + (base32 + "03zxar5drzm7ksqyrwypjaza3cri6wqvpr6iam92djvg6znp32gp")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (propagated-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/pytest-dev/pytest-mock/") + (synopsis "Thin-wrapper around the mock package for easier use with py.test") + (description + "This plugin installs a @code{mocker} fixture which is a thin-wrapper +around the patching API provided by the @code{mock} package, but with the +benefit of not having to worry about undoing patches at the end of a test. +The mocker fixture has the same API as @code{mock.patch}, supporting the +same arguments.") + (properties `((python2-variant . ,(delay python2-pytest-mock)))) + (license license:expat))) + +(define-public python2-pytest-mock + (let ((base (package-with-python2 + (strip-python2-variant python-pytest-mock)))) + (package (inherit base) + (propagated-inputs + `(("python2-mock" ,python2-mock) + ,@(package-propagated-inputs base)))))) + +(define-public python-pytest-xdist + (package + (name "python-pytest-xdist") + (version "1.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-xdist" version ".zip")) + (sha256 + (base32 + "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove pre-compiled .pyc files from source. + (for-each delete-file-recursively + (find-files "." "__pycache__" #:directories? #t)) + (for-each delete-file (find-files "." "\\.pyc$")) + #t)))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ;FIXME: Some tests are failing. + ;; #:phases + ;; (modify-phases %standard-phases + ;; (delete 'check) + ;; (add-after 'install 'check + ;; (lambda* (#:key inputs outputs #:allow-other-keys) + ;; (add-installed-pythonpath inputs outputs) + ;; (zero? (system* "py.test" "-v"))))) + (native-inputs + `(("unzip" ,unzip) + ("python-setuptools-scm" ,python-setuptools-scm))) + (propagated-inputs + `(("python-execnet" ,python-execnet) + ("python-pytest" ,python-pytest) + ("python-py" ,python-py))) + (home-page + "https://github.com/pytest-dev/pytest-xdist") + (synopsis + "Plugin for py.test with distributed testing and loop-on-failing modes") + (description + "The pytest-xdist plugin extends py.test with some unique test execution +modes: parallelization, running tests in boxed subprocesses, the ability +to run tests repeatedly when failed, and the ability to run tests on multiple +Python interpreters or platforms. It uses rsync to copy the existing +program code to a remote location, executes there, and then syncs the +result back.") + (license license:expat))) + +(define-public python2-pytest-xdist + (package-with-python2 python-pytest-xdist)) + +(define-public python-scripttest + (package + (name "python-scripttest") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/s/scripttest/scripttest-" + version ".tar.gz")) + (sha256 + (base32 + "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "http://pythonpaste.org/scripttest/") + (synopsis "Python library to test command-line scripts") + (description "Scripttest is a Python helper library for testing +interactive command-line applications. With it you can run a script in a +subprocess and see the output as well as any file modifications.") + (license license:expat))) + +(define-public python2-scripttest + (package-with-python2 python-scripttest)) + +(define-public python-testtools + (package + (name "python-testtools") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "testtools" version)) + (sha256 + (base32 + "1vw8yljnd75d396hhw6s2hrf4cclzy845ifd5am0lxsl235z3i8c")))) + (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))))) + (propagated-inputs + `(("python-mimeparse" ,python-mimeparse) + ("python-extras" ,python-extras))) + (home-page "https://github.com/testing-cabal/testtools") + (synopsis + "Extensions to the Python standard library unit testing framework") + (description + "Testtools extends the Python standard library unit testing framework to +provide matchers, more debugging information, and cross-Python +compatibility.") + (license license:psfl))) + +(define-public python2-testtools + (package-with-python2 python-testtools)) + +(define-public python-testscenarios + (package + (name "python-testscenarios") + (version "0.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/t/testscenarios/testscenarios-" + version ".tar.gz")) + (sha256 + (base32 + "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) + (build-system python-build-system) + (propagated-inputs + `(("python-testtools" ,python-testtools))) + (home-page "https://launchpad.net/testscenarios") + (synopsis "Pyunit extension for dependency injection") + (description + "Testscenarios provides clean dependency injection for Python unittest +style tests.") + (license (list license:bsd-3 license:asl2.0)))) ; at the user's option + +(define-public python2-testscenarios + (package-with-python2 python-testscenarios)) + +(define-public python-testresources + (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")))) + (build-system python-build-system) + (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.") + (license (list license:bsd-3 license:asl2.0)))) ; at the user's option + +(define-public python2-testresources + (package-with-python2 python-testresources)) + +(define-public python-subunit + (package + (name "python-subunit") + (version "0.0.21") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-" + version ".tar.gz")) + (sha256 + (base32 + "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv")))) + (build-system python-build-system) + (propagated-inputs + `(("python-extras" ,python-extras) + ("python-mimeparse" ,python-mimeparse))) + (native-inputs + `(("python-testscenarios" ,python-testscenarios))) + (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.") + (license (list license:bsd-3 license:asl2.0)))) ; at the user's option + +(define-public python2-subunit + (package-with-python2 python-subunit)) + +(define-public python-fixtures + (package + (name "python-fixtures") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fixtures" version)) + (sha256 + (base32 + "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "python" "-m" "testtools.run" + "fixtures.test_suite"))))))) + (propagated-inputs + `(("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 + +(define-public python2-fixtures + (package-with-python2 python-fixtures)) + +(define-public python-testrepository + (package + (name "python-testrepository") + (version "0.0.20") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/t/testrepository/testrepository-" + version ".tar.gz")) + (sha256 + (base32 + "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) + (build-system python-build-system) + (arguments + ;; FIXME: Many tests are failing. + '(#:tests? #f)) + (propagated-inputs + `(("python-fixtures" ,python-fixtures) + ("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") + (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 + +(define-public python2-testrepository + (package-with-python2 python-testrepository)) + +(define-public python-coverage + (package + (name "python-coverage") + (version "4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "coverage" version)) + (sha256 + (base32 + "01rbr4br4lsk0lwn8fb96zwd2xr4f0mg1w7iq3j11i8f5ig2nqs1")))) + (build-system python-build-system) + (arguments + ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. + '(#:tests? #f)) + (home-page "http://nedbatchelder.com/code/coverage") + (synopsis "Code coverage measurement for Python") + (description + "Coverage measures code coverage, typically during test execution. It +uses the code analysis tools and tracing hooks provided in the Python standard +library to determine which lines are executable, and which have been +executed.") + (license license:bsd-3))) + +(define-public python2-coverage + (package-with-python2 python-coverage)) + +(define-public python-cov-core + (package + (name "python-cov-core") + (version "1.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cov-core" version)) + (sha256 + (base32 + "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a")))) + (build-system python-build-system) + (propagated-inputs + `(("python-coverage" ,python-coverage))) + (home-page "https://github.com/schlamar/cov-core") + (synopsis "Coverage plugin core for pytest-cov, nose-cov and nose2-cov") + (description + "This is a library package for use by @code{pytest-cov}, @code{nose-cov} +and @code{nose2-cov}. It is useful for developing coverage plugins for these +testing frameworks.") + (license license:expat))) + +(define-public python2-cov-core + (package-with-python2 python-cov-core)) + +(define-public python-testpath + (package + (name "python-testpath") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/jupyter/testpath/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "04kh3fgvmqz6cfcw79q70qwjz7ib7lxm27cc548iy2rpr33qqf55")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; this package does not even have a setup.py + #:modules ((guix build python-build-system) + (guix build utils) + (srfi srfi-1)) + #:imported-modules (,@%python-build-system-modules + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (delete 'install) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((version (last + (string-split (assoc-ref inputs "python") #\-))) + (x.y (string-join (take (string-split version #\.) 2) + ".")) + (dir (string-append + (assoc-ref outputs "out") + "/lib/python" x.y "/site-packages/testpath"))) + (mkdir-p dir) + (copy-recursively "testpath" dir)) + #t))))) + (home-page "https://github.com/takluyver/testpath") + (synopsis "Test utilities for code working with files and commands") + (description + "Testpath is a collection of utilities for Python code working with files +and commands. It contains functions to check things on the filesystem, and +tools for mocking system commands and recording calls to those.") + (license license:expat))) + +(define-public python2-testpath + (package-with-python2 python-testpath)) + +(define-public python-testlib + (package + (name "python-testlib") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/t/testlib/testlib-" + version ".zip")) + (sha256 + (base32 "1mz26cxn4x8bbgv0rn0mvj2z05y31rkc8009nvdlb3lam5b4mj3y")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) ; for unpacking the source + (synopsis "Python micro test suite harness") + (description "A micro unittest suite harness for Python.") + (home-page "https://github.com/trentm/testlib") + (license license:expat))) + +(define-public python2-testlib + (package-with-python2 python-testlib)) + +;;; The software provided by this package was integrated into pytest 2.8. +(define-public python-pytest-cache + (package + (name "python-pytest-cache") + (version "1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-cache" version)) + (sha256 + (base32 + "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y")))) + (build-system python-build-system) + (propagated-inputs + `(("python-apipkg" ,python-apipkg) + ("python-execnet" ,python-execnet) + ("python-py" ,python-py) + ("python-pytest" ,python-pytest))) + (synopsis "Py.test plugin with mechanisms for caching across test runs") + (description "The pytest-cache plugin provides tools to rerun failures from +the last py.test invocation.") + (home-page "https://bitbucket.org/hpk42/pytest-cache/") + (license license:expat))) + +(define-public python2-pytest-cache + (package-with-python2 python-pytest-cache)) + +(define-public python-pytest-localserver + (package + (name "python-pytest-localserver") + (version "0.3.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-localserver" version)) + (sha256 + (base32 + "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p")))) + (build-system python-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "py.test" "--genscript=runtests.py")) + (zero? (system* "py.test"))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (propagated-inputs + `(("python-werkzeug" ,python-werkzeug))) + (synopsis "Py.test plugin to test server connections locally") + (description "Pytest-localserver is a plugin for the pytest testing +framework which enables you to test server connections locally.") + (home-page "https://pypi.python.org/pypi/pytest-localserver") + (license license:expat))) + +(define-public python-pytest-xprocess + (package + (name "python-pytest-xprocess") + (version "0.9.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-xprocess" version)) + (sha256 + (base32 + "17zlql1xqw3ywcgwwbqmw633aly99lab12hm02asr8awvg5603pp")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-cache" ,python-pytest-cache) + ("python-psutil" ,python-psutil))) + (synopsis "Pytest plugin to manage external processes across test runs") + (description "Pytest-xprocess is an experimental py.test plugin for managing +processes across test runs.") + (home-page "https://bitbucket.org/pytest-dev/pytest-xprocess") + (license license:expat))) + +(define-public python-pytest-subtesthack + (package + (name "python-pytest-subtesthack") + (version "0.1.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-subtesthack" version)) + (sha256 + (base32 + "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pytest" ,python-pytest))) + (synopsis "Set-up and tear-down fixtures for unit tests") + (description "This plugin allows you to set up and tear down fixtures within +unit test functions that use @code{py.test}. This is useful for using +@command{hypothesis} inside py.test, as @command{hypothesis} will call the test +function multiple times, without setting up or tearing down fixture state as is +normally the case.") + (home-page "https://github.com/untitaker/pytest-subtesthack/") + (license license:unlicense))) + +(define-public python2-pytest-subtesthack + (package-with-python2 python-pytest-subtesthack)) + +(define-public python-hypothesis + (package + (name "python-hypothesis") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "hypothesis" version)) + (sha256 + (base32 + "0qyqq9akm4vshhn8cngjc1qykcvsn7cz6dlm6njfsgpbraqrmbbw")))) + (build-system python-build-system) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest))) + (synopsis "Library for property based testing") + (description "Hypothesis is a library for testing your Python code against a +much larger range of examples than you would ever want to write by hand. It’s +based on the Haskell library, Quickcheck, and is designed to integrate +seamlessly into your existing Python unit testing work flow.") + (home-page "https://github.com/DRMacIver/hypothesis") + (license license:mpl2.0) + (properties `((python2-variant . ,(delay python2-hypothesis)))))) + +(define-public python2-hypothesis + (let ((hypothesis (package-with-python2 + (strip-python2-variant python-hypothesis)))) + (package (inherit hypothesis) + (propagated-inputs + `(("python2-enum34" ,python2-enum34) + ,@(package-propagated-inputs hypothesis)))))) + +(define-public python-lit + (package + (name "python-lit") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lit" version)) + (sha256 + (base32 + "135m2b9cwih85g66rjggavck328z7lj37srgpq3jxszbg0g2b91y")))) + (build-system python-build-system) + (home-page "http://llvm.org/") + (synopsis "LLVM Software Testing Tool") + (description "@code{lit} is a portable tool for executing LLVM and Clang +style test suites, summarizing their results, and providing indication of +failures.") + (license license:ncsa))) + +(define-public python2-lit + (package-with-python2 python-lit)) + +(define-public python-pytest-pep8 + (package + (name "python-pytest-pep8") + (version "1.0.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-pep8" version)) + (sha256 + (base32 + "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; Fails with recent pytest and pep8. See upstream issues #8 and #12. + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-pep8" ,python-pep8))) + (home-page "https://bitbucket.org/pytest-dev/pytest-pep8") + (synopsis "Py.test plugin to check PEP8 requirements") + (description "Pytest plugin for checking PEP8 compliance.") + (license license:expat))) + +(define-public python2-pytest-pep8 + (package-with-python2 python-pytest-pep8)) + +(define-public python-pytest-flakes + (package + (name "python-pytest-flakes") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "pytest-flakes" version)) + (sha256 + (base32 + "0flag3n33kbhyjrhzmq990rvg4yb8hhhl0i48q9hw0ll89jp28lw")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'check) + (add-after 'install 'check + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; It's easier to run tests after install. + ;; Make installed package available for running the tests + (add-installed-pythonpath inputs outputs) + (zero? (system* "py.test" "-vv"))))))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-pytest" ,python-pytest) + ("python-pytest-cache" ,python-pytest-cache) + ("python-pytest-pep8" ,python-pytest-pep8))) + (propagated-inputs + `(("python-pyflakes" ,python-pyflakes))) + (home-page "https://github.com/fschulze/pytest-flakes") + (synopsis "Py.test plugin to check source code with pyflakes") + (description "Pytest plugin for checking Python source code with pyflakes.") + (license license:expat))) + +(define-public python2-pytest-flakes + (package-with-python2 python-pytest-flakes)) + +(define-public python2-coverage-test-runner + (package + (name "python2-coverage-test-runner") + (version "1.11") + (source + (origin + (method url-fetch) + (uri (string-append + "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/" + "coverage-test-runner/snapshot/coverage-test-runner-" + version ".tar.gz")) + (sha256 + (base32 + "0y1m7z3dl63kmhcmydl1mwg0hacnf6ghrx9dah17j9iasssfa3g7")))) + (build-system python-build-system) + (arguments + `(#:python ,python-2 + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (zero? (system* "./testrun"))))))) + (propagated-inputs + `(("python2-coverage" ,python2-coverage))) + (home-page "https://liw.fi/coverage-test-runner/") + (synopsis "Python module for running unit tests") + (description "@code{CoverageTestRunner} is a python module for running +unit tests and failing them if the unit test module does not exercise all +statements in the module it tests.") + (license license:gpl3+))) + +(define-public python-pylint + (package + (name "python-pylint") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/PyCQA/pylint/archive/pylint-" + version ".tar.gz")) + (sha256 + (base32 + "0mzn1czhf1mgr2wiqfihb274sja02h899b85kywdpivppa9nwrmp")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-tox" ,python-tox))) + (propagated-inputs + `(("python-astroid" ,python-astroid) + ("python-isort" ,python-isort) + ("python-mccabe" ,python-mccabe) + ("python-six" ,python-six))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Somehow, tests for python2-pylint + ;; fail if run from the build directory + (let ((work "/tmp/work")) + (mkdir-p work) + (setenv "PYTHONPATH" + (string-append (getenv "PYTHONPATH") ":" work)) + (copy-recursively "." work) + (with-directory-excursion "/tmp" + (zero? (system* "python" "-m" "unittest" "discover" + "-s" (string-append work "/pylint/test") + "-p" "*test_*.py"))))))))) + (home-page "https://github.com/PyCQA/pylint") + (synopsis "Python source code analyzer which looks for coding standard +errors") + (description "Pylint is a Python source code analyzer which looks +for programming errors, helps enforcing a coding standard and sniffs +for some code smells (as defined in Martin Fowler's Refactoring book). + +Pylint has many rules enabled by default, way too much to silence them +all on a minimally sized program. It's highly configurable and handle +pragmas to control it from within your code. Additionally, it is +possible to write plugins to add your own checks.") + (properties `((python2-variant . ,(delay python2-pylint)))) + (license license:gpl2+))) + +(define-public python2-pylint + (let ((pylint (package-with-python2 + (strip-python2-variant python-pylint)))) + (package (inherit pylint) + (propagated-inputs + `(("python2-backports-functools-lru-cache" + ,python2-backports-functools-lru-cache) + ("python2-configparser" ,python2-configparser) + ,@(package-propagated-inputs pylint)))))) + +(define-public python-paramunittest + (package + (name "python-paramunittest") + (version "0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ParamUnittest" version)) + (sha256 + (base32 + "0kp793hws5xv1wvycxq7jw2pwy36f35k39jg8hx5qikij5a0jid1")))) + (build-system python-build-system) + (home-page + "https://github.com/rik0/ParamUnittest") + (synopsis + "Simple extension to have parametrized unit tests") + (description + "This package allows to create parametrized unit-tests that work with the standard +unittest package. A parametrized test case is automatically converted to multiple test +cases. Since they are TestCase subclasses, they work with other test suites that +recognize TestCases.") + (license license:bsd-2))) + +(define-public python2-python-paramunittest + (package-with-python2 python-paramunittest)) + +(define-public python-pytest-warnings + (package + (name "python-pytest-warnings") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-warnings" version)) + (sha256 + (base32 + "0gf2dpahpl5igb7jh1sr9acj3z3gp7zahqdqb69nk6wx01c8kc1g")))) + (build-system python-build-system) + (propagated-inputs + `(("pytest" ,python-pytest-3.0))) + (home-page "https://github.com/fschulze/pytest-warnings") + (synopsis "Pytest plugin to list Python warnings in pytest report") + (description + "Python-pytest-warnings is a pytest plugin to list Python warnings in +pytest report.") + (license license:expat))) + +(define-public python2-pytest-warnings + (package-with-python2 python-pytest-warnings)) + +(define-public python-pytest-capturelog + (package + (name "python-pytest-capturelog") + (version "0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-capturelog" version ".tar.gz")) + (sha256 + (base32 + "038049nyjl7di59ycnxvc9nydivc5m8np3hqq84j2iirkccdbs5n")))) + (build-system python-build-system) + (propagated-inputs + `(("pytest" ,python-pytest-3.0))) + (home-page "http://bitbucket.org/memedough/pytest-capturelog/overview") + (synopsis "Pytest plugin to catch log messages") + (description + "Python-pytest-catchlog is a pytest plugin to catch log messages.") + (license license:expat))) + +(define-public python2-pytest-capturelog + (package-with-python2 python-pytest-capturelog)) + +(define-public python-pytest-catchlog + (package + (name "python-pytest-catchlog") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-catchlog" version ".zip")) + (sha256 + (base32 + "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (propagated-inputs + `(("pytest" ,python-pytest-3.0))) + (home-page "https://github.com/eisensheng/pytest-catchlog") + (synopsis "Pytest plugin to catch log messages") + (description + "Python-pytest-catchlog is a pytest plugin to catch log messages. This is +a fork of pytest-capturelog.") + (license license:expat))) + +(define-public python2-pytest-catchlog + (package-with-python2 python-pytest-catchlog)) + +(define-public python-nosexcover + (package + (name "python-nosexcover") + (version "1.0.11") + (source (origin + (method url-fetch) + (uri (pypi-uri "nosexcover" version)) + (sha256 + (base32 + "10xqr12qv62k2flxwqhh8cr00cjhn7sfjrm6p35gd1x5bmjkr319")))) + (build-system python-build-system) + (propagated-inputs + `(("python-coverage" ,python-coverage) + ("python-nose" ,python-nose))) + (home-page "http://github.com/cmheisel/nose-xcover") + (synopsis "Extends nose.plugins.cover to add Cobertura-style XML reports") + (description "Nose-xcover is a companion to the built-in +@code{nose.plugins.cover}. This plugin will write out an XML coverage report +to a file named coverage.xml. + +It will honor all the options you pass to the Nose coverage plugin, +especially -cover-package.") + (license license:expat))) + +(define-public python2-nosexcover + (package-with-python2 python-nosexcover)) + +(define-public python-discover + (package + (name "python-discover") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/d/discover/discover-" + version ".tar.gz")) + (sha256 + (base32 + "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5")))) + (build-system python-build-system) + (home-page "http://pypi.python.org/pypi/discover/") + (synopsis + "Python test discovery for unittest") + (description + "Discover provides test discovery for unittest, a feature that has been +backported from Python 2.7 for Python 2.4+.") + (license license:bsd-3))) + +(define-public python2-discover + (package-with-python2 python-discover)) + +(define-public behave + (package + (name "behave") + (version "1.2.5") + (source (origin + (method url-fetch) + (uri (pypi-uri "behave" version ".tar.bz2")) + (sha256 + (base32 + "1iypp6z46r19n4xmgx6m1lwmlpfjh8vapq8izigrqlaarvp2y64c")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-parse" ,python-parse) + ("python-parse-type" ,python-parse-type))) + (arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and + ;PyHamcrest>=1.8 + (home-page "https://github.com/behave/behave") + (synopsis "Python behavior-driven development") + (description + "Behave is a tool for behavior-driven development in python. +Behavior-driven development (or BDD) is an agile software development +technique that encourages collaboration between developers, QA and +non-technical or business participants in a software project. Behave uses +tests written in a natural language style, backed up by Python code.") + (license license:x11))) + +(define-public python-behave-web-api + (package + (name "python-behave-web-api") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "behave-web-api" version)) + (sha256 + (base32 + "03kpq2xsy1gab3jy0dccbxlsg7vwfy4lagss0qldwmx3xz6b3i19")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dependencies + (lambda _ + (substitute* "setup.py" + (("'wheel'") "") ; We don't use it. + (("'ordereddict==1.1'") ""))))))) ; Python >= 2.7 has it built-in. + (propagated-inputs + `(("behave" ,behave) + ("python-requests" ,python-requests))) + (home-page "https://github.com/jefersondaniel/behave-web-api") + (synopsis "Provides testing for JSON APIs with Behave for Python") + (description "This package provides testing utility modules for testing +JSON APIs with Behave.") + (license license:expat))) + +(define-public python2-behave-web-api + (package-with-python2 python-behave-web-api)) + +(define-public python-rednose + (package + (name "python-rednose") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rednose" version)) + (sha256 + (base32 + "0b0bsna217lr1nykyhl5fgjly15zhdvqd4prg4wy1zrgfv7al6m0")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-deps + (lambda _ + ;; See + (substitute* "setup.py" + (("python-termstyle") "termstyle")) + #t))))) + (propagated-inputs + `(("python-colorama" ,python-colorama) + ("python-termstyle" ,python-termstyle))) + (native-inputs + `(("python-six" ,python-six) + ("python-nose" ,python-nose))) + (home-page "https://github.com/JBKahn/rednose") + (synopsis "Colored output for Python nosetests") + (description "This package provides colored output for the +@command{nosetests} command of the Python Nose unit test framework.") + (license license:bsd-3))) + +(define-public python2-rednose + (package-with-python2 python-rednose)) + +(define-public python-nose-randomly + (package + (name "python-nose-randomly") + (version "1.2.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nose-randomly" version)) + (sha256 + (base32 + "1cw9dlr1zh3w4i438kin7z0rm8092ki52hayisyc43h9pcplq7rn")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose) + ("python-numpy" ,python-numpy))) + (home-page "https://github.com/adamchainz/nose-randomly") + (synopsis + "Nose plugin to randomly order tests and control random.seed") + (description + "This is a @code{Nose} plugin to randomly order tests which can be quite +powerful in discovering hidden flaws in the tests themselves, while helping to +reduce inter-test dependencies. It also helps in controlling @code{random.seed}, +by resetting it to a repeatable number for each test, enabling the tests to +create data based on random numbers and yet remain repeatable.") + (license license:bsd-3))) + +(define-public python2-nose-randomly + (package-with-python2 python-nose-randomly)) + +(define-public python-nose-timer + (package + (name "python-nose-timer") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nose-timer" version)) + (patches + (search-patches + ;; This patch will not be needed in the next version. + ;; It is taken from the master branch. + "python-nose-timer-drop-ordereddict.patch")) + (sha256 + (base32 + "1s32ymsnby8lz2qk55ifj9zi50dqcg6swnj5cz2rmwxg2jsslsxp")))) + (build-system python-build-system) + (propagated-inputs + `(("python-nose" ,python-nose) + ("python-termcolor" ,python-termcolor))) + (home-page "https://github.com/mahmoudimus/nose-timer") + (synopsis "Timer plugin for nosetests") + (description "Shows how much time was needed to run individual tests.") + (license license:expat))) + +(define-public python2-nose-timer + (package-with-python2 python-nose-timer)) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index f06f232587..3513116f24 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -22,6 +22,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages python) #:use-module (gnu packages python-web)) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 229f0319f4..6b71092ac7 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages databases) + #:use-module (gnu packages check) #:use-module (gnu packages python) #:use-module (gnu packages python-web)) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e49658cbcc..cac1f67c52 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages bash) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages docbook) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 802d387693..9ea54c5022 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -31,6 +31,7 @@ (define-module (gnu packages haskell) #:use-module (gnu packages) #:use-module (gnu packages bootstrap) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages elf) #:use-module (gnu packages gcc) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index df8ac67e41..cb8e387f6a 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index afa5f60eec..120bdc4371 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages backup) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index a2ba7b8b9f..d4c41d5b9e 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -23,6 +23,7 @@ #:use-module (guix licenses) #:use-module (guix download) #:use-module (guix build-system python) + #:use-module (gnu packages check) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto)) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index d2aee9c7c0..8e9ae1724a 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -29,6 +29,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages gdb) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 2db57ffb85..948dabb41e 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -26,6 +26,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (gnu packages check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages ruby) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c18b9222df..1e13bb0afd 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages calendar) + #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index c305e457cb..c37fa56df4 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -37,6 +37,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages readline) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 5f15b01032..6745b203ba 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -19,6 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages openstack) + #:use-module (gnu packages check) #:use-module (gnu packages gnupg) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 85b6cd2699..9d178aae60 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages file) #:use-module (gnu packages backup) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages gnupg) #:use-module (gnu packages databases) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 9b9bd163fd..a75881701a 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 158384c1d7..ebb6e0617f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -37,6 +37,7 @@ #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 70b2dfd19e..b4b4a3db81 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -43,6 +43,7 @@ #:use-module (guix download) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages django) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e2beba3b5c..4a2c9973e7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -772,49 +772,6 @@ API for locking files.") (define-public python2-lockfile (package-with-python2 python-lockfile)) -(define-public python-mock - (package - (name "python-mock") - (version "1.0.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mock" version)) - (sha256 - (base32 - "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq")))) - (build-system python-build-system) - (arguments '(#:test-target "check")) - (home-page "https://github.com/testing-cabal/mock") - (synopsis "Python mocking and patching library for testing") - (description - "Mock is a library for testing in Python. It allows you to replace parts -of your system under test with mock objects and make assertions about how they -have been used.") - (license license:expat))) - -(define-public python2-mock - (package-with-python2 python-mock)) - -;;; Some packages (notably, certbot and python-acme) rely on this newer version -;;; of python-mock. However, a large number of packages fail to build with -;;; mock@2, so we add a new variable for now. Also, there may be a dependency -;;; cycle between mock and six, so we avoid creating python2-mock@2 for now. -(define-public python-mock-2 - (package - (inherit python-mock) - (version "2.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "mock" version)) - (sha256 - (base32 - "1flbpksir5sqrvq2z0dp8sl4bzbadg21sj4d42w3klpdfvgvcn5i")))) - (propagated-inputs - `(("python-pbr" ,python-pbr-minimal) - ,@(package-propagated-inputs python-mock))))) - (define-public python-setuptools (package (name "python-setuptools") @@ -1645,101 +1602,6 @@ matching them against a list of media-ranges.") (define-public python2-mimeparse (package-with-python2 python-mimeparse)) -(define-public python-nose - (package - (name "python-nose") - (version "1.3.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "nose" version)) - (sha256 - (base32 - "164a43k7k2wsqqk1s6vavcdamvss4mz0vd6pwzv2h9n8rgwzxgzi")))) - (build-system python-build-system) - (arguments - '(#:tests? #f)) ; FIXME: test suite fails - (home-page "http://readthedocs.org/docs/nose/") - (synopsis "Python testing library") - (description - "Nose extends the unittest library to make testing easier.") - (license license:lgpl2.0+))) - -(define-public python2-nose - (package-with-python2 python-nose)) - -(define-public python-nose2 - (package - (name "python-nose2") - (version "0.6.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "nose2" version)) - (sha256 - (base32 - "1x4zjq1zlyrh8b9ba0cmafd3w94pxhid408kibyjd3s6h1lap6s7")))) - (build-system python-build-system) - (arguments `(#:tests? #f)) ; 'module' object has no attribute 'collector' - (propagated-inputs - `(("python-cov-core" ,python-cov-core) - ("python-pytest-cov" ,python-pytest-cov) - ("python-six" ,python-six))) - (home-page "https://github.com/nose-devs/nose2") - (synopsis "Next generation of nicer testing for Python") - (description - "Nose2 is the next generation of nicer testing for Python, based on the -plugins branch of unittest2. Nose2 aims to improve on nose by providing a -better plugin api, being easier for users to configure, and simplifying internal -interfaces and processes.") - (license license:bsd-2))) - -(define-public python2-nose2 - (package-with-python2 python-nose2)) - -(define-public python-unittest2 - (package - (name "python-unittest2") - (version "0.5.1") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/u/unittest2py3k/unittest2py3k-" - version ".tar.gz")) - (sha256 - (base32 - "00yl6lskygcrddx5zspkhr0ibgvpknl4678kkm6s626539grq93q")))) - (build-system python-build-system) - (home-page "http://pypi.python.org/pypi/unittest2") - (synopsis "Python unit testing library") - (description - "Unittest2 is a replacement for the unittest module in the Python -standard library.") - (license license:psfl))) - -(define-public python2-unittest2 - (package (inherit python-unittest2) - (name "python2-unittest2") - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/u/unittest2/unittest2-" - version ".tar.gz")) - (sha256 - (base32 - "0y855kmx7a8rnf81d3lh5lyxai1908xjp0laf4glwa4c8472m212")) - (patches - (search-patches "python2-unittest2-remove-argparse.patch")))) - (propagated-inputs - `(("python2-six" ,python2-six) - ("python2-traceback2" ,python2-traceback2))) - (arguments - `(#:python ,python-2 - #:tests? #f)))) ; no setup.py test command - (define-public python-pafy (package (name "python-pafy") @@ -1792,393 +1654,6 @@ code introspection, and logging.") (define-public python2-py (package-with-python2 python-py)) -(define-public python-pytest - (package - (name "python-pytest") - (version "2.7.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/pytest/pytest-" - version ".tar.gz")) - (sha256 - (base32 - "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm")) - (modules '((guix build utils))) - (snippet - ;; One of the tests involves the /usr directory, so it fails. - '(substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix\\(self\\):") - "@pytest.mark.xfail\n def test_remove_dir_prefix(self):"))))) - (build-system python-build-system) - (propagated-inputs - `(("python-py" ,python-py))) - (native-inputs - `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`. - ("bash" ,bash) - ("python-nose" ,python-nose) - ("python-mock" ,python-mock))) - (home-page "http://pytest.org") - (synopsis "Python testing library") - (description - "Pytest is a testing tool that provides auto-discovery of test modules -and functions, detailed info on failing assert statements, modular fixtures, -and many external plugins.") - (license license:expat))) - -(define-public python2-pytest - (package-with-python2 python-pytest)) - -;; Some packages require a newer pytest. -(define-public python-pytest-3.0 - (package - (inherit python-pytest) - (name "python-pytest") - (version "3.0.7") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest" version)) - (sha256 - (base32 - "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'disable-invalid-test - (lambda _ - (substitute* "testing/test_argcomplete.py" - (("def test_remove_dir_prefix" line) - (string-append "@pytest.mark.skip" - "(reason=\"Assumes that /usr exists.\")\n " - line))) - #t))))) - (native-inputs - `(("python-hypothesis" ,python-hypothesis) - ,@(package-native-inputs python-pytest))) - (properties `((python2-variant . ,(delay python2-pytest-3.0)))))) - -(define-public python2-pytest-3.0 - (let ((base (package-with-python2 - (strip-python2-variant python-pytest-3.0)))) - (package (inherit base) - (native-inputs - `(("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base)))))) - -(define-public python-pytest-cov - (package - (name "python-pytest-cov") - (version "2.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-cov" version)) - (sha256 - (base32 - "03c2qc42r4bczyw93gd7n0qi1h1jfhw7fnbhi33c3vp1hs81gm2k")))) - (build-system python-build-system) - (arguments - `(#: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" - (zero? (system* "python" "./setup.py" "check" - "--strict" "--metadata"))))))) - (propagated-inputs - `(("python-coverage" ,python-coverage) - ("python-pytest" ,python-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 python2-pytest-cov - (package-with-python2 python-pytest-cov)) - -(define-public python-pytest-runner - (package - (name "python-pytest-runner") - (version "2.11.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-runner" version)) - (sha256 - (base32 - "1cw978kqqcq916b9gfns1qjqvg33c5ail5jhw9054dsynkm32flq")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; The fancy way of setting the version with setuptools_scm does not - ;; seem to work here. - (add-after 'unpack 'set-version - (lambda _ - (substitute* "docs/conf.py" - (("version = setuptools_scm\\.get_version\\(root='\\.\\.')") - (string-append "version = \"" ,version "\""))) - #t))))) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-setuptools-scm" ,python-setuptools-scm))) - (home-page "https://github.com/pytest-dev/pytest-runner") - (synopsis "Invoke py.test as a distutils command") - (description - "This package provides a @command{pytest-runner} command that -@file{setup.py} files can use to run tests.") - (license license:expat))) - -(define-public python2-pytest-runner - (package-with-python2 python-pytest-runner)) - -(define-public python-pytest-mock - (package - (name "python-pytest-mock") - (version "1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-mock" version ".zip")) - (sha256 - (base32 - "03zxar5drzm7ksqyrwypjaza3cri6wqvpr6iam92djvg6znp32gp")))) - (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) - (propagated-inputs - `(("python-pytest" ,python-pytest))) - (home-page "https://github.com/pytest-dev/pytest-mock/") - (synopsis "Thin-wrapper around the mock package for easier use with py.test") - (description - "This plugin installs a @code{mocker} fixture which is a thin-wrapper -around the patching API provided by the @code{mock} package, but with the -benefit of not having to worry about undoing patches at the end of a test. -The mocker fixture has the same API as @code{mock.patch}, supporting the -same arguments.") - (properties `((python2-variant . ,(delay python2-pytest-mock)))) - (license license:expat))) - -(define-public python2-pytest-mock - (let ((base (package-with-python2 - (strip-python2-variant python-pytest-mock)))) - (package (inherit base) - (propagated-inputs - `(("python2-mock" ,python2-mock) - ,@(package-propagated-inputs base)))))) - -(define-public python-pytest-xdist - (package - (name "python-pytest-xdist") - (version "1.14") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-xdist" version ".zip")) - (sha256 - (base32 - "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove pre-compiled .pyc files from source. - (for-each delete-file-recursively - (find-files "." "__pycache__" #:directories? #t)) - (for-each delete-file (find-files "." "\\.pyc$")) - #t)))) - (build-system python-build-system) - (arguments - '(#:tests? #f)) ;FIXME: Some tests are failing. - ;; #:phases - ;; (modify-phases %standard-phases - ;; (delete 'check) - ;; (add-after 'install 'check - ;; (lambda* (#:key inputs outputs #:allow-other-keys) - ;; (add-installed-pythonpath inputs outputs) - ;; (zero? (system* "py.test" "-v"))))) - (native-inputs - `(("unzip" ,unzip) - ("python-setuptools-scm" ,python-setuptools-scm))) - (propagated-inputs - `(("python-execnet" ,python-execnet) - ("python-pytest" ,python-pytest) - ("python-py" ,python-py))) - (home-page - "https://github.com/pytest-dev/pytest-xdist") - (synopsis - "Plugin for py.test with distributed testing and loop-on-failing modes") - (description - "The pytest-xdist plugin extends py.test with some unique test execution -modes: parallelization, running tests in boxed subprocesses, the ability -to run tests repeatedly when failed, and the ability to run tests on multiple -Python interpreters or platforms. It uses rsync to copy the existing -program code to a remote location, executes there, and then syncs the -result back.") - (license license:expat))) - -(define-public python2-pytest-xdist - (package-with-python2 python-pytest-xdist)) - -(define-public python-scripttest - (package - (name "python-scripttest") - (version "1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/s/scripttest/scripttest-" - version ".tar.gz")) - (sha256 - (base32 - "0f4w84k8ck82syys7yg9maz93mqzc8p5ymis941x034v44jzq74m")))) - (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest))) - (home-page "http://pythonpaste.org/scripttest/") - (synopsis "Python library to test command-line scripts") - (description "Scripttest is a Python helper library for testing -interactive command-line applications. With it you can run a script in a -subprocess and see the output as well as any file modifications.") - (license license:expat))) - -(define-public python2-scripttest - (package-with-python2 python-scripttest)) - -(define-public python-testtools - (package - (name "python-testtools") - (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "testtools" version)) - (sha256 - (base32 - "1vw8yljnd75d396hhw6s2hrf4cclzy845ifd5am0lxsl235z3i8c")))) - (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))))) - (propagated-inputs - `(("python-mimeparse" ,python-mimeparse) - ("python-extras" ,python-extras))) - (home-page "https://github.com/testing-cabal/testtools") - (synopsis - "Extensions to the Python standard library unit testing framework") - (description - "Testtools extends the Python standard library unit testing framework to -provide matchers, more debugging information, and cross-Python -compatibility.") - (license license:psfl))) - -(define-public python2-testtools - (package-with-python2 python-testtools)) - -(define-public python-testscenarios - (package - (name "python-testscenarios") - (version "0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/testscenarios/testscenarios-" - version ".tar.gz")) - (sha256 - (base32 - "1671jvrvqlmbnc42j7pc5y6vc37q44aiwrq0zic652pxyy2fxvjg")))) - (build-system python-build-system) - (propagated-inputs - `(("python-testtools" ,python-testtools))) - (home-page "https://launchpad.net/testscenarios") - (synopsis "Pyunit extension for dependency injection") - (description - "Testscenarios provides clean dependency injection for Python unittest -style tests.") - (license (list license:bsd-3 license:asl2.0)))) ; at the user's option - -(define-public python2-testscenarios - (package-with-python2 python-testscenarios)) - -(define-public python-testresources - (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")))) - (build-system python-build-system) - (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.") - (license (list license:bsd-3 license:asl2.0)))) ; at the user's option - -(define-public python2-testresources - (package-with-python2 python-testresources)) - -(define-public python-subunit - (package - (name "python-subunit") - (version "0.0.21") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/p/python-subunit/python-subunit-" - version ".tar.gz")) - (sha256 - (base32 - "1nkw9wfbvizmpajbj3in8ns07g7lwkiv8hip14jjlwk3cacls6jv")))) - (build-system python-build-system) - (propagated-inputs - `(("python-extras" ,python-extras) - ("python-mimeparse" ,python-mimeparse))) - (native-inputs - `(("python-testscenarios" ,python-testscenarios))) - (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.") - (license (list license:bsd-3 license:asl2.0)))) ; at the user's option - -(define-public python2-subunit - (package-with-python2 python-subunit)) - ;; Recent versions of python-fixtures and python-testrepository need ;; python-pbr for packaging, which itself needs these two packages for ;; testing. @@ -2189,7 +1664,7 @@ protocol.") ;; Strictly speaking we currently could remove the test-requirements from the ;; normal python-pbr package (and save this package) since test are disabled ;; there anyway. But this may change in future. -(define python-pbr-minimal +(define-public python-pbr-minimal (package (name "python-pbr-minimal") (version "3.0.1") @@ -2209,7 +1684,7 @@ protocol.") "Used only for bootstrapping python2-pbr, you should not need this.") (license license:asl2.0))) -(define python2-pbr-minimal +(define-public python2-pbr-minimal (package-with-python2 python-pbr-minimal)) (define-public python-pbr @@ -2242,179 +1717,6 @@ from git information. (define-public python2-pbr (package-with-python2 python-pbr)) -(define-public python-fixtures - (package - (name "python-fixtures") - (version "1.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "fixtures" version)) - (sha256 - (base32 - "0djxvdwm8s60dbfn7bhf40x6g818p3b3mlwijm1c3bqg7msn271y")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "python" "-m" "testtools.run" - "fixtures.test_suite"))))))) - (propagated-inputs - `(("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 - -(define-public python2-fixtures - (package-with-python2 python-fixtures)) - -(define-public python-testrepository - (package - (name "python-testrepository") - (version "0.0.20") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/testrepository/testrepository-" - version ".tar.gz")) - (sha256 - (base32 - "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m")))) - (build-system python-build-system) - (arguments - ;; FIXME: Many tests are failing. - '(#:tests? #f)) - (propagated-inputs - `(("python-fixtures" ,python-fixtures) - ("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") - (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 - -(define-public python2-testrepository - (package-with-python2 python-testrepository)) - -(define-public python-coverage - (package - (name "python-coverage") - (version "4.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "coverage" version)) - (sha256 - (base32 - "01rbr4br4lsk0lwn8fb96zwd2xr4f0mg1w7iq3j11i8f5ig2nqs1")))) - (build-system python-build-system) - (arguments - ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. - '(#:tests? #f)) - (home-page "http://nedbatchelder.com/code/coverage") - (synopsis "Code coverage measurement for Python") - (description - "Coverage measures code coverage, typically during test execution. It -uses the code analysis tools and tracing hooks provided in the Python standard -library to determine which lines are executable, and which have been -executed.") - (license license:bsd-3))) - -(define-public python2-coverage - (package-with-python2 python-coverage)) - -(define-public python-cov-core - (package - (name "python-cov-core") - (version "1.15.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "cov-core" version)) - (sha256 - (base32 - "0k3np9ymh06yv1ib96sb6wfsxjkqhmik8qfsn119vnhga9ywc52a")))) - (build-system python-build-system) - (propagated-inputs - `(("python-coverage" ,python-coverage))) - (home-page "https://github.com/schlamar/cov-core") - (synopsis "Coverage plugin core for pytest-cov, nose-cov and nose2-cov") - (description - "This is a library package for use by @code{pytest-cov}, @code{nose-cov} -and @code{nose2-cov}. It is useful for developing coverage plugins for these -testing frameworks.") - (license license:expat))) - -(define-public python2-cov-core - (package-with-python2 python-cov-core)) - -(define-public python-discover - (package - (name "python-discover") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/d/discover/discover-" - version ".tar.gz")) - (sha256 - (base32 - "0y8d0zwiqar51kxj8lzmkvwc3b8kazb04gk5zcb4nzg5k68zmhq5")))) - (build-system python-build-system) - (home-page "http://pypi.python.org/pypi/discover/") - (synopsis - "Python test discovery for unittest") - (description - "Discover provides test discovery for unittest, a feature that has been -backported from Python 2.7 for Python 2.4+.") - (license license:bsd-3))) - -(define-public python2-discover - (package-with-python2 python-discover)) - -(define-public behave - (package - (name "behave") - (version "1.2.5") - (source (origin - (method url-fetch) - (uri (pypi-uri "behave" version ".tar.bz2")) - (sha256 - (base32 - "1iypp6z46r19n4xmgx6m1lwmlpfjh8vapq8izigrqlaarvp2y64c")))) - (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six) - ("python-parse" ,python-parse) - ("python-parse-type" ,python-parse-type))) - (arguments `(#:tests? #f)) ;TODO: tests require nose>=1.3 and - ;PyHamcrest>=1.8 - (home-page "https://github.com/behave/behave") - (synopsis "Python behavior-driven development") - (description - "Behave is a tool for behavior-driven development in python. -Behavior-driven development (or BDD) is an agile software development -technique that encourages collaboration between developers, QA and -non-technical or business participants in a software project. Behave uses -tests written in a natural language style, backed up by Python code.") - (license license:x11))) - (define-public python-exif-read (package (name "python-exif-read") @@ -5427,53 +4729,6 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python2-ipykernel (package-with-python2 python-ipykernel)) -(define-public python-testpath - (package - (name "python-testpath") - (version "0.2") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/jupyter/testpath/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "04kh3fgvmqz6cfcw79q70qwjz7ib7lxm27cc548iy2rpr33qqf55")))) - (build-system python-build-system) - (arguments - `(#:tests? #f ; this package does not even have a setup.py - #:modules ((guix build python-build-system) - (guix build utils) - (srfi srfi-1)) - #:imported-modules (,@%python-build-system-modules - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (delete 'install) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((version (last - (string-split (assoc-ref inputs "python") #\-))) - (x.y (string-join (take (string-split version #\.) 2) - ".")) - (dir (string-append - (assoc-ref outputs "out") - "/lib/python" x.y "/site-packages/testpath"))) - (mkdir-p dir) - (copy-recursively "testpath" dir)) - #t))))) - (home-page "https://github.com/takluyver/testpath") - (synopsis "Test utilities for code working with files and commands") - (description - "Testpath is a collection of utilities for Python code working with files -and commands. It contains functions to check things on the filesystem, and -tools for mocking system commands and recording calls to those.") - (license license:expat))) - -(define-public python2-testpath - (package-with-python2 python-testpath)) - (define-public python-ipython (package (name "python-ipython") @@ -6139,29 +5394,6 @@ falling into the Python interpreter.") (define-public python2-q (package-with-python2 python-q)) -(define-public python-testlib - (package - (name "python-testlib") - (version "0.6.5") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/t/testlib/testlib-" - version ".zip")) - (sha256 - (base32 "1mz26cxn4x8bbgv0rn0mvj2z05y31rkc8009nvdlb3lam5b4mj3y")))) - (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) ; for unpacking the source - (synopsis "Python micro test suite harness") - (description "A micro unittest suite harness for Python.") - (home-page "https://github.com/trentm/testlib") - (license license:expat))) - -(define-public python2-testlib - (package-with-python2 python-testlib)) - (define-public python2-xlib (package (name "python2-xlib") @@ -8237,88 +7469,12 @@ minimal and fast API targeting the following uses: (home-page "https://github.com/benjolitz/trollius-redis") (synopsis "Port of asyncio-redis to trollius") (description "@code{trollius-redis} is a Redis client for Python - trollius. It is an asynchronious IO (PEP 3156) implementation of the - Redis protocol.") - (license license:bsd-2))) - -(define-public python2-trollius-redis - (package-with-python2 python-trollius-redis)) - -;;; The software provided by this package was integrated into pytest 2.8. -(define-public python-pytest-cache - (package - (name "python-pytest-cache") - (version "1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-cache" version)) - (sha256 - (base32 - "1a873fihw4rhshc722j4h6j7g3nj7xpgsna9hhg3zn6ksknnhx5y")))) - (build-system python-build-system) - (propagated-inputs - `(("python-apipkg" ,python-apipkg) - ("python-execnet" ,python-execnet) - ("python-py" ,python-py) - ("python-pytest" ,python-pytest))) - (synopsis "Py.test plugin with mechanisms for caching across test runs") - (description "The pytest-cache plugin provides tools to rerun failures from -the last py.test invocation.") - (home-page "https://bitbucket.org/hpk42/pytest-cache/") - (license license:expat))) - -(define-public python2-pytest-cache - (package-with-python2 python-pytest-cache)) - -(define-public python-pytest-localserver - (package - (name "python-pytest-localserver") - (version "0.3.5") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-localserver" version)) - (sha256 - (base32 - "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "py.test" "--genscript=runtests.py")) - (zero? (system* "py.test"))))))) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-requests" ,python-requests) - ("python-six" ,python-six))) - (propagated-inputs - `(("python-werkzeug" ,python-werkzeug))) - (synopsis "Py.test plugin to test server connections locally") - (description "Pytest-localserver is a plugin for the pytest testing -framework which enables you to test server connections locally.") - (home-page "https://pypi.python.org/pypi/pytest-localserver") - (license license:expat))) - -(define-public python-pytest-xprocess - (package - (name "python-pytest-xprocess") - (version "0.9.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-xprocess" version)) - (sha256 - (base32 - "17zlql1xqw3ywcgwwbqmw633aly99lab12hm02asr8awvg5603pp")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pytest" ,python-pytest) - ("python-pytest-cache" ,python-pytest-cache) - ("python-psutil" ,python-psutil))) - (synopsis "Pytest plugin to manage external processes across test runs") - (description "Pytest-xprocess is an experimental py.test plugin for managing -processes across test runs.") - (home-page "https://bitbucket.org/pytest-dev/pytest-xprocess") - (license license:expat))) + trollius. It is an asynchronious IO (PEP 3156) implementation of the + Redis protocol.") + (license license:bsd-2))) + +(define-public python2-trollius-redis + (package-with-python2 python-trollius-redis)) (define-public python-icalendar (package @@ -8774,62 +7930,6 @@ interface to the Amazon Web Services (AWS) API.") (define-public python2-botocore (package-with-python2 python-botocore)) -(define-public python-hypothesis - (package - (name "python-hypothesis") - (version "3.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "hypothesis" version)) - (sha256 - (base32 - "0qyqq9akm4vshhn8cngjc1qykcvsn7cz6dlm6njfsgpbraqrmbbw")))) - (build-system python-build-system) - (native-inputs - `(("python-flake8" ,python-flake8) - ("python-pytest" ,python-pytest))) - (synopsis "Library for property based testing") - (description "Hypothesis is a library for testing your Python code against a -much larger range of examples than you would ever want to write by hand. It’s -based on the Haskell library, Quickcheck, and is designed to integrate -seamlessly into your existing Python unit testing work flow.") - (home-page "https://github.com/DRMacIver/hypothesis") - (license license:mpl2.0) - (properties `((python2-variant . ,(delay python2-hypothesis)))))) - -(define-public python2-hypothesis - (let ((hypothesis (package-with-python2 - (strip-python2-variant python-hypothesis)))) - (package (inherit hypothesis) - (propagated-inputs - `(("python2-enum34" ,python2-enum34) - ,@(package-propagated-inputs hypothesis)))))) - -(define-public python-pytest-subtesthack - (package - (name "python-pytest-subtesthack") - (version "0.1.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-subtesthack" version)) - (sha256 - (base32 - "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pytest" ,python-pytest))) - (synopsis "Set-up and tear-down fixtures for unit tests") - (description "This plugin allows you to set up and tear down fixtures within -unit test functions that use @code{py.test}. This is useful for using -@command{hypothesis} inside py.test, as @command{hypothesis} will call the test -function multiple times, without setting up or tearing down fixture state as is -normally the case.") - (home-page "https://github.com/untitaker/pytest-subtesthack/") - (license license:unlicense))) - -(define-public python2-pytest-subtesthack - (package-with-python2 python-pytest-subtesthack)) - (define-public python-xdo (package (name "python-xdo") @@ -11119,89 +10219,6 @@ Python to manipulate OpenDocument 1.2 files.") (define-public python2-odfpy (package-with-python2 python-odfpy)) -(define-public python-lit - (package - (name "python-lit") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "lit" version)) - (sha256 - (base32 - "135m2b9cwih85g66rjggavck328z7lj37srgpq3jxszbg0g2b91y")))) - (build-system python-build-system) - (home-page "http://llvm.org/") - (synopsis "LLVM Software Testing Tool") - (description "@code{lit} is a portable tool for executing LLVM and Clang -style test suites, summarizing their results, and providing indication of -failures.") - (license license:ncsa))) - -(define-public python2-lit - (package-with-python2 python-lit)) - -(define-public python-pytest-pep8 - (package - (name "python-pytest-pep8") - (version "1.0.6") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-pep8" version)) - (sha256 - (base32 - "06032agzhw1i9d9qlhfblnl3dw5hcyxhagn7b120zhrszbjzfbh3")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; Fails with recent pytest and pep8. See upstream issues #8 and #12. - (native-inputs - `(("python-pytest" ,python-pytest))) - (propagated-inputs - `(("python-pep8" ,python-pep8))) - (home-page "https://bitbucket.org/pytest-dev/pytest-pep8") - (synopsis "Py.test plugin to check PEP8 requirements") - (description "Pytest plugin for checking PEP8 compliance.") - (license license:expat))) - -(define-public python2-pytest-pep8 - (package-with-python2 python-pytest-pep8)) - -(define-public python-pytest-flakes - (package - (name "python-pytest-flakes") - (version "1.0.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "pytest-flakes" version)) - (sha256 - (base32 - "0flag3n33kbhyjrhzmq990rvg4yb8hhhl0i48q9hw0ll89jp28lw")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - (lambda* (#:key outputs inputs #:allow-other-keys) - ;; It's easier to run tests after install. - ;; Make installed package available for running the tests - (add-installed-pythonpath inputs outputs) - (zero? (system* "py.test" "-vv"))))))) - (native-inputs - `(("python-coverage" ,python-coverage) - ("python-pytest" ,python-pytest) - ("python-pytest-cache" ,python-pytest-cache) - ("python-pytest-pep8" ,python-pytest-pep8))) - (propagated-inputs - `(("python-pyflakes" ,python-pyflakes))) - (home-page "https://github.com/fschulze/pytest-flakes") - (synopsis "Py.test plugin to check source code with pyflakes") - (description "Pytest plugin for checking Python source code with pyflakes.") - (license license:expat))) - -(define-public python2-pytest-flakes - (package-with-python2 python-pytest-flakes)) - (define-public python-natsort (package (name "python-natsort") @@ -11697,42 +10714,6 @@ PNG, JPEG, JPEG2000 and GIF files in pure Python.") (description "This package provides console text coloring for Python.") (license license:bsd-3))) -(define-public python-rednose - (package - (name "python-rednose") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rednose" version)) - (sha256 - (base32 - "0b0bsna217lr1nykyhl5fgjly15zhdvqd4prg4wy1zrgfv7al6m0")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-deps - (lambda _ - ;; See - (substitute* "setup.py" - (("python-termstyle") "termstyle")) - #t))))) - (propagated-inputs - `(("python-colorama" ,python-colorama) - ("python-termstyle" ,python-termstyle))) - (native-inputs - `(("python-six" ,python-six) - ("python-nose" ,python-nose))) - (home-page "https://github.com/JBKahn/rednose") - (synopsis "Colored output for Python nosetests") - (description "This package provides colored output for the -@command{nosetests} command of the Python Nose unit test framework.") - (license license:bsd-3))) - -(define-public python2-rednose - (package-with-python2 python-rednose)) - (define-public python-sadisplay (package (name "python-sadisplay") @@ -12536,126 +11517,6 @@ in other versions.") (define-public python2-configparser (package-with-python2 python-configparser)) -(define-public python2-coverage-test-runner - (package - (name "python2-coverage-test-runner") - (version "1.11") - (source - (origin - (method url-fetch) - (uri (string-append - "http://git.liw.fi/cgi-bin/cgit/cgit.cgi/" - "coverage-test-runner/snapshot/coverage-test-runner-" - version ".tar.gz")) - (sha256 - (base32 - "0y1m7z3dl63kmhcmydl1mwg0hacnf6ghrx9dah17j9iasssfa3g7")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (zero? (system* "./testrun"))))))) - (propagated-inputs - `(("python2-coverage" ,python2-coverage))) - (home-page "https://liw.fi/coverage-test-runner/") - (synopsis "Python module for running unit tests") - (description "@code{CoverageTestRunner} is a python module for running -unit tests and failing them if the unit test module does not exercise all -statements in the module it tests.") - (license license:gpl3+))) - -(define-public python-pylint - (package - (name "python-pylint") - (version "1.7.2") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/PyCQA/pylint/archive/pylint-" - version ".tar.gz")) - (sha256 - (base32 - "0mzn1czhf1mgr2wiqfihb274sja02h899b85kywdpivppa9nwrmp")))) - (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner) - ("python-tox" ,python-tox))) - (propagated-inputs - `(("python-astroid" ,python-astroid) - ("python-isort" ,python-isort) - ("python-mccabe" ,python-mccabe) - ("python-six" ,python-six))) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Somehow, tests for python2-pylint - ;; fail if run from the build directory - (let ((work "/tmp/work")) - (mkdir-p work) - (setenv "PYTHONPATH" - (string-append (getenv "PYTHONPATH") ":" work)) - (copy-recursively "." work) - (with-directory-excursion "/tmp" - (zero? (system* "python" "-m" "unittest" "discover" - "-s" (string-append work "/pylint/test") - "-p" "*test_*.py"))))))))) - (home-page "https://github.com/PyCQA/pylint") - (synopsis "Python source code analyzer which looks for coding standard -errors") - (description "Pylint is a Python source code analyzer which looks -for programming errors, helps enforcing a coding standard and sniffs -for some code smells (as defined in Martin Fowler's Refactoring book). - -Pylint has many rules enabled by default, way too much to silence them -all on a minimally sized program. It's highly configurable and handle -pragmas to control it from within your code. Additionally, it is -possible to write plugins to add your own checks.") - (properties `((python2-variant . ,(delay python2-pylint)))) - (license license:gpl2+))) - -(define-public python2-pylint - (let ((pylint (package-with-python2 - (strip-python2-variant python-pylint)))) - (package (inherit pylint) - (propagated-inputs - `(("python2-backports-functools-lru-cache" - ,python2-backports-functools-lru-cache) - ("python2-configparser" ,python2-configparser) - ,@(package-propagated-inputs pylint)))))) - -(define-public python-paramunittest - (package - (name "python-paramunittest") - (version "0.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "ParamUnittest" version)) - (sha256 - (base32 - "0kp793hws5xv1wvycxq7jw2pwy36f35k39jg8hx5qikij5a0jid1")))) - (build-system python-build-system) - (home-page - "https://github.com/rik0/ParamUnittest") - (synopsis - "Simple extension to have parametrized unit tests") - (description - "This package allows to create parametrized unit-tests that work with the standard -unittest package. A parametrized test case is automatically converted to multiple test -cases. Since they are TestCase subclasses, they work with other test suites that -recognize TestCases.") - (license license:bsd-2))) - -(define-public python2-python-paramunittest - (package-with-python2 python-paramunittest)) - (define-public python-mando (package (name "python-mando") @@ -12768,79 +11629,6 @@ exception message with a traceback that points to the culprit.") (define-public python2-mwclient (package-with-python2 python-mwclient)) -(define-public python-pytest-warnings - (package - (name "python-pytest-warnings") - (version "0.2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-warnings" version)) - (sha256 - (base32 - "0gf2dpahpl5igb7jh1sr9acj3z3gp7zahqdqb69nk6wx01c8kc1g")))) - (build-system python-build-system) - (propagated-inputs - `(("pytest" ,python-pytest-3.0))) - (home-page "https://github.com/fschulze/pytest-warnings") - (synopsis "Pytest plugin to list Python warnings in pytest report") - (description - "Python-pytest-warnings is a pytest plugin to list Python warnings in -pytest report.") - (license license:expat))) - -(define-public python2-pytest-warnings - (package-with-python2 python-pytest-warnings)) - -(define-public python-pytest-capturelog - (package - (name "python-pytest-capturelog") - (version "0.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-capturelog" version ".tar.gz")) - (sha256 - (base32 - "038049nyjl7di59ycnxvc9nydivc5m8np3hqq84j2iirkccdbs5n")))) - (build-system python-build-system) - (propagated-inputs - `(("pytest" ,python-pytest-3.0))) - (home-page "http://bitbucket.org/memedough/pytest-capturelog/overview") - (synopsis "Pytest plugin to catch log messages") - (description - "Python-pytest-catchlog is a pytest plugin to catch log messages.") - (license license:expat))) - -(define-public python2-pytest-capturelog - (package-with-python2 python-pytest-capturelog)) - -(define-public python-pytest-catchlog - (package - (name "python-pytest-catchlog") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytest-catchlog" version ".zip")) - (sha256 - (base32 - "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab")))) - (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) - (propagated-inputs - `(("pytest" ,python-pytest-3.0))) - (home-page "https://github.com/eisensheng/pytest-catchlog") - (synopsis "Pytest plugin to catch log messages") - (description - "Python-pytest-catchlog is a pytest plugin to catch log messages. This is -a fork of pytest-capturelog.") - (license license:expat))) - -(define-public python2-pytest-catchlog - (package-with-python2 python-pytest-catchlog)) - (define-public python-utils (package (name "python-utils") @@ -12935,33 +11723,6 @@ perform the operations required for synchronizing plain text.") (define-public python2-dirsync (package-with-python2 python-dirsync)) -(define-public python-nosexcover - (package - (name "python-nosexcover") - (version "1.0.11") - (source (origin - (method url-fetch) - (uri (pypi-uri "nosexcover" version)) - (sha256 - (base32 - "10xqr12qv62k2flxwqhh8cr00cjhn7sfjrm6p35gd1x5bmjkr319")))) - (build-system python-build-system) - (propagated-inputs - `(("python-coverage" ,python-coverage) - ("python-nose" ,python-nose))) - (home-page "http://github.com/cmheisel/nose-xcover") - (synopsis "Extends nose.plugins.cover to add Cobertura-style XML reports") - (description "Nose-xcover is a companion to the built-in -@code{nose.plugins.cover}. This plugin will write out an XML coverage report -to a file named coverage.xml. - -It will honor all the options you pass to the Nose coverage plugin, -especially -cover-package.") - (license license:expat))) - -(define-public python2-nosexcover - (package-with-python2 python-nosexcover)) - (define-public python-levenshtein (package (name "python-levenshtein") @@ -13196,38 +11957,6 @@ substitute for redis.") (define-public python2-fakeredis (package-with-python2 python-fakeredis)) -(define-public python-behave-web-api - (package - (name "python-behave-web-api") - (version "1.0.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "behave-web-api" version)) - (sha256 - (base32 - "03kpq2xsy1gab3jy0dccbxlsg7vwfy4lagss0qldwmx3xz6b3i19")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-dependencies - (lambda _ - (substitute* "setup.py" - (("'wheel'") "") ; We don't use it. - (("'ordereddict==1.1'") ""))))))) ; Python >= 2.7 has it built-in. - (propagated-inputs - `(("behave" ,behave) - ("python-requests" ,python-requests))) - (home-page "https://github.com/jefersondaniel/behave-web-api") - (synopsis "Provides testing for JSON APIs with Behave for Python") - (description "This package provides testing utility modules for testing -JSON APIs with Behave.") - (license license:expat))) - -(define-public python2-behave-web-api - (package-with-python2 python-behave-web-api)) - (define-public python-packaging (package (name "python-packaging") @@ -13466,35 +12195,6 @@ 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-nose-randomly - (package - (name "python-nose-randomly") - (version "1.2.5") - (source - (origin - (method url-fetch) - (uri (pypi-uri "nose-randomly" version)) - (sha256 - (base32 - "1cw9dlr1zh3w4i438kin7z0rm8092ki52hayisyc43h9pcplq7rn")))) - (build-system python-build-system) - (native-inputs - `(("python-nose" ,python-nose) - ("python-numpy" ,python-numpy))) - (home-page "https://github.com/adamchainz/nose-randomly") - (synopsis - "Nose plugin to randomly order tests and control random.seed") - (description - "This is a @code{Nose} plugin to randomly order tests which can be quite -powerful in discovering hidden flaws in the tests themselves, while helping to -reduce inter-test dependencies. It also helps in controlling @code{random.seed}, -by resetting it to a repeatable number for each test, enabling the tests to -create data based on random numbers and yet remain repeatable.") - (license license:bsd-3))) - -(define-public python2-nose-randomly - (package-with-python2 python-nose-randomly)) - (define-public python-jsonpointer (package (name "python-jsonpointer") @@ -14025,34 +12725,6 @@ ignoring formatting changes.") (define-public python2-pydiff (package-with-python2 python-pydiff)) -(define-public python-nose-timer - (package - (name "python-nose-timer") - (version "0.7.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "nose-timer" version)) - (patches - (search-patches - ;; This patch will not be needed in the next version. - ;; It is taken from the master branch. - "python-nose-timer-drop-ordereddict.patch")) - (sha256 - (base32 - "1s32ymsnby8lz2qk55ifj9zi50dqcg6swnj5cz2rmwxg2jsslsxp")))) - (build-system python-build-system) - (propagated-inputs - `(("python-nose" ,python-nose) - ("python-termcolor" ,python-termcolor))) - (home-page "https://github.com/mahmoudimus/nose-timer") - (synopsis "Timer plugin for nosetests") - (description "Shows how much time was needed to run individual tests.") - (license license:expat))) - -(define-public python2-nose-timer - (package-with-python2 python-nose-timer)) - (define-public python-tqdm (package (name "python-tqdm") diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 88ba1c3d63..2fa6475148 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages databases) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c7ebb84249..4014c0d7c2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -35,6 +35,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cran) #:use-module (gnu packages curl) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 5d647bcd34..440130f5ed 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages boost) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 171b9045f0..8d7594c26f 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -25,6 +25,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (gnu packages check) #:use-module (gnu packages python)) (define-public time diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 427b5dfab9..433793439d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -38,6 +38,7 @@ #:use-module (guix build-system haskell) #:use-module (gnu packages compression) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages dns) #:use-module (gnu packages guile) #:use-module (gnu packages haskell) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 9562bbfa8d..6cf833464c 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index 99245fa0b0..33d01f058d 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -19,6 +19,7 @@ (define-module (gnu packages tryton) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages gtk) #:use-module (gnu packages python) #:use-module (gnu packages python-web) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 40ee9d139c..6b626f0d26 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -29,6 +29,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages) + #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) -- cgit 1.4.1 From 33dc54b08c5b56fbe87229fe05f5c7de8c6f1179 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 18 Nov 2017 11:58:44 +0100 Subject: gnu: Move date/time packages from python.scm to time.scm. * gnu/packages/python.scm (python-pytz, python2-pytz, python-dateutil, python2-dateutil, python-parsedatetime, python2-parsedatetime, python-tzlocal, python-isodate, python2-isodate, python-iso8601, python2-iso8601, python-monotonic, python2-monotonic, python-pyrfc3339, python2-pyrfc3339, python-arrow, python2-arrow, python-aniso8601, python2-aniso8601): Move from here... * gnu/packages/time.scm: ...to here. * gnu/packages/calendar.scm, gnu/packages/check.scm, gnu/packages/django.scm, gnu/packages/ebook.scm, gnu/packages/gnome.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/mail.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/rdf.scm, gnu/packages/statistics.scm, gnu/packages/tls.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm: Adjust accordingly. --- gnu/packages/calendar.scm | 1 + gnu/packages/check.scm | 1 + gnu/packages/django.scm | 3 +- gnu/packages/ebook.scm | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/irc.scm | 1 + gnu/packages/jrnl.scm | 3 +- gnu/packages/mail.scm | 1 + gnu/packages/openstack.scm | 1 + gnu/packages/package-management.scm | 1 + gnu/packages/python-crypto.scm | 1 + gnu/packages/python-web.scm | 1 + gnu/packages/python.scm | 254 +--------------------------------- gnu/packages/rdf.scm | 1 + gnu/packages/statistics.scm | 1 + gnu/packages/time.scm | 262 +++++++++++++++++++++++++++++++++++- gnu/packages/tls.scm | 1 + gnu/packages/tryton.scm | 1 + gnu/packages/version-control.scm | 1 + 19 files changed, 280 insertions(+), 257 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 23e2da05ea..159e606a24 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages time) #:use-module (srfi srfi-26)) (define-public libical diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 149a276316..5a926eb596 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages python) #:use-module (gnu packages python-web) + #:use-module (gnu packages time) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 6b71092ac7..bbf231ab53 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -29,7 +29,8 @@ #:use-module (gnu packages databases) #:use-module (gnu packages check) #:use-module (gnu packages python) - #:use-module (gnu packages python-web)) + #:use-module (gnu packages python-web) + #:use-module (gnu packages time)) (define-public python-django (package diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 8cf977cff3..7d34bfafac 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 33d4c7d8e8..25e0e8fe31 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -122,6 +122,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages spice) #:use-module (gnu packages tex) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages webkit) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 120bdc4371..e1ceb508bb 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages qt) #:use-module (gnu packages tcl) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages web)) diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index d4c41d5b9e..ec9e20681c 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -25,7 +25,8 @@ #:use-module (guix build-system python) #:use-module (gnu packages check) #:use-module (gnu packages python) - #:use-module (gnu packages python-crypto)) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages time)) (define-public jrnl (package diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1e13bb0afd..77d935171a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -96,6 +96,7 @@ #:use-module (gnu packages samba) #:use-module (gnu packages screen) #:use-module (gnu packages tcl) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages networking) #:use-module (gnu packages web) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 6745b203ba..31922833b7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages ssh) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (guix build-system python) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9d178aae60..1570992b26 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages cpio) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages ssh) #:use-module (gnu packages vim) diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index ebb6e0617f..77409d86d2 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 57938d0cfd..12e45b2eff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) + #:use-module (gnu packages time) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index fd83cf7e0d..d46119718b 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -111,6 +111,7 @@ #:use-module (gnu packages statistics) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages video) @@ -469,31 +470,6 @@ pidof, tty, taskset, pmap.") (define-public python2-psutil (package-with-python2 python-psutil)) -(define-public python-pytz - (package - (name "python-pytz") - (version "2017.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pytz" version ".zip")) - (sha256 - (base32 - "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m")))) - (build-system python-build-system) - (native-inputs - `(("unzip" ,unzip))) - (home-page "http://pythonhosted.org/pytz") - (synopsis "Python timezone library") - (description "This library brings the Olson tz database into Python. It -allows accurate and cross platform timezone calculations using Python 2.4 or -higher. It also solves the issue of ambiguous times at the end of daylight -saving time. Almost all of the Olson timezones are supported.") - (license license:expat))) - -(define-public python2-pytz - (package-with-python2 python-pytz)) - (define-public python-clyent (package (name "python-clyent") @@ -1004,59 +980,6 @@ Python file, so it can be easily copied into your project.") (define-public python2-six (package-with-python2 python-six)) -(define-public python-dateutil - (package - (name "python-dateutil") - (version "2.6.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "python-dateutil" version)) - (sha256 - (base32 - "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2")))) - (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-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+.") - (license license:bsd-3))) - -(define-public python2-dateutil - (package-with-python2 python-dateutil)) - -(define-public python-parsedatetime - (package - (name "python-parsedatetime") - (version "2.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "parsedatetime" version)) - (sha256 - (base32 - "0jxqkjks7z9dn222cqgvskp4wr6d92aglinxq7pd2w4mzdc7r09x")))) - (build-system python-build-system) - (native-inputs - `(("python-nose" ,python-nose) - ("python-pyicu" ,python-pyicu) - ("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner))) - (propagated-inputs - `(("python-future" ,python-future))) - (home-page "https://github.com/bear/parsedatetime/") - (synopsis - "Parse human-readable date/time text") - (description - "Parse human-readable date/time text.") - (license license:asl2.0))) - -(define-public python2-parsedatetime - (package-with-python2 python-parsedatetime)) - (define-public python-schedule (package (name "python-schedule") @@ -1117,30 +1040,6 @@ doing practical, real world data analysis in Python.") (define-public python2-pandas (package-with-python2 python-pandas)) -(define-public python-tzlocal - (package - (name "python-tzlocal") - (version "1.2.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tzlocal" version)) - (sha256 - (base32 - "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pytz" ,python-pytz))) - (home-page "https://github.com/regebro/tzlocal") - (synopsis - "Local timezone information for Python") - (description - "Tzlocal returns a tzinfo object with the local timezone information. -This module attempts to fix a glaring hole in pytz, that there is no way to -get the local timezone information, unless you know the zoneinfo name, and -under several distributions that's hard or impossible to figure out.") - (license license:cc0))) - (define-public python2-mechanize (package (name "python2-mechanize") @@ -4564,30 +4463,6 @@ computing.") `(("python2-mock" ,python2-mock) ,@(package-native-inputs ipython)))))) -(define-public python-isodate - (package - (name "python-isodate") - (version "0.5.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "isodate" version)) - (sha256 - (base32 - "0cafaiwixgpxwh9dsd28qb0dbzsj6xpxjdkyk30ns91ps10mq422")))) - (build-system python-build-system) - (home-page - "http://cheeseshop.python.org/pypi/isodate") - (synopsis - "Python date parser and formatter") - (description - "Python-isodate is a python module for parsing and formatting -ISO 8601 dates, time and duration.") - (license license:bsd-3))) - -(define-public python2-isodate - (package-with-python2 python-isodate)) - (define-public python-urwid (package (name "python-urwid") @@ -5791,55 +5666,6 @@ and MAC network addresses.") (define-public python2-wrapt (package-with-python2 python-wrapt)) -(define-public python-iso8601 - (package - (name "python-iso8601") - (version "0.1.11") - (source - (origin - (method url-fetch) - (uri (pypi-uri "iso8601" version)) - (sha256 - (base32 - "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8")))) - (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest))) - (home-page "https://bitbucket.org/micktwomey/pyiso8601") - (synopsis "Module to parse ISO 8601 dates") - (description - "This module parses the most common forms of ISO 8601 date strings (e.g. -@code{2007-01-14T20:34:22+00:00}) into @code{datetime} objects.") - (license license:expat))) - -(define-public python2-iso8601 - (package-with-python2 python-iso8601)) - -(define-public python-monotonic - (package - (name "python-monotonic") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://pypi.python.org/packages/source/m/monotonic/monotonic-" - version - ".tar.gz")) - (sha256 - (base32 - "0yz0bcbwx8r2c01czzfpbrxddynxyk9k95jj8h6sgcb7xmfvl998")))) - (build-system python-build-system) - (home-page "https://github.com/atdt/monotonic") - (synopsis "Implementation of time.monotonic() for Python 2 & < 3.3") - (description - "This module provides a monotonic() function which returns the value (in -fractional seconds) of a clock which never goes backwards.") - (license license:asl2.0))) - -(define-public python2-monotonic - (package-with-python2 python-monotonic)) - (define-public python-xlrd (package (name "python-xlrd") @@ -6754,31 +6580,6 @@ This allows one to make simple text-mode user interfaces on Unix-like systems") (base32 "0d8k7lxk50imdyx85lv8j98i4c93a71iwpapnl1506rpkbm9qvd9"))))))) -(define-public python-pyrfc3339 - (package - (name "python-pyrfc3339") - (version "1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "pyRFC3339" version)) - (sha256 - (base32 - "0dgm4l9y8jiax5cp6yxjd2i27cq8h33sh81n1wfbmnmqb32cdywd")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pytz" ,python-pytz))) - (native-inputs - `(("python-nose" ,python-nose))) - (home-page "https://github.com/kurtraschke/pyRFC3339") - (synopsis "Python timestamp library") - (description "Python library for generating and parsing RFC 3339-compliant -timestamps.") - (license license:expat))) - -(define-public python2-pyrfc3339 - (package-with-python2 python-pyrfc3339)) - (define-public python-configobj (package (name "python-configobj") @@ -8836,34 +8637,6 @@ objects, patterned after the Mocha library for Ruby.") (define-public python2-chai (package-with-python2 python-chai)) -(define-public python-arrow - (package - (name "python-arrow") - (version "0.10.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "arrow" version)) - (sha256 - (base32 - "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0")))) - (build-system python-build-system) - (native-inputs - `(;; For testing - ("python-chai" ,python-chai) - ("python-simplejson" ,python-simplejson))) - (propagated-inputs - `(("python-dateutil" ,python-dateutil))) - (home-page "https://github.com/crsmithdev/arrow/") - (synopsis "Dates and times for Python") - (description - "Arrow is a Python library to creating, manipulating, formatting and -converting dates, times, and timestamps. It implements and updates the -datetime type.") - (license license:asl2.0))) - -(define-public python2-arrow - (package-with-python2 python-arrow)) - (define-public python-inflection (package (name "python-inflection") @@ -9931,31 +9704,6 @@ useful as a validator for JSON data.") (define-public python2-validictory (package-with-python2 python-validictory)) -(define-public python-aniso8601 - (package - (name "python-aniso8601") - (version "1.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "aniso8601" version)) - (sha256 - (base32 - "1waj54iv3n3lw1fapbz8a93yjgrybgpc86wif5baxdh1arpj9df3")))) - (build-system python-build-system) - (propagated-inputs - `(("python-dateutil" ,python-dateutil))) - (home-page - "https://bitbucket.org/nielsenb/aniso8601") - (synopsis - "Python library for parsing ISO 8601 strings") - (description - "This package contains a library for parsing ISO 8601 datetime strings.") - (license license:bsd-3))) - -(define-public python2-aniso8601 - (package-with-python2 python-aniso8601)) - (define-public python-pyev (package (name "python-pyev") diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 2fa6475148..5342dbbffb 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages qt) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c04975f36c..c1f4426f2f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages ssh) #:use-module (gnu packages texinfo) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages base) #:use-module (gnu packages web) diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 8d7594c26f..52d47a1a45 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -1,8 +1,18 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2017 Ludovic Courtès +;;; Copyright © 2013, 2015 Andreas Enge +;;; Copyright © 2015, 2016, 2017 Efraim Flashner +;;; Copyright © 2015, 2017 Leo Famulari +;;; Copyright © 2015, 2017 Cyril Roelandt +;;; Copyright © 2016 Sou Bunnbu +;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016 Danny Milosavljevic +;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ben Woodcroft -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017 ng0 +;;; Copyright © 2017 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +36,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages python)) (define-public time @@ -73,6 +84,31 @@ to a file.") (define-public python2-tzdata (package-with-python2 python-pytzdata)) +(define-public python-pytz + (package + (name "python-pytz") + (version "2017.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytz" version ".zip")) + (sha256 + (base32 + "12cmd3j46d2gcw08bspvp6s9icfcvx88zjz52n1bli9dyvl5dh7m")))) + (build-system python-build-system) + (native-inputs + `(("unzip" ,unzip))) + (home-page "http://pythonhosted.org/pytz") + (synopsis "Python timezone library") + (description "This library brings the Olson tz database into Python. It +allows accurate and cross platform timezone calculations using Python 2.4 or +higher. It also solves the issue of ambiguous times at the end of daylight +saving time. Almost all of the Olson timezones are supported.") + (license expat))) + +(define-public python2-pytz + (package-with-python2 python-pytz)) + (define-public python-pendulum (package (name "python-pendulum") @@ -102,3 +138,225 @@ Pendulum instances.") (define-public python2-pendulum (package-with-python2 python-pendulum)) + +(define-public python-dateutil + (package + (name "python-dateutil") + (version "2.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-dateutil" version)) + (sha256 + (base32 + "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-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+.") + (license bsd-3))) + +(define-public python2-dateutil + (package-with-python2 python-dateutil)) + +(define-public python-parsedatetime + (package + (name "python-parsedatetime") + (version "2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "parsedatetime" version)) + (sha256 + (base32 + "0jxqkjks7z9dn222cqgvskp4wr6d92aglinxq7pd2w4mzdc7r09x")))) + (build-system python-build-system) + (native-inputs + `(("python-nose" ,python-nose) + ("python-pyicu" ,python-pyicu) + ("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner))) + (propagated-inputs + `(("python-future" ,python-future))) + (home-page "https://github.com/bear/parsedatetime/") + (synopsis "Parse human-readable date/time text") + (description + "Parse human-readable date/time text.") + (license asl2.0))) + +(define-public python2-parsedatetime + (package-with-python2 python-parsedatetime)) + +(define-public python-tzlocal + (package + (name "python-tzlocal") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tzlocal" version)) + (sha256 + (base32 + "0paj7vlsb0np8b5sp4bv64wxv7qk2piyp7xg29pkhdjwsbls9fnb")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pytz" ,python-pytz))) + (home-page "https://github.com/regebro/tzlocal") + (synopsis "Local timezone information for Python") + (description + "Tzlocal returns a tzinfo object with the local timezone information. +This module attempts to fix a glaring hole in pytz, that there is no way to +get the local timezone information, unless you know the zoneinfo name, and +under several distributions that's hard or impossible to figure out.") + (license cc0))) + +(define-public python-isodate + (package + (name "python-isodate") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "isodate" version)) + (sha256 + (base32 + "0cafaiwixgpxwh9dsd28qb0dbzsj6xpxjdkyk30ns91ps10mq422")))) + (build-system python-build-system) + (home-page "http://cheeseshop.python.org/pypi/isodate") + (synopsis "Python date parser and formatter") + (description + "Python-isodate is a python module for parsing and formatting +ISO 8601 dates, time and duration.") + (license bsd-3))) + +(define-public python2-isodate + (package-with-python2 python-isodate)) + +(define-public python-iso8601 + (package + (name "python-iso8601") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "iso8601" version)) + (sha256 + (base32 + "0c7gh3lsdjds262h0v1sqc66l7hqgfwbakn96qrhdbl0i3vm5yz8")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://bitbucket.org/micktwomey/pyiso8601") + (synopsis "Module to parse ISO 8601 dates") + (description + "This module parses the most common forms of ISO 8601 date strings (e.g. +@code{2007-01-14T20:34:22+00:00}) into @code{datetime} objects.") + (license expat))) + +(define-public python2-iso8601 + (package-with-python2 python-iso8601)) + +(define-public python-monotonic + (package + (name "python-monotonic") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://pypi.python.org/packages/source/m/monotonic/monotonic-" + version + ".tar.gz")) + (sha256 + (base32 + "0yz0bcbwx8r2c01czzfpbrxddynxyk9k95jj8h6sgcb7xmfvl998")))) + (build-system python-build-system) + (home-page "https://github.com/atdt/monotonic") + (synopsis "Implementation of time.monotonic() for Python 2 & < 3.3") + (description + "This module provides a @code{monotonic()} function which returns the +value (in fractional seconds) of a clock which never goes backwards.") + (license asl2.0))) + +(define-public python2-monotonic + (package-with-python2 python-monotonic)) + +(define-public python-pyrfc3339 + (package + (name "python-pyrfc3339") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyRFC3339" version)) + (sha256 + (base32 + "0dgm4l9y8jiax5cp6yxjd2i27cq8h33sh81n1wfbmnmqb32cdywd")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pytz" ,python-pytz))) + (native-inputs + `(("python-nose" ,python-nose))) + (home-page "https://github.com/kurtraschke/pyRFC3339") + (synopsis "Python timestamp library") + (description "Python library for generating and parsing RFC 3339-compliant +timestamps.") + (license expat))) + +(define-public python2-pyrfc3339 + (package-with-python2 python-pyrfc3339)) + +(define-public python-arrow + (package + (name "python-arrow") + (version "0.10.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "arrow" version)) + (sha256 + (base32 + "08n7q2l69hlainds1byd4lxhwrq7zsw7s640zkqc3bs5jkq0cnc0")))) + (build-system python-build-system) + (native-inputs + `(;; For testing + ("python-chai" ,python-chai) + ("python-simplejson" ,python-simplejson))) + (propagated-inputs + `(("python-dateutil" ,python-dateutil))) + (home-page "https://github.com/crsmithdev/arrow/") + (synopsis "Dates and times for Python") + (description + "Arrow is a Python library to creating, manipulating, formatting and +converting dates, times, and timestamps. It implements and updates the +datetime type.") + (license asl2.0))) + +(define-public python2-arrow + (package-with-python2 python-arrow)) + +(define-public python-aniso8601 + (package + (name "python-aniso8601") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "aniso8601" version)) + (sha256 + (base32 + "1waj54iv3n3lw1fapbz8a93yjgrybgpc86wif5baxdh1arpj9df3")))) + (build-system python-build-system) + (propagated-inputs + `(("python-dateutil" ,python-dateutil))) + (home-page "https://bitbucket.org/nielsenb/aniso8601") + (synopsis "Python library for parsing ISO 8601 strings") + (description + "This package contains a library for parsing ISO 8601 datetime strings.") + (license bsd-3))) + +(define-public python2-aniso8601 + (package-with-python2 python-aniso8601)) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 433793439d..595524506a 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -56,6 +56,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages texinfo) + #:use-module (gnu packages time) #:use-module (gnu packages base) #:use-module (srfi srfi-1)) diff --git a/gnu/packages/tryton.scm b/gnu/packages/tryton.scm index 2e669510e6..aa7af669c8 100644 --- a/gnu/packages/tryton.scm +++ b/gnu/packages/tryton.scm @@ -24,6 +24,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages python) #:use-module (gnu packages python-web) + #:use-module (gnu packages time) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system python)) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 20f20a4040..9de660f090 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) + #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages) #:use-module (ice-9 match) -- cgit 1.4.1