diff --git a/components/meta-packages/history/history b/components/meta-packages/history/history index 958a6b19df2..8b5301f83e7 100644 --- a/components/meta-packages/history/history +++ b/components/meta-packages/history/history @@ -957,6 +957,9 @@ library/python/pyro4@4.82,5.11-2023.0.0.1 library/python/pytest-black-multipy-37@1.0.1,5.11-2023.0.0.1 library/python/pytest-black-multipy-39@1.0.1,5.11-2023.0.0.1 library/python/pytest-black-multipy@1.0.1,5.11-2023.0.0.1 +library/python/pytest-freezegun-37@0.4.2,5.11-2022.1.0.2 +library/python/pytest-freezegun-39@0.4.2,5.11-2022.1.0.2 library/python/pytest-freezer-39 +library/python/pytest-freezegun@0.4.2,5.11-2022.1.0.2 library/python/pytest-freezer library/python/python-gnome-desktop-26@2.32.0,5.11-2016.0.1.6 library/python/python-gnome-desktop-27@2.32.0,5.11-2017.0.0.9 library/python/python-gnome-desktop@2.32.0,5.11-2017.0.0.9 diff --git a/components/python/pytest-freezegun/Makefile b/components/python/pytest-freezegun/Makefile deleted file mode 100644 index 40ee0e2dd17..00000000000 --- a/components/python/pytest-freezegun/Makefile +++ /dev/null @@ -1,42 +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 pytest-freezegun -# - -BUILD_STYLE = setup.py - -include ../../../make-rules/shared-macros.mk - -COMPONENT_NAME = pytest-freezegun -HUMAN_VERSION = 0.4.2 -COMPONENT_REVISION = 1 -COMPONENT_SUMMARY = pytest-freezegun - Wrap tests with fixtures in freeze_time -COMPONENT_PROJECT_URL = https://github.com/ktosiek/pytest-freezegun -COMPONENT_ARCHIVE_URL = \ - https://files.pythonhosted.org/packages/f0/e3/c39d7c3d3afef5652f19323f3483267d7e6b0d9911c3867e10d6e2d3c9ae/pytest-freezegun-0.4.2.zip -COMPONENT_ARCHIVE_HASH = \ - sha256:19c82d5633751bf3ec92caa481fb5cffaac1787bd485f0df6436fd6242176949 -COMPONENT_LICENSE = MIT -COMPONENT_LICENSE_FILE = LICENSE - -TEST_STYLE = pytest - -COMPONENT_ARCHIVE = $(COMPONENT_SRC).zip - -include $(WS_MAKE_RULES)/common.mk - -# Auto-generated dependencies -PYTHON_REQUIRED_PACKAGES += library/python/freezegun -PYTHON_REQUIRED_PACKAGES += library/python/pytest -PYTHON_REQUIRED_PACKAGES += runtime/python diff --git a/components/python/pytest-freezegun/manifests/sample-manifest.p5m b/components/python/pytest-freezegun/manifests/sample-manifest.p5m deleted file mode 100644 index 9f0b43e1c9a..00000000000 --- a/components/python/pytest-freezegun/manifests/sample-manifest.p5m +++ /dev/null @@ -1,41 +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 2022 -# - -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/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/zip-safe -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun.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 -depend type=require fmri=pkg:/library/python/freezegun-$(PYV) -depend type=require fmri=pkg:/library/python/pytest-$(PYV) diff --git a/components/python/pytest-freezegun/patches/01-fix-DeprecationWarning.patch b/components/python/pytest-freezegun/patches/01-fix-DeprecationWarning.patch deleted file mode 100644 index 9f4ef16deec..00000000000 --- a/components/python/pytest-freezegun/patches/01-fix-DeprecationWarning.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://github.com/ktosiek/pytest-freezegun/pull/38 - -diff --git a/pytest_freezegun.py b/pytest_freezegun.py -index a08133f..23fae90 100644 ---- a/pytest_freezegun.py -+++ b/pytest_freezegun.py -@@ -2,7 +2,6 @@ - - import pytest - --from distutils.version import LooseVersion - from freezegun import freeze_time - - -@@ -10,16 +9,6 @@ - FIXTURE_NAME = 'freezer' - - --def get_closest_marker(node, name): -- """ -- Get our marker, regardless of pytest version -- """ -- if LooseVersion(pytest.__version__) < LooseVersion('3.6.0'): -- return node.get_marker('freeze_time') -- else: -- return node.get_closest_marker('freeze_time') -- -- - @pytest.fixture(name=FIXTURE_NAME) - def freezer_fixture(request): - """ -@@ -30,7 +19,7 @@ def freezer_fixture(request): - ignore = [] - - # If we've got a marker, use the arguments provided there -- marker = get_closest_marker(request.node, MARKER_NAME) -+ marker = request.node.get_closest_marker('freeze_time') - if marker: - ignore = marker.kwargs.pop('ignore', []) - args = marker.args -@@ -52,7 +41,7 @@ def pytest_collection_modifyitems(items): - Inject our fixture into any tests with our marker - """ - for item in items: -- if get_closest_marker(item, MARKER_NAME): -+ if item.get_closest_marker('freeze_time'): - item.fixturenames.insert(0, FIXTURE_NAME) - - ---- pytest-freezegun-0.4.2/setup.cfg.orig -+++ pytest-freezegun-0.4.2/setup.cfg -@@ -31,7 +31,7 @@ - pytest_freezegun - install_requires = - freezegun>0.3 -- pytest>=3.0.0 -+ pytest>=3.6 - - [options.entry_points] - pytest11 = diff --git a/components/python/pytest-freezegun/pkg5 b/components/python/pytest-freezegun/pkg5 deleted file mode 100644 index a75c4e3d5c8..00000000000 --- a/components/python/pytest-freezegun/pkg5 +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": [ - "SUNWcs", - "library/python/freezegun-37", - "library/python/freezegun-39", - "library/python/pytest-37", - "library/python/pytest-39", - "runtime/python-37", - "runtime/python-39", - "shell/ksh93", - "system/library" - ], - "fmris": [ - "library/python/pytest-freezegun-37", - "library/python/pytest-freezegun-39", - "library/python/pytest-freezegun" - ], - "name": "pytest-freezegun" -} \ No newline at end of file diff --git a/components/python/pytest-freezegun/pytest-freezegun-PYVER.p5m b/components/python/pytest-freezegun/pytest-freezegun-PYVER.p5m deleted file mode 100644 index caf64157da5..00000000000 --- a/components/python/pytest-freezegun/pytest-freezegun-PYVER.p5m +++ /dev/null @@ -1,41 +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/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun-$(HUMAN_VERSION)-py$(PYVER).egg-info/zip-safe -file path=usr/lib/python$(PYVER)/vendor-packages/pytest_freezegun.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 -depend type=require fmri=pkg:/library/python/freezegun-$(PYV) -depend type=require fmri=pkg:/library/python/pytest-$(PYV) diff --git a/components/python/pytest-freezegun/python-integrate-project.conf b/components/python/pytest-freezegun/python-integrate-project.conf deleted file mode 100644 index 0ee32166f65..00000000000 --- a/components/python/pytest-freezegun/python-integrate-project.conf +++ /dev/null @@ -1,19 +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 2022 Marcel Telka -# - -%patch% 01-fix-DeprecationWarning.patch - -%include-2% -COMPONENT_ARCHIVE = $(COMPONENT_SRC).zip diff --git a/components/python/pytest-freezegun/test/results-all.master b/components/python/pytest-freezegun/test/results-all.master deleted file mode 100644 index ff07a0d340a..00000000000 --- a/components/python/pytest-freezegun/test/results-all.master +++ /dev/null @@ -1,10 +0,0 @@ -============================= test session starts ============================== -platform sunos5 -- Python $(PYTHON_VERSION).X -- $(PYTHON) -cachedir: .pytest_cache -hypothesis profile 'default' -> database=DirectoryBasedExampleDatabase('$(@D)/.hypothesis/examples') -rootdir: $(@D) -collecting ... collected 2 items - -::project PASSED - -======== 1 passed ======== diff --git a/make-rules/setup.py.mk b/make-rules/setup.py.mk index 2067081018d..20ab6e10026 100644 --- a/make-rules/setup.py.mk +++ b/make-rules/setup.py.mk @@ -430,7 +430,6 @@ $(eval $(call disable-pytest-plugin,env,pytest-env)) $(eval $(call disable-pytest-plugin,faker,faker)) $(eval $(call disable-pytest-plugin,flake8,pytest-flake8)) $(eval $(call disable-pytest-plugin,flaky,flaky)) -$(eval $(call disable-pytest-plugin,freezegun,pytest-freezegun)) $(eval $(call disable-pytest-plugin,freezer,pytest-freezer)) $(eval $(call disable-pytest-plugin,helpers_namespace,pytest-helpers-namespace)) $(eval $(call disable-pytest-plugin,hypothesispytest,hypothesis)) # adds line to test report header