GNU bug report logs - #42511
[PATCH 0/2] gnu: python-cookiecutter: Update to 1.7.2.

Previous Next

Package: guix-patches;

Reported by: Tanguy Le Carrour <tanguy <at> bioneland.org>

Date: Fri, 24 Jul 2020 08:17:02 UTC

Severity: normal

Tags: patch

Done: Marius Bakke <marius <at> gnu.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42511 in the body.
You can then email your comments to 42511 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Fri, 24 Jul 2020 08:17:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Tanguy Le Carrour <tanguy <at> bioneland.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 24 Jul 2020 08:17:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: guix-patches <at> gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH 0/2] gnu: python-cookiecutter: Update to 1.7.2.
Date: Fri, 24 Jul 2020 10:16:11 +0200
Tanguy Le Carrour (2):
  gnu: python-slugify: Update to 4.0.1.
  gnu: python-cookiecutter: Update to 1.7.2.

 .../python-slugify-depend-on-unidecode.patch  | 22 -------------------
 gnu/packages/python-web.scm                   |  6 ++---
 gnu/packages/python-xyz.scm                   |  6 +++--
 3 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch

-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Fri, 24 Jul 2020 08:19:02 GMT) Full text and rfc822 format available.

Message #8 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Fri, 24 Jul 2020 10:17:40 +0200
* gnu/packages/python-web.scm (python-slugify): Update to 4.0.1. [source] Drop patch.
* gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Remove useless patch.
---
 .../python-slugify-depend-on-unidecode.patch  | 22 -------------------
 gnu/packages/python-web.scm                   |  6 ++---
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch

diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
deleted file mode 100644
index 5ac749c19d..0000000000
--- a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 4800173..6bdd77f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -14,8 +14,7 @@ url = 'https://github.com/un33k/python-slugify'
- author = 'Val Neekman'
- author_email = 'info <at> neekware.com'
- license = 'MIT'
--install_requires = ['text-unidecode>=1.3']
--extras_require = {'unidecode': ['Unidecode>=1.1.1']}
-+install_requires = ['Unidecode']
- 
- classifiers = [
-     'Development Status :: 5 - Production/Stable',
-@@ -67,7 +66,6 @@ setup(
-     author_email=author_email,
-     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
-     install_requires=install_requires,
--    extras_require=extras_require,
-     classifiers=classifiers,
-     entry_points={'console_scripts': ['slugify=slugify.slugify:main']},
- )
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a202873fd0..a52220ff23 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3522,15 +3522,13 @@ Python.")
 (define-public python-slugify
   (package
     (name "python-slugify")
-    (version "3.0.4")
+    (version "4.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-slugify" version))
        (sha256
-        (base32 "0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap"))
-       (patches
-        (search-patches "python-slugify-depend-on-unidecode.patch"))))
+        (base32 "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9"))))
     (native-inputs
      `(("python-wheel" ,python-wheel)))
     (propagated-inputs
-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Fri, 24 Jul 2020 08:19:02 GMT) Full text and rfc822 format available.

Message #11 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH 2/2] gnu: python-cookiecutter: Update to 1.7.2.
Date: Fri, 24 Jul 2020 10:17:41 +0200
* gnu/packages/python-xyz.scm (python-cookiecutter): Update to 1.7.2.
[propagated-inputs]: Add python-slugify, python-text-unidecode.
---
 gnu/packages/python-xyz.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 07a52a0e5c..83c5e9a61a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10546,14 +10546,14 @@ designed to work across multiple versions of Python.")
 (define-public python-cookiecutter
   (package
     (name "python-cookiecutter")
-    (version "1.6.0")
+    (version "1.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cookiecutter" version))
        (sha256
         (base32
-         "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"))))
+         "1b2xa5dypk1vf8aq599fd8zw4y0pwvq3hgl7ia8aiv8gg3ab5dpg"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-freezegun" ,python-freezegun)
@@ -10569,6 +10569,8 @@ designed to work across multiple versions of Python.")
        ("python-jinja2-time" ,python-jinja2-time)
        ("python-poyo" ,python-poyo)
        ("python-requests" ,python-requests)
+       ("python-slugify" ,python-slugify)
+       ("python-text-unidecode" ,python-text-unidecode)
        ("python-whichcraft" ,python-whichcraft)))
     (home-page "https://github.com/audreyr/cookiecutter")
     (synopsis
-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Sat, 25 Jul 2020 10:38:02 GMT) Full text and rfc822 format available.

Message #14 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Oleg Pykhalov <go.wigust <at> gmail.com>
To: Tanguy Le Carrour <tanguy <at> bioneland.org>
Cc: 42511 <at> debbugs.gnu.org
Subject: Re: [bug#42511] [PATCH 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Sat, 25 Jul 2020 13:36:50 +0300
[Message part 1 (text/plain, inline)]
Hi,

Tanguy Le Carrour <tanguy <at> bioneland.org> writes:

> * gnu/packages/python-web.scm (python-slugify): Update to 4.0.1. [source] Drop patch.
> * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Remove useless patch.
> ---
>  .../python-slugify-depend-on-unidecode.patch  | 22 -------------------

This patch should be also removed from gnu/local.mk file:
--8<---------------cut here---------------start------------->8---
$ make
make  all-recursive
make[1]: Entering directory '/home/oleg/src/guix-master'
Making all in po/guix
make[2]: Entering directory '/home/oleg/src/guix-master/po/guix'
make[2]: Leaving directory '/home/oleg/src/guix-master/po/guix'
Making all in po/packages
make[2]: Entering directory '/home/oleg/src/guix-master/po/packages'
make[2]: Leaving directory '/home/oleg/src/guix-master/po/packages'
make[2]: Entering directory '/home/oleg/src/guix-master'
Compiling Scheme modules...
make[2]: *** No rule to make target 'gnu/packages/patches/python-slugify-depend-on-unidecode.patch', needed by 'all-am'.  Stop.
...
make[2]: Leaving directory '/home/oleg/src/guix-master'
make[1]: *** [Makefile:5048: all-recursive] Error 1
make[1]: Leaving directory '/home/oleg/src/guix-master'
make: *** [Makefile:3487: all] Error 2

$ grep -RF python-slugify-depend-on-unidecode.patch .
./gnu/local.mk:  %D%/packages/patches/python-slugify-depend-on-unidecode.patch  \
...
--8<---------------cut here---------------end--------------->8---

[…]

Otherwise LGTM.

Could you send updated patch, please?

Thanks,
Oleg.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Sat, 25 Jul 2020 17:25:02 GMT) Full text and rfc822 format available.

Message #17 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: go.wigust <at> gmail.com, Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v2 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Sat, 25 Jul 2020 19:23:36 +0200
* gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/python-web.scm (python-slugify): Update to 4.0.1. [source] Drop patch.
---
 gnu/local.mk                                  |  1 -
 .../python-slugify-depend-on-unidecode.patch  | 22 -------------------
 gnu/packages/python-web.scm                   |  6 ++---
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index f2a7b6b984..bb9b03bb6f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1478,7 +1478,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch	\
   %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
   %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch	\
-  %D%/packages/patches/python-slugify-depend-on-unidecode.patch	\
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch	\
   %D%/packages/patches/python-tinycss2-flake8-compat.patch	\
   %D%/packages/patches/python-unittest2-python3-compat.patch	\
diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
deleted file mode 100644
index 5ac749c19d..0000000000
--- a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 4800173..6bdd77f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -14,8 +14,7 @@ url = 'https://github.com/un33k/python-slugify'
- author = 'Val Neekman'
- author_email = 'info <at> neekware.com'
- license = 'MIT'
--install_requires = ['text-unidecode>=1.3']
--extras_require = {'unidecode': ['Unidecode>=1.1.1']}
-+install_requires = ['Unidecode']
- 
- classifiers = [
-     'Development Status :: 5 - Production/Stable',
-@@ -67,7 +66,6 @@ setup(
-     author_email=author_email,
-     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
-     install_requires=install_requires,
--    extras_require=extras_require,
-     classifiers=classifiers,
-     entry_points={'console_scripts': ['slugify=slugify.slugify:main']},
- )
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index a202873fd0..a52220ff23 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3522,15 +3522,13 @@ Python.")
 (define-public python-slugify
   (package
     (name "python-slugify")
-    (version "3.0.4")
+    (version "4.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-slugify" version))
        (sha256
-        (base32 "0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap"))
-       (patches
-        (search-patches "python-slugify-depend-on-unidecode.patch"))))
+        (base32 "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9"))))
     (native-inputs
      `(("python-wheel" ,python-wheel)))
     (propagated-inputs
-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Sat, 25 Jul 2020 17:25:02 GMT) Full text and rfc822 format available.

