Skip to contentSkip to conversation

package/python-txaio: drop python 2 support

PATCH New James Hilliard 2 participants 2 messages Apr 8, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/python-txaio: drop python 2 support

Upstream removed python 2 support so we need to depend on python 3.

Removed python 2 txaio tests.

Removed python-six dependency which is no longer used by txaio.

---
 .gitlab-ci.yml                                     |  1 -
 package/python-txaio/Config.in                     |  2 +-
 support/testing/tests/package/test_python_txaio.py | 11 -----------
 3 files changed, 1 insertion(+), 13 deletions(-)
.gitlab-ci.yml +0 -1
index d833ce4555..3963258628 100644
@@ -497,7 +497,6 @@ tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test }
 tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test }
 tests.package.test_python_twisted.TestPythonPy2Twisted: { extends: .runtime_test }
 tests.package.test_python_twisted.TestPythonPy3Twisted: { extends: .runtime_test }
-tests.package.test_python_txaio.TestPythonPy2Txaio: { extends: .runtime_test }
 tests.package.test_python_txaio.TestPythonPy3Txaio: { extends: .runtime_test }
 tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_test }
 tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test }
package/python-txaio/Config.in +1 -1
index 9d4238215e..19a318a902 100644
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PYTHON_TXAIO
 	bool "python-txaio"
-	select BR2_PACKAGE_PYTHON_SIX # runtime
+	depends on BR2_PACKAGE_PYTHON3
 	help
 	  Compatibility API between asyncio/Twisted/Trollius.
 
support/testing/tests/package/test_python_txaio.py +0 -11
index 7bff1bc23c..f1bb2c79a6 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Txaio(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_TXAIO=y
-        BR2_PACKAGE_PYTHON_TWISTED=y
-        """
-    sample_scripts = ["tests/package/sample_python_txaio_twisted.py"]
-
-
 class TestPythonPy3Txaio(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/python-txaio: drop python 2 support

Le 08/04/2020 ? 02:19, James Hilliard a ?crit?:

Quoted 30 lines

Upstream removed python 2 support so we need to depend on python 3.

Removed python 2 txaio tests.

Removed python-six dependency which is no longer used by txaio.

---
 .gitlab-ci.yml                                     |  1 -
 package/python-txaio/Config.in                     |  2 +-
 support/testing/tests/package/test_python_txaio.py | 11 -----------
 3 files changed, 1 insertion(+), 13 deletions(-)
.gitlab-ci.yml +0 -1
index d833ce4555..3963258628 100644
@@ -497,7 +497,6 @@ tests.package.test_python_treq.TestPythonPy2Treq: { extends: .runtime_test }
 tests.package.test_python_treq.TestPythonPy3Treq: { extends: .runtime_test }
 tests.package.test_python_twisted.TestPythonPy2Twisted: { extends: .runtime_test }
 tests.package.test_python_twisted.TestPythonPy3Twisted: { extends: .runtime_test }
-tests.package.test_python_txaio.TestPythonPy2Txaio: { extends: .runtime_test }
 tests.package.test_python_txaio.TestPythonPy3Txaio: { extends: .runtime_test }
 tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_test }
 tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test }
package/python-txaio/Config.in +0 -0
index 9d4238215e..19a318a902 100644

package/python-txaio/Config.in line 3

Quoted 3 lines
package/python-txaio/Config.in +0 -1
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PYTHON_TXAIO
 	bool "python-txaio"
-	select BR2_PACKAGE_PYTHON_SIX # runtime

Indeed python-six is not needed anymore since it was removed from 20.3.1 version.

https://github.com/crossbario/txaio/commit/62b0e7eaa22769687df1de8f57374cb0a42bdc4d

package/python-txaio/Config.in line 3

Quoted 1 line
package/python-txaio/Config.in +1 -0
+	depends on BR2_PACKAGE_PYTHON3

I checked that all packages selecting python-txaio (python-autobahn and python-crossbar) are already python3 only.

Best regards,
Romain

Quoted 26 lines
package/python-txaio/Config.in +0 -0
 	help
 	  Compatibility API between asyncio/Twisted/Trollius.
 
support/testing/tests/package/test_python_txaio.py +0 -11
index 7bff1bc23c..f1bb2c79a6 100644
@@ -1,17 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Txaio(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_TXAIO=y
-        BR2_PACKAGE_PYTHON_TWISTED=y
-        """
-    sample_scripts = ["tests/package/sample_python_txaio_twisted.py"]
-
-
 class TestPythonPy3Txaio(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \