[PATCH 1/4] gnu: Add python-pytest-3.0.7

[PATCH 1/4] gnu: Add python-pytest-3.0.7

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-pytest-3.0.7): New variable.
---
 gnu/packages/python.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7aae8fc..52be497 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1845,6 +1845,24 @@ and many external plugins.")
                                line)))
              #t)))))))
 
+;; This package is used by Sphinx version 1.5.2 and up
+(define-public python-pytest-3.0.7
+  (package
+    (inherit python-pytest-2.9.2)
+    (name "python-pytest")
+    (version "3.0.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pytest" version))
+       (sha256
+        (base32
+         "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-mock" ,python-mock)
+       ("python-hypothesis" ,python-hypothesis)))))
+
 (define-public python-pytest-cov
   (package
     (name "python-pytest-cov")
-- 
2.10.2

[PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-sphinx-1.5.2): New variable.
* gnu/packages/python.scm (python-sphinx-1.5.3): New variable.
---
 gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 52be497..7bda780 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3104,6 +3104,38 @@ sources.")
     (license license:bsd-3)
     (properties `((python2-variant . ,(delay python2-sphinx))))))
 
+(define-public python-sphinx-1.5.2
+  (package
+    (inherit python-sphinx)
+    (name "python-sphinx")
+    (version "1.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Sphinx" version))
+       (sha256
+        (base32
+         "08n765wix63yfvxhnrhlahb2wqn877ypdpnldr571r0974wli704"))))
+    (native-inputs
+     `(("graphviz" ,graphviz)
+       ("python-html5lib" ,python-html5lib)
+       ("python-mock" ,python-mock)
+       ("python-nose" ,python-nose)
+       ("python-pytest" ,python-pytest-3.0.7)))))
+
+(define-public python-sphinx-1.5.3
+  (package
+    (inherit python-sphinx-1.5.2)
+    (name "python-sphinx")
+    (version "1.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Sphinx" version))
+       (sha256
+        (base32
+         "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg"))))))
+
 (define-public python2-sphinx
   (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
     (package
-- 
2.10.2

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Pjotr Prins]

Hi Fred, 

Why do we need both versions?

Pj.

On Sun, Mar 26, 2017 at 12:23:33PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-sphinx-1.5.2): New variable.
> * gnu/packages/python.scm (python-sphinx-1.5.3): New variable.
> ---
>  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 52be497..7bda780 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -3104,6 +3104,38 @@ sources.")
>      (license license:bsd-3)
>      (properties `((python2-variant . ,(delay python2-sphinx))))))
>  
> +(define-public python-sphinx-1.5.2
> +  (package
> +    (inherit python-sphinx)
> +    (name "python-sphinx")
> +    (version "1.5.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "Sphinx" version))
> +       (sha256
> +        (base32
> +         "08n765wix63yfvxhnrhlahb2wqn877ypdpnldr571r0974wli704"))))
> +    (native-inputs
> +     `(("graphviz" ,graphviz)
> +       ("python-html5lib" ,python-html5lib)
> +       ("python-mock" ,python-mock)
> +       ("python-nose" ,python-nose)
> +       ("python-pytest" ,python-pytest-3.0.7)))))
> +
> +(define-public python-sphinx-1.5.3
> +  (package
> +    (inherit python-sphinx-1.5.2)
> +    (name "python-sphinx")
> +    (version "1.5.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "Sphinx" version))
> +       (sha256
> +        (base32
> +         "0kw1axswbvaavr8ggyf4qr6hnisnrzlbkkcdada69vk1x9xjassg"))))))
> +
>  (define-public python2-sphinx
>    (let ((base (package-with-python2 (strip-python2-variant python-sphinx))))
>      (package
> -- 
> 2.10.2
> 

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Frederick Muriithi]

On Sun, Mar 26, 2017 at 6:10 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
> Hi Fred,
>
> Why do we need both versions?
>

We don't. I noticed there was a newer version (1.5.3) while working on
version 1.5.2, and thought to just add it, since it wasn't much
effort.

If it's ever explicitly needed, it'll be defined already. Is that
okay, or should I refrain from that in the future?

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Pjotr Prins]

If the update passes I would just add it.

Are the messages showing up on debbugs?

On Sun, Mar 26, 2017 at 06:32:49PM +0300, Frederick Muriithi wrote:
> On Sun, Mar 26, 2017 at 6:10 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
> > Hi Fred,
> >
> > Why do we need both versions?
> >
> 
> We don't. I noticed there was a newer version (1.5.3) while working on
> version 1.5.2, and thought to just add it, since it wasn't much
> effort.
> 
> If it's ever explicitly needed, it'll be defined already. Is that
> okay, or should I refrain from that in the future?
> 

-- 

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Ricardo Wurmus]

