From patchwork Fri Jun 21 10:42:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 14361 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BF53017124; Fri, 21 Jun 2019 11:43:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2BDE91711F for ; Fri, 21 Jun 2019 11:43:16 +0100 (BST) Received: from localhost ([::1]:59018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heH0k-0005CS-4y for patchwork@mira.cbaines.net; Fri, 21 Jun 2019 06:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37854) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heH0b-0005An-Qw for guix-patches@gnu.org; Fri, 21 Jun 2019 06:43:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heH0Y-0006q6-Lh for guix-patches@gnu.org; Fri, 21 Jun 2019 06:43:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36220) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heH0Y-0006pe-Fc for guix-patches@gnu.org; Fri, 21 Jun 2019 06:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heH0Y-0002F0-9B for guix-patches@gnu.org; Fri, 21 Jun 2019 06:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36194] [PATCH 01/10 v2] gnu: Add python-slugify. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2019 10:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36194 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36194@debbugs.gnu.org Received: via spool by 36194-submit@debbugs.gnu.org id=B36194.15611137638586 (code B ref 36194); Fri, 21 Jun 2019 10:43:02 +0000 Received: (at 36194) by debbugs.gnu.org; 21 Jun 2019 10:42:43 +0000 Received: from localhost ([127.0.0.1]:49762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heH0A-0002EL-Eh for submit@debbugs.gnu.org; Fri, 21 Jun 2019 06:42:43 -0400 Received: from mout.gmx.net ([212.227.17.20]:58347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heH07-0002E6-Nc for 36194@debbugs.gnu.org; Fri, 21 Jun 2019 06:42:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1561113748; bh=nLK9bL6L1GahjrlDok/NNxcCBFuXF7Lao6KnSj92IA0=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:In-reply-to:Date; b=l1Zf77wZIDAz/0q9kBS5hBkXfhvDT3YSGJ0hNYu1q8uwZqNVa/BfKdxm7jr1lTqcP 0cDwVFefASw7+Kjiv06TlF6Wta4wCjHg0jDeqKzi3SJu8iBuktfVmPLPlqaO8qyqoT 4uvhydthSjXT/smlUPvnET6cTnQ6+Kl4UAUWH0Ms= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([2.99.195.183]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MgXCF-1i030N0Zmh-00O0c9; Fri, 21 Jun 2019 12:42:28 +0200 References: <20190613150126.17280-1-pierre.langlois@gmx.com> <20190613150627.1882-1-pierre.langlois@gmx.com> User-agent: mu4e 1.2.0; emacs 26.2 From: Pierre Langlois In-reply-to: <20190613150627.1882-1-pierre.langlois@gmx.com> Date: Fri, 21 Jun 2019 11:42:23 +0100 Message-ID: <87ef3nfcds.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:gXAeexoKaT6ismRP3lumcZJ8u++SrqJv8wMIrCFI2LdCZYYufcR roY6hqD3F3Xt/O7w/2DoqnG7sRx3Wj7tAjRF532jcD6eAq0YJGX3bGXaBtOHpbXIcvasR6L UQOmJEcVttk4x+gGrYcghsI1F0sHJxV/0mQsJP51Rd1X+eejNcTAPVbGwpAD0t9VkXtM6i4 oQrUrqwBgYCD2OzrxMjWg== X-UI-Out-Filterresults: notjunk:1;V03:K0:6eXqudsmiJw=:CP7tgR/FukdiE7D4g4Ev9X 6bF40dwdKGDmR3w65ItnxbmKCXA1EWh4mQgUKnoIpZ3g0RJXd9EXmfbapZgnpMpMuROXxPK4l Hz6dlAquCyJxyuGI/LxVkF7p2ILutjCugnGTs7ab+6BLrvDyaQ+EMRubkXmFUWfRXQFA1m9Uk Fl/qMKlHJxb7FCm6mtRMuYtH9km5irOaIhnua70Dq+UMeTHCXwAdbsM6eDTiy3uYgtGyMYvSu XQsxrYDFxYNVTw43X0C4mgobPpMd0QOxQ68Ad05vbdmkE/UC8ZYD1C52waqHnNZrpsByzJ0h0 br8HHeuqglL+dol+IJeIMf6FeQsMzP+tmCsrwq2nfsiJiXcEydj7HYslVVmz7yqB5UG3LJqGw HVq5cT3NEGwohGi1MrE2yTBhR0+BNOXs69MrN3pBnlnQ6XOiSMZfkfb+82b5SNPm8fi8lSjWA Sc5RF2zZUdWyG8cPgUOeOHsxeYloSOxwMRiNJrexOD6/NAGOYfuNU8XIoYjA/sa6C5oJn+M9f PmfZdho3IYgkrYjlxTG6k38IAooI8RCmoAUSqHKFisIi8HwqO7im7gmh4JQSWC+DqY79691CW WAZD2HWipZKCfBXMXXzolSzddJZEiWUKb5fbfewKAlWXiuiEcEalor06Dl9LryaoNV3EWd3gn DMA7WxVJ9wSV0RNHCBFiwBW8AoWGpRJWKcXtRfsK5OBqz8yWQfVV301v6wZNRr16P5aqHna/D Dj1dMrmssL4vqHmY2+lHcqtUwQNIf10IQd9AkJJdLZW81FXRplI0jg5zahz2BE3z8HOxYP7Jj 1a5uaDmmVzSrUh6Fzpu3q6NT2YWyo+NTtwe+G6Og4BZ10cwTqHda8q+aly7G1aO5GadMnZoAI +gwHpA5zRC0JATkrhBbBYrdH571Rw0ogMbAdFh4AkmO7Cg01eXCXKKNSp/xms5Ww71AxVhKDx 1nfwwswuqZUvYgWr1md4WZDQXH+Uj12k= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Pierre Langlois writes: > * gnu/packages/python-web.scm (python-slugify): New variable. > * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: New file. > * gnu/local.mk (dist_patch_DATA): Add it. > --- > gnu/local.mk | 1 + > .../python-slugify-depend-on-unidecode.patch | 22 +++++++++++++ > gnu/packages/python-web.scm | 31 +++++++++++++++++++ > 3 files changed, 54 insertions(+) > create mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index c7b557ca61..f8c33dd8c2 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1214,6 +1214,7 @@ dist_patch_DATA = \ > %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ > %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ > %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ > + %D%/packages/patches/python-slugify-depend-on-unidecode.patch \ > %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ > %D%/packages/patches/python-unittest2-python3-compat.patch \ > %D%/packages/patches/python-unittest2-remove-argparse.patch \ > diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch > new file mode 100644 > index 0000000000..93a3aaebe9 > --- /dev/null > +++ b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch > @@ -0,0 +1,22 @@ > +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@neekware.com' > + license = 'MIT' > +-install_requires = ['text-unidecode==1.2'] > +-extras_require = {'unidecode': ['Unidecode==1.0.23']} > ++install_requires = ['Unidecode==1.0.23'] Ah, the python-unidecode package was just updated to version 1.1.0 which then breaks csvkit. Here's a fixed patch that ignores the version number, the tests pass so I think we're good still. Thanks! Pierre From 39110b5dc66485cdda73b85bc46ff9ff2c85b97f Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 12 Jun 2019 21:15:27 +0100 Subject: [PATCH] gnu: Add python-slugify. * gnu/packages/python-web.scm (python-slugify): New variable. * gnu/packages/patches/python-slugify-depend-on-unidecode.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../python-slugify-depend-on-unidecode.patch | 22 +++++++++++++ gnu/packages/python-web.scm | 31 +++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 gnu/packages/patches/python-slugify-depend-on-unidecode.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4c54f024e0..28d9d118a6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1223,6 +1223,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-honor-source-date-epoch.patch \ + %D%/packages/patches/python-slugify-depend-on-unidecode.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/patches/python-slugify-depend-on-unidecode.patch b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch new file mode 100644 index 0000000000..6038f432f1 --- /dev/null +++ b/gnu/packages/patches/python-slugify-depend-on-unidecode.patch @@ -0,0 +1,22 @@ +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@neekware.com' + license = 'MIT' +-install_requires = ['text-unidecode==1.2'] +-extras_require = {'unidecode': ['Unidecode==1.0.23']} ++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 cbcbe6c867..e441cbaa81 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian ;;; Copyright © 2019 Brendan Tildesley +;;; Copyright © 2019 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -3165,3 +3166,33 @@ Python.") (propagated-inputs `(("python-gevent" ,python2-gevent) ("python-tornado" ,python2-tornado))))) + +(define-public python-slugify + (package + (name "python-slugify") + (version "3.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-slugify" version)) + (sha256 + (base32 + "0n6pfmsq899c54plpvzi46l7zrpa3zfpm8im6h32czjw6kxky5jp")) + (patches + (search-patches "python-slugify-depend-on-unidecode.patch")))) + (native-inputs + `(("python-wheel" ,python-wheel))) + (propagated-inputs + `(("python-unidecode" ,python-unidecode))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "test.py")))))) + (build-system python-build-system) + (home-page "https://github.com/un33k/python-slugify") + (synopsis "Python Slugify application that handles Unicode") + (description "This package provides a @command{slufigy} command and +library to create slugs from unicode strings while keeping it DRY.") + (license license:expat))) -- 2.22.0