commit a6f344ae118fa08fb57c526da067a1138b14e42a Author: MSVSphere Packaging Team Date: Fri Oct 25 18:50:19 2024 +0300 import python-qrcode-7.4.2-11.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d05e209 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/qrcode-7.4.2.tar.gz diff --git a/.python-qrcode.metadata b/.python-qrcode.metadata new file mode 100644 index 0000000..0d976e2 --- /dev/null +++ b/.python-qrcode.metadata @@ -0,0 +1 @@ +b05df83e15fb8a74ce9461658cd654eba2e9319e SOURCES/qrcode-7.4.2.tar.gz diff --git a/SOURCES/qrcode-optional-pypng.patch b/SOURCES/qrcode-optional-pypng.patch new file mode 100644 index 0000000..cc7882a --- /dev/null +++ b/SOURCES/qrcode-optional-pypng.patch @@ -0,0 +1,93 @@ +Backport of https://github.com/lincolnloop/python-qrcode/pull/338 + +diff --git a/qrcode/main.py b/qrcode/main.py +index 0ac91bb..53f2ab2 100644 +--- a/qrcode/main.py ++++ b/qrcode/main.py +@@ -16,7 +16,6 @@ from typing_extensions import Literal + + from qrcode import constants, exceptions, util + from qrcode.image.base import BaseImage +-from qrcode.image.pure import PyPNGImage + + ModulesType = List[List[Optional[bool]]] + # Cache modules generated just based on the QR Code version +@@ -360,7 +359,11 @@ class QRCode(Generic[GenericImage]): + from qrcode.image.pil import Image, PilImage + + # Use PIL by default if available, otherwise use PyPNG. +- image_factory = PilImage if Image else PyPNGImage ++ if Image is not None: ++ image_factory = PilImage ++ else: ++ from qrcode.image.pure import PyPNGImage ++ image_factory = PyPNGImage + + im = image_factory( + self.border, +diff --git a/qrcode/tests/test_qrcode.py b/qrcode/tests/test_qrcode.py +index 5c1ea35..24c36f8 100644 +--- a/qrcode/tests/test_qrcode.py ++++ b/qrcode/tests/test_qrcode.py +@@ -5,18 +5,21 @@ import warnings + from tempfile import mkdtemp + from unittest import mock + +-import png +- + import qrcode + import qrcode.util + from qrcode.compat.pil import Image as pil_Image + from qrcode.exceptions import DataOverflowError + from qrcode.image.base import BaseImage +-from qrcode.image.pure import PyPNGImage + from qrcode.image.styledpil import StyledPilImage + from qrcode.image.styles import colormasks, moduledrawers + from qrcode.util import MODE_8BIT_BYTE, MODE_ALPHA_NUM, MODE_NUMBER, QRData + ++try: ++ import png ++ from qrcode.image.pure import PyPNGImage ++except ImportError: ++ PyPNGImage = None ++ + UNICODE_TEXT = "\u03b1\u03b2\u03b3" + WHITE = (255, 255, 255) + BLACK = (0, 0, 0) +@@ -175,6 +178,7 @@ class QRCodeTests(unittest.TestCase): + self.assertTrue(MockFactory.new_image.called) + self.assertTrue(MockFactory.drawrect.called) + ++ @unittest.skipIf(not PyPNGImage, "Requires pypng") + def test_render_pypng(self): + qr = qrcode.QRCode() + qr.add_data(UNICODE_TEXT) +@@ -184,6 +188,7 @@ class QRCodeTests(unittest.TestCase): + print(img.width, img.box_size, img.border) + img.save(io.BytesIO()) + ++ @unittest.skipIf(not PyPNGImage, "Requires pypng") + def test_render_pypng_to_str(self): + qr = qrcode.QRCode() + qr.add_data(UNICODE_TEXT) +diff --git a/setup.cfg b/setup.cfg +index 3aff842..c17189b 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -30,7 +30,6 @@ packages = find: + install_requires = + colorama;platform_system=="Windows" + typing_extensions +- pypng + python_requires = >= 3.7 + + [options.extras_require] +@@ -45,6 +44,8 @@ test = + pytest + pil = + pillow>=9.1.0 ++png = ++ pypng + all = + zest.releaser[recommended] + tox diff --git a/SOURCES/qrcode_assert-has-calls.patch b/SOURCES/qrcode_assert-has-calls.patch new file mode 100644 index 0000000..d8efa19 --- /dev/null +++ b/SOURCES/qrcode_assert-has-calls.patch @@ -0,0 +1,9 @@ +diff -rupN --no-dereference qrcode-7.4.2/qrcode/tests/test_release.py qrcode-7.4.2-new/qrcode/tests/test_release.py +--- qrcode-7.4.2/qrcode/tests/test_release.py 2023-02-05 23:11:38.000000000 +0100 ++++ qrcode-7.4.2-new/qrcode/tests/test_release.py 2023-05-12 13:59:22.069372313 +0200 +@@ -37,4 +37,4 @@ class UpdateManpageTests(unittest.TestCa + .replace("version", "3.11") + .replace("date", datetime.datetime.now().strftime("%-d %b %Y")) + ) +- mock_file().write.has_calls([mock.call(line) for line in expected]) ++ mock_file().write.assert_has_calls([mock.call(line) for line in expected if line]) diff --git a/SOURCES/qrcode_test.patch b/SOURCES/qrcode_test.patch new file mode 100644 index 0000000..0809b2b --- /dev/null +++ b/SOURCES/qrcode_test.patch @@ -0,0 +1,16 @@ +diff -rupN --no-dereference qrcode-7.4.2/qrcode/tests/test_script.py qrcode-7.4.2-new/qrcode/tests/test_script.py +--- qrcode-7.4.2/qrcode/tests/test_script.py 2023-02-05 23:11:38.000000000 +0100 ++++ qrcode-7.4.2-new/qrcode/tests/test_script.py 2023-05-12 13:59:22.053372149 +0200 +@@ -59,9 +59,9 @@ class ScriptTest(unittest.TestCase): + def test_optimize(self, mock_print_ascii): + main("testtext --optimize 0".split()) + +- @mock.patch("sys.stdout") +- def test_factory(self, mock_stdout): +- main("testtext --factory svg".split()) ++ #@mock.patch("sys.stdout") ++ #def test_factory(self, mock_stdout): ++ # main("testtext --factory svg".split()) + + @mock.patch("sys.stderr") + def test_bad_factory(self, mock_stderr): diff --git a/SPECS/python-qrcode.spec b/SPECS/python-qrcode.spec new file mode 100644 index 0000000..78208af --- /dev/null +++ b/SPECS/python-qrcode.spec @@ -0,0 +1,247 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 11; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%global pkgname qrcode + +Name: python-%{pkgname} +Version: 7.4.2 +Release: %autorelease +Summary: Python QR Code image generator + +License: BSD-3-Clause +URL: https://github.com/lincolnloop/python-qrcode +Source0: %{pypi_source qrcode} +BuildArch: noarch + +BuildRequires: python3-devel +BuildRequires: python3-pytest + +# Comment out failing test +Patch0: qrcode_test.patch +# Fix failure with Python3.12 +Patch1: qrcode_assert-has-calls.patch +# Make pypng requirement optional +# https://github.com/lincolnloop/python-qrcode/pull/338 +Patch2: qrcode-optional-pypng.patch + +%description +This module uses the Python Imaging Library (PIL) to allow for the\ +generation of QR Codes. + + +%package -n python3-%{pkgname} +Summary: Python QR Code image generator +Obsoletes: python3-qrcode-core < 7.4.2-2 +Provides: python3-qrcode-core = %{version}-%{release} + +%description -n python3-%{pkgname} +This module uses the Python Imaging Library (PIL) to allow for the +generation of QR Codes. Python 3 version. + + +%generate_buildrequires +# RHEL does not include the extra test dependencies (coverage, pillow) +%pyproject_buildrequires %{?!rhel:-x test -x pil -x png} + + +%prep +%autosetup -n qrcode-%{version} -p1 +# Remove shebang +sed -i '1d' qrcode/console_scripts.py + + +%build +%pyproject_wheel + + +%install +%pyproject_install +%pyproject_save_files qrcode + +# +# In previous iterations of the package, the qr script had been +# renamed to qrcode. This was an unnecessary change from upstream. +# +# We cary this symlink to maintain compat with old packages. +# +ln -s qr %{buildroot}%{_bindir}/qrcode + + +%check +%pytest -v + + +%files -n python3-%{pkgname} -f %{pyproject_files} +%doc README.rst CHANGES.rst +%license LICENSE +%{_bindir}/qr +%{_bindir}/qrcode +%{_mandir}/man1/qr.1* + +%changelog +* Fri Oct 25 2024 MSVSphere Packaging Team - 7.4.2-11 +- Rebuilt for MSVSphere 10 + +## START: Generated by rpmautospec +* Mon Jun 24 2024 Troy Dawson - 7.4.2-11 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 7.4.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 7.4.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Aug 23 2023 Florence Blanc-Renaud - 7.4.2-8 +- migrated to SPDX license + +* Tue Jul 25 2023 Yaakov Selkowitz - 7.4.2-7 +- Make pypng requirement optional + +* Fri Jul 21 2023 Fedora Release Engineering - 7.4.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Python Maint - 7.4.2-5 +- Rebuilt for Python 3.12 + +* Tue May 23 2023 Yaakov Selkowitz - 7.4.2-4 +- Migrate from tox to pytest, avoid unwanted deps in RHEL builds + +* Fri May 12 2023 Sandro Mani - 7.4.2-3 +- Add patch to fix test failures with py3.12 + +* Mon May 01 2023 Sandro Mani - 7.4.2-2 +- Switch to pyproject macros + +* Mon May 01 2023 Sandro Mani - 7.4.2-1 +- Update to 7.4.2 + +* Tue Jan 04 2022 Michel Alexandre Salim - 7.3.1-3 +- Opt in to rpmautospec + +* Tue Jan 04 2022 Christian Heimes - 7.3.1-2 +- Remove python-imaging build requirements for RHEL (#1935839) +- Run unit tests during build + +* Thu Dec 09 2021 Sandro Mani - 7.3.1-1 +- Update to 7.3.1 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 6.1-9 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 6.1-6 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 6.1-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 6.1-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun May 26 2019 Fabian Affolter - 6.1-1 +- Update to latest upstream release 6.1 + +* Sat Feb 02 2019 Fedora Release Engineering - 5.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Oct 11 2018 Zbigniew Jędrzejewski-Szmek - 5.1-14 +- Python2 binary package has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Jul 14 2018 Fedora Release Engineering - 5.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 5.1-12 +- Rebuilt for Python 3.7 + +* Fri Mar 23 2018 Iryna Shcherbina - 5.1-11 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Tue Mar 20 2018 Zbigniew Jędrzejewski-Szmek - 5.1-10 +- Also rename python-qrcode-core to python2-qrcode-core + +* Fri Feb 09 2018 Fedora Release Engineering - 5.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 5.1-8 +- Python 2 binary package renamed to python2-qrcode + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 5.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 5.1-5 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 5.1-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Jul 10 2015 Miro Hrončok - 5.1-1 +- Update to 5.1 +- Introduce python3 subpackages (#1237118) +- Moved LICENSE from %%doc to %%license + +* Thu Jun 18 2015 Fedora Release Engineering - 5.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Sep 16 2014 Nathaniel McCallum - 5.0.1-2 +- Make python-qrcode-core conflicts with python-qrcode < 5.0 + +* Wed Sep 10 2014 Nathaniel McCallum - 5.0.1-1 +- Update to 5.0.1 + +* Tue Sep 09 2014 Nathaniel McCallum - 2.4.1-7 +- Create -core subpackage for minimal dependencies + +* Sat Jun 07 2014 Fedora Release Engineering - 2.4.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 2.4.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jun 6 2012 Michel Salim - 2.4.1-2 +- Clean up spec, removing unnecessary declarations +- Rename tool in %%{_bindir} to the less ambiguous qrcode + +* Sat Jun 2 2012 Michel Salim - 2.4.1-1 +- Initial package + +## END: Generated by rpmautospec