From d5f77aba7114f0848f8116baa85c485375bc1385 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Sat, 06 Apr 2024 12:09:48 +0200
Subject: [PATCH] python/Paste: update to 3.9.0
---
components/python/Paste/python-integrate-project.conf | 4 +-
/dev/null | 20 ----------
components/python/Paste/Makefile | 6 +-
components/python/Paste/pkg5 | 1
components/python/Paste/Paste-PYVER.p5m | 1
components/python/Paste/manifests/sample-manifest.p5m | 1
components/python/Paste/test/results-all.master | 50 +++++++++---------------
7 files changed, 24 insertions(+), 59 deletions(-)
diff --git a/components/python/Paste/Makefile b/components/python/Paste/Makefile
index 51e84a2..454566e 100644
--- a/components/python/Paste/Makefile
+++ b/components/python/Paste/Makefile
@@ -19,17 +19,17 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = Paste
-HUMAN_VERSION = 3.8.0
+HUMAN_VERSION = 3.9.0
COMPONENT_SUMMARY = Paste - Tools for using a Web Server Gateway Interface stack
COMPONENT_PROJECT_URL = https://pythonpaste.readthedocs.io/
COMPONENT_ARCHIVE_HASH = \
- sha256:9c6cc18f2f9b8e8e57c0a5228c957ec3beeefdeeb9ab93c85876b513e4babdaf
+ sha256:556e3c24208fcfae269684fc3b888f46783c80208516bcecc410c00c7f678fef
COMPONENT_LICENSE = MIT
+COMPONENT_LICENSE_FILE = docs/license.txt
include $(WS_MAKE_RULES)/common.mk
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/setuptools
-PYTHON_REQUIRED_PACKAGES += library/python/six
PYTHON_REQUIRED_PACKAGES += runtime/python
TEST_REQUIRED_PACKAGES.python += library/python/pytest
diff --git a/components/python/Paste/Paste-PYVER.p5m b/components/python/Paste/Paste-PYVER.p5m
index 8e422a2..fef394f 100644
--- a/components/python/Paste/Paste-PYVER.p5m
+++ b/components/python/Paste/Paste-PYVER.p5m
@@ -120,4 +120,3 @@
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/setuptools-$(PYV)
-depend type=require fmri=pkg:/library/python/six-$(PYV)
diff --git a/components/python/Paste/Paste.license b/components/python/Paste/Paste.license
deleted file mode 100644
index c810dec..0000000
--- a/components/python/Paste/Paste.license
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2006-2007 Ian Bicking and Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/components/python/Paste/manifests/sample-manifest.p5m b/components/python/Paste/manifests/sample-manifest.p5m
index 5d40f3a..e2ddd90 100644
--- a/components/python/Paste/manifests/sample-manifest.p5m
+++ b/components/python/Paste/manifests/sample-manifest.p5m
@@ -120,4 +120,3 @@
# Automatically generated dependencies based on distribution metadata
depend type=require fmri=pkg:/library/python/setuptools-$(PYV)
-depend type=require fmri=pkg:/library/python/six-$(PYV)
diff --git a/components/python/Paste/pkg5 b/components/python/Paste/pkg5
index c611f6a..41aa076 100644
--- a/components/python/Paste/pkg5
+++ b/components/python/Paste/pkg5
@@ -1,7 +1,6 @@
{
"dependencies": [
"library/python/setuptools-39",
- "library/python/six-39",
"runtime/python-39"
],
"fmris": [
diff --git a/components/python/Paste/python-integrate-project.conf b/components/python/Paste/python-integrate-project.conf
index 193eeb2..f645b7c 100644
--- a/components/python/Paste/python-integrate-project.conf
+++ b/components/python/Paste/python-integrate-project.conf
@@ -13,5 +13,5 @@
# Copyright 2023 Marcel Telka
#
-%hook-no-license%
-cat "$SOURCE_DIR/docs/license.txt" > "$DISTRIBUTION.license"
+%hook-begin%
+LICENSE_FILE='docs/license.txt'
diff --git a/components/python/Paste/test/results-all.master b/components/python/Paste/test/results-all.master
index 03850db..f81ca99 100644
--- a/components/python/Paste/test/results-all.master
+++ b/components/python/Paste/test/results-all.master
@@ -165,65 +165,53 @@
$(@D)/tests/__init__.py:6: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
import pkg_resources
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('paste')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('paste')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('flufl')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('flufl')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze.sphinx')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze.sphinx')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2331
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2331: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2317
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2317: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('repoze')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(parent)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('sphinxcontrib')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('sphinxcontrib')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zc')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zc')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: 15 warnings
- $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2846: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zope')`.
+../../../../../../../..$(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: 15 warnings
+ $(PYTHON_DIR)/vendor-packages/pkg_resources/__init__.py:2832: DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('zope')`.
Implementing implicit namespace packages (as specified in PEP 420) is preferred to `pkg_resources.declare_namespace`. See https://setuptools.pypa.io/en/latest/references/keywords.html#keyword-namespace-packages
declare_namespace(pkg)
-
-tests/test_cgitb_catcher.py::test_makes_exception
-tests/test_errordocument.py::test_ok
-tests/test_exceptions/test_error_middleware.py::test_makes_exception
-tests/test_fileapp.py::test_data
-tests/test_grantip.py::test_req
-tests/test_recursive.py::test_ForwardRequest_url
-tests/test_registry.py::test_simple
-tests/test_request.py::test_gets
-tests/test_urlparser.py::test_find_file
- $(PYTHON_DIR)/vendor-packages/_pytest/python.py:742: DeprecationWarning: setup_module is deprecated
- func(arg)
tests/test_recursive.py::test_ForwardRequestException
$(@D)/tests/test_recursive.py:104: DeprecationWarning: ForwardRequestException(path_info=...) has been deprecated; please use ForwardRequestException(url=...)
raise ForwardRequestException(path_info=self.url)
-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
-======== 150 passed, 1 skipped, 35 warnings ========
+======== 150 passed, 1 skipped, 26 warnings ========
py$(PYV): OK
congratulations :)
--
Gitblit v1.9.3