Accepting request 1067842 from home:mcepl:branches:devel:languages:python

- Upstream became stale, switching to the fork
  https://github.com/faust-streaming/cChardet
- Update to 2.1.18:
  - Fix building source distribution
  - Fix pep517 builds
  - Time to continue off where the original project left off!
  - Support Python 3.10 + 3.11
  - Add linux aarch64 wheel support
- Removed upstreamed denose.patch

OBS-URL: https://build.opensuse.org/request/show/1067842
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cchardet?expand=0&rev=15
This commit is contained in:
Matej Cepl 2023-02-26 19:58:29 +00:00 committed by Git OBS Bridge
parent a1d8467ccf
commit 48489fd7b4
5 changed files with 23 additions and 138 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf
size 653617

View File

@ -1,125 +0,0 @@
---
requirements-dev.txt | 1 -
setup.cfg | 4 ----
src/tests/test.py | 32 +++++++-------------------------
3 files changed, 7 insertions(+), 30 deletions(-)
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,4 @@
chardet==3.0.4
-nose==1.3.7
tox==3.20.1
Cython==0.29.21
# pylint==2.6.0
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,3 @@
-[nosetests]
-verbose = 1
-nocapture = 1
-
[egg_info]
tag_build =
tag_date = 0
--- a/src/tests/test.py
+++ b/src/tests/test.py
@@ -3,7 +3,6 @@ import glob
import os
import string
-from nose.tools import eq_
import cchardet
SKIP_LIST = [
@@ -26,14 +25,11 @@ SKIP_LIST_02.extend(SKIP_LIST)
class TestCChardet():
def test_ascii(self):
detected_encoding = cchardet.detect(b'abcdefghijklmnopqrstuvwxyz')
- eq_(
- 'ascii',
- detected_encoding['encoding'].lower(),
+ assert 'ascii' == detected_encoding['encoding'].lower(), \
'Expected %s, but got %s' % (
'ascii',
detected_encoding['encoding'].lower()
)
- )
def test_detect(self):
testfiles = glob.glob('tests/testdata/*/*.txt')
@@ -46,15 +42,13 @@ class TestCChardet():
with open(testfile, 'rb') as f:
msg = f.read()
detected_encoding = cchardet.detect(msg)
- eq_(
- expected_charset.lower(),
- detected_encoding['encoding'].lower(),
+ assert expected_charset.lower() == \
+ detected_encoding['encoding'].lower(), \
'Expected %s, but got %s for "%s"' % (
expected_charset.lower(),
detected_encoding['encoding'].lower(),
testfile
)
- )
def test_detector(self):
detector = cchardet.UniversalDetector()
@@ -67,14 +61,11 @@ class TestCChardet():
line = f.readline()
detector.close()
detected_encoding = detector.result
- eq_(
- "shift_jis",
- detected_encoding['encoding'].lower(),
+ assert "shift_jis" == detected_encoding['encoding'].lower(), \
'Expected %s, but got %s' % (
"shift_jis",
detected_encoding['encoding'].lower()
)
- )
def test_github_issue_20(self):
"""
@@ -109,37 +100,28 @@ class TestCChardet():
def test_utf8_with_bom(self):
sample = b'\xEF\xBB\xBF'
detected_encoding = cchardet.detect(sample)
- eq_(
- "utf-8-sig",
- detected_encoding['encoding'].lower(),
+ assert "utf-8-sig" == detected_encoding['encoding'].lower(), \
'Expected %s, but got %s' % (
"utf-8-sig",
detected_encoding['encoding'].lower()
)
- )
def test_null_bytes(self):
sample = b'ABC\x00\x80\x81'
detected_encoding = cchardet.detect(sample)
- eq_(
- None,
- detected_encoding['encoding'],
+ assert detected_encoding['encoding'] is None, \
'Expected None, but got %s' % (
detected_encoding['encoding']
)
- )
# def test_iso8859_2_csv(self):
# testfile = 'tests/samples/iso8859-2.csv'
# with open(testfile, 'rb') as f:
# msg = f.read()
# detected_encoding = cchardet.detect(msg)
- # eq_(
- # "iso8859-2",
- # detected_encoding['encoding'].lower(),
+ # assert "iso8859-2" == detected_encoding['encoding'].lower(), \
# 'Expected %s, but got %s' % (
# "iso8859-2",
# detected_encoding['encoding'].lower()
# )
- # )

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d374eecad23c68383e549c83e90b16788bde6b0354fd5ece4020b046df5a7c7e
size 655620

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sun Feb 26 19:06:23 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Upstream became stale, switching to the fork
https://github.com/faust-streaming/cChardet
- Update to 2.1.18:
- Fix building source distribution
- Fix pep517 builds
- Time to continue off where the original project left off!
- Support Python 3.10 + 3.11
- Add linux aarch64 wheel support
- Removed upstreamed denose.patch
-------------------------------------------------------------------
Tue Feb 21 07:47:56 UTC 2023 - Matej Cepl <mcepl@suse.com>

View File

@ -17,16 +17,14 @@
%define skip_python2 1
%define modname faust-cchardet
Name: python-cchardet
Version: 2.1.7
Version: 2.1.18
Release: 0
Summary: CChardet is high speed universal character encoding detector
License: GPL-2.0-or-later OR LGPL-2.1-or-later OR MPL-1.1
URL: https://github.com/PyYoshi/cChardet
Source: https://files.pythonhosted.org/packages/source/c/cchardet/cchardet-%{version}.tar.gz
# PATCH-FIX-UPSTREAM denose.patch gh#PyYoshi/cChardet!87 mcepl@suse.com
# Remove dependency on nose
Patch0: denose.patch
URL: https://github.com/faust-streaming/cChardet
Source: https://files.pythonhosted.org/packages/source/f/%{modname}/%{modname}-%{version}.tar.gz
BuildRequires: %{python_module Cython}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pip}
@ -45,7 +43,7 @@ Requires(postun):update-alternatives
cChardet is high speed universal character encoding detector. - binding to `uchardet`_.
%prep
%autosetup -p1 -n cchardet-%{version}
%autosetup -p1 -n %{modname}-%{version}
%build
%pyproject_wheel
@ -56,8 +54,7 @@ cChardet is high speed universal character encoding detector. - binding to `ucha
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%check
cd src
%pytest_arch tests/test.py
%pytest_arch src/tests
%post
%python_install_alternative cchardetect
@ -70,6 +67,6 @@ cd src
%doc README.rst
%python_alternative %{_bindir}/cchardetect
%{python_sitearch}/cchardet
%{python_sitearch}/cchardet-%{version}*-info
%{python_sitearch}/%(echo %{modname}|tr '-' '_')-%{version}*-info
%changelog