From 80ea343bf2fb907d28c8850dfc2e3c6c9b0dcee2 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 9 Feb 2021 20:39:10 +0100 Subject: [PATCH] staticjinja: 1.0.3 -> 1.0.4 --- .../python-modules/staticjinja/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index a49f6a4fdfc..e7f1e442f4d 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -1,33 +1,35 @@ { lib , fetchFromGitHub , buildPythonPackage +, poetry , isPy27 , docopt , easywatch , jinja2 , pytestCheckHook , pytest-check -, fetchPypi , markdown -, sphinx -, sphinx_rtd_theme }: buildPythonPackage rec { pname = "staticjinja"; - version = "1.0.3"; + version = "1.0.4"; + format = "pyproject"; disabled = isPy27; # 0.4.0 drops python2 support - # For some reason, in pypi the tests get disabled when using - # PY_IGNORE_IMPORTMISMATCH, so we just fetch from GitHub + # No tests in pypi src = fetchFromGitHub { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "12rpv5gv64i5j4w98wm1444xnnmarcn3pg783j3fkkzc58lk5wwj"; + sha256 = "1saz6f71s693gz9c2k3bq2di2mrkj65mgmfdg86jk0z0zzjk90y1"; }; + nativeBuildInputs = [ + poetry + ]; + propagatedBuildInputs = [ jinja2 docopt @@ -38,15 +40,10 @@ buildPythonPackage rec { pytestCheckHook pytest-check markdown - sphinx_rtd_theme - sphinx ]; + # The tests need to find and call the installed staticjinja executable preCheck = '' - # Import paths differ by a "build/lib" subdirectory, but the files are - # the same, so we ignore import mismatches. - export PY_IGNORE_IMPORTMISMATCH=1 - # The tests need to find and call the installed staticjinja executable export PATH="$PATH:$out/bin"; '';