Removed Python2 support #7031

venthur · 2019-11-19T13:51:05Z

This PR removes Python2 support and removes all traces of six.

Closes: #6890

Signed-off-by: Bastian Venthur bastian.venthur@flixbus.com

Resolves #6890
Resolves #7503

ndeloof · 2019-11-19T14:38:49Z

build failure is expected as the Jenkinsfile being built is the one from target branch, not the one modified by PR.
@ulyssessouza are you ok I remove py27 from Jenkinsfile (which we plan to replace by #6932 anyway) so this PR can be tested by CI?

venthur · 2019-11-19T14:52:35Z

Yes please :)
I was desperately searching for any py27 occurrences in the code.

ndeloof · 2019-11-19T15:11:17Z

I was expecting so, so my comment :) I had such issue myself in the past and started getting crazy.

ulyssessouza · 2019-11-19T15:20:41Z

Hello @venthur ! Thank you for the PR!

@ndeloof Is right about the Jenkinsfile.

My problem with this PR landing now is that Python2 is not in the EOL. Sorry, but it's too early to merge it. That would break people's code without having the Python2.7 EOL to back our move.

ndeloof · 2019-11-19T16:24:55Z

Python 2 will be EOL in a few weeks, and this would only impact people who consider docker-compose as a library to build third party products, which we know exists but never aknowledge we want to support. We should be free to refactor our codebase and drop python 2 support as long as the CLI tool is available to our end-user base.

ndeloof · 2019-11-19T16:27:40Z

see #7034

ndeloof · 2019-11-20T12:49:51Z

@venthur could you please reconfigure your PR to target py2 branch ?
I've disabled 2.7 as a target on this one, so we will get a real CI to prepare this move.

venthur · 2019-11-20T13:46:49Z

@ndeloof Did I do something wrong?

ndeloof · 2019-11-20T14:01:17Z

nope, I just missed the reference to python 2.7 by .tox.

ndeloof · 2019-11-20T14:27:04Z

No module named 'requests' seems the build script goes way beyond my understanding...

venthur · 2019-11-20T14:33:24Z

I don't know what's going on either, I double-checked the diff, requests does not even show up in them.

I did however remove python2(-dev) from the Dockerfile w/o replacing it with python3, I can try again with adding python3...

EDIT: also you can see requests was actually installed

ndeloof · 2019-11-20T14:41:59Z

please give me some time to get py2 branch fixed ;)

ndeloof · 2019-11-20T15:27:21Z

I was able to fix the py2 branch (https://ci.docker.com/public/blue/organizations/jenkins/compose/detail/py2/3/pipeline/) and rebased your PR on top (I had to force push, so if you need to make some changes, be carreful to re-create your local branch from https://github.com/venthur/compose/tree/remove_python2)

venthur · 2019-11-21T07:31:55Z

Nice!

With respect to the merge, I also tend to agree that it should not matter if we merge it now, as long as the CLI has a major version bump. If people consume directly from master and still depend on Python2, well that's dangerous anyways these days.

On the other hand, if the patch itself looks good to you and is likely to be merged at some point, I don't have a problem maintaining it for a while.

venthur · 2020-01-03T07:58:32Z

Python2 reached its EOL, can we merge now?

compose/utils.py

tests/__init__.py

graingert

Please merge #6623 first

venthur · 2020-02-11T09:14:12Z

So, it's mid-February. Any chance we can drop Py2 support by merging? :)

ulyssessouza · 2020-02-21T09:20:22Z

@venthur Sorry for the late reply, but we got to the conclusion (based on pypi downloads data) that it would be more prudent to sync that with the next Ubuntu release. That new release will eliminate Python2.

alexrecuenco · 2020-03-10T14:09:47Z

I was working on a branch before I noticed you had already done most of the same things I did @venthur . Is it ok if I add to it? In my branch I also changed dictionary comprehensions and other details that are cleaner in python3. (Like format strings)

graingert · 2020-03-10T15:07:37Z

You might want to run and add pyupgrade as a pre-commit hook

…

On Tue, 10 Mar 2020, 14:09 alexrecuenco, ***@***.***> wrote: I was working on a branch before I noticed you had already done most of the same things I did @venthur <https://github.com/venthur> . Is it ok if I add to it? In my branch I also changed dictionary comprehensions and other details that are cleaner in python3. (Like format strings) — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#7031?email_source=notifications&email_token=AADFATG4YETC6QPGJUEEOV3RGZC2ZA5CNFSM4JPDUY22YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEOLR5CA#issuecomment-597106312>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AADFATDNWWMMNI2GRF2Q3FDRGZC2ZANCNFSM4JPDUY2Q> .

alexrecuenco · 2020-03-11T03:05:03Z

You might want to run and add pyupgrade as a pre-commit hook
…

I noticed we are on this branch far behind master, can we rebase?

After all, this change affects almost all files, it should probably be done close to the tip.

We can rebase from 1.26.x, since this is a 1.26 goal anyway.

Is that ok?

---- Downgrade gitpython to 2.1.15 and idna to 2.8 Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com> Removed Python2 support Closes: docker#6890 Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com> Removed six Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

---- Downgrade gitpython to 2.1.15 and idna to 2.8 Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com> Removed Python2 support Closes: docker#6890 Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com> Removed six Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com> Removed now useless check for version_info >= 2.7 Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com> Removed now unused get_output_stream method Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com> Import unittest.mock directly. We don't need to support Python2 anymore. Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

---- Downgrade gitpython to 2.1.15 and idna to 2.8 Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com> Removed Python2 support Closes: docker#6890 - Removed six - Removed now useless check for version_info >= 2.7 - Removed now unused get_output_stream method - Import unittest.mock directly. How we removed six from docker-compose We expect this to happen in a couple steps, 1. Remove six entirely, and remove python2.7 from requirements, setup, etc. 2. cleanup code that is left (All the conditionals that are now always True or False) 3. Remove all unnecessary `__future__` commands, by modifying the pre-commit-hook of python sourts to be `--py3-plus` After removing all occurrances, we made sure `six` wasn't used anymore running a search for ```txt six\.\w+\(([^()]+)\) ``` - We replaced all types for their corresponding python3 types. Note how six returns a tuple for the isinstance (since in python2 there are more than one type, but that isn't necessary in python3, so we removed the tuple and instead used the class directly) We then searched for all instances where code could be pruned. (i.e., if/else clauses that now where always `True` or `False`) After that, - Removed inheritinng from `object` super class, it isn't necessary in python3 - `# coding ... utf-8` statements are not needed - `super(ClassName, self)` can now be replaced with `super()`

---- Removed Python2 support Closes: docker#6890 - Removed six - Removed now useless check for version_info >= 2.7 - Removed now unused get_output_stream method - Import unittest.mock directly. How we removed six from docker-compose We expect this to happen in a couple steps, 1. Remove six entirely, and remove python2.7 from requirements, setup, etc. 2. cleanup code that is left (All the conditionals that are now always True or False) 3. Remove all unnecessary `__future__` commands, by modifying the pre-commit-hook of python sourts to be `--py3-plus` After removing all occurrances, we made sure `six` wasn't used anymore running a search for ```txt six\.\w+\(([^()]+)\) ``` - We replaced all types for their corresponding python3 types. Note how six returns a tuple for the isinstance (since in python2 there are more than one type, but that isn't necessary in python3, so we removed the tuple and instead used the class directly) We then searched for all instances where code could be pruned. (i.e., if/else clauses that now where always `True` or `False`) After that, - Removed inheritinng from `object` super class, it isn't necessary in python3 - `# coding ... utf-8` statements are not needed - `super(ClassName, self)` can now be replaced with `super()` Signed-off-by: Alejandro G. Recuenco <alejandrogonzalezrecuenco@gmail.com>

---- Removed Python2 support Closes: docker#6890 - Removed six - Removed now useless check for version_info >= 2.7 - Removed now unused get_output_stream method - Import unittest.mock directly. How we removed six from docker-compose We expect this to happen in a couple steps, 1. Remove six entirely, and remove python2.7 from requirements, setup, etc. 2. cleanup code that is left (All the conditionals that are now always True or False) 3. Remove all unnecessary `__future__` commands, by modifying the pre-commit-hook of python sourts to be `--py3-plus` After removing all occurrances, we made sure `six` wasn't used anymore running a search for ```txt six\.\w+\(([^()]+)\) ``` - We replaced all types for their corresponding python3 types. Note how six returns a tuple for the isinstance (since in python2 there are more than one type, but that isn't necessary in python3, so we removed the tuple and instead used the class directly) We then searched for all instances where code could be pruned. (i.e., if/else clauses that now where always `True` or `False`) After that, - Removed inheritinng from `object` super class, it isn't necessary in python3 - `# coding ... utf-8` statements are not needed - `super(ClassName, self)` can now be replaced with `super()` Signed-off-by: alexrecuenco <alejandrogonzalezrecuenco@gmail.com>

---- Removed Python2 support Closes: docker#6890 - Removed six - Removed now useless check for version_info >= 2.7 - Removed now unused get_output_stream method - Import unittest.mock directly. Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

ulyssessouza · 2020-06-03T13:37:01Z

@venthur Can you rebase this PR pls? We are finally ready to merge

Closes: docker#6890 Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

We don't need to support Python2 anymore. Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

venthur · 2020-06-03T16:42:20Z

Done, re-based onto current master.

ulyssessouza

LGTM

ulyssessouza · 2020-06-10T15:04:04Z

Thank you @venthur !
And sorry for the delay

remram44 · 2020-08-05T17:44:54Z

This removed release.py script completely? Was that intended?

venthur changed the base branch from master to py2 November 20, 2019 13:36

GordonTheTurtle added the dco/no label Nov 20, 2019

venthur force-pushed the remove_python2 branch from dca8bef to 9af8aec Compare November 20, 2019 13:40

GordonTheTurtle removed the dco/no label Nov 20, 2019

docker deleted a comment from GordonTheTurtle Nov 20, 2019

ndeloof force-pushed the py2 branch from 93d9859 to 9ad1057 Compare November 20, 2019 15:01

ndeloof force-pushed the remove_python2 branch from 71e81fb to ec41f41 Compare November 20, 2019 15:25

ulyssessouza reviewed Jan 7, 2020

View reviewed changes

compose/utils.py Outdated Show resolved Hide resolved

ulyssessouza reviewed Jan 7, 2020

View reviewed changes

tests/__init__.py Outdated Show resolved Hide resolved

ulyssessouza reviewed Jan 8, 2020

View reviewed changes

tests/__init__.py Outdated Show resolved Hide resolved

ulyssessouza mentioned this pull request Jan 8, 2020

support PyYAML up to 5.x version #6623

Merged

graingert suggested changes Jan 8, 2020

View reviewed changes

alexrecuenco mentioned this pull request Mar 14, 2020

Clean up python2 style code #7294

Merged

venthur added 6 commits June 3, 2020 17:37

Removed Python2 support

e8424d5

Closes: docker#6890 Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Removed six

5529376

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Removed now useless check for version_info >= 2.7

c44746d

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Removed now unused get_output_stream method

0263d3e

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Import unittest.mock directly.

6351ad8

We don't need to support Python2 anymore. Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

Fixed new things that came after the PR

8ce743c

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

venthur force-pushed the remove_python2 branch from b0de408 to 8ce743c Compare June 3, 2020 16:11

venthur changed the base branch from py2 to master June 3, 2020 16:14

re-added accidentally removed contextlib import

c5d2d3c

Signed-off-by: Bastian Venthur <bastian.venthur@flixbus.com>

venthur requested review from ndeloof and rumpl as code owners June 3, 2020 16:23

ulyssessouza requested review from thaJeztah, chris-crone and ulyssessouza June 4, 2020 11:58

ulyssessouza approved these changes Jun 4, 2020

View reviewed changes

ndeloof approved these changes Jun 10, 2020

View reviewed changes

ulyssessouza merged commit 854c14a into docker:master Jun 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Removed Python2 support #7031

Removed Python2 support #7031

venthur commented Nov 19, 2019 •

edited by ulyssessouza

Loading

ndeloof commented Nov 19, 2019

venthur commented Nov 19, 2019

ndeloof commented Nov 19, 2019

ulyssessouza commented Nov 19, 2019

ndeloof commented Nov 19, 2019

ndeloof commented Nov 19, 2019 •

edited

Loading

ndeloof commented Nov 20, 2019

venthur commented Nov 20, 2019

ndeloof commented Nov 20, 2019

ndeloof commented Nov 20, 2019 •

edited

Loading

venthur commented Nov 20, 2019 •

edited

Loading

ndeloof commented Nov 20, 2019

ndeloof commented Nov 20, 2019

venthur commented Nov 21, 2019

venthur commented Jan 3, 2020

graingert left a comment

venthur commented Feb 11, 2020 •

edited

Loading

ulyssessouza commented Feb 21, 2020

alexrecuenco commented Mar 10, 2020

graingert commented Mar 10, 2020 via email

alexrecuenco commented Mar 11, 2020 •

edited

Loading

ulyssessouza commented Jun 3, 2020

venthur commented Jun 3, 2020

ulyssessouza left a comment

ulyssessouza commented Jun 10, 2020

remram44 commented Aug 5, 2020

Removed Python2 support #7031

Removed Python2 support #7031

Conversation

venthur commented Nov 19, 2019 • edited by ulyssessouza Loading

ndeloof commented Nov 19, 2019

venthur commented Nov 19, 2019

ndeloof commented Nov 19, 2019

ulyssessouza commented Nov 19, 2019

ndeloof commented Nov 19, 2019

ndeloof commented Nov 19, 2019 • edited Loading

ndeloof commented Nov 20, 2019

venthur commented Nov 20, 2019

ndeloof commented Nov 20, 2019

ndeloof commented Nov 20, 2019 • edited Loading

venthur commented Nov 20, 2019 • edited Loading

ndeloof commented Nov 20, 2019

ndeloof commented Nov 20, 2019

venthur commented Nov 21, 2019

venthur commented Jan 3, 2020

graingert left a comment

Choose a reason for hiding this comment

venthur commented Feb 11, 2020 • edited Loading

ulyssessouza commented Feb 21, 2020

alexrecuenco commented Mar 10, 2020

graingert commented Mar 10, 2020 via email

alexrecuenco commented Mar 11, 2020 • edited Loading

ulyssessouza commented Jun 3, 2020

venthur commented Jun 3, 2020

ulyssessouza left a comment

Choose a reason for hiding this comment

ulyssessouza commented Jun 10, 2020

remram44 commented Aug 5, 2020

venthur commented Nov 19, 2019 •

edited by ulyssessouza

Loading

ndeloof commented Nov 19, 2019 •

edited

Loading

ndeloof commented Nov 20, 2019 •

edited

Loading

venthur commented Nov 20, 2019 •

edited

Loading

venthur commented Feb 11, 2020 •

edited

Loading

alexrecuenco commented Mar 11, 2020 •

edited

Loading