Removed Python2 support

Closes: #6890

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

tests/__init__.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import sys
 
 if sys.version_info >= (2, 7):

tests/acceptance/cli_test.py

@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import datetime
 import json
 import os.path

tests/helpers.py

@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
-import contextlib
 import os
 
 from compose.config.config import ConfigDetails

tests/integration/environment_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import tempfile
 
 from ddt import data

tests/integration/network_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import pytest
 
 from .testcases import DockerClientTestCase

tests/integration/project_test.py

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

tests/integration/resilience_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import pytest
 
 from .. import mock

tests/integration/service_test.py

@@ -1,17 +1,14 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 import re
 import shutil
 import tempfile
 from distutils.spawn import find_executable
+from io import StringIO
 from os import path
 
 import pytest
 from docker.errors import APIError
 from docker.errors import ImageNotFound
-from six import StringIO
 from six import text_type
 
 from .. import mock

tests/integration/state_test.py

@@ -2,9 +2,6 @@
 Integration tests which cover state convergence (aka smart recreate) performed
 by `docker-compose up`.
 """
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import copy
 import os
 import shutil

tests/integration/testcases.py

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

tests/integration/volume_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import six
 from docker.errors import DockerException
 

tests/unit/cli/command_test.py

@@ -1,7 +1,4 @@
 # ~*~ encoding: utf-8 ~*~
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 
 import pytest

tests/unit/cli/docker_client_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 import platform
 import ssl

tests/unit/cli/errors_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import pytest
 from docker.errors import APIError
 from requests.exceptions import ConnectionError

tests/unit/cli/formatter_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import logging
 
 from compose.cli import colors

tests/unit/cli/log_printer_test.py

@@ -1,13 +1,10 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import itertools
+from queue import Queue
 
 import pytest
 import requests
 import six
 from docker.errors import APIError
-from six.moves.queue import Queue
 
 from compose.cli.log_printer import build_log_generator
 from compose.cli.log_printer import build_log_presenters

tests/unit/cli/main_test.py

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

tests/unit/cli/utils_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import unittest
 
 from compose.cli.utils import human_readable_file_size

tests/unit/cli/verbose_proxy_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import six
 
 from compose.cli import verbose_proxy

tests/unit/cli_test.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 import shutil
 import tempfile

tests/unit/config/config_test.py

@@ -1,8 +1,4 @@
 # encoding: utf-8
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import codecs
 import os
 import shutil

tests/unit/config/environment_test.py

@@ -1,8 +1,4 @@
 # encoding: utf-8
-from __future__ import absolute_import
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import codecs
 import os
 import shutil

tests/unit/config/interpolation_test.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import pytest
 
 from compose.config.environment import Environment

tests/unit/config/sort_services_test.py

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

tests/unit/config/types_test.py

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

tests/unit/container_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import docker
 
 from .. import mock

tests/unit/network_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import pytest
 
 from .. import mock

tests/unit/parallel_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import unittest
 from threading import Lock
 

tests/unit/progress_stream_test.py

@@ -1,14 +1,10 @@
 # ~*~ encoding: utf-8 ~*~
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import io
 import os
 import random
 import shutil
 import tempfile
-
-from six import StringIO
+from io import StringIO
 
 from compose import progress_stream
 from tests import unittest

tests/unit/project_test.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import datetime
 import os
 import tempfile

tests/unit/service_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import docker
 import pytest
 from docker.constants import DEFAULT_DOCKER_API_VERSION

tests/unit/split_buffer_test.py

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

tests/unit/timeparse_test.py

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

tests/unit/utils_test.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from compose import utils
 
 

tests/unit/volume_test.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import docker
 import pytest