~olbohlen/oi-userland.git

parent: 76b34bb9 | patch | commit | ignore whitespace

python/CherryPy: update to 18.9.0; obsolete package for Python 3.7

Marcel Telka

2023-12-14 6d38cf425d179e9d568deb28b7df54199a469798

python/CherryPy: update to 18.9.0; obsolete package for Python 3.7

3 files added

5 files modified

	components/python/CherryPy/CherryPy-PYVER.p5m	12 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/Makefile	13 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/history	3 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/manifests/sample-manifest.p5m	11 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/patches/01-test-deps-not-needed.patch	24 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/patches/02-setuptools_scm_git_archive.patch	14 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/pkg5	17 ●●●●● patch \| view \| raw \| blame \| history
	components/python/CherryPy/python-integrate-project.conf	17 ●●●●● patch \| view \| raw \| blame \| history

 components/python/CherryPy/CherryPy-PYVER.p5m

@@ -24,12 +24,11 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/cherryd-$(PYVER)
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/LICENSE.md
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpchecker.py
@@ -162,4 +161,3 @@
depend type=require fmri=pkg:/library/python/more-itertools-$(PYV)
depend type=require fmri=pkg:/library/python/portend-$(PYV)
depend type=require fmri=pkg:/library/python/zc-lockfile-$(PYV)
<transform file path=usr/bin/cherryd-3\.7$ -> add pkg.depend.bypass-generate .*/importlib/(64/)?metadata.* >

 components/python/CherryPy/Makefile

@@ -14,18 +14,18 @@
#   $WS_TOOLS/python-integrate-project CherryPy
#

BUILD_STYLE = setup.py
BUILD_STYLE = pyproject

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        CherryPy
HUMAN_VERSION =            18.8.0
HUMAN_VERSION =            18.9.0
COMPONENT_SUMMARY =        CherryPy - Object-Oriented HTTP framework
COMPONENT_PROJECT_URL =        https://www.cherrypy.dev
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/60/ea/6c4d16b0cd1f4f64a478bac8a37d75a585e854afb5693ce80a9711efdc4a/CherryPy-18.8.0.tar.gz
    https://files.pythonhosted.org/packages/bd/5f/e265a49883bfcfb7f2c3d3d9e96197cfe8136783e96c5ce20e201550aaa0/CherryPy-18.9.0.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b
    sha256:6b06c191ce71a86461f30572a1ab57ffc09f43143ba8e42c103c7b3347220eb1
COMPONENT_LICENSE =        BSD-3-Clause
COMPONENT_LICENSE_FILE =    LICENSE.md

@@ -33,11 +33,12 @@

# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/cheroot
PYTHON_REQUIRED_PACKAGES += library/python/importlib-metadata
PYTHON_REQUIRED_PACKAGES += library/python/jaraco-collections
PYTHON_REQUIRED_PACKAGES += library/python/more-itertools
PYTHON_REQUIRED_PACKAGES += library/python/portend
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
PYTHON_REQUIRED_PACKAGES += library/python/wheel
PYTHON_REQUIRED_PACKAGES += library/python/zc-lockfile
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/codecov
@@ -48,8 +49,6 @@
TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
TEST_REQUIRED_PACKAGES.python += library/python/pytest-forked
TEST_REQUIRED_PACKAGES.python += library/python/pytest-services
TEST_REQUIRED_PACKAGES.python += library/python/pytest-sugar
TEST_REQUIRED_PACKAGES.python += library/python/python-memcached
TEST_REQUIRED_PACKAGES.python += library/python/requests-toolbelt
TEST_REQUIRED_PACKAGES.python += library/python/routes
TEST_REQUIRED_PACKAGES.python += library/python/setuptools

 components/python/CherryPy/history

@@ -3,4 +3,5 @@
library/python-2/cherrypy@3.1.2,5.11-2016.0.1.0 library/python/cherrypy
library/python/cherrypy-27@17.3.0,5.11-2020.0.1.5
library/python/cherrypy-34@17.3.0,5.11-2020.0.1.1
library/python/cherrypy-35@17.3.0,5.11-2021.0.0.7 noincorporate
library/python/cherrypy-35@17.3.0,5.11-2021.0.0.8
library/python/cherrypy-37@18.8.0,5.11-2023.0.0.1

 components/python/CherryPy/manifests/sample-manifest.p5m

@@ -24,12 +24,11 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=usr/bin/cherryd-$(PYVER)
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/LICENSE.md
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/METADATA
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/top_level.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpchecker.py

 components/python/CherryPy/patches/01-test-deps-not-needed.patch

New file
@@ -0,0 +1,24 @@
pytest-sugar is not needed to run tests.
python-memcached is optional test dependendency and we do not have it packaged
yet.  See also https://github.com/cherrypy/cherrypy/pull/1984