Pjotr Prins <pjotr.public12@thebird.nl> writes:

> Are the messages showing up on debbugs?

No.  These were sent to “guix-devel”, not “guix-patches”.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 637 bytes --]

On Sun, Mar 26, 2017 at 06:32:49PM +0300, Frederick Muriithi wrote:
> On Sun, Mar 26, 2017 at 6:10 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
> > Hi Fred,
> >
> > Why do we need both versions?
> >
> 
> We don't. I noticed there was a newer version (1.5.3) while working on
> version 1.5.2, and thought to just add it, since it wasn't much
> effort.
> 
> If it's ever explicitly needed, it'll be defined already. Is that
> okay, or should I refrain from that in the future?

Thanks! If mando works with 1.5.3, we should just use that. Otherwise,
let's leave 1.5.3 out for now, to avoid needless building on Hydra.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

On Mon, Mar 27, 2017 at 11:11:00AM -0400, Leo Famulari wrote:
> On Sun, Mar 26, 2017 at 06:32:49PM +0300, Frederick Muriithi wrote:
> > On Sun, Mar 26, 2017 at 6:10 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
> > > Hi Fred,
> > >
> > > Why do we need both versions?
> > >
> > 
> > We don't. I noticed there was a newer version (1.5.3) while working on
> > version 1.5.2, and thought to just add it, since it wasn't much
> > effort.
> > 
> > If it's ever explicitly needed, it'll be defined already. Is that
> > okay, or should I refrain from that in the future?
> 
> Thanks! If mando works with 1.5.3, we should just use that. Otherwise,
> let's leave 1.5.3 out for now, to avoid needless building on Hydra.

Or leave out 1.5.2, since your mando package is using 1.5.3 :)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/4] gnu: Add python-sphinx-1.5.2, python-sphinx-1.5.3

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 932 bytes --]

On Mon, Mar 27, 2017 at 11:12:34AM -0400, Leo Famulari wrote:
> On Mon, Mar 27, 2017 at 11:11:00AM -0400, Leo Famulari wrote:
> > On Sun, Mar 26, 2017 at 06:32:49PM +0300, Frederick Muriithi wrote:
> > > On Sun, Mar 26, 2017 at 6:10 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
> > > > Hi Fred,
> > > >
> > > > Why do we need both versions?
> > > >
> > > 
> > > We don't. I noticed there was a newer version (1.5.3) while working on
> > > version 1.5.2, and thought to just add it, since it wasn't much
> > > effort.
> > > 
> > > If it's ever explicitly needed, it'll be defined already. Is that
> > > okay, or should I refrain from that in the future?
> > 
> > Thanks! If mando works with 1.5.3, we should just use that. Otherwise,
> > let's leave 1.5.3 out for now, to avoid needless building on Hydra.
> 
> Or leave out 1.5.2, since your mando package is using 1.5.3 :)

Pushed without 1.5.2, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 3/4] gnu: Add python-paramunittest

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-paramunittest): New variable.
---
 gnu/packages/python.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7bda780..a219bb3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13932,3 +13932,26 @@ possible to write plugins to add your own checks.")
                  ,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-3)))
-- 
2.10.2

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Pjotr Prins]

This package does not actually have an OSI approved license that I can
tell. We should contact the authors.

Pj.

On Sun, Mar 26, 2017 at 12:23:34PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-paramunittest): New variable.
> ---
>  gnu/packages/python.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 7bda780..a219bb3 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -13932,3 +13932,26 @@ possible to write plugins to add your own checks.")
>                   ,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-3)))
> -- 
> 2.10.2
> 

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Frederick Muriithi]

On Sun, Mar 26, 2017 at 6:12 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
> This package does not actually have an OSI approved license that I can
> tell. We should contact the authors.
>

