Skip to content

Commit

Permalink
Forgot to remote actual use of six, whoops
Browse files Browse the repository at this point in the history
  • Loading branch information
bitprophet committed Jan 6, 2023
1 parent 02bff78 commit 378f83c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 4 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions invocations/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 1 addition & 2 deletions invocations/packaging/semantic_version_monkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
or distributing our own fork.
"""

from invoke.vendor.six import text_type

from semantic_version import Version

Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions invocations/testing.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit 378f83c

Please sign in to comment.