~olbohlen/oi-userland.git

parent: d770ecb4 | patch | commit | ignore whitespace

Marcel Telka

2024-03-02 a2e793d9607a18f39a2e463089ec4ad58060a204

python/twisted: update to 24.3.0

7 files modified

	components/python/twisted/Makefile	9 ●●●●● patch \| view \| raw \| blame \| history
	components/python/twisted/manifests/sample-manifest.p5m	3 ●●●●● patch \| view \| raw \| blame \| history
	components/python/twisted/patches/01-tox.patch	4 ●●●●● patch \| view \| raw \| blame \| history
	components/python/twisted/patches/02-tox-dump_all_version_info.patch	4 ●●●●● patch \| view \| raw \| blame \| history
	components/python/twisted/pkg5	6 ●●●●● patch \| view \| raw \| blame \| history
	components/python/twisted/python-integrate-project.conf	4 ●●●●● patch \| view \| raw \| blame \| history
	components/python/twisted/twisted-PYVER.p5m	1 ●●●●● patch \| view \| raw \| blame \| history

 components/python/twisted/Makefile

@@ -19,18 +19,19 @@
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME =        twisted
HUMAN_VERSION =            23.10.0
HUMAN_VERSION =            24.3.0
COMPONENT_SUMMARY =        twisted - An asynchronous networking framework written in Python
COMPONENT_PROJECT_URL =        https://twistedmatrix.com/
COMPONENT_ARCHIVE_URL =        \
    https://files.pythonhosted.org/packages/6e/d3/077ece8f12cd82419bd68bb34cf4538c4df5bb9202835e7a18358223e537/twisted-23.10.0.tar.gz
COMPONENT_ARCHIVE_HASH =    \
    sha256:987847a0790a2c597197613686e2784fd54167df3a55d0fb17c8412305d76ce5
    sha256:6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae
COMPONENT_LICENSE =        MIT
COMPONENT_LICENSE_FILE =    LICENSE

include $(WS_MAKE_RULES)/common.mk

# Testing fails with coverage-enable-subprocess installed
TEST_CONFLICTING_PACKAGES.python += library/python/coverage-enable-subprocess

# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += library/python/attrs
PYTHON_REQUIRED_PACKAGES += library/python/automat

 components/python/twisted/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)
@@ -36,7 +36,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/licenses/LICENSE
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/11715.misc
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/__init__.py

 components/python/twisted/patches/01-tox.patch

@@ -1,7 +1,7 @@
We do not need to build wheels during testing so let's remove tox-wheel.

--- twisted-23.10.0/tox.ini.orig
+++ twisted-23.10.0/tox.ini
--- twisted-24.3.0/tox.ini.orig
+++ twisted-24.3.0/tox.ini
@@ -19,8 +19,7 @@
 minversion=3.24.1
 requires=

 components/python/twisted/patches/02-tox-dump_all_version_info.patch

@@ -1,7 +1,7 @@
https://github.com/twisted/twisted/issues/11784

--- twisted-23.10.0/tox.ini.orig
+++ twisted-23.10.0/tox.ini
--- twisted-24.3.0/tox.ini.orig
+++ twisted-24.3.0/tox.ini
@@ -111,12 +111,6 @@
     lint: True
 

 components/python/twisted/pkg5

@@ -12,8 +12,8 @@
        "runtime/python-39"
    ],
    "fmris": [
        "library/python/twisted-39",
        "library/python/twisted"
        "library/python/twisted",
        "library/python/twisted-39"
    ],
    "name": "twisted"
}
}

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

@@ -15,3 +15,7 @@

%patch% 01-tox.patch
%patch% 02-tox-dump_all_version_info.patch

%include-3%
# Testing fails with coverage-enable-subprocess installed
TEST_CONFLICTING_PACKAGES.python += library/python/coverage-enable-subprocess

 components/python/twisted/twisted-PYVER.p5m

@@ -36,7 +36,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/WHEEL
file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/entry_points.txt
file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/licenses/LICENSE
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/11715.misc
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/__main__.py
file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/__init__.py

			@@ -19,18 +19,19 @@
			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME = twisted
			HUMAN_VERSION = 23.10.0
			HUMAN_VERSION = 24.3.0
			COMPONENT_SUMMARY = twisted - An asynchronous networking framework written in Python
			COMPONENT_PROJECT_URL = https://twistedmatrix.com/
			COMPONENT_ARCHIVE_URL = \
			https://files.pythonhosted.org/packages/6e/d3/077ece8f12cd82419bd68bb34cf4538c4df5bb9202835e7a18358223e537/twisted-23.10.0.tar.gz
			COMPONENT_ARCHIVE_HASH = \
			sha256:987847a0790a2c597197613686e2784fd54167df3a55d0fb17c8412305d76ce5
			sha256:6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae
			COMPONENT_LICENSE = MIT
			COMPONENT_LICENSE_FILE = LICENSE

			include $(WS_MAKE_RULES)/common.mk

			# Testing fails with coverage-enable-subprocess installed
			TEST_CONFLICTING_PACKAGES.python += library/python/coverage-enable-subprocess

			# Auto-generated dependencies
			PYTHON_REQUIRED_PACKAGES += library/python/attrs
			PYTHON_REQUIRED_PACKAGES += library/python/automat

			@@ -10,7 +10,7 @@
			#

			#
			# Copyright 2023 <contributor>
			# Copyright 2024 <contributor>
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -36,7 +36,6 @@
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/WHEEL
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/entry_points.txt
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted-$(HUMAN_VERSION).dist-info/licenses/LICENSE
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted/11715.misc
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted/__init__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted/__main__.py
			file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/__init__.py

			@@ -1,7 +1,7 @@
			We do not need to build wheels during testing so let's remove tox-wheel.

			--- twisted-23.10.0/tox.ini.orig
			+++ twisted-23.10.0/tox.ini
			--- twisted-24.3.0/tox.ini.orig
			+++ twisted-24.3.0/tox.ini
			@@ -19,8 +19,7 @@
			minversion=3.24.1
			requires=

			@@ -1,7 +1,7 @@
			https://github.com/twisted/twisted/issues/11784

			--- twisted-23.10.0/tox.ini.orig
			+++ twisted-23.10.0/tox.ini
			--- twisted-24.3.0/tox.ini.orig
			+++ twisted-24.3.0/tox.ini
			@@ -111,12 +111,6 @@
			lint: True

			@@ -12,8 +12,8 @@
			"runtime/python-39"
			],
			"fmris": [
			"library/python/twisted-39",
			"library/python/twisted"
			"library/python/twisted",
			"library/python/twisted-39"
			],
			"name": "twisted"
			}
			}

			@@ -15,3 +15,7 @@

			%patch% 01-tox.patch
			%patch% 02-tox-dump_all_version_info.patch

			%include-3%
			# Testing fails with coverage-enable-subprocess installed
			TEST_CONFLICTING_PACKAGES.python += library/python/coverage-enable-subprocess