Drop python 2 #3566
Merged
Drop python 2 #3566
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
greschd
reviewed
Nov 21, 2019
sphuber
force-pushed
the
fix_3562_drop_python_2
branch
3 times, most recently
from
6974652 to
66550b8
Compare
5 tasks
greschd
previously approved these changes
Nov 25, 2019
|
I think the only thing left to do now is telling Jenkins to use py3 as well. |
|
Yes, but I also wanted to merge some final things that should go into |
|
@sphuber I've just stumbled across a very important little detail: In order for the "graceful fallback" on So that means, for the No idea why that's the case, but just tested this with a different package. It's described here (last paragraph), although you could easily miss it. |
|
Good catch! I will open a PR now |
Merged
sphuber
force-pushed
the
fix_3562_drop_python_2
branch
5 times, most recently
from
a4d7d7f to
e351001
Compare
Remove python 2 from supported version in `setup.json` and remove all dependencies that were only necessary for `python<3.5`. Additionally python 2 is removed from the build matrix on Travis. Add explicit `python_requires` keyword to `setup.json` which will ensure that `pip>=9` and other clients that support the metadata 1.2 spec only install a compatible version for the current Python runtime when installing the package.
sphuber
force-pushed
the
fix_3562_drop_python_2
branch
from
e351001 to
3517f4b
Compare
|
@greschd if you'd like, I added three more commits on top since last time you reviewed. If you have the time you can just look at those commits. |
sphuber
force-pushed
the
fix_3562_drop_python_2
branch
from
3517f4b to
8126314
Compare
The removal of all future statements was performed with the following:
find . -type f -not -path './.git*' -exec sed -i '/from __future__.*$/d' {} +
The `modernizer` hook is also removed from the pre-commit config.
The majority of adaptations was done with the following commands:
find . -type f -not -path './.git*' -exec sed -i '/\(import six\|from six\).*$/d' {} +
find . -type f -not -path './.git*' -exec sed -i '/\(six\.add_metaclass\).*$/d' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.integer_types/int/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.string_types/str/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.text_type/str/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.binary_type/bytes/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.moves.StringIO/io.StringIO/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.StringIO/io.StringIO/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.moves.BytesIO/io.BytesIO/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.BytesIO/io.BytesIO/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's/six.moves.range/range/g' {} +
find . -type f -not -path './.git*' -exec sed -i 's|six.iterkeys(\([^)]*\))|\1.keys()|' {} +
find . -type f -not -path './.git*' -exec sed -i 's|six.iteritems(\([^)]*\))|\1.items()|' {} +
find . -type f -not -path './.git*' -exec sed -i 's|six.itervalues(\([^)]*\))|\1.values()|' {} +
This is no longer needed for python 3.
In python 3 strings are stored as unicode by default so now that we dropped pyhon 2 support there is no need to keep prefixing them with the string encoding declaration `u`.
This is no longer necesary in python 3. To remove all the occurrences
of this usage, the following command was used:
find . -type f -not -path './.git*' -exec \
sed -i 's/super([^)]*,[^)]*)/super()/g' {} +
The regex tries to find all instances of `super()` where there is
content between the parentheses. The search for `[^)]*` means to look
for all characters except a closing parens, which essentially makes the
search non-greedy. Having just that would not be enough and we have to
explicitly add another such clause separated by a comma. This is the
exact format required by python 2 where the `super` call expects two
arguments, first being the class itself and the second the reference,
typically `self` or `cls. By making the regex more specific we avoid
matching cases like:
def test_without_super(self):
which would be replaced to
def test_without_super():
if we don't include the explicit comma in the regex between the parens.
sphuber
force-pushed
the
fix_3562_drop_python_2
branch
from
8126314 to
b8c458b
Compare
greschd
reviewed
Dec 2, 2019
| Hash arbitrary binary strings (str in Python 2, bytes in Python 3). | ||
| For compat reason between Python 2 and 3, this gets the same hash-type | ||
| as for unicode in Python 2, resp. str in Python 3.""" | ||
| """Hash arbitrary byte strings.""" | ||
| return [_single_digest('str', bytes_obj)] |
There was a problem hiding this comment.
Hmm, I'm not sure if we might want to change the "type specifier" here to be bytes - specific, now that py2 / py3 compatibility is no longer a concern.
greschd
approved these changes
Dec 2, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3562