Merge pull request #5031 from djmitche/issue4614

petemoore · web-flow · commit a1020d6df397 · 2022-01-12T10:28:03.000+01:00
Drop support for Python-2.7 in the client.
diff --git a/changelog/issue-4614.md b/changelog/issue-4614.md
@@ -0,0 +1,5 @@
+audience: developers
+level: minor
+reference: issue 4614
+---
+This version drops support for Python-2.7 in the Python client. Python-2.7's support window ended over one year ago.
diff --git a/clients/client-py/README.md b/clients/client-py/README.md
diff --git a/clients/client-py/release.sh b/clients/client-py/release.sh
@@ -31,10 +31,6 @@ python3 -mvenv .release/py3
 # Work around https://bitbucket.org/pypa/wheel/issues/147/bdist_wheel-should-start-by-cleaning-up
 rm -rf build/
 
-virtualenv --python=python2 .release/py2
-.release/py2/bin/pip install -U setuptools wheel
-.release/py2/bin/python setup.py bdist_wheel
-
 ls -al dist
 
 # Publish to PyPI using Twine, as recommended by:
diff --git a/clients/client-py/setup.py b/clients/client-py/setup.py
@@ -10,7 +10,7 @@
     'pytest',
     'pytest-cov',   
     'pytest-mock',
-    'pytest-asyncio; python_version>="3.6"',
+    'pytest-asyncio',
     'httmock',
     'mock',
     'setuptools-lint',
@@ -20,9 +20,8 @@
     'tox',
     'coverage',
     'python-dateutil',
-    'subprocess32; python_version=="2.7"',
-    'aiofiles; python_version>="3.6"',
-    'httptest; python_version>="3.6"',
+    'aiofiles',
+    'httptest',
 ]
 
 # requests has a policy of not breaking apis between major versions
@@ -32,11 +31,8 @@
     'mohawk>=0.3.4',
     'slugid>=2',
     'taskcluster-urls>=12.1.0',
-    'six>=1.10.0',
-
-    # python-3 only
-    'aiohttp>=3.7.4; python_version>="3.6"',
-    'async_timeout>=2.0.0; python_version>="3.6"',
+    'aiohttp>=3.7.4',
+    'async_timeout>=2.0.0',
 ]
 
 # from http://testrun.org/tox/latest/example/basic.html
@@ -65,12 +61,8 @@ def run_tests(self):
 if sys.version_info[0] == 3 and sys.version_info[:2] < (3, 5):
     raise Exception('This library does not support Python 3 versions below 3.5')
 
-if sys.version_info.major == 2:
-    with open('README.md') as f:
-        long_description = f.read()
-else:
-    with open('README.md', encoding='utf8') as f:
-        long_description = f.read()
+with open('README.md', encoding='utf8') as f:
+    long_description = f.read()
 
 if __name__ == '__main__':
     setup(
@@ -96,8 +88,10 @@ def run_tests(self):
         },
         cmdclass={'test': Tox},
         zip_safe=False,
-        classifiers=['Programming Language :: Python :: 2.7',
-                     'Programming Language :: Python :: 3.5',
-                     'Programming Language :: Python :: 3.6',
-                     'Programming Language :: Python :: 3.7'],
+        classifiers=[
+            'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
+            'Programming Language :: Python :: 3.9',
+        ],
     )
diff --git a/clients/client-py/taskcluster/aio/asyncclient.py b/clients/client-py/taskcluster/aio/asyncclient.py
@@ -4,7 +4,7 @@
 
 import os
 import logging
-from six.moves import urllib
+import urllib
 
 import mohawk
 import mohawk.bewit
diff --git a/clients/client-py/taskcluster/aio/asyncutils.py b/clients/client-py/taskcluster/aio/asyncutils.py
@@ -6,7 +6,6 @@
 import functools
 import logging
 import os
-import six
 
 import taskcluster.utils as utils
 import taskcluster.exceptions as exceptions
@@ -101,7 +100,7 @@ async def makeSingleHttpRequest(method, url, payload, headers, session=None):
             log.debug('Received HTTP Status:    %s' % resp.status)
             log.debug('Received HTTP Headers: %s' % str(resp.headers))
             log.debug('Received HTTP Payload: %s (limit 1024 char)' %
-                      six.text_type(response_text)[:1024])
+                      str(response_text)[:1024])
             return resp
     finally:
         if implicit:
diff --git a/clients/client-py/taskcluster/aio/download.py b/clients/client-py/taskcluster/aio/download.py
@@ -14,11 +14,6 @@
 This module provides several pre-defined writers and writer factories for
 common cases.
 """
-import six
-
-if six.PY2:
-    raise ImportError("download is only supported in Python 3")
-
 import aiohttp
 import contextlib
 
diff --git a/clients/client-py/taskcluster/aio/upload.py b/clients/client-py/taskcluster/aio/upload.py
@@ -15,11 +15,6 @@
 This module provides several pre-defined readers and reader factories for
 common cases.
 """
