Remove python 2 support

Author: David Pal

.buildscripts/e2e.sh

@@ -12,5 +12,3 @@ else
     ./tester_linux_amd64 -segment-write-key="${SEGMENT_WRITE_KEY}" -webhook-auth-username="${WEBHOOK_AUTH_USERNAME}" -webhook-bucket="${WEBHOOK_BUCKET}" -path='./e2e_test.sh'
     echo "End to end tests completed!"
 fi
-
-

.circleci/config.yml

@@ -24,8 +24,8 @@ jobs:
     steps:
       - checkout
       - attach_workspace: { at: . }
-      - run: pip3 install dephell 
-      - run: pip3 install --user appdirs   
+      - run: pip3 install dephell
+      - run: pip3 install --user appdirs
       - run: dephell deps convert --from=setup.py --to=requirements.txt
       - run: pip3 install --user -r requirements.txt
       - run: curl -sL https://raw.githubusercontent.com/segmentio/snyk_helpers/master/initialization/snyk.sh | sh
@@ -114,7 +114,7 @@ workflows:
                 - master
                 - scheduled_e2e_testing
     jobs:
-      - test_36      
+      - test_36
       - test_37
       - test_38
-      - test_39
+      - test_39

.pylintrc

@@ -306,7 +306,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins,io,builtins
+redefining-builtins-modules=past.builtins,future.builtins,io,builtins
 
 
 [FORMAT]

HISTORY.md

@@ -1,3 +1,7 @@
+# 2.2.0 / 2022-03-07
+- Remove Python 2 support
+- Remove six package
+
 # 2.1.0 / 2022-03-04
 
 - Raise exception on large message

Makefile

@@ -1,3 +1,6 @@
+install_dev:
+	pip install --edit .[dev]
+
 test:
 	pylint --rcfile=.pylintrc --reports=y --exit-zero analytics | tee pylint.out
 	flake8 --max-complexity=10 --statistics analytics > flake8.out || true

analytics/consumer.py

@@ -7,10 +7,7 @@
 
 from analytics.request import post, APIError, DatetimeSerializer
 
-try:
-    from queue import Empty
-except ImportError:
-    from Queue import Empty
+from queue import Empty
 
 MAX_MSG_SIZE = 32 << 10
 

analytics/test/client.py

@@ -1,7 +1,6 @@
 from datetime import date, datetime
 import unittest
 import time
-import six
 import mock
 
 from analytics.version import VERSION

segment/analytics/client.py

@@ -6,20 +6,15 @@
 import json
 
 from dateutil.tz import tzutc
-from six import string_types
 
 from segment.analytics.utils import guess_timezone, clean
 from segment.analytics.consumer import Consumer, MAX_MSG_SIZE
 from segment.analytics.request import post, DatetimeSerializer
 from segment.analytics.version import VERSION
 
-try:
-    import queue
-except ImportError:
-    import Queue as queue
+import queue
 
-
-ID_TYPES = (numbers.Number, string_types)
+ID_TYPES = (numbers.Number, str)
 
 
 class Client(object):

segment/analytics/consumer.py

@@ -6,10 +6,7 @@
 
 from segment.analytics.request import post, APIError, DatetimeSerializer
 
-try:
-    from queue import Empty
-except ImportError:
-    from Queue import Empty
+from queue import Empty
 
 MAX_MSG_SIZE = 32 << 10
 

segment/analytics/test/client.py

@@ -1,7 +1,6 @@
 from datetime import date, datetime
 import unittest
 import time
-import six
 import mock
 
 from analytics.version import VERSION
@@ -286,7 +285,7 @@ def test_success_on_invalid_write_key(self):
         self.assertFalse(self.failed)
 
     def test_unicode(self):
-        Client(six.u('unicode_key'))
+        Client('unicode_key')
 
     def test_numeric_user_id(self):
         self.client.track(1234, 'python event')