pythonPackages.flake8-future-import: fix build #100533
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
jonringer
reviewed
Oct 15, 2020
| @@ -20,7 +20,7 @@ buildPythonPackage rec { | |||
| # Upstream disables this test case naturally on python 3, but it also fails | |||
| # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it | |||
| # on py2 as well. | |||
| patches = lib.optionals isPy27 [ ./skip-test.patch ]; | |||
| patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ] ++ lib.optionals isPy27 [ ./skip-test.patch ]; | |||
There was a problem hiding this comment.
getting kind of long
Suggested change
| patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ] ++ lib.optionals isPy27 [ ./skip-test.patch ]; | |
| patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ] | |
| ++ lib.optionals isPy27 [ ./skip-test.patch ]; |
Was broken after python3.8 upgraded to 3.8.6 due to this change:
bpo-41314: Changed the release when from future import annotations becomes the default from 4.0 to 3.10 (following a change in PEP 563).
mweinelt
force-pushed
the
python/flake8-future-import
branch
from
85ef893
to
01d7285
Compare
|
Applied.
…On Wed, Oct 14, 2020 at 10:16:10PM -0700, Jon wrote:
@jonringer commented on this pull request.
> @@ -20,7 +20,7 @@ buildPythonPackage rec {
# Upstream disables this test case naturally on python 3, but it also fails
# inside NixPkgs for python 2. Since it's going to be deleted, we just skip it
# on py2 as well.
- patches = lib.optionals isPy27 [ ./skip-test.patch ];
+ patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ] ++ lib.optionals isPy27 [ ./skip-test.patch ];
getting kind of long
```suggestion
patches = lib.optionals isPy38 [ ./fix-annotations-version.patch ]
++ lib.optionals isPy27 [ ./skip-test.patch ];
```
--
You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#100533 (review)
|
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.
Motivation for this change
Breaks esphome which subsequently requires platformio, which in turn requires esphome.
Was broken after python3.8 upgraded to 3.8.6 due to this change:
Reported upstream in xZise/flake8-future-import#24.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)