pyrox.dev
Merge pull request #254356 from fabaff/python-lsp-jsonrpc-bump
python311Packages.python-lsp-jsonrpc: 1.0.0 -> 1.1.1, python311Packages.python-lsp-server: 1.7.4 -> 1.8.0
authored by Robert Scott and committed by GitHub 201cabb7 398a5f16
+26
-11
pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
+26
-11
pkgs/development/python-modules/python-lsp-jsonrpc/default.nix
···
2
2
, buildPythonPackage
3
3
, fetchFromGitHub
4
4
, pytestCheckHook
5
+
, pythonOlder
6
+
, setuptools
7
+
, setuptools-scm
5
8
, ujson
6
9
}:
7
10
8
11
buildPythonPackage rec {
9
12
pname = "python-lsp-jsonrpc";
10
-
version = "1.0.0";
13
+
version = "1.1.1";
14
+
format = "pyproject";
15
+
16
+
disabled = pythonOlder "3.7";
11
17
12
18
src = fetchFromGitHub {
13
19
owner = "python-lsp";
14
20
repo = pname;
15
-
rev = "v${version}";
16
-
sha256 = "0h4bs8s4axcm0p02v59amz9sq3nr4zhzdgwq7iaw6awl27v1hd0i";
21
+
rev = "refs/tags/v${version}";
22
+
hash = "sha256-XTvnDTaP5oweGSq1VItq+SEv7S/LrQq4YP1XQc3bxbk=";
17
23
};
18
24
25
+
SETUPTOOLS_SCM_PRETEND_VERSION = version;
26
+
27
+
postPatch = ''
28
+
substituteInPlace pyproject.toml \
29
+
--replace "--cov-report html --cov-report term --junitxml=pytest.xml --cov pylsp_jsonrpc --cov test" ""
30
+
'';
31
+
32
+
nativeBuildInputs = [
33
+
setuptools
34
+
setuptools-scm
35
+
];
36
+
19
37
propagatedBuildInputs = [
20
38
ujson
21
39
];
···
24
42
pytestCheckHook
25
43
];
26
44
27
-
postPatch = ''
28
-
substituteInPlace setup.cfg \
29
-
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
30
-
--replace "--cov pylsp_jsonrpc --cov test" ""
31
-
'';
32
-
33
-
pythonImportsCheck = [ "pylsp_jsonrpc" ];
45
+
pythonImportsCheck = [
46
+
"pylsp_jsonrpc"
47
+
];
34
48
35
49
meta = with lib; {
36
-
description = "Python server implementation of the JSON RPC 2.0 protocol.";
50
+
description = "Python server implementation of the JSON RPC 2.0 protocol";
37
51
homepage = "https://github.com/python-lsp/python-lsp-jsonrpc";
52
+
changelog = "https://github.com/python-lsp/python-lsp-jsonrpc/blob/v${version}/CHANGELOG.md";
38
53
license = licenses.mit;
39
54
maintainers = with maintainers; [ fab ];
40
55
};
+7
-14
pkgs/development/python-modules/python-lsp-server/default.nix
+7
-14
pkgs/development/python-modules/python-lsp-server/default.nix
···
4
4
, buildPythonPackage
5
5
, docstring-to-markdown
6
6
, fetchFromGitHub
7
-
, fetchpatch
8
7
, flake8
9
8
, flaky
9
+
, importlib-metadata
10
10
, jedi
11
11
, matplotlib
12
12
, mccabe
···
19
19
, pylint
20
20
, pyqt5
21
21
, pytestCheckHook
22
-
, pythonRelaxDepsHook
23
22
, python-lsp-jsonrpc
24
23
, pythonOlder
24
+
, pythonRelaxDepsHook
25
25
, rope
26
26
, setuptools
27
27
, setuptools-scm
···
35
35
36
36
buildPythonPackage rec {
37
37
pname = "python-lsp-server";
38
-
version = "1.7.4";
38
+
version = "1.8.0";
39
39
format = "pyproject";
40
40
41
-
disabled = pythonOlder "3.7";
41
+
disabled = pythonOlder "3.8";
42
42
43
43
src = fetchFromGitHub {
44
44
owner = "python-lsp";
45
45
repo = pname;
46
46
rev = "refs/tags/v${version}";
47
-
hash = "sha256-plciPUROFileVULGBZpwUTkW2NZVHy4Nuf4+fSjd8nM=";
47
+
hash = "sha256-hLgMGZumuNY70/qyD9t5pMpYI/g70sqFIt1LEfIEALY=";
48
48
};
49
49
50
-
patches = [
51
-
# https://github.com/python-lsp/python-lsp-server/pull/416
52
-
(fetchpatch {
53
-
name = "bump-jedi-upper-pin-to-0.20.patch";
54
-
url = "https://github.com/python-lsp/python-lsp-server/commit/f33a93afc8c3a0f16751f9e1f6601a37967fd7df.patch";
55
-
hash = "sha256-lBpzXxjlQp2ig0z2DRJw+jQZ5eRLIOJYjGrzfgvknDA=";
56
-
})
57
-
];
58
-
59
50
postPatch = ''
60
51
substituteInPlace pyproject.toml \
61
52
--replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \
···
86
77
python-lsp-jsonrpc
87
78
setuptools # `pkg_resources`imported in pylsp/config/config.py
88
79
ujson
80
+
] ++ lib.optionals (pythonOlder "3.10") [
81
+
importlib-metadata
89
82
];
90
83
91
84
passthru.optional-dependencies = {