uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, isPy38
|
||||
, isPy39
|
||||
, pythonAtLeast
|
||||
, flake8
|
||||
, six
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flake8-future-import";
|
||||
version = "0.4.6";
|
||||
|
||||
# PyPI tarball doesn't include the test suite
|
||||
src = fetchFromGitHub {
|
||||
owner = "xZise";
|
||||
repo = "flake8-future-import";
|
||||
rev = version;
|
||||
sha256 = "00q8n15xdnvqj454arn7xxksyrzh0dw996kjyy7g9rdk0rf8x82z";
|
||||
};
|
||||
|
||||
patches = lib.optionals (pythonAtLeast "3.10") [
|
||||
./fix-annotations-version-11.patch
|
||||
] ++ lib.optionals (isPy38 || isPy39) [
|
||||
./fix-annotations-version-10.patch
|
||||
] ++ lib.optionals isPy27 [
|
||||
# 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.
|
||||
./skip-test.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ flake8 ];
|
||||
|
||||
checkInputs = [ six ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m test_flake8_future_import
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";
|
||||
homepage = "https://github.com/xZise/flake8-future-import";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -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, 10, 0))
|
||||
|
||||
|
||||
# Order important as it defines the error code
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/test_flake8_future_import.py b/test_flake8_future_import.py
|
||||
index 84fde59..345f23f 100644
|
||||
--- a/test_flake8_future_import.py
|
||||
+++ b/test_flake8_future_import.py
|
||||
@@ -230,7 +230,7 @@ class TestBadSyntax(TestCaseBase):
|
||||
"""Test using various bad syntax examples from Python's library."""
|
||||
|
||||
|
||||
-@unittest.skipIf(sys.version_info[:2] >= (3, 7), 'flake8 supports up to 3.6')
|
||||
+@unittest.skip("Has issue with installed path for flake8 in python2")
|
||||
class Flake8TestCase(TestCaseBase):
|
||||
|
||||
"""
|
||||
Loading…
Add table
Add a link
Reference in a new issue