From PyPi (https://pypi.python.org/pypi/ParamUnittest/0.2) the license
is indicated as BSD. I have also cloned the repository and looked at
setup.py, where the license field is defined as:

    'License :: OSI Approved :: BSD License'

If this is not enough, I could start an Issue requesting a 'LICENSE'
file be added.

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Chris Marusich]

[-- Attachment #1: Type: text/plain, Size: 1089 bytes --]

Frederick Muriithi <fredmanglis@gmail.com> writes:

> On Sun, Mar 26, 2017 at 6:12 PM, Pjotr Prins <pjotr.public12@thebird.nl> wrote:
>> This package does not actually have an OSI approved license that I can
>> tell. We should contact the authors.
>>
>
> From PyPi (https://pypi.python.org/pypi/ParamUnittest/0.2) the license
> is indicated as BSD. I have also cloned the repository and looked at
> setup.py, where the license field is defined as:
>
>     'License :: OSI Approved :: BSD License'
>
> If this is not enough, I could start an Issue requesting a 'LICENSE'
> file be added.

Since the term "BSD License" is ambiguous it would be good to ask.  If
they mean the original BSD license, then this is free software, so it is
OK to add it, but it would also mean that the license is incompatible
with the GNU GPL.  It would be useful to know which license they mean.
The best way for them to do that is to include the text of the license
in the source tree.

https://www.gnu.org/licenses/license-list.html
https://www.gnu.org/licenses/bsd.html

-- 
Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Frederick Muriithi]

On Mon, Mar 27, 2017 at 2:32 AM, Chris Marusich <cmmarusich@gmail.com> wrote:
> Since the term "BSD License" is ambiguous it would be good to ask.  If
> they mean the original BSD license, then this is free software, so it is
> OK to add it, but it would also mean that the license is incompatible
> with the GNU GPL.  It would be useful to know which license they mean.
> The best way for them to do that is to include the text of the license
> in the source tree.
>
> https://www.gnu.org/licenses/license-list.html
> https://www.gnu.org/licenses/bsd.html
>

An issue has been started, and hopefully, we'll receive the answer soon.

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Frederick Muriithi]

> An issue has been started, and hopefully, we'll receive the answer soon.

From this thread https://github.com/rik0/ParamUnittest/issues/8 the
author has finally chosen BSD-2.

-- 
Frederick M. Muriithi

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Ludovic Courtès]

Hi Frederick,

Frederick Muriithi <fredmanglis@gmail.com> skribis:

>> An issue has been started, and hopefully, we'll receive the answer soon.
>
> From this thread https://github.com/rik0/ParamUnittest/issues/8 the
> author has finally chosen BSD-2.

Cool.  Do you want to send an updated patch or should we just apply this
one with ‘bsd-2’ as the license?

Thanks,
Ludo’.

Re: [PATCH 3/4] gnu: Add python-paramunittest

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

On Sun, Mar 26, 2017 at 12:23:34PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-paramunittest): New variable.

I added a python2 variant (we like to do this when adding new Python
packages) and pushed. Thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 4/4] gnu: Add python-mando

[Muriithi Frederick Muriuki]

* gnu/packages/python.scm (python-mando): New variable.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a219bb3..1c750ee 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -13955,3 +13955,28 @@ unittest package.  A parametrized test case is automatically converted to multip
 cases.  Since they are TestCase subclasses, they work with other test suites that
 recognize TestCases.")
     (license license:bsd-3)))
+
+(define-public python-mando
+  (package
+  (name "python-mando")
+  (version "0.5")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "mando" version))
+      (sha256
+        (base32
+          "0q05h66439gqdmlk4jqm6xrwrzfdgs4mwk70barxhr2y83qbbdc0"))))
+  (build-system python-build-system)
+  (propagated-inputs
+   `(("python-rst2ansi" ,python-rst2ansi)))
+  (native-inputs
+   `(("python-sphinx" ,python-sphinx-1.5.3)
+     ("python-paramunittest" ,python-paramunittest)))
+  (home-page "https://mando.readthedocs.org/")
+  (synopsis
+    "Wrapper around argparse, allowing creation of complete CLI applications")
+  (description
+    "This package is a wrapper around argparse, allowing you to write complete CLI
+ applications in seconds while maintaining all the flexibility.")
+  (license license:expat)))
-- 
2.10.2

