diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-31 12:01:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-31 12:01:07 +0000 |
commit | b4bf622e464f47c69fefb43746c531044b630d59 (patch) | |
tree | 1100872ef436b91ab7dfdc8086aaccf698072025 /pkgs/development/python-modules | |
parent | 6b7b5776bef8eed645f63725ce31fa0946f997ff (diff) | |
parent | 9bc8f11e8747a23d3333ed480a5078072827bab3 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules')
10 files changed, 220 insertions, 72 deletions
diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index a62c3dc8251de..22ef8222b04b2 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,21 +17,21 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.4"; + version = "5.6.6"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-Uq0DXrNQRVhQaPXXGNjbnPhOYoPpa8H3WuDdotCKS8c="; + hash = "sha256-wVl2C1AG9LbSh/p95fstJyJr6JnhZFIhNvq8mhpg13Q="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-warn " --cov-report=term-missing --no-cov-on-fail --cov vdb" "" + --replace-fail " --cov-report=term-missing --no-cov-on-fail --cov vdb" "" ''; pythonRelaxDeps = [ @@ -39,12 +39,15 @@ buildPythonPackage rec { "semver" ]; + build-system = [ + setuptools + ]; + nativeBuildInputs = [ pythonRelaxDepsHook - setuptools ]; - propagatedBuildInputs = [ + dependencies = [ appdirs cvss httpx @@ -75,10 +78,10 @@ buildPythonPackage rec { meta = with lib; { description = "Vulnerability database and package search for sources such as OSV, NVD, GitHub and npm"; - mainProgram = "vdb"; homepage = "https://github.com/appthreat/vulnerability-db"; changelog = "https://github.com/AppThreat/vulnerability-db/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "vdb"; }; } diff --git a/pkgs/development/python-modules/cssutils/default.nix b/pkgs/development/python-modules/cssutils/default.nix index 10f62f29280c0..8695f576f2bdf 100644 --- a/pkgs/development/python-modules/cssutils/default.nix +++ b/pkgs/development/python-modules/cssutils/default.nix @@ -2,9 +2,7 @@ , buildPythonPackage , pythonAtLeast , pythonOlder -, fetchpatch -, fetchPypi -, setuptools +, fetchFromGitHub , setuptools-scm , cssselect , jaraco-test @@ -16,19 +14,20 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.9.0"; + version = "2.10.1"; + pyproject = true; disabled = pythonOlder "3.8"; - format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-iUd7PRfXkOl7n7Te9wh2cGEFV5Wq5vfIKuMulnyb5M0="; + src = fetchFromGitHub { + owner = "jaraco"; + repo = "cssutils"; + rev = "refs/tags/v${version}"; + hash = "sha256-FK+EHdfsuCnWmnfUH18gyMq6CBXICBbhJj3XrscLLOA="; }; - nativeBuildInputs = [ - setuptools + build-system = [ setuptools-scm ]; @@ -42,14 +41,8 @@ buildPythonPackage rec { importlib-resources ]; - pytestFlagsArray = [ - # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. - "-W" "ignore::pytest.PytestRemovedIn8Warning" - ]; - disabledTests = [ # access network - "test_parseUrl" "encutils" "website.logging" ]; @@ -59,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CSS Cascading Style Sheets library for Python"; homepage = "https://github.com/jaraco/cssutils"; - changelog = "https://github.com/jaraco/cssutils/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/jaraco/cssutils/blob/${src.rev}/NEWS.rst"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index dd490f3707834..4f99055f5ad11 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage -, fetchPypi -, yajl , cffi +, fetchPypi , pytestCheckHook +, pythonOlder +, setuptools +, yajl }: buildPythonPackage rec { pname = "ijson"; version = "3.2.3"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-EClOm/ictxPaBbxHkL3/YWYQQy21YZZIJwdImOF0+Rc="; }; + build-system = [ + setuptools + ]; + buildInputs = [ yajl ]; - propagatedBuildInputs = [ + dependencies = [ cffi ]; @@ -28,8 +36,6 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = true; - pythonImportsCheck = [ "ijson" ]; @@ -39,5 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/ICRAR/ijson"; changelog = "https://github.com/ICRAR/ijson/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index ba387cd8d06c7..f216aad5e431b 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -27,11 +27,11 @@ buildPythonPackage rec { hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ charset-normalizer dsinternals flask @@ -40,6 +40,7 @@ buildPythonPackage rec { pyasn1 pycryptodomex pyopenssl + setuptools six ]; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 71ec2af828855..3671abb0e47bd 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.34.0"; + version = "1.34.16"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-FRAT7wQZEO60Hf3sJv+jLIHif8ium0j2Mr1mU/XKlCM="; + hash = "sha256-ei4fMjEL7IytpQs/szTjRNu+3TByLZLVYX7qxwjT4OQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index dea8c8d194aa7..9ab583acbeebd 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -3,26 +3,42 @@ , fetchFromGitHub , impacket , netaddr -, pythonOlder +, poetry-core , pypykatz +, pythonOlder +, pythonRelaxDepsHook , rich }: buildPythonPackage rec { pname = "lsassy"; version = "3.1.9"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Hackndo"; - repo = pname; + repo = "lsassy"; rev = "refs/tags/v${version}"; hash = "sha256-VGLSVv/+UpgeSTHoOTjEfQSAYfXA3bAI+yKjcKBI1Z4="; }; - propagatedBuildInputs = [ + pythonRelaxDeps = [ + "impacket" + "netaddr" + "rich" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + build-system = [ + poetry-core + ]; + + dependencies = [ impacket netaddr pypykatz @@ -38,10 +54,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)"; - mainProgram = "lsassy"; homepage = "https://github.com/Hackndo/lsassy"; changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "lsassy"; }; } diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 22a602df273a3..77f63870a2960 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -1,37 +1,64 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, libvorbis, flac, libogg, libopus, opusfile, substituteAll }: +{ stdenv +, lib +, fetchPypi +, buildPythonPackage +, libvorbis +, flac +, libogg +, libopus +, opusfile +, substituteAll +, python +}: buildPythonPackage rec { - pname = "pyogg"; - version = "0.6.9a1"; - - src = fetchPypi { - pname = "PyOgg"; - inherit version; - sha256 = "0xabqwyknpvfc53s7il5pq6b07fcaqvz5bi5vbs3pbaw8602qvim"; - }; - - buildInputs = [ libvorbis flac libogg libopus ]; - propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ]; - # There are no tests in this package. - doCheck = false; - patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol - patches = [ - (substituteAll { - src = ./pyogg-paths.patch; - flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; - oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; - vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; - vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; - vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; - opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; - opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; - - meta = { + + pname = "pyogg"; + version = "0.6.14a1"; + + src = fetchPypi { + pname = "PyOgg"; + inherit version; + hash = "sha256-gpSzSqWckCAMRjDCzEpbhEByCRQejl0GnXpb41jpQmI="; + }; + + buildInputs = [ + libvorbis + flac + libogg + libopus + ]; + + propagatedBuidInputs = [ + libvorbis + flac + libogg + libopus + opusfile + ]; + + # There are no tests in this package. + doCheck = false; + + # patch has dos style eol + patchFlags = [ "-p1" "--binary" ]; + patches = [ + (substituteAll { + src = ./pyogg-paths.patch; + flacLibPath="${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}"; + oggLibPath="${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisLibPath="${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisFileLibPath="${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + vorbisEncLibPath="${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}"; + opusLibPath="${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}"; + opusFileLibPath="${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + meta = with lib; { description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python"; homepage = "https://github.com/Zuzu-Typ/PyOgg"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ pmiddend ]; + license = licenses.publicDomain; + maintainers = with maintainers; [ pmiddend ]; }; } diff --git a/pkgs/development/python-modules/romy/default.nix b/pkgs/development/python-modules/romy/default.nix new file mode 100644 index 0000000000000..9492bab6ce0e7 --- /dev/null +++ b/pkgs/development/python-modules/romy/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, aiohttp +}: + +buildPythonPackage rec { + pname = "romy"; + version = "0.0.9"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "xeniter"; + repo = "romy"; + rev = "refs/tags/${version}"; + hash = "sha256-r7g8DE8eBFHkMHzGfNlYi+XxrRIvH8IDxGOSEiJKKqM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "romy" + ]; + + meta = with lib; { + description = "Library to control Wi-Fi enabled ROMY vacuum cleaners"; + homepage = "https://github.com/xeniter/romy"; + changelog = "https://github.com/xeniter/romy/releases/tag/${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/securityreporter/default.nix b/pkgs/development/python-modules/securityreporter/default.nix new file mode 100644 index 0000000000000..df2f60a22cff4 --- /dev/null +++ b/pkgs/development/python-modules/securityreporter/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, docker +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, requests +, responses +}: + +buildPythonPackage rec { + pname = "securityreporter"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dongit-org"; + repo = "python-reporter"; + rev = "refs/tags/v${version}"; + hash = "sha256-mBZVsoDnDRYHdcFzi4kuwmAJDRdpysUbNRcDzIhYRGY="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + requests + ]; + + nativeCheckInputs = [ + docker + pytestCheckHook + responses + ]; + + pythonImportsCheck = [ + "reporter" + ]; + + disabledTestPaths = [ + # Test require a running Docker instance + "tests/functional/" + ]; + + meta = with lib; { + description = "A Python wrapper for the Reporter API"; + homepage = "https://github.com/dongit-org/python-reporter"; + changelog = "https://github.com/dongit-org/python-reporter/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index faae85664bfb9..9c5a39aa71754 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.12.6"; + version = "0.13.0"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-K2ilPDkxXICb66rOgz18AZ92u5VBgRh6bLiDVEgleDU="; + hash = "sha256-zRQOFYAh4QpDNlSPi1h70eOmw/8aTa6yAKBSgTuIhME="; }; propagatedBuildInputs = [ |