From 5fe02f910e2a2c22155d566ab13bab1eb5ff8183 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Fri, 22 Mar 2024 12:10:19 +0100
Subject: [PATCH] python/pytest-checkdocs: update to 2.11.0
---
components/python/pytest-checkdocs/manifests/sample-manifest.p5m | 4 -
components/python/pytest-checkdocs/test/results-all.master | 16 ++-----
components/python/pytest-checkdocs/pytest-checkdocs-PYVER.p5m | 2 -
components/python/pytest-checkdocs/patches/01-no-ruff.patch | 10 ++--
components/python/pytest-checkdocs/pkg5 | 7 +--
components/python/pytest-checkdocs/python-integrate-project.conf | 12 ------
components/python/pytest-checkdocs/history | 2
components/python/pytest-checkdocs/Makefile | 20 +---------
8 files changed, 17 insertions(+), 56 deletions(-)
diff --git a/components/python/pytest-checkdocs/Makefile b/components/python/pytest-checkdocs/Makefile
index 83c9242..fc5479f 100644
--- a/components/python/pytest-checkdocs/Makefile
+++ b/components/python/pytest-checkdocs/Makefile
@@ -19,40 +19,24 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = pytest-checkdocs
-HUMAN_VERSION = 2.10.1
+HUMAN_VERSION = 2.11.0
COMPONENT_SUMMARY = pytest-checkdocs - check the README when running tests
COMPONENT_PROJECT_URL = https://github.com/jaraco/pytest-checkdocs
-COMPONENT_ARCHIVE_URL = \
- https://files.pythonhosted.org/packages/85/d1/cc399ee395c1b18a3e99cc827aba364399c6d8aaa65a6b9d90508bb35053/pytest-checkdocs-2.10.1.tar.gz
COMPONENT_ARCHIVE_HASH = \
- sha256:393868583f2d0314f8c5828fd94f7d28699543f6a0a925356d7e274e2952297e
+ sha256:3270668c5d0758f6084c8dc1890d4e95321f0b1c46bda7aa18d8b6cc314e4b5c
COMPONENT_LICENSE = MIT
COMPONENT_LICENSE_FILE = LICENSE
-
-#
-# Following dependency loops were detected (where 'A --> B' means 'A needs B to
-# run tests', and 'A ==> B' means 'A needs B for build and/or run'):
-#
-# pytest-checkdocs --> pytest-checkdocs
-#
-# To break loops we need to allow this project to integrate without testing in
-# a case the required projects are not available yet (bootstrap).
-#
-PYTHON_TEST_BOOTSTRAP = yes
include $(WS_MAKE_RULES)/common.mk
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/build
PYTHON_REQUIRED_PACKAGES += library/python/docutils
-PYTHON_REQUIRED_PACKAGES += library/python/importlib-metadata
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/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-mypy
diff --git a/components/python/pytest-checkdocs/history b/components/python/pytest-checkdocs/history
index c30fdde..40f93e2 100644
--- a/components/python/pytest-checkdocs/history
+++ b/components/python/pytest-checkdocs/history
@@ -1 +1 @@
-library/python/pytest-checkdocs-37@2.9.0,5.11-2022.0.0.1 noincorporate
+library/python/pytest-checkdocs-37@2.9.0,5.11-2022.0.0.2
diff --git a/components/python/pytest-checkdocs/manifests/sample-manifest.p5m b/components/python/pytest-checkdocs/manifests/sample-manifest.p5m
index ba92f3f..d9be831 100644
--- a/components/python/pytest-checkdocs/manifests/sample-manifest.p5m
+++ b/components/python/pytest-checkdocs/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)
@@ -29,7 +29,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs/py310compat.py
# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
@@ -38,4 +37,3 @@
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/build-$(PYV)
depend type=require fmri=pkg:/library/python/docutils-$(PYV)
-depend type=require fmri=pkg:/library/python/importlib-metadata-$(PYV)
diff --git a/components/python/pytest-checkdocs/patches/01-no-ruff.patch b/components/python/pytest-checkdocs/patches/01-no-ruff.patch
index 8d094d4..87c3b06 100644
--- a/components/python/pytest-checkdocs/patches/01-no-ruff.patch
+++ b/components/python/pytest-checkdocs/patches/01-no-ruff.patch
@@ -1,13 +1,13 @@
We have no pytest-ruff support yet.
see https://github.com/tikv/jemallocator/issues/58
---- pytest-checkdocs-2.10.0/setup.cfg.orig
-+++ pytest-checkdocs-2.10.0/setup.cfg
-@@ -39,7 +39,6 @@
- pytest-mypy >= 0.9.1; \
+--- pytest-checkdocs-2.11.0/setup.cfg.orig
++++ pytest-checkdocs-2.11.0/setup.cfg
+@@ -28,7 +28,6 @@
+ pytest-mypy; \
python_implementation != "PyPy"
pytest-enabler >= 2.2
-- pytest-ruff
+- pytest-ruff >= 0.2.1
types-docutils # pytest-checkdocs#13
docs =
diff --git a/components/python/pytest-checkdocs/pkg5 b/components/python/pytest-checkdocs/pkg5
index b812c37..760b5e1 100644
--- a/components/python/pytest-checkdocs/pkg5
+++ b/components/python/pytest-checkdocs/pkg5
@@ -2,15 +2,14 @@
"dependencies": [
"library/python/build-39",
"library/python/docutils-39",
- "library/python/importlib-metadata-39",
"library/python/setuptools-39",
"library/python/setuptools-scm-39",
"library/python/wheel-39",
"runtime/python-39"
],
"fmris": [
- "library/python/pytest-checkdocs-39",
- "library/python/pytest-checkdocs"
+ "library/python/pytest-checkdocs",
+ "library/python/pytest-checkdocs-39"
],
"name": "pytest-checkdocs"
-}
\ No newline at end of file
+}
diff --git a/components/python/pytest-checkdocs/pytest-checkdocs-PYVER.p5m b/components/python/pytest-checkdocs/pytest-checkdocs-PYVER.p5m
index ebedbe1..1ce3fe5 100644
--- a/components/python/pytest-checkdocs/pytest-checkdocs-PYVER.p5m
+++ b/components/python/pytest-checkdocs/pytest-checkdocs-PYVER.p5m
@@ -29,7 +29,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pytest_checkdocs/py310compat.py
# python modules are unusable without python runtime binary
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
@@ -38,4 +37,3 @@
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/build-$(PYV)
depend type=require fmri=pkg:/library/python/docutils-$(PYV)
-depend type=require fmri=pkg:/library/python/importlib-metadata-$(PYV)
diff --git a/components/python/pytest-checkdocs/python-integrate-project.conf b/components/python/pytest-checkdocs/python-integrate-project.conf
index 9baa151..4b69b89 100644
--- a/components/python/pytest-checkdocs/python-integrate-project.conf
+++ b/components/python/pytest-checkdocs/python-integrate-project.conf
@@ -14,15 +14,3 @@
#
%patch% 01-no-ruff.patch
-
-%include-2%
-#
-# Following dependency loops were detected (where 'A --> B' means 'A needs B to
-# run tests', and 'A ==> B' means 'A needs B for build and/or run'):
-#
-# pytest-checkdocs --> pytest-checkdocs
-#
-# To break loops we need to allow this project to integrate without testing in
-# a case the required projects are not available yet (bootstrap).
-#
-PYTHON_TEST_BOOTSTRAP = yes
diff --git a/components/python/pytest-checkdocs/test/results-all.master b/components/python/pytest-checkdocs/test/results-all.master
index f9f6714..59e06b2 100644
--- a/components/python/pytest-checkdocs/test/results-all.master
+++ b/components/python/pytest-checkdocs/test/results-all.master
@@ -1,27 +1,21 @@
-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 9 items
+collecting ... collected 5 items
-::project PASSED
-docs/conf.py::black PASSED
+.::project PASSED
+.::project PASSED
docs/conf.py::mypy PASSED
docs/conf.py::mypy-status PASSED
-pytest_checkdocs/__init__.py::black PASSED
pytest_checkdocs/__init__.py::mypy PASSED
-pytest_checkdocs/py310compat.py::black PASSED
-pytest_checkdocs/py310compat.py::mypy PASSED
===================================== mypy =====================================
-Success: no issues found in 3 source files
-======== 8 passed ========
+Success: no issues found in 2 source files
+======== 5 passed ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3