Re: [PATCH 4/4] gnu: Add python-mando

[Pjotr Prins]

Pretty cool package :). Note that python-sphinx may default to latest
if you update the package. 

Otherwise LGTM

On Sun, Mar 26, 2017 at 12:23:35PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-mando): New variable.
> ---
>  gnu/packages/python.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index a219bb3..1c750ee 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -13955,3 +13955,28 @@ unittest package.  A parametrized test case is automatically converted to multip
>  cases.  Since they are TestCase subclasses, they work with other test suites that
>  recognize TestCases.")
>      (license license:bsd-3)))
> +
> +(define-public python-mando
> +  (package
> +  (name "python-mando")
> +  (version "0.5")
> +  (source
> +    (origin
> +      (method url-fetch)
> +      (uri (pypi-uri "mando" version))
> +      (sha256
> +        (base32
> +          "0q05h66439gqdmlk4jqm6xrwrzfdgs4mwk70barxhr2y83qbbdc0"))))
> +  (build-system python-build-system)
> +  (propagated-inputs
> +   `(("python-rst2ansi" ,python-rst2ansi)))
> +  (native-inputs
> +   `(("python-sphinx" ,python-sphinx-1.5.3)
> +     ("python-paramunittest" ,python-paramunittest)))
> +  (home-page "https://mando.readthedocs.org/")
> +  (synopsis
> +    "Wrapper around argparse, allowing creation of complete CLI applications")
> +  (description
> +    "This package is a wrapper around argparse, allowing you to write complete CLI
> + applications in seconds while maintaining all the flexibility.")
> +  (license license:expat)))
> -- 
> 2.10.2
> 

Re: [PATCH 4/4] gnu: Add python-mando

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

On Sun, Mar 26, 2017 at 12:23:35PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-mando): New variable.

Thanks, looks good!

I'll push this series (or a revision of it) after we get a timely
response to the paramunittest licensing question.

If there is not a timely response, I think it's fine to use the license
'non-copyleft' for that package, since the author does appear to have
meant to release the software under a permissive BSD style license.

Can you let us know when that question is answered, or too much time has
passed?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 4/4] gnu: Add python-mando

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Sun, Mar 26, 2017 at 12:23:35PM +0300, Muriithi Frederick Muriuki wrote:
>> * gnu/packages/python.scm (python-mando): New variable.
>
> Thanks, looks good!
>
> I'll push this series (or a revision of it) after we get a timely
> response to the paramunittest licensing question.
>
> If there is not a timely response, I think it's fine to use the license
> 'non-copyleft' for that package, since the author does appear to have
> meant to release the software under a permissive BSD style license.
>
> Can you let us know when that question is answered, or too much time has
> passed?

Here we are:

  https://lists.gnu.org/archive/html/guix-devel/2017-03/msg00805.html

I’ll let you take care of applying the series then.

Thanks,
Ludo’.

Re: [PATCH 4/4] gnu: Add python-mando

[Leo Famulari]

On Sun, Mar 26, 2017 at 12:23:35PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-mando): New variable.

Pushed with a python2 variant, thanks!

Re: [PATCH 1/4] gnu: Add python-pytest-3.0.7

[Pjotr Prins]

Is there a reason not to just update this package? 

Otherwise LGTM

