pythonPackages.flake8-future-import: fix build on Python 3.10

This commit is contained in:
Markus S. Wamser 2021-11-04 20:45:08 +01:00
parent e10ad44614
commit d3528e22ec
3 changed files with 20 additions and 3 deletions

View file

@ -1,8 +1,10 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, pythonAtLeast
, isPy27 , isPy27
, isPy38
, isPy39
, pythonAtLeast
, flake8 , flake8
, six , six
, python , python
@ -20,8 +22,10 @@ buildPythonPackage rec {
sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z"; sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z";
}; };
patches = lib.optionals (pythonAtLeast "3.8") [ patches = lib.optionals (pythonAtLeast "3.10") [
./fix-annotations-version.patch ./fix-annotations-version-11.patch
] ++ lib.optionals (isPy38 || isPy39) [
./fix-annotations-version-10.patch
] ++ lib.optionals isPy27 [ ] ++ lib.optionals isPy27 [
# Upstream disables this test case naturally on python 3, but it also fails # 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 # inside NixPkgs for python 2. Since it's going to be deleted, we just skip it

View file

@ -0,0 +1,13 @@
diff --git a/flake8_future_import.py b/flake8_future_import.py
index 92c3fda..27a1a66 100755
--- a/flake8_future_import.py
+++ b/flake8_future_import.py
@@ -76,7 +76,7 @@ UNICODE_LITERALS = Feature(4, 'unicode_literals', (2, 6, 0), (3, 0, 0))
GENERATOR_STOP = Feature(5, 'generator_stop', (3, 5, 0), (3, 7, 0))
NESTED_SCOPES = Feature(6, 'nested_scopes', (2, 1, 0), (2, 2, 0))
GENERATORS = Feature(7, 'generators', (2, 2, 0), (2, 3, 0))
-ANNOTATIONS = Feature(8, 'annotations', (3, 7, 0), (4, 0, 0))
+ANNOTATIONS = Feature(8, 'annotations', (3, 7, 0), (3, 11, 0))
# Order important as it defines the error code