Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Py2 deprecation #2876

Merged
merged 27 commits into from
Jun 1, 2020
Merged

Py2 deprecation #2876

merged 27 commits into from
Jun 1, 2020

Conversation

honnix
Copy link
Member

@honnix honnix commented Dec 27, 2019

Description

This consolidates all PRs for python2 deprecation: https://github.com/spotify/luigi/pulls?q=is%3Apr+label%3A%22Python2+deprecation%22+is%3Aclosed

Motivation and Context

Open a PR to make final check easier.

Have you tested this? If so, how?

@honnix
Copy link
Member Author

honnix commented Dec 27, 2019

cc @drowoseque . Thanks for your great contribution!

@dlstadther
Copy link
Collaborator

Thanks @drowoseque and @honnix for managing and doing this deprecation!

@drowoseque
Copy link
Contributor

@honnix or @dlstadther could you pls resolve conflicts and merge master in this branch to keep it up-to-date?

@honnix
Copy link
Member Author

honnix commented May 21, 2020

@drowoseque Sure. We might get this merged next week. Sorry for taking so long.

honnix and others added 13 commits June 1, 2020 14:15
* py2/py3 import error eliminated

*  E402 module level import not at top of file

* E303 too many blank lines (3)
* snamebite removed

* no minicluster

* no minicluster

* flake8

* branches - master

* no snakebite in tox.ini
* no itervalues

* no exception
* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* six.assertCountEqual -> self.assertCountEqual

* no ununsed import

* E128 continuation line under-indented for visual indent
* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no six.next

* yield from instead of loop

* too-many-blank-lines
* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* six.add_metaclass -> metaclass=

* six.add_metaclass -> metaclass=
* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no from __future__ import
* no string_types

* no-binary_type

* Update .travis.yml

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* original

* no ununsed import

* Update .travis.yml

