From 9c4d0a9ab1dbde98b2cbf0f25199e8a369fff92f Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Sun, 24 Mar 2024 16:07:40 +0100
Subject: [PATCH] python/keyring: update to 25.0.0
---
components/python/keyring/python-integrate-project.conf | 1
/dev/null | 13 ------
components/python/keyring/Makefile | 6 ++-
components/python/keyring/keyring-PYVER.p5m | 8 ++-
components/python/keyring/manifests/sample-manifest.p5m | 8 ++-
components/python/keyring/pkg5 | 2 +
components/python/keyring/test/results-all.master | 25 +++++++-----
components/python/keyring/patches/03-no-ruff.patch | 12 +++---
8 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/components/python/keyring/Makefile b/components/python/keyring/Makefile
index b5d5060..367feac 100644
--- a/components/python/keyring/Makefile
+++ b/components/python/keyring/Makefile
@@ -19,11 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = keyring
-HUMAN_VERSION = 24.3.1
+HUMAN_VERSION = 25.0.0
COMPONENT_SUMMARY = keyring - Store and access your passwords safely.
COMPONENT_PROJECT_URL = https://github.com/jaraco/keyring
COMPONENT_ARCHIVE_HASH = \
- sha256:c3327b6ffafc0e8befbdb597cacdb4928ffe5c1212f7645f186e6d9957a898db
+ sha256:fc024ed53c7ea090e30723e6bd82f58a39dc25d9a6797d866203ecd0ee6306cb
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
@@ -32,6 +32,8 @@
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/importlib-metadata
PYTHON_REQUIRED_PACKAGES += library/python/jaraco-classes
+PYTHON_REQUIRED_PACKAGES += library/python/jaraco-context
+PYTHON_REQUIRED_PACKAGES += library/python/jaraco-functools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
PYTHON_REQUIRED_PACKAGES += library/python/wheel
diff --git a/components/python/keyring/keyring-PYVER.p5m b/components/python/keyring/keyring-PYVER.p5m
index 0ef4dde..7aa6e9d 100644
--- a/components/python/keyring/keyring-PYVER.p5m
+++ b/components/python/keyring/keyring-PYVER.p5m
@@ -31,8 +31,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/__main__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keyring/_compat.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keyring/_properties_compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backend.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backend_complete.bash
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backend_complete.zsh
@@ -47,6 +45,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backends/macOS/api.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backends/null.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/cli.py
+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/completion.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/credentials.py
@@ -54,7 +55,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/errors.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/http.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/py.typed
-file path=usr/lib/python$(PYVER)/vendor-packages/keyring/py312compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/testing/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/testing/backend.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/testing/util.py
@@ -68,3 +68,5 @@
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/importlib-metadata-$(PYV)
depend type=require fmri=pkg:/library/python/jaraco-classes-$(PYV)
+depend type=require fmri=pkg:/library/python/jaraco-context-$(PYV)
+depend type=require fmri=pkg:/library/python/jaraco-functools-$(PYV)
diff --git a/components/python/keyring/manifests/sample-manifest.p5m b/components/python/keyring/manifests/sample-manifest.p5m
index e43ff57..122f01f 100644
--- a/components/python/keyring/manifests/sample-manifest.p5m
+++ b/components/python/keyring/manifests/sample-manifest.p5m
@@ -31,8 +31,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/__main__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keyring/_compat.py
-file path=usr/lib/python$(PYVER)/vendor-packages/keyring/_properties_compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backend.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backend_complete.bash
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backend_complete.zsh
@@ -47,6 +45,9 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backends/macOS/api.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/backends/null.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/cli.py
+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/completion.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/core.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/credentials.py
@@ -54,7 +55,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/errors.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/http.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/py.typed
-file path=usr/lib/python$(PYVER)/vendor-packages/keyring/py312compat.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/testing/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/testing/backend.py
file path=usr/lib/python$(PYVER)/vendor-packages/keyring/testing/util.py
@@ -68,3 +68,5 @@
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/importlib-metadata-$(PYV)
depend type=require fmri=pkg:/library/python/jaraco-classes-$(PYV)
+depend type=require fmri=pkg:/library/python/jaraco-context-$(PYV)
+depend type=require fmri=pkg:/library/python/jaraco-functools-$(PYV)
diff --git a/components/python/keyring/patches/02-test-disable-failing.patch b/components/python/keyring/patches/02-test-disable-failing.patch
deleted file mode 100644
index 5b3246c..0000000
--- a/components/python/keyring/patches/02-test-disable-failing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- keyring-24.3.1/tests/test_packaging.py.orig
-+++ keyring-24.3.1/tests/test_packaging.py
-@@ -1,7 +1,10 @@
- from keyring import backend
- from keyring.py312compat import metadata
-
-+import pytest
-
-+
-+@pytest.mark.skip(reason="known to fail: https://github.com/jaraco/keyring/issues/581")
- def test_entry_point():
- """
- Keyring provides exactly one 'keyring' console script
diff --git a/components/python/keyring/patches/03-no-ruff.patch b/components/python/keyring/patches/03-no-ruff.patch
index 0f516c6..e61bab8 100644
--- a/components/python/keyring/patches/03-no-ruff.patch
+++ b/components/python/keyring/patches/03-no-ruff.patch
@@ -1,13 +1,13 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58
---- keyring-24.3.1/setup.cfg.orig
-+++ keyring-24.3.1/setup.cfg
-@@ -33,7 +33,6 @@
- pytest-mypy; \
- python_implementation != "PyPy"
+--- keyring-25.0.0/setup.cfg.orig
++++ keyring-25.0.0/setup.cfg
+@@ -34,7 +34,6 @@
+ pytest-cov
+ pytest-mypy
pytest-enabler >= 2.2
- pytest-ruff >= 0.2.1
docs =
sphinx >= 3.5
- sphinx < 7.2.5
+ jaraco.packaging >= 9.3
diff --git a/components/python/keyring/pkg5 b/components/python/keyring/pkg5
index a9f88a7..48885c1 100644
--- a/components/python/keyring/pkg5
+++ b/components/python/keyring/pkg5
@@ -2,6 +2,8 @@
"dependencies": [
"library/python/importlib-metadata-39",
"library/python/jaraco-classes-39",
+ "library/python/jaraco-context-39",
+ "library/python/jaraco-functools-39",
"library/python/setuptools-39",
"library/python/setuptools-scm-39",
"library/python/wheel-39",
diff --git a/components/python/keyring/python-integrate-project.conf b/components/python/keyring/python-integrate-project.conf
index 6e2ab43..51ed142 100644
--- a/components/python/keyring/python-integrate-project.conf
+++ b/components/python/keyring/python-integrate-project.conf
@@ -13,5 +13,4 @@
# Copyright 2023 Marcel Telka
#
-%patch% 02-test-disable-failing.patch
%patch% 03-no-ruff.patch
diff --git a/components/python/keyring/test/results-all.master b/components/python/keyring/test/results-all.master
index b0b8a51..fd4d9e0 100644
--- a/components/python/keyring/test/results-all.master
+++ b/components/python/keyring/test/results-all.master
@@ -5,7 +5,7 @@
cachedir: .tox/py$(PYV)/.pytest_cache
rootdir: $(@D)
configfile: pytest.ini
-collecting ... collected 158 items
+collecting ... collected 157 items
.::project PASSED
.::project PASSED
@@ -14,10 +14,6 @@
docs/conf.py::mypy PASSED
keyring/__init__.py::mypy PASSED
keyring/__main__.py::mypy PASSED
-keyring/_compat.py::mypy PASSED
-keyring/_properties_compat.py::keyring._properties_compat.NonDataProperty PASSED
-keyring/_properties_compat.py::keyring._properties_compat.classproperty PASSED
-keyring/_properties_compat.py::mypy PASSED
keyring/backend.py::keyring.backend.SchemeSelectable PASSED
keyring/backend.py::mypy PASSED
keyring/backends/SecretService.py::mypy PASSED
@@ -34,6 +30,11 @@
keyring/backends/null.py::mypy PASSED
keyring/cli.py::keyring.cli.CommandLineTool.strip_last_newline PASSED
keyring/cli.py::mypy PASSED
+keyring/compat/__init__.py::mypy PASSED
+keyring/compat/properties.py::keyring.compat.properties.NonDataProperty PASSED
+keyring/compat/properties.py::keyring.compat.properties.classproperty PASSED
+keyring/compat/properties.py::mypy PASSED
+keyring/compat/py312.py::mypy PASSED
keyring/completion.py::mypy PASSED
keyring/core.py::keyring.core._load_keyring_class PASSED
keyring/core.py::mypy PASSED
@@ -43,11 +44,9 @@
keyring/devpi_client.py::mypy PASSED
keyring/errors.py::mypy PASSED
keyring/http.py::mypy PASSED
-keyring/py312compat.py::mypy PASSED
keyring/testing/__init__.py::mypy PASSED
keyring/testing/backend.py::mypy PASSED
keyring/testing/util.py::mypy PASSED
-keyring/util/__init__.py::keyring.util.once PASSED
keyring/util/__init__.py::mypy PASSED
keyring/util/platform_.py::mypy PASSED
tests/backends/test_SecretService.py::TestSecretServiceKeyring::test_credential SKIPPED
@@ -160,15 +159,21 @@
tests/test_multiprocess.py::test_multiprocess_get PASSED
tests/test_multiprocess.py::test_multiprocess_get_after_native_get PASSED
tests/test_packaging.py::mypy PASSED
-tests/test_packaging.py::test_entry_point SKIPPED (known to fail: ht...)
+tests/test_packaging.py::test_entry_point PASSED
tests/test_packaging.py::test_missing_metadata PASSED
tests/util/test_platform.py::mypy PASSED
tests/util/test_platform.py::test_platform_Linux SKIPPED (condition:...)
tests/util/test_platform.py::test_platform_Windows SKIPPED (conditio...)
-===================================== mypy =====================================
+=============================== 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
+ 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, 84 skipped ========
+======== 74 passed, 83 skipped, 1 warning ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3