Merge pull request #107 from SciKit-Surgery/106-remove-six

Issue #106 removed six
SciKit-Surgery · Jan 12, 2022 · 320be18 · 320be18
2 parents 716b2e6 + 533016c
commit 320be18
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 numpy
-six
 opencv-contrib-python>=4.2.0.32
 scikit-surgerycore
diff --git a/setup.py b/setup.py
@@ -51,7 +51,6 @@
     ),
 
     install_requires=[
-        'six>=1.10',
         'numpy>=1.11',
         'opencv-contrib-python>=4.1.1.26',
         'scikit-surgerycore>=0.1.0',

diff --git a/tests/calibration/test_aruco_point_detector.py b/tests/calibration/test_aruco_point_detector.py
@@ -7,7 +7,6 @@
 import cv2 as cv2
 from cv2 import aruco
 import numpy as np
-import six
 import pytest
 from sksurgeryimage.calibration.aruco_point_detector import ArucoPointDetector
 
@@ -52,9 +51,9 @@ def test_aruco_detector_with_model():
     assert object_points.shape[1] == 3
     assert image_points.shape[0] == 12
     assert image_points.shape[1] == 2
-    six.print_('ArUco ids=' + str(ids))
-    six.print_('ArUco object_points=' + str(object_points))
-    six.print_('ArUco image_points=' + str(image_points))
+    print('ArUco ids=' + str(ids))
+    print('ArUco object_points=' + str(object_points))
+    print('ArUco image_points=' + str(image_points))
 
     model = detector.get_model_points()
     assert model.shape[0] == 2000

diff --git a/tests/calibration/test_charuco_point_detector.py b/tests/calibration/test_charuco_point_detector.py
@@ -6,7 +6,6 @@
 
 import cv2 as cv2
 from cv2 import aruco
-import six
 import pytest
 from sksurgeryimage.calibration.charuco_point_detector import CharucoPointDetector
 

diff --git a/tests/pylintrc b/tests/pylintrc
@@ -314,7 +314,7 @@ callbacks=cb_,_cb
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,future.builtins
+redefining-builtins-modules=future.builtins
 
 
 [CLASSES]