From deb423b04d5ab6a43990f10094daa59d68954013 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 27 Aug 2024 08:16:06 +0200 Subject: [PATCH 1/3] python312Packages.qstylizer: 0.2.2 -> 0.2.3 Diff: https://github.com/blambright/qstylizer/compare/refs/tags/0.2.2...0.2.3 --- .../python-modules/qstylizer/default.nix | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/qstylizer/default.nix b/pkgs/development/python-modules/qstylizer/default.nix index 22aa5d14843b0..ab9c3032d047d 100644 --- a/pkgs/development/python-modules/qstylizer/default.nix +++ b/pkgs/development/python-modules/qstylizer/default.nix @@ -2,33 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, - inflection, - pbr, - pytest-mock, - pytestCheckHook, pythonOlder, + + # build-system + pbr, + setuptools, + + # dependencies + inflection, tinycss2, + + # checks + pytestCheckHook, + pytest-mock, }: buildPythonPackage rec { pname = "qstylizer"; - version = "0.2.2"; - format = "setuptools"; + version = "0.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blambright"; - repo = pname; - rev = version; - hash = "sha256-QJ4xhaAoVO4/VncXKzI8Q5f/rPfctJ8CvfedkQVgZgQ="; + repo = "qstylizer"; + rev = "refs/tags/${version}"; + hash = "sha256-eZVBUGQxa2cr0O48iKWNTqM9E5ZAsiT1WfXjdYdxIdg="; }; PBR_VERSION = version; - nativeBuildInputs = [ pbr ]; + build-system = [ + pbr + setuptools + ]; - propagatedBuildInputs = [ + dependencies = [ inflection tinycss2 ]; @@ -40,10 +50,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "qstylizer" ]; - meta = with lib; { + meta = { description = "Qt stylesheet generation utility for PyQt/PySide"; homepage = "https://github.com/blambright/qstylizer"; - license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drewrisinger ]; }; } From 709b1eb5190b5cd709712f87cf27df9e9d1b130a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 27 Aug 2024 08:21:35 +0200 Subject: [PATCH 2/3] python312Packages.python-lsp-server: 1.11.0 -> 1.12.0 Diff: https://github.com/python-lsp/python-lsp-server/compare/refs/tags/v1.11.0...v1.12.0 Changelog: https://github.com/python-lsp/python-lsp-server/blob/v1.12.0/CHANGELOG.md --- .../python-lsp-server/default.nix | 105 ++++++++++-------- 1 file changed, 59 insertions(+), 46 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 927f26b3201e7..54fa536f792e4 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -1,39 +1,50 @@ { lib, - autopep8, buildPythonPackage, - docstring-to-markdown, fetchFromGitHub, - flake8, - flaky, - importlib-metadata, + pythonOlder, + + # build-system + setuptools-scm, + + # dependencies + docstring-to-markdown, jedi, - matplotlib, - mccabe, - numpy, - pandas, pluggy, + python-lsp-jsonrpc, + setuptools, + ujson, + importlib-metadata, + + # optional-dependencies + autopep8, + flake8, + mccabe, pycodestyle, pydocstyle, pyflakes, pylint, - pytestCheckHook, - python-lsp-jsonrpc, - pythonOlder, rope, - setuptools, - setuptools-scm, toml, - ujson, - websockets, whatthepatch, yapf, + + # checks + flaky, + matplotlib, + numpy, + pandas, + pytestCheckHook, + websockets, + + testers, + python-lsp-server, }: buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.11.0"; - format = "pyproject"; + version = "1.12.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +52,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = "python-lsp-server"; rev = "refs/tags/v${version}"; - hash = "sha256-0DFcnGlyDOK0Lxpr++xV6klhFF9b1fihH5FY/tblr+E="; + hash = "sha256-oFqa7DtFpJmDZrw+GJqrFH3QqnMAu9159q3IWT9vRko="; }; postPatch = '' @@ -59,8 +70,6 @@ buildPythonPackage rec { "pyflakes" ]; - nativeBuildInputs = [ setuptools-scm ]; - build-system = [ setuptools-scm ]; dependencies = [ @@ -72,7 +81,7 @@ buildPythonPackage rec { ujson ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ autopep8 flake8 @@ -101,27 +110,24 @@ buildPythonPackage rec { websockets = [ websockets ]; }; - nativeCheckInputs = - [ - flaky - matplotlib - numpy - pandas - pytestCheckHook - ] - ++ passthru.optional-dependencies.all; - - disabledTests = - [ - # Don't run lint tests - "test_pydocstyle" - # https://github.com/python-lsp/python-lsp-server/issues/243 - "test_numpy_completions" - "test_workspace_loads_pycodestyle_config" - "test_autoimport_code_actions_and_completions_for_notebook_document" - # avoid dependencies on many Qt things just to run one singular test - "test_pyqt_completion" - ]; + nativeCheckInputs = [ + flaky + matplotlib + numpy + pandas + pytestCheckHook + ] ++ optional-dependencies.all; + + disabledTests = [ + # Don't run lint tests + "test_pydocstyle" + # https://github.com/python-lsp/python-lsp-server/issues/243 + # "test_numpy_completions" + "test_workspace_loads_pycodestyle_config" + "test_autoimport_code_actions_and_completions_for_notebook_document" + # avoid dependencies on many Qt things just to run one singular test + "test_pyqt_completion" + ]; preCheck = '' export HOME=$(mktemp -d); @@ -132,12 +138,19 @@ buildPythonPackage rec { "pylsp.python_lsp" ]; - meta = with lib; { + passthru = { + tests.version = testers.testVersion { + package = python-lsp-server; + version = "v${version}"; + }; + }; + + meta = { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/python-lsp/python-lsp-server"; changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "pylsp"; }; } From 246071ae1da23bafcdcf612522635c585512a88b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 27 Aug 2024 08:10:38 +0200 Subject: [PATCH 3/3] spyder: 5.5.5 -> 5.5.6 Changelog: https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md --- 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 eafc959eb8820..b3d91997fc903 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -3,6 +3,8 @@ buildPythonPackage, fetchPypi, pythonOlder, + + # dependencies atomicwrites, chardet, cloudpickle, @@ -44,14 +46,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.5.5"; + version = "5.5.6"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Y+JZO/LfWi1QzoSSV1uDI4zxLcte0HwVMNmBK0aXgd4="; + hash = "sha256-lYtmn0oBXFw5EFDrbv+o2EZWqL/Eel9GrbopeEnYK90="; }; patches = [ ./dont-clear-pythonpath.patch ];