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

python-protobuf: enable python3 and enable py3 tests

Browse Source 
- moved expression out of python-packages
- no significant changes how package is built except the supported
  python versions
This commit is contained in:
Jörg Thalheim 2017-01-23 14:25:19 +01:00
parent 6db593164a
commit 094ac2d9b1
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pkgs/development/python-modules/protobuf.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, python, buildPythonPackage
, protobuf, google_apputils
, disabled, doCheck ? true }:
with stdenv.lib;
buildPythonPackage rec {
inherit (protobuf) name src;
inherit disabled doCheck;
propagatedBuildInputs = [ protobuf google_apputils ];
buildInputs = [ google_apputils ];
prePatch = ''
while [ ! -d python ]; do
cd *
done
cd python
'';
preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
'';
preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") ''
${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
'';
installFlags = optional (versionAtLeast protobuf.version "2.6.0")
"--install-option='--cpp_implementation'";
# the _message.so isn't installed, so we'll do that manually.
# if someone can figure out a less hacky way to get the _message.so to
# install, please do replace this.
postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
'';
meta = {
description = "Protocol Buffers are Google's data interchange format";
homepage = https://developers.google.com/protocol-buffers/;
};
passthru.protobuf = protobuf;
}

74
pkgs/top-level/python-packages.nix
View File

@ -9044,6 +9044,8 @@ in {
}; };
propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ]; propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ];
# IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in)
doCheck = !isPy3k;
meta = { meta = {
homepage = "https://github.com/tgalal/python-axolotl"; homepage = "https://github.com/tgalal/python-axolotl";
@ -19289,64 +19291,28 @@ in {
}); });
protobuf = self.protobuf2_6; protobuf = self.protobuf2_6;
protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; }; # only required by tensorflow
protobuf3_0_0b2 = (self.protobufBuild pkgs.protobuf3_0_0b2).override { doCheck = false; }; protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix {
protobuf2_6 = self.protobufBuild pkgs.protobuf2_6; disabled = isPyPy || isPy3k;
protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; doCheck = isPy3k;
protobufBuild = protobuf: buildPythonPackage rec { protobuf = pkgs.protobuf3_0_0b2;
inherit (protobuf) name src; };
protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPyPy;
doCheck = isPy3k;
protobuf = pkgs.protobuf3_0;
};
protobuf2_6 = callPackage ../development/python-modules/protobuf.nix {
disabled = isPy3k || isPyPy; disabled = isPy3k || isPyPy;
doCheck = false;
propagatedBuildInputs = with self; [ protobuf google_apputils ]; protobuf = pkgs.protobuf2_6;
prePatch = ''
while [ ! -d python ]; do
cd *
done
cd python
'';
preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
'';
preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") ''
${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
'';
checkPhase = ''
runHook preCheck
'' + (if versionAtLeast protobuf.version "2.6.0" then ''
${python.executable} setup.py google_test --cpp_implementation
echo "sanity checking the C extension . . ."
echo "import google.protobuf.descriptor" | ${python.executable}
'' else ''
${python.executable} setup.py test
'') + ''
runHook postCheck
'';
installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'";
# the _message.so isn't installed, so we'll do that manually.
# if someone can figure out a less hacky way to get the _message.so to
# install, please do replace this.
postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
'';
doCheck = true;
meta = {
description = "Protocol Buffers are Google's data interchange format";
homepage = http://code.google.com/p/protobuf/;
}; };
protobuf2_5 = callPackage ../development/python-modules/protobuf.nix {
passthru.protobuf = protobuf; disabled = isPy3k || isPyPy;
protobuf = pkgs.protobuf2_5;
}; };
psutil = buildPythonPackage rec { psutil = buildPythonPackage rec {
name = "psutil-${version}"; name = "psutil-${version}";
version = "4.3.0"; version = "4.3.0";