Unverified Commit 6d669bb7 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #301476 from fabaff/rstcheck-bump 

python312Packages.rstcheck: 6.2.1 -> 6.2.1, python312Packages.rstcheck-core: 1.2.0 -> 1.2.1
parents 73865887 3b0f012e

pkgs/development/python-modules/rstcheck-core/default.nix

+28 −29
Original line number Diff line number Diff line 
{ stdenv

, lib

, buildPythonPackage

, docutils

, fetchFromGitHub

, importlib-metadata

, mock

, pydantic

, pytest-mock

, pytestCheckHook

, pythonOlder

, setuptools

, setuptools-scm

, typing-extensions

, wheel

{

  lib,

  stdenv,

  buildPythonPackage,

  docutils,

  fetchFromGitHub,

  importlib-metadata,

  mock,

  pydantic,

  pytest-mock,

  pytestCheckHook,

  pythonOlder,

  setuptools,

  setuptools-scm,

  typing-extensions,

}:



buildPythonPackage rec {

  pname = "rstcheck-core";

  version = "1.2.0";

  version = "1.2.1";

  pyproject = true;



  disabled = pythonOlder "3.8";
@@ -26,23 +26,24 @@ 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") [

    ]

    ++ lib.optionals (pythonOlder "3.9") [

      importlib-metadata

      typing-extensions

    ];
@@ -58,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";

pkgs/development/python-modules/rstcheck/default.nix

+26 −39
Original line number Diff line number Diff line 
{ stdenv

, lib

, buildPythonPackage

, docutils

, fetchFromGitHub

, importlib-metadata

, poetry-core

, pydantic

, pytestCheckHook

, pythonOlder

, pythonRelaxDepsHook

, 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 {

  pname = "rstcheck";

  version = "6.1.2";

  format = "pyproject";

  version = "6.2.1";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.8";



  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"

  build-system = [

    setuptools

    setuptools-scm

  ];



  nativeBuildInputs = [

    poetry-core

    pythonRelaxDepsHook

  ];



  propagatedBuildInputs = [

  dependencies = [

    docutils

    rstcheck-core

    types-docutils

    typing-extensions

    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.
@@ -60,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
@@ -71,10 +58,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";

  };

}