From 53d7fe773aeedd4e4ba03ae6d124459fe9e22ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 May 2018 11:19:19 +0100 Subject: [PATCH 1/7] python.pkgs.parso: 0.1.1 -> 0.2.0 --- pkgs/development/python-modules/parso/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 17e3f9fcf3e..f47a2acf200 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "parso"; - version = "0.1.1"; + version = "0.2.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "5815f3fe254e5665f3c5d6f54f086c2502035cb631a91341591b5a564203cffb"; + sha256 = "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2"; }; checkInputs = [ pytest ]; @@ -22,4 +22,4 @@ buildPythonPackage rec { license = lib.licenses.mit; }; -} \ No newline at end of file +} From 1a1799b6f45b58067d4806dbe65f21814f8a9461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 May 2018 11:19:56 +0100 Subject: [PATCH 2/7] python.pkgs.jedi: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/jedi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index df8a287ea09..7d652b2943a 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.11.1"; + version = "0.12.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "d6e799d04d1ade9459ed0f20de47c32f2285438956a677d083d3c98def59fa97"; + sha256 = "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr"; }; postPatch = '' From b76177a625e589bd44df28a5fef4cc5a58f10326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 25 May 2018 10:42:34 +0100 Subject: [PATCH 3/7] mypy: make it usuable as a library --- pkgs/development/{tools => python-modules}/mypy/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) rename pkgs/development/{tools => python-modules}/mypy/default.nix (80%) diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix similarity index 80% rename from pkgs/development/tools/mypy/default.nix rename to pkgs/development/python-modules/mypy/default.nix index d021f994e49..5ce05b7938f 100644 --- a/pkgs/development/tools/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast, psutil }: +{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "mypy"; version = "0.600"; @@ -12,6 +12,8 @@ buildPythonApplication rec { sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw"; }; + disabled = !isPy3k; + propagatedBuildInputs = [ lxml typed-ast psutil ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f729c0942f..2791e379e8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8492,7 +8492,7 @@ with pkgs; grabserial = callPackage ../development/tools/grabserial { }; - mypy = python3Packages.callPackage ../development/tools/mypy { }; + mypy = python3Packages.mypy; ### DEVELOPMENT / LIBRARIES diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 739c40b2d63..27195dc6869 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8088,6 +8088,8 @@ in { mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + mypy = callPackage ../development/python-modules/mypy { }; + mwclient = buildPythonPackage rec { version = "0.8.3"; pname = "mwclient"; From d4153a6fb8d6c02322fb25526346b53f99688691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 May 2018 12:41:42 +0100 Subject: [PATCH 4/7] python.pkgs.pyls-mypy: init at 0.1.2 --- .../python-modules/pyls-mypy/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pyls-mypy/default.nix diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix new file mode 100644 index 00000000000..985d1937d3f --- /dev/null +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +, future, python-language-server, mypy, configparser +, pytest, mock, isPy3k, pytestcov, coverage +}: + +buildPythonPackage rec { + pname = "pyls-mypy"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "tomv564"; + repo = "pyls-mypy"; + rev = version; + sha256 = "0wa038a8a8yj3wmrc7q909nj4b5d3lq70ysbw7rpsnyb0x06m826"; + }; + + disabled = !isPy3k; + + patches = [ + # also part of https://github.com/tomv564/pyls-mypy/pull/10 + (fetchpatch { + url = "https://github.com/Mic92/pyls-mypy/commit/4c727120d2cbd8bf2825e1491cd55175f03266d2.patch"; + sha256 = "1dgn5z742swpxwknmgvm65jpxq9zwzhggw4nl6ys7yw8r49kqgrl"; + }) + ]; + + checkPhase = '' + HOME=$TEMPDIR pytest + ''; + + checkInputs = [ pytest mock pytestcov coverage ]; + + propagatedBuildInputs = [ + mypy python-language-server future configparser + ]; + + meta = with lib; { + homepage = https://github.com/palantir/python-language-server; + description = "An implementation of the Language Server Protocol for Python"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27195dc6869..99438cfca6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11268,6 +11268,10 @@ in { buildInputs = with self; [ pyasn1 pycrypto ]; }; + python-language-server = callPackage ../development/python-modules/python-language-server {}; + + pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) fetchurl systemd; }; From 5432e4d0ad247f30df60f06ae8177229b6b0d92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 May 2018 12:52:59 +0100 Subject: [PATCH 5/7] python.pkgs.pyls-isort: init at 0.1.2 --- .../python-modules/pyls-isort/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/pyls-isort/default.nix diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix new file mode 100644 index 00000000000..fce7999a756 --- /dev/null +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, python-language-server, isort +}: + +buildPythonPackage rec { + pname = "pyls-isort"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "paradoxxxzero"; + repo = "pyls-isort"; + rev = version; + sha256 = "0mf8c6dw5lsj9np20p0vrhr1yfycq2awjk2pil28l579xj9nr0dc"; + }; + + # no tests + doCheck = false; + + propagatedBuildInputs = [ + isort python-language-server + ]; + + meta = with lib; { + homepage = https://github.com/palantir/python-language-server; + description = "An implementation of the Language Server Protocol for Python"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99438cfca6c..8ea969f142b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11272,6 +11272,8 @@ in { pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + pyls-isort = callPackage ../development/python-modules/pyls-isort {}; + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) fetchurl systemd; }; From f7650ebd5fb1085a6e4ad13d2c0b7782e2dfe9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 25 May 2018 01:02:05 +0100 Subject: [PATCH 6/7] python.pkgs.spyder: fix setup.py patch --- pkgs/applications/science/spyder/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 4b3ef167d53..4411d78cec2 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing? postPatch = '' - substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' ' + sed -i -e '/pyqt5/d' setup.py ''; propagatedBuildInputs = [ From 88b94b78829322e1a1393c17f2e68d037bd81219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 24 May 2018 11:22:09 +0100 Subject: [PATCH 7/7] python.pkgs.python-language-server: init at 0.18.0 --- .../python-language-server/default.nix | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/python-language-server/default.nix diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix new file mode 100644 index 00000000000..c2df1f85325 --- /dev/null +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -0,0 +1,48 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 +, configparser, futures, future, jedi, pluggy +, pytest, mock, pytestcov, coverage +# The following packages are optional and +# can be overwritten with null as your liking. +# This also requires to disable tests. +, rope ? null +, mccabe ? null +, pyflakes ? null +, pycodestyle ? null +, autopep8 ? null +, yapf ? null +, pydocstyle ? null +}: + +buildPythonPackage rec { + pname = "python-language-server"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "palantir"; + repo = "python-language-server"; + rev = version; + sha256 = "0ig34bc0qm6gdj8xakmm3877lmf8ms7qg0xj8hay9gpgf8cz894s"; + }; + + checkInputs = [ + pytest mock pytestcov coverage + # rope is technically a dependency, but we don't add it by default since we + # already have jedi, which is the preferred option + rope + ]; + checkPhase = '' + HOME=$TEMPDIR pytest + ''; + + propagatedBuildInputs = [ + jedi pluggy mccabe pyflakes pycodestyle yapf pydocstyle future autopep8 + ] ++ lib.optional (isPy27) [ configparser ] + ++ lib.optional (pythonOlder "3.2") [ futures ]; + + meta = with lib; { + homepage = https://github.com/palantir/python-language-server; + description = "An implementation of the Language Server Protocol for Python"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +}