Skip to contentSkip to conversation

package/python-twisted: bump to version 19.10.0

PATCH New aduskett at gmail.com 2 participants 8 messages Dec 5, 2019 – Dec 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 package/python-twisted: bump to version 19.10.0

From: Adam Duskett <[email protected]>

Tested with
run-tests tests.package.test_python_twisted.TestPythonPy3Twisted -d ./dl -o ./o

Ran 1 test in 388.506s
OK

---
 package/python-twisted/python-twisted.hash | 4 ++--
 package/python-twisted/python-twisted.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
package/python-twisted/python-twisted.hash +2 -2
index 0b7aa62021..2ce30d0fb8 100644
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/twisted/json
-md5 5e9296a952430d288cdcdc6ad9eb5ee8 Twisted-19.7.0.tar.bz2
-sha256 d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d Twisted-19.7.0.tar.bz2
+md5 f2d70f7a66ecdf54152310164cceadfe Twisted-19.10.0.tar.bz2
+sha256 7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d Twisted-19.10.0.tar.bz2
 # Locally computed sha256
 sha256 85b798413ba885b06cc1b91efe857a39f694071c29b04e80d23ea26ee271d613 LICENSE
package/python-twisted/python-twisted.mk +2 -2
index da22ae77a3..71748fc90c 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_TWISTED_VERSION = 19.7.0
+PYTHON_TWISTED_VERSION = 19.10.0
 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2
-PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/61/31/3855dcacd1d3b2e60c0b4ccc8e727b8cd497bd7087d327d81a9f0cbb580c
+PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/0b/95/5fff90cd4093c79759d736e5f7c921c8eb7e5057a70d753cdb4e8e5895d7
 PYTHON_TWISTED_SETUP_TYPE = setuptools
 PYTHON_TWISTED_LICENSE = MIT
 PYTHON_TWISTED_LICENSE_FILES = LICENSE
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/4 package/python-twisted: add config for TLS support

From: Adam Duskett <[email protected]>

Add an option that selects all of the necessary python packages to ensure that twisted has TLS support.

---
 package/python-twisted/Config.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/python-twisted/Config.in +14 -0
index b72952f979..f3d94c544e 100644
@@ -12,3 +12,17 @@ config BR2_PACKAGE_PYTHON_TWISTED
 	  Python.
 
 	  https://twistedmatrix.com/trac/
+
+if BR2_PACKAGE_PYTHON_TWISTED
+
+config BR2_PACKAGE_PYTHON_TWISTED_TLS
+	bool "TLS support"
+	depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-cryptography
+	select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
+	select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime
+	select BR2_PACKAGE_PYTHON_IDNA # runtime
+
+comment "TLS support needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+endif
Signature · 1 line
2.23.0
#2 lore raw

PATCH 2/4 package/python-twisted: add config for TLS support

package/python-twisted/Config.in config BR2_PACKAGE_PYTHON_TWISTED · line 20

Quoted 5 lines · On Thu, 5 Dec 2019 14:15:13 -0800 aduskett at gmail.com wrote:
package/python-twisted/Config.in +5 -0
+if BR2_PACKAGE_PYTHON_TWISTED
+
+config BR2_PACKAGE_PYTHON_TWISTED_TLS
+	bool "TLS support"
+	depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-cryptography

We don't really care about python-cryptography here, since it's not a direct dependencies. However, python-service-identify does have a C++ dependency, so it made more sense to list that here.

package/python-twisted/Config.in config BR2_PACKAGE_PYTHON_TWISTED · line 23

Quoted 3 lines
package/python-twisted/Config.in +3 -0
+	select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
+	select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime
+	select BR2_PACKAGE_PYTHON_IDNA # runtime

Alphabetic ordering was not good.

I fixed up both issues and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 3/4 package/python-twisted: add config for HTTP2 support

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Add an option that selects all of the necessary python packages to ensure that twisted has HTTP2 support.

---
 package/python-twisted/Config.in | 5 +++++
 1 file changed, 5 insertions(+)
package/python-twisted/Config.in +5 -0
index f3d94c544e..767e690e5f 100644
@@ -15,6 +15,11 @@ config BR2_PACKAGE_PYTHON_TWISTED
 
 if BR2_PACKAGE_PYTHON_TWISTED
 
+config BR2_PACKAGE_PYTHON_TWISTED_HTTP2
+	bool "HTTP2 support"
+	select BR2_PACKAGE_PYTHON_PRIORITY # runtime
+	select BR2_PACKAGE_PYTHON_H2 # runtime
+
 config BR2_PACKAGE_PYTHON_TWISTED_TLS
 	bool "TLS support"
 	depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-cryptography
Signature · 1 line
2.23.0
#4 lore raw

PATCH 3/4 package/python-twisted: add config for HTTP2 support

Quoted 15 lines · On Thu, 5 Dec 2019 14:15:14 -0800 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Add an option that selects all of the necessary python packages to ensure that twisted has HTTP2 support.

---
 package/python-twisted/Config.in | 5 +++++
 1 file changed, 5 insertions(+)
package/python-twisted/Config.in +0 -0
index f3d94c544e..767e690e5f 100644

package/python-twisted/Config.in config BR2_PACKAGE_PYTHON_TWISTED · line 21

Quoted 7 lines
package/python-twisted/Config.in +4 -0
@@ -15,6 +15,11 @@ config BR2_PACKAGE_PYTHON_TWISTED
 
 if BR2_PACKAGE_PYTHON_TWISTED
 
