colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #301476 from fabaff/rstcheck-bump

Browse Source 
python312Packages.rstcheck: 6.2.1 -> 6.2.1, python312Packages.rstcheck-core: 1.2.0 -> 1.2.1
This commit is contained in:
Fabian Affolter 2024-04-04 18:29:27 +02:00 committed by GitHub
commit 6d669bb73c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 54 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
pkgs/development/python-modules/rstcheck-core/default.nix
View File

@ -1,23 +1,23 @@
{ stdenv {
, lib lib,
, buildPythonPackage stdenv,
, docutils buildPythonPackage,
, fetchFromGitHub docutils,
, importlib-metadata fetchFromGitHub,
, mock importlib-metadata,
, pydantic mock,
, pytest-mock pydantic,
, pytestCheckHook pytest-mock,
, pythonOlder pytestCheckHook,
, setuptools pythonOlder,
, setuptools-scm setuptools,
, typing-extensions setuptools-scm,
, wheel typing-extensions,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "rstcheck-core"; pname = "rstcheck-core";
version = "1.2.0"; version = "1.2.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -26,23 +26,24 @@ buildPythonPackage rec {
owner = "rstcheck"; owner = "rstcheck";
repo = "rstcheck-core"; repo = "rstcheck-core";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-cKJNktIB4vXt1MPRgYrJQ0aksmrVu7Y2uTyUjdx5YdA="; hash = "sha256-PiQMk0lIv24S6qXMYIQR+SkSji+WA30ivWs2uPQwf2A=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
setuptools-scm setuptools-scm
wheel
]; ];
env = { env = {
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes";
}; };
propagatedBuildInputs = [ dependencies =
[
docutils docutils
pydantic pydantic
] ++ lib.optionals (pythonOlder "3.9") [ ]
++ lib.optionals (pythonOlder "3.9") [
importlib-metadata importlib-metadata
typing-extensions typing-extensions
]; ];
@ -58,9 +59,7 @@ buildPythonPackage rec {
"test_check_yaml_returns_error_on_bad_code_block" "test_check_yaml_returns_error_on_bad_code_block"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "rstcheck_core" ];
"rstcheck_core"
];
meta = with lib; { meta = with lib; {
description = "Library for checking syntax of reStructuredText"; description = "Library for checking syntax of reStructuredText";

65
pkgs/development/python-modules/rstcheck/default.nix
View File

@ -1,58 +1,47 @@
{ stdenv {
, lib lib,
, buildPythonPackage stdenv,
, docutils buildPythonPackage,
, fetchFromGitHub docutils,
, importlib-metadata fetchFromGitHub,
, poetry-core setuptools,
, pydantic setuptools-scm,
, pytestCheckHook pydantic,
, pythonOlder pytestCheckHook,
, pythonRelaxDepsHook pythonOlder,
, rstcheck-core rstcheck-core,
, typer typer,
, types-docutils types-docutils,
, typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "rstcheck"; pname = "rstcheck";
version = "6.1.2"; version = "6.2.1";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rstcheck"; owner = "rstcheck";
repo = pname; repo = "rstcheck";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-UMByfnnP1va3v1IgyQL0f3kC+W6HoiWScb7U2FAvWkU="; hash = "sha256-S04l+x/rIc/XSvq2lSKCQp6KK5mmKI2mOgPgJ3WKe5M=";
}; };
pythonRelaxDeps = [ build-system = [
"typer" setuptools
setuptools-scm
]; ];
nativeBuildInputs = [ dependencies = [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = [
docutils docutils
rstcheck-core rstcheck-core
types-docutils types-docutils
typing-extensions
pydantic pydantic
typer typer
] ++ lib.optionals (pythonOlder "3.8") [
typing-extensions
importlib-metadata
] ++ typer.optional-dependencies.all; ] ++ typer.optional-dependencies.all;
nativeCheckInputs = [ nativeCheckInputs = [ pytestCheckHook ];
pytestCheckHook
];
disabledTests = lib.optionals stdenv.isDarwin [ disabledTests = lib.optionals stdenv.isDarwin [
# Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. # 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" "test_file_1_is_bad_without_config_macos"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "rstcheck" ];
"rstcheck"
];
preCheck = '' preCheck = ''
# The tests need to find and call the rstcheck executable # The tests need to find and call the rstcheck executable
@ -71,10 +58,10 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Checks syntax of reStructuredText and code blocks nested within it"; description = "Checks syntax of reStructuredText and code blocks nested within it";
mainProgram = "rstcheck";
homepage = "https://github.com/myint/rstcheck"; homepage = "https://github.com/myint/rstcheck";
changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md"; changelog = "https://github.com/rstcheck/rstcheck/blob/v${version}/CHANGELOG.md";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ staccato ]; maintainers = with maintainers; [ staccato ];
mainProgram = "rstcheck";
}; };
} }