Python: allow installing wheels

By passing `format="wheel"` it is now possible to install a wheel.
It's not recommended, but it can be useful.
This commit is contained in:
Frederik Rietdijk 2016-04-26 17:57:13 +02:00
parent 5a0cde6c19
commit 303e976245
2 changed files with 51 additions and 27 deletions

View File

@ -534,6 +534,7 @@ All parameters from `mkDerivation` function are still supported.
* `postShellHook`: Hook to execute commands after `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`.
* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
* `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`.
#### `buildPythonApplication` function #### `buildPythonApplication` function

View File

@ -21,9 +21,6 @@
# https://github.com/pypa/pip/issues/881 # https://github.com/pypa/pip/issues/881
, setupPyBuildFlags ? [] , setupPyBuildFlags ? []
# enable tests by default
, doCheck ? true
# DEPRECATED: use propagatedBuildInputs # DEPRECATED: use propagatedBuildInputs
, pythonPath ? [] , pythonPath ? []
@ -45,6 +42,8 @@
# Additional flags to pass to "pip install". # Additional flags to pass to "pip install".
, installFlags ? [] , installFlags ? []
, format ? "setup"
, ... } @ attrs: , ... } @ attrs:
@ -57,8 +56,51 @@ let
# use setuptools shim (so that setuptools is imported before distutils) # use setuptools shim (so that setuptools is imported before distutils)
# pip does the same thing: https://github.com/pypa/pip/pull/3265 # pip does the same thing: https://github.com/pypa/pip/pull/3265
setuppy = ./run_setup.py; setuppy = ./run_setup.py;
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
'';
# We run all tests after software has been installed since that is
# a common idiom in Python
#
# For backwards compatibility, let's use an alias # For backwards compatibility, let's use an alias
doInstallCheck = doCheck; doInstallCheck = attrs.doCheck or false;
}
else
throw "Unsupported format ${format}";
in in
python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // { python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // {
name = namePrefix + name; name = namePrefix + name;
@ -67,9 +109,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
++ [ (ensureNewerSourcesHook { year = "1980"; }) ] ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); ++ (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; pythonPath = pythonPath;
configurePhase = attrs.configurePhase or '' configurePhase = attrs.configurePhase or ''
@ -82,14 +121,8 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
runHook postConfigure runHook postConfigure
''; '';
# we copy nix_run_setup.py over so it's executed relative to the root of the source # Python packages don't have a checkPhase, only a installCheckPhase
# many project make that assumption doCheck = false;
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
'';
installPhase = attrs.installPhase or '' installPhase = attrs.installPhase or ''
runHook preInstall runHook preInstall
@ -104,16 +137,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
runHook postInstall 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 '' postFixup = attrs.postFixup or ''
wrapPythonPrograms wrapPythonPrograms
@ -143,4 +166,4 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
# a marker for release utilities to discover python packages # a marker for release utilities to discover python packages
isBuildPythonPackage = python.meta.platforms; isBuildPythonPackage = python.meta.platforms;
}; };
}) } // formatspecific)