diff --git a/pkgs/development/python-modules/mike/default.nix b/pkgs/development/python-modules/mike/default.nix new file mode 100644 index 000000000000..f107d8e632bd --- /dev/null +++ b/pkgs/development/python-modules/mike/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, git +, importlib-metadata +, importlib-resources +, jinja2 +, mkdocs +, pythonOlder +, pyyaml +, unittestCheckHook +, verspec +}: + +buildPythonPackage rec { + pname = "mike"; + version = "unstable-2023-05-06"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jimporter"; + repo = pname; + rev = "300593c338b18f61f604d18457c351e166318020"; + hash = "sha256-Sjj2275IJDtLjG6uO9h4FbgxXTMgqD8c/rJj6iOxfuI="; + }; + + propagatedBuildInputs = [ + importlib-metadata + importlib-resources + jinja2 + mkdocs + pyyaml + verspec + ]; + + nativeCheckInputs = [ + git + unittestCheckHook + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + # Difficult to setup + doCheck = false; + + pythonImportsCheck = [ + "mike" + ]; + + meta = with lib; { + description = "Manage multiple versions of your MkDocs-powered documentation"; + homepage = "https://github.com/jimporter/mike"; + license = licenses.bsd3; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 3674c0d74974..1a2851158c52 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -18,6 +18,7 @@ , withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin && pythonAtLeast "3.10") , ansi2html , markdown-include +, mike , mkdocs , mkdocs-exclude , mkdocs-material @@ -31,7 +32,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.7"; + version = "1.10.8"; format = "setuptools"; outputs = [ @@ -43,10 +44,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "samuelcolvin"; + owner = "pydantic"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7X7rlHJ5Q01CuB9FZzoUfyfwx6AMXtE1BV5t+LnZKIM="; + hash = "sha256-4oJoDlP1grLblF0ppqYM1GYEyNMEM9FssFQjacipmms="; }; postPatch = '' @@ -65,6 +66,7 @@ buildPythonPackage rec { ansi2html markdown-include mdx-truly-sane-lists + mike mkdocs mkdocs-exclude mkdocs-material @@ -120,8 +122,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydantic" ]; meta = with lib; { - homepage = "https://github.com/samuelcolvin/pydantic"; description = "Data validation and settings management using Python type hinting"; + homepage = "https://github.com/pydantic/pydantic"; + changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md"; license = licenses.mit; maintainers = with maintainers; [ wd15 ]; }; diff --git a/pkgs/development/python-modules/verspec/default.nix b/pkgs/development/python-modules/verspec/default.nix new file mode 100644 index 000000000000..05a6a446c23e --- /dev/null +++ b/pkgs/development/python-modules/verspec/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pretend +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "verspec"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; + }; + + nativeCheckInputs = [ + pretend + pytestCheckHook + ]; + + disabledTestPaths = [ + # Import fail + "test/test_specifiers.py" + ]; + + pythonImportsCheck = [ + "verspec" + ]; + + meta = with lib; { + description = "Flexible version handling"; + homepage = "https://github.com/jimporter/verspec"; + changelog = "https://github.com/jimporter/averspec/releases/tag/v${version}"; + license = with licenses; [ bsd2 /* and */ asl20 ]; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a8dd7112725..4cd867b51eb9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6222,6 +6222,8 @@ self: super: with self; { migen = callPackage ../development/python-modules/migen { }; + mike = callPackage ../development/python-modules/mike { }; + milc = callPackage ../development/python-modules/milc { }; milksnake = callPackage ../development/python-modules/milksnake { }; @@ -12756,6 +12758,8 @@ self: super: with self; { versiontools = callPackage ../development/python-modules/versiontools { }; + verspec = callPackage ../development/python-modules/verspec { }; + vertica-python = callPackage ../development/python-modules/vertica-python { }; veryprettytable = callPackage ../development/python-modules/veryprettytable { };