From e88ee5cf4adf864b6c41dcf0ac0eaf31a73713ab Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Fri, 1 Nov 2024 09:41:36 +0100 Subject: [PATCH] python/twisted: update to 24.10.0 --- components/python/twisted/.gitignore | 2 +- components/python/twisted/Makefile | 8 +++++--- components/python/twisted/manifests/sample-manifest.p5m | 3 +++ components/python/twisted/patches/01-tox.patch | 8 ++++---- .../python/twisted/patches/02-tox-dump_all_version_info.patch | 4 ++-- components/python/twisted/twisted-PYVER.p5m | 3 +++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/components/python/twisted/.gitignore b/components/python/twisted/.gitignore index af15407b06..9104016ebf 100644 --- a/components/python/twisted/.gitignore +++ b/components/python/twisted/.gitignore @@ -1 +1 @@ -/twisted-24.7.0/ +/twisted-24.10.0/ diff --git a/components/python/twisted/Makefile b/components/python/twisted/Makefile index 4e1f8f1585..ea6bd2ab68 100644 --- a/components/python/twisted/Makefile +++ b/components/python/twisted/Makefile @@ -19,11 +19,11 @@ BUILD_STYLE = pyproject include ../../../make-rules/shared-macros.mk COMPONENT_NAME = twisted -HUMAN_VERSION = 24.7.0 +HUMAN_VERSION = 24.10.0 COMPONENT_SUMMARY = An asynchronous networking framework written in Python -COMPONENT_PROJECT_URL = https://twistedmatrix.com/ +COMPONENT_PROJECT_URL = https://twisted.org/ COMPONENT_ARCHIVE_HASH = \ - sha256:5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394 + sha256:02951299672595fea0f70fa2d5f7b5e3d56836157eda68859a6ad6492d36756e COMPONENT_LICENSE = MIT COMPONENT_LICENSE_FILE = LICENSE @@ -44,6 +44,8 @@ PYTHON_REQUIRED_PACKAGES += library/python/typing-extensions PYTHON_REQUIRED_PACKAGES += library/python/zope-interface PYTHON_REQUIRED_PACKAGES += runtime/python TEST_REQUIRED_PACKAGES.python += library/python/cython-test-exception-raiser +TEST_REQUIRED_PACKAGES.python += library/python/h2 +TEST_REQUIRED_PACKAGES.python += library/python/httpx TEST_REQUIRED_PACKAGES.python += library/python/hypothesis TEST_REQUIRED_PACKAGES.python += library/python/pyhamcrest TEST_REQUIRED_PACKAGES.python += library/python/virtualenv diff --git a/components/python/twisted/manifests/sample-manifest.p5m b/components/python/twisted/manifests/sample-manifest.p5m index ecba39b934..ba16531205 100644 --- a/components/python/twisted/manifests/sample-manifest.p5m +++ b/components/python/twisted/manifests/sample-manifest.p5m @@ -52,6 +52,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/test/test_team file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/test/test_threadworker.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_version.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/_client_service.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/app.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/internet.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/newsfragments/10146.misc @@ -785,6 +786,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/twisted/trial/test/weird.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/trial/unittest.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/trial/util.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_abnf.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_auth/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_auth/basic.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_auth/digest.py @@ -822,6 +824,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/_util.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/injectionhelpers.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/requesthelper.py +file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_abnf.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_agent.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_cgi.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_client.py diff --git a/components/python/twisted/patches/01-tox.patch b/components/python/twisted/patches/01-tox.patch index 89e4b82622..59b41a44b8 100644 --- a/components/python/twisted/patches/01-tox.patch +++ b/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-24.7.0/tox.ini.orig -+++ twisted-24.7.0/tox.ini +--- twisted-24.10.0/tox.ini.orig ++++ twisted-24.10.0/tox.ini @@ -19,8 +19,7 @@ minversion=3.24.1 requires= @@ -25,8 +25,8 @@ We do not need to build wheels during testing so let's remove tox-wheel. posix: python -c "print('Running on POSIX (no special dependencies)')" ; Run tests without wrapping them using coverage. -- nocov: python -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:-j8} {posargs:twisted} -+ python -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:-j8} {posargs:twisted} +- nocov: python -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:-jauto} {posargs:twisted} ++ python -m twisted.trial --temp-directory={envtmpdir}/_trial_temp --reporter={env:TRIAL_REPORTER:verbose} {env:TRIAL_ARGS:-jauto} {posargs:twisted} ; Run the tests wrapped using coverage. withcov: python {toxinidir}/admin/_copy.py {toxinidir}/admin/zz_coverage.pth {envsitepackagesdir}/zz_coverage.pth diff --git a/components/python/twisted/patches/02-tox-dump_all_version_info.patch b/components/python/twisted/patches/02-tox-dump_all_version_info.patch index e640328222..dcc1b66c84 100644 --- a/components/python/twisted/patches/02-tox-dump_all_version_info.patch +++ b/components/python/twisted/patches/02-tox-dump_all_version_info.patch @@ -1,7 +1,7 @@ https://github.com/twisted/twisted/issues/11784 ---- twisted-24.7.0/tox.ini.orig -+++ twisted-24.7.0/tox.ini +--- twisted-24.10.0/tox.ini.orig ++++ twisted-24.10.0/tox.ini @@ -111,12 +111,6 @@ lint: True diff --git a/components/python/twisted/twisted-PYVER.p5m b/components/python/twisted/twisted-PYVER.p5m index 8bbb230d72..f81ae94ada 100644 --- a/components/python/twisted/twisted-PYVER.p5m +++ b/components/python/twisted/twisted-PYVER.p5m @@ -52,6 +52,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/test/test_team file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_threads/test/test_threadworker.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/_version.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/_client_service.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/app.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/internet.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/application/newsfragments/10146.misc @@ -785,6 +786,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/twisted/trial/test/weird.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/trial/unittest.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/trial/util.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/__init__.py +file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_abnf.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_auth/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_auth/basic.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/_auth/digest.py @@ -822,6 +824,7 @@ file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/_util.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/injectionhelpers.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/requesthelper.py +file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_abnf.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_agent.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_cgi.py file path=usr/lib/python$(PYVER)/vendor-packages/twisted/web/test/test_client.py -- 2.11.4.GIT