From 83e48f46d5c042ae8c3906be0db28850d1f9aeb9375bbc69250f45245e61096e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 10 Dec 2020 11:03:11 +0000 Subject: [PATCH 1/2] - Last try before this results in an editwar: * remove importlib_resources and importlib-metadata provides/obsoletes * import importlib_resources is not the same as import importlib.resources, same for metadata * The backport packages from PyPI needed for older flavors are specified as such for setuptools or in pyproject.toml. If a package requires them they typically add them with a python version qualifier and the packages have their own version numbers. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=40 --- python39.changes | 14 ++++++++++++++ python39.spec | 8 -------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/python39.changes b/python39.changes index 419c110..2a265bf 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Dec 10 00:26:51 UTC 2020 - Benjamin Greiner + +- Last try before this results in an editwar: + * remove importlib_resources and importlib-metadata + provides/obsoletes + * import importlib_resources is not the same as + import importlib.resources, same for metadata + * The backport packages from PyPI needed for older flavors are + specified as such for setuptools or in pyproject.toml. If a + package requires them they typically add them with a python + version qualifier and the packages have their own version + numbers. + ------------------------------------------------------------------- Sat Dec 5 16:55:12 UTC 2020 - Matej Cepl diff --git a/python39.spec b/python39.spec index 49d3638..1c044af 100644 --- a/python39.spec +++ b/python39.spec @@ -291,10 +291,6 @@ Provides: %{python_pkg_name}-asyncio = %{version} Provides: %{python_pkg_name}-typing = %{version} # python3-xml was merged into python3, now moved into -base Provides: %{python_pkg_name}-xml = %{version} -# python-importlib-metadata was specifical project which was merged into 3.8 -Provides: %{python_pkg_name}-importlib-metadata = %{version} -# python-importlib_resources is a backport of 3.7 behaviour into older pythons -Provides: %{python_pkg_name}-importlib_resources = %{version} %if %{primary_interpreter} Provides: python3-asyncio = %{version} Provides: python3-base = %{version} @@ -303,10 +299,6 @@ Provides: python3-typing = %{version} Obsoletes: python3-typing < %{version} Provides: python3-xml = %{version} Obsoletes: python3-xml < %{version} -Provides: python3-importlib-metadata = %{version} -Obsoletes: python3-importlib-metadata < %{version} -Provides: python3-importlib_resources = %{version} -Obsoletes: python3-importlib_resources < %{version} %endif %description -n %{python_pkg_name}-base From 5b2c8e3c6b147c9710a938df0d462ed3a2c5e5208c963098a7b97adec31ebf79 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 12 Dec 2020 14:31:49 +0000 Subject: [PATCH 2/2] - Update sphinx-update-removed-function.patch patch to the latest version in python36. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=41 --- python39.changes | 6 ++++++ sphinx-update-removed-function.patch | 18 ++++++------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/python39.changes b/python39.changes index 2a265bf..aee4e15 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 12 14:29:33 UTC 2020 - Matej Cepl + +- Update sphinx-update-removed-function.patch patch to the latest + version in python36. + ------------------------------------------------------------------- Thu Dec 10 00:26:51 UTC 2020 - Benjamin Greiner diff --git a/sphinx-update-removed-function.patch b/sphinx-update-removed-function.patch index 105f6a2..17bc498 100644 --- a/sphinx-update-removed-function.patch +++ b/sphinx-update-removed-function.patch @@ -1,12 +1,6 @@ -From 960bb883769e5c64a63b014590d75654db87ffb0 Mon Sep 17 00:00:00 2001 -From: Pablo Galindo -Date: Fri, 10 May 2019 22:58:17 +0100 -Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange() - (GH-13236) - --- - Doc/tools/extensions/pyspecific.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Doc/tools/extensions/pyspecific.py | 6 ++++++ + 1 file changed, 6 insertions(+) --- a/Doc/tools/extensions/pyspecific.py +++ b/Doc/tools/extensions/pyspecific.py @@ -15,12 +9,12 @@ Subject: [PATCH] Fix sphinx deprecation warning about env.note_versionchange() node.append(para) env = self.state.document.settings.env - env.get_domain('changeset').note_changeset(node) -+ # new method -+ if hasattr(env, 'get_domain'): -+ env.get_domain('changeset').note_changeset(node) + # deprecated pre-Sphinx-2 method -+ else: ++ if hasattr(env, 'note_versionchange'): + env.note_versionchange('deprecated', version[0], node, self.lineno) ++ # new method ++ else: ++ env.get_domain('changeset').note_changeset(node) return [node] + messages