diff --git a/00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch b/00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch deleted file mode 100644 index 62feb1c..0000000 --- a/00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Fri, 18 Jun 2021 15:16:04 +0200 -Subject: [PATCH] 00363: Reset DeprecationWarning filters in - test_importlib.test_entry_points_by_index - -This avoids StopIteration error when running tests. - -https://bugs.python.org/issue44451 ---- - Lib/test/test_importlib/test_metadata_api.py | 1 + - .../NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst | 3 +++ - 2 files changed, 4 insertions(+) - create mode 100644 Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst - -diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py -index 3506493463..2bfc44b18e 100644 ---- a/Lib/test/test_importlib/test_metadata_api.py -+++ b/Lib/test/test_importlib/test_metadata_api.py -@@ -139,6 +139,7 @@ def test_entry_points_by_index(self): - """ - eps = distribution('distinfo-pkg').entry_points - with warnings.catch_warnings(record=True) as caught: -+ warnings.filterwarnings("default", category=DeprecationWarning) - eps[0] - - # check warning -diff --git a/Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst b/Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst -new file mode 100644 -index 0000000000..0f635cfe18 ---- /dev/null -+++ b/Misc/NEWS.d/next/Tests/2021-06-18-15-19-35.bpo-44451.aj5pqE.rst -@@ -0,0 +1,3 @@ -+Reset ``DeprecationWarning`` filters in -+``test.test_importlib.test_metadata_api.APITests.test_entry_points_by_index`` -+to avoid ``StopIteration`` error if ``DeprecationWarnings`` are ignored. diff --git a/python3.10.spec b/python3.10.spec index 7bd28a1..8374837 100644 --- a/python3.10.spec +++ b/python3.10.spec @@ -14,7 +14,7 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well %global general_version %{pybasever}.0 -%global prerel b3 +#global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -68,8 +68,8 @@ License: Python # If the rpmwheels condition is disabled, we use the bundled wheel packages # from Python with the versions below. # This needs to be manually updated when we update Python. -%global pip_version 21.1.1 -%global setuptools_version 56.0.0 +%global pip_version 21.2.3 +%global setuptools_version 57.4.0 # Expensive optimizations (mainly, profile-guided optimizations) %bcond_without optimizations @@ -292,14 +292,6 @@ Patch251: 00251-change-user-install-location.patch # Ideally, we should talk to upstream and explain why we don't want this Patch328: 00328-pyc-timestamp-invalidation-mode.patch -# 00363 # bcb4a805ad54d3a810fb54582e67c5f5fe6d9773 -# Reset DeprecationWarning filters in test_importlib.test_entry_points_by_index -# -# This avoids StopIteration error when running tests. -# -# https://bugs.python.org/issue44451 -Patch363: 00363-reset-deprecationwarning-filters-in-test_importlib-test_entry_points_by_index.patch - # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -461,6 +453,7 @@ Requires: %{pkgname}-libs%{?_isa} = %{version}-%{release} # But we want them when packages BuildRequire python3-devel Requires: (python-rpm-macros if rpm-build) Requires: (python3-rpm-macros if rpm-build) +Requires: (pyproject-rpm-macros if rpm-build) # Python developers are very likely to need pip Recommends: %{pkgname}-pip @@ -512,6 +505,10 @@ configuration, browsers, and other dialogs. Summary: A GUI toolkit for Python Requires: %{pkgname} = %{version}-%{release} +# The importable module "turtle" is here, so provide python3-turtle. +# (We don't provide python3-turtledemo, that's not too useful when imported.) +%py_provides %{pkgname}-turtle + %description -n %{pkgname}-tkinter The Tkinter (Tk interface) library is a graphical user interface toolkit for the Python programming language. @@ -1061,10 +1058,8 @@ CheckPython() { # test_distutils # distutils.tests.test_bdist_rpm tests fail when bootstraping the Python # package: rpmbuild requires /usr/bin/pythonX.Y to be installed - # test_frozentable fails with Python 3.10.0a6 (https://bugs.python.org/issue43372) LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ -wW --slowest -j0 --timeout=1800 \ - -i test_frozentable \ %if %{with bootstrap} -x test_distutils \ %endif @@ -1586,6 +1581,25 @@ CheckPython optimized # ====================================================== %changelog +* Mon Oct 04 2021 Miro Hrončok - 3.10.0-1 +- Update to 3.10.0 final + +* Wed Sep 08 2021 Tomas Hrnciar - 3.10.0~rc2-1 +- Update to 3.10.0rc2 + +* Tue Aug 03 2021 Tomas Hrnciar - 3.10.0~rc1-1 +- Update to 3.10.0rc1 + +* Fri Jul 23 2021 Fedora Release Engineering - 3.10.0~b4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 16 2021 Petr Viktorin - 3.10.0~b4-2 +- Provide python3-turtle from python3-tkinter +- Require pyproject-rpm-macros from python3-devel + +* Sun Jul 11 2021 Miro Hrončok - 3.10.0~b4-1 +- Update to 3.10.0b4 + * Thu Jun 17 2021 Miro Hrončok - 3.10.0~b3-1 - Update to 3.10.0b3 diff --git a/sources b/sources index ef907d3..29a970b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.10.0b3.tar.xz) = ef0dc5eddb5f9702ab88faa2827455347caa81ab6c03192d6e37c968a40c53ab485d5c923905c511d19bc35e10129aa302f6733e0a7d296da8f725367dd1b258 -SHA512 (Python-3.10.0b3.tar.xz.asc) = 6b8d2caf753f0d92019e18d1441e323a44aff06ee8bdc272572a67359dc4bece833db56b9318c91962d39ee4d09bf701b548d71ae02c4b64f3c21f1c23ed1d36 +SHA512 (Python-3.10.0.tar.xz) = 82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd +SHA512 (Python-3.10.0.tar.xz.asc) = 67236e02bc49da1423717cb54216b745f613ba2fc4b372a4aa15a36ab15fe69d9b9087070382957d480df7576d13056caedcd979fb56531799a1190b822f673d