[PATCH 0/5] Some simple or even trivial changes.

[PATCH 0/5] Some simple or even trivial changes.

[Hartmut Goebel]

Hartmut Goebel (5):
  gnu: python2-pytest-runner: Remove duplicate definition.
  gnu: python-pytest-xdist: Remove python byte-code files from source.
  gnu: python-zope-testing: Strip byte-code and garbage from source.
  gnu: python.scm: Update some home-page urls and descriptions.
  guix: python-build-system: Fix an outdated comment.

 gnu/packages/python.scm            | 30 ++++++++++++++++++++++--------
 guix/build/python-build-system.scm |  3 +--
 2 files changed, 23 insertions(+), 10 deletions(-)

-- 
2.7.4

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

[Hartmut Goebel]

* gnu/packages/python.scm (python2-pytest-runner): Was defined twice, remove
  duplicate definition.
---
 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

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

[Leo Famulari]

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
> 
> 

More duplicate package definitions

[Danny Milosavljevic]

python2-msgpack has a duplicate too. 

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

(See grep '(define-public' * |sort |uniq -d )

Re: More duplicate package definitions

[Hartmut Goebel]

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.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: More duplicate package definitions

[Leo Famulari]

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.

Re: More duplicate package definitions

[Ricardo Wurmus]

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 2/5] gnu: python-pytest-xdist: Remove python byte-code files from source.

[Hartmut Goebel]

