diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:03:33 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-12 04:53:38 +0200 |
commit | 6c2fbfbd7720446821be2a506cefcd1e0ff3b42d (patch) | |
tree | ef852f77f02c1636e2ee215623d6a20e87174b9e /pkgs/development/python-modules/generic | |
parent | 81df0354290389128077e00edfd2368eeeea0c24 (diff) | |
parent | 3d932ba135f9fe7eb649269543276dffa7aa563a (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/python-modules/generic')
-rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 79 |
1 files changed, 52 insertions, 27 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 1fdbd4ffc0bd4..a90b66a337576 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -21,9 +21,6 @@ # https://github.com/pypa/pip/issues/881 , setupPyBuildFlags ? [] -# enable tests by default -, doCheck ? true - # DEPRECATED: use propagatedBuildInputs , pythonPath ? [] @@ -45,6 +42,8 @@ # Additional flags to pass to "pip install". , installFlags ? [] +, format ? "setup" + , ... } @ attrs: @@ -57,8 +56,53 @@ let # use setuptools shim (so that setuptools is imported before distutils) # pip does the same thing: https://github.com/pypa/pip/pull/3265 setuppy = ./run_setup.py; - # For backwards compatibility, let's use an alias - doInstallCheck = doCheck; + + formatspecific = + if format == "wheel" then + { + unpackPhase = '' + mkdir dist + cp $src dist/"''${src#*-}" + ''; + + # Wheels are pre-compiled + buildPhase = attrs.buildPhase or ":"; + installCheckPhase = attrs.checkPhase or ":"; + + # Wheels don't have any checks to run + doInstallCheck = attrs.doCheck or false; + } + else if format == "setup" then + { + # propagate python/setuptools to active setup-hook in nix-shell + propagatedBuildInputs = + propagatedBuildInputs ++ [ python setuptools ]; + + # we copy nix_run_setup.py over so it's executed relative to the root of the source + # many project make that assumption + buildPhase = attrs.buildPhase or '' + runHook preBuild + cp ${setuppy} nix_run_setup.py + ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel + runHook postBuild + ''; + + installCheckPhase = attrs.checkPhase or '' + runHook preCheck + ${python.interpreter} nix_run_setup.py test + runHook postCheck + ''; + + # Python packages that are installed with setuptools + # are typically distributed with tests. + # With Python it's a common idiom to run the tests + # after the software has been installed. + + # For backwards compatibility, let's use an alias + doInstallCheck = attrs.doCheck or true; + } + else + throw "Unsupported format ${format}"; in python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // { name = namePrefix + name; @@ -67,9 +111,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); - # propagate python/setuptools to active setup-hook in nix-shell - propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; - pythonPath = pythonPath; configurePhase = attrs.configurePhase or '' @@ -82,14 +123,8 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // runHook postConfigure ''; - # we copy nix_run_setup.py over so it's executed relative to the root of the source - # many project make that assumption - buildPhase = attrs.buildPhase or '' - runHook preBuild - cp ${setuppy} nix_run_setup.py - ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel - runHook postBuild - ''; + # Python packages don't have a checkPhase, only an installCheckPhase + doCheck = false; installPhase = attrs.installPhase or '' runHook preInstall @@ -104,16 +139,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // runHook postInstall ''; - # We run all tests after software has been installed since that is - # a common idiom in Python - doInstallCheck = doInstallCheck; - - installCheckPhase = attrs.checkPhase or '' - runHook preCheck - ${python.interpreter} nix_run_setup.py test - runHook postCheck - ''; - postFixup = attrs.postFixup or '' wrapPythonPrograms @@ -143,4 +168,4 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // # a marker for release utilities to discover python packages isBuildPythonPackage = python.meta.platforms; }; -}) +} // formatspecific) |