Merge pull request #180787 from fabaff/types-docutils-bump

python310Packages.types-docutils: 0.18.3 -> 0.19.0

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

@@ -0,0 +1,63 @@
+{ lib
+, buildPythonPackage
+, docutils
+, fetchFromGitHub
+, importlib-metadata
+, mock
+, poetry-core
+, pydantic
+, pytest-mock
+, pytestCheckHook
+, pythonOlder
+, types-docutils
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "rstcheck-core";
+  version = "1.0.2";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "rstcheck";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-XNr+prK9VDP66ZaFvh3Qrx+eJs6mnVO8lvoMC/qrCLs=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    docutils
+    importlib-metadata
+    pydantic
+    types-docutils
+    typing-extensions
+  ];
+
+  checkInputs = [
+    mock
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"'
+  '';
+
+  pythonImportsCheck = [
+    "rstcheck_core"
+  ];
+
+  meta = with lib; {
+    description = "Library for checking syntax of reStructuredText";
+    homepage = "https://github.com/rstcheck/rstcheck-core";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}

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

@@ -1,26 +1,32 @@
 { lib
 , buildPythonPackage
+, colorama
 , docutils
 , fetchFromGitHub
+, importlib-metadata
 , poetry-core
+, pydantic
 , pytestCheckHook
 , pythonOlder
+, rstcheck-core
+, shellingham
+, typer
 , types-docutils
 , typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "rstcheck";
-  version = "5.0.0";
+  version = "6.0.0.post1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = "myint";
+    owner = "rstcheck";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vTUa/eP6/flxRLBuzdHoNoPoGAg6XWwu922az8tLgJM=";
+    hash = "sha256-Ljg1cciT9qKL9xtBxQ8OLygDpV/1yR5XiJOzHrLr6xw=";
   };
 
   nativeBuildInputs = [
@@ -28,15 +34,28 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
+    colorama
     docutils
+    rstcheck-core
+    shellingham
     types-docutils
     typing-extensions
+    pydantic
+    typer
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    typing-extensions
+    importlib-metadata
   ];
 
   checkInputs = [
     pytestCheckHook
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"'
+  '';
+
   pythonImportsCheck = [
     "rstcheck"
   ];

pkgs/development/python-modules/types-docutils/default.nix

@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-docutils";
-  version = "0.18.3";
+  version = "0.19.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oO+DHcIGNfNQ+pz/WRIxwx0n51dx5Z/WyXm2wMfgMpI=";
+    hash = "sha256-lJNrGWGqzaYexrsKzxFpzXgwtSMLZFhVwdR4m68ZaF4=";
   };
 
   # Module doesn't have tests

pkgs/top-level/python-packages.nix

@@ -9419,6 +9419,8 @@ in {
 
   rstcheck = callPackage ../development/python-modules/rstcheck { };
 
+  rstcheck-core = callPackage ../development/python-modules/rstcheck-core { };
+
   rtmidi-python = callPackage ../development/python-modules/rtmidi-python {
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices;
   };