* gnu/packages/python.scm (python-pytest-xdist): Add source snippet.
---
 gnu/packages/python.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f1e9264..345c6a7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1764,7 +1764,15 @@ same arguments.")
        (uri (pypi-uri "pytest-xdist" version ".zip"))
        (sha256
         (base32
-         "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"))))
+         "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Source archive contains .pyc files
+           (for-each delete-file-recursively
+                     (find-files "." "__pychache__" #:directories? #t))
+           (for-each delete-file (find-files "." "\\.pyc$"))
+           #t))))
     (build-system python-build-system)
     (native-inputs
      `(("unzip" ,unzip)
-- 
2.7.4

Re: [PATCH 2/5] gnu: python-pytest-xdist: Remove python byte-code files from source.

[Danny Milosavljevic]

On Mon, 10 Oct 2016 15:10:00 +0200
Hartmut Goebel <h.goebel@crazy-compilers.com> wrote:

> +        '(begin
> +           ;; Source archive contains .pyc files
> +           (for-each delete-file-recursively
> +                     (find-files "." "__pychache__" #:directories? #t))

                                         ^^^^^^^^^^ should this be "__pycache__" ?

Re: [PATCH 2/5] gnu: python-pytest-xdist: Remove python byte-code files from source.

[Leo Famulari]

On Mon, Oct 10, 2016 at 03:10:00PM +0200, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python-pytest-xdist): Add source snippet.

* gnu/packages/python.scm (python-pytest-xdist,
python2-pytest-xdist)[source]: Add snippet.

> ---
>  gnu/packages/python.scm | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index f1e9264..345c6a7 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -1764,7 +1764,15 @@ same arguments.")
>         (uri (pypi-uri "pytest-xdist" version ".zip"))
>         (sha256
>          (base32
> -         "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"))))
> +         "08rn2l39ds60xshs4js787l84pfckksqklfq2wq9x8ig2aci2pja"))
> +       (modules '((guix build utils)))
> +       (snippet
> +        '(begin
> +           ;; Source archive contains .pyc files

Can you make this comment into a complete sentence? Something like "Remove
pre-compiled .pyc files from source."?

> +           (for-each delete-file-recursively
> +                     (find-files "." "__pychache__" #:directories? #t))

As Danny pointed out, it should probably be "__pycache__".

LGTM with these changes.

[PATCH 3/5] gnu: python-zope-testing: Strip byte-code and garbage from source.

[Hartmut Goebel]

* gnu/package/python.scm (python-zope-testing): Add snippet to strip
  byte-code and garbage from source.
---
 gnu/packages/python.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 345c6a7..a289093 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6647,7 +6647,13 @@ that have uses outside of the Zope framework.")
                            "/zope.testing/zope.testing-" version ".tar.gz"))
        (sha256
         (base32
-         "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s"))))
+         "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Source contains .pyc files and some garbage
+           (for-each delete-file (find-files "." "(\\.pyc|~)$"))
+           #t))))
     (build-system python-build-system)
     (native-inputs
      `(("python-zope-exceptions" ,python-zope-exceptions)))
-- 
2.7.4

Re: [PATCH 3/5] gnu: python-zope-testing: Strip byte-code and garbage from source.

[Leo Famulari]

On Mon, Oct 10, 2016 at 03:10:01PM +0200, Hartmut Goebel wrote:
> * gnu/package/python.scm (python-zope-testing): Add snippet to strip
>   byte-code and garbage from source.

Again, mention both python-zope-testing and python2-zope-testing, and
indicate that the changes are in [source].

Also, I think we should be more descriptive than "garbage".

> ---
>  gnu/packages/python.scm | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 345c6a7..a289093 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -6647,7 +6647,13 @@ that have uses outside of the Zope framework.")
>                             "/zope.testing/zope.testing-" version ".tar.gz"))
>         (sha256
>          (base32
> -         "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s"))))
> +         "1yvglxhzvhl45mndvn9gskx2ph30zz1bz7rrlyfs62fv2pvih90s"))
> +       (modules '((guix build utils)))
> +       (snippet
> +        '(begin
> +           ;; Source contains .pyc files and some garbage

Please use a complete sentence here.

> +           (for-each delete-file (find-files "." "(\\.pyc|~)$"))
> +           #t))))
>      (build-system python-build-system)
>      (native-inputs
>       `(("python-zope-exceptions" ,python-zope-exceptions)))

LGTM with the requested changes.

[PATCH 4/5] gnu: python.scm: Update some home-page urls and descriptions.

[Hartmut Goebel]

* gnu/packages/python.scm (python-keyring, python-pylockfile): Update
  home-page url. (python-pathlib): Update description.
---
 gnu/packages/python.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a289093..9b62241 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -763,7 +763,7 @@ concepts.")
     (arguments '(#:test-target "check"))
     (native-inputs
      `(("python-pbr" ,python-pbr)))
-    (home-page "http://code.google.com/p/pylockfile/")
+    (home-page "https://launchpad.net/pylockfile")
     (synopsis "Platform-independent file locking module")
     (description
      "The lockfile package exports a LockFile class which provides a simple
@@ -900,7 +900,7 @@ etc.).  The package is structured to make adding new modules easy.")
      `(("python-pycrypto" ,python-pycrypto)))
     (arguments
      `(#:tests? #f))                      ;TODO: tests require pytest
-    (home-page "http://bitbucket.org/kang/python-keyring-lib")
+    (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
@@ -8852,7 +8852,10 @@ be done easily through operators, attribute accesses, and method calls.
 comparing Windows paths ignores casing.
 @item Well-defined semantics, eliminating any inconsistencies or
 ambiguities (forward vs. backward slashes, etc.).
-@end enumerate\n")
+@end enumerate
+
+Note: This module isn't maintained anymore. Please consider python-pathlib2
+instead.")
     (license license:expat)))
 
 (define-public python2-pathlib
-- 
2.7.4

Re: [PATCH 4/5] gnu: python.scm: Update some home-page urls and descriptions.

[Leo Famulari]

On Mon, Oct 10, 2016 at 03:10:02PM +0200, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python-keyring, python-pylockfile): Update
>   home-page url. (python-pathlib): Update description.

This should really be separate commits :)

> ---
>  gnu/packages/python.scm | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index a289093..9b62241 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -763,7 +763,7 @@ concepts.")
>      (arguments '(#:test-target "check"))
>      (native-inputs
>       `(("python-pbr" ,python-pbr)))
> -    (home-page "http://code.google.com/p/pylockfile/")
> +    (home-page "https://launchpad.net/pylockfile")
>      (synopsis "Platform-independent file locking module")
>      (description
>       "The lockfile package exports a LockFile class which provides a simple
> @@ -900,7 +900,7 @@ etc.).  The package is structured to make adding new modules easy.")
>       `(("python-pycrypto" ,python-pycrypto)))
>      (arguments
>       `(#:tests? #f))                      ;TODO: tests require pytest
> -    (home-page "http://bitbucket.org/kang/python-keyring-lib")
> +    (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
> @@ -8852,7 +8852,10 @@ be done easily through operators, attribute accesses, and method calls.
>  comparing Windows paths ignores casing.
>  @item Well-defined semantics, eliminating any inconsistencies or
>  ambiguities (forward vs. backward slashes, etc.).
> -@end enumerate\n")
> +@end enumerate
> +
> +Note: This module isn't maintained anymore. Please consider python-pathlib2
> +instead.")

We should also point out that this module was merged into the Python
standard library in 3.4:

https://pypi.python.org/pypi/pathlib/

"In Python 3.4, pathlib is now part of the standard library. For Python
3.3 and earlier, easy_install pathlib or pip install pathlib should do
the trick."

Re: [PATCH 4/5] gnu: python.scm: Update some home-page urls and descriptions.

[Hartmut Goebel]

Am 12.10.2016 um 18:01 schrieb Leo Famulari:
> On Mon, Oct 10, 2016 at 03:10:02PM +0200, Hartmut Goebel wrote:
>> > * gnu/packages/python.scm (python-keyring, python-pylockfile): Update
>> >   home-page url. (python-pathlib): Update description.
> This should really be separate commits :)
>

How many? Three?

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 4/5] gnu: python.scm: Update some home-page urls and descriptions.

[Ludovic Courtès]

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> Am 12.10.2016 um 18:01 schrieb Leo Famulari:
>> On Mon, Oct 10, 2016 at 03:10:02PM +0200, Hartmut Goebel wrote:
>>> > * gnu/packages/python.scm (python-keyring, python-pylockfile): Update
>>> >   home-page url. (python-pathlib): Update description.
>> This should really be separate commits :)
>>
>
> How many? Three?

Yes, one patch for each logical change.  See the last item at
<https://www.gnu.org/software/guix/manual/html_node/Submitting-Patches.html>.

Thanks,
Ludo’.

Re: [PATCH 4/5] gnu: python.scm: Update some home-page urls and descriptions.

[Hartmut Goebel]

Am 13.10.2016 um 22:14 schrieb Ludovic Courtès:
> Yes, one patch for each logical change.  See

Fine, this is how I normally do it.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

[PATCH 5/5] guix: python-build-system: Fix an outdated comment.

[Hartmut Goebel]

---
 guix/build/python-build-system.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 9109fb4..e906e60 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -137,8 +137,7 @@ installed with setuptools."
     #t))
 
 (define %standard-phases
-  ;; 'configure' and 'build' phases are not needed.  Everything is done during
-  ;; 'install'.
+  ;; 'configure' phase is not needed.
   (modify-phases gnu:%standard-phases
     (add-after 'unpack 'ensure-no-mtimes-pre-1980 ensure-no-mtimes-pre-1980)
     (delete 'configure)
-- 
2.7.4

Re: [PATCH 5/5] guix: python-build-system: Fix an outdated comment.

[Leo Famulari]

On Mon, Oct 10, 2016 at 03:10:03PM +0200, Hartmut Goebel wrote:
> ---
>  guix/build/python-build-system.scm | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
> index 9109fb4..e906e60 100644
> --- a/guix/build/python-build-system.scm
> +++ b/guix/build/python-build-system.scm
> @@ -137,8 +137,7 @@ installed with setuptools."
>      #t))
>  
>  (define %standard-phases
> -  ;; 'configure' and 'build' phases are not needed.  Everything is done during
> -  ;; 'install'.
> +  ;; 'configure' phase is not needed.

I have no real comment because I don't know the python-build-system well
enough. Is the sentence about 'install' no longer accurate?

Re: [PATCH 5/5] guix: python-build-system: Fix an outdated comment.

[Hartmut Goebel]

Am 12.10.2016 um 18:03 schrieb Leo Famulari:
>> >  (define %standard-phases
>> > -  ;; 'configure' and 'build' phases are not needed.  Everything is done during
>> > -  ;; 'install'.
>> > +  ;; 'configure' phase is not needed.
> I have no real comment because I don't know the python-build-system well
> enough. Is the sentence about 'install' no longer accurate?

The python-build-system uses the build and the install phase, but not
the configure phase. So the old comment was plain wrong. I assume once
only the install phase was used[*] and the comment has had been correct :-)

Which is possible and much like running "make install" without prior run
to "make".

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 5/5] guix: python-build-system: Fix an outdated comment.

[Ludovic Courtès]

Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:

> Am 12.10.2016 um 18:03 schrieb Leo Famulari:
>>> >  (define %standard-phases
>>> > -  ;; 'configure' and 'build' phases are not needed.  Everything is done during
>>> > -  ;; 'install'.
>>> > +  ;; 'configure' phase is not needed.
>> I have no real comment because I don't know the python-build-system well
>> enough. Is the sentence about 'install' no longer accurate?
>
> The python-build-system uses the build and the install phase, but not
> the configure phase. So the old comment was plain wrong. I assume once
> only the install phase was used[*] and the comment has had been correct :-)
>
> Which is possible and much like running "make install" without prior run
> to "make".

Indeed, I think this has been the case since commit
b191f88ee34576a6908b9b5e94cb7664e88c7e79.

Note however that Mark reverted this patch from master because it would
have caused a rebuild of all things Python.  However feel free to apply
it to wip-python-build-system.

Thanks,
Ludo’.