-import six
-
-if six.PY2:
-    raise ImportError("upload is only supported in Python 3")
-
 import base64
 import hashlib
 
diff --git a/clients/client-py/taskcluster/client.py b/clients/client-py/taskcluster/client.py
@@ -11,9 +11,8 @@
 import calendar
 import requests
 import time
-import six
 import warnings
-from six.moves import urllib
+import urllib
 
 import mohawk
 import mohawk.bewit
@@ -66,7 +65,7 @@ def __init__(self, options=None, session=None):
         if credentials:
             for x in ('accessToken', 'clientId', 'certificate'):
                 value = credentials.get(x)
-                if value and not isinstance(value, six.binary_type):
+                if value and not isinstance(value, bytes):
                     try:
                         credentials[x] = credentials[x].encode('ascii')
                     except Exception:
@@ -98,9 +97,9 @@ def makeHawkExt(self):
             ext = {}
             cert = c.get('certificate')
             if cert:
-                if six.PY3 and isinstance(cert, six.binary_type):
+                if isinstance(cert, bytes):
                     cert = cert.decode()
-                if isinstance(cert, six.string_types):
+                if isinstance(cert, str):
                     cert = json.loads(cert)
                 ext['certificate'] = cert
 
@@ -130,7 +129,7 @@ def _makeTopicExchange(self, entry, *args, **kwargs):
         }
 
         # If we are passed in a string, we can short-circuit this function
-        if isinstance(routingKeyPattern, six.string_types):
+        if isinstance(routingKeyPattern, str):
             log.debug('Passing through string for topic exchange key')
             data['routingKeyPattern'] = routingKeyPattern
             return data
@@ -355,12 +354,12 @@ def _processArgs(self, entry, *_args, **_kwargs):
         # These all need to be rendered down to a string, let's just check that
         # they are up front and fail fast
         for arg in args:
-            if not isinstance(arg, six.string_types) and not isinstance(arg, int):
+            if not isinstance(arg, str) and not isinstance(arg, int):
                 raise exceptions.TaskclusterFailure(
                     'Positional arg "%s" to %s is not a string or int' % (arg, entry['name']))
 
-        for name, arg in six.iteritems(kwApiArgs):
-            if not isinstance(arg, six.string_types) and not isinstance(arg, int):
+        for name, arg in kwApiArgs.items():
+            if not isinstance(arg, str) and not isinstance(arg, int):
                 raise exceptions.TaskclusterFailure(
                     'KW arg "%s: %s" to %s is not a string or int' % (name, arg, entry['name']))
 
@@ -419,7 +418,7 @@ def _subArgsInRoute(self, entry, args):
 
         route = entry['route']
 
