stevefan1999
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extras: simplified testing of flake8-artiq and dax-applets

This commit is contained in:
Leon Riesebos 2021-06-26 14:27:22 -04:00 committed by Gitea
parent c967b67aa3
commit f705a9c756
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
artiq-full/extras.nix
View File

@ -236,13 +236,7 @@ in
}; };
pythonOptions = { pythonOptions = {
propagatedBuildInputs = [ pkgs.python3Packages.flake8 ]; propagatedBuildInputs = [ pkgs.python3Packages.flake8 ];
checkInputs = [ pkgs.python3Packages.pytest pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ]; checkInputs = [ pkgs.python3Packages.pytestCheckHook ];
checkPhase =
''
pytest
mypy
flake8
'';
}; };
condaOptions = { dependencies = [ "flake8" ]; }; condaOptions = { dependencies = [ "flake8" ]; };
}) // (dualPackage rec { }) // (dualPackage rec {
@ -274,12 +268,7 @@ in
pythonOptions = { pythonOptions = {
propagatedBuildInputs = [ artiq pyqtgraph-qt5 ] propagatedBuildInputs = [ artiq pyqtgraph-qt5 ]
++ (with pkgs.python3Packages; [ numpy pyqt5 ]); ++ (with pkgs.python3Packages; [ numpy pyqt5 ]);
checkInputs = [ pkgs.python3Packages.mypy pkgs.python3Packages.flake8 ]; doCheck = false;
checkPhase =
''
mypy
flake8
'';
}; };
condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; }; condaOptions = { dependencies = [ "python>=3.5" "artiq" "numpy" "pyqt" "pyqtgraph" ]; };
}) })