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

python3Packages.flit: fix tests and packaging (#69546)

Browse Source 
* python3Packages.flit: fix tests

* python: fix flit setup hook
This commit is contained in:
Jon 2019-09-26 14:09:03 -07:00 committed by zimbatm
parent e6b93257b0
commit 28af6ac647
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/python/hooks/flit-build-hook.sh
View File

@ -3,9 +3,9 @@ echo "Sourcing flit-build-hook"
flitBuildPhase () { flitBuildPhase () {
echo "Executing flitBuildPhase" echo "Executing flitBuildPhase"
preBuild runHook preBuild
@pythonInterpreter@ -m flit build --format wheel @pythonInterpreter@ -m flit build --format wheel
postBuild runHook postBuild
echo "Finished executing flitBuildPhase" echo "Finished executing flitBuildPhase"
} }

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

@ -7,7 +7,7 @@
, requests_download , requests_download
, zipfile36 , zipfile36
, pythonOlder , pythonOlder
, pytest , pytest_4
, testpath , testpath
, responses , responses
, pytoml , pytoml
@ -21,17 +21,17 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "flit"; pname = "flit";
version = "1.3"; version = "1.3";
disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36"; sha256 = "6f6f0fb83c51ffa3a150fa41b5ac118df9ea4a87c2c06dff4ebf9adbe7b52b36";
}; };
disabled = !isPy3k;
propagatedBuildInputs = [ docutils requests requests_download pytoml ] propagatedBuildInputs = [ docutils requests requests_download pytoml ]
++ lib.optional (pythonOlder "3.6") zipfile36; ++ lib.optional (pythonOlder "3.6") zipfile36;
checkInputs = [ pytest testpath responses ]; checkInputs = [ pytest_4 testpath responses ];
# Disable test that needs some ini file. # Disable test that needs some ini file.
# Disable test that wants hg # Disable test that wants hg
@ -39,10 +39,10 @@ buildPythonPackage rec {
HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist" HOME=$(mktemp -d) pytest -k "not test_invalid_classifier and not test_build_sdist"
''; '';
meta = { meta = with lib; {
description = "A simple packaging tool for simple packages"; description = "A simple packaging tool for simple packages";
homepage = https://github.com/takluyver/flit; homepage = https://github.com/takluyver/flit;
license = lib.licenses.bsd3; license = licenses.bsd3;
maintainers = [ lib.maintainers.fridh ]; maintainers = [ maintainers.fridh ];
}; };
} }