SOURCES/174.patch

@@ -0,0 +1,23 @@
+From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Tue, 12 Mar 2019 18:44:36 +0100
+Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
+
+Fixes https://github.com/chardet/chardet/issues/173
+---
+ test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test.py b/test.py
+index 9833307..ad2b753 100644
+--- a/test.py
++++ b/test.py
+@@ -59,7 +59,7 @@ def gen_test_params():
+             full_path = join(path, file_name)
+             test_case = full_path, encoding
+             if full_path in EXPECTED_FAILURES:
+-                test_case = pytest.mark.xfail(test_case)
++                test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
+             yield test_case
+ 
+ 

SPECS/python-chardet.spec

@@ -1,16 +1,31 @@
 %global pypi_name chardet
 Name:           python-%{pypi_name}
 Version:        3.0.4
-Release:        7%{?dist}
+Release:        19%{?dist}
 Summary:        Character encoding auto-detection in Python
-
-Group:          Development/Languages
 License:        LGPLv2
 URL:            https://github.com/%{pypi_name}/%{pypi_name}
-Source0:        https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        %pypi_source
+
+# pytest 4 support
+Patch1:         https://github.com/chardet/chardet/pull/174.patch
 
 BuildArch:      noarch
-BuildRequires:  python3-devel, python3-setuptools
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686
+
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-rpm-macros
+
+# Circular dependency on pytest
+%bcond_without tests
+%if %{with tests}
+BuildRequires:  python%{python3_pkgversion}-pytest
+%endif
+
 
 %global _description\
 Character encoding auto-detection in Python. As\
@@ -18,17 +33,15 @@ smart as your browser. Open source.
 
 %description %_description
 
-%package -n python3-%{pypi_name}
+%package -n python%{python3_pkgversion}-%{pypi_name}
-Summary:        Character encoding auto-detection in Python 3
+Summary:        %{summary}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
+Requires:  python%{python3_pkgversion}-setuptools
 
-%description -n python3-%{pypi_name}
+%description -n python%{python3_pkgversion}-%{pypi_name} %_description
-Character encoding auto-detection in Python. As 
-smart as your browser. Open source.
-
-Python 3 version.
 
 %prep
-%setup -q -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{pypi_name}-%{version}
 sed -ie '1d' %{pypi_name}/cli/chardetect.py
 
 %build
@@ -36,23 +49,64 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py
 
 %install
 %py3_install
+mv %{buildroot}%{_bindir}/chardetect %{buildroot}%{_bindir}/chardetect-%{python3_version}
 
-%files -n python3-%{pypi_name}
+%if %{with tests}
-%{!?_licensedir:%global license %%doc}
+%check
+%{__python3} -m pytest -v
+%endif
+
+%files -n python%{python3_pkgversion}-%{pypi_name}
 %license LICENSE
 %doc README.rst
-%{python3_sitelib}/*
+%{python3_sitelib}/%{pypi_name}/
-%{_bindir}/chardetect
+%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
+%{_bindir}/chardetect-%{python3_version}
 
 
 %changelog
-* Wed Jul 11 2018 Petr Viktorin <pviktori@redhat.com> - 3.0.4-7
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 3.0.4-19
-- Remove the Python 2 subpackage
+- Exclude unsupported i686 arch
-  https://bugzilla.redhat.com/show_bug.cgi?id=1590397
 
-* Mon Jun 25 2018 Petr Viktorin <pviktori@redhat.com> - 3.0.4-6
+* Thu Nov 28 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-18
-- Allow Python 2 for build
+- Chardet requires setuptools
-  see https://hurl.corp.redhat.com/rhel8-py2
+
+* Fri Nov 22 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-17
+- Renamed chardetect → chardetect-3.8
+
+* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-16
+- Rebuild with tests
+
+* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-15
+- Adjusted for Python 3.8 module in RHEL 8
+
+* Thu Nov 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-14
+- Subpackage python2-chardet has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-13
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-12
+- Rebuilt for Python 3.8
+
+* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-11
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Aug 17 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-8
+- Only have one /usr/bin/chardetect
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-6
+- Rebuilt for Python 3.7
 
 * Sun Feb 11 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.0.4-5
 - Update Python 2 dependency declarations to new packaging standards