From 8eaec63adca8d6ba736ccc79a27c285763178eb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:14:04 +0200 Subject: [PATCH 1/4] python312Packages.rstcheck: 6.2.1 -> 6.2.1 Diff: https://github.com/rstcheck/rstcheck/compare/refs/tags/v6.2.1...v6.2.1 Changelog: https://github.com/rstcheck/rstcheck/blob/v6.2.1/CHANGELOG.md --- .../python-modules/rstcheck/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 3e648e792b20..2cebca7ba5ae 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,14 +1,14 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , docutils , fetchFromGitHub , importlib-metadata -, poetry-core +, setuptools +, setuptools-scm , pydantic , pytestCheckHook , pythonOlder -, pythonRelaxDepsHook , rstcheck-core , typer , types-docutils @@ -17,32 +17,27 @@ buildPythonPackage rec { pname = "rstcheck"; - version = "6.1.2"; - format = "pyproject"; + version = "6.2.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rstcheck"; - repo = pname; + repo = "rstcheck"; rev = "refs/tags/v${version}"; - hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU="; + hash = "sha256-S04l+x/rIc/XSvq2lSKCQp6KK5mmKI2mOgPgJ3WKe5M="; }; - pythonRelaxDeps = [ - "typer" - ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook + setuptools + setuptools-scm ]; propagatedBuildInputs = [ docutils rstcheck-core types-docutils - typing-extensions pydantic typer ] ++ lib.optionals (pythonOlder "3.8") [ @@ -71,10 +66,10 @@ buildPythonPackage rec { meta = with lib; { description = "Checks syntax of reStructuredText and code blocks nested within it"; - mainProgram = "rstcheck"; homepage = "https://github.com/myint/rstcheck"; changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ staccato ]; + mainProgram = "rstcheck"; }; } From dcff09c3f8c5269d6bdd8d26dc3ae8ebfd3f2a97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:20:12 +0200 Subject: [PATCH 2/4] python312Packages.rstcheck: refactor - use nixfmt --- .../python-modules/rstcheck/default.nix | 46 ++++++++----------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck/default.nix b/pkgs/development/python-modules/rstcheck/default.nix index 2cebca7ba5ae..91f58f134710 100644 --- a/pkgs/development/python-modules/rstcheck/default.nix +++ b/pkgs/development/python-modules/rstcheck/default.nix @@ -1,18 +1,17 @@ -{ lib -, stdenv -, buildPythonPackage -, docutils -, fetchFromGitHub -, importlib-metadata -, setuptools -, setuptools-scm -, pydantic -, pytestCheckHook -, pythonOlder -, rstcheck-core -, typer -, types-docutils -, typing-extensions +{ + lib, + stdenv, + buildPythonPackage, + docutils, + fetchFromGitHub, + setuptools, + setuptools-scm, + pydantic, + pytestCheckHook, + pythonOlder, + rstcheck-core, + typer, + types-docutils, }: buildPythonPackage rec { @@ -20,7 +19,7 @@ buildPythonPackage rec { version = "6.2.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rstcheck"; @@ -29,25 +28,20 @@ buildPythonPackage rec { hash = "sha256-S04l+x/rIc/XSvq2lSKCQp6KK5mmKI2mOgPgJ3WKe5M="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ docutils rstcheck-core types-docutils pydantic typer - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions - importlib-metadata ] ++ typer.optional-dependencies.all; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = lib.optionals stdenv.isDarwin [ # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. @@ -55,9 +49,7 @@ buildPythonPackage rec { "test_file_1_is_bad_without_config_macos" ]; - pythonImportsCheck = [ - "rstcheck" - ]; + pythonImportsCheck = [ "rstcheck" ]; preCheck = '' # The tests need to find and call the rstcheck executable From 034fa6419ca72d6a3f2ad3864e79b6b504b3b0c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:23:48 +0200 Subject: [PATCH 3/4] python312Packages.rstcheck-core: 1.2.0 -> 1.2.1 Diff: https://github.com/rstcheck/rstcheck-core/compare/refs/tags/v1.2.0...v1.2.1 Changelog: https://github.com/rstcheck/rstcheck-core/blob/v1.2.1/CHANGELOG.md --- .../python-modules/rstcheck-core/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index 74a1dd2dbff2..91dda8d7cb8f 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , docutils , fetchFromGitHub @@ -12,12 +12,11 @@ , setuptools , setuptools-scm , typing-extensions -, wheel }: buildPythonPackage rec { pname = "rstcheck-core"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,20 +25,19 @@ buildPythonPackage rec { owner = "rstcheck"; repo = "rstcheck-core"; rev = "refs/tags/v${version}"; - hash = "sha256-cKJNktIB4vXt1MPRgYrJQ0aksmrVu7Y2uTyUjdx5YdA="; + hash = "sha256-PiQMk0lIv24S6qXMYIQR+SkSji+WA30ivWs2uPQwf2A="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; env = { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes"; }; - propagatedBuildInputs = [ + dependencies = [ docutils pydantic ] ++ lib.optionals (pythonOlder "3.9") [ From 3b0f012e447bc1116d694ecde9fd3675ce19ec79 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 Apr 2024 10:24:09 +0200 Subject: [PATCH 4/4] python312Packages.rstcheck-core: use nixfmt --- .../python-modules/rstcheck-core/default.nix | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index 91dda8d7cb8f..971e0b12cfd1 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, buildPythonPackage -, docutils -, fetchFromGitHub -, importlib-metadata -, mock -, pydantic -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm -, typing-extensions +{ + lib, + stdenv, + buildPythonPackage, + docutils, + fetchFromGitHub, + importlib-metadata, + mock, + pydantic, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, + typing-extensions, }: buildPythonPackage rec { @@ -37,13 +38,15 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes"; }; - dependencies = [ - docutils - pydantic - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-metadata - typing-extensions - ]; + dependencies = + [ + docutils + pydantic + ] + ++ lib.optionals (pythonOlder "3.9") [ + importlib-metadata + typing-extensions + ]; nativeCheckInputs = [ mock @@ -56,9 +59,7 @@ buildPythonPackage rec { "test_check_yaml_returns_error_on_bad_code_block" ]; - pythonImportsCheck = [ - "rstcheck_core" - ]; + pythonImportsCheck = [ "rstcheck_core" ]; meta = with lib; { description = "Library for checking syntax of reStructuredText";