+config BR2_PACKAGE_PYTHON_TWISTED_HTTP2
+	bool "HTTP2 support"
+	select BR2_PACKAGE_PYTHON_PRIORITY # runtime
+	select BR2_PACKAGE_PYTHON_H2 # runtime

Alphabetic ordering was not correct, so I fixed that and applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 4/4 package/python-daphne: bump to version 2.4.0

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Other changes:
- Update hash for PKG-INFO due to a version bump in the file.
- select BR2_PACKAGE_PYTHON_TWISTED_TLS as a runtime dependency.
- Update 0001-remove-pytest-runner-requirement.patch to work with the new version.

---
 .../0001-remove-pytest-runner-requirement.patch             | 2 +-
 package/python-daphne/Config.in                             | 1 +
 package/python-daphne/python-daphne.hash                    | 6 +++---
 package/python-daphne/python-daphne.mk                      | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)
package/python-daphne/0001-remove-pytest-runner-requirement.patch +1 -1
index c471d60e8c..30acf201d6 100644
@@ -17,7 +17,7 @@ index 64e94f1..4e3abb0 100755
 @@ -23,7 +23,6 @@ setup(
      packages=find_packages() + ["twisted.plugins"],
      include_package_data=True,
-     install_requires=["twisted>=18.7", "autobahn>=0.18", "asgiref~=3.0"],
+     install_requires=["twisted[tls]>=18.7", "autobahn>=0.18", "asgiref~=3.2"],
 -    setup_requires=["pytest-runner"],
      extras_require={
          "tests": ["hypothesis~=3.88", "pytest~=3.10", "pytest-asyncio~=0.8"]
package/python-daphne/Config.in +1 -0
index 896bcfe421..601b2e1db8 100644
@@ -5,6 +5,7 @@ config BR2_PACKAGE_PYTHON_DAPHNE
 	select BR2_PACKAGE_PYTHON_ASGIREF # runtime
 	select BR2_PACKAGE_PYTHON_AUTOBAHN # runtime
 	select BR2_PACKAGE_PYTHON_TWISTED # runtime
+	select BR2_PACKAGE_PYTHON_TWISTED_TLS # runtime
 	help
 	  Daphne is a HTTP, HTTP2 and WebSocket protocol server for
 	  ASGI and ASGI-HTTP, developed to power Django Channels.
package/python-daphne/python-daphne.hash +3 -3
index 71439a77e1..17c13e12c1 100644
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/daphne/json
-md5	cac7352d0ebdde4f0cc245ae0b0682f8  daphne-2.3.0.tar.gz
-sha256	2329b7a74b5559f7ea012879c10ba945c3a53df7d8d2b5932a904e3b4c9abcc2  daphne-2.3.0.tar.gz
+md5	1e8c391395ade46abe8cca84e3a9746a  daphne-2.4.0.tar.gz
+sha256	5af4d83c8ecf11a4d8ed65ced02d8336d52d90d213dfcd184d07222d36da433c  daphne-2.4.0.tar.gz
 # Locally computed sha256
-sha256 55d7d6117493d69de1c7c211b947b910a715030366f1b636d28cf6891dfc1f3d PKG-INFO
+sha256 d0916b2b91afac6090fc01501e895a3cea81141d4b10c702db9e0a057ca5a563 PKG-INFO
package/python-daphne/python-daphne.mk +2 -2
index 278bfec29f..3d625c85ec 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_DAPHNE_VERSION = 2.3.0
+PYTHON_DAPHNE_VERSION = 2.4.0
 PYTHON_DAPHNE_SOURCE = daphne-$(PYTHON_DAPHNE_VERSION).tar.gz
-PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/7b/f1/994f55248e27059e160f9d07bf5d325a9891b99daf1eb775a14110e91e5b
+PYTHON_DAPHNE_SITE = https://files.pythonhosted.org/packages/c6/66/05ace288000d323831a9fab1e68a5625b117b7c8aca408404d33330f3906
 PYTHON_DAPHNE_SETUP_TYPE = setuptools
 # https://github.com/django/daphne/blob/master/LICENSE
 PYTHON_DAPHNE_LICENSE = BSD-3-Clause
Signature · 1 line
2.23.0
#6 lore raw

PATCH 4/4 package/python-daphne: bump to version 2.4.0

Quoted 8 lines · On Thu, 5 Dec 2019 14:15:15 -0800 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Other changes:
- Update hash for PKG-INFO due to a version bump in the file.
- select BR2_PACKAGE_PYTHON_TWISTED_TLS as a runtime dependency.
- Update 0001-remove-pytest-runner-requirement.patch to work with the new version.

Quoted 7 lines
---
 .../0001-remove-pytest-runner-requirement.patch             | 2 +-
 package/python-daphne/Config.in                             | 1 +
 package/python-daphne/python-daphne.hash                    | 6 +++---
 package/python-daphne/python-daphne.mk                      | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH 1/4 package/python-twisted: bump to version 19.10.0

In reply to aduskett at gmail.com
Quoted 5 lines · On Thu, 5 Dec 2019 14:15:12 -0800 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Tested with
run-tests tests.package.test_python_twisted.TestPythonPy3Twisted -d ./dl -o ./o

Quoted 8 lines

Ran 1 test in 388.506s
OK

---
 package/python-twisted/python-twisted.hash | 4 ++--
 package/python-twisted/python-twisted.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com