--- CherryPy-18.9.0/setup.py.orig
+++ CherryPy-18.9.0/setup.py
@@ -94,7 +94,6 @@
             'pytest>=5.3.5',
             'pytest-cov',
             'pytest-forked',
-            'pytest-sugar',
             'path.py',
             'requests_toolbelt',
             'pytest-services>=2',
--- CherryPy-18.9.0/tox.ini.orig
+++ CherryPy-18.9.0/tox.ini
@@ -21,7 +21,6 @@
 extras =
     testing
     routes_dispatcher
-    memcached_session
 whitelist_externals = mkdir
 
 [python-cli-options]

 components/python/CherryPy/patches/02-setuptools_scm_git_archive.patch

New file
@@ -0,0 +1,14 @@
https://github.com/cherrypy/cherrypy/issues/2005

--- CherryPy-18.9.0/pyproject.toml.orig
+++ CherryPy-18.9.0/pyproject.toml
@@ -4,8 +4,7 @@
     "setuptools >= 45",
 
     # Plugins
-    "setuptools_scm[toml] >= 3.5",
-    "setuptools_scm_git_archive >= 1.1",
+    "setuptools_scm[toml] >= 7.0.0",
 ]
 build-backend = "setuptools.build_meta"
 

 components/python/CherryPy/pkg5

@@ -1,27 +1,16 @@
{
    "dependencies": [
        "SUNWcs",
        "library/python/cheroot-37",
        "library/python/cheroot-39",
        "library/python/importlib-metadata-37",
        "library/python/importlib-metadata-39",
        "library/python/jaraco-collections-37",
        "library/python/jaraco-collections-39",
        "library/python/more-itertools-37",
        "library/python/more-itertools-39",
        "library/python/portend-37",
        "library/python/portend-39",
        "library/python/setuptools-37",
        "library/python/setuptools-39",
        "library/python/zc-lockfile-37",
        "library/python/setuptools-scm-39",
        "library/python/wheel-39",
        "library/python/zc-lockfile-39",
        "runtime/python-37",
        "runtime/python-39",
        "shell/ksh93",
        "system/library"
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/cherrypy-37",
        "library/python/cherrypy-39",
        "library/python/cherrypy"
    ],

 components/python/CherryPy/python-integrate-project.conf

New file
@@ -0,0 +1,17 @@
#
# 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-test-deps-not-needed.patch
%patch% 02-setuptools_scm_git_archive.patch

			@@ -24,12 +24,11 @@
			license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

			file path=usr/bin/cherryd-$(PYVER)
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/PKG-INFO
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/SOURCES.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/dependency_links.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/entry_points.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/requires.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION)-py$(PYVER).egg-info/top_level.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/LICENSE.md
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/METADATA
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/WHEEL
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/entry_points.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/CherryPy-$(HUMAN_VERSION).dist-info/top_level.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__init__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/__main__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/cherrypy/_cpchecker.py
			@@ -162,4 +161,3 @@
			depend type=require fmri=pkg:/library/python/more-itertools-$(PYV)
			depend type=require fmri=pkg:/library/python/portend-$(PYV)
			depend type=require fmri=pkg:/library/python/zc-lockfile-$(PYV)
			<transform file path=usr/bin/cherryd-3\.7$ -> add pkg.depend.bypass-generate ./importlib/(64/)?metadata. >

			@@ -14,18 +14,18 @@
			# $WS_TOOLS/python-integrate-project CherryPy
			#

			BUILD_STYLE = setup.py
			BUILD_STYLE = pyproject

			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME = CherryPy
			HUMAN_VERSION = 18.8.0
			HUMAN_VERSION = 18.9.0
			COMPONENT_SUMMARY = CherryPy - Object-Oriented HTTP framework
			COMPONENT_PROJECT_URL = https://www.cherrypy.dev
			COMPONENT_ARCHIVE_URL = \
			https://files.pythonhosted.org/packages/60/ea/6c4d16b0cd1f4f64a478bac8a37d75a585e854afb5693ce80a9711efdc4a/CherryPy-18.8.0.tar.gz
			https://files.pythonhosted.org/packages/bd/5f/e265a49883bfcfb7f2c3d3d9e96197cfe8136783e96c5ce20e201550aaa0/CherryPy-18.9.0.tar.gz
			COMPONENT_ARCHIVE_HASH = \
			sha256:9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b
			sha256:6b06c191ce71a86461f30572a1ab57ffc09f43143ba8e42c103c7b3347220eb1
			COMPONENT_LICENSE = BSD-3-Clause
			COMPONENT_LICENSE_FILE = LICENSE.md

			@@ -33,11 +33,12 @@

			# Auto-generated dependencies
			PYTHON_REQUIRED_PACKAGES += library/python/cheroot
			PYTHON_REQUIRED_PACKAGES += library/python/importlib-metadata
			PYTHON_REQUIRED_PACKAGES += library/python/jaraco-collections
			PYTHON_REQUIRED_PACKAGES += library/python/more-itertools
			PYTHON_REQUIRED_PACKAGES += library/python/portend
			PYTHON_REQUIRED_PACKAGES += library/python/setuptools
			PYTHON_REQUIRED_PACKAGES += library/python/setuptools-scm
			PYTHON_REQUIRED_PACKAGES += library/python/wheel
			PYTHON_REQUIRED_PACKAGES += library/python/zc-lockfile
			PYTHON_REQUIRED_PACKAGES += runtime/python
			TEST_REQUIRED_PACKAGES.python += library/python/codecov
			@@ -48,8 +49,6 @@
			TEST_REQUIRED_PACKAGES.python += library/python/pytest-cov
			TEST_REQUIRED_PACKAGES.python += library/python/pytest-forked
			TEST_REQUIRED_PACKAGES.python += library/python/pytest-services
			TEST_REQUIRED_PACKAGES.python += library/python/pytest-sugar
			TEST_REQUIRED_PACKAGES.python += library/python/python-memcached
			TEST_REQUIRED_PACKAGES.python += library/python/requests-toolbelt
			TEST_REQUIRED_PACKAGES.python += library/python/routes
			TEST_REQUIRED_PACKAGES.python += library/python/setuptools

			@@ -3,4 +3,5 @@
			library/python-2/cherrypy@3.1.2,5.11-2016.0.1.0 library/python/cherrypy
			library/python/cherrypy-27@17.3.0,5.11-2020.0.1.5
			library/python/cherrypy-34@17.3.0,5.11-2020.0.1.1
			library/python/cherrypy-35@17.3.0,5.11-2021.0.0.7 noincorporate
			library/python/cherrypy-35@17.3.0,5.11-2021.0.0.8
			library/python/cherrypy-37@18.8.0,5.11-2023.0.0.1

