diff --git a/pkgs/by-name/py/pybibget/package.nix b/pkgs/by-name/py/pybibget/package.nix index 4aad76fdc760..b8cad1e423fb 100644 --- a/pkgs/by-name/py/pybibget/package.nix +++ b/pkgs/by-name/py/pybibget/package.nix @@ -4,19 +4,19 @@ fetchPypi, }: -let +python3.pkgs.buildPythonApplication rec { pname = "pybibget"; version = "0.1.0"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-M6CIctTOVn7kIPmsoHQmYl2wQaUzfel7ryw/3ebQitg="; }; -in -python3.pkgs.buildPythonApplication { - inherit pname version src; - pyproject = true; + build-system = [ + python3.pkgs.setuptools + ]; propagatedBuildInputs = with python3.pkgs; [ lxml diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index 94df8e4f62bb..f2eb9539e1d9 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -2,33 +2,47 @@ lib, buildPythonPackage, fetchPypi, + + # build-system + setuptools, + + # dependencies latexcodec, pyyaml, - setuptools, + + # tests + pytestCheckHook, }: buildPythonPackage rec { - version = "0.24.0"; - format = "setuptools"; pname = "pybtex"; - - doCheck = false; - pythonImportsCheck = [ "pybtex" ]; - - propagatedBuildInputs = [ - latexcodec - pyyaml - setuptools - ]; + version = "0.25.1"; + pyproject = true; src = fetchPypi { inherit version pname; - sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755"; + sha256 = "sha256-nq+QJnx+g+Ilr4n+plw3Cvv2X0WCINOUap4wSeHspJE="; }; - meta = with lib; { + build-system = [ + setuptools + ]; + + dependencies = [ + latexcodec + pyyaml + ]; + + pythonImportsCheck = [ "pybtex" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { homepage = "https://pybtex.org/"; + changelog = "https://bitbucket.org/pybtex-devs/pybtex/src/master/CHANGES"; description = "BibTeX-compatible bibliography processor written in Python"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 3d737f1e0af8..a228353d9a1a 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -171,6 +171,7 @@ buildPythonPackage rec { # attempt to insert nil object from objects[1] "test_timer_10_2_7" + "test_timer" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 377682ae2529..3e1f64080743 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-bibtex"; - version = "2.6.3"; + version = "2.6.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mcmtroffaes"; repo = "sphinxcontrib-bibtex"; tag = version; - hash = "sha256-cqz5Jamtlflo5rFhWPCPlYoymApUtXPG4oTRjfDI+WY="; + hash = "sha256-sT23DkIfJcb3cFBFdL31RRzlDoJRcCUYIdpUVuYjGuo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix new file mode 100644 index 000000000000..e66a37255080 --- /dev/null +++ b/pkgs/development/python-modules/svgdigitizer/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + stdenv, + + # build-system + setuptools, + + # dependencies + astropy, + click, + frictionless, + matplotlib, + mergedeep, + pandas, + pillow, + pybtex, + pymupdf, + pyyaml, + scipy, + svg-path, + svgpathtools, + svgwrite, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "svgdigitizer"; + version = "0.12.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "echemdb"; + repo = "svgdigitizer"; + tag = version; + hash = "sha256-aodPjms92+/6bbheIs/8w+M4T+mfw5PWf1dsxFuojwA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + astropy + click + frictionless + matplotlib + mergedeep + pandas + pillow + pybtex + pymupdf + pyyaml + scipy + svg-path + svgpathtools + svgwrite + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlags = [ + "--doctest-modules" + "svgdigitizer" + ]; + + pythonImportsCheck = [ + "svgdigitizer" + ]; + + meta = { + description = "(x,y) Data Points from SVG files"; + homepage = "https://github.com/echemdb/svgdigitizer"; + changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.rev}/ChangeLog"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ doronbehar ]; + # https://github.com/echemdb/svgdigitizer/issues/252 + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/pkgs/development/python-modules/svgpathtools/default.nix b/pkgs/development/python-modules/svgpathtools/default.nix new file mode 100644 index 000000000000..abd043fed018 --- /dev/null +++ b/pkgs/development/python-modules/svgpathtools/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + numpy, + scipy, + svgwrite, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "svgpathtools"; + version = "1.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mathandy"; + repo = "svgpathtools"; + tag = "v${version}"; + hash = "sha256-SzYssDJ+uGb5zXZ16XaMCvIPF8BKJ4VVI/gUghz1IyA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + scipy + svgwrite + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "svgpathtools" + ]; + + meta = { + description = "A collection of tools for manipulating and analyzing SVG Path objects and Bezier curves"; + homepage = "https://github.com/mathandy/svgpathtools"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f0a0858c3d26..cf93e5bab6b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17370,10 +17370,14 @@ self: super: with self; { svg2tikz = callPackage ../development/python-modules/svg2tikz { }; + svgdigitizer = callPackage ../development/python-modules/svgdigitizer { }; + svgelements = callPackage ../development/python-modules/svgelements { }; svglib = callPackage ../development/python-modules/svglib { }; + svgpathtools = callPackage ../development/python-modules/svgpathtools { }; + svgutils = callPackage ../development/python-modules/svgutils { }; svgwrite = callPackage ../development/python-modules/svgwrite { };