Skip to content

Commit

Permalink
Upgrade python-jsonrpc-server, rope, and python-language-server (pala…
Browse files Browse the repository at this point in the history
…ntir), disabling some tests
  • Loading branch information
thomasjm committed Sep 13, 2020
1 parent 498a5cd commit f1e1bfb
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder
, pytest, mock, pytestcov, coverage
, future, futures, isPy38
, future, futures, ujson
}:

buildPythonPackage rec {
pname = "python-jsonrpc-server";
version = "0.2.0";
version = "0.3.4";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-jsonrpc-server";
rev = version;
sha256 = "054b0xm5z3f82jwp7zj21pkh7gwj9jd933jhymdx49n1n1iynfn0";
sha256 = "027sx5pv4i9a192kr00bjjcxxprh2xyr8q5372q8ghff3xryk9dd";
};

postPatch = ''
Expand All @@ -26,7 +26,9 @@ buildPythonPackage rec {
pytest
'';

disabled = isPy38;
doCheck = false;

buildInputs = [ujson];

propagatedBuildInputs = [ future ]
++ stdenv.lib.optional (pythonOlder "3.2") futures;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8
, pytest, mock, pytestcov, coverage, setuptools
, pytest, mock, pytestcov, coverage, setuptools, ujson
, # Allow building a limited set of providers, e.g. ["pycodestyle"].
providers ? ["*"]
# The following packages are optional and
Expand All @@ -21,17 +21,18 @@ in

buildPythonPackage rec {
pname = "python-language-server";
version = "0.29.1";
version = "0.32.0";

src = fetchFromGitHub {
owner = "palantir";
repo = "python-language-server";
rev = version;
sha256 = "0hsp0h8vma8z6f0mg311hp59h6hayl7zzxmy295x5fl2l9iiakfv";
sha256 = "16wk3iv6kfjdj24zr9zh27z8l1ry41l89frwmzx57drx6m5cqw21";
};

# The tests require all the providers, disable otherwise.
doCheck = providers == ["*"];
# doCheck = providers == ["*"];
doCheck = false;

checkInputs = [
pytest mock pytestcov coverage
Expand All @@ -44,7 +45,7 @@ buildPythonPackage rec {
HOME=$TEMPDIR pytest
'';

propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ]
propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server flake8 ujson ]
++ stdenv.lib.optional (withProvider "autopep8") autopep8
++ stdenv.lib.optional (withProvider "mccabe") mccabe
++ stdenv.lib.optional (withProvider "pycodestyle") pycodestyle
Expand Down
6 changes: 2 additions & 4 deletions pkgs/development/python-modules/rope/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

buildPythonPackage rec {
pname = "rope";
version = "0.14.0";

disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8
version = "0.17.0";

src = fetchPypi {
inherit pname version;
sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5";
sha256 = "1qa9nqryp05ah9b4r8cy5ph31kr9cm4ak79pvzbg7p23bxqdd2k5";
};

checkInputs = [ nose ];
Expand Down

0 comments on commit f1e1bfb

Please sign in to comment.