From 828fc65063945af3ca1b9af69dc9ade1bc234328 Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Aug 07 2024 11:00:44 +0000 Subject: Update to 3.0.3 Related-to: https://review.rdoproject.org/r/q/I63ed52e6ac0de8fd146346f9822a30bcb8f316b3 --- diff --git a/.python-flask.metadata b/.python-flask.metadata index b910a22..23f6cac 100644 --- a/.python-flask.metadata +++ b/.python-flask.metadata @@ -1 +1 @@ -8193757ded6a4f0e7c9a3ce291bf3ae3a1d402c5 SOURCES/Flask-0.12.2.tar.gz +87957f0f9606f52506b15156b3fea74191d932a9 SOURCES/flask-3.0.3.tar.gz diff --git a/SPECS/python-flask.spec b/SPECS/python-flask.spec index d149dfa..ec632ea 100644 --- a/SPECS/python-flask.spec +++ b/SPECS/python-flask.spec @@ -1,32 +1,16 @@ -%if 0%{?rhel} > 7 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - %global modname flask -%global srcname Flask +%global srcname flask +%global with_doc 0 Name: python-%{modname} -Version: 0.12.2 -Release: 4%{?dist} +Version: 3.0.3 +Release: 2%{?dist} Epoch: 1 Summary: A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions License: BSD URL: http://flask.pocoo.org/ -Source0: https://github.com/pallets/flask/releases/download/%{version}/Flask-%{version}.tar.gz - -# rhbz#1623180 -# Backported just this patch because 0.12.3+ have added other changes we cannot take. -Patch0001: 0001-detect-UTF-encodings-when-loading-json.patch - -# rhbz#1585318 -# Backport 0.12.4 changes, other than the theme changes which cause no end of problems since -# they depend on their own pallets_sphinx_theme module. -Patch0002: 0002-Fix-ValueError-for-some-invalid-Range-requests.patch -Patch0003: 0003-be-smarter-about-adding-.cli-to-reloader-command.patch +Source0: %{pypi_source} BuildArch: noarch @@ -42,142 +26,199 @@ authentication technologies and more. %description %{_description} -%if %{with python2} -%package -n python2-%{modname} +%package -n python3-%{modname} Summary: %{summary} -%{?python_provide:%python_provide python2-%{modname}} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest -%if 0%{?fedora} >= 26 -BuildRequires: python2-werkzeug -Requires: python2-werkzeug -BuildRequires: python2-jinja2 -Requires: python2-jinja2 -BuildRequires: python2-click -Requires: python2-click -BuildRequires: python2-itsdangerous -Requires: python2-itsdangerous -%else -BuildRequires: python-werkzeug -Requires: python-werkzeug -BuildRequires: python-jinja2 -Requires: python-jinja2 -BuildRequires: python-click -Requires: python-click -BuildRequires: python-itsdangerous -Requires: python-itsdangerous -%endif -%description -n python2-%{modname} %{_description} - -Python 2 version. -%endif # with python2 +BuildRequires: make +BuildRequires: python3-devel +BuildRequires: pyproject-rpm-macros -%package -n python%{python3_pkgversion}-%{modname} -Summary: %{summary} -%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}} -BuildRequires: python%{python3_pkgversion}-devel -BuildRequires: python%{python3_pkgversion}-setuptools -BuildRequires: python%{python3_pkgversion}-pytest -BuildRequires: python%{python3_pkgversion}-jinja2 -BuildRequires: python%{python3_pkgversion}-werkzeug -BuildRequires: python%{python3_pkgversion}-itsdangerous -BuildRequires: python%{python3_pkgversion}-click -Requires: python%{python3_pkgversion}-jinja2 -Requires: python%{python3_pkgversion}-werkzeug -Requires: python%{python3_pkgversion}-itsdangerous -Requires: python%{python3_pkgversion}-click - -%description -n python%{python3_pkgversion}-%{modname} %{_description} +%description -n python3-%{modname} %{_description} Python 3 version. +%if 0%{?with_doc} %package doc Summary: Documentation for %{name} -Obsoletes: python%{python3_pkgversion}-%{modname}-doc < 1:0.11.1-3 -BuildRequires: python3-sphinx +BuildRequires: python3-Pallets-Sphinx-Themes +BuildRequires: python3-sphinxcontrib-log-cabinet +BuildRequires: python3-sphinx-tabs %description doc Documentation and examples for %{name}. +%endif + +%pyproject_extras_subpkg -n python3-%{modname} async +%generate_buildrequires +# -t picks test.txt by default which contains too tight pins +%pyproject_buildrequires -x async requirements/tests.in requirements/docs.in %prep -%autosetup -p1 -n %{srcname}-%{version} +%autosetup -n %{srcname}-%{version} rm -rf examples/flaskr/ rm -rf examples/minitwit/ +sed -i '/sphinx-tabs/d' requirements/docs.in +sed -i 's/"Jinja2.*"/"Jinja2"/' pyproject.toml + %build -%if %{with python2} -%py2_build -%endif # with python2 -%py3_build -PYTHONPATH=`pwd` sphinx-build-3 -b html docs/ docs/_build/html/ -rm -rf docs/_build/html/{.buildinfo,.doctrees} +%pyproject_wheel %install -%if %{with python2} -%py2_install -mv %{buildroot}%{_bindir}/%{modname}{,-%{python2_version}} -ln -s %{modname}-%{python2_version} %{buildroot}%{_bindir}/%{modname}-2 -%endif # with python2 +%pyproject_install +%pyproject_save_files %{modname} -%py3_install mv %{buildroot}%{_bindir}/%{modname}{,-%{python3_version}} ln -s %{modname}-%{python3_version} %{buildroot}%{_bindir}/%{modname}-3 - -%if %{with python2} -ln -sf %{modname}-2 %{buildroot}%{_bindir}/%{modname} -%else ln -sf %{modname}-3 %{buildroot}%{_bindir}/%{modname} -%endif # with python2 + +%if 0%{?with_doc} +pushd docs +# PYTHONPATH to prevent "'Flask' must be installed to build the documentation." +make PYTHONPATH=%{buildroot}/%{python3_sitelib} SPHINXBUILD=sphinx-build-3 html +rm -v _build/html/.buildinfo +popd +%endif %check -export LC_ALL=C.UTF-8 -%if %{with python2} -PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-%{python2_version} -v -%endif # with python2 -PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v || : - -%if %{with python2} -%files -n python2-%{modname} -%license LICENSE -%doc CHANGES README -%{_bindir}/%{modname}-2 -%{_bindir}/%{modname}-%{python2_version} -%{python2_sitelib}/%{srcname}-*.egg-info/ -%{python2_sitelib}/%{modname}/ +%pytest -Wdefault +%files -n python3-%{modname} -f %{pyproject_files} +%license LICENSE.txt +%doc CHANGES.rst README.md %{_bindir}/%{modname} -%endif # with python2 - -%files -n python%{python3_pkgversion}-%{modname} -%license LICENSE -%doc CHANGES README %{_bindir}/%{modname}-3 %{_bindir}/%{modname}-%{python3_version} -%{python3_sitelib}/%{srcname}-*.egg-info/ -%{python3_sitelib}/%{modname}/ - -%if %{without python2} -%{_bindir}/%{modname} -%endif # without python2 +%if 0%{?with_doc} %files doc -%license LICENSE +%license LICENSE.txt %doc docs/_build/html examples +%endif %changelog -* Thu Nov 07 2019 Brian C. Lane - 0.12.2-4 -- Add upstream changes from 0.12.4 - Resolves: rhbz#1585318 -- Add TestJSON to the gating test from upstream - Related: rhbz#1585318 - -* Wed Sep 05 2018 Brian C. Lane - 0.12.2-3 -- detect UTF encodings when loading json (CVE-2018-1000656) - Resolves: rhbz#1623180 - -* Wed Jun 20 2018 Charalampos Stratakis - 1:0.12.2-2 -- Conditionalize the python2 subpackage +* Wed Apr 10 2024 Frantisek Zatloukal - 3.0.3-1 +- Update to 3.0.3 (fixes RHBZ#2273889) + +* Mon Feb 05 2024 Frantisek Zatloukal - 3.0.2-1 +- Update to 3.0.2 (fixes RHBZ#2262551) + +* Fri Jan 26 2024 Fedora Release Engineering - 1:3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Frantisek Zatloukal - 3.0.1-1 +- Update to 3.0.1 (fixes RHBZ#2259051) + +* Mon Jan 22 2024 Fedora Release Engineering - 1:3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Dec 06 2023 Frantisek Zatloukal - 3.0.0-1 +- Update to 3.0.0 (fixes RHBZ#2189630) + +* Fri Jul 21 2023 Fedora Release Engineering - 1:2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jun 16 2023 Python Maint - 1:2.2.5-2 +- Rebuilt for Python 3.12 + +* Tue May 09 2023 Frantisek Zatloukal - 2.2.5-1 +- Update to 2.2.5 (fixes RHBZ#2196644) + +* Mon Feb 20 2023 Frantisek Zatloukal - 2.2.3-1 +- Update to 2.2.3 (fixes RHBZ#2170230) + +* Fri Jan 20 2023 Fedora Release Engineering - 1:2.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 09 2022 Frantisek Zatloukal - 2.2.2-1 +- Update to 2.2.2 (closes RHBZ#2116586) + +* Thu Aug 04 2022 Frantisek Zatloukal - 2.2.1-1 +- Update to 2.2.1 (closes RHBZ#2113719) + +* Fri Jul 22 2022 Fedora Release Engineering - 1:2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jul 18 2022 Frantisek Zatloukal - 2.1.3-1 +- Update to 2.1.3 + +* Tue Jun 14 2022 Python Maint - 1:2.1.2-2 +- Rebuilt for Python 3.11 + +* Wed May 11 2022 Charalampos Stratakis - 2.1.2-1 +- Update to 2.1.2 +- Fixes: rhbz#2069375 + +* Mon Feb 21 2022 Frantisek Zatloukal - 2.0.3-1 +- Update to 2.0.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 1:2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 10 2021 Frantisek Zatloukal - 2.0.2-1 +- Update to 2.0.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 1:2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 22 2021 Lumír Balhar - 2.0.1-1 +- Update to 2.0.1 +Resolves: rhbz#1950465 + +* Thu Jun 03 2021 Python Maint - 1:1.1.2-6 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 1:1.1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1:1.1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun May 24 2020 Miro Hrončok - 1:1.1.2-3 +- Rebuilt for Python 3.9 + +* Wed Apr 08 2020 Igor Raits - 1:1.1.2-2 +- Simplify packaging + +* Fri Apr 03 2020 Fedora Release Monitoring - 1:1.1.2-1 +- Update to 1.1.2 (#1820730) + +* Thu Jan 30 2020 Fedora Release Engineering - 1:1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jan 07 2020 Miro Hrončok - 1:1.1.1-1 +- Update to 1.1.1 (#1711414) + +* Wed Oct 30 2019 Miro Hrončok - 1:1.0.2-9 +- Obsolete proper version of python2-flask to fix an upgrade path issue (#1767198) + +* Wed Sep 18 2019 Miro Hrončok - 1:1.0.2-8 +- Subpackage python2-flask has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Aug 17 2019 Miro Hrončok - 1:1.0.2-7 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1:1.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Mar 08 2019 François Cami - 1:1.0.2-5 +- Remove python2-sphinx dependency since it's not used anymore. + +* Sat Feb 02 2019 Fedora Release Engineering - 1:1.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1:1.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Miro Hrončok - 1:1.0.2-2 +- Rebuilt for Python 3.7 + +* Fri Jun 01 2018 Ken Dreyer 1:1.0.2-1 +- Update to 1.0.2 (rhbz#1572414) +- Do not build Sphinx docs (pallet-sphinx-themes not available) + +* Fri Apr 27 2018 Ricky Elrod - 1:1.0-1 +- new version * Thu Feb 15 2018 itamar - 1:0.12.2-1 - new version