diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix index 87bf7d225fa7..7a8482db6ec4 100644 --- a/pkgs/development/python-modules/commoncode/default.nix +++ b/pkgs/development/python-modules/commoncode/default.nix @@ -14,16 +14,16 @@ text-unidecode, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "commoncode"; - version = "32.4.0"; + version = "32.4.2"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "commoncode"; - tag = "v${version}"; - hash = "sha256-k9E/Yz6G3IHJPf3BlscZNSL4Qk9WyGU3vXA+U+GwWA0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-A2FE+qhLQahuAtptP3hCnIUgh7j61Wf02avO6DM0b5E="; }; dontConfigure = true; @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Set of common utilities, originally split from ScanCode"; homepage = "https://github.com/nexB/commoncode"; - changelog = "https://github.com/nexB/commoncode/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/nexB/commoncode/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 31e4b94387b1..da2a8d11f986 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -10,23 +10,23 @@ setuptools-scm, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "container-inspector"; - version = "33.0.1"; + version = "33.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nexB"; repo = "container-inspector"; - tag = "v${version}"; - hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uwfqPh4e5zNO0K5rKZ2pxgOkX/KF9pzCsKdYbQuw9MA="; }; dontConfigure = true; build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs click dockerfile-parse @@ -40,8 +40,8 @@ buildPythonPackage rec { meta = { description = "Suite of analysis utilities and command line tools for container images"; homepage = "https://github.com/nexB/container-inspector"; - changelog = "https://github.com/nexB/container-inspector/releases/tag/v${version}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/nexB/container-inspector/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/multiregex/default.nix b/pkgs/development/python-modules/multiregex/default.nix new file mode 100644 index 000000000000..caa7739cc86c --- /dev/null +++ b/pkgs/development/python-modules/multiregex/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyahocorasick, + pytestCheckHook, + setuptools-scm, + setuptools, +}: + +buildPythonPackage rec { + pname = "multiregex"; + version = "2.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "quantco"; + repo = "multiregex"; + tag = version; + hash = "sha256-S10FJwtFNK4CarE2YAcUM38hRYTDL0Vp4B8NqGvJs5M="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ pyahocorasick ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "multiregex" ]; + + meta = { + description = "Quickly match many regexes against a string"; + homepage = "https://github.com/quantco/multiregex"; + changelog = "https://github.com/quantco/multiregex/blob/${src.tag}/CHANGELOG.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index bfde86cd69ab..ffd1f0fcdf90 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -30,6 +30,7 @@ license-expression, lxml, markupsafe, + multiregex, packageurl-python, packaging, parameter-expansion-patched, @@ -60,12 +61,13 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.4.1"; + version = "32.5.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-qZUILeB1lGv0V9Uq81/aOI9pJTtayfZH/O5kwNnpf28="; + pname = "scancode_toolkit"; + inherit version; + hash = "sha256-WXAZCk0aRmKb1UU1ud95mZFHAMC9U+gDRd9w7TZTVSA="; }; dontConfigure = true; @@ -101,6 +103,7 @@ buildPythonPackage rec { license-expression lxml markupsafe + multiregex packageurl-python packaging parameter-expansion-patched @@ -126,9 +129,7 @@ buildPythonPackage rec { xmltodict ]; - nativeBuildInputs = [ - writableTmpDirAsHomeHook - ]; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 08458f9bb14e..b3dfe906c11f 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, click, fetchFromGitHub, - fetchpatch, license-expression, ply, pytestCheckHook, @@ -17,27 +16,18 @@ xmltodict, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "spdx-tools"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; src = fetchFromGitHub { owner = "spdx"; repo = "tools-python"; - tag = "v${version}"; - hash = "sha256-r7+RYGoq3LJYN1jYfwzb1r3fc/kL+CPd4pmGATFq8Pw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-loD+YXRCEYRynOKf7Da43SA7JQVYP1IzJe2f7ssJTtI="; }; - patches = [ - # https://github.com/spdx/tools-python/issues/844 - (fetchpatch { - name = "beartype-0.20-compat.patch"; - url = "https://github.com/spdx/tools-python/pull/841/commits/3b13bd5af36a2b78f5c87fdbadc3f2601d2dcd8d.patch"; - hash = "sha256-8sQNGRss4R1olsw+xGps3NICyimBxKv47TaSrCcnVhA="; - }) - ]; - build-system = [ setuptools setuptools-scm @@ -73,8 +63,8 @@ buildPythonPackage rec { meta = { description = "SPDX parser and tools"; homepage = "https://github.com/spdx/tools-python"; - changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/spdx/tools-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eae25c92111b..9ce48491d331 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10158,6 +10158,8 @@ self: super: with self; { multiprocess = callPackage ../development/python-modules/multiprocess { }; + multiregex = callPackage ../development/python-modules/multiregex { }; + multiscale-spatial-image = callPackage ../development/python-modules/multiscale-spatial-image { }; multiset = callPackage ../development/python-modules/multiset { };