Re: [PR PATCH] [Updated] python3-Twisted: update to 21.7.0.

[TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1838 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages Twisted
https://github.com/void-linux/void-packages/pull/34098

python3-Twisted: update to 21.7.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

I had to split `python-Twisted` and `python3-Twisted` into separate templates since the last verson of Twisted to support python2 is 20.3.0 (the current version in void-packages).

I tested this with `synapse` (and by dependency `python3-treq` as well) and have no issues. It looks like there are several others that should be checked...

`$ xbps-query -RX python3-Twisted`

- [x] alot-0.9.1_5
- [x] deluge-2.0.3_14
- [x] python3-TxSNI-0.2.0_2
- [x] python3-autobahn-21.3.1_2
- [x] python3-treq-20.3.0_4
- [x] python3-txtorcon-21.1.0_2
- [x] synapse-1.46.0_1
- [x] syncplay-1.6.9_2

A patch file from https://github.com/void-linux/void-packages/pull/34098.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Twisted-34098.patch --]
[-- Type: text/x-diff, Size: 8670 bytes --]

From 7e72619de54abb9563df33b796e474dbd86c5a9d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Nov 2021 14:37:03 -0500
Subject: [PATCH 1/3] python-incremental: update to 21.3.0.

---
 srcpkgs/python-incremental/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python-incremental/template b/srcpkgs/python-incremental/template
index 693613085c17..900b83f5f774 100644
--- a/srcpkgs/python-incremental/template
+++ b/srcpkgs/python-incremental/template
@@ -1,18 +1,18 @@
 # Template file for 'python-incremental'
 pkgname=python-incremental
-version=17.5.0
-revision=6
+version=21.3.0
+revision=1
 wrksrc="incremental-${version}"
 build_style=python-module
-pycompile_module="incremental"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 short_desc="Small library that versions your Python projects (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
-homepage="https://github.com/twisted/incremental"
 license="MIT"
+homepage="https://github.com/twisted/incremental"
+changelog="https://raw.githubusercontent.com/twisted/incremental/trunk/NEWS.rst"
 distfiles="${PYPI_SITE}/i/incremental/incremental-${version}.tar.gz"
-checksum=7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3
+checksum=02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57
 
 post_install() {
 	vlicense LICENSE
@@ -20,7 +20,6 @@ post_install() {
 
 python3-incremental_package() {
 	depends="python3"
-	pycompile_module="incremental"
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*

From ef54b9bf4a2d5c4d8680dbdeb0a22c6a73628e49 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Nov 2021 11:15:03 -0500
Subject: [PATCH 2/3] python-Twisted: remove python3 subpackage

---
 .../python-Twisted/python3-Twisted.INSTALL    |  5 ---
 srcpkgs/python-Twisted/python3-Twisted.REMOVE |  5 ---
 srcpkgs/python-Twisted/template               | 37 +++++--------------
 srcpkgs/python3-Twisted                       |  1 -
 4 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/python-Twisted/python3-Twisted.INSTALL
 delete mode 100644 srcpkgs/python-Twisted/python3-Twisted.REMOVE
 delete mode 120000 srcpkgs/python3-Twisted

diff --git a/srcpkgs/python-Twisted/python3-Twisted.INSTALL b/srcpkgs/python-Twisted/python3-Twisted.INSTALL
deleted file mode 100644
index 632dfe8fa02c..000000000000
--- a/srcpkgs/python-Twisted/python3-Twisted.INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${ACTION} in
-post)
-	python3 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1
-	;;
-esac
diff --git a/srcpkgs/python-Twisted/python3-Twisted.REMOVE b/srcpkgs/python-Twisted/python3-Twisted.REMOVE
deleted file mode 100644
index ec8608bc5f8e..000000000000
--- a/srcpkgs/python-Twisted/python3-Twisted.REMOVE
+++ /dev/null
@@ -1,5 +0,0 @@
-case ${ACTION} in
-purge)
-	find usr/lib/python3.*/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-	;;
-esac
diff --git a/srcpkgs/python-Twisted/template b/srcpkgs/python-Twisted/template
index 93560162f8fc..173600b79f34 100644
--- a/srcpkgs/python-Twisted/template
+++ b/srcpkgs/python-Twisted/template
@@ -1,12 +1,11 @@
 # Template file for 'python-Twisted'
 pkgname=python-Twisted
 version=20.3.0
-revision=3
+revision=4
 wrksrc="Twisted-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools
- python-incremental python3-incremental"
-makedepends="python-devel python3-devel"
+build_style=python2-module
+hostmakedepends="python-setuptools python-incremental"
+makedepends="python-devel"
 depends="python-setuptools python-zope.interface python-openssl
  python-service_identity python-constantly python-incremental python-automat
  python-hyperlink python-PyHamcrest"
@@ -14,6 +13,7 @@ short_desc="Asynchronous networking framework written in Python (Python2)"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="MIT"
 homepage="https://twistedmatrix.com/"
+changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
 distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.bz2"
 checksum=d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10
 
@@ -29,27 +29,10 @@ alternatives="
  twisted:twistd:/usr/bin/twistd2"
 
 post_install() {
-	vlicense LICENSE
-}
+	# don't conflict with python3-Twisted
+	for f in "${DESTDIR}"/usr/bin/*; do
+		mv "${f}"{,2}
+	done
 
-python3-Twisted_package() {
-	alternatives="
-	 twisted:cftp:/usr/bin/cftp3
-	 twisted:ckeygen:/usr/bin/ckeygen3
-	 twisted:conch:/usr/bin/conch3
-	 twisted:mailmail:/usr/bin/mailmail3
-	 twisted:pyhtmlizer:/usr/bin/pyhtmlizer3
-	 twisted:tkconch:/usr/bin/tkconch3
-	 twisted:trial:/usr/bin/trial3
-	 twisted:twist:/usr/bin/twist3
-	 twisted:twistd:/usr/bin/twistd3"
-	depends="python3-setuptools python3-zope.interface python3-openssl
-	 python3-service_identity python3-constantly python3-incremental
-	 python3-automat python3-hyperlink python3-PyHamcrest"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
+	vlicense LICENSE
 }
diff --git a/srcpkgs/python3-Twisted b/srcpkgs/python3-Twisted
deleted file mode 120000
index e4bef5378519..000000000000
--- a/srcpkgs/python3-Twisted
+++ /dev/null
@@ -1 +0,0 @@
-python-Twisted
\ No newline at end of file

From 078279d4c84f0026a2769ea8aa47f28a174614d4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 15 Nov 2021 11:20:43 -0500
Subject: [PATCH 3/3] python3-Twisted: update to 21.7.0.

---
 srcpkgs/python3-Twisted/INSTALL  |  5 ++++
 srcpkgs/python3-Twisted/REMOVE   |  5 ++++
 srcpkgs/python3-Twisted/template | 44 ++++++++++++++++++++++++++++++++
 srcpkgs/python3-Twisted/update   |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/python3-Twisted/INSTALL
 create mode 100644 srcpkgs/python3-Twisted/REMOVE
 create mode 100644 srcpkgs/python3-Twisted/template
 create mode 100644 srcpkgs/python3-Twisted/update

diff --git a/srcpkgs/python3-Twisted/INSTALL b/srcpkgs/python3-Twisted/INSTALL
new file mode 100644
index 000000000000..632dfe8fa02c
--- /dev/null
+++ b/srcpkgs/python3-Twisted/INSTALL
@@ -0,0 +1,5 @@
+case ${ACTION} in
+post)
+	python3 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1
+	;;
+esac
diff --git a/srcpkgs/python3-Twisted/REMOVE b/srcpkgs/python3-Twisted/REMOVE
new file mode 100644
index 000000000000..ec8608bc5f8e
--- /dev/null
+++ b/srcpkgs/python3-Twisted/REMOVE
@@ -0,0 +1,5 @@
+case ${ACTION} in
+purge)
+	find usr/lib/python3.*/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
+	;;
+esac
diff --git a/srcpkgs/python3-Twisted/template b/srcpkgs/python3-Twisted/template
new file mode 100644
index 000000000000..3b713d113d2b
--- /dev/null
+++ b/srcpkgs/python3-Twisted/template
@@ -0,0 +1,44 @@
+# Template file for 'python3-Twisted'
+pkgname=python3-Twisted
+version=21.7.0
+revision=1
+wrksrc="Twisted-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-incremental"
+makedepends="python3-devel"
+depends="python3-zope.interface python3-constantly python3-incremental
+ python3-automat python3-hyperlink python3-attrs python3-typing_extensions
+ python3-openssl python3-service_identity python3-pyasn1"
+checkdepends="python3-PyHamcrest $depends"
+short_desc="Asynchronous networking framework written in Python (Python3)"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://twistedmatrix.com/"
+changelog="https://raw.githubusercontent.com/twisted/twisted/trunk/NEWS.rst"
+distfiles="${PYPI_SITE}/T/Twisted/Twisted-${version}.tar.gz"
+checksum=2cd652542463277378b0d349f47c62f20d9306e57d1247baabd6d1d38a109006
+
+alternatives="
+ twisted:cftp:/usr/bin/cftp3
+ twisted:ckeygen:/usr/bin/ckeygen3
+ twisted:conch:/usr/bin/conch3
+ twisted:mailmail:/usr/bin/mailmail3
+ twisted:pyhtmlizer:/usr/bin/pyhtmlizer3
+ twisted:tkconch:/usr/bin/tkconch3
+ twisted:trial:/usr/bin/trial3
+ twisted:twist:/usr/bin/twist3
+ twisted:twistd:/usr/bin/twistd3"
+
+post_patch() {
+	# test requires unpackaged cython-test-exception-raiser
+	rm src/twisted/test/test_failure.py
+}
+
+post_install() {
+	# don't conflict with python-Twisted
+	for f in "${DESTDIR}"/usr/bin/*; do
+		mv "${f}"{,3}
+	done
+
+	vlicense LICENSE
+}
diff --git a/srcpkgs/python3-Twisted/update b/srcpkgs/python3-Twisted/update
new file mode 100644
index 000000000000..e299d00ea67c
--- /dev/null
+++ b/srcpkgs/python3-Twisted/update
@@ -0,0 +1 @@
+ignore="*rc*"