From 98c883b140b5dc1e927b09d3bc68f88d666b95b9 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Mon, 25 Sep 2023 16:14:56 +0200
Subject: [PATCH] python/importlib_resources: update to 6.1.0
---
components/python/importlib_resources/manifests/sample-manifest.p5m | 6 --
components/python/importlib_resources/Makefile | 7 ++-
components/python/importlib_resources/importlib_resources-PYVER.p5m | 6 --
components/python/importlib_resources/test/results-all.master | 85 +++++++++++++++++++++++++++++++++---------
components/python/importlib_resources/patches/01-no-ruff.patch | 8 ++--
5 files changed, 77 insertions(+), 35 deletions(-)
diff --git a/components/python/importlib_resources/Makefile b/components/python/importlib_resources/Makefile
index f8cfa15..e76109f 100644
--- a/components/python/importlib_resources/Makefile
+++ b/components/python/importlib_resources/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = importlib_resources
-HUMAN_VERSION = 6.0.1
+HUMAN_VERSION = 6.1.0
COMPONENT_SUMMARY = importlib_resources - Read resources from Python packages
COMPONENT_PROJECT_URL = https://github.com/python/importlib_resources
COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/fd/dc/0c5cfbd4df5d6e83de4e64324b370151ee88de25f3c71aea21115f4f77f8/importlib_resources-6.0.1.tar.gz
+ https://files.pythonhosted.org/packages/0a/a2/f4b8b82ea966b6c7f66b9099e19ac02dc539f4fe667188113c663e98e784/importlib_resources-6.1.0.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:4359457e42708462b9626a04657c6208ad799ceb41e5c58c57ffa0e6a098a5d4
+ sha256:9d48dcccc213325e810fd723e7fbb45ccb39f6cf5c31f00cf2b965f5f10f3cb9
COMPONENT_LICENSE = Apache-2.0
COMPONENT_LICENSE_FILE = LICENSE
@@ -43,3 +43,4 @@
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
TEST_REQUIRED_PACKAGES.python += library/python/pytest-enabler
TEST_REQUIRED_PACKAGES.python += library/python/pytest-mypy
+TEST_REQUIRED_PACKAGES.python += library/python/zipp
diff --git a/components/python/importlib_resources/importlib_resources-PYVER.p5m b/components/python/importlib_resources/importlib_resources-PYVER.p5m
index f6ba557..ec49b4a 100644
--- a/components/python/importlib_resources/importlib_resources-PYVER.p5m
+++ b/components/python/importlib_resources/importlib_resources-PYVER.p5m
@@ -63,12 +63,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/test_read.py
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/test_reader.py
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/test_resource.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/update-zips.py
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata01/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata01/ziptestdata.zip
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata02/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata02/ziptestdata.zip
+file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zip.py
# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
diff --git a/components/python/importlib_resources/manifests/sample-manifest.p5m b/components/python/importlib_resources/manifests/sample-manifest.p5m
index 0e40601..4679f86 100644
--- a/components/python/importlib_resources/manifests/sample-manifest.p5m
+++ b/components/python/importlib_resources/manifests/sample-manifest.p5m
@@ -63,12 +63,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/test_read.py
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/test_reader.py
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/test_resource.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/update-zips.py
file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata01/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata01/ziptestdata.zip
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata02/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zipdata02/ziptestdata.zip
+file path=usr/lib/python$(PYVER)/vendor-packages/importlib_resources/tests/zip.py
# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
diff --git a/components/python/importlib_resources/patches/01-no-ruff.patch b/components/python/importlib_resources/patches/01-no-ruff.patch
index 6716634..aaca00f 100644
--- a/components/python/importlib_resources/patches/01-no-ruff.patch
+++ b/components/python/importlib_resources/patches/01-no-ruff.patch
@@ -1,13 +1,13 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58
---- importlib_resources-6.0.0/setup.cfg.orig
-+++ importlib_resources-6.0.0/setup.cfg
+--- importlib_resources-6.1.0/setup.cfg.orig
++++ importlib_resources-6.1.0/setup.cfg
@@ -38,7 +38,6 @@
pytest-mypy >= 0.9.1; \
python_implementation != "PyPy"
pytest-enabler >= 2.2
- pytest-ruff
+
+ zipp >= 3.17
docs =
- sphinx >= 3.5
- jaraco.packaging >= 9.3
diff --git a/components/python/importlib_resources/test/results-all.master b/components/python/importlib_resources/test/results-all.master
index 62d167b..a324e71 100644
--- a/components/python/importlib_resources/test/results-all.master
+++ b/components/python/importlib_resources/test/results-all.master
@@ -1,14 +1,11 @@
-ROOT: tox-gh-actions won't override envlist because tox is not running in GitHub Actions
py$(PYV): remove tox env folder $(@D)/.tox/py$(PYV)
py$(PYV): commands[0]> python -m pytest
============================= test session starts ==============================
platform sunos5 -- Python $(PYTHON_VERSION).X -- $(@D)/.tox/py$(PYV)/bin/python
cachedir: .tox/py$(PYV)/.pytest_cache
-hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase('$(@D)/.hypothesis/examples')
rootdir: $(@D)
configfile: pytest.ini
-asyncio: mode=strict
-collecting ... collected 221 items
+collecting ... collected 220 items
::project PASSED
docs/conf.py::black PASSED
@@ -202,10 +199,14 @@
importlib_resources/tests/test_resource.py::ResourceDiskTests::test_is_dir PASSED
importlib_resources/tests/test_resource.py::ResourceDiskTests::test_is_file_exists PASSED
importlib_resources/tests/test_resource.py::ResourceDiskTests::test_is_file_missing PASSED
-importlib_resources/tests/test_resource.py::ResourceFromNamespaceTest01::test_is_submodule_resource PASSED
-importlib_resources/tests/test_resource.py::ResourceFromNamespaceTest01::test_read_submodule_resource_by_name PASSED
-importlib_resources/tests/test_resource.py::ResourceFromNamespaceTest01::test_submodule_contents PASSED
-importlib_resources/tests/test_resource.py::ResourceFromNamespaceTest01::test_submodule_contents_by_name PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceDiskTests::test_is_submodule_resource PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceDiskTests::test_read_submodule_resource_by_name PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceDiskTests::test_submodule_contents PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceDiskTests::test_submodule_contents_by_name PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceZipTests::test_is_submodule_resource PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceZipTests::test_read_submodule_resource_by_name PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceZipTests::test_submodule_contents PASSED
+importlib_resources/tests/test_resource.py::ResourceFromNamespaceZipTests::test_submodule_contents_by_name PASSED
importlib_resources/tests/test_resource.py::ResourceFromZipsTest01::test_as_file_directory PASSED
importlib_resources/tests/test_resource.py::ResourceFromZipsTest01::test_is_submodule_resource PASSED
importlib_resources/tests/test_resource.py::ResourceFromZipsTest01::test_read_submodule_resource_by_name PASSED
@@ -221,19 +222,67 @@
importlib_resources/tests/test_resource.py::ResourceZipTests::test_is_file_missing PASSED
importlib_resources/tests/test_resource.py::black PASSED
importlib_resources/tests/test_resource.py::mypy PASSED
-importlib_resources/tests/update-zips.py::black PASSED
-importlib_resources/tests/update-zips.py::importlib_resources.tests.update-zips.main PASSED
-importlib_resources/tests/update-zips.py::mypy PASSED
importlib_resources/tests/util.py::black PASSED
importlib_resources/tests/util.py::mypy PASSED
-importlib_resources/tests/zipdata01/__init__.py::black PASSED
-importlib_resources/tests/zipdata01/__init__.py::mypy PASSED
-importlib_resources/tests/zipdata02/__init__.py::black PASSED
-importlib_resources/tests/zipdata02/__init__.py::mypy PASSED
+importlib_resources/tests/zip.py::black PASSED
+importlib_resources/tests/zip.py::mypy PASSED
+
+=============================== warnings summary ===============================
+::project
+ $(PYTHON_DIR)/vendor-packages/setuptools_rust/build.py:21: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
+ import pkg_resources
+
+::project
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('paste')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('flufl')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+::project
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze.sphinx')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2350: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(parent)
+
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('sphinxcontrib')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zc')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+::project
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zest')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+: 15 warnings
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2871: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zope')`.
+ Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
+ declare_namespace(pkg)
+
+-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
===================================== mypy =====================================
-
-Success: no issues found in 30 source files
-======== 219 passed, 1 skipped ========
+Success: no issues found in 28 source files
+======== 218 passed, 1 skipped, 26 warnings ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3