Summary

Bundle an internal version of six for future compatibility.

Review Request #11092 — Created July 22, 2020 and submitted July 28, 2020, 7:16 p.m.

Information

Owner

chipx86

Repository

Django Evolution

Branch

master

Bugs

Depends On

Reviewers

Groups

django-evolution

People

Description

Django 3.0 and higher do not include django.utils.six, since they've
moved entirely onto Python 3. In order to provide compatibility going
forward, Django Evolution now bundles its own copy of six as
django_evolution.compat.six, and all imports have been updated
accordingly.

Testing Done

Unit tests pass for all supported versions of Python and Django
(1.6 through 2.2 — more work is required for 3.0 support).

Commits

Summary	ID
Bundle an internal version of six for future compatibility. Django 3.0 and higher do not include `django.utils.six`, since they've moved entirely onto Python 3. In order to provide compatibility going forward, Django Evolution now bundles its own copy of `six` as `django_evolution.compat.six`, and all imports have been updated accordingly.	c7878369db82a70c29023c98f9a8fe05018eecbd

Issues

Description	From	Last Updated
Wouldn't it be better to just add a dependency on the upstream six?	david	July 24, 2020, 9:23 a.m.
E501 line too long (80 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E305 expected 2 blank lines after class or function definition, found 1	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (91 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (93 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (91 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (118 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (110 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (87 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (96 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (80 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (80 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (82 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (82 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (82 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (96 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (80 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (86 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (80 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (86 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (83 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (84 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (90 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (86 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (92 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (92 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (98 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (83 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
E305 expected 2 blank lines after class or function definition, found 1	reviewbot	July 23, 2020, 2:56 a.m.
E501 line too long (82 > 79 characters)	reviewbot	July 23, 2020, 2:56 a.m.
F821 undefined name '__spec__'	reviewbot	July 23, 2020, 2:56 a.m.

flake8 passed.

JSHint passed.

Change Summary:

Actually add the six module.

Commits:

	Summary	ID
	Bundle an internal version of six for future compatibility. Django 3.0 and higher do not include `django.utils.six`, since they've moved entirely onto Python 3. In order to provide compatibility going forward, Django Evolution now bundles its own copy of `six` as `django_evolution.compat.six`, and all imports have been updated accordingly.	060a814c255225424b5387276c2862a892456dc0
	Bundle an internal version of six for future compatibility. Django 3.0 and higher do not include `django.utils.six`, since they've moved entirely onto Python 3. In order to provide compatibility going forward, Django Evolution now bundles its own copy of `six` as `django_evolution.compat.six`, and all imports have been updated accordingly.	c7878369db82a70c29023c98f9a8fe05018eecbd

Diff:

Revision 2 (+2016 -52)

Show changes

	django_evolution/diff.py
	django_evolution/errors.py
	django_evolution/evolve.py
	django_evolution/mock_models.py
	django_evolution/models.py
	django_evolution/mutations.py
	django_evolution/signature.py
	django_evolution/compat/commands.py
	15 more

Checks run (1 failed, 1 succeeded)

flake8 failed.

JSHint passed.

flake8

```
Warning: Showing 30 of 31 failures.
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E305 expected 2 blank lines after class or function definition, found 1
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (91 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (93 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (91 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (118 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (110 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (87 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (96 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (96 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (86 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (80 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (86 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (83 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (84 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (90 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (86 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (92 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (92 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (98 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (83 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E305 expected 2 blank lines after class or function definition, found 1
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
E501 line too long (82 > 79 characters)
```
django_evolution/compat/six.py (Diff revision 2)
The issue has been dropped. Show all issues
```
F821 undefined name '__spec__'
```

The issue has been dropped. Show all issues

Wouldn't it be better to just add a dependency on the upstream six?

chipx86 July 23, 2020, 5:36 p.m.

I debated this. Solid "maybe" with a lean toward "no for now."

We hit that issue before with a system version of six taking precedence from a package, and wrecking havoc when a later system update replaced it with an older version than what some dependency required. I'm a bit weary of system packages outright breaking things for us again because of this dependency.

david July 24, 2020, 9:23 a.m.
```
Makes sense.
```

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to master (532a183)