Removed Python2 support

Closes: docker#6890

Signed-off-by: Bastian Venthur <[email protected]>

.pre-commit-config.yaml

@@ -17,9 +17,6 @@
   sha: v1.3.4
   hooks:
     - id: reorder-python-imports
-      language_version: 'python2.7'
+      language_version: 'python3.7'
       args:
-        - --add-import
-        - from __future__ import absolute_import
-        - --add-import
-        - from __future__ import unicode_literals
+         - --py3-plus

Dockerfile

@@ -24,8 +24,6 @@ RUN apk add --no-cache \
     musl-dev \
     openssl \
     openssl-dev \
-    python2 \
-    python2-dev \
     zlib-dev
 ENV BUILD_BOOTLOADER=1
 
@@ -40,7 +38,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     libssl-dev \
     make \
     openssl \
-    python2.7-dev \
     zlib1g-dev
 
 FROM build-${BUILD_PLATFORM} AS build

bin/docker-compose

@@ -1,6 +1,3 @@
 #!/usr/bin/env python
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from compose.cli.main import main
 main()

compose/__init__.py

@@ -1,4 +1,2 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
 
 __version__ = '1.26.0dev'

compose/__main__.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from compose.cli.main import main
 
 main()

compose/cli/colors.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from ..const import IS_WINDOWS_PLATFORM
 
 NAMES = [

compose/cli/command.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 import os
 import re

compose/cli/docker_client.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 import os.path
 import ssl

compose/cli/docopt_command.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from inspect import getdoc
 
 from docopt import docopt

compose/cli/errors.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import contextlib
 import logging
 import socket

compose/cli/formatter.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 import shutil
 

compose/cli/log_printer.py

@@ -1,15 +1,12 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
+import _thread as thread
 import sys
 from collections import namedtuple
 from itertools import cycle
+from queue import Empty
+from queue import Queue
 from threading import Thread
 
 from docker.errors import APIError
-from six.moves import _thread as thread
-from six.moves.queue import Empty
-from six.moves.queue import Queue
 
 from . import colors
 from compose import utils

compose/cli/main.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import contextlib
 import functools
 import json

compose/cli/signals.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import signal
 
 from ..const import IS_WINDOWS_PLATFORM

compose/cli/utils.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import unicode_literals
-
 import math
 import os
 import platform

compose/cli/verbose_proxy.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import functools
 import logging
 import pprint

compose/config/__init__.py

@@ -1,7 +1,4 @@
 # flake8: noqa
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from . import environment
 from .config import ConfigurationError
 from .config import DOCKER_CONFIG_KEYS

compose/config/config.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import functools
 import io
 import logging

compose/config/environment.py

@@ -1,6 +1,5 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
+import codecs
+import contextlib
 import logging
 import os
 import re

compose/config/errors.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
 
 
 VERSION_EXPLANATION = (

compose/config/interpolation.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 import re
 from string import Template

compose/config/serialize.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import six
 import yaml
 

compose/config/sort_services.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from compose.config.errors import DependencyError
 
 

compose/config/types.py

@@ -1,9 +1,6 @@
 """
 Types for objects parsed from the configuration.
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import json
 import ntpath
 import os

compose/config/validation.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import json
 import logging
 import os

compose/const.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import sys
 
 from .version import ComposeVersion

compose/container.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from functools import reduce
 
 import six

compose/errors.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
 
 
 class OperationFailedError(Exception):

compose/network.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 import re
 from collections import OrderedDict

compose/parallel.py

@@ -1,18 +1,15 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
+import _thread as thread
 import logging
 import operator
 import sys
+from queue import Empty
+from queue import Queue
 from threading import Lock
 from threading import Semaphore
 from threading import Thread
 
 from docker.errors import APIError
 from docker.errors import ImageNotFound
-from six.moves import _thread as thread
-from six.moves.queue import Empty
-from six.moves.queue import Queue
 
 from compose.cli.colors import green
 from compose.cli.colors import red

compose/progress_stream.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from compose import utils
 
 

compose/project.py

@@ -1,14 +1,11 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import datetime
+import enum
 import logging
 import operator
 import re
 from functools import reduce
 from os import path
 
-import enum
 import six
 from docker.errors import APIError
 from docker.errors import ImageNotFound

compose/service.py

@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
+import enum
 import itertools
 import json
 import logging
@@ -12,7 +10,6 @@
 from collections import OrderedDict
 from operator import attrgetter
 
-import enum
 import six
 from docker.errors import APIError
 from docker.errors import ImageNotFound

compose/timeparse.py

@@ -31,9 +31,6 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import re
 
 HOURS = r'(?P<hours>[\d.]+)h'

compose/utils.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import codecs
 import hashlib
 import json.decoder

compose/version.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from distutils.version import LooseVersion
 
 

compose/volume.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 import re
 

contrib/migration/migrate-compose-file-v1-to-v2.py

@@ -3,9 +3,6 @@
 Migrate a Compose file from the V1 format in Compose 1.5 to the V2 format
 supported by Compose 1.6+
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import argparse
 import logging
 import sys

requirements.txt

@@ -1,5 +1,4 @@
 backports.shutil_get_terminal_size==1.0.0
-backports.ssl-match-hostname==3.5.0.1; python_version < '3'
 cached-property==1.5.1
 certifi==2020.4.5.1
 chardet==3.0.4