From 1033c5ddac61c4e29898306bf19488024c5dbd85 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Aug 02 2023 16:47:45 +0000 Subject: Remove 2to3 automatic conversion Package supports python3 and the script is changing the code and behavior in some cases. Related-to: https://review.rdoproject.org/r/q/I8c423242afe9155746368459cb62b4955ec21892 --- diff --git a/.python-yaql.metadata b/.python-yaql.metadata new file mode 100644 index 0000000..70c3806 --- /dev/null +++ b/.python-yaql.metadata @@ -0,0 +1 @@ +1b90a2bc17dd8d55d5a75757b5bf116b5d83468a SOURCES/yaql-2.0.0.tar.gz diff --git a/SOURCES/0001-Replace-assertItemsEqual-with-assertCountEqual.patch b/SOURCES/0001-Replace-assertItemsEqual-with-assertCountEqual.patch new file mode 100644 index 0000000..28d0b82 --- /dev/null +++ b/SOURCES/0001-Replace-assertItemsEqual-with-assertCountEqual.patch @@ -0,0 +1,37 @@ +From b4c39c58746334912f9a89941f967e296f1e0b5b Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Tue, 16 Feb 2021 10:29:21 +0100 +Subject: [PATCH] Replace assertItemsEqual with assertCountEqual + +assertItemsEqual was removed from Python's unittest.TestCase in +Python 3.3 [1][2]. We have been able to use them since then, because +testtools required unittest2, which still included it. With testtools +removing Python 2.7 support [3][4], we will lose support for +assertItemsEqual, so we should switch to use assertCountEqual. + +[1] - https://bugs.python.org/issue17866 +[2] - https://hg.python.org/cpython/rev/d9921cb6e3cd +[3] - testing-cabal/testtools#286 +[4] - testing-cabal/testtools#277 + +Change-Id: I6ebd93aa093caad6f2d3db6e43beb8bc8d9cedb7 +--- + yaql/tests/test_strings.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/yaql/tests/test_strings.py b/yaql/tests/test_strings.py +index 3e51189..4af8812 100644 +--- a/yaql/tests/test_strings.py ++++ b/yaql/tests/test_strings.py +@@ -174,7 +174,7 @@ class TestStrings(yaql.tests.TestCase): + self.assertEqual(['a', 'b', 'c'], self.eval('abc.toCharArray()')) + + def test_characters(self): +- self.assertItemsEqual( ++ self.assertCountEqual( + ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'], + self.eval('characters(octdigits => true, digits => true)')) + +-- +2.31.1 + diff --git a/SPECS/python-yaql.spec b/SPECS/python-yaql.spec new file mode 100644 index 0000000..115b402 --- /dev/null +++ b/SPECS/python-yaql.spec @@ -0,0 +1,207 @@ +%global pypi_name yaql + + +# Disable docs building as it doesn't support recent sphinx +%global with_docs 0 + +Name: python-%{pypi_name} +Version: 2.0.0 +Release: 3%{?dist} +Summary: Yet Another Query Language + +License: ASL 2.0 +URL: https://pypi.python.org/pypi/%{pypi_name} +Source0: https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Patch0001: 0001-Replace-assertItemsEqual-with-assertCountEqual.patch + +BuildArch: noarch + +%description +YAQL library has a out of the box large set of commonly used functions. + +%package -n python3-%{pypi_name} +Summary: YAQL library has a out of the box large set of commonly used functions. +%{?python_provide:%python_provide python3-%{pypi_name}} + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-tools +BuildRequires: python3-pbr +BuildRequires: python3-sphinx +BuildRequires: python3-oslo-sphinx +BuildRequires: python3-testtools +BuildRequires: python3-ply +BuildRequires: python3-dateutil + +Requires: python3-six +Requires: python3-pbr +Requires: python3-babel +Requires: python3-ply +Requires: python3-dateutil + +%description -n python3-%{pypi_name} +YAQL library has a out of the box large set of commonly used functions. + +%if 0%{?with_docs} +# Documentation package +%package -n python-%{pypi_name}-doc +Summary: Documentation for YAQL library + +%description -n python-%{pypi_name}-doc +Documentation for YAQL library +%endif + + +%prep +%autosetup -n %{pypi_name}-%{version} -p1 +# Remove bundled egg-info +rm -rf %{pypi_name}.egg-info +# Let RPM handle the dependencies +rm -f test-requirements.txt requirements.txt + +%build +%py3_build + +%if 0%{?with_docs} +# generate html docs +sphinx-build-3 doc/source html +# remove the sphinx-build leftovers +rm -rf html/.{doctrees,buildinfo} +%endif + +%install +%py3_install +mv %{buildroot}/%{_bindir}/%{pypi_name} %{buildroot}/%{_bindir}/python3-%{pypi_name} + +pushd %{buildroot}%{_bindir} +for i in %{pypi_name}-{3,%{?python3_version}}; do + ln -sf python3-%{pypi_name} $i + ln -sf python3-%{pypi_name} %{pypi_name} +done +popd + +%check +%{python3} -W ignore::ResourceWarning setup.py test +# Delete tests +rm -fr %{buildroot}%{python3_sitelib}/yaql/tests + + +%files -n python3-%{pypi_name} +%license LICENSE +%doc doc/source/readme.rst README.rst +%{_bindir}/python3-%{pypi_name} +%{_bindir}/%{pypi_name}-3* +%{_bindir}/%{pypi_name} +%{python3_sitelib}/%{pypi_name} +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info + +%if 0%{?with_docs} +%files -n python-%{pypi_name}-doc +%doc html +%license LICENSE +%endif + +%changelog +* Wed Aug 02 2023 Alfredo Moralejo - 2.0.0-3 +- Remove 2to3 conversion. Not needed and it is changing code silently + +* Tue Oct 12 2021 Joel Capitao - 2.0.0-2 +- Replace remaining asserItemsEqual with asserCountEqual + +* Mon Jul 26 2021 Joel Capitao - 2.0.0-1 +- Update to latest release (#1981310) + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 16 2021 Joel Capitao - 1.1.3-18 +- Switch to collections.abc +- Replace asserItemsEqual with asserCountEqual +- Enable tests + +* Fri Jun 04 2021 Python Maint - 1.1.3-17 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Aug 28 2020 Alfredo Moralejo - 1.1.3-15 +- Remove references to python2 subpackage. + +* Sat Aug 01 2020 Fedora Release Engineering - 1.1.3-14 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.1.3-12 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 1.1.3-10 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.1.3-9 +- Rebuilt for Python 3.8 + +* Mon Jul 29 2019 Alfredo Moralejo - 1.1.3-8 +- Remove python2 subpackage from fedora and rhel < 8 +- Remove docs subpackage as it doesn't support recent versions of sphinx + +* Fri Jul 26 2019 Fedora Release Engineering - 1.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.1.3-5 +- Drop explicit locale setting + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.1.3-3 +- Rebuilt for Python 3.7 + +* Wed Feb 14 2018 Yatin Karel - 1.1.3-2 +- Fix python-ply Requires for rhel + +* Fri Feb 09 2018 Alfredo Moralejo - 1.1.3-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.1.0-4 +- Rebuild for Python 3.6 + +* Mon Aug 22 2016 Haïkel Guémar - 1.1.0-3 +- Fix Requires in python2-yaql + +* Fri Apr 8 2016 Haïkel Guémar - 1.1.0-2 +- Fix RHBZ#1282081 + +* Fri Apr 8 2016 Haïkel Guémar - 1.1.0-1 +- Upstream 1.1.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Nov 18 2015 Marcos Fermin Lobo 1.0.2-1.el7 +- Update to 1.0.2 + +* Thu Nov 12 2015 Kalev Lember - 0.2.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Wed Aug 26 2015 Marcos Fermin Lobo 0.2.7-1 +- First RPM for FC23