JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #109501 from grwlf/pyls-no-pyflakes-leak

Browse Source
This commit is contained in:
Jörg Thalheim 2021-01-27 19:54:08 +00:00 committed by GitHub
commit 6834d03bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/python-modules/python-language-server/default.nix
View File

@ -30,7 +30,7 @@ buildPythonPackage rec {
sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q";
};
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ]
++ lib.optional (withProvider "autopep8") autopep8
++ lib.optional (withProvider "mccabe") mccabe
++ lib.optional (withProvider "pycodestyle") pycodestyle
@ -42,12 +42,13 @@ buildPythonPackage rec {
++ lib.optional isPy27 configparser
++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ];
# The tests require all the providers, disable otherwise.
doCheck = providers == ["*"];
checkInputs = [
pytestCheckHook mock pytestcov coverage flaky
# Do not propagate flake8 or it will enable pyflakes implicitly
flake8
# rope is technically a dependency, but we don't add it by default since we
# already have jedi, which is the preferred option
rope

12
pkgs/development/python-modules/spyder/default.nix
View File

@ -1,8 +1,9 @@
{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree, jedi, pycodestyle,
psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc,
qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments,
spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server
, pyqtwebengine, atomicwrites, pyxdg, diff-match-patch, three-merge, pyls-black, pyls-spyder
{ lib, buildPythonPackage, fetchPypi, isPy27, makeDesktopItem, intervaltree,
jedi, pycodestyle, psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint,
keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl,
cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle,
watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg,
diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8
}:
buildPythonPackage rec {
@ -23,6 +24,7 @@ buildPythonPackage rec {
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server
atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder
flake8
];
# There is no test for spyder