mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
Revert "flake8: 2.5.4 -> 3.0.4"
This reverts commit7026cdf9e9
. This reverts commit0675eb1b5d
. This reverts commit3c88d3a9c4
. --- flake8 versions 2 and 3 are api incompatible and this update breaks stuff. Version 3 should be added as a seperate expression and compatible packages should use it explicitly.
This commit is contained in:
parent
e493c8406c
commit
14510fdc73
2 changed files with 4 additions and 35 deletions
|
@ -1,22 +0,0 @@
|
||||||
diff -r ad8325924f04 pytest.ini
|
|
||||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
|
||||||
+++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200
|
|
||||||
@@ -0,0 +1,4 @@
|
|
||||||
+[pytest]
|
|
||||||
+-norecursedirs = .git .* *.egg* old docs dist build
|
|
||||||
+-addopts = -rwv
|
|
||||||
+
|
|
||||||
diff -r ad8325924f04 setup.cfg
|
|
||||||
--- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200
|
|
||||||
+++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200
|
|
||||||
@@ -12,10 +12,6 @@
|
|
||||||
pycodestyle >= 2.0.0, < 2.1.0
|
|
||||||
mccabe >= 0.5.0, < 0.6.0
|
|
||||||
|
|
||||||
-[pytest]
|
|
||||||
-norecursedirs = .git .* *.egg* old docs dist build
|
|
||||||
-addopts = -rw
|
|
||||||
-
|
|
||||||
[egg_info]
|
|
||||||
tag_build =
|
|
||||||
tag_date = 0
|
|
|
@ -10539,24 +10539,15 @@ in modules // {
|
||||||
|
|
||||||
flake8 = buildPythonPackage rec {
|
flake8 = buildPythonPackage rec {
|
||||||
name = "flake8-${version}";
|
name = "flake8-${version}";
|
||||||
version = "3.0.4";
|
version = "2.5.4";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "mirror://pypi/f/flake8/${name}.tar.gz";
|
url = "mirror://pypi/f/flake8/${name}.tar.gz";
|
||||||
sha256 = "03cpdrjxh0fyi2qpdxbbrmxw7whiq3xr3p958gr6yzghk34i1hml";
|
sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = with self; [ nose mock pytestrunner pytest ];
|
buildInputs = with self; [ nose mock ];
|
||||||
propagatedBuildInputs = with self; [ pyflakes pep8 mccabe enum34 configparser pycodestyle ];
|
propagatedBuildInputs = with self; [ pyflakes pep8 mccabe ];
|
||||||
|
|
||||||
patches = [
|
|
||||||
../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
# Tests fail due to missing ini file.
|
|
||||||
preCheck = ''
|
|
||||||
touch tox.ini
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Code checking using pep8 and pyflakes";
|
description = "Code checking using pep8 and pyflakes";
|
||||||
|
|
Loading…
Reference in a new issue