Patchwork [1/5] gnu: python2-pytest-runner: Remove duplicate definition.

login
register
mail settings
Submitter Hartmut Goebel
Date Oct. 10, 2016, 1:09 p.m.
Message ID <1476105003-29538-2-git-send-email-h.goebel@crazy-compilers.com>
Download mbox | patch
Permalink /patch/16391/
State New
Headers show

Comments

Hartmut Goebel - Oct. 10, 2016, 1:09 p.m.
* gnu/packages/python.scm (python2-pytest-runner): Was defined twice, remove
  duplicate definition.
---
 gnu/packages/python.scm | 3 ---
 1 file changed, 3 deletions(-)
Leo Famulari - Oct. 12, 2016, 3:53 p.m.
On Mon, Oct 10, 2016 at 03:09:59PM +0200, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python2-pytest-runner): Was defined twice, remove
>   duplicate definition.

LGTM, good catch!

> ---
>  gnu/packages/python.scm | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index a9fd8eb..f1e9264 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1715,9 +1715,6 @@ supports coverage of subprocesses.")
>        (native-inputs `(("python2-setuptools" ,python2-setuptools)
>                         ,@(package-native-inputs base))))))
>  
> -(define-public python2-pytest-runner
> -  (package-with-python2 python-pytest-runner))
> -
>  (define-public python-pytest-mock
>    (package
>      (name "python-pytest-mock")
> -- 
> 2.7.4
> 
>
Danny Milosavljevic - Oct. 12, 2016, 8:10 p.m.
python2-msgpack has a duplicate too. 

And so do ruby-arel, r-codetools, r-gtable.

(See grep '(define-public' * |sort |uniq -d )
Hartmut Goebel - Oct. 13, 2016, 1:17 p.m.
Hi Danny,

thanks for pointing this out.
> python2-msgpack has a duplicate too. 

I removed this one, too.

> And so do ruby-arel, r-codetools, r-gtable.


These have different versions and are not defined just below each other.
Somebody else needs to work on this.
Leo Famulari - Oct. 13, 2016, 10:39 p.m.
On Thu, Oct 13, 2016 at 03:17:54PM +0200, Hartmut Goebel wrote:
> Hi Danny,
> 
> thanks for pointing this out.
> > python2-msgpack has a duplicate too. 
> 
> I removed this one, too.
> 
> > And so do ruby-arel, r-codetools, r-gtable.
> 
> 
> These have different versions and are not defined just below each other.
> Somebody else needs to work on this.

We should CC whoever added those second patches to get their input. At
least, we can add comments to the package definitions to explain why we
need to keep multiple versions around.
Ricardo Wurmus - Oct. 14, 2016, 11:10 a.m.
Leo Famulari <leo@famulari.name> writes:

> On Thu, Oct 13, 2016 at 03:17:54PM +0200, Hartmut Goebel wrote:
>> Hi Danny,
>> 
>> thanks for pointing this out.
>> > python2-msgpack has a duplicate too. 
>> 
>> I removed this one, too.
>> 
>> > And so do ruby-arel, r-codetools, r-gtable.
>> 
>> 
>> These have different versions and are not defined just below each other.
>> Somebody else needs to work on this.
>
> We should CC whoever added those second patches to get their input. At
> least, we can add comments to the package definitions to explain why we
> need to keep multiple versions around.

Looks like I added the “r-codetools” dupe.  It’s the same version and it
wasn’t on purpose, as far as I can tell.  It’s okay to remove it.

“r-gtable” seems to be the same.  What’s weird is that I added both
versions according to git blame, so maybe it’s been a careless merge?
I’d suggest removing the older version.

~~ Ricardo

Patch

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a9fd8eb..f1e9264 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1715,9 +1715,6 @@  supports coverage of subprocesses.")
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs base))))))
 
-(define-public python2-pytest-runner
-  (package-with-python2 python-pytest-runner))
-
 (define-public python-pytest-mock
   (package
     (name "python-pytest-mock")