diff --git a/pkgs/development/python-modules/bibtexparser/2.nix b/pkgs/development/python-modules/bibtexparser/2.nix new file mode 100644 index 000000000000..8b776e551c13 --- /dev/null +++ b/pkgs/development/python-modules/bibtexparser/2.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pylatexenc, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "bibtexparser"; + version = "2.0.0b8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sciunto-org"; + repo = "python-bibtexparser"; + tag = "v${version}"; + hash = "sha256-531Mh/5DUYayXm1H0v4dPX0P9mRcqcQcU/A+f4wwqxg="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pylatexenc ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "bibtexparser" ]; + + meta = { + description = "Bibtex parser for Python"; + homepage = "https://github.com/sciunto-org/python-bibtexparser"; + changelog = "https://github.com/sciunto-org/python-bibtexparser/blob/${src.tag}/CHANGELOG"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; + }; +} diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 70800b121f5b..1dc7cc8de508 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -4,11 +4,11 @@ buildPythonPackage, colorlog, fetchFromGitHub, + bibtexparser_2, git, lxml, markdown, markupsafe, - mock, postgresql, pylatexenc, pytest-cov-stub, @@ -22,21 +22,21 @@ buildPythonPackage rec { pname = "clldutils"; - version = "3.21.0"; + version = "3.24.2"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "clld"; repo = "clldutils"; - rev = "v${version}"; - hash = "sha256-OD+WJ9JuYZb/oXDgVqL4i5YlcVEt0+swq0SB3cutyRo="; + tag = "v${version}"; + hash = "sha256-xIs6Lq9iDdcM3j51F27x408oUldvy5nlvVdbrAS5Jz0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ attrs + bibtexparser_2 colorlog lxml markdown @@ -47,7 +47,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - mock postgresql pytest-cov-stub pytest-mock @@ -55,11 +54,11 @@ buildPythonPackage rec { git ]; - meta = with lib; { - changelog = "https://github.com/clld/clldutils/blob/${src.rev}/CHANGES.md"; + meta = { + changelog = "https://github.com/clld/clldutils/blob/${src.tag}/CHANGES.md"; description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al"; homepage = "https://github.com/clld/clldutils"; - license = licenses.asl20; - maintainers = with maintainers; [ melling ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ melling ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d0d38dd1614..5d3262b216a4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1817,6 +1817,8 @@ self: super: with self; { bibtexparser = callPackage ../development/python-modules/bibtexparser { }; + bibtexparser_2 = callPackage ../development/python-modules/bibtexparser/2.nix { }; + bidict = callPackage ../development/python-modules/bidict { }; bids-validator = callPackage ../development/python-modules/bids-validator { };