python/keyring: update to 25.1.0 (#16776)

Marcel Telka

2024-04-03 c630cdeedd339cc65ffb3bb655e14fd82053d592

python/keyring: update to 25.1.0 (#16776)

 components/python/keyring/Makefile

@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        keyring
HUMAN_VERSION =            25.0.0
HUMAN_VERSION =            25.1.0
COMPONENT_SUMMARY =        keyring - Store and access your passwords safely.
COMPONENT_PROJECT_URL =        https://github.com/jaraco/keyring
COMPONENT_ARCHIVE_HASH =    \
    sha256:fc024ed53c7ea090e30723e6bd82f58a39dc25d9a6797d866203ecd0ee6306cb
    sha256:7230ea690525133f6ad536a9b5def74a4bd52642abe594761028fc044d7c7893
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE


 components/python/keyring/keyring-PYVER.p5m

@@ -48,6 +48,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/properties.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/py312.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/py38.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/completion.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/credentials.py

 components/python/keyring/manifests/sample-manifest.p5m

@@ -48,6 +48,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/properties.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/py312.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/compat/py38.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/completion.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/credentials.py

 components/python/keyring/patches/01-pytest-8.1.1.patch

New file
@@ -0,0 +1,27 @@
Reverts https://github.com/jaraco/keyring/commit/6ff02e0eefcd90e271cefd326b460ecfa0e3eb9e
We do have pytest 8.1.1

--- keyring-25.1.0/pytest.ini.orig
+++ keyring-25.1.0/pytest.ini
@@ -1,9 +1,6 @@
 [pytest]
 norecursedirs=dist build .tox .eggs
-addopts=
-    --doctest-modules
-    --import-mode importlib
-consider_namespace_packages=true
+addopts=--doctest-modules
 filterwarnings=
     ## upstream
 
--- keyring-25.1.0/setup.cfg.orig
+++ keyring-25.1.0/setup.cfg
@@ -29,7 +29,7 @@
 
 [options.extras_require]
 testing = 
-    pytest >= 6, != 8.1.1
+    pytest >= 6
     pytest-checkdocs >= 2.4
     pytest-cov
     pytest-mypy

 components/python/keyring/patches/03-no-ruff.patch

@@ -1,8 +1,8 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58

--- keyring-25.0.0/setup.cfg.orig
+++ keyring-25.0.0/setup.cfg
--- keyring-25.1.0/setup.cfg.orig
+++ keyring-25.1.0/setup.cfg
@@ -34,7 +34,6 @@
     pytest-cov
     pytest-mypy

 components/python/keyring/python-integrate-project.conf

@@ -13,4 +13,5 @@
# Copyright 2023 Marcel Telka
#

%patch% 01-pytest-8.1.1.patch
%patch% 03-no-ruff.patch

 components/python/keyring/test/results-all.master

@@ -5,7 +5,7 @@
cachedir: .tox/py$(PYV)/.pytest_cache
rootdir: $(@D)
configfile: pytest.ini
collecting ... collected 157 items
collecting ... collected 158 items

.::project PASSED
.::project PASSED
@@ -35,6 +35,7 @@
keyring/compat/properties.py::keyring.compat.properties.classproperty PASSED
keyring/compat/properties.py::mypy PASSED
keyring/compat/py312.py::mypy PASSED
keyring/compat/py38.py::mypy PASSED
keyring/completion.py::mypy PASSED
keyring/core.py::keyring.core._load_keyring_class PASSED
keyring/core.py::mypy PASSED
@@ -167,13 +168,13 @@

=============================== warnings summary ===============================
tests/test_core.py::test_init_recommended
  $(PYTHON_DIR)/vendor-packages/keyrings/alt/Gnome.py:28: DeprecationWarning: GnomeKeyring.get_default_keyring_sync is deprecated
  $(PYTHON_DIR)/vendor-packages/keyrings/alt/Gnome.py:27: DeprecationWarning: GnomeKeyring.get_default_keyring_sync is deprecated
    result = GnomeKeyring.get_default_keyring_sync()[0]

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html

===================================== mypy =====================================
Success: no issues found in 42 source files
======== 74 passed, 83 skipped, 1 warning ========
Success: no issues found in 43 source files
======== 75 passed, 83 skipped, 1 warning ========
  py$(PYV): OK
  congratulations :)