diff --git a/docs/changelog.rst b/docs/changelog.rst index f687ccf..1c3722b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,10 @@ Changelog ========= +- :bug:`-` We neglected to remove references to ``six`` in a few spots - + including some that utilized Invoke's old vendor of same; this causes issues + when trying to use development and upcoming versions of Invoke. Six is now + truly gone! - :release:`3.0.0 <2022-12-31>` - :support:`-` Various fixes and doc updates re: the `~invocations.autodoc` module's compatibility with modern Sphinx versions. diff --git a/invocations/console.py b/invocations/console.py index a80e025..bbeb6e3 100644 --- a/invocations/console.py +++ b/invocations/console.py @@ -4,8 +4,6 @@ import sys -from invoke.vendor.six.moves import input - # NOTE: originally cribbed from fab 1's contrib.console.confirm def confirm(question, assume_yes=True): diff --git a/invocations/packaging/semantic_version_monkey.py b/invocations/packaging/semantic_version_monkey.py index b12026e..0713c99 100644 --- a/invocations/packaging/semantic_version_monkey.py +++ b/invocations/packaging/semantic_version_monkey.py @@ -5,7 +5,6 @@ or distributing our own fork. """ -from invoke.vendor.six import text_type from semantic_version import Version @@ -17,7 +16,7 @@ def clone(self): Useful when you need to generate a new object that can be mutated separately from the original. """ - return Version(text_type(self)) + return Version(str(self)) Version.clone = clone diff --git a/invocations/testing.py b/invocations/testing.py index 3f1ccd0..18d2105 100644 --- a/invocations/testing.py +++ b/invocations/testing.py @@ -1,8 +1,6 @@ import sys import time from collections import defaultdict -from invoke.vendor.six import iteritems -from invoke.vendor.six.moves import range from invoke import task from tqdm import tqdm @@ -164,7 +162,7 @@ def count_errors(c, command, trials=10, verbose=False, fail_fast=False): counts = defaultdict(int) for period in periods: counts[period] += 1 - mode = sorted((value, key) for key, value in iteritems(counts))[-1][1] + mode = sorted((value, key) for key, value in counts.items())[-1][1] # Emission of stats! if fail_fast: print("First failure occurred after {} successes".format(successes))