From d76537a76bd8e9408dee5bf5a5af150e1f38c7fe Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Tue, 1 Mar 2022 22:59:02 +0000 Subject: [PATCH] CLN: Remove unused six imports --- asv/commands/publish.py | 3 --- asv/commands/rm.py | 3 --- asv/commands/run.py | 3 --- asv/plugins/conda.py | 5 +---- asv/plugins/regressions.py | 2 -- asv/plugins/summarylist.py | 3 --- asv/plugins/virtualenv.py | 3 --- test/test_compare.py | 2 -- test/test_environment.py | 2 -- test/test_gh_pages.py | 2 -- test/test_machine.py | 3 --- test/test_publish.py | 2 -- test/test_repo.py | 2 -- test/test_rm.py | 3 --- test/test_show.py | 2 -- test/test_util.py | 2 -- test/test_web.py | 2 -- 17 files changed, 1 insertion(+), 43 deletions(-) diff --git a/asv/commands/publish.py b/asv/commands/publish.py index 56a976c00..7f2edb47a 100644 --- a/asv/commands/publish.py +++ b/asv/commands/publish.py @@ -1,13 +1,10 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os import shutil import multiprocessing import datetime from collections import defaultdict -import six - from . import Command from ..benchmarks import Benchmarks from ..console import log diff --git a/asv/commands/rm.py b/asv/commands/rm.py index 2751999d7..7b66dbfa8 100644 --- a/asv/commands/rm.py +++ b/asv/commands/rm.py @@ -1,7 +1,4 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - -import six - from fnmatch import fnmatchcase import sys diff --git a/asv/commands/run.py b/asv/commands/run.py index a2ca2f034..cd1355781 100644 --- a/asv/commands/run.py +++ b/asv/commands/run.py @@ -1,5 +1,4 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os import sys import logging @@ -10,8 +9,6 @@ from collections import defaultdict -import six - from . import Command from ..benchmarks import Benchmarks from ..console import log diff --git a/asv/plugins/conda.py b/asv/plugins/conda.py index 560469319..7a6ba7b99 100644 --- a/asv/plugins/conda.py +++ b/asv/plugins/conda.py @@ -1,12 +1,8 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import re import os import tempfile import contextlib -import multiprocessing - -import six from .. import environment from ..console import log @@ -22,6 +18,7 @@ util.new_multiprocessing_lock("conda_lock") + def _conda_lock(): # function; for easier monkeypatching return util.get_multiprocessing_lock("conda_lock") diff --git a/asv/plugins/regressions.py b/asv/plugins/regressions.py index e67988bf7..1bd085668 100644 --- a/asv/plugins/regressions.py +++ b/asv/plugins/regressions.py @@ -1,10 +1,8 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os import re import itertools import datetime -import six from six.moves.urllib.parse import urlencode diff --git a/asv/plugins/summarylist.py b/asv/plugins/summarylist.py index a72f97642..5b6e79dcb 100644 --- a/asv/plugins/summarylist.py +++ b/asv/plugins/summarylist.py @@ -1,8 +1,6 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os import itertools -import six from ..console import log from ..publishing import OutputPublisher @@ -11,7 +9,6 @@ from .. import util - def benchmark_param_iter(benchmark): """ Iterate over all combinations of parameterized benchmark parameters. diff --git a/asv/plugins/virtualenv.py b/asv/plugins/virtualenv.py index 831b42c94..72421119c 100644 --- a/asv/plugins/virtualenv.py +++ b/asv/plugins/virtualenv.py @@ -1,12 +1,9 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - from distutils.version import LooseVersion import sys import re import os -import six - from .. import environment from ..console import log from .. import util diff --git a/test/test_compare.py b/test/test_compare.py index dda718478..a6f5569ad 100644 --- a/test/test_compare.py +++ b/test/test_compare.py @@ -1,9 +1,7 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os from os.path import abspath, dirname, join -import six import pytest import shutil diff --git a/test/test_environment.py b/test/test_environment.py index 0ecb6410b..81d50ecdb 100644 --- a/test/test_environment.py +++ b/test/test_environment.py @@ -1,8 +1,6 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os import sys -import six import pytest import json from collections import defaultdict diff --git a/test/test_gh_pages.py b/test/test_gh_pages.py index 750317f59..f4b189db5 100644 --- a/test/test_gh_pages.py +++ b/test/test_gh_pages.py @@ -1,7 +1,5 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os -import six import pytest from . import tools diff --git a/test/test_machine.py b/test/test_machine.py index d0e29f762..8d60a8402 100644 --- a/test/test_machine.py +++ b/test/test_machine.py @@ -1,9 +1,6 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - from os.path import join -import six - from asv import machine diff --git a/test/test_publish.py b/test/test_publish.py index 1cc2ab8fe..8568dadcd 100644 --- a/test/test_publish.py +++ b/test/test_publish.py @@ -1,11 +1,9 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import datetime import os from os.path import abspath, dirname, join, isfile, isdir import shutil -import six import pytest import xml.etree.ElementTree as etree try: diff --git a/test/test_repo.py b/test/test_repo.py index 39c653162..3c7a4799f 100644 --- a/test/test_repo.py +++ b/test/test_repo.py @@ -1,9 +1,7 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os from os.path import join -import six import pytest import tempfile import shutil diff --git a/test/test_rm.py b/test/test_rm.py index 50dd3c00a..ed240effa 100644 --- a/test/test_rm.py +++ b/test/test_rm.py @@ -1,10 +1,7 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - from os.path import dirname, join import shutil -import six - from asv import config from asv import results diff --git a/test/test_show.py b/test/test_show.py index c37dc5c15..e400d359a 100644 --- a/test/test_show.py +++ b/test/test_show.py @@ -1,9 +1,7 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os from os.path import abspath, dirname, join -import six import textwrap from asv import config diff --git a/test/test_util.py b/test/test_util.py index b910ccdce..6c4c29656 100644 --- a/test/test_util.py +++ b/test/test_util.py @@ -1,5 +1,4 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import io import locale import os @@ -11,7 +10,6 @@ import traceback import time import datetime -import six import pytest from asv import console diff --git a/test/test_web.py b/test/test_web.py index fb0e4013c..dc1f6d1a3 100644 --- a/test/test_web.py +++ b/test/test_web.py @@ -1,5 +1,4 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst - import os import re import shutil @@ -8,7 +7,6 @@ import contextlib from os.path import join, abspath, dirname -import six from six.moves.urllib.parse import parse_qs, splitquery, splittag import pytest