New file
			@@ -0,0 +1,24 @@
			pytest-sugar is not needed to run tests.
			python-memcached is optional test dependendency and we do not have it packaged
			yet. See also https://github.com/cherrypy/cherrypy/pull/1984

			--- CherryPy-18.9.0/setup.py.orig
			+++ CherryPy-18.9.0/setup.py
			@@ -94,7 +94,6 @@
			'pytest>=5.3.5',
			'pytest-cov',
			'pytest-forked',
			- 'pytest-sugar',
			'path.py',
			'requests_toolbelt',
			'pytest-services>=2',
			--- CherryPy-18.9.0/tox.ini.orig
			+++ CherryPy-18.9.0/tox.ini
			@@ -21,7 +21,6 @@
			extras =
			testing
			routes_dispatcher
			- memcached_session
			whitelist_externals = mkdir

			[python-cli-options]

New file
			@@ -0,0 +1,14 @@
			https://github.com/cherrypy/cherrypy/issues/2005

			--- CherryPy-18.9.0/pyproject.toml.orig
			+++ CherryPy-18.9.0/pyproject.toml
			@@ -4,8 +4,7 @@
			"setuptools >= 45",

			# Plugins
			- "setuptools_scm[toml] >= 3.5",
			- "setuptools_scm_git_archive >= 1.1",
			+ "setuptools_scm[toml] >= 7.0.0",
			]
			build-backend = "setuptools.build_meta"

			@@ -1,27 +1,16 @@
			{
			"dependencies": [
			"SUNWcs",
			"library/python/cheroot-37",
			"library/python/cheroot-39",
			"library/python/importlib-metadata-37",
			"library/python/importlib-metadata-39",
			"library/python/jaraco-collections-37",
			"library/python/jaraco-collections-39",
			"library/python/more-itertools-37",
			"library/python/more-itertools-39",
			"library/python/portend-37",
			"library/python/portend-39",
			"library/python/setuptools-37",
			"library/python/setuptools-39",
			"library/python/zc-lockfile-37",
			"library/python/setuptools-scm-39",
			"library/python/wheel-39",
			"library/python/zc-lockfile-39",
			"runtime/python-37",
			"runtime/python-39",
			"shell/ksh93",
			"system/library"
			"runtime/python-39"
			],
			"fmris": [
			"library/python/cherrypy-37",
			"library/python/cherrypy-39",
			"library/python/cherrypy"
			],

New file
			@@ -0,0 +1,17 @@
			#
			# 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-test-deps-not-needed.patch
			%patch% 02-setuptools_scm_git_archive.patch