On Sun, Mar 26, 2017 at 12:23:32PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-pytest-3.0.7): New variable.
> ---
>  gnu/packages/python.scm | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 7aae8fc..52be497 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1845,6 +1845,24 @@ and many external plugins.")
>                                 line)))
>               #t)))))))
>  
> +;; This package is used by Sphinx version 1.5.2 and up
> +(define-public python-pytest-3.0.7
> +  (package
> +    (inherit python-pytest-2.9.2)
> +    (name "python-pytest")
> +    (version "3.0.7")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "pytest" version))
> +       (sha256
> +        (base32
> +         "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
> +    (native-inputs
> +     `(("python-nose" ,python-nose)
> +       ("python-mock" ,python-mock)
> +       ("python-hypothesis" ,python-hypothesis)))))
> +
>  (define-public python-pytest-cov
>    (package
>      (name "python-pytest-cov")
> -- 
> 2.10.2
> 

Re: [PATCH 1/4] gnu: Add python-pytest-3.0.7

[Frederick Muriithi]

[-- Attachment #1: Type: text/plain, Size: 1711 bytes --]

I don't really see a reason why not. I have to point out though, that when
writing the definition, I found python-pytest-2.9.2 also defined, with a
note that it's there until all packages can be upgraded to use a more
recent pytest.

Since I don't know what the progress on that is, I decided to err on the
side of caution, and just add it with a note on why it's needed.

On 26 Mar 2017 6:12 p.m., "Pjotr Prins" <pjotr.public12@thebird.nl> wrote:

Is there a reason not to just update this package?

Otherwise LGTM

On Sun, Mar 26, 2017 at 12:23:32PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-pytest-3.0.7): New variable.
> ---
>  gnu/packages/python.scm | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 7aae8fc..52be497 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1845,6 +1845,24 @@ and many external plugins.")
>                                 line)))
>               #t)))))))
>
> +;; This package is used by Sphinx version 1.5.2 and up
> +(define-public python-pytest-3.0.7
> +  (package
> +    (inherit python-pytest-2.9.2)
> +    (name "python-pytest")
> +    (version "3.0.7")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "pytest" version))
> +       (sha256
> +        (base32
> +         "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
> +    (native-inputs
> +     `(("python-nose" ,python-nose)
> +       ("python-mock" ,python-mock)
> +       ("python-hypothesis" ,python-hypothesis)))))
> +
>  (define-public python-pytest-cov
>    (package
>      (name "python-pytest-cov")
> --
> 2.10.2
>

[-- Attachment #2: Type: text/html, Size: 2584 bytes --]

Re: [PATCH 1/4] gnu: Add python-pytest-3.0.7

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 960 bytes --]

On Sun, Mar 26, 2017 at 06:29:04PM +0300, Frederick Muriithi wrote:
> I don't really see a reason why not. I have to point out though, that when
> writing the definition, I found python-pytest-2.9.2 also defined, with a
> note that it's there until all packages can be upgraded to use a more
> recent pytest.
> 
> Since I don't know what the progress on that is, I decided to err on the
> side of caution, and just add it with a note on why it's needed.

I added pytest 2.9.2 when I realized that many packages are picky about
which version of pytest they can use.

I checked, and all the packages that are using pytest 2.9.2 can use
pytest 3.0.7 instead.

So, here's a patch that updates the newer pytest across the board. It
goes after your patch series, unless you want to rebase your patches on
to it.

Soon we'll do a "python-updates" branch where we try to default to the
newer pytest, and keep an older one around for the outliers.

[-- Attachment #1.2: 0001-gnu-python-pytest-2.9.2-Replace-with-python-pytest-3.patch --]
[-- Type: text/plain, Size: 5116 bytes --]

From f44c8d0dec2af7677ad16cfad877fb73407b6c30 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 27 Mar 2017 03:10:53 -0400
Subject: [PATCH] gnu: python-pytest-2.9.2: Replace with python-pytest-3.0.

* gnu/packages/python.scm (python-pytest-2.9.2): Replace with ...
(python-pytest-3.0): ... new variable.
(python2-pytest-3.0): New variable.
(python-cryptography, python2-cryptography)[native-inputs]: Replace
python-pytest-2.9.2 with python-pytest-3.0.
* gnu/packages/backup.scm (borg)[native-inputs]: Likewise.
gnu/packages/calendar.scm (khal)[native-inputs]: Likewise.
---
 gnu/packages/backup.scm   |  2 +-
 gnu/packages/calendar.scm |  2 +-
 gnu/packages/python.scm   | 40 +++++++++++++++++-----------------------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 7e9ae18f3..8e1f19515 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -529,7 +529,7 @@ detection, and lossless compression.")
        ("python-setuptools-scm" ,python-setuptools-scm)
        ;; Borg 1.0.8's test suite uses 'tmpdir_factory', which was introduced in
        ;; pytest 2.8.
-       ("python-pytest" ,python-pytest-2.9.2)
+       ("python-pytest" ,python-pytest-3.0)
        ;; For generating the documentation.
        ("python-sphinx" ,python-sphinx)
        ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 1e9a93ca9..977111bfe 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -113,7 +113,7 @@ data units.")
             (zero? (system* "py.test" "tests")))))))
     (native-inputs
       ;; XXX Uses tmpdir_factory, introduced in pytest 2.8.
-     `(("python-pytest" ,python-pytest-2.9.2)
+     `(("python-pytest" ,python-pytest-3.0)
        ("python-pytest-cov" ,python-pytest-cov)
        ("python-setuptools-scm" ,python-setuptools-scm)
        ;; Required for tests
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8788e9d77..12d298bbd 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1818,19 +1818,18 @@ and many external plugins.")
 (define-public python2-pytest
   (package-with-python2 python-pytest))
 
-;; This package is used by Borg until we can upgrade all our Python packages to
-;; use a more recent pytest.
-(define-public python-pytest-2.9.2
+;; Some packages require a newer pytest.
+(define-public python-pytest-3.0
   (package
     (inherit python-pytest)
     (name "python-pytest")
-    (version "2.9.2")
+    (version "3.0.7")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "pytest" version))
               (sha256
                (base32
-                "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j"))))
+                "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -1841,25 +1840,20 @@ and many external plugins.")
                 (string-append "@pytest.mark.skip"
                                "(reason=\"Assumes that /usr exists.\")\n    "
                                line)))