Message #20 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: go.wigust <at> gmail.com, Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v2 2/2] gnu: python-cookiecutter: Update to 1.7.2.
Date: Sat, 25 Jul 2020 19:23:37 +0200
* gnu/packages/python-xyz.scm (python-cookiecutter): Update to 1.7.2.
[propagated-inputs]: Add python-slugify, python-text-unidecode.
---
 gnu/packages/python-xyz.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 446e0a6def..d289689045 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10547,14 +10547,14 @@ designed to work across multiple versions of Python.")
 (define-public python-cookiecutter
   (package
     (name "python-cookiecutter")
-    (version "1.6.0")
+    (version "1.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cookiecutter" version))
        (sha256
         (base32
-         "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"))))
+         "1b2xa5dypk1vf8aq599fd8zw4y0pwvq3hgl7ia8aiv8gg3ab5dpg"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-freezegun" ,python-freezegun)
@@ -10570,6 +10570,8 @@ designed to work across multiple versions of Python.")
        ("python-jinja2-time" ,python-jinja2-time)
        ("python-poyo" ,python-poyo)
        ("python-requests" ,python-requests)
+       ("python-slugify" ,python-slugify)
+       ("python-text-unidecode" ,python-text-unidecode)
        ("python-whichcraft" ,python-whichcraft)))
     (home-page "https://github.com/audreyr/cookiecutter")
     (synopsis
-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Sat, 25 Jul 2020 18:00:02 GMT) Full text and rfc822 format available.

