b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python3Packages.pyspark: Fix out of date postPatch

Browse source 
Pyspark switched to pinning py4j==0.10.9 with v3.0.0 - see this commit:
https://github.com/apache/spark/\
   commit/fc4e56a54c15e20baf085e6061d3d83f5ce1185d

This meant that since the bump to pyspark v3.0.0 - in this commit:
https://github.com/NixOS/nixpkgs/\
   commit/5181547ae6624b462919a806c4d0888e6e4630f4 -
the patch was no longer matching on the 'py4j==0.10.7' string that was
working previously.

The failing patch went unnoticed previously because the version of py4j
pinned by pyspark>=3.0.0 was the same as the py4j provided by nixpkgs.

However, a recent PR (#101636) bumped the version of py4j to 0.10.9.1 in
this commit:
https://github.com/NixOS/nixpkgs/\
   commit/43a91282d66223c5cb978d53fbe1033f56dd7f2b
which caused the version pinned by pyspark to no longer match the
version provided by nixpkgs. FWIW, @jonringer flagged this issue on
another PR that tried to bump py4j: #100623.

My solution here was to upgrade the patch's target string to match the
version found in pyspark's current setup.py.
This commit is contained in:
Joshua Skrzypek 2020-11-23 18:15:59 -05:00 committed by Jonathan Ringer
parent cc5a3cb547
commit cde89e3ecf
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/python-modules/pyspark/default.nix
View file

@ -13,8 +13,7 @@ buildPythonPackage rec {
postPatch = ''
sed -i "s/'pypandoc'//" setup.py
# Current release works fine with py4j 0.10.8.1
substituteInPlace setup.py --replace py4j==0.10.7 'py4j>=0.10.7,<0.11'
substituteInPlace setup.py --replace py4j==0.10.9 'py4j>=0.10.9,<0.11'
'';
propagatedBuildInputs = [ py4j ];