-             #t)))))))
-
-;; This package is used by Sphinx version 1.5.2 and up
-(define-public python-pytest-3.0.7
-  (package
-    (inherit python-pytest-2.9.2)
-    (name "python-pytest")
-    (version "3.0.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest" version))
-       (sha256
-        (base32
-         "1asc4b2nd2a4f0g3r12y97rslq5wliji7b73wwkvdrm5s7mrc1mp"))))
+             #t)))))
     (native-inputs
      `(("python-nose" ,python-nose)
        ("python-mock" ,python-mock)
-       ("python-hypothesis" ,python-hypothesis)))))
+       ("python-hypothesis" ,python-hypothesis)))
+    (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
@@ -3119,7 +3113,7 @@ sources.")
        ("python-html5lib" ,python-html5lib)
        ("python-mock" ,python-mock)
        ("python-nose" ,python-nose)
-       ("python-pytest" ,python-pytest-3.0.7)))))
+       ("python-pytest" ,python-pytest-3.0)))))
 
 (define-public python-sphinx-1.5.3
   (package
@@ -7331,7 +7325,7 @@ responses, rather than doing any computation.")
        ("python-pyasn1" ,python-pyasn1)
        ("python-pyasn1-modules" ,python-pyasn1-modules)
        ("python-pytz" ,python-pytz)
-       ("python-pytest" ,python-pytest-2.9.2)))
+       ("python-pytest" ,python-pytest-3.0)))
     (home-page "https://github.com/pyca/cryptography")
     (synopsis "Cryptographic recipes and primitives for Python")
     (description
-- 
2.12.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/4] gnu: Add python-pytest-3.0.7

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

On Mon, Mar 27, 2017 at 11:09:24AM -0400, Leo Famulari wrote:
> From f44c8d0dec2af7677ad16cfad877fb73407b6c30 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 27 Mar 2017 03:10:53 -0400
> Subject: [PATCH] gnu: python-pytest-2.9.2: Replace with python-pytest-3.0.
> 
> * gnu/packages/python.scm (python-pytest-2.9.2): Replace with ...
> (python-pytest-3.0): ... new variable.
> (python2-pytest-3.0): New variable.
> (python-cryptography, python2-cryptography)[native-inputs]: Replace
> python-pytest-2.9.2 with python-pytest-3.0.
> * gnu/packages/backup.scm (borg)[native-inputs]: Likewise.
> gnu/packages/calendar.scm (khal)[native-inputs]: Likewise.

I pushed a variant of this patch, so now there is one old pytest, and
one new pytest. Hopefully we can clean all these different versions of
pytest, sphinx, etc soon!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/4] gnu: Add python-pytest-3.0.7

[Leo Famulari]

On Sun, Mar 26, 2017 at 12:23:32PM +0300, Muriithi Frederick Muriuki wrote:
> * gnu/packages/python.scm (python-pytest-3.0.7): New variable.

Pushed, thanks!