Drop python3.6 support #681
Merged
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
CI config, tox, and setuptools config are all updated. pyupgrade is intentionally exempted so that it can be updated in a dedicated commit. The changelog fragment is included.
This applies some rewrites.
This was always going to be a multi-step process to add `__future__` imports, rewrite, and iterate. However, there's an additional wrinkle: unfortunately, `pyupgrade` does not support rewrites on `import typing as t`-style annotations. Therefore, the following procedure includes rewrites away from and back to this style. 1. Set future annotations in all files Run a script to inject `from __future__ import annotations` in all non-`__init__.py` python files in the src tree. 2. Convert `import typing as t` style to `import typing` style This was done with a combination of scripts and macros. 3. Run `pre-commit run -a` to converge Converge, converge, converge. `black`, `isort`, `pyupgrade`, until they get along. 4. Convert `import typing` style back to `import typing as t` style Again, scripts and editor macros. Converge again, as the rewrites may fold out and fold in with `black`, especially. 5. Update _generate_init.py to not check python version The TYPE_CHECKING branch was combined with the py3.6 branch. Remove that logic for better clarity.
- A tox environment list in the Makefile (aside: maybe remove in the future?) - A bit of documentation text in `_testing`
sirosen
requested review from
ada-globus,
derek-globus,
kurtmckee and
aaschaer
as code owners
kurtmckee
previously approved these changes
Feb 8, 2023
kurtmckee
approved these changes
Feb 9, 2023
|
I was really surprised when I got back to this to see the pylint failure. But the diff to fix it is + type: None # pylint: disable=redefined-builtin
+ | (Literal["file", "dir"]) = None,
- type: None
- | (Literal["file", "dir"]) = None, # pylint: disable=redefined-builtinSo I think we can see what happened here, at some level. |
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.
Remove it from all CI and configurations, docs, etc.
Then, do some rewrite magic (my fingers are sore from my macros!) to get
__future__style annotations in place.Nothing is changing other than the removal of 3.6 support and the future possibility of 3.6 support on this branch.
I am ready to get this
list[Changes]merged. Are you?