2
1
Эх сурвалжийг харах

package/python-autobahn: drop python 2 support

Upstream commit
https://github.com/crossbario/autobahn-python/commit/c0223223f865603ce192e6d5cdbcf74849a4cdd8,
which has been part of the releases since v20.1.2 has dropped support
for Python 2.x. So python-autobahn is now only available for Python
3.x.

We therefore remove the Python 2.x autobahn tests, and while at it,
drop the python-six dependency, which is no longer needed since
upstream commit
https://github.com/crossbario/autobahn-python/commit/79bd2ba41b83950614a2928eeda4704c1d149a20,
part of the releases since v20.1.3.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
James Hilliard 5 жил өмнө
parent
commit
8a99ce44b4

+ 0 - 1
.gitlab-ci.yml

@@ -456,7 +456,6 @@ tests.package.test_python_argh.TestPythonPy2Argh: { extends: .runtime_test }
 tests.package.test_python_argh.TestPythonPy3Argh: { extends: .runtime_test }
 tests.package.test_python_attrs.TestPythonPy2Attrs: { extends: .runtime_test }
 tests.package.test_python_attrs.TestPythonPy3Attrs: { extends: .runtime_test }
-tests.package.test_python_autobahn.TestPythonPy2Autobahn: { extends: .runtime_test }
 tests.package.test_python_autobahn.TestPythonPy3Autobahn: { extends: .runtime_test }
 tests.package.test_python_automat.TestPythonPy2Automat: { extends: .runtime_test }
 tests.package.test_python_automat.TestPythonPy3Automat: { extends: .runtime_test }

+ 2 - 1
package/python-autobahn/Config.in

@@ -1,8 +1,8 @@
 config BR2_PACKAGE_PYTHON_AUTOBAHN
 	bool "python-autobahn"
 	depends on BR2_INSTALL_LIBSTDCPP # python-cryptography -> python-pyasn
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime
-	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_TXAIO # runtime
 	help
 	  WebSocket client and server library, WAMP real-time
@@ -12,3 +12,4 @@ config BR2_PACKAGE_PYTHON_AUTOBAHN
 
 comment "python-autobahn needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_PYTHON3

+ 0 - 10
support/testing/tests/package/test_python_autobahn.py

@@ -1,16 +1,6 @@
 from tests.package.test_python import TestPythonPackageBase
 
 
-class TestPythonPy2Autobahn(TestPythonPackageBase):
-    __test__ = True
-    config = TestPythonPackageBase.config + \
-        """
-        BR2_PACKAGE_PYTHON=y
-        BR2_PACKAGE_PYTHON_AUTOBAHN=y
-        """
-    sample_scripts = ["tests/package/sample_python_autobahn.py"]
-
-
 class TestPythonPy3Autobahn(TestPythonPackageBase):
     __test__ = True
     config = TestPythonPackageBase.config + \