* Fix params hashing (#2540)

* move params freezing to separated module

* freeze dict for toml parser

* FIX FrozenOrderedDict name

* Freeze only params of config, not all config

* +docstring

* [luigi.mock.MockFile] removed (#2839)

* no-mock-file

* MockFile removed

* unused import

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* new string_types

* no string_types

* no-binary_type

* original

* no ununsed import

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* new string_types

* snakebite

* no-unused-import
* Update .travis.yml

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no-six-moves

* del attr removed

* del attr removed

* exec_ removed
* 2.7 mentions removed from README and setup.py

* py27 -> py37 in CONTRIBUTING.rst
* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* abstractproperty -> property + abstractmethod

* Update beam_dataflow.py

* Update beam_dataflow.py
* no-if-six.py*

* no unused imports

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* postgres toxenv for py3

* postgres toxenv for py3

* postgres toxenv for py3

* \n

* no-unused-import

* test_multiple_workers back
drowoseque and others added 13 commits June 1, 2020 14:16
* iteritems usage removed

* no unused imports

* bmo

* bmo

* iteritems removed

* no doc for iteritems

* most_common from collections.Counter

* returning tuple

* postgres toxenv for py3

* original

* no-unused-import

* F401 'luigi.six' imported but unused

* blank line
* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no six.{u,b}

* joined

* Update .travis.yml

* "except ImportError" removed (#2845)

* py2/py3 import error eliminated

*  E402 module level import not at top of file

* E303 too many blank lines (3)

* snakebite removed (#2833)

* snamebite removed

* no minicluster

* no minicluster

* flake8

* branches - master

* no snakebite in tox.ini

* [luigi.six.itervalues] usage removed (#2835)

* no itervalues

* no exception

* [luigi.six.assertCountEqual] removed (#2841)

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* six.assertCountEqual -> self.assertCountEqual

* no ununsed import

* E128 continuation line under-indented for visual indent

* [luigi.six.next] removed (#2842)

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no six.next

* yield from instead of loop

* too-many-blank-lines

* `luigi.six.add_metaclass` removed (#2843)

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* six.add_metaclass -> metaclass=

* six.add_metaclass -> metaclass=

* no `from __future__ import ...` (#2846)

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no from __future__ import

* [luigi.six.string_types] and [luigi.six.binary_type]  removed (#2838)

* no string_types

* no-binary_type

* Update .travis.yml

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* original

* no ununsed import

* Update .travis.yml

* Fix params hashing (#2540)

* move params freezing to separated module

* freeze dict for toml parser

* FIX FrozenOrderedDict name

* Freeze only params of config, not all config

* +docstring

* [luigi.mock.MockFile] removed (#2839)

* no-mock-file

* MockFile removed

* unused import

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* new string_types

* no string_types

* no-binary_type

* original

* no ununsed import

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* new string_types

* snakebite

* no-unused-import

* utf-8 in auth

* no unused imports

* py27 -> py37 in CONTRIBUTING.rst

* E231 missing whitespace after ','

* [luigi.six.moves] removed (#2844)

* Update .travis.yml

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* no-six-moves

* del attr removed

* del attr removed

* exec_ removed

* py 2.7 mentions removed from README and setup.py (#2852)

* 2.7 mentions removed from README and setup.py

* py27 -> py37 in CONTRIBUTING.rst

* abstractproperty -> property + abstractmethod (#2847)

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* abstractproperty -> property + abstractmethod

* Update beam_dataflow.py

* Update beam_dataflow.py

* no-if-six.py* (#2840)

* no-if-six.py*

* no unused imports

* Update .travis.yml

* no py27 in travis (#2836)

* no py27 in travis

* py37

* flake8 and docs back

* py36 py37 postgres

* py36-apache

* MixedUnicodeBytes removed

* unused imports removed

* no-if-py3

* space

* space

* MixedUnicodeBytesFormat returned

* postgres toxenv for py3

* postgres toxenv for py3

* postgres toxenv for py3

* \n

* no-unused-import

* test_multiple_workers back

* F401 'luigi.six' imported but unused

* test_url_without_basic_auth fix

* [luigi.six.iteritems] usage removed (#2834)

* iteritems usage removed

* no unused imports

* bmo

* bmo

* iteritems removed

* no doc for iteritems

* most_common from collections.Counter

* returning tuple

* postgres toxenv for py3

* original

* no-unused-import

* F401 'luigi.six' imported but unused

* blank line

*  F401 'luigi.six' imported but unused

* six.b('...') -> b'...'

* blank line
@honnix
Copy link
Member Author

honnix commented Jun 1, 2020

@dlstadther @Tarrasch Could you please approve this as well? I will get it merged right after.

Copy link
Collaborator

@dlstadther dlstadther left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@@ -7,5 +7,5 @@
__author__ = 'The Luigi Authors'
__contact__ = 'https://github.com/spotify/luigi'
__license__ = 'Apache License 2.0'
__version__ = '2.8.13'
__version__ = '3.0.0b2'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@honnix shouldn't we change version here prior to merge?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. We can release 3.0.0 immediately after merging to master. So it is OK in this PR I think.

@drowoseque
Copy link
Contributor

@honnix
btw I've found that some new code handling ImportError has arrived after merging #2845
ie

  • luigi/freezing.py:7

  • luigi/tools/deps.py:48

I think we should remove it before merging
don't you mind a pr from me with eliminating that?

@honnix
Copy link
Member Author

honnix commented Jun 1, 2020

@drowoseque Sure, please go ahead.

@honnix
Copy link
Member Author

honnix commented Jun 1, 2020

luigi/freezing.py:7 is introduced for python 3.9 #2895

Actually they both are in the same PR. @drowoseque

@drowoseque
Copy link
Contributor

okay, then no need for removal. You can go ahead :)

@honnix honnix merged commit 91ff2f0 into master Jun 1, 2020
@honnix honnix deleted the py2-deprecation branch June 1, 2020 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants