From f14cafb94463f4ba0dc4f14dc9666e288cb8d59b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 19:24:42 +0100 Subject: [PATCH 1/6] python310Packages.pylint-venv: init at 2.3.0 --- .../python-modules/pylint-venv/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 ++- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pylint-venv/default.nix diff --git a/pkgs/development/python-modules/pylint-venv/default.nix b/pkgs/development/python-modules/pylint-venv/default.nix new file mode 100644 index 000000000000..ea361ed88ef3 --- /dev/null +++ b/pkgs/development/python-modules/pylint-venv/default.nix @@ -0,0 +1,39 @@ + { lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pylint-venv"; + version = "2.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jgosmann"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-x36OsTRzrN3NWrMpJ34ZHRsw4cQlo49AnJNr5kP8/aQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pylint_venv" + ]; + + meta = with lib; { + description = "Module to make pylint respect virtual environments"; + homepage = "https://github.com/jgosmann/pylint-venv/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5248321ec871..24a2f0767c28 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7990,16 +7990,18 @@ self: super: with self; { pylink-square = callPackage ../development/python-modules/pylink-square { }; + pylint = callPackage ../development/python-modules/pylint { }; + pylint-celery = callPackage ../development/python-modules/pylint-celery { }; pylint-django = callPackage ../development/python-modules/pylint-django { }; pylint-flask = callPackage ../development/python-modules/pylint-flask { }; - pylint = callPackage ../development/python-modules/pylint { }; - pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; + pylint-venv = callPackage ../development/python-modules/pylint-venv { }; + pylitterbot = callPackage ../development/python-modules/pylitterbot { }; py-libzfs = callPackage ../development/python-modules/py-libzfs { }; From 2a9615d0d071a3c9d4f8336c20032c5621785a5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 19:32:38 +0100 Subject: [PATCH 2/6] python310Packages.spyder-kernels: 2.3.3 -> 2.4.0 --- .../python-modules/spyder-kernels/default.nix | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 743be37b5130..f39b03763c81 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -1,30 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, cloudpickle, ipykernel, wurlitzer, - jupyter-client, pyzmq }: +{ lib +, buildPythonPackage +, cloudpickle +, fetchPypi +, ipykernel +, ipython +, jupyter-client +, packaging +, pythonOlder +, pyxdg +, pyzmq +, wurlitzer +}: buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.3.3"; + version = "2.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7luJo7S/n88jDJRhJx1WuF5jhmeRHrrdxinbBbXuRxc="; + hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE="; }; propagatedBuildInputs = [ cloudpickle ipykernel - wurlitzer + ipython jupyter-client + packaging + pyxdg pyzmq + wurlitzer ]; postPatch = '' - substituteInPlace setup.py --replace "ipython>=7.31.1,<8" "ipython" + substituteInPlace setup.py \ + --replace "ipykernel>=6.16.1,<7" "ipykernel" \ + --replace "ipython>=7.31.1,<8" "ipython" ''; # No tests doCheck = false; + pythonImportsCheck = [ + "spyder_kernels" + ]; + meta = with lib; { description = "Jupyter kernels for Spyder's console"; homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; From ad8c505447ad365aa0824c1800ca444d598b9988 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 19:39:34 +0100 Subject: [PATCH 3/6] python310Packages.qtawesome: 1.1.1 -> 1.2.1 --- .../python-modules/qtawesome/default.nix | 44 +++++++++++++------ 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 4bb3303af467..b4e02e77b229 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -1,29 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi, qtpy, six, pyqt5, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyqt5 +, pytestCheckHook +, pythonOlder +, qtpy +}: buildPythonPackage rec { - pname = "QtAwesome"; - version = "1.1.1"; + pname = "qtawesome"; + version = "1.2.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "ec02e200231fa68a146a93845890aa0432a7edcba14bf811ff6975cf9acdab5d"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-KcYCXrTP8ED5j/VTLTw7a8zotDSqIu9ultmwp8Ip5nM="; }; - propagatedBuildInputs = [ qtpy six ]; + propagatedBuildInputs = [ + pyqt5 + qtpy + ]; - checkInputs = [ pyqt5 pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test - ''; - - # Requires https://github.com/boylea/qtbot + # Requires https://github.com/boylea/qtbot which is unmaintained doCheck = false; + pythonImportsCheck = [ + "qtawesome" + ]; + meta = with lib; { description = "Iconic fonts in PyQt and PySide applications"; homepage = "https://github.com/spyder-ide/qtawesome"; license = licenses.mit; + maintainers = with maintainers; [ ]; platforms = platforms.linux; # fails on Darwin }; } From e6fa5b83dca44e892ded6f6467f707c11db7e436 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 19:45:42 +0100 Subject: [PATCH 4/6] python310Packages.qstylizer: 0.2.1 -> 0.2.2 --- .../python-modules/qstylizer/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix index 768e5f7d007e..835437da0011 100644 --- a/pkgs/development/python-modules/qstylizer/default.nix +++ b/pkgs/development/python-modules/qstylizer/default.nix @@ -1,25 +1,30 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub , inflection , pbr -, tinycss2 -, pytestCheckHook , pytest-mock +, pytestCheckHook +, pythonOlder +, tinycss2 }: buildPythonPackage rec { pname = "qstylizer"; - version = "0.2.1"; + version = "0.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blambright"; repo = pname; rev = version; - sha256 = "sha256-iEMxBpS9gOPubd9O8zpVmR5B7+UZJFkPuOtikO1a9v0="; + hash = "sha256-QJ4xhaAoVO4/VncXKzI8Q5f/rPfctJ8CvfedkQVgZgQ="; }; + PBR_VERSION = version; + nativeBuildInputs = [ pbr ]; @@ -34,12 +39,12 @@ buildPythonPackage rec { pytest-mock ]; - preBuild = '' - export PBR_VERSION=${version} - ''; + pythonImportsCheck = [ + "qstylizer" + ]; meta = with lib; { - description = "Qt stylesheet generation utility for PyQt/PySide "; + description = "Qt stylesheet generation utility for PyQt/PySide"; homepage = "https://github.com/blambright/qstylizer"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; From 70619cbff75debaa3189fcca3278e952b4a9959a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 19:51:21 +0100 Subject: [PATCH 5/6] python310Packages.qtconsole: 5.3.2 -> 5.4.0 --- .../python-modules/qtconsole/default.nix | 47 +++++++++++++------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index aae38c944958..5c618b418931 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -1,38 +1,57 @@ { lib , buildPythonPackage , fetchPypi -, nose -, isPy27 -, mock -, traitlets +, ipykernel , jupyter_core , jupyter-client , pygments -, ipykernel , pyqt5 +, pytestCheckHook +, pythonOlder +, pyzmq , qtpy +, traitlets }: buildPythonPackage rec { pname = "qtconsole"; - version = "5.3.2"; + version = "5.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jq3wEug6sBgpWAPCR8arfqzT1aseHYig83/c/auSlaM="; + hash = "sha256-V3SOov0mMgoLd626IBMc+7E4GMfJbYP6/LEQ/1X1izU="; }; - checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; - propagatedBuildInputs = [traitlets jupyter_core jupyter-client pygments ipykernel pyqt5 qtpy]; + propagatedBuildInputs = [ + ipykernel + jupyter_core + jupyter-client + pygments + pyqt5 + pyzmq + qtpy + traitlets + ]; + + checkInputs = [ + pytestCheckHook + ]; # : cannot connect to X server doCheck = false; - meta = { + pythonImportsCheck = [ + "qtconsole" + ]; + + meta = with lib; { description = "Jupyter Qt console"; - homepage = "https://jupyter.org/"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ fridh ]; + homepage = "https://qtconsole.readthedocs.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh ]; + platforms = platforms.unix; }; } From 7e07e34547097d06836a4336d3910c9a770152f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 19:51:50 +0100 Subject: [PATCH 6/6] python310Packages.spyder: 5.3.3 -> 5.4.0 --- pkgs/development/python-modules/spyder/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index a5e11ebc6f00..bb744b2abab4 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -21,6 +21,7 @@ , psutil , pygments , pylint +, pylint-venv , pyls-spyder , pyopengl , pyqtwebengine @@ -45,14 +46,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.3.3"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vWhwn07zgHX7/7uAz0ekNwnAiKLECCBzBq47TtTaHfE="; + hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw="; }; nativeBuildInputs = [ @@ -75,6 +76,7 @@ buildPythonPackage rec { numpydoc psutil pygments + pylint-venv pyls-spyder pyopengl pyqtwebengine