From 814f85740eba8d7f1e480028f9abba83c76e8bad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 17:18:51 +0100 Subject: [PATCH 1/4] python311Packages.pylint-plugin-utils: refactor --- .../python-modules/pylint-plugin-utils/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index a8cff3800960..25cc23e95472 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -4,23 +4,28 @@ , pylint , pytestCheckHook , pythonOlder +, setuptools , toml }: buildPythonPackage rec { pname = "pylint-plugin-utils"; version = "0.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; - rev = version; + repo = "pylint-plugin-utils"; + rev = "refs/tags/${version}"; hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pylint toml From 4b2a66591c2c17ea47a447a1f7c4d4e39dc4ade5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 17:19:57 +0100 Subject: [PATCH 2/4] python311Packages.pylint-plugin-utils: 0.7 -> 0.8.2 Diff: https://github.com/PyCQA/pylint-plugin-utils/compare/refs/tags/0.7...0.8.2 --- .../python-modules/pylint-plugin-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index 25cc23e95472..cdc29eb19621 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core , pylint , pytestCheckHook , pythonOlder -, setuptools , toml }: buildPythonPackage rec { pname = "pylint-plugin-utils"; - version = "0.7"; + version = "0.8.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,11 +19,11 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "pylint-plugin-utils"; rev = "refs/tags/${version}"; - hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww="; + hash = "sha256-xuPU1txfB+6+zJjtlfvNA950S5n7/PWPPFn1F3RtvCc="; }; nativeBuildInputs = [ - setuptools + poetry-core ]; propagatedBuildInputs = [ From de6d7c3774d44bdf3413d0e0df4856437a0adf63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 17:33:16 +0100 Subject: [PATCH 3/4] python311Packages.pylint-django: refactor - disable failing tests --- .../python-modules/pylint-django/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index d12e7268a24f..d3f22e8532ef 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonPackage , django +, django-tables2 +, django-tastypie , factory-boy , fetchFromGitHub +, poetry-core , pylint-plugin-utils , pytestCheckHook , pythonOlder @@ -11,33 +14,43 @@ buildPythonPackage rec { pname = "pylint-django"; version = "2.5.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "pylint-django"; rev = "refs/tags/v${version}"; hash = "sha256-MNgu3LvFoohXA+JzUiHIaYFw0ssEe+H5T8Ea56LcGuI="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - django pylint-plugin-utils ]; + passthru.optional-dependencies = { + with_django = [ + django + ]; + }; + nativeCheckInputs = [ + django-tables2 + django-tastypie factory-boy pytestCheckHook ]; disabledTests = [ - # AttributeError, AssertionError - "external_django_tables2_noerror_meta_class" - "external_tastypie_noerror_foreign_key" + # AttributeError: module 'pylint.interfaces' has no attribute 'IAstroidChecker' + "test_migrations_plugin" "func_noerror_model_unicode_lambda" - "0001_noerror_initial" + "test_linter_should_be_pickleable_with_pylint_django_plugin_installed" ]; pythonImportsCheck = [ @@ -47,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pylint plugin to analyze Django applications"; homepage = "https://github.com/PyCQA/pylint-django"; + changelog = "https://github.com/pylint-dev/pylint-django/releases/tag/v${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kamadorueda ]; }; From 8406235c376d1fe30557227acda8bb92351be630 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 19:09:43 +0100 Subject: [PATCH 4/4] python311Packages.mypy-boto3-builder: refactor --- .../python-modules/mypy-boto3-builder/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index d63e6f9791e5..273da11049ad 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -9,17 +9,19 @@ , md-toc , mdformat , newversion +, pip , poetry-core , pyparsing , pytestCheckHook , pythonOlder , setuptools +, typing-extensions }: buildPythonPackage rec { pname = "mypy-boto3-builder"; version = "7.21.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -43,8 +45,10 @@ buildPythonPackage rec { md-toc mdformat newversion + pip pyparsing setuptools + typing-extensions ]; nativeCheckInputs = [