From e9540261f15160422558419929b230136299bedc Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Sun, 10 Dec 2023 23:04:35 +0100
Subject: [PATCH] python/jaraco.collections: update to 5.0.0; obsolete package for Python 3.7
---
components/python/jaraco.collections/test/results-all.master | 60 ++++++++++++++----------------
components/python/jaraco.collections/history | 1
components/python/jaraco.collections/manifests/sample-manifest.p5m | 3 +
components/python/jaraco.collections/patches/01-no-ruff.patch | 8 ++--
components/python/jaraco.collections/jaraco.collections-PYVER.p5m | 3 +
components/python/jaraco.collections/pkg5 | 6 ---
components/python/jaraco.collections/Makefile | 6 +-
7 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/components/python/jaraco.collections/Makefile b/components/python/jaraco.collections/Makefile
index 87bf222..a34c18e 100644
--- a/components/python/jaraco.collections/Makefile
+++ b/components/python/jaraco.collections/Makefile
@@ -19,13 +19,13 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = jaraco.collections
-HUMAN_VERSION = 4.3.0
+HUMAN_VERSION = 5.0.0
COMPONENT_SUMMARY = jaraco.collections - Collection objects similar to those in stdlib by jaraco
COMPONENT_PROJECT_URL = https://github.com/jaraco/jaraco.collections
COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/de/b5/8ea883dc5161d844c97f6472ed66cd8f7644ef70659977819f76425106f4/jaraco.collections-4.3.0.tar.gz
+ https://files.pythonhosted.org/packages/e6/85/9c4ab9772bcc2c9b4beffd56aca70f646e4a1f3a576579fa401d742b46a8/jaraco.collections-5.0.0.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:74ffc23fccfee4de0a2ebf556a33675b6a3c003d6335947d3122a0bc8822c8e4
+ sha256:1680e8d09f295f625c7ba926880175a26fdbe7092b4c76d198e30476b21cfe68
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
diff --git a/components/python/jaraco.collections/history b/components/python/jaraco.collections/history
new file mode 100644
index 0000000..ca31b8e
--- /dev/null
+++ b/components/python/jaraco.collections/history
@@ -0,0 +1 @@
+library/python/jaraco-collections-37@4.3.0,5.11-2023.0.0.1 noincorporate
diff --git a/components/python/jaraco.collections/jaraco.collections-PYVER.p5m b/components/python/jaraco.collections/jaraco.collections-PYVER.p5m
index 0423279..6de3b65 100644
--- a/components/python/jaraco.collections/jaraco.collections-PYVER.p5m
+++ b/components/python/jaraco.collections/jaraco.collections-PYVER.p5m
@@ -27,7 +27,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/jaraco.collections-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/jaraco.collections-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/jaraco.collections-$(HUMAN_VERSION).dist-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/jaraco/collections.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jaraco/collections/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jaraco/collections/py.typed
# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
diff --git a/components/python/jaraco.collections/manifests/sample-manifest.p5m b/components/python/jaraco.collections/manifests/sample-manifest.p5m
index f2e9dd2..c084b6e 100644
--- a/components/python/jaraco.collections/manifests/sample-manifest.p5m
+++ b/components/python/jaraco.collections/manifests/sample-manifest.p5m
@@ -27,7 +27,8 @@
file path=usr/lib/python$(PYVER)/vendor-packages/jaraco.collections-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/jaraco.collections-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/jaraco.collections-$(HUMAN_VERSION).dist-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/jaraco/collections.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jaraco/collections/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/jaraco/collections/py.typed
# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
diff --git a/components/python/jaraco.collections/patches/01-no-ruff.patch b/components/python/jaraco.collections/patches/01-no-ruff.patch
index 1747997..0c25e19 100644
--- a/components/python/jaraco.collections/patches/01-no-ruff.patch
+++ b/components/python/jaraco.collections/patches/01-no-ruff.patch
@@ -1,13 +1,13 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58
---- jaraco.collections-4.3.0/setup.cfg.orig
-+++ jaraco.collections-4.3.0/setup.cfg
+--- jaraco.collections-5.0.0/setup.cfg.orig
++++ jaraco.collections-5.0.0/setup.cfg
@@ -36,7 +36,6 @@
pytest-mypy >= 0.9.1; \
python_implementation != "PyPy"
- pytest-enabler >= 1.3
+ pytest-enabler >= 2.2
- pytest-ruff
docs =
sphinx >= 3.5
- jaraco.packaging >= 9
+ sphinx < 7.2.5
diff --git a/components/python/jaraco.collections/pkg5 b/components/python/jaraco.collections/pkg5
index f3f4b38..a5d5f31 100644
--- a/components/python/jaraco.collections/pkg5
+++ b/components/python/jaraco.collections/pkg5
@@ -1,18 +1,12 @@
{
"dependencies": [
- "library/python/jaraco-text-37",
"library/python/jaraco-text-39",
- "library/python/setuptools-37",
"library/python/setuptools-39",
- "library/python/setuptools-scm-37",
"library/python/setuptools-scm-39",
- "library/python/wheel-37",
"library/python/wheel-39",
- "runtime/python-37",
"runtime/python-39"
],
"fmris": [
- "library/python/jaraco-collections-37",
"library/python/jaraco-collections-39",
"library/python/jaraco-collections"
],
diff --git a/components/python/jaraco.collections/test/results-all.master b/components/python/jaraco.collections/test/results-all.master
index 500f8ea..2dd4983 100644
--- a/components/python/jaraco.collections/test/results-all.master
+++ b/components/python/jaraco.collections/test/results-all.master
@@ -1,50 +1,46 @@
-ROOT: tox-gh-actions won't override envlist because tox is not running in GitHub Actions
-py$(PYV): remove tox env folder .tox/py$(PYV)
+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 32 items
+collecting ... collected 31 items
::project PASSED
-docs/conf.py::BLACK PASSED
+docs/conf.py::black PASSED
docs/conf.py::mypy PASSED
docs/conf.py::mypy-status PASSED
-jaraco/collections.py::BLACK PASSED
-jaraco/collections.py::jaraco.collections.BijectiveMap PASSED
-jaraco/collections.py::jaraco.collections.DictAdapter PASSED
-jaraco/collections.py::jaraco.collections.DictFilter PASSED
-jaraco/collections.py::jaraco.collections.DictStack PASSED
-jaraco/collections.py::jaraco.collections.Enumeration PASSED
-jaraco/collections.py::jaraco.collections.Everything PASSED
-jaraco/collections.py::jaraco.collections.FoldedCaseKeyedDict PASSED
-jaraco/collections.py::jaraco.collections.FreezableDefaultDict PASSED
-jaraco/collections.py::jaraco.collections.FrozenDict PASSED
-jaraco/collections.py::jaraco.collections.Greatest PASSED
-jaraco/collections.py::jaraco.collections.IdentityOverrideMap PASSED
-jaraco/collections.py::jaraco.collections.InstrumentedDict PASSED
-jaraco/collections.py::jaraco.collections.ItemsAsAttributes PASSED
-jaraco/collections.py::jaraco.collections.Least PASSED
-jaraco/collections.py::jaraco.collections.Mask PASSED
-jaraco/collections.py::jaraco.collections.Projection PASSED
-jaraco/collections.py::jaraco.collections.RangeMap PASSED
-jaraco/collections.py::jaraco.collections.WeightedLookup PASSED
-jaraco/collections.py::jaraco.collections.dict_map PASSED
-jaraco/collections.py::jaraco.collections.invert_map PASSED
-jaraco/collections.py::jaraco.collections.pop_all PASSED
-jaraco/collections.py::jaraco.collections.sorted_items PASSED
-jaraco/collections.py::mypy PASSED
-tests/test_collections.py::BLACK PASSED
+jaraco/collections/__init__.py::black PASSED
+jaraco/collections/__init__.py::jaraco.collections.BijectiveMap PASSED
+jaraco/collections/__init__.py::jaraco.collections.DictAdapter PASSED
+jaraco/collections/__init__.py::jaraco.collections.DictStack PASSED
+jaraco/collections/__init__.py::jaraco.collections.Enumeration PASSED
+jaraco/collections/__init__.py::jaraco.collections.Everything PASSED
+jaraco/collections/__init__.py::jaraco.collections.FoldedCaseKeyedDict PASSED
+jaraco/collections/__init__.py::jaraco.collections.FreezableDefaultDict PASSED
+jaraco/collections/__init__.py::jaraco.collections.FrozenDict PASSED
+jaraco/collections/__init__.py::jaraco.collections.Greatest PASSED
+jaraco/collections/__init__.py::jaraco.collections.IdentityOverrideMap PASSED
+jaraco/collections/__init__.py::jaraco.collections.InstrumentedDict PASSED
+jaraco/collections/__init__.py::jaraco.collections.ItemsAsAttributes PASSED
+jaraco/collections/__init__.py::jaraco.collections.Least PASSED
+jaraco/collections/__init__.py::jaraco.collections.Mask PASSED
+jaraco/collections/__init__.py::jaraco.collections.Projection PASSED
+jaraco/collections/__init__.py::jaraco.collections.RangeMap PASSED
+jaraco/collections/__init__.py::jaraco.collections.WeightedLookup PASSED
+jaraco/collections/__init__.py::jaraco.collections.dict_map PASSED
+jaraco/collections/__init__.py::jaraco.collections.invert_map PASSED
+jaraco/collections/__init__.py::jaraco.collections.pop_all PASSED
+jaraco/collections/__init__.py::jaraco.collections.sorted_items PASSED
+jaraco/collections/__init__.py::mypy PASSED
+tests/test_collections.py::black PASSED
tests/test_collections.py::mypy PASSED
tests/test_collections.py::test_always_lower_keys_dict PASSED
===================================== mypy =====================================
Success: no issues found in 3 source files
-======== 31 passed ========
+======== 30 passed ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3