-        for arg, val in six.iteritems(args):
+        for arg, val in args.items():
             toReplace = "<%s>" % arg
             if toReplace not in route:
                 raise exceptions.TaskclusterFailure(
@@ -650,7 +649,7 @@ def createTemporaryCredentials(clientId, accessToken, start, expiry, scopes, nam
     """
 
     for scope in scopes:
-        if not isinstance(scope, six.string_types):
+        if not isinstance(scope, str):
             raise exceptions.TaskclusterFailure('Scope must be string')
 
     # Credentials can only be valid for 31 days.  I hope that
@@ -687,7 +686,7 @@ def createTemporaryCredentials(clientId, accessToken, start, expiry, scopes, nam
     ] + scopes)
     sigStr = '\n'.join(sig).encode()
 
-    if isinstance(accessToken, six.text_type):
+    if isinstance(accessToken, str):
         accessToken = accessToken.encode()
     sig = hmac.new(accessToken, sigStr, hashlib.sha256).digest()
 
diff --git a/clients/client-py/taskcluster/download.py b/clients/client-py/taskcluster/download.py
@@ -12,10 +12,6 @@
 common cases.
 """
 import functools
-import six
-
-if six.PY2:
-    raise ImportError("download is only supported in Python 3")
 
 from .aio import download as aio_download
 from .aio.asyncutils import ensureCoro, runAsync
diff --git a/clients/client-py/taskcluster/upload.py b/clients/client-py/taskcluster/upload.py
@@ -13,10 +13,6 @@
 common cases.
 """
 import functools
-import six
-
-if six.PY2:
-    raise ImportError("upload is only supported in Python 3")
 
 from .aio import upload as aio_upload
 from .aio.asyncutils import ensureCoro, runAsync
diff --git a/clients/client-py/taskcluster/utils.py b/clients/client-py/taskcluster/utils.py
@@ -10,7 +10,6 @@
 import requests.exceptions
 import slugid
 import time
-import six
 import random
 
 import taskcluster_urls as liburls
@@ -55,7 +54,7 @@ def calculateSleepTime(attempt):
 
 
 def toStr(obj, encoding='utf-8'):
-    if six.PY3 and isinstance(obj, six.binary_type):
+    if isinstance(obj, bytes):
         obj = obj.decode(encoding)
     else:
         obj = str(obj)
@@ -127,7 +126,7 @@ def dumpJson(obj, **kwargs):
     base64 encoding JSON results in \n sequences in the output.  Hawk
     barfs in your face if you have that in the text"""
     def handleDateAndBinaryForJs(x):
-        if six.PY3 and isinstance(x, six.binary_type):
+        if isinstance(x, bytes):
             x = x.decode()
         if isinstance(x, datetime.datetime) or isinstance(x, datetime.date):
             return stringDate(x)
@@ -154,28 +153,25 @@ def stringDate(date):
 
 def makeB64UrlSafe(b64str):
     """ Make a base64 string URL Safe """
-    if isinstance(b64str, six.text_type):
+    if isinstance(b64str, str):
         b64str = b64str.encode()
     # see RFC 4648, sec. 5
     return b64str.replace(b'+', b'-').replace(b'/', b'_')
 
 
 def makeB64UrlUnsafe(b64str):
     """ Make a base64 string URL Unsafe """
-    if isinstance(b64str, six.text_type):
+    if isinstance(b64str, str):
         b64str = b64str.encode()
     # see RFC 4648, sec. 5
     return b64str.replace(b'-', b'+').replace(b'_', b'/')
 
 
 def encodeStringForB64Header(s):
     """ HTTP Headers can't have new lines in them, let's """
-    if isinstance(s, six.text_type):
+    if isinstance(s, str):
         s = s.encode()
-    if six.PY3:
-        b64str = base64.encodebytes(s)
-    else:
-        b64str = base64.encodestring(s)
+    b64str = base64.encodebytes(s)
     return b64str.strip().replace(b'\n', b'')
 
 
@@ -319,7 +315,7 @@ def decryptMessage(message, privateKey):
 
 def isExpired(certificate):
     """ Check if certificate is expired """
-    if isinstance(certificate, six.string_types):
+    if isinstance(certificate, str):
         certificate = json.loads(certificate)
     expiry = certificate.get('expiry', 0)
     return expiry < int(time.time() * 1000) + 20 * 60
diff --git a/clients/client-py/test/test_client.py b/clients/client-py/test/test_client.py
@@ -2,7 +2,7 @@
 import types
 import time
 import datetime
-from six.moves import urllib
+import urllib
 import os
 import re
 import json
diff --git a/clients/client-py/test/test_imports.py b/clients/client-py/test/test_imports.py
@@ -2,8 +2,6 @@
 import unittest
 import importlib
 
-import six
-
 
 class ImportTest(unittest.TestCase):
     """These tests are intended to ensure that existing means of importing modules within
@@ -37,12 +35,10 @@ def test_taskcluster_service(self):
         queue = importlib.import_module("taskcluster.queue")
         queue.Queue
 
-    if six.PY3:
-
-        def taskcluster_aio(self):
-            aio = importlib.import_module("taskcluster.aio")
-            aio.Queue
+    def taskcluster_aio(self):
+        aio = importlib.import_module("taskcluster.aio")
+        aio.Queue
 
-        def test_taskcluster_aio_service(self):
-            queue = importlib.import_module("taskcluster.aio.queue")
-            queue.Queue
+    def test_taskcluster_aio_service(self):
+        queue = importlib.import_module("taskcluster.aio.queue")
+        queue.Queue
diff --git a/clients/client-py/tox.ini b/clients/client-py/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    py27
     py36
     py37
     py38
@@ -20,8 +19,3 @@ commands =
     pip freeze
     {envbindir}/py.test --cov-config .coveragerc --cov=taskcluster --cov-report term-missing -v {env:EX1:} {env:EX2:} {env:EX3:}
     ./lint.sh --python "{envpython}" --flake8 "{envbindir}/flake8"
-
-[testenv:py27]
-commands =
-    pip freeze
-    {envbindir}/py.test -v --ignore=test/aio --ignore-glob=test/test_upload* --ignore=taskcluster/aio
diff --git a/taskcluster/ci/client/kind.yml b/taskcluster/ci/client/kind.yml
diff --git a/ui/docs/manual/using/api.mdx b/ui/docs/manual/using/api.mdx
