Drop use of six

testing-cabal · Nov 24, 2023 · 20ac49f · 20ac49f
1 parent cb9c6eb
commit 20ac49f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -23,6 +23,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install ruff testtools pbr
+        python -m pip install .
     - name: Lint with ruff
       run: |
         ruff check .

diff --git a/setup.cfg b/setup.cfg
@@ -20,7 +20,6 @@ classifier =
 
 [extras]
 test =
-    six
     docutils
     fixtures
     testtools

diff --git a/testresources/tests/test_optimising_test_suite.py b/testresources/tests/test_optimising_test_suite.py
@@ -15,7 +15,6 @@
 #  license.
 #
 
-import six
 import testtools
 import random
 import testresources
@@ -538,8 +537,8 @@ def _permute_four(self, cases):
         permutations.append([case4, case1, case3, case2])
         return permutations
 
-    @testtools.skipIf(six.PY3, "Flaky on Python 3, see LP #1645008")
     def testBasicSortTests(self):
+        self.skipTest("flaky, see LP #1645008")
         # Test every permutation of inputs, with legacy tests.
         # Cannot use equal costs because of the use of
         # a 2*optimal heuristic for sorting: with equal