diff options
Diffstat (limited to 'pkgs/development/python-modules')
37 files changed, 229 insertions, 135 deletions
diff --git a/pkgs/development/python-modules/amaranth-boards/default.nix b/pkgs/development/python-modules/amaranth-boards/default.nix index 19e61f789cbb2..3e9548bfe5b61 100644 --- a/pkgs/development/python-modules/amaranth-boards/default.nix +++ b/pkgs/development/python-modules/amaranth-boards/default.nix @@ -45,7 +45,6 @@ buildPythonPackage rec { homepage = "https://github.com/amaranth-lang/amaranth-boards"; license = licenses.bsd2; maintainers = with maintainers; [ - emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/amaranth-soc/default.nix b/pkgs/development/python-modules/amaranth-soc/default.nix index 78cdea45edff0..aee85e709aff1 100644 --- a/pkgs/development/python-modules/amaranth-soc/default.nix +++ b/pkgs/development/python-modules/amaranth-soc/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/amaranth-lang/amaranth-soc"; license = licenses.bsd2; maintainers = with maintainers; [ - emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix index 00d40dd1460bb..1a096f01606f4 100644 --- a/pkgs/development/python-modules/amaranth/default.nix +++ b/pkgs/development/python-modules/amaranth/default.nix @@ -58,7 +58,6 @@ buildPythonPackage rec { homepage = "https://amaranth-lang.org/docs/amaranth"; license = licenses.bsd2; maintainers = with maintainers; [ - emily thoughtpolice pbsds ]; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index efb76645c7876..9d95e4ecd957b 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.39.0"; + version = "0.39.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-lmSILV7xb3aHC+Rd8/SYzoA/t6DgdClccoK8ESdvNq0="; + hash = "sha256-e7DGAA2/6tc2+iH/14y/QT7k9a7pgrE5bplTPL3xm2Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index 439309b4bd420..ab5d4025dbf99 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -1,7 +1,10 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + pythonOlder, + pythonRelaxDepsHook, hatchling, hatch-vcs, aiohttp, @@ -14,9 +17,11 @@ deepmerge, fs, httpx, + httpx-ws, inflection, jinja2, numpy, + nvidia-ml-py, opentelemetry-api, opentelemetry-instrumentation, opentelemetry-instrumentation-aiohttp-client, @@ -30,16 +35,16 @@ pip-tools, prometheus-client, psutil, - nvidia-ml-py, python-dateutil, python-json-logger, python-multipart, pyyaml, - requests, rich, schema, simple-di, starlette, + tomli, + tomli-w, uvicorn, watchfiles, fs-s3fs, @@ -49,7 +54,6 @@ protobuf, grpcio-channelz, grpcio-reflection, - filetype, pillow, pydantic, pandas, @@ -62,6 +66,8 @@ tritonclient, # native check inputs pytestCheckHook, + pytest-xdist, + google-api-python-client, scikit-learn, lxml, orjson, @@ -70,7 +76,7 @@ }: let - version = "1.2.5"; + version = "1.2.18"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -78,9 +84,7 @@ let opentelemetry-instrumentation-grpc protobuf ]; - io-file = [ filetype ]; - io-image = io-file ++ [ pillow ]; - io-json = [ pydantic ]; + io-image = [ pillow ]; io-pandas = [ pandas pyarrow @@ -91,16 +95,14 @@ let # tracing-jaeger = [ opentelemetry-exporter-jaeger ]; tracing-otlp = [ opentelemetry-exporter-otlp ]; # tracing-zipkin = [ opentelemetry-exporter-zipkin ]; - io = io-json ++ io-image ++ io-pandas ++ io-file; + io = io-image ++ io-pandas; tracing = tracing-otlp; # ++ tracing-zipkin ++ tracing-jaeger optional-dependencies = { all = aws ++ io ++ grpc ++ grpc-reflection ++ grpc-channelz ++ tracing ++ monitor-otlp; inherit aws grpc - io-file io-image - io-json io-pandas io grpc-reflection @@ -109,37 +111,45 @@ let tracing-otlp tracing ; - triton = [ - tritonclient - ] ++ tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc; + triton = + [ tritonclient ] + ++ lib.optionals stdenv.hostPlatform.isLinux ( + tritonclient.optional-dependencies.http ++ tritonclient.optional-dependencies.grpc + ); }; in buildPythonPackage { pname = "bentoml"; inherit version; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-GBKxyjCs02mxYiMK4GhgFUATRCUSVf8mFbWjuPVD7SU="; + hash = "sha256-giZteSikwS9YEcVMPCC9h2khbBgvUPRW1biAyixO13Y="; }; - # https://github.com/bentoml/BentoML/pull/4227 should fix this test - postPatch = '' - substituteInPlace tests/unit/_internal/utils/test_analytics.py \ - --replace "requests" "httpx" - ''; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - pythonRelaxDeps = [ "opentelemetry-semantic-conventions" ]; + pythonRelaxDeps = [ + "cattrs" + "nvidia-ml-py" + "opentelemetry-api" + "opentelemetry-instrumentation-aiohttp-client" + "opentelemetry-instrumentation-asgi" + "opentelemetry-instrumentation" + "opentelemetry-sdk" + "opentelemetry-semantic-conventions" + "opentelemetry-util-http" + ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp attrs cattrs @@ -150,9 +160,11 @@ buildPythonPackage { deepmerge fs httpx + httpx-ws inflection jinja2 numpy + nvidia-ml-py opentelemetry-api opentelemetry-instrumentation opentelemetry-instrumentation-aiohttp-client @@ -166,21 +178,21 @@ buildPythonPackage { pip-tools prometheus-client psutil - nvidia-ml-py + pydantic python-dateutil python-json-logger python-multipart pyyaml - requests rich schema simple-di starlette + tomli-w uvicorn watchfiles - ]; + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = optional-dependencies; + inherit optional-dependencies; pythonImportsCheck = [ "bentoml" ]; @@ -201,16 +213,16 @@ buildPythonPackage { ]; nativeCheckInputs = [ - pytestCheckHook - pandas - pydantic - scikit-learn + fastapi + google-api-python-client lxml orjson - pytest-asyncio + pandas pillow - fastapi - starlette + pytest-asyncio + pytest-xdist + pytestCheckHook + scikit-learn ] ++ optional-dependencies.grpc; meta = with lib; { @@ -222,7 +234,8 @@ buildPythonPackage { happysalada natsukium ]; - # https://github.com/bentoml/BentoML/issues/3885 - broken = versionAtLeast pydantic.version "2"; + # AttributeError: 'dict' object has no attribute 'schemas' + # https://github.com/bentoml/BentoML/issues/4290 + broken = versionAtLeast cattrs.version "23.2"; }; } diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d5f683371d504..2fe3dd417d7f0 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.124"; + version = "1.34.127"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-X+092AtE6I/k6MLyFiBVGJRGNty8vSgG0E4NGVN68Ws="; + hash = "sha256-D1r5bttxHpNs8zDHket919cptFZJADyRUsvq7SvZCFo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 270249458c849..e565c7b6d83d2 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.124"; + version = "1.34.127"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-naShit9yT/YXT0/TaEwb4bFhe8fdWPSsBPghiY1SuX8="; + hash = "sha256-94VD/pPCFjRFgJDYXM5o7dDJlPh6YV/G6Rr00m6WcX8="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index f6e9245d89bb7..125c25d8a6b59 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.17.0"; + version = "2.17.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "dash"; rev = "refs/tags/v${version}"; - hash = "sha256-45nSQ3N7VcPsXthmMj3gMWFPi/i9z0peI1Wc6fUT7So="; + hash = "sha256-51/nMnXUhb+hTL4xS9x4urI+2eENo/8sEKtk/kt6xTk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch b/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch index a8f4975280c2f..ea40fe496e963 100644 --- a/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch +++ b/pkgs/development/python-modules/eduvpn-common/use-nix-lib.patch @@ -1,25 +1,10 @@ -diff --git a/eduvpn_common/loader.py b/eduvpn_common/loader.py -index 673d180..195f8c1 100644 --- a/eduvpn_common/loader.py +++ b/eduvpn_common/loader.py -@@ -21,6 +21,7 @@ def load_lib() -> CDLL: +@@ -22,6 +22,7 @@ def load_lib() -> CDLL: :return: The Go shared library loaded with cdll.LoadLibrary from ctypes :rtype: CDLL """ + return cdll.LoadLibrary("@libeduvpn-common@") - lib_prefixes = defaultdict( - lambda: "lib", - { -diff --git a/setup.py b/setup.py -index 0d23379..a9d7926 100755 ---- a/setup.py -+++ b/setup.py -@@ -92,4 +92,6 @@ class bdist_wheel(_bdist_wheel): - self.exports_lib_path = "../../exports/lib" # default - - def run(self): -+ _bdist_wheel.run(self) -+ return - self.plat_name_supplied = True # Force use platform - - libpath = getlibpath(self.plat_name) + libfile = f"libeduvpn_common-{__version__}.so" + + lib = None diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix index 3aab5ddc6a298..005e514ff3c23 100644 --- a/pkgs/development/python-modules/fastembed/default.nix +++ b/pkgs/development/python-modules/fastembed/default.nix @@ -1,23 +1,31 @@ { lib, buildPythonPackage, - fetchFromGitHub, - huggingface-hub, - loguru, pythonOlder, + fetchFromGitHub, pythonRelaxDepsHook, + + # build-system poetry-core, + + # dependencies + huggingface-hub, + loguru, + mmh3, + numpy, onnx, onnxruntime, + pillow, + pystemmer, requests, + snowballstemmer, tokenizers, tqdm, - pytestCheckHook, }: buildPythonPackage rec { pname = "fastembed"; - version = "0.2.7"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +34,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "fastembed"; rev = "refs/tags/v${version}"; - hash = "sha256-ArLilvixzpHIGGAom4smX0jZ6lJSZe6tSGreeD+Pzmk="; + hash = "sha256-Tfj0YdUW/Nnvn4+RoOWj9l0gDkWbpVgiADA09ht4xxM="; }; build-system = [ poetry-core ]; @@ -36,30 +44,32 @@ buildPythonPackage rec { dependencies = [ huggingface-hub loguru + mmh3 + numpy onnx onnxruntime + pillow + pystemmer requests + snowballstemmer tokenizers tqdm ]; pythonImportsCheck = [ "fastembed" ]; - pythonRelaxDeps = [ - "huggingface-hub" - "onnxruntime" - "tokenizers" - ]; - - nativeCheckInputs = [ pytestCheckHook ]; + pythonRelaxDeps = [ "onnxruntime" ]; # there is one test and it requires network doCheck = false; - meta = with lib; { + meta = { description = "Fast, Accurate, Lightweight Python library to make State of the Art Embedding"; homepage = "https://github.com/qdrant/fastembed"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + changelog = "https://github.com/qdrant/fastembed/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException' + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 3c21d738f2fc5..a78c772c74a24 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -14,6 +14,7 @@ stdenv, openssh, fetchFromGitHub, + pythonAtLeast, pythonOlder, }: @@ -22,7 +23,10 @@ buildPythonPackage rec { version = "3.4.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Python 3.12 is not yet supported. + # https://github.com/usnistgov/fipy/issues/997 + # https://github.com/usnistgov/fipy/pull/1023 + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "usnistgov"; @@ -45,12 +49,18 @@ buildPythonPackage rec { nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + # NOTE: Two of the doctests in fipy.matrices.scipyMatrix._ScipyMatrix.CSR fail, and there is no + # clean way to disable them. + doCheck = false; + checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules ''; - pythonImportsCheck = [ "fipy" ]; + # NOTE: Importing fipy within the sandbox will fail because plm_rsh_agent isn't set and the process isn't able + # to start a daemon on the builder. + # pythonImportsCheck = [ "fipy" ]; meta = with lib; { homepage = "https://www.ctcms.nist.gov/fipy/"; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 6b2dcccc67af3..52711cead2d0b 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { mainProgram = "fx2tool"; homepage = "https://github.com/whitequark/libfx2"; license = licenses.bsd0; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 9de834fab5d76..1ee6497fd1817 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.4"; + version = "0.6.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F1CEjBKvlsskrhw90F5L/iSGfcRXcAntA+EELYQh6HQ="; + hash = "sha256-xAicJ3+k4mci92qwPuMDnyi+i/HJvigpSLlYOhVMbXk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index cfda3e8db2d59..28d364c2650d9 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gpsoauth"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BA+2aFxpFpi6cWGl4yepba7s7BmZ1ijvSBhtS23v3QM="; + hash = "sha256-WCAu0wM5fSkntGTcleJxS///haGw+Iv2jzrWOFnr5DU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 5743b35c2b80e..ec89847abc248 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { # incompatible with setuptools-scm>=7 # https://github.com/ofek/hatch-vcs/issues/8 "test_write" + ] ++ lib.optionals (pythonOlder "3.11") [ + # https://github.com/pypa/setuptools_scm/issues/1038, fixed in setuptools_scm@8.1.0 + "test_basic" + "test_root" + "test_metadata" ]; pythonImportsCheck = [ "hatch_vcs" ]; diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix new file mode 100644 index 0000000000000..37e3657815732 --- /dev/null +++ b/pkgs/development/python-modules/inline-snapshot/default.nix @@ -0,0 +1,73 @@ +{ + lib, + asttokens, + black, + buildPythonPackage, + click, + dirty-equals, + executing, + fetchFromGitHub, + hypothesis, + poetry-core, + pyright, + pytest-subtests, + pytest-xdist, + pytestCheckHook, + pythonOlder, + rich, + time-machine, + toml, + types-toml, +}: + +buildPythonPackage rec { + pname = "inline-snapshot"; + version = "0.10.2"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "15r10nk"; + repo = "inline-snapshot"; + rev = "refs/tags/v${version}"; + hash = "sha256-19rvhqYkM3QiD0La5TRi/2uKza8HW/bnXeGAhOZ/bgs="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + asttokens + black + click + executing + rich + toml + types-toml + ]; + + nativeCheckInputs = [ + dirty-equals + hypothesis + pyright + pytest-subtests + pytest-xdist + pytestCheckHook + time-machine + ]; + + pythonImportsCheck = [ "inline_snapshot" ]; + + disabledTestPaths = [ + # Tests don't play nice with pytest-xdist + "tests/test_typing.py" + ]; + + meta = with lib; { + description = "Create and update inline snapshots in Python tests"; + homepage = "https://github.com/15r10nk/inline-snapshot/"; + changelog = "https://github.com/15r10nk/inline-snapshot/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 9f636ab57f4e1..5879be3b53592 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { homepage = "https://github.com/avian2/jsonmerge"; changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; license = licenses.mit; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 738f05f28e8aa..ce9aded24b3b9 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -112,7 +112,6 @@ buildPythonPackage rec { license = licenses.isc; maintainers = with maintainers; [ tilpner - emily symphorien ]; }; diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 170d0bd2f7413..84cbbf48157b6 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.2.1"; + version = "24.6.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-g1IrqpuRVg6phic8qxScORVpdunWEkVxciYyCTWtVuQ="; + hash = "sha256-jey0xoT8r7hae08DjaEl7UJb3RDbdr8M20E/m4TkG1g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 0d063c06eaf53..24fdc105e18b0 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.3.2"; + version = "2.4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X3tbTh1bK34QYmDz0oxAoMTs6kGWFPLNjfW+jyfEYAw="; + hash = "sha256-WH6aklJP8Wk1XgxULedM/rIt6XWAV5ur9hOAta7TsD4="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 0f52f3dbf45ce..af11516e851a1 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyinsteon"; repo = "pyinsteon"; rev = "refs/tags/${version}"; - hash = "sha256-s8YRDu+UpU1sisdscd87CpcLl3csOUDdIuKqx48GZsw="; + hash = "sha256-V1sYLKKlTMG9Km53uNCU34e8D/owxuDNT+HGZxtK21I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 1a1e912c9b502..3b4c2db066360 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ sb0 - emily ]; }; } diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index c252601e8a250..e65aad91904a7 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -30,6 +30,7 @@ xcffib, xkbcommon, nixosTests, + extraPackages ? [ ], }: buildPythonPackage rec { @@ -66,7 +67,7 @@ buildPythonPackage rec { pkg-config ]; - dependencies = [ + dependencies = extraPackages ++ [ (cairocffi.override { withXcffib = true; }) dbus-next iwlib @@ -97,6 +98,11 @@ buildPythonPackage rec { providedSessions = [ "qtile" ]; }; + postInstall = '' + install resources/qtile.desktop -Dt $out/share/xsessions + install resources/qtile-wayland.desktop -Dt $out/share/wayland-sessions + ''; + meta = with lib; { homepage = "http://www.qtile.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/qtile/wrapper.nix b/pkgs/development/python-modules/qtile/wrapper.nix deleted file mode 100644 index b4f6e4c2e23b2..0000000000000 --- a/pkgs/development/python-modules/qtile/wrapper.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ python3 }: - -(python3.withPackages (_: [ python3.pkgs.qtile ])).overrideAttrs (_: { - # restore some qtile attrs, beautify name - inherit (python3.pkgs.qtile) pname version meta; - name = with python3.pkgs.qtile; "${pname}-${version}"; - passthru.unwrapped = python3.pkgs.qtile; -}) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 35c178941bdd4..2399e4e977feb 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.2"; + version = "3.2.3"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-KlhnAEqh487ckAAKtyb9rSzgrheYY8GxaX1+je0bjNs="; + hash = "sha256-QUFUk08XJ9r4pkc0k5RP7LOAVAw/AIddwa43c4L32D8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index d892c356a25d6..5c65ccaeb4124 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "1.1.2"; + version = "1.1.3"; format = "wheel"; @@ -21,7 +21,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - hash = "sha256-zudERm/eSPUDArhRKRsgiqZ+cmyjG3o7+5tuahRWY+A="; + hash = "sha256-pVSpp6w4gZeah6KxD2M6oqVwbnIhihD3G+OLPJ6DGuk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 9434e25ecc31d..6578e3c119575 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/florisla/stm32loader"; changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; - maintainers = with maintainers; [ emily ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 4db4998c1bca3..0ec6c7bfc616e 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -15,6 +15,7 @@ flask, freezegun, graphql-core, + inline-snapshot, libcst, opentelemetry-api, opentelemetry-sdk, @@ -43,7 +44,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.230.0"; + version = "0.235.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -52,7 +53,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-jhInHoOvPGIEoSddv8+30gY38L6XR5OEATUTdrHbNpA="; + hash = "sha256-M9GwddyLfwGhA1z+imEOiNrXYFM2gFT9IcFf/8cRHAE="; }; patches = [ @@ -66,7 +67,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "--emoji --mypy-ini-file=mypy.ini" "" \ + --replace-fail "--emoji" "" \ ''; build-system = [ poetry-core ]; @@ -138,6 +139,7 @@ buildPythonPackage rec { daphne email-validator freezegun + inline-snapshot pytest-asyncio pytest-emoji pytest-mock @@ -154,7 +156,6 @@ buildPythonPackage rec { "tests/django/test_dataloaders.py" "tests/exceptions/" "tests/http/" - "tests/mypy/test_plugin.py" # avoid dependency on mypy "tests/schema/extensions/" "tests/schema/test_dataloaders.py" "tests/schema/test_lazy/" diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index a54f3df4a7f59..c2fbba8406847 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "superqt"; rev = "refs/tags/v${version}"; - hash = "sha256-AJXX460sm0rrimizkiBIjYFRtWbscEjlwo5ZLcgjzcA="; + hash = "sha256-/VR9Lc1x+7J/3zyo/eBFBvGkPXzpTfPpNAvNhSzWio8="; }; build-system = [ diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index 143650d2ee509..a689f4381d6cf 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -50,6 +50,8 @@ xmltodict, # native check inputs unittestCheckHook, + + pythonAtLeast, }: let version = "7.2.0"; @@ -195,11 +197,13 @@ buildPythonPackage { "-v" ]; - meta = with lib; { + meta = { description = "Semantic search and workflows powered by language models"; changelog = "https://github.com/neuml/txtai/releases/tag/v${version}"; homepage = "https://github.com/neuml/txtai"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada ]; + # This should be addressed in a newer version, but we first need to wait for python311Packages.faiss to be updated + broken = pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 68b187e2e7dcf..112c19286a92b 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.11"; + version = "0.20.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-rVzp+1EUFEMDJvGaUT4j07xxQ8EM2+HNrrIiKtVnaY8="; + hash = "sha256-C+q93gIF3B2meepGT9P5i1cO9PD8glsVWpdPtRsh6Nk="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index f47d4cb590e3b..85764d05986c2 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ubelt"; - version = "1.3.5"; + version = "1.3.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "ubelt"; rev = "refs/tags/v${version}"; - hash = "sha256-pwqqt5Syag4cO6a93+7ZE3eI61yTZGc+NEu/Y0i1U0k="; + hash = "sha256-ygoJqyTscfuZVDGVbrZobZFvlcuF4HavTU65tmhyU+w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 8a362c8f84af0..7e8091dac4dab 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.6.12"; + version = "2.6.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-JGX9v/x8c7ayHnxVjC7u4YLs3OvZmTzPNFUfqGCeIRQ="; + hash = "sha256-UDYIAAAKmdqtTzV8yn1zkEH0PvOUmVXodxF1ZyubgE0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 470943793d7b5..fc1b3c7115188 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "websockify"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "novnc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-82Fk9qbiiCD5Rts1d14sK/njeN7DcjKMKPqE7S/1WHs="; + hash = "sha256-+qjWmCkXJj8J5OImMSjTwXWyApmJ883NMr0157iqPS4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 63c4e14ba8142..477f5d776c906 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "3.21.0"; + version = "3.22.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YkMDoFwWPrDhAgDnPpNCU1NlnAPhwYQF/KFaRFn+juQ="; + hash = "sha256-WyMMcKKBNnEb0tyE2EjOspgJve6NJZg9HxymovBy/u4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 7958be28794c2..e3d33af5d0689 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; rev = "refs/tags/${version}"; - hash = "sha256-xOaqwgL8NqB3pHNa6U/wextntI5aMivHLaIhSRqvgRU="; + hash = "sha256-wQY355KUsN91y3lgj9k3ceeHb6a0faxiguIFK4ZwPIE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 5e70e78e4dc2c..48455b0a6e94b 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.64.0"; + version = "0.64.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-4p/CUAZQLiADWzjXMOeYUX0OJgZczHrI2/sVRuXiFSI="; + hash = "sha256-9hPJZQfLevV6zl7JvLtCJSspGl87ORlWLXoVJmRcEJU="; }; postPatch = '' |