Merge pull request #19132 from groxxda/pep8

pythonPackages.{pep,flake8}: undo changes from #19104
This commit is contained in:
Frederik Rietdijk 2016-10-01 18:29:21 +02:00 committed by GitHub
commit 539e9fc80c

View File

@ -10537,9 +10537,27 @@ in modules // {
}; };
}; };
pep8 = self.pycodestyle;
flake8 = buildPythonPackage rec { flake8 = buildPythonPackage rec {
name = "flake8-${version}";
version = "2.5.4";
src = pkgs.fetchurl {
url = "mirror://pypi/f/flake8/${name}.tar.gz";
sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc";
};
buildInputs = with self; [ nose mock ];
propagatedBuildInputs = with self; [ pyflakes pep8 mccabe ];
meta = {
description = "Code checking using pep8 and pyflakes";
homepage = http://pypi.python.org/pypi/flake8;
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
};
};
flake8_3 = buildPythonPackage rec {
name = "flake8-${version}"; name = "flake8-${version}";
version = "3.0.4"; version = "3.0.4";
@ -10549,7 +10567,7 @@ in modules // {
}; };
buildInputs = with self; [ nose mock pytestrunner pytest ]; buildInputs = with self; [ nose mock pytestrunner pytest ];
propagatedBuildInputs = with self; [ pyflakes pep8 mccabe enum34 configparser pycodestyle ]; propagatedBuildInputs = with self; [ pyflakes mccabe enum34 configparser pycodestyle ];
patches = [ patches = [
../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch ../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch
@ -10564,7 +10582,7 @@ in modules // {
description = "Code checking using pep8 and pyflakes"; description = "Code checking using pep8 and pyflakes";
homepage = http://pypi.python.org/pypi/flake8; homepage = http://pypi.python.org/pypi/flake8;
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ garbas ]; maintainers = with maintainers; [ ];
}; };
}; };
@ -17601,6 +17619,23 @@ in modules // {
}; };
}; };
pep8 = buildPythonPackage rec {
name = "pep8-${version}";
version = "1.7.0";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pep8/${name}.tar.gz";
sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
};
meta = {
homepage = "http://pep8.readthedocs.org/";
description = "Python style guide checker";
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
};
};
pep257 = buildPythonPackage rec { pep257 = buildPythonPackage rec {
name = "pep257-${version}"; name = "pep257-${version}";
version = "0.3.2"; version = "0.3.2";