From 27c0cca8a9ee080fc1c1d0b900aae3eeb189a906 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:00:33 +0000 Subject: [PATCH 1/3] python311Packages.pylint: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/pylint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 046277a5fa58..9a1f093e5754 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pylint-dev"; repo = "pylint"; rev = "refs/tags/v${version}"; - hash = "sha256-JHtMaZNwl+yLwEDD4Nl0vOt9NQ9DO7iIy5LR/9ta1Pw="; + hash = "sha256-LmpLt2GCzYU73BUpORHaFbGqkxyYqoPoKZpUJSChqKQ="; }; nativeBuildInputs = [ From becd4a584b950e6aed0e8cd854d05674791160df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:26:33 +0200 Subject: [PATCH 2/3] python312Packages.pylint: refactor --- .../python-modules/pylint/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 9a1f093e5754..d6d410215173 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,23 +1,23 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder +{ lib +, stdenv , astroid +, buildPythonPackage , dill +, fetchFromGitHub +, gitpython , isort , mccabe , platformdirs +, py +, pytest-timeout +, pytest-xdist +, pytest7CheckHook +, pythonOlder , requests , setuptools , tomli , tomlkit , typing-extensions -, gitpython -, py -, pytest-timeout -, pytest-xdist -, pytest7CheckHook }: buildPythonPackage rec { @@ -34,11 +34,11 @@ buildPythonPackage rec { hash = "sha256-LmpLt2GCzYU73BUpORHaFbGqkxyYqoPoKZpUJSChqKQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ astroid dill isort @@ -47,7 +47,7 @@ buildPythonPackage rec { tomlkit ] ++ lib.optionals (pythonOlder "3.11") [ tomli - ] ++ lib.optionals (pythonOlder "3.9") [ + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; @@ -106,8 +106,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://pylint.readthedocs.io/en/stable/"; description = "A bug and style checker for Python"; + homepage = "https://pylint.readthedocs.io/en/stable/"; changelog = "https://github.com/pylint-dev/pylint/releases/tag/v${version}"; longDescription = '' Pylint is a Python static code analysis tool which looks for programming errors, @@ -118,7 +118,7 @@ buildPythonPackage rec { - symilar: an independent similarities checker - epylint: Emacs and Flymake compatible Pylint ''; - license = licenses.gpl1Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; } From d9b9268a1b1b9d7039f4dd7b6df00d89dfcc9ee2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:26:57 +0200 Subject: [PATCH 3/3] python311Packages.pylint: format with nixfmt --- .../python-modules/pylint/default.nix | 113 +++++++++--------- 1 file changed, 57 insertions(+), 56 deletions(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index d6d410215173..cfa1b686a72a 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,23 +1,24 @@ -{ lib -, stdenv -, astroid -, buildPythonPackage -, dill -, fetchFromGitHub -, gitpython -, isort -, mccabe -, platformdirs -, py -, pytest-timeout -, pytest-xdist -, pytest7CheckHook -, pythonOlder -, requests -, setuptools -, tomli -, tomlkit -, typing-extensions +{ + lib, + stdenv, + astroid, + buildPythonPackage, + dill, + fetchFromGitHub, + gitpython, + isort, + mccabe, + platformdirs, + py, + pytest-timeout, + pytest-xdist, + pytest7CheckHook, + pythonOlder, + requests, + setuptools, + tomli, + tomlkit, + typing-extensions, }: buildPythonPackage rec { @@ -34,22 +35,19 @@ buildPythonPackage rec { hash = "sha256-LmpLt2GCzYU73BUpORHaFbGqkxyYqoPoKZpUJSChqKQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - astroid - dill - isort - mccabe - platformdirs - tomlkit - ] ++ lib.optionals (pythonOlder "3.11") [ - tomli - ] ++ lib.optionals (pythonOlder "3.10") [ - typing-extensions - ]; + dependencies = + [ + astroid + dill + isort + mccabe + platformdirs + tomlkit + ] + ++ lib.optionals (pythonOlder "3.11") [ tomli ] + ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ gitpython @@ -67,7 +65,8 @@ buildPythonPackage rec { # displaying implemented interfaces in pylint 3.0. The # implementation relies on the '__implements__' attribute proposed # in PEP 245, which was rejected in 2006. - "-W" "ignore::DeprecationWarning" + "-W" + "ignore::DeprecationWarning" "-v" ]; @@ -84,26 +83,28 @@ buildPythonPackage rec { "tests/pyreverse/test_writer.py" ]; - disabledTests = [ - # AssertionError when self executing and checking output - # expected output looks like it should match though - "test_invocation_of_pylint_config" - "test_generate_rcfile" - "test_generate_toml_config" - "test_help_msg" - "test_output_of_callback_options" - # Failed: DID NOT WARN. No warnings of type (,) were emitted. The list of emitted warnings is: []. - "test_save_and_load_not_a_linter_stats" - # Truncated string expectation mismatch - "test_truncated_compare" - # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483 - "test_functional" - # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] - "test_functional_relation_extraction" - ] ++ lib.optionals stdenv.isDarwin [ - "test_parallel_execution" - "test_py3k_jobs_option" - ]; + disabledTests = + [ + # AssertionError when self executing and checking output + # expected output looks like it should match though + "test_invocation_of_pylint_config" + "test_generate_rcfile" + "test_generate_toml_config" + "test_help_msg" + "test_output_of_callback_options" + # Failed: DID NOT WARN. No warnings of type (,) were emitted. The list of emitted warnings is: []. + "test_save_and_load_not_a_linter_stats" + # Truncated string expectation mismatch + "test_truncated_compare" + # Probably related to pytest versions, see pylint-dev/pylint#9477 and pylint-dev/pylint#9483 + "test_functional" + # AssertionError: assert [('specializa..., 'Ancestor')] == [('aggregatio..., 'Ancestor')] + "test_functional_relation_extraction" + ] + ++ lib.optionals stdenv.isDarwin [ + "test_parallel_execution" + "test_py3k_jobs_option" + ]; meta = with lib; { description = "A bug and style checker for Python";