[PATCH 0/4] Add "Unlicense"; Update vdirsyncer

[PATCH 0/4] Add "Unlicense"; Update vdirsyncer

[Leo Famulari]

This patch series adds the Unlicense [0], which is a GPL-compatible [1]
public domain "license". It is required to add
python-pytest-subtesthack, which is a new dependency of vdirsyncer.

It also adds python-hypothesis, which is a Python testing package.

Finally, it updates vdirsyncer.

[0]
https://unlicense.org/

[1]
https://www.gnu.org/licenses/license-list#Unlicense

Leo Famulari (4):
  gnu: Add python-hypothesis.
  licenses: Add the Unlicense.
  gnu: Add python-pytest-subtesthack.
  gnu: vdirsyncer: Update to 0.8.1.

 gnu/packages/dav.scm    |  8 ++++---
 gnu/packages/python.scm | 60 +++++++++++++++++++++++++++++++++++++++++++++++--
 guix/licenses.scm       |  7 ++++++
 3 files changed, 70 insertions(+), 5 deletions(-)

-- 
2.6.3

[PATCH 1/4] gnu: Add python-hypothesis.

[Leo Famulari]

* gnu/packages/python.scm (python-hypothesis, python2-hypothesis): New
variables.
---
 gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 82a9cfc..98be464 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2015 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
@@ -37,7 +37,7 @@
   #:use-module ((guix licenses)
                 #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
                           gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ agpl3+
-                          isc psfl public-domain x11-style zpl2.1))
+                          isc mpl2.0 psfl public-domain x11-style zpl2.1))
   #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages attr)
@@ -7254,3 +7254,31 @@ supports url redirection and retries, and also gzip and deflate decoding.")
 
 (define-public python2-urllib3
   (package-with-python2 python-urllib3))
+
+(define-public python-hypothesis
+  (package
+    (name "python-hypothesis")
+    (version "2.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "hypothesis" version))
+              (sha256
+               (base32
+                "1la6mfpvcn640gs2v35iv8b4sh6xdhp9j5ghay0jd86c9n4fkgxr"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(;; setuptools required for python-2 variant
+       ("python-setuptools" ,python-setuptools)))
+    (propagated-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 mpl2.0)))
+
+(define-public python2-hypothesis
+  (package-with-python2 python-hypothesis))
-- 
2.6.3

Re: [PATCH 1/4] gnu: Add python-hypothesis.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/python.scm (python-hypothesis, python2-hypothesis): New
> variables.

LGTM.

[PATCH 2/4] licenses: Add the Unlicense.

[Leo Famulari]

* guix/licenses.scm (unlicense): New variable.
---
 guix/licenses.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/guix/licenses.scm b/guix/licenses.scm
index cb23734..d33b19f 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -61,6 +62,7 @@
             sgifreeb2.0
             silofl1.1
             sleepycat
+            unlicense
             vim
             x11 x11-style
             zpl2.1
@@ -385,6 +387,11 @@ at URI, which may be a file:// URI pointing the package's tree."
            "http://directory.fsf.org/wiki/License:Vim7.2"
            "http://www.gnu.org/licenses/license-list.html#Vim"))
 
+(define unlicense
+  (license "Unlicense"
+           "https://unlicense.org/"
+           "https://www.gnu.org/licenses/license-list.html#Unlicense"))
+
 (define x11
   (license "X11"
            "http://directory.fsf.org/wiki/License:X11"
-- 
2.6.3

Re: [PATCH 2/4] licenses: Add the Unlicense.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * guix/licenses.scm (unlicense): New variable.

OK.

[PATCH 3/4] gnu: Add python-pytest-subtesthack.

[Leo Famulari]

* gnu/packages/python.scm (python-pytest-subtesthack,
python2-pytest-subtesthack): New variables.
---
 gnu/packages/python.scm | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 98be464..41dd5cc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -37,7 +37,8 @@
   #:use-module ((guix licenses)
                 #:select (asl2.0 bsd-4 bsd-3 bsd-2 non-copyleft cc0 x11 x11-style
                           gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3+ agpl3+
-                          isc mpl2.0 psfl public-domain x11-style zpl2.1))
+                          isc mpl2.0 psfl public-domain unlicense x11-style
+                          zpl2.1))
   #:use-module ((guix licenses) #:select (expat zlib) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages attr)
@@ -7282,3 +7283,30 @@ seamlessly into your existing Python unit testing work flow.")
 
 (define-public python2-hypothesis
   (package-with-python2 python-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)
+    (native-inputs
+     `(;; setuptools required for python-2 variant
+       ("python-setuptools" ,python-setuptools)))
+    (propagated-inputs
+     `(("python-pytest" ,python-pytest)))
+    (synopsis "Explicitly set up and tear down fixtures")
+    (description "This plugin allows you to set up and tear down fixtures within
+the test function itself.  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 unlicense)))
+
+(define-public python2-pytest-subtesthack
+  (package-with-python2 python-pytest-subtesthack))
-- 
2.6.3

Re: [PATCH 3/4] gnu: Add python-pytest-subtesthack.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/python.scm (python-pytest-subtesthack,
> python2-pytest-subtesthack): New variables.

[...]

> +    (synopsis "Explicitly set up and tear down fixtures")

What about: “Set-up and tear-down fixtures for unit tests”?

> +    (description "This plugin allows you to set up and tear down fixtures within
> +the test function itself.

s/the test function itself/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.")

OK with a change along these lines, thanks!

Ludo’.

[PATCH 4/4] gnu: vdirsyncer: Update to 0.8.1.

[Leo Famulari]

* gnu/packages/dav.scm (vdirsyncer): Update to 0.8.1.
[native-inputs]: Add python-hypothesis, python-pytest-subtesthack.
---
 gnu/packages/dav.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm
index f13d013..25b665f 100644
--- a/gnu/packages/dav.scm
+++ b/gnu/packages/dav.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,13 +52,13 @@ clients.")
 (define-public vdirsyncer
   (package
     (name "vdirsyncer")
-    (version "0.7.5")
+    (version "0.8.1")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "vdirsyncer" version))
              (sha256
               (base32
-               "0dvar4k95n689fgw5gy19mb7ggaw32c8j2gbglr33wn7pbxc2l9z"))))
+               "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78"))))
     (build-system python-build-system)
     (arguments
       `(#:phases (modify-phases %standard-phases
@@ -86,8 +86,10 @@ clients.")
        ("python-setuptools-scm" ,python-setuptools-scm)
        ("python-sphinx" ,python-sphinx)
        ;; Required for testing
+       ("python-hypothesis" ,python-hypothesis)
        ("python-pytest" ,python-pytest)
        ("python-pytest-localserver" ,python-pytest-localserver)
+       ("python-pytest-subtesthack" ,python-pytest-subtesthack)
        ("python-pytest-xprocess" ,python-pytest-xprocess)
        ("python-wsgi-intercept" ,python-wsgi-intercept)
        ("radicale" ,radicale)))
-- 
2.6.3

Re: [PATCH 4/4] gnu: vdirsyncer: Update to 0.8.1.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> * gnu/packages/dav.scm (vdirsyncer): Update to 0.8.1.
> [native-inputs]: Add python-hypothesis, python-pytest-subtesthack.

OK, thank you!

Ludo’.