diff --git a/pkgs/development/python-modules/ciscoconfparse/default.nix b/pkgs/development/python-modules/ciscoconfparse/default.nix index 40018a49c8cc..52cd1a8cf28a 100644 --- a/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , dnspython +, deprecat , fetchFromGitHub , loguru , passlib @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "ciscoconfparse"; - version = "1.6.50"; + version = "1.7.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mpenning"; repo = pname; - rev = version; - hash = "sha256-OKPw7P2hhk8yzqjOcf2NYEueJR1ecC/D93ULfkM88Xg="; + rev = "refs/tags/${version}"; + hash = "sha256-oGvwtaIgVvvW8Oq/dZN+Zj/PESpqWALFYPia9yeilco="; }; postPatch = '' @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib + deprecat dnspython loguru toml @@ -51,6 +53,8 @@ buildPythonPackage rec { # Tests require network access "test_dns_lookup" "test_reverse_dns_lookup" + # Path issues with configuration files + "testParse_valid_filepath" ]; pythonImportsCheck = [ @@ -58,8 +62,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations"; + description = "Module to parse, audit, query, build, and modify Cisco IOS-style configurations"; homepage = "https://github.com/mpenning/ciscoconfparse"; + changelog = "https://github.com/mpenning/ciscoconfparse/blob/${version}/CHANGES.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro ]; }; diff --git a/pkgs/development/python-modules/deprecat/default.nix b/pkgs/development/python-modules/deprecat/default.nix new file mode 100644 index 000000000000..da81c63cca86 --- /dev/null +++ b/pkgs/development/python-modules/deprecat/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools-scm +, wrapt +}: + +buildPythonPackage rec { + pname = "deprecat"; + version = "2.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mjhajharia"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-3Xl/IC+ImFUxxLry15MIIVRf6aR+gA9K5S2IQomkv+o="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + wrapt + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deprecat" + ]; + + meta = with lib; { + description = "Decorator to deprecate old python classes, functions or methods"; + homepage = "https://github.com/mjhajharia/deprecat"; + changelog = "https://github.com/mjhajharia/deprecat/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba5e500a2980..f957f38eaede 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2375,6 +2375,8 @@ self: super: with self; { deploykit = callPackage ../development/python-modules/deploykit { }; + deprecat = callPackage ../development/python-modules/deprecat { }; + deprecated = callPackage ../development/python-modules/deprecated { }; deprecation = callPackage ../development/python-modules/deprecation { };