[arch-commits] Commit in python-pyenchant/trunk (3 files)
Jelle van der Waa
jelle at archlinux.org
Sun Jul 12 11:36:21 UTC 2020
Date: Sunday, July 12, 2020 @ 11:36:20
Author: jelle
Revision: 663315
Update to 3.0.1, drop python2 module
Modified:
python-pyenchant/trunk/PKGBUILD
Deleted:
python-pyenchant/trunk/0001-Add-enchant-2-compatibility.patch
python-pyenchant/trunk/enchant-2.patch
----------------------------------------+
0001-Add-enchant-2-compatibility.patch | 70 -------------------------------
PKGBUILD | 44 ++++---------------
enchant-2.patch | 11 ----
3 files changed, 10 insertions(+), 115 deletions(-)
Deleted: 0001-Add-enchant-2-compatibility.patch
===================================================================
--- 0001-Add-enchant-2-compatibility.patch 2020-07-12 11:19:51 UTC (rev 663314)
+++ 0001-Add-enchant-2-compatibility.patch 2020-07-12 11:36:20 UTC (rev 663315)
@@ -1,70 +0,0 @@
-From 4ecabbdb345a4f84e97e05abb970e8ca83e6b52e Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle at vdwaa.nl>
-Date: Sat, 2 Dec 2017 21:13:42 +0100
-Subject: [PATCH] Add enchant 2 compatibility
-
-Remove is_in_session of which the function is removed in Enchant 2.0 and
-was already deprecated.
----
- enchant/__init__.py | 9 ---------
- enchant/_enchant.py | 6 ------
- enchant/pypwl.py | 6 ------
- 3 files changed, 21 deletions(-)
-
-diff --git a/enchant/__init__.py b/enchant/__init__.py
-index 016d32f..56ecbeb 100644
---- a/enchant/__init__.py
-+++ b/enchant/__init__.py
-@@ -715,15 +715,6 @@ class Dict(_EnchantObject):
- word = self._StringClass(word)
- return _e.dict_is_removed(self._this,word.encode())
-
-- def is_in_session(self,word):
-- """Check whether a word is in the session list."""
-- warnings.warn("Dict.is_in_session is deprecated, "\
-- "please use Dict.is_added",
-- category=DeprecationWarning,stacklevel=2)
-- self._check_this()
-- word = self._StringClass(word)
-- return _e.dict_is_in_session(self._this,word.encode())
--
- def store_replacement(self,mis,cor):
- """Store a replacement spelling for a miss-spelled word.
-
-diff --git a/enchant/_enchant.py b/enchant/_enchant.py
-index a07058d..cf77908 100644
---- a/enchant/_enchant.py
-+++ b/enchant/_enchant.py
-@@ -309,12 +309,6 @@ dict_is_removed1.restype = c_int
- def dict_is_removed(dict,word):
- return dict_is_removed1(dict,word,len(word))
-
--dict_is_in_session1 = e.enchant_dict_is_in_session
--dict_is_in_session1.argtypes = [t_dict,c_char_p,c_size_t]
--dict_is_in_session1.restype = c_int
--def dict_is_in_session(dict,word):
-- return dict_is_in_session1(dict,word,len(word))
--
- dict_store_replacement1 = e.enchant_dict_store_replacement
- dict_store_replacement1.argtypes = [t_dict,c_char_p,c_size_t,c_char_p,c_size_t]
- dict_store_replacement1.restype = None
-diff --git a/enchant/pypwl.py b/enchant/pypwl.py
-index 3a2248f..282c015 100644
---- a/enchant/pypwl.py
-+++ b/enchant/pypwl.py
-@@ -247,12 +247,6 @@ class PyPWL:
- """Add a word to the session list."""
- self._words.insert(word)
-
-- def is_in_session(self,word):
-- """Check whether a word is in the session list."""
-- warnings.warn("PyPWL.is_in_session is deprecated, please use PyPWL.is_added",category=DeprecationWarning)
-- # Consider all words to be in the session list
-- return self.check(word)
--
- def store_replacement(self,mis,cor):
- """Store a replacement spelling for a miss-spelled word.
-
---
-2.15.1
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-12 11:19:51 UTC (rev 663314)
+++ PKGBUILD 2020-07-12 11:36:20 UTC (rev 663315)
@@ -4,50 +4,26 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-pkgname=('python-pyenchant' 'python2-pyenchant')
-pkgver=2.0.0
-pkgrel=5
+pkgname=python-pyenchant
+pkgver=3.1.1
+pkgrel=1
arch=('any')
url="https://pypi.python.org/pypi/pyenchant"
license=('LGPL')
-makedepends=('python2-setuptools' 'python-setuptools' 'enchant')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/rfk/pyenchant/archive/v${pkgver}.tar.gz"
- "enchant-2.patch")
-sha512sums=('21f8dd286f1f462d11aea0f1b89f3189e51109a3a8c5baee80cba17b9e7c56fa60f308d4ea39d9675d69e3da11dc07996eb32d545cd3567503f0956abc060882'
- 'c6dc74e60c684b5606b681096d740814a5f138e9caf8ad2f41d9e467c820d46bab6b3d449a99dc17e4b1e1b89964d1fc4248c55a600c977ee6269cddb46ad596')
+pkgdesc='PyEnchant is a spellchecking library for Python3 based on the Enchant library'
+depends=('python' 'enchant' 'nuspell')
+makedepends=('python-setuptools' 'enchant')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/rfk/pyenchant/archive/v${pkgver}.tar.gz")
+sha512sums=('512758629347b711b8b46fd2d5a270ac16a56cb8df3474213052aba76c390051a21758ae7bbdfda21e7db67dc26fb0e9005abfb4865d70a2f4d49dc34158cbf7')
-prepare() {
- cd ${srcdir}/pyenchant-${pkgver}
-
- patch -Np1 -i "${srcdir}/enchant-2.patch"
-}
-
build() {
- cp -r pyenchant-${pkgver} pyenchant2-${pkgver}
+ cd pyenchant-${pkgver}
- cd ${srcdir}/pyenchant-${pkgver}
-
python3 setup.py build
-
- cd ${srcdir}/pyenchant2-${pkgver}
-
- python2 setup.py build
}
-package_python-pyenchant() {
- pkgdesc="PyEnchant is a spellchecking library for Python3 based on the Enchant library"
- depends=('python' 'enchant')
-
+package() {
cd pyenchant-${pkgver}
python3 setup.py install --root=${pkgdir} --optimize=1
}
-
-package_python2-pyenchant() {
- pkgdesc="PyEnchant is a spellchecking library for Python2 based on the Enchant library"
- depends=('python2' 'enchant')
-
- cd pyenchant2-${pkgver}
-
- python2 setup.py install --root=${pkgdir} --optimize=1
-}
Deleted: enchant-2.patch
===================================================================
--- enchant-2.patch 2020-07-12 11:19:51 UTC (rev 663314)
+++ enchant-2.patch 2020-07-12 11:36:20 UTC (rev 663315)
@@ -1,11 +0,0 @@
-diff -ur pyenchant2-2.0.0/enchant/_enchant.py pyenchant2-2.0.0_fix/enchant/_enchant.py
---- pyenchant2-2.0.0/enchant/_enchant.py 2018-01-24 21:13:42.680056632 -0700
-+++ pyenchant2-2.0.0_fix/enchant/_enchant.py 2018-01-24 21:14:20.620017925 -0700
-@@ -72,6 +72,7 @@
- yield "libenchant.so"
- # See if ctypes can find the library for us, under various names.
- yield find_library("enchant")
-+ yield find_library("enchant-2")
- yield find_library("libenchant")
- yield find_library("libenchant-1")
- # Special-case handling for enchant installed by macports.
More information about the arch-commits
mailing list