From e8424d5ae0de01fae98fa7aaff3c79cbb1dfcf2b Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Tue, 19 Nov 2019 14:47:57 +0100 Subject: [PATCH 1/7] Removed Python2 support Closes: #6890 Signed-off-by: Bastian Venthur --- .pre-commit-config.yaml | 7 +- Dockerfile | 3 - bin/docker-compose | 3 - compose/__init__.py | 2 - compose/__main__.py | 3 - compose/cli/colors.py | 3 - compose/cli/command.py | 3 - compose/cli/docker_client.py | 3 - compose/cli/docopt_command.py | 3 - compose/cli/errors.py | 3 - compose/cli/formatter.py | 3 - compose/cli/log_printer.py | 9 +- compose/cli/main.py | 4 - compose/cli/signals.py | 3 - compose/cli/utils.py | 4 - compose/cli/verbose_proxy.py | 3 - compose/config/__init__.py | 3 - compose/config/config.py | 3 - compose/config/environment.py | 5 +- compose/config/errors.py | 2 - compose/config/interpolation.py | 3 - compose/config/serialize.py | 3 - compose/config/sort_services.py | 3 - compose/config/types.py | 3 - compose/config/validation.py | 3 - compose/const.py | 3 - compose/container.py | 3 - compose/errors.py | 2 - compose/network.py | 3 - compose/parallel.py | 9 +- compose/progress_stream.py | 3 - compose/project.py | 5 +- compose/service.py | 5 +- compose/timeparse.py | 3 - compose/utils.py | 3 - compose/version.py | 3 - compose/volume.py | 3 - .../migrate-compose-file-v1-to-v2.py | 3 - requirements.txt | 1 - script/release/release.py | 126 ------------------ script/release/utils.py | 3 - script/test/all | 4 +- script/test/versions.py | 4 - setup.py | 6 - tests/__init__.py | 3 - tests/acceptance/cli_test.py | 3 - tests/helpers.py | 4 - tests/integration/environment_test.py | 3 - tests/integration/network_test.py | 3 - tests/integration/project_test.py | 3 - tests/integration/resilience_test.py | 3 - tests/integration/service_test.py | 5 +- tests/integration/state_test.py | 3 - tests/integration/testcases.py | 3 - tests/integration/volume_test.py | 3 - tests/unit/cli/command_test.py | 3 - tests/unit/cli/docker_client_test.py | 3 - tests/unit/cli/errors_test.py | 3 - tests/unit/cli/formatter_test.py | 3 - tests/unit/cli/log_printer_test.py | 5 +- tests/unit/cli/main_test.py | 3 - tests/unit/cli/utils_test.py | 3 - tests/unit/cli/verbose_proxy_test.py | 3 - tests/unit/cli_test.py | 3 - tests/unit/config/config_test.py | 4 - tests/unit/config/environment_test.py | 4 - tests/unit/config/interpolation_test.py | 3 - tests/unit/config/sort_services_test.py | 3 - tests/unit/config/types_test.py | 3 - tests/unit/container_test.py | 3 - tests/unit/network_test.py | 3 - tests/unit/parallel_test.py | 3 - tests/unit/progress_stream_test.py | 6 +- tests/unit/project_test.py | 3 - tests/unit/service_test.py | 3 - tests/unit/split_buffer_test.py | 3 - tests/unit/timeparse_test.py | 3 - tests/unit/utils_test.py | 3 - tests/unit/volume_test.py | 3 - tox.ini | 2 +- 80 files changed, 18 insertions(+), 378 deletions(-) delete mode 100755 script/release/release.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e447294eb..a2aeb014a 100644 --- a/.pre-commit-config.yaml +++ b/.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 diff --git a/Dockerfile b/Dockerfile index 1f7608e24..9439d0e4f 100644 --- a/Dockerfile +++ b/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 diff --git a/bin/docker-compose b/bin/docker-compose index aeb538703..5976e1d4a 100755 --- a/bin/docker-compose +++ b/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() diff --git a/compose/__init__.py b/compose/__init__.py index 69c4e0e49..32f0afd92 100644 --- a/compose/__init__.py +++ b/compose/__init__.py @@ -1,4 +1,2 @@ -from __future__ import absolute_import -from __future__ import unicode_literals __version__ = '1.26.0dev' diff --git a/compose/__main__.py b/compose/__main__.py index 27a7acbb8..199ba2ae9 100644 --- a/compose/__main__.py +++ b/compose/__main__.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from compose.cli.main import main main() diff --git a/compose/cli/colors.py b/compose/cli/colors.py index ea45198e0..c6a869bf5 100644 --- a/compose/cli/colors.py +++ b/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 = [ diff --git a/compose/cli/command.py b/compose/cli/command.py index 7621134e8..6c88e5819 100644 --- a/compose/cli/command.py +++ b/compose/cli/command.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import os import re diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py index d4cdc96e8..3abeb5cdc 100644 --- a/compose/cli/docker_client.py +++ b/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 diff --git a/compose/cli/docopt_command.py b/compose/cli/docopt_command.py index 809a4b745..856c92348 100644 --- a/compose/cli/docopt_command.py +++ b/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 diff --git a/compose/cli/errors.py b/compose/cli/errors.py index 189b67faf..d1a47f078 100644 --- a/compose/cli/errors.py +++ b/compose/cli/errors.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import contextlib import logging import socket diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py index 9651fb4da..4dabe77c2 100644 --- a/compose/cli/formatter.py +++ b/compose/cli/formatter.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import shutil diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py index a4b70a672..fd193000f 100644 --- a/compose/cli/log_printer.py +++ b/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 diff --git a/compose/cli/main.py b/compose/cli/main.py index 250d06c90..714592a32 100644 --- a/compose/cli/main.py +++ b/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 diff --git a/compose/cli/signals.py b/compose/cli/signals.py index 44def2ece..0244e7018 100644 --- a/compose/cli/signals.py +++ b/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 diff --git a/compose/cli/utils.py b/compose/cli/utils.py index 40bef1652..65ba74dbb 100644 --- a/compose/cli/utils.py +++ b/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 diff --git a/compose/cli/verbose_proxy.py b/compose/cli/verbose_proxy.py index b1592eabe..68dfabe52 100644 --- a/compose/cli/verbose_proxy.py +++ b/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 diff --git a/compose/config/__init__.py b/compose/config/__init__.py index 2b40666f1..855b2401d 100644 --- a/compose/config/__init__.py +++ b/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 diff --git a/compose/config/config.py b/compose/config/config.py index 444a40325..52863b13c 100644 --- a/compose/config/config.py +++ b/compose/config/config.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import functools import io import logging diff --git a/compose/config/environment.py b/compose/config/environment.py index d8810ebb6..abcafe0ce 100644 --- a/compose/config/environment.py +++ b/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 diff --git a/compose/config/errors.py b/compose/config/errors.py index 9b2078f2c..7db079e9c 100644 --- a/compose/config/errors.py +++ b/compose/config/errors.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals VERSION_EXPLANATION = ( diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py index 18be8562c..f202e9114 100644 --- a/compose/config/interpolation.py +++ b/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 diff --git a/compose/config/serialize.py b/compose/config/serialize.py index 5776ce957..79b5777cb 100644 --- a/compose/config/serialize.py +++ b/compose/config/serialize.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import six import yaml diff --git a/compose/config/sort_services.py b/compose/config/sort_services.py index 42f548a6d..a600139b2 100644 --- a/compose/config/sort_services.py +++ b/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 diff --git a/compose/config/types.py b/compose/config/types.py index ab8f34e3d..4a7a25b2b 100644 --- a/compose/config/types.py +++ b/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 diff --git a/compose/config/validation.py b/compose/config/validation.py index 1cceb71f0..f8513bdef 100644 --- a/compose/config/validation.py +++ b/compose/config/validation.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import json import logging import os diff --git a/compose/const.py b/compose/const.py index 3d9030520..d80e23c9e 100644 --- a/compose/const.py +++ b/compose/const.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import sys from .version import ComposeVersion diff --git a/compose/container.py b/compose/container.py index 8a2fb240e..37de4e6f6 100644 --- a/compose/container.py +++ b/compose/container.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from functools import reduce import six diff --git a/compose/errors.py b/compose/errors.py index 415b41e7f..530656173 100644 --- a/compose/errors.py +++ b/compose/errors.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals class OperationFailedError(Exception): diff --git a/compose/network.py b/compose/network.py index 84531ecc7..bc3ade168 100644 --- a/compose/network.py +++ b/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 diff --git a/compose/parallel.py b/compose/parallel.py index e242a318a..6ef9ceedd 100644 --- a/compose/parallel.py +++ b/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 diff --git a/compose/progress_stream.py b/compose/progress_stream.py index 522ddf75d..0ae0dc316 100644 --- a/compose/progress_stream.py +++ b/compose/progress_stream.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from compose import utils diff --git a/compose/project.py b/compose/project.py index 696c8b040..90a6f5cd5 100644 --- a/compose/project.py +++ b/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 diff --git a/compose/service.py b/compose/service.py index 95a87d210..18173cf70 100644 --- a/compose/service.py +++ b/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 namedtuple from collections import OrderedDict from operator import attrgetter -import enum import six from docker.errors import APIError from docker.errors import ImageNotFound diff --git a/compose/timeparse.py b/compose/timeparse.py index 16ef8a6dc..bdd9f611f 100644 --- a/compose/timeparse.py +++ b/compose/timeparse.py @@ -31,9 +31,6 @@ https://golang.org/pkg/time/#ParseDuration # 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[\d.]+)h' diff --git a/compose/utils.py b/compose/utils.py index a1e5e6435..4ea163c42 100644 --- a/compose/utils.py +++ b/compose/utils.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import codecs import hashlib import json.decoder diff --git a/compose/version.py b/compose/version.py index 0532e16c7..c039263ac 100644 --- a/compose/version.py +++ b/compose/version.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from distutils.version import LooseVersion diff --git a/compose/volume.py b/compose/volume.py index b02fc5d80..d31417a55 100644 --- a/compose/volume.py +++ b/compose/volume.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import re diff --git a/contrib/migration/migrate-compose-file-v1-to-v2.py b/contrib/migration/migrate-compose-file-v1-to-v2.py index 274b499b9..e217b7072 100755 --- a/contrib/migration/migrate-compose-file-v1-to-v2.py +++ b/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 diff --git a/requirements.txt b/requirements.txt index f02e15eac..4dea71c14 100644 --- a/requirements.txt +++ b/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 diff --git a/script/release/release.py b/script/release/release.py deleted file mode 100755 index f53d1f3c1..000000000 --- a/script/release/release.py +++ /dev/null @@ -1,126 +0,0 @@ -#!/usr/bin/env python3 -from __future__ import absolute_import -from __future__ import unicode_literals - -import re - -import click -from git import Repo -from utils import update_init_py_version -from utils import update_run_sh_version -from utils import yesno - -VALID_VERSION_PATTERN = re.compile(r"^\d+\.\d+\.\d+(-rc\d+)?$") - - -class Version(str): - def matching_groups(self): - match = VALID_VERSION_PATTERN.match(self) - if not match: - return False - - return match.groups() - - def is_ga_version(self): - groups = self.matching_groups() - if not groups: - return False - - rc_suffix = groups[1] - return not rc_suffix - - def validate(self): - return len(self.matching_groups()) > 0 - - def branch_name(self): - if not self.validate(): - return None - - rc_part = self.matching_groups()[0] - ver = self - if rc_part: - ver = ver[:-len(rc_part)] - - tokens = ver.split(".") - tokens[-1] = 'x' - - return ".".join(tokens) - - -def create_bump_commit(repository, version): - print('Creating bump commit...') - repository.commit('-a', '-s', '-m "Bump {}"'.format(version), '--no-verify') - - -def validate_environment(version, repository): - if not version.validate(): - print('Version "{}" has an invalid format. This should follow D+.D+.D+(-rcD+). ' - 'Like: 1.26.0 or 1.26.0-rc1'.format(version)) - return False - - expected_branch = version.branch_name() - if str(repository.active_branch) != expected_branch: - print('Cannot tag in this branch with version "{}". ' - 'Please checkout "{}" to tag'.format(version, version.branch_name())) - return False - return True - - -@click.group() -def cli(): - pass - - -@cli.command() -@click.argument('version') -def tag(version): - """ - Updates the version related files and tag - """ - repo = Repo(".") - version = Version(version) - if not validate_environment(version, repo): - return - - update_init_py_version(version) - update_run_sh_version(version) - - input('Please add the release notes to the CHANGELOG.md file, then press Enter to continue.') - proceed = False - while not proceed: - print(repo.git.diff()) - proceed = yesno('Are these changes ok? y/N ', default=False) - - if repo.git.diff(): - create_bump_commit(repo.git, version) - else: - print('No changes to commit. Exiting...') - return - - repo.create_tag(version) - - print('Please, check the changes. If everything is OK, you just need to push with:\n' - '$ git push --tags upstream {}'.format(version.branch_name())) - - -@cli.command() -@click.argument('version') -def push_latest(version): - """ - TODO Pushes the latest tag pointing to a certain GA version - """ - raise NotImplementedError - - -@cli.command() -@click.argument('version') -def ghtemplate(version): - """ - TODO Generates the github release page content - """ - version = Version(version) - raise NotImplementedError - - -if __name__ == '__main__': - cli() diff --git a/script/release/utils.py b/script/release/utils.py index 4f5770487..25b39ca74 100644 --- a/script/release/utils.py +++ b/script/release/utils.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import os import re diff --git a/script/test/all b/script/test/all index f929a57ee..57b76d5a9 100755 --- a/script/test/all +++ b/script/test/all @@ -11,7 +11,7 @@ docker run --rm \ "$TAG" tox -e pre-commit get_versions="docker run --rm - --entrypoint=/code/.tox/py27/bin/python + --entrypoint=/code/.tox/py37/bin/python $TAG /code/script/test/versions.py docker/docker-ce,moby/moby" @@ -23,7 +23,7 @@ fi BUILD_NUMBER=${BUILD_NUMBER-$USER} -PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py27,py37} +PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py37} for version in $DOCKER_VERSIONS; do >&2 echo "Running tests against Docker $version" diff --git a/script/test/versions.py b/script/test/versions.py index a06c49f20..1a28dc19a 100755 --- a/script/test/versions.py +++ b/script/test/versions.py @@ -21,10 +21,6 @@ For example, if the list of versions is: `default` would return `1.7.1` and `recent -n 3` would return `1.8.0-rc2 1.7.1 1.6.2` """ -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals - import argparse import itertools import operator diff --git a/setup.py b/setup.py index efc144b7f..dad44d72e 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,5 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import print_function -from __future__ import unicode_literals - import codecs import os import re @@ -108,8 +104,6 @@ setup( 'Environment :: Console', 'Intended Audience :: Developers', 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.6', diff --git a/tests/__init__.py b/tests/__init__.py index 1ac1b21cf..d3cfb8649 100644 --- a/tests/__init__.py +++ b/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): diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index 9f5853143..868e1e227 100644 --- a/tests/acceptance/cli_test.py +++ b/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 diff --git a/tests/helpers.py b/tests/helpers.py index 1365c5bcf..2ecb04523 100644 --- a/tests/helpers.py +++ b/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 diff --git a/tests/integration/environment_test.py b/tests/integration/environment_test.py index 671e65318..43df2c52b 100644 --- a/tests/integration/environment_test.py +++ b/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 diff --git a/tests/integration/network_test.py b/tests/integration/network_test.py index a2493fda1..23c9e9a4b 100644 --- a/tests/integration/network_test.py +++ b/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 diff --git a/tests/integration/project_test.py b/tests/integration/project_test.py index cb620a8c9..19d27185c 100644 --- a/tests/integration/project_test.py +++ b/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 diff --git a/tests/integration/resilience_test.py b/tests/integration/resilience_test.py index 3de16e977..81cb2382f 100644 --- a/tests/integration/resilience_test.py +++ b/tests/integration/resilience_test.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import pytest from .. import mock diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py index 01e2e1d22..e83b8af07 100644 --- a/tests/integration/service_test.py +++ b/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 diff --git a/tests/integration/state_test.py b/tests/integration/state_test.py index 492de7b8a..611d0cc94 100644 --- a/tests/integration/state_test.py +++ b/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 diff --git a/tests/integration/testcases.py b/tests/integration/testcases.py index fe70d1f72..f787923ad 100644 --- a/tests/integration/testcases.py +++ b/tests/integration/testcases.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import functools import os diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py index 2a521d4c5..1e02647fb 100644 --- a/tests/integration/volume_test.py +++ b/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 diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py index 3a9844c4f..e2a899517 100644 --- a/tests/unit/cli/command_test.py +++ b/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 diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py index 772c136ee..873c1ff3d 100644 --- a/tests/unit/cli/docker_client_test.py +++ b/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 diff --git a/tests/unit/cli/errors_test.py b/tests/unit/cli/errors_test.py index 7b53ed2b1..cb5f59df1 100644 --- a/tests/unit/cli/errors_test.py +++ b/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 diff --git a/tests/unit/cli/formatter_test.py b/tests/unit/cli/formatter_test.py index e68572511..07f5a8f50 100644 --- a/tests/unit/cli/formatter_test.py +++ b/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 diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py index 5e387241d..da0abb99f 100644 --- a/tests/unit/cli/log_printer_test.py +++ b/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 diff --git a/tests/unit/cli/main_test.py b/tests/unit/cli/main_test.py index 067c74f0b..ac3df2920 100644 --- a/tests/unit/cli/main_test.py +++ b/tests/unit/cli/main_test.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import logging import docker diff --git a/tests/unit/cli/utils_test.py b/tests/unit/cli/utils_test.py index 7a7628903..d67c8ba8a 100644 --- a/tests/unit/cli/utils_test.py +++ b/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 diff --git a/tests/unit/cli/verbose_proxy_test.py b/tests/unit/cli/verbose_proxy_test.py index f111f8cdb..1da1676eb 100644 --- a/tests/unit/cli/verbose_proxy_test.py +++ b/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 diff --git a/tests/unit/cli_test.py b/tests/unit/cli_test.py index a7522f939..c6891bc34 100644 --- a/tests/unit/cli_test.py +++ b/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 diff --git a/tests/unit/config/config_test.py b/tests/unit/config/config_test.py index 4f09c59a6..1f9a168c0 100644 --- a/tests/unit/config/config_test.py +++ b/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 diff --git a/tests/unit/config/environment_test.py b/tests/unit/config/environment_test.py index 7e394d248..507385468 100644 --- a/tests/unit/config/environment_test.py +++ b/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 diff --git a/tests/unit/config/interpolation_test.py b/tests/unit/config/interpolation_test.py index 91fc3e69d..4efcf865a 100644 --- a/tests/unit/config/interpolation_test.py +++ b/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 diff --git a/tests/unit/config/sort_services_test.py b/tests/unit/config/sort_services_test.py index c39ac0225..430fed6a6 100644 --- a/tests/unit/config/sort_services_test.py +++ b/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 diff --git a/tests/unit/config/types_test.py b/tests/unit/config/types_test.py index e7cc67b04..c0991b9dc 100644 --- a/tests/unit/config/types_test.py +++ b/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 diff --git a/tests/unit/container_test.py b/tests/unit/container_test.py index 626b466d4..452475209 100644 --- a/tests/unit/container_test.py +++ b/tests/unit/container_test.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import docker from .. import mock diff --git a/tests/unit/network_test.py b/tests/unit/network_test.py index b829de196..ab7ad59cf 100644 --- a/tests/unit/network_test.py +++ b/tests/unit/network_test.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import pytest from .. import mock diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py index 0735bfccb..e4c98b5d6 100644 --- a/tests/unit/parallel_test.py +++ b/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 diff --git a/tests/unit/progress_stream_test.py b/tests/unit/progress_stream_test.py index 6fdb7d927..b885b239b 100644 --- a/tests/unit/progress_stream_test.py +++ b/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 diff --git a/tests/unit/project_test.py b/tests/unit/project_test.py index 6391fac86..1ad49c1aa 100644 --- a/tests/unit/project_test.py +++ b/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 diff --git a/tests/unit/service_test.py b/tests/unit/service_test.py index 592e22f75..d4e7f3c5d 100644 --- a/tests/unit/service_test.py +++ b/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 diff --git a/tests/unit/split_buffer_test.py b/tests/unit/split_buffer_test.py index dedd4ee36..f1974c831 100644 --- a/tests/unit/split_buffer_test.py +++ b/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 diff --git a/tests/unit/timeparse_test.py b/tests/unit/timeparse_test.py index 9915932c3..e56595f18 100644 --- a/tests/unit/timeparse_test.py +++ b/tests/unit/timeparse_test.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - from compose import timeparse diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py index 21b88d962..f1febc13e 100644 --- a/tests/unit/utils_test.py +++ b/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 diff --git a/tests/unit/volume_test.py b/tests/unit/volume_test.py index 457d85581..8b2f6cfee 100644 --- a/tests/unit/volume_test.py +++ b/tests/unit/volume_test.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import docker import pytest diff --git a/tox.ini b/tox.ini index 5f57cfb11..c7cde59ef 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py37,pre-commit +envlist = py37,pre-commit [testenv] usedevelop=True From 5529376d4c9ae47b1330f6f74bc6d73ddb791b8f Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Tue, 19 Nov 2019 15:34:42 +0100 Subject: [PATCH 2/7] Removed six Signed-off-by: Bastian Venthur --- compose/cli/command.py | 4 +--- compose/cli/formatter.py | 3 +-- compose/cli/utils.py | 3 +-- compose/cli/verbose_proxy.py | 6 ++---- compose/config/config.py | 19 +++++++++--------- compose/config/environment.py | 5 +---- compose/config/interpolation.py | 16 +++++++-------- compose/config/serialize.py | 11 +++++----- compose/config/types.py | 9 ++++----- compose/config/validation.py | 15 +++++++------- compose/container.py | 3 +-- compose/project.py | 7 +++---- compose/service.py | 30 +++++++++------------------- compose/utils.py | 12 ++++------- requirements.txt | 2 -- setup.py | 1 - tests/acceptance/cli_test.py | 11 ++-------- tests/integration/service_test.py | 21 ++++++++++--------- tests/integration/volume_test.py | 3 +-- tests/unit/cli/command_test.py | 10 ---------- tests/unit/cli/log_printer_test.py | 4 ++-- tests/unit/cli/verbose_proxy_test.py | 4 +--- tests/unit/parallel_test.py | 13 ++++++------ 23 files changed, 77 insertions(+), 135 deletions(-) diff --git a/compose/cli/command.py b/compose/cli/command.py index 6c88e5819..f18f76639 100644 --- a/compose/cli/command.py +++ b/compose/cli/command.py @@ -2,8 +2,6 @@ import logging import os import re -import six - from . import errors from .. import config from .. import parallel @@ -107,7 +105,7 @@ def get_config_from_options(base_dir, options, additional_options=None): def get_config_path_from_options(base_dir, options, environment): def unicode_paths(paths): - return [p.decode('utf-8') if isinstance(p, six.binary_type) else p for p in paths] + return [p.decode('utf-8') if isinstance(p, bytes) else p for p in paths] file_option = options.get('--file') if file_option: diff --git a/compose/cli/formatter.py b/compose/cli/formatter.py index 4dabe77c2..a59f0742c 100644 --- a/compose/cli/formatter.py +++ b/compose/cli/formatter.py @@ -1,7 +1,6 @@ import logging import shutil -import six import texttable from compose.cli import colors @@ -54,7 +53,7 @@ class ConsoleWarningFormatter(logging.Formatter): return '' def format(self, record): - if isinstance(record.msg, six.binary_type): + if isinstance(record.msg, bytes): record.msg = record.msg.decode('utf-8') message = super(ConsoleWarningFormatter, self).format(record) return '{0}{1}'.format(self.get_level_message(record), message) diff --git a/compose/cli/utils.py b/compose/cli/utils.py index 65ba74dbb..b91ab6a13 100644 --- a/compose/cli/utils.py +++ b/compose/cli/utils.py @@ -7,7 +7,6 @@ import sys import distro import docker -import six import compose from ..const import IS_WINDOWS_PLATFORM @@ -141,7 +140,7 @@ def human_readable_file_size(size): def binarystr_to_unicode(s): - if not isinstance(s, six.binary_type): + if not isinstance(s, bytes): return s if IS_WINDOWS_PLATFORM: diff --git a/compose/cli/verbose_proxy.py b/compose/cli/verbose_proxy.py index 68dfabe52..1d2f28b5c 100644 --- a/compose/cli/verbose_proxy.py +++ b/compose/cli/verbose_proxy.py @@ -3,12 +3,10 @@ import logging import pprint from itertools import chain -import six - def format_call(args, kwargs): args = (repr(a) for a in args) - kwargs = ("{0!s}={1!r}".format(*item) for item in six.iteritems(kwargs)) + kwargs = ("{0!s}={1!r}".format(*item) for item in kwargs.items()) return "({0})".format(", ".join(chain(args, kwargs))) @@ -38,7 +36,7 @@ class VerboseProxy(object): def __getattr__(self, name): attr = getattr(self.obj, name) - if not six.callable(attr): + if not callable(attr): return attr return functools.partial(self.proxy_callable, name) diff --git a/compose/config/config.py b/compose/config/config.py index 52863b13c..61fad199f 100644 --- a/compose/config/config.py +++ b/compose/config/config.py @@ -8,7 +8,6 @@ import sys from collections import namedtuple from operator import attrgetter -import six import yaml from cached_property import cached_property @@ -201,7 +200,7 @@ class ConfigFile(namedtuple('_ConfigFile', 'filename config')): 'Compose file version 1.'.format(self.filename)) return V1 - if not isinstance(version, six.string_types): + if not isinstance(version, str): raise ConfigurationError( 'Version in "{}" is invalid - it should be a string.' .format(self.filename)) @@ -684,12 +683,12 @@ def resolve_environment(service_dict, environment=None, interpolate=True): env.update(env_vars_from_file(env_file, interpolate)) env.update(parse_environment(service_dict.get('environment'))) - return dict(resolve_env_var(k, v, environment) for k, v in six.iteritems(env)) + return dict(resolve_env_var(k, v, environment) for k, v in env.items()) def resolve_build_args(buildargs, environment): args = parse_build_arguments(buildargs) - return dict(resolve_env_var(k, v, environment) for k, v in six.iteritems(args)) + return dict(resolve_env_var(k, v, environment) for k, v in args.items()) def validate_extended_service_dict(service_dict, filename, service): @@ -776,7 +775,7 @@ def process_service(service_config): def process_build_section(service_dict, working_dir): - if isinstance(service_dict['build'], six.string_types): + if isinstance(service_dict['build'], str): service_dict['build'] = resolve_build_path(working_dir, service_dict['build']) elif isinstance(service_dict['build'], dict): if 'context' in service_dict['build']: @@ -844,7 +843,7 @@ def process_healthcheck(service_dict): hc['test'] = ['NONE'] for field in ['interval', 'timeout', 'start_period']: - if field not in hc or isinstance(hc[field], six.integer_types): + if field not in hc or isinstance(hc[field], int): continue hc[field] = parse_nanoseconds_int(hc[field]) @@ -1176,7 +1175,7 @@ def merge_ports(md, base, override): def merge_build(output, base, override): def to_dict(service): build_config = service.get('build', {}) - if isinstance(build_config, six.string_types): + if isinstance(build_config, str): return {'context': build_config} return build_config @@ -1386,7 +1385,7 @@ def normalize_build(service_dict, working_dir, environment): if 'build' in service_dict: build = {} # Shortcut where specifying a string is treated as the build context - if isinstance(service_dict['build'], six.string_types): + if isinstance(service_dict['build'], str): build['context'] = service_dict.pop('build') else: build.update(service_dict['build']) @@ -1412,7 +1411,7 @@ def validate_paths(service_dict): if 'build' in service_dict: build = service_dict.get('build', {}) - if isinstance(build, six.string_types): + if isinstance(build, str): build_path = build elif isinstance(build, dict) and 'context' in build: build_path = build['context'] @@ -1503,7 +1502,7 @@ def merge_list_or_string(base, override): def to_list(value): if value is None: return [] - elif isinstance(value, six.string_types): + elif isinstance(value, str): return [value] else: return value diff --git a/compose/config/environment.py b/compose/config/environment.py index abcafe0ce..4526d0b3e 100644 --- a/compose/config/environment.py +++ b/compose/config/environment.py @@ -1,11 +1,8 @@ -import codecs -import contextlib import logging import os import re import dotenv -import six from ..const import IS_WINDOWS_PLATFORM from .errors import ConfigurationError @@ -15,7 +12,7 @@ log = logging.getLogger(__name__) def split_env(env): - if isinstance(env, six.binary_type): + if isinstance(env, bytes): env = env.decode('utf-8', 'replace') key = value = None if '=' in env: diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py index f202e9114..9f0fc4847 100644 --- a/compose/config/interpolation.py +++ b/compose/config/interpolation.py @@ -2,8 +2,6 @@ import logging import re from string import Template -import six - from .errors import ConfigurationError from compose.const import COMPOSEFILE_V2_0 as V2_0 from compose.utils import parse_bytes @@ -74,7 +72,7 @@ def recursive_interpolate(obj, interpolator, config_path): def append(config_path, key): return '{}/{}'.format(config_path, key) - if isinstance(obj, six.string_types): + if isinstance(obj, str): return converter.convert(config_path, interpolator.interpolate(obj)) if isinstance(obj, dict): return dict( @@ -135,7 +133,7 @@ class TemplateWithDefaults(Template): if named is not None: val = mapping[named] - if isinstance(val, six.binary_type): + if isinstance(val, bytes): val = val.decode('utf-8') return '%s' % (val,) if mo.group('escaped') is not None: @@ -174,7 +172,7 @@ def service_path(*args): def to_boolean(s): - if not isinstance(s, six.string_types): + if not isinstance(s, str): return s s = s.lower() if s in ['y', 'yes', 'true', 'on']: @@ -185,11 +183,11 @@ def to_boolean(s): def to_int(s): - if not isinstance(s, six.string_types): + if not isinstance(s, str): return s # We must be able to handle octal representation for `mode` values notably - if six.PY3 and re.match('^0[0-9]+$', s.strip()): + if re.match('^0[0-9]+$', s.strip()): s = '0o' + s[1:] try: return int(s, base=0) @@ -198,7 +196,7 @@ def to_int(s): def to_float(s): - if not isinstance(s, six.string_types): + if not isinstance(s, str): return s try: @@ -221,7 +219,7 @@ def bytes_to_int(s): def to_microseconds(v): - if not isinstance(v, six.string_types): + if not isinstance(v, str): return v return int(parse_nanoseconds_int(v) / 1000) diff --git a/compose/config/serialize.py b/compose/config/serialize.py index 79b5777cb..fe0d007a6 100644 --- a/compose/config/serialize.py +++ b/compose/config/serialize.py @@ -1,4 +1,3 @@ -import six import yaml from compose.config import types @@ -12,7 +11,7 @@ from compose.const import COMPOSEFILE_V3_5 as V3_5 def serialize_config_type(dumper, data): - representer = dumper.represent_str if six.PY3 else dumper.represent_unicode + representer = dumper.represent_str return representer(data.repr()) @@ -22,9 +21,9 @@ def serialize_dict_type(dumper, data): def serialize_string(dumper, data): """ Ensure boolean-like strings are quoted in the output """ - representer = dumper.represent_str if six.PY3 else dumper.represent_unicode + representer = dumper.represent_str - if isinstance(data, six.binary_type): + if isinstance(data, bytes): data = data.decode('utf-8') if data.lower() in ('y', 'n', 'yes', 'no', 'on', 'off', 'true', 'false'): @@ -95,10 +94,10 @@ def v3_introduced_name_key(key): def serialize_config(config, image_digests=None, escape_dollar=True): if escape_dollar: yaml.SafeDumper.add_representer(str, serialize_string_escape_dollar) - yaml.SafeDumper.add_representer(six.text_type, serialize_string_escape_dollar) + yaml.SafeDumper.add_representer(str, serialize_string_escape_dollar) else: yaml.SafeDumper.add_representer(str, serialize_string) - yaml.SafeDumper.add_representer(six.text_type, serialize_string) + yaml.SafeDumper.add_representer(str, serialize_string) return yaml.safe_dump( denormalize_config(config, image_digests), default_flow_style=False, diff --git a/compose/config/types.py b/compose/config/types.py index 4a7a25b2b..0c654fa6f 100644 --- a/compose/config/types.py +++ b/compose/config/types.py @@ -7,7 +7,6 @@ import os import re from collections import namedtuple -import six from docker.utils.ports import build_port_bindings from ..const import COMPOSEFILE_V1 as V1 @@ -101,7 +100,7 @@ def serialize_restart_spec(restart_spec): return '' parts = [restart_spec['Name']] if restart_spec['MaximumRetryCount']: - parts.append(six.text_type(restart_spec['MaximumRetryCount'])) + parts.append(str(restart_spec['MaximumRetryCount'])) return ':'.join(parts) @@ -323,7 +322,7 @@ class ServiceLink(namedtuple('_ServiceLink', 'target alias')): class ServiceConfigBase(namedtuple('_ServiceConfigBase', 'source target uid gid mode name')): @classmethod def parse(cls, spec): - if isinstance(spec, six.string_types): + if isinstance(spec, str): return cls(spec, None, None, None, None, None) return cls( spec.get('source'), @@ -361,7 +360,7 @@ class ServicePort(namedtuple('_ServicePort', 'target published protocol mode ext raise ConfigurationError('Invalid target port: {}'.format(target)) if published: - if isinstance(published, six.string_types) and '-' in published: # "x-y:z" format + if isinstance(published, str) and '-' in published: # "x-y:z" format a, b = published.split('-', 1) try: int(a) @@ -474,7 +473,7 @@ def normalize_port_dict(port): class SecurityOpt(namedtuple('_SecurityOpt', 'value src_file')): @classmethod def parse(cls, value): - if not isinstance(value, six.string_types): + if not isinstance(value, str): return value # based on https://github.com/docker/cli/blob/9de1b162f/cli/command/container/opts.go#L673-L697 con = value.split('=', 2) diff --git a/compose/config/validation.py b/compose/config/validation.py index f8513bdef..3161b2395 100644 --- a/compose/config/validation.py +++ b/compose/config/validation.py @@ -4,7 +4,6 @@ import os import re import sys -import six from docker.utils.ports import split_port from jsonschema import Draft4Validator from jsonschema import FormatChecker @@ -72,13 +71,13 @@ def format_ports(instance): try: split_port(instance) except ValueError as e: - raise ValidationError(six.text_type(e)) + raise ValidationError(str(e)) return True @FormatChecker.cls_checks(format="expose", raises=ValidationError) def format_expose(instance): - if isinstance(instance, six.string_types): + if isinstance(instance, str): if not re.match(VALID_EXPOSE_FORMAT, instance): raise ValidationError( "should be of the format 'PORT[/PROTOCOL]'") @@ -88,7 +87,7 @@ def format_expose(instance): @FormatChecker.cls_checks("subnet_ip_address", raises=ValidationError) def format_subnet_ip_address(instance): - if isinstance(instance, six.string_types): + if isinstance(instance, str): if not re.match(VALID_REGEX_IPV4_CIDR, instance) and \ not re.match(VALID_REGEX_IPV6_CIDR, instance): raise ValidationError("should use the CIDR format") @@ -135,7 +134,7 @@ def validate_config_section(filename, config, section): type=anglicize_json_type(python_type_to_yaml_type(config)))) for key, value in config.items(): - if not isinstance(key, six.string_types): + if not isinstance(key, str): raise ConfigurationError( "In file '{filename}', the {section} name {name} must be a " "quoted string, i.e. '{name}'.".format( @@ -163,7 +162,7 @@ def validate_top_level_object(config_file): def validate_ulimits(service_config): ulimit_config = service_config.config.get('ulimits', {}) - for limit_name, soft_hard_values in six.iteritems(ulimit_config): + for limit_name, soft_hard_values in ulimit_config.items(): if isinstance(soft_hard_values, dict): if not soft_hard_values['soft'] <= soft_hard_values['hard']: raise ConfigurationError( @@ -326,7 +325,7 @@ def handle_generic_error(error, path): required_keys) elif error.cause: - error_msg = six.text_type(error.cause) + error_msg = str(error.cause) msg_format = "{path} is invalid: {msg}" elif error.path: @@ -346,7 +345,7 @@ def parse_key_from_error_msg(error): def path_string(path): - return ".".join(c for c in path if isinstance(c, six.string_types)) + return ".".join(c for c in path if isinstance(c, str)) def _parse_valid_types_from_validator(validator): diff --git a/compose/container.py b/compose/container.py index 37de4e6f6..18deabbda 100644 --- a/compose/container.py +++ b/compose/container.py @@ -1,6 +1,5 @@ from functools import reduce -import six from docker.errors import ImageNotFound from .const import LABEL_CONTAINER_NUMBER @@ -127,7 +126,7 @@ class Container(object): return ', '.join( ','.join(format_port(*item)) - for item in sorted(six.iteritems(self.ports)) + for item in sorted(self.ports.items()) ) @property diff --git a/compose/project.py b/compose/project.py index 90a6f5cd5..4c8b197f2 100644 --- a/compose/project.py +++ b/compose/project.py @@ -6,7 +6,6 @@ import re from functools import reduce from os import path -import six from docker.errors import APIError from docker.errors import ImageNotFound from docker.errors import NotFound @@ -391,7 +390,7 @@ class Project(object): ) if len(errors): combined_errors = '\n'.join([ - e.decode('utf-8') if isinstance(e, six.binary_type) else e for e in errors.values() + e.decode('utf-8') if isinstance(e, bytes) else e for e in errors.values() ]) raise ProjectError(combined_errors) @@ -681,7 +680,7 @@ class Project(object): .format(' '.join(must_build))) if len(errors): combined_errors = '\n'.join([ - e.decode('utf-8') if isinstance(e, six.binary_type) else e for e in errors.values() + e.decode('utf-8') if isinstance(e, bytes) else e for e in errors.values() ]) raise ProjectError(combined_errors) @@ -931,7 +930,7 @@ class NeedsPull(Exception): class NoSuchService(Exception): def __init__(self, name): - if isinstance(name, six.binary_type): + if isinstance(name, bytes): name = name.decode('utf-8') self.name = name self.msg = "No such service: %s" % self.name diff --git a/compose/service.py b/compose/service.py index 18173cf70..673b0b335 100644 --- a/compose/service.py +++ b/compose/service.py @@ -4,13 +4,13 @@ import json import logging import os import re +import subprocess import sys import tempfile from collections import namedtuple from collections import OrderedDict from operator import attrgetter -import six from docker.errors import APIError from docker.errors import ImageNotFound from docker.errors import NotFound @@ -59,10 +59,6 @@ from .utils import truncate_id from .utils import unique_everseen from compose.cli.utils import binarystr_to_unicode -if six.PY2: - import subprocess32 as subprocess -else: - import subprocess log = logging.getLogger(__name__) @@ -422,7 +418,7 @@ class Service(object): except NoSuchImageError as e: log.debug( 'Service %s has diverged: %s', - self.name, six.text_type(e), + self.name, str(e), ) return True @@ -972,7 +968,7 @@ class Service(object): blkio_config = convert_blkio_config(options.get('blkio_config', None)) log_config = get_log_config(logging_dict) init_path = None - if isinstance(options.get('init'), six.string_types): + if isinstance(options.get('init'), str): init_path = options.get('init') options['init'] = True @@ -1106,7 +1102,7 @@ class Service(object): try: all_events = list(stream_output(build_output, output_stream)) except StreamOutputError as e: - raise BuildError(self, six.text_type(e)) + raise BuildError(self, str(e)) # Ensure the HTTP connection is not reused for another # streaming command, as the Docker daemon can sometimes @@ -1221,7 +1217,7 @@ class Service(object): if not ignore_pull_failures: raise else: - log.error(six.text_type(e)) + log.error(str(e)) def pull(self, ignore_pull_failures=False, silent=False, stream=False): if 'image' not in self.options: @@ -1262,7 +1258,7 @@ class Service(object): if not ignore_push_failures: raise else: - log.error(six.text_type(e)) + log.error(str(e)) def is_healthy(self): """ Check that all containers for this service report healthy. @@ -1628,8 +1624,8 @@ def build_ulimits(ulimit_config): if not ulimit_config: return None ulimits = [] - for limit_name, soft_hard_values in six.iteritems(ulimit_config): - if isinstance(soft_hard_values, six.integer_types): + for limit_name, soft_hard_values in ulimit_config.items(): + if isinstance(soft_hard_values, int): ulimits.append({'name': limit_name, 'soft': soft_hard_values, 'hard': soft_hard_values}) elif isinstance(soft_hard_values, dict): ulimit_dict = {'name': limit_name} @@ -1653,7 +1649,7 @@ def format_environment(environment): def format_env(key, value): if value is None: return key - if isinstance(value, six.binary_type): + if isinstance(value, bytes): value = value.decode('utf-8') return '{key}={value}'.format(key=key, value=value) @@ -1704,11 +1700,6 @@ def convert_blkio_config(blkio_config): def rewrite_build_path(path): - # python2 os.stat() doesn't support unicode on some UNIX, so we - # encode it to a bytestring to be safe - if not six.PY3 and not IS_WINDOWS_PLATFORM: - path = path.encode('utf8') - if IS_WINDOWS_PLATFORM and not is_url(path) and not path.startswith(WINDOWS_LONGPATH_PREFIX): path = WINDOWS_LONGPATH_PREFIX + os.path.normpath(path) @@ -1806,9 +1797,6 @@ class _CLIBuilder(object): line = p.stdout.readline() if not line: break - # Fix non ascii chars on Python2. To remove when #6890 is complete. - if six.PY2: - magic_word = str(magic_word) if line.startswith(magic_word): appear = True yield json.dumps({"stream": line}) diff --git a/compose/utils.py b/compose/utils.py index 4ea163c42..9170abc13 100644 --- a/compose/utils.py +++ b/compose/utils.py @@ -1,11 +1,9 @@ -import codecs import hashlib import json.decoder import logging import ntpath import random -import six from docker.errors import DockerException from docker.utils import parse_bytes as sdk_parse_bytes @@ -19,9 +17,7 @@ log = logging.getLogger(__name__) def get_output_stream(stream): - if six.PY3: - return stream - return codecs.getwriter('utf-8')(stream) + return stream def stream_as_text(stream): @@ -32,13 +28,13 @@ def stream_as_text(stream): of byte streams. """ for data in stream: - if not isinstance(data, six.text_type): + if not isinstance(data, str): data = data.decode('utf-8', 'replace') yield data def line_splitter(buffer, separator=u'\n'): - index = buffer.find(six.text_type(separator)) + index = buffer.find(str(separator)) if index == -1: return None return buffer[:index + 1], buffer[index + 1:] @@ -53,7 +49,7 @@ def split_buffer(stream, splitter=None, decoder=lambda a: a): of the input. """ splitter = splitter or line_splitter - buffered = six.text_type('') + buffered = str('') for data in stream_as_text(stream): buffered += data diff --git a/requirements.txt b/requirements.txt index 4dea71c14..32257fced 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,8 +20,6 @@ PySocks==1.7.1 python-dotenv==0.13.0 PyYAML==5.3 requests==2.22.0 -six==1.12.0 -subprocess32==3.5.4; python_version < '3.2' texttable==1.6.2 urllib3==1.25.9; python_version == '3.3' wcwidth==0.1.9 diff --git a/setup.py b/setup.py index dad44d72e..e32785225 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,6 @@ install_requires = [ 'distro >= 1.5.0, < 2', 'docker[ssh] >= 3.7.0, < 5', 'dockerpty >= 0.4.1, < 1', - 'six >= 1.3.0, < 2', 'jsonschema >= 2.5.1, < 4', 'python-dotenv >= 0.13.0, < 1', ] diff --git a/tests/acceptance/cli_test.py b/tests/acceptance/cli_test.py index 868e1e227..c84d3f8cb 100644 --- a/tests/acceptance/cli_test.py +++ b/tests/acceptance/cli_test.py @@ -12,7 +12,6 @@ from functools import reduce from operator import attrgetter import pytest -import six import yaml from docker import errors @@ -2219,15 +2218,9 @@ services: @mock.patch.dict(os.environ) def test_run_unicode_env_values_from_system(self): value = 'ą, ć, ę, ł, ń, ó, ś, ź, ż' - if six.PY2: # os.environ doesn't support unicode values in Py2 - os.environ['BAR'] = value.encode('utf-8') - else: # ... and doesn't support byte values in Py3 - os.environ['BAR'] = value + os.environ['BAR'] = value self.base_dir = 'tests/fixtures/unicode-environment' - result = self.dispatch(['run', 'simple']) - - if six.PY2: # Can't retrieve output on Py3. See issue #3670 - assert value in result.stdout.strip() + self.dispatch(['run', 'simple']) container = self.project.containers(one_off=OneOffFilter.only, stopped=True)[0] environment = container.get('Config.Env') diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py index e83b8af07..9af5a2324 100644 --- a/tests/integration/service_test.py +++ b/tests/integration/service_test.py @@ -9,7 +9,6 @@ from os import path import pytest from docker.errors import APIError from docker.errors import ImageNotFound -from six import text_type from .. import mock from ..helpers import BUSYBOX_IMAGE_WITH_TAG @@ -1029,7 +1028,7 @@ class ServiceTest(DockerClientTestCase): with open(os.path.join(base_dir.encode('utf8'), b'foo\xE2bar'), 'w') as f: f.write("hello world\n") - service = self.create_service('web', build={'context': text_type(base_dir)}) + service = self.create_service('web', build={'context': str(base_dir)}) service.build() self.addCleanup(self.client.remove_image, service.image_name) assert self.client.inspect_image('composetest_web') @@ -1063,7 +1062,7 @@ class ServiceTest(DockerClientTestCase): f.write("RUN echo ${build_version}\n") service = self.create_service('buildwithargs', - build={'context': text_type(base_dir), + build={'context': str(base_dir), 'args': {"build_version": "1"}}) service.build() self.addCleanup(self.client.remove_image, service.image_name) @@ -1080,7 +1079,7 @@ class ServiceTest(DockerClientTestCase): f.write("RUN echo ${build_version}\n") service = self.create_service('buildwithargs', - build={'context': text_type(base_dir), + build={'context': str(base_dir), 'args': {"build_version": "1"}}) service.build(build_args_override={'build_version': '2'}) self.addCleanup(self.client.remove_image, service.image_name) @@ -1096,7 +1095,7 @@ class ServiceTest(DockerClientTestCase): f.write('FROM busybox\n') service = self.create_service('buildlabels', build={ - 'context': text_type(base_dir), + 'context': str(base_dir), 'labels': {'com.docker.compose.test': 'true'} }) service.build() @@ -1123,7 +1122,7 @@ class ServiceTest(DockerClientTestCase): self.client.start(net_container) service = self.create_service('buildwithnet', build={ - 'context': text_type(base_dir), + 'context': str(base_dir), 'network': 'container:{}'.format(net_container['Id']) }) @@ -1147,7 +1146,7 @@ class ServiceTest(DockerClientTestCase): f.write('LABEL com.docker.compose.test.target=two\n') service = self.create_service('buildtarget', build={ - 'context': text_type(base_dir), + 'context': str(base_dir), 'target': 'one' }) @@ -1169,7 +1168,7 @@ class ServiceTest(DockerClientTestCase): ])) service = self.create_service('build_extra_hosts', build={ - 'context': text_type(base_dir), + 'context': str(base_dir), 'extra_hosts': { 'foobar': '127.0.0.1', 'baz': '127.0.0.1' @@ -1191,7 +1190,7 @@ class ServiceTest(DockerClientTestCase): f.write('hello world\n') service = self.create_service('build_gzip', build={ - 'context': text_type(base_dir), + 'context': str(base_dir), }) service.build(gzip=True) assert service.image() @@ -1204,7 +1203,7 @@ class ServiceTest(DockerClientTestCase): f.write('FROM busybox\n') service = self.create_service('build_isolation', build={ - 'context': text_type(base_dir), + 'context': str(base_dir), 'isolation': 'default', }) service.build() @@ -1218,7 +1217,7 @@ class ServiceTest(DockerClientTestCase): service = Service( 'build_leading_slug', client=self.client, project='___-composetest', build={ - 'context': text_type(base_dir) + 'context': str(base_dir) } ) assert service.image_name == 'composetest_build_leading_slug' diff --git a/tests/integration/volume_test.py b/tests/integration/volume_test.py index 1e02647fb..2ede7bf28 100644 --- a/tests/integration/volume_test.py +++ b/tests/integration/volume_test.py @@ -1,4 +1,3 @@ -import six from docker.errors import DockerException from .testcases import DockerClientTestCase @@ -24,7 +23,7 @@ class VolumeTest(DockerClientTestCase): def create_volume(self, name, driver=None, opts=None, external=None, custom_name=False): if external: custom_name = True - if isinstance(external, six.text_type): + if isinstance(external, str): name = external vol = Volume( diff --git a/tests/unit/cli/command_test.py b/tests/unit/cli/command_test.py index e2a899517..20702d975 100644 --- a/tests/unit/cli/command_test.py +++ b/tests/unit/cli/command_test.py @@ -2,7 +2,6 @@ import os import pytest -import six from compose.cli.command import get_config_path_from_options from compose.config.environment import Environment @@ -62,12 +61,3 @@ class TestGetConfigPathFromOptions(object): assert get_config_path_from_options( '.', opts, environment ) == ['就吃饭/docker-compose.yml'] - - @pytest.mark.skipif(six.PY3, reason='Env values in Python 3 are already Unicode') - def test_unicode_path_from_env(self): - with mock.patch.dict(os.environ): - os.environ['COMPOSE_FILE'] = b'\xe5\xb0\xb1\xe5\x90\x83\xe9\xa5\xad/docker-compose.yml' - environment = Environment.from_env_file('.') - assert get_config_path_from_options( - '.', {}, environment - ) == ['就吃饭/docker-compose.yml'] diff --git a/tests/unit/cli/log_printer_test.py b/tests/unit/cli/log_printer_test.py index da0abb99f..38dd56c71 100644 --- a/tests/unit/cli/log_printer_test.py +++ b/tests/unit/cli/log_printer_test.py @@ -1,9 +1,9 @@ import itertools +from io import StringIO from queue import Queue import pytest import requests -import six from docker.errors import APIError from compose.cli.log_printer import build_log_generator @@ -19,7 +19,7 @@ from tests import mock @pytest.fixture def output_stream(): - output = six.StringIO() + output = StringIO() output.flush = mock.Mock() return output diff --git a/tests/unit/cli/verbose_proxy_test.py b/tests/unit/cli/verbose_proxy_test.py index 1da1676eb..0da662fd0 100644 --- a/tests/unit/cli/verbose_proxy_test.py +++ b/tests/unit/cli/verbose_proxy_test.py @@ -1,5 +1,3 @@ -import six - from compose.cli import verbose_proxy from tests import unittest @@ -7,7 +5,7 @@ from tests import unittest class VerboseProxyTestCase(unittest.TestCase): def test_format_call(self): - prefix = '' if six.PY3 else 'u' + prefix = '' expected = "(%(p)s'arg1', True, key=%(p)s'value')" % dict(p=prefix) actual = verbose_proxy.format_call( ("arg1", True), diff --git a/tests/unit/parallel_test.py b/tests/unit/parallel_test.py index e4c98b5d6..98412f9a2 100644 --- a/tests/unit/parallel_test.py +++ b/tests/unit/parallel_test.py @@ -1,7 +1,6 @@ import unittest from threading import Lock -import six from docker.errors import APIError from compose.parallel import GlobalLimit @@ -36,7 +35,7 @@ class ParallelTest(unittest.TestCase): results, errors = parallel_execute( objects=[1, 2, 3, 4, 5], func=lambda x: x * 2, - get_name=six.text_type, + get_name=str, msg="Doubling", ) @@ -58,7 +57,7 @@ class ParallelTest(unittest.TestCase): results, errors = parallel_execute( objects=list(range(tasks)), func=f, - get_name=six.text_type, + get_name=str, msg="Testing", limit=limit, ) @@ -82,7 +81,7 @@ class ParallelTest(unittest.TestCase): results, errors = parallel_execute( objects=list(range(tasks)), func=f, - get_name=six.text_type, + get_name=str, msg="Testing", ) @@ -144,7 +143,7 @@ def test_parallel_execute_alignment(capsys): results, errors = parallel_execute( objects=["short", "a very long name"], func=lambda x: x, - get_name=six.text_type, + get_name=str, msg="Aligning", ) @@ -161,7 +160,7 @@ def test_parallel_execute_ansi(capsys): results, errors = parallel_execute( objects=["something", "something more"], func=lambda x: x, - get_name=six.text_type, + get_name=str, msg="Control characters", ) @@ -177,7 +176,7 @@ def test_parallel_execute_noansi(capsys): results, errors = parallel_execute( objects=["something", "something more"], func=lambda x: x, - get_name=six.text_type, + get_name=str, msg="Control characters", ) From c44746d92d696d64386145216b605733d2e12a37 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 8 Jan 2020 09:52:04 +0100 Subject: [PATCH 3/7] Removed now useless check for version_info >= 2.7 Signed-off-by: Bastian Venthur --- tests/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index d3cfb8649..84347ec0f 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,9 +1,4 @@ -import sys - -if sys.version_info >= (2, 7): - import unittest # NOQA -else: - import unittest2 as unittest # NOQA +import unittest # NOQA try: from unittest import mock From 0263d3ec3714131acaa17900c6d620a5a2064c7c Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 8 Jan 2020 10:04:38 +0100 Subject: [PATCH 4/7] Removed now unused get_output_stream method Signed-off-by: Bastian Venthur --- compose/cli/log_printer.py | 3 +-- compose/parallel.py | 3 +-- compose/progress_stream.py | 2 +- compose/utils.py | 4 ---- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/compose/cli/log_printer.py b/compose/cli/log_printer.py index fd193000f..100f3a825 100644 --- a/compose/cli/log_printer.py +++ b/compose/cli/log_printer.py @@ -9,7 +9,6 @@ from threading import Thread from docker.errors import APIError from . import colors -from compose import utils from compose.cli.signals import ShutdownException from compose.utils import split_buffer @@ -64,7 +63,7 @@ class LogPrinter(object): self.containers = containers self.presenters = presenters self.event_stream = event_stream - self.output = utils.get_output_stream(output) + self.output = output self.cascade_stop = cascade_stop self.log_args = log_args or {} diff --git a/compose/parallel.py b/compose/parallel.py index 6ef9ceedd..15c3ad572 100644 --- a/compose/parallel.py +++ b/compose/parallel.py @@ -18,7 +18,6 @@ from compose.const import PARALLEL_LIMIT from compose.errors import HealthCheckFailed from compose.errors import NoHealthCheckConfigured from compose.errors import OperationFailedError -from compose.utils import get_output_stream log = logging.getLogger(__name__) @@ -82,7 +81,7 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None, limit=None, fa in the CLI logs, but don't raise an exception (such as attempting to start 0 containers) """ objects = list(objects) - stream = get_output_stream(sys.stderr) + stream = sys.stderr if ParallelStreamWriter.instance: writer = ParallelStreamWriter.instance diff --git a/compose/progress_stream.py b/compose/progress_stream.py index 0ae0dc316..8792ff287 100644 --- a/compose/progress_stream.py +++ b/compose/progress_stream.py @@ -15,7 +15,7 @@ def write_to_stream(s, stream): def stream_output(output, stream): is_terminal = hasattr(stream, 'isatty') and stream.isatty() - stream = utils.get_output_stream(stream) + stream = stream lines = {} diff = 0 diff --git a/compose/utils.py b/compose/utils.py index 9170abc13..8b5ab38d9 100644 --- a/compose/utils.py +++ b/compose/utils.py @@ -16,10 +16,6 @@ json_decoder = json.JSONDecoder() log = logging.getLogger(__name__) -def get_output_stream(stream): - return stream - - def stream_as_text(stream): """Given a stream of bytes or text, if any of the items in the stream are bytes convert them to text. From 6351ad8a9590c6b504dfa271189b1571328f9c2c Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 8 Jan 2020 10:46:28 +0100 Subject: [PATCH 5/7] Import unittest.mock directly. We don't need to support Python2 anymore. Signed-off-by: Bastian Venthur --- tests/__init__.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index 84347ec0f..9d7324900 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,6 +1,2 @@ import unittest # NOQA - -try: - from unittest import mock -except ImportError: - import mock # NOQA +from unittest import mock # NOQA From 8ce743c8c1c42c12729ea74a0572187673455a04 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 3 Jun 2020 18:08:23 +0200 Subject: [PATCH 6/7] Fixed new things that came after the PR Signed-off-by: Bastian Venthur --- compose/cli/docker_client.py | 3 +-- script/release/const.py | 3 --- tests/acceptance/context_test.py | 3 --- tests/conftest.py | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/compose/cli/docker_client.py b/compose/cli/docker_client.py index 3abeb5cdc..493597b80 100644 --- a/compose/cli/docker_client.py +++ b/compose/cli/docker_client.py @@ -2,7 +2,6 @@ import logging import os.path import ssl -import six from docker import APIClient from docker import Context from docker import ContextAPI @@ -44,7 +43,7 @@ def get_client(environment, verbose=False, version=None, context=None): environment=environment, tls_version=get_tls_version(environment) ) if verbose: - version_info = six.iteritems(client.version()) + version_info = client.version().items() log.info(get_version_info('full')) log.info("Docker base_url: %s", client.base_url) log.info("Docker version: %s", diff --git a/script/release/const.py b/script/release/const.py index 77a32332a..8c90eebca 100644 --- a/script/release/const.py +++ b/script/release/const.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import os diff --git a/tests/acceptance/context_test.py b/tests/acceptance/context_test.py index 1d79a22a0..e17e71717 100644 --- a/tests/acceptance/context_test.py +++ b/tests/acceptance/context_test.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import -from __future__ import unicode_literals - import os import shutil import unittest diff --git a/tests/conftest.py b/tests/conftest.py index 013368689..fd31a9748 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import unicode_literals - import pytest import tests.acceptance.cli_test From c5d2d3c30ea14b18af781408976f968602b691e4 Mon Sep 17 00:00:00 2001 From: Bastian Venthur Date: Wed, 3 Jun 2020 18:23:19 +0200 Subject: [PATCH 7/7] re-added accidentally removed contextlib import Signed-off-by: Bastian Venthur --- tests/helpers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/helpers.py b/tests/helpers.py index 2ecb04523..d17868485 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -1,3 +1,4 @@ +import contextlib import os from compose.config.config import ConfigDetails