flent: 2.0.1 -> 2.1.1; fixes

Manuel Mendez (4):
      flent: format with alejandra
      flent: Get python packages via python.pkgs
             Less confusing this way.
      flent: Add qtpy dependency
             This has been a gui requirement since v2.0.0 circa Jan 2021!
      flent: Ensure the gui tests are never skipped
             We always build with the gui enabled and we want to make sure it works.

R. RyanTM (1):
      flent: 2.0.1 -> 2.1.1
This commit is contained in:
R. Ryantm 2022-11-02 12:59:13 +00:00 committed by Manuel Mendez
parent 3bd44d7597
commit 11b9b7bf86

View file

@ -1,23 +1,39 @@
{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python {
, pythonPackages, qt5, sphinx, xvfb-run }: lib,
buildPythonApplication,
fetchPypi,
procps,
python,
qt5,
xvfb-run,
}:
buildPythonApplication rec { buildPythonApplication rec {
pname = "flent"; pname = "flent";
version = "2.0.1"; version = "2.1.1";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796"; sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M=";
}; };
buildInputs = [ sphinx ]; buildInputs = [python.pkgs.sphinx];
nativeBuildInputs = [ qt5.wrapQtAppsHook ]; nativeBuildInputs = [qt5.wrapQtAppsHook];
propagatedBuildInputs = [ matplotlib procps pyqt5 ]; propagatedBuildInputs = [
checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ]; procps
python.pkgs.matplotlib
python.pkgs.pyqt5
python.pkgs.qtpy
];
checkInputs = [
python.pkgs.mock
xvfb-run
];
checkPhase = '' checkPhase = ''
# we want the gui tests to always run
sed -i 's|self.skip|pass; #&|' unittests/test_gui.py
cat >test-runner <<EOF cat >test-runner <<EOF
#!/bin/sh #!/bin/sh
${python.pythonForBuild.interpreter} nix_run_setup test ${python.pythonForBuild.interpreter} nix_run_setup test
EOF EOF
chmod +x test-runner chmod +x test-runner
@ -34,6 +50,6 @@ buildPythonApplication rec {
homepage = "https://flent.org"; homepage = "https://flent.org";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = [ maintainers.mmlb ]; maintainers = [maintainers.mmlb];
}; };
} }