From 408e5d05305fc7032ab39e1c56263723cfa4fce3 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Fri, 05 Apr 2024 12:30:16 +0200
Subject: [PATCH] python/jaraco.context: update to 5.1.0; obsolete package for Python 3.7
---
components/python/jaraco.context/Makefile | 14 +-----
components/python/jaraco.context/python-integrate-project.conf | 5 +-
components/python/jaraco.context/manifests/sample-manifest.p5m | 2
components/python/jaraco.context/pkg5 | 11 +----
components/python/jaraco.context/patches/01-no-ruff.patch | 13 ++++++
components/python/jaraco.context/test/results-all.master | 31 +++++++--------
components/python/jaraco.context/history | 3 +
7 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/components/python/jaraco.context/Makefile b/components/python/jaraco.context/Makefile
index 30412ed..6a6dcd5 100644
--- a/components/python/jaraco.context/Makefile
+++ b/components/python/jaraco.context/Makefile
@@ -19,13 +19,11 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = jaraco.context
-HUMAN_VERSION = 4.3.0
-COMPONENT_SUMMARY = jaraco.context - Context managers by jaraco
+HUMAN_VERSION = 5.1.0
+COMPONENT_SUMMARY = jaraco.context - Useful decorators and context managers
COMPONENT_PROJECT_URL = https://github.com/jaraco/jaraco.context
-COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/7c/b4/fa71f82b83ebeed95fe45ce587d6cba85b7c09ef3d9f61602f92f45e90db/jaraco.context-4.3.0.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:4dad2404540b936a20acedec53355bdaea223acb88fd329fa6de9261c941566e
+ sha256:24ec1f739aec2c5766c68027ccc70d91d7b0cb931699442f5c7ed93515b955e7
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
@@ -42,19 +40,13 @@
include $(WS_MAKE_RULES)/common.mk
-# https://github.com/tholo/pytest-flake8/issues/92
-PYTEST_ADDOPTS += -p no:flake8
-
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += runtime/python
-TEST_REQUIRED_PACKAGES.python += library/python/flake8
TEST_REQUIRED_PACKAGES.python += library/python/pytest
-TEST_REQUIRED_PACKAGES.python += library/python/pytest-black
TEST_REQUIRED_PACKAGES.python += library/python/pytest-checkdocs
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
TEST_REQUIRED_PACKAGES.python += library/python/pytest-enabler
-TEST_REQUIRED_PACKAGES.python += library/python/pytest-flake8
TEST_REQUIRED_PACKAGES.python += library/python/pytest-mypy
diff --git a/components/python/jaraco.context/history b/components/python/jaraco.context/history
index 3192a67..4cb4804 100644
--- a/components/python/jaraco.context/history
+++ b/components/python/jaraco.context/history
@@ -1,3 +1,4 @@
-library/python/jaraco.context-37@4.1.1,5.11-2022.0.0.1 library/python/jaraco-context-37
+library/python/jaraco-context-37@4.3.0,5.11-2023.0.0.1
+library/python/jaraco.context-37@4.1.1,5.11-2022.0.0.2
library/python/jaraco.context-39@4.1.1,5.11-2022.0.0.1 library/python/jaraco-context-39
library/python/jaraco.context@4.1.1,5.11-2022.0.0.1 library/python/jaraco-context
diff --git a/components/python/jaraco.context/manifests/sample-manifest.p5m b/components/python/jaraco.context/manifests/sample-manifest.p5m
index a978ac0..ef5213a 100644
--- a/components/python/jaraco.context/manifests/sample-manifest.p5m
+++ b/components/python/jaraco.context/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff --git a/components/python/jaraco.context/patches/01-no-ruff.patch b/components/python/jaraco.context/patches/01-no-ruff.patch
new file mode 100644
index 0000000..dba389a
--- /dev/null
+++ b/components/python/jaraco.context/patches/01-no-ruff.patch
@@ -0,0 +1,13 @@
+We have no pytest-ruff support yet.
+see https://github.com/tikv/jemallocator/issues/58
+
+--- jaraco.context-5.1.0/setup.cfg.orig
++++ jaraco.context-5.1.0/setup.cfg
+@@ -24,7 +24,6 @@
+ pytest-cov
+ pytest-mypy
+ pytest-enabler >= 2.2
+- pytest-ruff >= 0.2.1
+ docs =
+ sphinx >= 3.5
+ jaraco.packaging >= 9.3
diff --git a/components/python/jaraco.context/pkg5 b/components/python/jaraco.context/pkg5
index 9a82c9f..c61f460 100644
--- a/components/python/jaraco.context/pkg5
+++ b/components/python/jaraco.context/pkg5
@@ -1,18 +1,13 @@
{
"dependencies": [
- "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-context-37",
- "library/python/jaraco-context-39",
- "library/python/jaraco-context"
+ "library/python/jaraco-context",
+ "library/python/jaraco-context-39"
],
"name": "jaraco.context"
-}
\ No newline at end of file
+}
diff --git a/components/python/jaraco.context/python-integrate-project.conf b/components/python/jaraco.context/python-integrate-project.conf
index 0df0fab..a90f0e5 100644
--- a/components/python/jaraco.context/python-integrate-project.conf
+++ b/components/python/jaraco.context/python-integrate-project.conf
@@ -13,6 +13,8 @@
# Copyright 2022 Marcel Telka
#
+%patch% 01-no-ruff.patch
+
%include-2%
#
# Following dependency loops were detected (where 'A --> B' means 'A needs B to
@@ -24,6 +26,3 @@
# a case the required projects are not available yet (bootstrap).
#
PYTHON_TEST_BOOTSTRAP = yes
-%include-3%
-# https://github.com/tholo/pytest-flake8/issues/92
-PYTEST_ADDOPTS += -p no:flake8
diff --git a/components/python/jaraco.context/test/results-all.master b/components/python/jaraco.context/test/results-all.master
index a0354de..37e8c77 100644
--- a/components/python/jaraco.context/test/results-all.master
+++ b/components/python/jaraco.context/test/results-all.master
@@ -1,29 +1,26 @@
-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 16 items
+collecting ... collected 15 items
-::project PASSED
-docs/conf.py::BLACK PASSED
+.::project PASSED
+.::project PASSED
docs/conf.py::mypy PASSED
docs/conf.py::mypy-status PASSED
-jaraco/context.py::BLACK PASSED
-jaraco/context.py::context.ExceptionTrap PASSED
-jaraco/context.py::context.ExceptionTrap.passes PASSED
-jaraco/context.py::context.ExceptionTrap.raises PASSED
-jaraco/context.py::context.infer_compression PASSED
-jaraco/context.py::context.null PASSED
-jaraco/context.py::context.on_interrupt PASSED
-jaraco/context.py::context.pushd PASSED
-jaraco/context.py::context.suppress PASSED
-jaraco/context.py::context.temp_dir PASSED
+jaraco/context.py::jaraco.context.ExceptionTrap PASSED
+jaraco/context.py::jaraco.context.ExceptionTrap.passes PASSED
+jaraco/context.py::jaraco.context.ExceptionTrap.raises PASSED
+jaraco/context.py::jaraco.context._compose PASSED
+jaraco/context.py::jaraco.context.infer_compression PASSED
+jaraco/context.py::jaraco.context.null PASSED
+jaraco/context.py::jaraco.context.on_interrupt PASSED
+jaraco/context.py::jaraco.context.pushd PASSED
+jaraco/context.py::jaraco.context.suppress PASSED
+jaraco/context.py::jaraco.context.temp_dir PASSED
jaraco/context.py::mypy PASSED
===================================== mypy =====================================
--
Gitblit v1.9.3