Message #23 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Tanguy Le Carrour <tanguy <at> bioneland.org>
Cc: go.wigust <at> gmail.com, 42511 <at> debbugs.gnu.org
Subject: Re: [bug#42511] [PATCH v2 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Sat, 25 Jul 2020 18:59:31 +0100
Hi Tanguy!

Tanguy Le Carrour writes:

> * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
> * gnu/packages/python-web.scm (python-slugify): Update to 4.0.1. [source] Drop patch.
> ---
>  gnu/local.mk                                  |  1 -
>  .../python-slugify-depend-on-unidecode.patch  | 22 -------------------
>  gnu/packages/python-web.scm                   |  6 ++---
>  3 files changed, 2 insertions(+), 27 deletions(-)
>  delete mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index f2a7b6b984..bb9b03bb6f 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1478,7 +1478,6 @@ dist_patch_DATA =						\
>    %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch	\
>    %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
>    %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch	\
> -  %D%/packages/patches/python-slugify-depend-on-unidecode.patch	\
>    %D%/packages/patches/python2-subprocess32-disable-input-test.patch	\
>    %D%/packages/patches/python-tinycss2-flake8-compat.patch	\
>    %D%/packages/patches/python-unittest2-python3-compat.patch	\
> diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
> deleted file mode 100644
> index 5ac749c19d..0000000000
> --- a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -diff --git a/setup.py b/setup.py
> -index 4800173..6bdd77f 100755
> ---- a/setup.py
> -+++ b/setup.py
> -@@ -14,8 +14,7 @@ url = 'https://github.com/un33k/python-slugify'
> - author = 'Val Neekman'
> - author_email = 'info <at> neekware.com'
> - license = 'MIT'
> --install_requires = ['text-unidecode>=1.3']
> --extras_require = {'unidecode': ['Unidecode>=1.1.1']}
> -+install_requires = ['Unidecode']
> -
> - classifiers = [
> -     'Development Status :: 5 - Production/Stable',
> -@@ -67,7 +66,6 @@ setup(
> -     author_email=author_email,
> -     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
> -     install_requires=install_requires,
> --    extras_require=extras_require,
> -     classifiers=classifiers,
> -     entry_points={'console_scripts': ['slugify=slugify.slugify:main']},
> - )

I remember adding this patch, without it csvkit doesn't build with the
following error:

```
starting phase `check'
running "python setup.py" with command "test" and parameters ()
running test
Searching for text-unidecode>=1.3
Reading https://pypi.org/simple/text-unidecode/
Download error on https://pypi.org/simple/text-unidecode/: [Errno -2] Name or service not known -- Some packages may not be found!
Couldn't find index page for 'text-unidecode' (maybe misspelled?)
Scanning index of all packages (this may take a while)
Reading https://pypi.org/simple/
Download error on https://pypi.org/simple/: [Errno -2] Name or service not known -- Some packages may not be found!
No local packages or working download links found for text-unidecode>=1.3
error: Could not find suitable distribution for Requirement.parse('text-unidecode>=1.3')
command "python" "-c" "import setuptools, tokenize;__file__='setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\\r\\n', '\\n');f.close();exec(compile(code, __file__, 'exec'))" "test" failed with status 1
builder for `/gnu/store/1dmzhmc1miszbwy84s5bvn2pw2zjzgkv-csvkit-1.0.5.drv' failed with exit code 1
build of /gnu/store/1dmzhmc1miszbwy84s5bvn2pw2zjzgkv-csvkit-1.0.5.drv failed
View build log at '/var/log/guix/drvs/1d/mzhmc1miszbwy84s5bvn2pw2zjzgkv-csvkit-1.0.5.drv.bz2'.
guix build: error: build of `/gnu/store/1dmzhmc1miszbwy84s5bvn2pw2zjzgkv-csvkit-1.0.5.drv' failed
```

I'm not familiar enough with the python build/test process to know for
sure if this is an issue with csvkit or python-slugify. We could just
package the python-text-unidecode package, but AFAIU the
python-unidecode package we already have is equivalent so it should be
OK. But somehow csvkit's check procedure doesn't see that.

Should we keep this patch around? Or maybe somebody has a better idea of
what's going on? I realise now I should have added a comment here :-).

Thanks!
Pierre




Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Mon, 27 Jul 2020 08:45:02 GMT) Full text and rfc822 format available.

Message #26 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: go.wigust <at> gmail.com, 42511 <at> debbugs.gnu.org
Subject: Re: [bug#42511] [PATCH v2 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Mon, 27 Jul 2020 10:43:57 +0200
Hi Pierre,

Le 07/25, Pierre Langlois a écrit :
> Tanguy Le Carrour writes:
> 
> > * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file.
> […]
> I remember adding this patch, without it csvkit doesn't build […]
> I'm not familiar enough with the python build/test process to know for
> sure if this is an issue with csvkit or python-slugify. We could just
> package the python-text-unidecode package, but AFAIU the
> python-unidecode package we already have is equivalent so it should be
> OK. But somehow csvkit's check procedure doesn't see that.
> 
> Should we keep this patch around? Or maybe somebody has a better idea of
> what's going on? I realise now I should have added a comment here :-).

Thanks for raising the issue!
As we already have `python-text-unidecode`, I tried patching `csvkit` and
it builds again. But I haven't tried `csvkit` itself!
Does it sound like a proper solution to you?

-- 
Tanguy




Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Mon, 27 Jul 2020 09:14:01 GMT) Full text and rfc822 format available.

Message #29 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: Tanguy Le Carrour <tanguy <at> bioneland.org>
Cc: go.wigust <at> gmail.com, Pierre Langlois <pierre.langlois <at> gmx.com>,
 42511 <at> debbugs.gnu.org
Subject: Re: [bug#42511] [PATCH v2 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Mon, 27 Jul 2020 10:17:32 +0100
Tanguy Le Carrour writes:

> Hi Pierre,
>
> Le 07/25, Pierre Langlois a écrit :
>> Tanguy Le Carrour writes:
>> 
>> > * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file.
>> […]
>> I remember adding this patch, without it csvkit doesn't build […]
>> I'm not familiar enough with the python build/test process to know for
>> sure if this is an issue with csvkit or python-slugify. We could just
>> package the python-text-unidecode package, but AFAIU the
>> python-unidecode package we already have is equivalent so it should be
>> OK. But somehow csvkit's check procedure doesn't see that.
>> 
>> Should we keep this patch around? Or maybe somebody has a better idea of
>> what's going on? I realise now I should have added a comment here :-).
>
> Thanks for raising the issue!
> As we already have `python-text-unidecode`, I tried patching `csvkit` and
> it builds again. But I haven't tried `csvkit` itself!
> Does it sound like a proper solution to you?

Oh, I didn't realise we already had this package, yep, that sounds great
to me!

Thanks,
Pierre






Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Mon, 27 Jul 2020 10:57:01 GMT) Full text and rfc822 format available.

Message #32 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: Pierre Langlois <pierre.langlois <at> gmx.com>
Cc: go.wigust <at> gmail.com, 42511 <at> debbugs.gnu.org
Subject: Re: [bug#42511] [PATCH v2 1/2] gnu: python-slugify: Update to 4.0.1.
Date: Mon, 27 Jul 2020 12:56:15 +0200
Le 07/27, Pierre Langlois a écrit :
> Tanguy Le Carrour writes:
> > Le 07/25, Pierre Langlois a écrit :
> >> Tanguy Le Carrour writes:
> >> 
> >> > * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file.
> >> […]
> >> I remember adding this patch, without it csvkit doesn't build […]
> >> I'm not familiar enough with the python build/test process to know for
> >> sure if this is an issue with csvkit or python-slugify. We could just
> >> package the python-text-unidecode package, but AFAIU the
> >> python-unidecode package we already have is equivalent so it should be
> >> OK. But somehow csvkit's check procedure doesn't see that.
> >> 
> >> Should we keep this patch around? Or maybe somebody has a better idea of
> >> what's going on? I realise now I should have added a comment here :-).
> >
> > Thanks for raising the issue!
> > As we already have `python-text-unidecode`, I tried patching `csvkit` and
> > it builds again. But I haven't tried `csvkit` itself!
> > Does it sound like a proper solution to you?
> 
> Oh, I didn't realise we already had this package, yep, that sounds great
> to me!

Submitted as #42556. I guess the commit message should contain "fix"…
but right now, `csvkit` is not (yet) broken.

-- 
Tanguy




Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Mon, 27 Jul 2020 20:09:02 GMT) Full text and rfc822 format available.

Message #35 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v3 1/3] gnu: python-slugify: Update to 4.0.1.
Date: Mon, 27 Jul 2020 22:08:16 +0200
* gnu/packages/patches/python-slugify-depend-on-unidecode.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/python-web.scm (python-slugify): Update to 4.0.1. [source] Drop patch.
---
 gnu/local.mk                                  |  1 -
 .../python-slugify-depend-on-unidecode.patch  | 22 -------------------
 gnu/packages/python-web.scm                   |  6 ++---
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8274e158d0..ef67d2e00a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1468,7 +1468,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch	\
   %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \
   %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch	\
-  %D%/packages/patches/python-slugify-depend-on-unidecode.patch	\
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch	\
   %D%/packages/patches/python-tinycss2-flake8-compat.patch	\
   %D%/packages/patches/python-unittest2-python3-compat.patch	\
diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
deleted file mode 100644
index 5ac749c19d..0000000000
--- a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 4800173..6bdd77f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -14,8 +14,7 @@ url = 'https://github.com/un33k/python-slugify'
- author = 'Val Neekman'
- author_email = 'info <at> neekware.com'
- license = 'MIT'
--install_requires = ['text-unidecode>=1.3']
--extras_require = {'unidecode': ['Unidecode>=1.1.1']}
-+install_requires = ['Unidecode']
- 
- classifiers = [
-     'Development Status :: 5 - Production/Stable',
-@@ -67,7 +66,6 @@ setup(
-     author_email=author_email,
-     packages=find_packages(exclude=EXCLUDE_FROM_PACKAGES),
-     install_requires=install_requires,
--    extras_require=extras_require,
-     classifiers=classifiers,
-     entry_points={'console_scripts': ['slugify=slugify.slugify:main']},
- )
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 44fe95479f..d1dc907e35 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3522,15 +3522,13 @@ Python.")
 (define-public python-slugify
   (package
     (name "python-slugify")
-    (version "3.0.4")
+    (version "4.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python-slugify" version))
        (sha256
-        (base32 "0dv97yi5fq074q5qyqbin09pmi8ixg36caf5nkpw2bqkd8jh6pap"))
-       (patches
-        (search-patches "python-slugify-depend-on-unidecode.patch"))))
+        (base32 "0w22fapghmzk3xdasc4dn7h8sl58l08d1h5zbf72dh80drv1g9b9"))))
     (native-inputs
      `(("python-wheel" ,python-wheel)))
     (propagated-inputs
-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Mon, 27 Jul 2020 20:09:02 GMT) Full text and rfc822 format available.

Message #38 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v3 2/3] gnu: csvkit: Fix problem caused by the update of
 python-slugify.
Date: Mon, 27 Jul 2020 22:08:17 +0200
* gnu/packages/wireservice.scm (csvkit)[inputs]: Add python-text-unidecode.
---
 gnu/packages/wireservice.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/wireservice.scm b/gnu/packages/wireservice.scm
index e3bfe8d478..9451e24d33 100644
--- a/gnu/packages/wireservice.scm
+++ b/gnu/packages/wireservice.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Pierre Langlois <pierre.langlois <at> gmx.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy <at> bioneland.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -215,7 +216,8 @@ for xls and xlsx files support to all @code{agate.Table} instances.")))
      `(("python-agate-dbf" ,python-agate-dbf)
        ("python-agate-excel" ,python-agate-excel)
        ("python-agate-sql" ,python-agate-sql)
-       ("python-six" ,python-six)))
+       ("python-six" ,python-six)
+       ("python-text-unidecode" ,python-text-unidecode)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-- 
2.27.0





Information forwarded to guix-patches <at> gnu.org:
bug#42511; Package guix-patches. (Mon, 27 Jul 2020 20:09:02 GMT) Full text and rfc822 format available.

Message #41 received at 42511 <at> debbugs.gnu.org (full text, mbox):

From: Tanguy Le Carrour <tanguy <at> bioneland.org>
To: 42511 <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: [PATCH v3 3/3] gnu: python-cookiecutter: Update to 1.7.2.
Date: Mon, 27 Jul 2020 22:08:18 +0200
* gnu/packages/python-xyz.scm (python-cookiecutter): Update to 1.7.2.
[propagated-inputs]: Add python-slugify, python-text-unidecode.
[home-page]: Update URL.
---
 gnu/packages/python-xyz.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3aebff078b..cc37b85988 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10546,14 +10546,14 @@ designed to work across multiple versions of Python.")
 (define-public python-cookiecutter
   (package
     (name "python-cookiecutter")
-    (version "1.6.0")
+    (version "1.7.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cookiecutter" version))
        (sha256
         (base32
-         "0glsvaz8igi2wy1hsnhm9fkn6560vdvdixzvkq6dn20z3hpaa5hk"))))
+         "1b2xa5dypk1vf8aq599fd8zw4y0pwvq3hgl7ia8aiv8gg3ab5dpg"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-freezegun" ,python-freezegun)
@@ -10569,8 +10569,10 @@ designed to work across multiple versions of Python.")
        ("python-jinja2-time" ,python-jinja2-time)
        ("python-poyo" ,python-poyo)
        ("python-requests" ,python-requests)
+       ("python-slugify" ,python-slugify)
+       ("python-text-unidecode" ,python-text-unidecode)
        ("python-whichcraft" ,python-whichcraft)))
-    (home-page "https://github.com/audreyr/cookiecutter")
+    (home-page "https://github.com/cookiecutter/cookiecutter")
     (synopsis
      "Command-line utility that creates projects from project templates")
     (description
-- 
2.27.0





Reply sent to Marius Bakke <marius <at> gnu.org>:
You have taken responsibility. (Wed, 29 Jul 2020 22:32:02 GMT) Full text and rfc822 format available.

Notification sent to Tanguy Le Carrour <tanguy <at> bioneland.org>:
bug acknowledged by developer. (Wed, 29 Jul 2020 22:32:02 GMT) Full text and rfc822 format available.

Message #46 received at 42511-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <marius <at> gnu.org>
To: Tanguy Le Carrour <tanguy <at> bioneland.org>, 42511-done <at> debbugs.gnu.org
Cc: Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: Re: [bug#42511] [PATCH 0/2] gnu: python-cookiecutter: Update to 1.7.2.
Date: Thu, 30 Jul 2020 00:30:56 +0200
[Message part 1 (text/plain, inline)]
Tanguy Le Carrour <tanguy <at> bioneland.org> writes:

> Tanguy Le Carrour (2):
>   gnu: python-slugify: Update to 4.0.1.
>   gnu: python-cookiecutter: Update to 1.7.2.

Applied both patches + the csvkit fix.  Thanks!
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Thu, 27 Aug 2020 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 3 years and 214 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.