Skip to content

Commit

Permalink
python3.pkgs.jedi: fix compatibility with parso
Browse files Browse the repository at this point in the history
The current version is fundamentally broken as tested with
python-language-server because parso now uses Path instead of str
in many instances.

Backporting of the fixes is not trivial and likely breaks more stuff
than it fixes due to other refactorings in jedi, hence using a recent
commit in master seems more reasonably.
  • Loading branch information
Mic92 authored and Jon committed Sep 8, 2020
1 parent b0a8c8a commit 12a9a93
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions pkgs/development/python-modules/jedi/default.nix
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchPypi, pytest, glibcLocales, tox, pytestcov, parso }:

buildPythonPackage rec {
pname = "jedi";
version = "0.17.2";

src = fetchPypi {
inherit pname version;
sha256 = "86ed7d9b750603e4ba582ea8edc678657fb4007894a12bcf6f4bb97892f31d20";
# switch back to stable version on the next release.
# current stable is incompatible with parso
version = "2020-08-06";

src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi";
rev = "216f976fd5cab7a460e5d287e853d11759251e52";
sha256 = "1kb2ajzigadl95pnwglg8fxz9cvpg9hx30hqqj91jkgrc7djdldj";
fetchSubmodules = true;
};

checkInputs = [ pytest glibcLocales tox pytestcov ];

propagatedBuildInputs = [ parso ];

# remove next bump, >=0.17.2, already fixed in master
prePatch = ''
substituteInPlace requirements.txt \
--replace "parso>=0.7.0,<0.8.0" "parso"
'';

checkPhase = ''
LC_ALL="en_US.UTF-8" py.test test
'';
Expand Down

0 comments on commit 12a9a93

Please sign in to comment.