From 94c2aee55118bccd5c7d8705af55972b97493628 Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Wed, 03 Apr 2024 18:38:08 +0200 Subject: [PATCH] Obsolete python/backports.unittest_mock --- components/meta-packages/history/history | 3 +++ /dev/null | 30 ------------------------------ make-rules/setup.py.mk | 1 - 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/components/meta-packages/history/history b/components/meta-packages/history/history index d5fc151..a6300ca 100644 --- a/components/meta-packages/history/history +++ b/components/meta-packages/history/history @@ -915,6 +915,9 @@ library/python/backports-ssl-match-hostname-37@3.7.0.1,5.11-2022.0.0.4 library/python/backports-ssl-match-hostname-39@3.7.0.1,5.11-2022.0.0.4 library/python/backports-ssl-match-hostname@3.7.0.1,5.11-2022.0.0.4 +library/python/backports-unittest-mock-37@1.5.1,5.11-2023.0.0.1 +library/python/backports-unittest-mock-39@1.5.1,5.11-2023.0.0.1 +library/python/backports-unittest-mock@1.5.1,5.11-2023.0.0.1 library/python/backports.functools_lru_cache-27@1.5,5.11-2020.0.1.2 library/python/backports.functools_lru_cache@1.5,5.11-2020.0.1.2 library/python/backports.shutil_get_terminal_size-27@1.0.0,5.11-2020.0.1.2 diff --git a/components/python/backports.unittest_mock/Makefile b/components/python/backports.unittest_mock/Makefile deleted file mode 100644 index e9df580..0000000 --- a/components/python/backports.unittest_mock/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# This file was automatically generated using the following command: -# $WS_TOOLS/python-integrate-project backports.unittest_mock -# - -BUILD_STYLE = pyproject - -include ../../../make-rules/shared-macros.mk - -COMPONENT_NAME = backports.unittest_mock -HUMAN_VERSION = 1.5.1 -COMPONENT_SUMMARY = backports.unittest_mock - Make unittest.mock available on older Pythons -COMPONENT_PROJECT_URL = https://github.com/jaraco/backports.unittest_mock -COMPONENT_ARCHIVE_URL = \ - https://files.pythonhosted.org/packages/7d/c4/78da0aa8fecbb44fdbee54483b33520ed8ed558ae1b8f011136062800da2/backports.unittest_mock-1.5.1.tar.gz -COMPONENT_ARCHIVE_HASH = \ - sha256:b693b7dee5db7e13d0b31ddc84768cc672ac9a2b03aad3c83b0f28d32ef53e6f -COMPONENT_LICENSE = MIT -COMPONENT_LICENSE_FILE = LICENSE - -include $(WS_MAKE_RULES)/common.mk - -# 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/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/backports.unittest_mock/backports.unittest_mock-PYVER.p5m b/components/python/backports.unittest_mock/backports.unittest_mock-PYVER.p5m deleted file mode 100644 index ae75a33..0000000 --- a/components/python/backports.unittest_mock/backports.unittest_mock-PYVER.p5m +++ /dev/null @@ -1,37 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# This file was automatically generated using python-integrate-project -# - -set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.human-version value=$(HUMAN_VERSION) -set name=pkg.summary value="$(COMPONENT_SUMMARY)" -set name=info.classification value="$(COMPONENT_CLASSIFICATION)" -set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - -license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' - -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/LICENSE -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/METADATA -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/WHEEL -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/entry_points.txt -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/top_level.txt -file path=usr/lib/python$(PYVER)/vendor-packages/backports/unittest_mock/__init__.py - -# python modules are unusable without python runtime binary -depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \ - pkg.debug.depend.path=usr/bin - -# Automatically generated dependencies based on distribution metadata diff --git a/components/python/backports.unittest_mock/manifests/sample-manifest.p5m b/components/python/backports.unittest_mock/manifests/sample-manifest.p5m deleted file mode 100644 index 423c632..0000000 --- a/components/python/backports.unittest_mock/manifests/sample-manifest.p5m +++ /dev/null @@ -1,37 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2023 <contributor> -# - -set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) -set name=pkg.human-version value=$(HUMAN_VERSION) -set name=pkg.summary value="$(COMPONENT_SUMMARY)" -set name=info.classification value="$(COMPONENT_CLASSIFICATION)" -set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) -set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) -set name=org.opensolaris.consolidation value=$(CONSOLIDATION) - -license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' - -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/LICENSE -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/METADATA -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/WHEEL -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/entry_points.txt -file path=usr/lib/python$(PYVER)/vendor-packages/backports.unittest_mock-$(HUMAN_VERSION).dist-info/top_level.txt -file path=usr/lib/python$(PYVER)/vendor-packages/backports/unittest_mock/__init__.py - -# python modules are unusable without python runtime binary -depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \ - pkg.debug.depend.path=usr/bin - -# Automatically generated dependencies based on distribution metadata diff --git a/components/python/backports.unittest_mock/patches/01-no-ruff.patch b/components/python/backports.unittest_mock/patches/01-no-ruff.patch deleted file mode 100644 index 9e2e68b..0000000 --- a/components/python/backports.unittest_mock/patches/01-no-ruff.patch +++ /dev/null @@ -1,13 +0,0 @@ -We have no pytest-ruff support yet. -see https://github.com/tikv/jemallocator/issues/58 - ---- backports.unittest_mock-1.5.1/setup.cfg.orig -+++ backports.unittest_mock-1.5.1/setup.cfg -@@ -45,7 +45,6 @@ - pytest-mypy >= 0.9.1; \ - python_implementation != "PyPy" - pytest-enabler >= 1.3 -- pytest-ruff - docs = - sphinx >= 3.5 - jaraco.packaging >= 9 diff --git a/components/python/backports.unittest_mock/pkg5 b/components/python/backports.unittest_mock/pkg5 deleted file mode 100644 index 65352c3..0000000 --- a/components/python/backports.unittest_mock/pkg5 +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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/backports-unittest-mock-37", - "library/python/backports-unittest-mock-39", - "library/python/backports-unittest-mock" - ], - "name": "backports.unittest_mock" -} \ No newline at end of file diff --git a/components/python/backports.unittest_mock/python-integrate-project.conf b/components/python/backports.unittest_mock/python-integrate-project.conf deleted file mode 100644 index 4346eb2..0000000 --- a/components/python/backports.unittest_mock/python-integrate-project.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. -# -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. -# - -# -# Copyright 2023 Marcel Telka -# - -%patch% 01-no-ruff.patch diff --git a/components/python/backports.unittest_mock/test/results-all.master b/components/python/backports.unittest_mock/test/results-all.master deleted file mode 100644 index 2c6d0d3..0000000 --- a/components/python/backports.unittest_mock/test/results-all.master +++ /dev/null @@ -1,30 +0,0 @@ -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): 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 12 items - -::project PASSED -backports/__init__.py::BLACK PASSED -backports/__init__.py::mypy PASSED -backports/__init__.py::mypy-status PASSED -backports/unittest_mock/__init__.py::BLACK PASSED -backports/unittest_mock/__init__.py::mypy PASSED -docs/conf.py::BLACK PASSED -docs/conf.py::mypy PASSED -tests/test_unittest_mock.py::BLACK PASSED -tests/test_unittest_mock.py::mypy PASSED -tests/test_unittest_mock.py::test_installed PASSED - -===================================== mypy ===================================== - -Success: no issues found in 4 source files -======== 11 passed ======== - py$(PYV): OK - congratulations :) diff --git a/make-rules/setup.py.mk b/make-rules/setup.py.mk index 2a9194f..9bbd73d 100644 --- a/make-rules/setup.py.mk +++ b/make-rules/setup.py.mk @@ -470,7 +470,6 @@ $(eval $(call disable-pytest-plugin,timeout,pytest-timeout)) $(eval $(call disable-pytest-plugin,travis-fold,pytest-travis-fold)) $(eval $(call disable-pytest-plugin,typeguard,typeguard)) -$(eval $(call disable-pytest-plugin,unittest_mock,backports-unittest-mock)) $(eval $(call disable-pytest-plugin,xdist,pytest-xdist)) $(eval $(call disable-pytest-plugin,xdist.looponfail,pytest-xdist)) $(eval $(call disable-pytest-plugin,xprocess,pytest-xprocess)) # adds a reminder line to test output -- Gitblit v1.9.3