diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index eb179bfa54964..53d7262d78df7 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -64,10 +64,6 @@ in python3.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath bins) ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - outputs = [ "out" "man" ]; postBuild = '' make -C man diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index a57bae8aa9b1f..8ad7a6232bebe 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -34,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { ]; pytestFlagsArray = [ + "-W" "ignore::sphinx.deprecation.RemovedInSphinx90Warning" "--rootdir" "src/ablog" ]; diff --git a/pkgs/applications/misc/acpic/default.nix b/pkgs/applications/misc/acpic/default.nix index 6b37ef6b8e653..7d05f0a05702e 100644 --- a/pkgs/applications/misc/acpic/default.nix +++ b/pkgs/applications/misc/acpic/default.nix @@ -6,15 +6,21 @@ python3Packages.buildPythonApplication rec { pname = "acpic"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit version pname; hash = "sha256-vQ9VxCNbOmqHIY3e1wq1wNJl5ywfU2tm62gDg3vKvcg="; }; - nativeBuildInputs = [ - python3Packages.pbr + postPatch = '' + substituteInPlace setup.py \ + --replace "pbr>=5.8.1,<6" "pbr" + ''; + + nativeBuildInputs = with python3Packages; [ + pbr + setuptools ]; # no tests diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 2ada67daa1e2c..ddf2b9f528dad 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -19,6 +19,7 @@ in with python3.pkgs; buildPythonApplication rec { version = "4.8"; pname = "buku"; + pyproject = true; src = fetchFromGitHub { owner = "jarun"; @@ -27,6 +28,10 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-kPVlfTYUusf5CZnKB53WZcCHo3MEnA2bLUHTRPGPn+8="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ hypothesis pytest diff --git a/pkgs/applications/misc/keepmenu/default.nix b/pkgs/applications/misc/keepmenu/default.nix index 1e6735d656166..d10c10c231d6d 100644 --- a/pkgs/applications/misc/keepmenu/default.nix +++ b/pkgs/applications/misc/keepmenu/default.nix @@ -17,8 +17,6 @@ python3Packages.buildPythonApplication rec { hatch-vcs ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3Packages; [ pykeepass pynput diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 27bf5d1db267e..c892f046c895c 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-yI33pB/t+UISvSbLUzmsZqBxLF6r8R3j9iPNeosKcYw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ glibcLocales installShellFiles diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 0654974eb9390..6bd9b2089f18e 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -9,7 +9,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = with python3.pkgs; [ setuptools-scm sphinxHook diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index 28f1e4b2d98cf..05f04ed0aba05 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -30,8 +30,6 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3.pkgs; [ colorama distro diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e7daa60198d11..5b42f1d08c3cf 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -163,7 +163,7 @@ let zeroconf zipstream-ng class-doc - pydantic + pydantic_1 ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ] ++ lib.optionals (!stdenv.isDarwin) [ diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/applications/misc/pysentation/default.nix index c02fec3c01663..1a84c06c94ff4 100644 --- a/pkgs/applications/misc/pysentation/default.nix +++ b/pkgs/applications/misc/pysentation/default.nix @@ -15,9 +15,14 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-TwHDXWgGWuQVgatBDc1iympnb6dy4xYThLR5MouEZHA="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools - python3.pkgs.wheel + nativeBuildInputs = with python3.pkgs; [ + setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "click" + "rich" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index cd69643251063..3715ef27524e9 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -15,8 +15,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-OzcoOIgEiadWrsUPIxBJTuZQYjScJBYKyqCu1or6fz8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3.pkgs; [ hatchling hatch-vcs diff --git a/pkgs/applications/networking/cloudflare-dyndns/default.nix b/pkgs/applications/networking/cloudflare-dyndns/default.nix index 2be03621a016f..087b3c66f00dd 100644 --- a/pkgs/applications/networking/cloudflare-dyndns/default.nix +++ b/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { attrs click cloudflare - pydantic + pydantic_1 requests ]; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index 5343fd1c4daeb..8e496c6c11012 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -23,8 +23,6 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python3.pkgs; [ appdirs deltachat diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index d434e000da5e6..ed9a7d6ed5ad0 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ distro setuptools diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index cd0290f08746c..95d5effa151ff 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pkgs.gettext pkgs.which diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index 95608b26e2fee..4460e50ab6246 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ distro gtk3 diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 9950075d6b273..e21379678a175 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -42,8 +42,6 @@ python3Packages.buildPythonApplication rec { sourceRoot = "${src.name}/paperwork-gtk"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' chmod a+w -R .. patchShebangs ../tools diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 7a1d82a5eb31e..cbda78976b5b1 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -32,8 +32,6 @@ buildPythonPackage rec { chmod a+w -R .. patchShebangs ../tools ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ openpaperwork-core paperwork-backend diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index f2940b1e3fb9b..d53306e77904e 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -19,8 +19,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-5tQaNT6QVN9mxa9t6OvMux4ZGy4flUqszTAwet2QL0w="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ installShellFiles ] ++ (with python3.pkgs; [ diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index f65f5e5149ca8..e9e693fcf5118 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -31,8 +31,6 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - doCheck = false; dontWrapGApps = true; diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index a04ac5a6945ec..301308f901369 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.2"; + version = "0.9.2-unstable-2023-11-28"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; - rev = "v${version}"; - sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; + rev = "6c2204ba66776b700095ff73e3e599a908ffd9c3"; + hash = "sha256-lSIah4T+QqZwCRpeI3mxJ7PZT6pSHBO26rcEFfK8DSk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index d030c7add9660..667da3ec229fd 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -52,8 +52,6 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 56a89f7eec815..e9db7812cca5b 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -11,8 +11,6 @@ python3Packages.buildPythonApplication rec { hash = "sha256-PtV2mzxOfZ88THiFD4K+qtOi41GeLF1GcdiFFhUR8Ak="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = lib.optionals stdenv.isLinux [ qt5.qtwayland ]; propagatedBuildInputs = with python3Packages; [ git pyqt5 qtpy send2trash ]; nativeBuildInputs = with python3Packages; [ setuptools-scm gettext qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index 37783a92ab3e1..d29bf08855f07 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-4SGkkC4LjZXTDXwK6jMOIKXR1qX76CasOwSqv8XUrjs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Upstream splitted the project into gitlint and gitlint-core to # simplify the dependency handling sourceRoot = "${src.name}/gitlint-core"; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index ab6f57d02ed0b..1051dc6da886a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true -, rustSupport ? stdenv.hostPlatform.isLinux, cargo, rustPlatform, rustc +# depends on rust-cpython which won't support python312 +# https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9 +, rustSupport ? (stdenv.hostPlatform.isLinux && python3Packages.pythonOlder "3.12"), cargo, rustPlatform, rustc , fullBuild ? false , gitSupport ? fullBuild , guiSupport ? fullBuild, tk @@ -43,7 +45,7 @@ let propagatedBuildInputs = lib.optional re2Support fb-re2 ++ lib.optional gitSupport pygit2 ++ lib.optional highlightSupport pygments; - nativeBuildInputs = [ makeWrapper gettext installShellFiles ] + nativeBuildInputs = [ makeWrapper gettext installShellFiles python3Packages.setuptools ] ++ lib.optionals rustSupport [ rustPlatform.cargoSetupHook cargo diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix index 8b9e822070cf1..428275535af49 100644 --- a/pkgs/applications/video/deface/default.nix +++ b/pkgs/applications/video/deface/default.nix @@ -42,9 +42,6 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace pyproject.toml requirements.txt --replace "opencv-python" "opencv" ''; - # Let setuptools know deface version - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ]; meta = with lib; { diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 5414193640f0e..81798df47f27a 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -25,6 +25,12 @@ let python = python3.override { packageOverrides = self: super: { + pydantic = super.pydantic_1; + + versioningit = super.versioningit.overridePythonAttrs { + # checkPhase requires pydantic>=2 + doCheck = false; + }; }; }; diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index d5ff069290ba5..028441d18160e 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -25,7 +25,7 @@ maturinBuildHook() { # Move the wheel to dist/ so that regular Python tooling can find it. mkdir -p dist - mv target/wheels/*.whl dist/ + mv ${cargoRoot:+$cargoRoot/}target/wheels/*.whl dist/ # These are python build hooks and may depend on ./dist runHook postBuild diff --git a/pkgs/by-name/ai/airlift/package.nix b/pkgs/by-name/ai/airlift/package.nix index 81ac5acc2efad..9ab35cc2a4622 100644 --- a/pkgs/by-name/ai/airlift/package.nix +++ b/pkgs/by-name/ai/airlift/package.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchPypi -, argparse , kubernetes-helm , kind , docker @@ -17,16 +16,22 @@ python3.pkgs.buildPythonApplication rec { inherit pname version; hash = "sha256-1LE3fpfX4NExJdUdSjt4BXvxQTLJ8zrRkGHkxo/6Pb8="; }; + + postPatch = '' + sed -i '/argparse/d' pyproject.toml + ''; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + buildInputs = [ kubernetes-helm kind docker ]; - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; + propagatedBuildInputs = with python3.pkgs; [ - argparse halo pyyaml hiyapyco diff --git a/pkgs/by-name/bi/bitbake-language-server/package.nix b/pkgs/by-name/bi/bitbake-language-server/package.nix index 8d314053e7bc8..a03af1d9a94ee 100644 --- a/pkgs/by-name/bi/bitbake-language-server/package.nix +++ b/pkgs/by-name/bi/bitbake-language-server/package.nix @@ -41,8 +41,6 @@ python3.pkgs.buildPythonApplication rec { tree-sitter ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - # The scikit-build-core runs CMake internally so we must let it run the configure step itself. dontUseCmakeConfigure = true; SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" [ diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix index 26f90237f5218..c5a6026d8ec37 100644 --- a/pkgs/by-name/ho/homeassistant-satellite/package.nix +++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -16,8 +16,12 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook setuptools - wheel + ]; + + pythonRelaxDeps = [ + "aiohttp" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/we/websecprobe/package.nix b/pkgs/by-name/we/websecprobe/package.nix index fb81063526cf1..544d56f0114be 100644 --- a/pkgs/by-name/we/websecprobe/package.nix +++ b/pkgs/by-name/we/websecprobe/package.nix @@ -5,18 +5,17 @@ python3.pkgs.buildPythonApplication rec { pname = "websecprobe"; - version = "0.0.10"; + version = "0.0.11"; pyproject = true; src = fetchPypi { pname = "WebSecProbe"; inherit version; - hash = "sha256-QvXOyQUptMyim/bgvhihjgGs7vX0qX8MqK2ol8q9ePc="; + hash = "sha256-OKbKz3HSTtwyx/JNUtLJBTaHQcxkUWroMg9/msVWgk4="; }; nativeBuildInputs = with python3.pkgs; [ setuptools - wheel ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/embedded/fpga/tinyprog/default.nix b/pkgs/development/embedded/fpga/tinyprog/default.nix index 4872111b811c5..b242d6ebc1b4f 100644 --- a/pkgs/development/embedded/fpga/tinyprog/default.nix +++ b/pkgs/development/embedded/fpga/tinyprog/default.nix @@ -30,10 +30,6 @@ with python3Packages; buildPythonApplication rec { nativeBuildInputs = [ setuptools-scm ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - meta = with lib; { homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e4556d95f0fdd..a791dbd414590 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,10 +30,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "6"; + patch = "7"; suffix = ""; }; - hash = "sha256-D6t4+n8TP084IQxiYNkNfA1ccZhEZBnOBX7HrC5vXzg="; + hash = "sha256-GOGqfmb/OlhCPVntIoFaaVTlM0ISLEXfIMlod8Biubc="; }; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 35116b38f8104..83c6be2f53823 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -172,6 +172,16 @@ in { }; } ./python-remove-tests-dir-hook.sh) {}; + pythonRuntimeDepsCheckHook = callPackage ({ makePythonHook, packaging }: + makePythonHook { + name = "python-runtime-deps-check-hook.sh"; + propagatedBuildInputs = [ packaging ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + hook = ./python-runtime-deps-check-hook.py; + }; + } ./python-runtime-deps-check-hook.sh) {}; + setuptoolsBuildHook = callPackage ({ makePythonHook, setuptools, wheel }: makePythonHook { name = "setuptools-setup-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index 1ac91fb40e4e5..293bd5cebd500 100644 --- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -52,7 +52,7 @@ _pythonRelaxDeps() { else for dep in $pythonRelaxDeps; do sed -i "$metadata_file" -r \ - -e "s/(Requires-Dist: $dep\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/" + -e "s/(Requires-Dist: $dep\s*(\[[^]]+\])?)[^;]*(;.*)?/\1\3/i" done fi } diff --git a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py new file mode 100644 index 0000000000000..5a3a919391753 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py @@ -0,0 +1,97 @@ +#!/usr/bin/env python3 +""" +The runtimeDependenciesHook validates, that all dependencies specified +in wheel metadata are available in the local environment. + +In case that does not hold, it will print missing dependencies and +violated version constraints. +""" + + +import importlib.metadata +import re +import sys +import tempfile +from argparse import ArgumentParser +from zipfile import ZipFile + +from packaging.metadata import Metadata, parse_email +from packaging.requirements import Requirement + +argparser = ArgumentParser() +argparser.add_argument("wheel", help="Path to the .whl file to test") + + +def error(msg: str) -> None: + print(f" - {msg}", file=sys.stderr) + + +def normalize_name(name: str) -> str: + """ + Normalize package names according to PEP503 + """ + return re.sub(r"[-_.]+", "-", name).lower() + + +def get_manifest_text_from_wheel(wheel: str) -> str: + """ + Given a path to a wheel, this function will try to extract the + METADATA file in the wheels .dist-info directory. + """ + with ZipFile(wheel) as zipfile: + for zipinfo in zipfile.infolist(): + if zipinfo.filename.endswith(".dist-info/METADATA"): + with tempfile.TemporaryDirectory() as tmp: + path = zipfile.extract(zipinfo, path=tmp) + with open(path, encoding="utf-8") as fd: + return fd.read() + + raise RuntimeError("No METADATA file found in wheel") + + +def get_metadata(wheel: str) -> Metadata: + """ + Given a path to a wheel, returns a parsed Metadata object. + """ + text = get_manifest_text_from_wheel(wheel) + raw, _ = parse_email(text) + metadata = Metadata.from_raw(raw) + + return metadata + + +def test_requirement(requirement: Requirement) -> bool: + """ + Given a requirement specification, tests whether the dependency can + be resolved in the local environment, and whether it satisfies the + specified version constraints. + """ + if requirement.marker and not requirement.marker.evaluate(): + # ignore requirements with incompatible markers + return True + + package_name = normalize_name(requirement.name) + + try: + package = importlib.metadata.distribution(requirement.name) + except importlib.metadata.PackageNotFoundError: + error(f"{package_name} not installed") + return False + + if package.version not in requirement.specifier: + error( + f"{package_name}{requirement.specifier} not satisfied by version {package.version}" + ) + return False + + return True + + +if __name__ == "__main__": + args = argparser.parse_args() + + metadata = get_metadata(args.wheel) + tests = [test_requirement(requirement) for requirement in metadata.requires_dist] + + if not all(tests): + sys.exit(1) diff --git a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh new file mode 100644 index 0000000000000..43a2f9b88745e --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.sh @@ -0,0 +1,20 @@ +# Setup hook for PyPA installer. +echo "Sourcing python-runtime-deps-check-hook" + +pythonRuntimeDepsCheckHook() { + echo "Executing pythonRuntimeDepsCheck" + + export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" + + for wheel in dist/*.whl; do + echo "Checking runtime dependencies for $(basename $wheel)" + @pythonInterpreter@ @hook@ "$wheel" + done + + echo "Finished executing pythonRuntimeDepsCheck" +} + +if [ -z "${dontCheckRuntimeDeps-}" ]; then + echo "Using pythonRuntimeDepsCheckHook" + preInstallPhases+=" pythonRuntimeDepsCheckHook" +fi diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index c14c6bc096fd3..e6f9087de866e 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -19,6 +19,7 @@ , pythonOutputDistHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook +, pythonRuntimeDepsCheckHook , setuptoolsBuildHook , setuptoolsCheckHook , wheelUnpackHook @@ -229,6 +230,13 @@ let } else pypaBuildHook + ) ( + if isBootstrapPackage then + pythonRuntimeDepsCheckHook.override { + inherit (python.pythonOnBuildForHost.pkgs.bootstrap) packaging; + } + else + pythonRuntimeDepsCheckHook )] ++ lib.optionals (format' == "wheel") [ wheelUnpackHook ] ++ lib.optionals (format' == "egg") [ diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 9aa1284bbee9d..0a6be882120ba 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , c-ares , cmake , crc32c @@ -18,6 +19,7 @@ , staticOnly ? stdenv.hostPlatform.isStatic }: let + # defined in cmake/GoogleapisConfig.cmake googleapisRev = "85f8c758016c279fb7fa8f0d51ddc7ccc0dd5e05"; googleapis = fetchFromGitHub { name = "googleapis-src"; @@ -39,6 +41,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-0SoOaAqvk8cVC5W3ejTfe4O/guhrro3uAzkeIpAkCpg="; }; + patches = [ + # https://github.com/googleapis/google-cloud-cpp/pull/12554, tagged in 2.16.0 + (fetchpatch { + name = "prepare-for-GCC-13.patch"; + url = "https://github.com/googleapis/google-cloud-cpp/commit/ae30135c86982c36e82bb0f45f99baa48c6a780b.patch"; + hash = "sha256-L0qZfdhP8Zt/gYBWvJafteVgBHR8Kup49RoOrLDtj3k="; + }) + ]; + postPatch = '' substituteInPlace external/googleapis/CMakeLists.txt \ --replace "https://github.com/googleapis/googleapis/archive/\''${_GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}" @@ -69,7 +80,7 @@ stdenv.mkDerivation rec { ]; # https://hydra.nixos.org/build/222679737/nixlog/3/tail - NIX_CFLAGS_COMPILE = if stdenv.isAarch64 then "-Wno-error=maybe-uninitialized" else null; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isAarch64 "-Wno-error=maybe-uninitialized"; doInstallCheck = true; diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index da8568bc8dc5c..b20b6782d9b06 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtest, libdrm, libpciaccess, libva, libX11 -, libXau, libXdmcp, libpthreadstubs }: +, libXau, libXdmcp, libpthreadstubs, fetchpatch }: stdenv.mkDerivation rec { pname = "intel-media-sdk"; @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { hash = "sha256-wno3a/ZSKvgHvZiiJ0Gq9GlrEbfHCizkrSiHD6k/Loo="; }; + patches = [ + # https://github.com/Intel-Media-SDK/MediaSDK/pull/3005 + (fetchpatch { + name = "include-cstdint-explicitly.patch"; + url = "https://github.com/Intel-Media-SDK/MediaSDK/commit/a4f37707c1bfdd5612d3de4623ffb2d21e8c1356.patch"; + hash = "sha256-OPwGzcMTctJvHcKn5bHqV8Ivj4P7+E4K9WOKgECqf04="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 73c3b1b571737..243ec53a3234c 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -25,6 +25,8 @@ let buildInputs = [ libuuid zlib ]; nativeBuildInputs = [ autoreconfHook ]; + enableParallelBuilding = true; + doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index a937b016ce897..a2f22062d3bf2 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -2,20 +2,25 @@ , lib , pythonOlder , fetchPypi +, setuptools , six , enum34 }: buildPythonPackage rec { pname = "absl-py"; - version = "1.4.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-0sJE0BBIukdufAgL0sbfXhQdIR3oAiNGDVs7iipYQz0="; + hash = "sha256-2WkCEcX8/vzdGkVHCsK1xazUUkHDr3Hu2WvFRBdGwNU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.4") [ diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index 24ed871c4037a..8e3bccc473cf4 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.24.1"; + version = "0.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DKyFb+4DUMhVUwr+sgF2IaJS9pEj2o2shGYwExfffWg="; + hash = "sha256-WIMOSfo9fGbevMkUHvFsA51SOiGkBO1cK388FudRDY0="; }; patches = [ diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 4aacc5c46b21b..aabd6216c904c 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { hash = "sha256-0aLPDh9lrKpHo97VFFwCmPXyXXNFGgkdjoppzm3BCTo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/adafruit-io/default.nix b/pkgs/development/python-modules/adafruit-io/default.nix index 59bdcc46e8bbc..3315df4212ce5 100644 --- a/pkgs/development/python-modules/adafruit-io/default.nix +++ b/pkgs/development/python-modules/adafruit-io/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-vfjyU+czLtUA0WDEvc0iYmJ2Tn75o/OsX909clfDsUE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 672854ce6a989..fcd55c0f7a3b1 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-tw95VnxsK57KBMw0fzzgJnFe8O8Ef0rQ9qBMIeYrkHQ="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/adext/default.nix b/pkgs/development/python-modules/adext/default.nix index 1aa9368f347b7..c5a05d19bee85 100644 --- a/pkgs/development/python-modules/adext/default.nix +++ b/pkgs/development/python-modules/adext/default.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { sha256 = "0h5k9kzms2f0r48pdhsgv8pimk0vsxw8vs0k6880mank8ij914wr"; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index d1ff94519646b..c299864830afc 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -3,13 +3,15 @@ , fetchPypi , pyparsing , pytestCheckHook +, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aenum"; version = "3.1.15"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-jL12zRjE+HD/ObJChNPqAo++hzGljfOqWB5DTFdblVk="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pyparsing pytestCheckHook @@ -36,6 +42,9 @@ buildPythonPackage rec { "test_arduino_headers" "test_c_header_scanner" "test_extend_flag_backwards_stdlib" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: has no attribute 'value'. Did you mean: 'blue'? + "test_extend_enum_shadow_property_stdlib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index 8d40361c6d06f..d971bc5b5e039 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-eE5BsXNtSU6YUhRn4/SKpMrqaYf8tyfLKdxxGOmNJ9I="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 5f226d26018e5..006bd358d7c25 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.6.0"; + version = "2.8.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-e8FBUG08yWNL9B51Uv4ftYx1C0kcdoweOreUtvvvTAk="; + hash = "sha256-mVG3dCz9DnExteUFhvTGjZu81E0KbrObP3OX0w/OVzU="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -82,6 +82,8 @@ buildPythonPackage rec { "test_sso_credential_fetcher_can_fetch_credentials" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python client for amazon services"; homepage = "https://github.com/aio-libs/aiobotocore"; diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index 870ae00612d26..ab2d20155a92e 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytest-asyncio , pytestCheckHook , pythonOlder @@ -56,6 +57,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; description = "Asynchronous console and interfaces for asyncio"; homepage = "https://github.com/vxgmichel/aioconsole"; changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/aiocron/default.nix b/pkgs/development/python-modules/aiocron/default.nix index acb53f02ecc85..a9a135e28f21f 100644 --- a/pkgs/development/python-modules/aiocron/default.nix +++ b/pkgs/development/python-modules/aiocron/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , python , croniter , tzlocal @@ -10,13 +11,17 @@ buildPythonPackage rec { pname = "aiocron"; version = "1.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-SFRlE/ry63kB5lpk66e2U8gBBu0A7ZyjQZw9ELZVWgE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ croniter tzlocal diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 5fc14b4f66bdd..1da999978b58d 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -3,36 +3,43 @@ , fetchFromGitHub , pycares , pythonOlder -, typing +, setuptools + }: buildPythonPackage rec { pname = "aiodns"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "saghul"; - repo = pname; - rev = "aiodns-${version}"; - sha256 = "1i91a43gsq222r8212jn4m6bxc3fl04z1mf2h7s39nqywxkggvlp"; + repo = "aiodns"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-JZS53kICsrXDot3CKjG30AOjkYycKpMJvC9yS3c1v5Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pycares - ] ++ lib.optionals (pythonOlder "3.7") [ - typing ]; # Could not contact DNS servers doCheck = false; - pythonImportsCheck = [ "aiodns" ]; + pythonImportsCheck = [ + "aiodns" + ]; meta = with lib; { description = "Simple DNS resolver for asyncio"; homepage = "https://github.com/saghul/aiodns"; + changelog = "https://github.com/saghul/aiodns/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index d700c29071cc4..a640c978764a6 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -1,18 +1,24 @@ { lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, cython_3 +, setuptools + +# dependencies , aiohappyeyeballs , async-timeout -, buildPythonPackage , chacha20poly1305-reuseable -, cython_3 -, fetchFromGitHub -, mock , noiseprotocol , protobuf +, zeroconf + +# tests +, mock , pytest-asyncio , pytestCheckHook -, pythonOlder -, setuptools -, zeroconf }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index ba943865a444d..3eb23c4a66419 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -9,11 +9,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, sigstore }: buildPythonPackage rec { pname = "aiogithubapi"; - version = "23.2.1"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-J6kcEVqADmVJZDbU9eqLCL0rohMSA/Ig7FSp/Ye5Sfk="; + hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI="; }; postPatch = '' @@ -41,6 +42,7 @@ buildPythonPackage rec { aiohttp async-timeout backoff + sigstore ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index 7638c4efb48fd..a33cdb4517791 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.0.0"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-bWwK761gn7HsR9ObcBDfvQH0fJfTAo0QAcL/HcNdHik="; + hash = "sha256-8SYrg+gfNSTR0CTPf4cYDa4bfA0LPBmZtPcATF22fqw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 3b72b53045b00..c7fc67f4e11e6 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -3,6 +3,7 @@ , async-timeout , asyncio-dgram , buildPythonPackage +, certifi , docutils , fetchFromGitHub , poetry-core @@ -35,6 +36,7 @@ buildPythonPackage rec { aiohttp async-timeout asyncio-dgram + certifi docutils voluptuous ]; diff --git a/pkgs/development/python-modules/aiohappyeyeballs/default.nix b/pkgs/development/python-modules/aiohappyeyeballs/default.nix index 8922c8283adcb..ece43814ab551 100644 --- a/pkgs/development/python-modules/aiohappyeyeballs/default.nix +++ b/pkgs/development/python-modules/aiohappyeyeballs/default.nix @@ -1,10 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system , poetry-core + +# optional-dependencies +, furo +, myst-parser +, sphinx-autobuild +, sphinxHook + +# tests , pytest-asyncio , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { @@ -21,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-LMvELnN6Sy6DssXfH6fQ84N2rhdjqB8AlikTMidrjT4="; }; + outputs = [ + "out" + "doc" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=aiohappyeyeballs --cov-report=term-missing:skip-covered" "" @@ -28,7 +43,16 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core - ]; + ] ++ passthru.optional-dependencies.docs; + + passthru.optional-dependencies = { + docs = [ + furo + myst-parser + sphinx-autobuild + sphinxHook + ]; + }; nativeCheckInputs = [ pytest-asyncio @@ -40,15 +64,15 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # Test has typos + # https://github.com/bdraco/aiohappyeyeballs/issues/30 "tests/test_impl.py" ]; meta = with lib; { - description = "Modul for connecting with Happy Eyeballs"; + description = "Happy Eyeballs for pre-resolved hosts"; homepage = "https://github.com/bdraco/aiohappyeyeballs"; - changelog = "https://github.com/bdraco/aiohappyeyeballs/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bdraco/aiohappyeyeballs/blob/${src.rev}/CHANGELOG.md"; license = licenses.psfl; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab hexa ]; }; } diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 6008b94179fb0..8e78784457ca4 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiohttp-jinja2"; - version = "1.5.1"; + version = "1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jRSbKlfZH3lLM6OU6lvGa1Z/OMdKWmqUd6/CRQ8QXAE="; + hash = "sha256-o6f/UmTlvKUuiuVHu/0HYbcklSMNQ40FtsCRW+YZsOI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index b81ff0065277d..6b96d06ea482b 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -1,23 +1,46 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, aiohttp, python-socks, attrs }: +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder + +# build-system +, setuptools + +# dependencies +, aiohttp +, attrs +, python-socks +}: buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.8.3"; - format = "setuptools"; + version = "0.8.4"; + pyproject = true; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-aqtSj2aeCHMBj9N3c7gzouK6KEJDvmcoF/pAG8eUHsY="; + hash = "sha256-a2EdTOg46c8sL+1eDbpEfMhIJKbLqV3FdHYGIB2kbLQ="; }; - propagatedBuildInputs = [ aiohttp attrs python-socks ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + attrs + python-socks + ]; # Checks needs internet access doCheck = false; - pythonImportsCheck = [ "aiohttp_socks" ]; - disabled = pythonOlder "3.5.3"; + pythonImportsCheck = [ + "aiohttp_socks" + ]; meta = { description = "SOCKS proxy connector for aiohttp"; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index ebbcf6ea82a41..691345d65a163 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -1,15 +1,15 @@ { lib , stdenv , buildPythonPackage -, fetchPypi -, fetchpatch , pythonOlder +, fetchFromGitHub +, substituteAll +, llhttp # build_requires +, cython , setuptools -, wheel # install_requires , attrs -, charset-normalizer , multidict , async-timeout , yarl @@ -17,70 +17,74 @@ , aiosignal , aiodns , brotli -, faust-cchardet -, typing-extensions # tests_require -, async-generator -, freezegun , gunicorn , pytest-mock , pytestCheckHook +, python-on-whales , re-assert +, time-machine , trustme }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.6"; - format = "pyproject"; + version = "3.9.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sM8qRQG/+TMKilJItM6VGFHkFb3M6dwVjnbP1V4VCFw="; + src = fetchFromGitHub { + owner = "aio-libs"; + repo = "aiohttp"; + rev = "refs/tags/v${version}"; + hash = "sha256-uiqBUDbmROrhkanfBz4avvTSrnKxgVqw54k4jKhfRGY="; }; patches = [ - (fetchpatch { - # https://github.com/aio-libs/aiohttp/pull/7260 - # Merged upstream, should be dropped once updated to 3.9.0 - url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; - hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; + (substituteAll { + src = ./unvendor-llhttp.patch; + llhttpDev = lib.getDev llhttp; + llhttpLib = lib.getLib llhttp; }) ]; postPatch = '' sed -i '/--cov/d' setup.cfg + + rm -r vendor + patchShebangs tools + touch .git # tools/gen.py uses .git to find the project root ''; nativeBuildInputs = [ + cython setuptools - wheel ]; + preBuild = '' + make cythonize + ''; + propagatedBuildInputs = [ attrs - charset-normalizer multidict async-timeout yarl - typing-extensions frozenlist aiosignal aiodns brotli - faust-cchardet ]; # NOTE: pytest-xdist cannot be added because it is flaky. See https://github.com/NixOS/nixpkgs/issues/230597 for more info. nativeCheckInputs = [ - async-generator - freezegun gunicorn pytest-mock pytestCheckHook + python-on-whales re-assert + time-machine ] ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ # Optional test dependency. Depends indirectly on pyopenssl, which is # broken on aarch64-darwin. @@ -100,6 +104,8 @@ buildPythonPackage rec { "test_static_file_if_none_match" "test_static_file_if_match" "test_static_file_if_modified_since_past_date" + # don't run benchmarks + "test_import_time" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.isDarwin [ @@ -108,15 +114,15 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - "test_proxy_functional.py" # FIXME package proxy.py + "tests/test_proxy_functional.py" # FIXME package proxy.py ]; __darwinAllowLocalNetworking = true; # aiohttp in current folder shadows installed version - # Probably because we run `python -m pytest` instead of `pytest` in the hook. preCheck = '' - cd tests + rm -r aiohttp + touch tests/data.unknown_mime_type # has to be modified after 1 Jan 1990 '' + lib.optionalString stdenv.isDarwin '' # Work around "OSError: AF_UNIX path too long" export TMPDIR="/tmp" diff --git a/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch b/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch new file mode 100644 index 0000000000000..49b3e9154ded3 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch @@ -0,0 +1,60 @@ +diff --git a/Makefile b/Makefile +index 5769d2a1..f505dd81 100644 +--- a/Makefile ++++ b/Makefile +@@ -71,7 +71,7 @@ vendor/llhttp/node_modules: vendor/llhttp/package.json + generate-llhttp: .llhttp-gen + + .PHONY: cythonize +-cythonize: .install-cython $(PYXS:.pyx=.c) ++cythonize: $(PYXS:.pyx=.c) + + .install-deps: .install-cython $(PYXS:.pyx=.c) $(call to-hash,$(CYS) $(REQS)) + @python -m pip install -r requirements/dev.txt -c requirements/constraints.txt +diff --git a/aiohttp/_cparser.pxd b/aiohttp/_cparser.pxd +index 165dd61d..bc6bf86d 100644 +--- a/aiohttp/_cparser.pxd ++++ b/aiohttp/_cparser.pxd +@@ -10,7 +10,7 @@ from libc.stdint cimport ( + ) + + +-cdef extern from "../vendor/llhttp/build/llhttp.h": ++cdef extern from "@llhttpDev@/include/llhttp.h": + + struct llhttp__internal_s: + int32_t _index +diff --git a/setup.py b/setup.py +index 4d59a022..d87d5b69 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,13 +17,6 @@ if sys.implementation.name != "cpython": + NO_EXTENSIONS = True + + +-if IS_GIT_REPO and not (HERE / "vendor/llhttp/README.md").exists(): +- print("Install submodules when building from git clone", file=sys.stderr) +- print("Hint:", file=sys.stderr) +- print(" git submodule update --init", file=sys.stderr) +- sys.exit(2) +- +- + # NOTE: makefile cythonizes all Cython modules + + extensions = [ +@@ -33,12 +26,11 @@ extensions = [ + [ + "aiohttp/_http_parser.c", + "aiohttp/_find_header.c", +- "vendor/llhttp/build/c/llhttp.c", +- "vendor/llhttp/src/native/api.c", +- "vendor/llhttp/src/native/http.c", + ], + define_macros=[("LLHTTP_STRICT_MODE", 0)], +- include_dirs=["vendor/llhttp/build"], ++ include_dirs=["@llhttpDev@/include"], ++ library_dirs=["@llhttpLib@/lib"], ++ libraries=["llhttp"], + ), + Extension("aiohttp._helpers", ["aiohttp/_helpers.c"]), + Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]), diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 1061b4f777a72..b4ccb7b7fb4e2 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiojobs"; - version = "1.2.0"; + version = "1.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiojobs"; rev = "refs/tags/v${version}"; - hash = "sha256-/+PTHLrZyf2UuYkLWkNgzf9amFywDJnP2OKVWvARcAA="; + hash = "sha256-LwFXb/SHP6bbqPg1tqYwE03FKHf4Mv1PPOxnPdESH0I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index c99a317d2ca1b..2d8f1835554ad 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -2,8 +2,8 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub -, fetchpatch , poetry-core , pydantic , pytest-aiohttp @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2023.05.5"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,30 +23,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o="; + rev = "refs/tags/${version}"; + hash = "sha256-SxlMsntiG/geDDWDx5dyXkDaOkTEaDJI2zHlv4/+SDQ="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aionotion/pull/269 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp + certifi pydantic ]; @@ -71,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for Notion Home Monitoring"; homepage = "https://github.com/bachya/aionotion"; + changelog = "https://github.com/bachya/aionotion/releases/tag/${src.rev}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix index 91c71fb2bcd61..0c0e512dae984 100644 --- a/pkgs/development/python-modules/aiooss2/default.nix +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-PwgbUZAuk2woEmLYDdWF5hTs19DASxxUv3Ga844ai7g="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonRelaxDeps = [ "aiohttp" "oss2" diff --git a/pkgs/development/python-modules/aiopurpleair/default.nix b/pkgs/development/python-modules/aiopurpleair/default.nix index bdbc83fd2ab3e..47a27c5742d36 100644 --- a/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/pkgs/development/python-modules/aiopurpleair/default.nix @@ -2,8 +2,8 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub -, fetchpatch , poetry-core , pydantic , pytest-aiohttp @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiopurpleair"; - version = "2022.12.1"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,28 +23,9 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk="; + hash = "sha256-SNgdz3pnPyEH9qIi+aTBbEG6YBIXpwPYZuNJ4dEPLW8="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aiopurpleair/pull/207 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/aiopurpleair/commit/8c704c51ea50da266f52a7f53198d29d643b30c5.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pydantic = "^1.10.2"' 'pydantic = "*"' - ''; - nativeBuildInputs = [ poetry-core ]; @@ -52,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp pydantic + certifi ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aiopurpleair/pydantic_2-compatibility.patch b/pkgs/development/python-modules/aiopurpleair/pydantic_2-compatibility.patch new file mode 100644 index 0000000000000..090014778fa62 --- /dev/null +++ b/pkgs/development/python-modules/aiopurpleair/pydantic_2-compatibility.patch @@ -0,0 +1,111 @@ +diff --git a/aiopurpleair/api.py b/aiopurpleair/api.py +index d3b276b..c557015 100644 +--- a/aiopurpleair/api.py ++++ b/aiopurpleair/api.py +@@ -5,7 +5,10 @@ from typing import Any, cast + + from aiohttp import ClientSession, ClientTimeout + from aiohttp.client_exceptions import ClientError +-from pydantic import BaseModel, ValidationError ++try: ++ from pydantic.v1 import BaseModel, ValidationError ++except ModuleNotFoundError: ++ from pydantic import BaseModel, ValidationError + + from aiopurpleair.const import LOGGER + from aiopurpleair.endpoints.sensors import SensorsEndpoints +diff --git a/aiopurpleair/endpoints/__init__.py b/aiopurpleair/endpoints/__init__.py +index 4d263e1..6632310 100644 +--- a/aiopurpleair/endpoints/__init__.py ++++ b/aiopurpleair/endpoints/__init__.py +@@ -4,7 +4,10 @@ from __future__ import annotations + from collections.abc import Awaitable, Callable, Iterable + from typing import Any + +-from pydantic import BaseModel, ValidationError ++try: ++ from pydantic.v1 import BaseModel, ValidationError ++except ModuleNotFoundError: ++ from pydantic import BaseModel, ValidationError + + from aiopurpleair.errors import InvalidRequestError + from aiopurpleair.helpers.typing import ModelT +diff --git a/aiopurpleair/helpers/typing.py b/aiopurpleair/helpers/typing.py +index 4ae01e6..49f59e6 100644 +--- a/aiopurpleair/helpers/typing.py ++++ b/aiopurpleair/helpers/typing.py +@@ -1,6 +1,9 @@ + """Define typing helpers.""" + from typing import TypeVar + +-from pydantic import BaseModel ++try: ++ from pydantic.v1 import BaseModel ++except ModuleNotFoundError: ++ from pydantic import BaseModel + + ModelT = TypeVar("ModelT", bound=BaseModel) +diff --git a/aiopurpleair/models/keys.py b/aiopurpleair/models/keys.py +index 591ae01..ffadbcc 100644 +--- a/aiopurpleair/models/keys.py ++++ b/aiopurpleair/models/keys.py +@@ -3,7 +3,10 @@ from __future__ import annotations + + from datetime import datetime + +-from pydantic import BaseModel, validator ++try: ++ from pydantic.v1 import BaseModel, validator ++except ModuleNotFoundError: ++ from pydantic import BaseModel, validator + + from aiopurpleair.backports.enum import StrEnum + from aiopurpleair.helpers.validators import validate_timestamp +diff --git a/aiopurpleair/models/sensors.py b/aiopurpleair/models/sensors.py +index 5b99b51..d435996 100644 +--- a/aiopurpleair/models/sensors.py ++++ b/aiopurpleair/models/sensors.py +@@ -5,7 +5,10 @@ from __future__ import annotations + from datetime import datetime + from typing import Any, Optional + +-from pydantic import BaseModel, root_validator, validator ++try: ++ from pydantic.v1 import BaseModel, root_validator, validator ++except ModuleNotFoundError: ++ from pydantic import BaseModel, root_validator, validator + + from aiopurpleair.const import SENSOR_FIELDS, ChannelFlag, ChannelState, LocationType + from aiopurpleair.helpers.validators import validate_timestamp +diff --git a/tests/models/test_keys.py b/tests/models/test_keys.py +index 0d7d7c8..b2e30c1 100644 +--- a/tests/models/test_keys.py ++++ b/tests/models/test_keys.py +@@ -5,7 +5,10 @@ from datetime import datetime + from typing import Any + + import pytest +-from pydantic import ValidationError ++try: ++ from pydantic.v1 import ValidationError ++except ModuleNotFoundError: ++ from pydantic import ValidationError + + from aiopurpleair.models.keys import ApiKeyType, GetKeysResponse + +diff --git a/tests/models/test_sensors.py b/tests/models/test_sensors.py +index a984b36..7b2c84f 100644 +--- a/tests/models/test_sensors.py ++++ b/tests/models/test_sensors.py +@@ -5,7 +5,10 @@ from datetime import datetime + from typing import Any + + import pytest +-from pydantic import ValidationError ++try: ++ from pydantic.v1 import ValidationError ++except ModuleNotFoundError: ++ from pydantic import ValidationError + + from aiopurpleair.models.sensors import ( + GetSensorsRequest, diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 055239052ddb8..710421cd366ee 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiopvapi"; - version = "2.0.4"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sander76"; repo = "aio-powerview-api"; rev = "refs/tags/v${version}"; - hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M="; + hash = "sha256-+jhfp8gLEmL8TGPPN7QY8lw1SkV4sMSDb4VSq2OJ6PU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 9aeb06a1382d8..fc0fe63de4e5b 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -7,24 +7,31 @@ , pyopenssl , pytestCheckHook , pythonOlder +, setuptools +, service-identity }: buildPythonPackage rec { pname = "aioquic"; - version = "0.9.21"; - format = "setuptools"; + version = "0.9.23"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ecfsBjGOeFYnZlyk6HI63zR7ciW30AbjMtJXWh9RbvU="; + hash = "sha256-UsnaYO0IN/6LimoNfc8N++vsjpoCfhDr9yBPBWnFj6g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ certifi pylsqpack pyopenssl + service-identity ]; buildInputs = [ diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 572d88044356d..6cbcad24bdc4c 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -1,33 +1,43 @@ { lib -, aiohttp , buildPythonPackage -, ddt , fetchPypi -, pbr -, pytestCheckHook , pythonOlder + +# build-system +, pbr , setuptools + +# dependencies +, aiohttp + +# tests +, ddt +, pytestCheckHook }: buildPythonPackage rec { pname = "aioresponses"; - version = "0.7.4"; - format = "setuptools"; + version = "0.7.6"; + pyproject = true; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-m4wQizY1TARjO60Op1K1XZVqdgL+PjI0uTn8RK+W8dg="; + hash = "sha256-95XZ29otYXdIQOfjL1Nm9FdS0a3Bt0yTYq/QFylsfuE="; }; nativeBuildInputs = [ pbr + setuptools ]; propagatedBuildInputs = [ aiohttp - setuptools + ]; + + pythonImportsCheck = [ + "aioresponses" ]; nativeCheckInputs = [ @@ -41,10 +51,6 @@ buildPythonPackage rec { "test_pass_through_with_origin_params" ]; - pythonImportsCheck = [ - "aioresponses" - ]; - meta = { description = "A helper to mock/fake web requests in python aiohttp package"; homepage = "https://github.com/pnuckowski/aioresponses"; diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index d96add82b7d26..63f14b1991315 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -2,6 +2,7 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub , freezegun , poetry-core @@ -35,6 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + certifi pyjwt pytz titlecase diff --git a/pkgs/development/python-modules/aiormq/default.nix b/pkgs/development/python-modules/aiormq/default.nix index 3a5b809c13feb..14c0d0f7b5133 100644 --- a/pkgs/development/python-modules/aiormq/default.nix +++ b/pkgs/development/python-modules/aiormq/default.nix @@ -6,9 +6,7 @@ , pytestCheckHook , pamqp , yarl -, setuptools , poetry-core -, aiomisc }: buildPythonPackage rec { @@ -20,13 +18,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mosquito"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-X5Uy1DGxvsyEFR1UgVYqxOX6mESLnNzQl7sVkvzjcw4="; + repo = "aiormq"; + # https://github.com/mosquito/aiormq/issues/189 + rev = "72c44f55313fc14e2a760a45a09831237b64c48d"; + hash = "sha256-IIlna8aQY6bIA7OZHthfvMFFWnf3DDRBP1uiFCD7+Do="; }; nativeBuildInputs = [ - setuptools poetry-core ]; diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix index 0fc144ac6f2b3..84813ff04c970 100644 --- a/pkgs/development/python-modules/aioshutil/default.nix +++ b/pkgs/development/python-modules/aioshutil/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-XIGjiLjoyS/7vUDIyBPvHNMyHOBa0gsg/c/vGgrhZAg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 4358c22f8be02..0456138379027 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast +, setuptools , nose , coverage -, isPy27 , wrapt }: buildPythonPackage rec { pname = "aiounittest"; version = "1.4.2"; - format = "setuptools"; - disabled = isPy27; + pyproject = true; + + # requires the imp module + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "kwarunek"; @@ -20,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-7lDOI1SHPpRZLTHRTmfbKlZH18T73poJdFyVmb+HKms="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/aiowatttime/default.nix b/pkgs/development/python-modules/aiowatttime/default.nix index fd5da5c330d56..1b6866b654b48 100644 --- a/pkgs/development/python-modules/aiowatttime/default.nix +++ b/pkgs/development/python-modules/aiowatttime/default.nix @@ -2,49 +2,38 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub -, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio , pytestCheckHook , pythonOlder +, yarl }: buildPythonPackage rec { pname = "aiowatttime"; - version = "2023.08.0"; + version = "2023.10.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/ulDImbLOTcoA4iH8e65A01aqqnCLn+01DWuM/4H4p4="; + hash = "sha256-3cVs/mIMkHx5jyfICL+I9pOr0uCV2uzasrEcAN4UFGg="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aiowatttime/pull/206 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/aiowatttime/commit/c3cd53f794964c5435148caacd04f4e0ab8f550a.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp + certifi + yarl ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 36a6bb79bc271..19f646816b126 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.12.0"; + version = "1.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-jnZFwy5PIAZ15p8HRUFTNetZo2Y/X+tIer+gswxFiIs="; + hash = "sha256-q0s7lNLh5fgeNL6Km3t1dfyd1TmPzLC+81HsmxSHJiM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index e69de9cfea339..6e28c5da99787 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.11.2"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { rev = "refs/tags/v${version}"; # Test vectors require git submodule fetchSubmodules = true; - hash = "sha256-0/+bX02qTbOydWDxex4OWL7woP7dW1yJZBmDZAivE7U="; + hash = "sha256-wA24ASd6+rTAqHNQ9ZGMnCK9ykJjogCtEWfrXY1B87o="; }; postPatch = '' diff --git a/pkgs/development/python-modules/amberelectric/default.nix b/pkgs/development/python-modules/amberelectric/default.nix index 1f1422a6b36a0..ac32a8cc7824c 100644 --- a/pkgs/development/python-modules/amberelectric/default.nix +++ b/pkgs/development/python-modules/amberelectric/default.nix @@ -5,21 +5,26 @@ , pytestCheckHook , python-dateutil , pythonOlder +, setuptools , urllib3 }: buildPythonPackage rec { pname = "amberelectric"; - version = "1.0.4"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk="; + hash = "sha256-HujjqJ3nkPIj8P0qAiQnQzLhji5l8qOAO2Gh53OJ7UY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ urllib3 python-dateutil @@ -30,7 +35,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "amberelectric" ]; + pythonImportsCheck = [ + "amberelectric" + ]; meta = with lib; { description = "Python Amber Electric API interface"; diff --git a/pkgs/development/python-modules/amqtt/default.nix b/pkgs/development/python-modules/amqtt/default.nix index b25c1fa46ed25..0daef6d77aa02 100644 --- a/pkgs/development/python-modules/amqtt/default.nix +++ b/pkgs/development/python-modules/amqtt/default.nix @@ -2,13 +2,13 @@ , buildPythonPackage , docopt , fetchFromGitHub -, fetchpatch , hypothesis , passlib , poetry-core , pytest-logdog , pytest-asyncio , pytestCheckHook +, pythonAtLeast , pythonOlder , pyyaml , setuptools @@ -60,6 +60,19 @@ buildPythonPackage rec { "--asyncio-mode=auto" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # stuck in epoll + "test_publish_qos0" + "test_publish_qos1" + "test_publish_qos1_retry" + "test_publish_qos2" + "test_publish_qos2_retry" + "test_receive_qos0" + "test_receive_qos1" + "test_receive_qos2" + "test_start_stop" + ]; + disabledTestPaths = [ # Test are not ported from hbmqtt yet "tests/test_client.py" diff --git a/pkgs/development/python-modules/ansible-vault-rw/default.nix b/pkgs/development/python-modules/ansible-vault-rw/default.nix index 23281c3ed0701..9e0005e04e858 100644 --- a/pkgs/development/python-modules/ansible-vault-rw/default.nix +++ b/pkgs/development/python-modules/ansible-vault-rw/default.nix @@ -1,15 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, ansible-core, ... }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, setuptools + +# dependencies +, ansible-core + +# tests +, pytestCheckHook +}: buildPythonPackage rec { pname = "ansible-vault-rw"; version = "2.1.0"; - format = "setuptools"; + pyproject = true; + src = fetchPypi { pname = "ansible-vault"; inherit version; - sha256 = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4"; + hash = "sha256-XOj9tUcPFEm3a/B64qvFZIDa1INWrkBchbaG77ZNvV4"; }; - propagatedBuildInputs = [ ansible-core ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + ansible-core + ]; # Otherwise tests will fail to create directory # Permission denied: '/homeless-shelter' @@ -17,6 +37,13 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + # no tests in sdist, no 2.1.0 tag on git + doCheck = false; + + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "This project aim to R/W an ansible-vault yaml file."; homepage = "https://github.com/tomoh1r/ansible-vault"; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 5c08a0f5bf078..42f4d0032cfdf 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.6.0"; + version = "9.0.1"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-lfTlkydNWdU/NvYiB1NbfScq3CcBrHoO169qbYFjemA="; + hash = "sha256-zAbCUfFCg3z1QLeXdyRZapTz0P6dqWGRdeneZTnNBwU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 7e55912bed208..8dbfa99687c86 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast , pythonOlder , textwrap3 }: @@ -12,7 +13,7 @@ buildPythonPackage rec { version = "0.8.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 20daf71c8cda0..3b8ed13b1ad83 100644 --- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -19,12 +19,22 @@ buildPythonPackage rec { setuptools ]; + postPatch = '' + substituteInPlace tests/TestIntervalSet.py \ + --replace "assertEquals" "assertEqual" + ''; + # We use an asterisk because this expression is used also for old antlr # versions, where there the tests directory is `test` and not `tests`. # See e.g in package `baserow`. checkPhase = '' - cd test* + runHook preCheck + + pushd tests ${python.interpreter} run.py + popd + + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 06112cccdc3fb..f645a416e8344 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -28,20 +28,18 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.0.0"; - format = "pyproject"; + version = "4.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "agronholm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gUFd2gHWIElYfzOvg7Yx7iJyhU6+iAcJpHTVsJtxTsk="; + hash = "sha256-PEDPliWJX3QypwsvJTAJhrQnJx8lWXQQSdyjN0I8L+I="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm @@ -64,13 +62,13 @@ buildPythonPackage rec { doCheck = !(stdenv.isDarwin && stdenv.isAarch64); nativeCheckInputs = [ + exceptiongroup hypothesis psutil pytest-mock pytest-xdist pytestCheckHook trustme - ] ++ lib.optionals (pythonOlder "3.12") [ uvloop ] ++ passthru.optional-dependencies.trio; diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix index bff63bb84b79a..bd53a6f0b48aa 100644 --- a/pkgs/development/python-modules/apache-beam/default.nix +++ b/pkgs/development/python-modules/apache-beam/default.nix @@ -39,6 +39,7 @@ , requests , requests-mock , scikit-learn +, setuptools , sqlalchemy , tenacity , testcontainers @@ -48,14 +49,14 @@ buildPythonPackage rec { pname = "apache-beam"; - version = "2.50.0"; - format = "setuptools"; + version = "2.52.0"; + pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "refs/tags/v${version}"; - hash = "sha256-qaxYWPVdMlegvH/W66UBoQbcQ5Ac/3DNoQs8xo+KfLc="; + hash = "sha256-s/DgTMsJc3c3dqR5Ak9p+xmLm72uNL3AofGzR26B3nI="; }; patches = [ @@ -95,6 +96,7 @@ buildPythonPackage rec { grpcio-tools mypy-protobuf pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index 0edddd68be32a..b37c1b11fe6fe 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 1371cc72de3b3..5e755090c7413 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-vo10BHUzvYlldAqTw/1LxgvSXgTM3LAls9jQIeB5LcU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index bedd0f367851c..b248303862d50 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { ''; pythonRelaxDeps = [ + "msgpack" "semver" ]; diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix index 105f6a71c9153..5680b15530e96 100644 --- a/pkgs/development/python-modules/apricot-select/default.nix +++ b/pkgs/development/python-modules/apricot-select/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, nose , numba , numpy , pytestCheckHook @@ -26,6 +27,10 @@ buildPythonPackage rec { hash = "sha256-v9BHFxmlbwXVipPze/nV35YijdFBuka3gAl85AlsffQ="; }; + postPatch = '' + sed -i '/"nose"/d' setup.py + ''; + nativeBuildInputs = [ setuptools ]; @@ -38,6 +43,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + nose pytestCheckHook torchvision scikit-learn diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 59576a129d68d..aafdf6ac72b22 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.43.1.0"; + version = "3.44.2.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-x+bSft37DgF2tXXCL6ac86g1+mj/wJeDLoCSiVSXedA="; + hash = "sha256-H7aqZHU4SXNrfbv6iwHckkNm5MeGkro42+njSoFJgS4="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/archspec/default.nix b/pkgs/development/python-modules/archspec/default.nix index 5be16a16771f9..b6b4a5b606c34 100644 --- a/pkgs/development/python-modules/archspec/default.nix +++ b/pkgs/development/python-modules/archspec/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archspec"; - version = "0.2.1"; + version = "0.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = pname; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-2rMsxSAnPIVqvsbAUtBbHLb3AvrZFjGzxYO6A/1qXnY="; + hash = "sha256-6+1TiXCBqW8YH/ggZhRcZV/Tyh8Ku3ocwxf9z9KrCZY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 765a7848ac56a..7c5bf54369965 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index a03e441c8fdaa..2a0ba451d28ac 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "argh"; - version = "0.29.4"; + version = "0.30.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-aVwK5FNCcMriaXhBtKVvQ0qZBpSgAmTqEOu7zcAsE/c="; + hash = "sha256-n8qOacTa1PjSp7373YCwdURitTUQoD4bXPK0Oofm6WA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 0e0bf1140a64b..ecfb0c32bc46e 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.20.1"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v3CaLMTo/zbNEoE3K+aWnFTCgLetcnN7vOU/sFqLq2k="; + hash = "sha256-T5J0xAF33PDkC8sDOzHADpQJxwdXwKary0y/jaUJ9Fk="; }; patches = [ ./remove-opentracing.patch diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index 0497c542fe24a..0f3f99a8a1d57 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , pythonOlder +, pythonAtLeast , python , fetchPypi , absl-py @@ -16,7 +17,7 @@ buildPythonPackage rec { format = "wheel"; # As of 2023-10-31, PyPI includes wheels for Python 3.9, 3.10, and 3.11. - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; src = let pyShortVersion = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 1801900dcdeff..77aa1f6ca4ac0 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -2,8 +2,9 @@ , buildPythonPackage , fetchPypi , pythonOlder +, flit-core , python-dateutil -, typing-extensions +, types-python-dateutil , pytestCheckHook , pytest-mock , pytz @@ -12,14 +13,14 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.2.3"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OTSzDKG58pI3bZ2xWxlEYIjRLsWGKbw/DaKP1V+2M6E="; + hash = "sha256-1FQGF2SMtfiVcw8a2MgqZfLa0BZvV7dfPKVHWcTWeoU="; }; postPatch = '' @@ -27,8 +28,14 @@ buildPythonPackage rec { sed -i "/addopts/d" tox.ini ''; - propagatedBuildInputs = [ python-dateutil ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + python-dateutil + types-python-dateutil + ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index f4a45ecaf9ade..a6508229a3f0e 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -33,8 +33,6 @@ buildPythonPackage rec { hash = "sha256-u8e7ot5NDRqQFH0eLVnGinBQmQD73BlR5K9HVjA7SIg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - patches = [ # Fix default validation, https://github.com/asdf-format/asdf/pull/1203 (fetchpatch { diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 4822c5a16ac8d..58bfe11458dbc 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -1,22 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# tests , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "asn1crypto"; - version = "1.5.1"; - format = "setuptools"; + version = "1.5.1-unstable-2023-11-03"; + pyproject = true; # Pulling from Github to run tests src = fetchFromGitHub { owner = "wbond"; repo = "asn1crypto"; - rev = version; - hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; + # https://github.com/wbond/asn1crypto/issues/269 + rev = "b763a757bb2bef2ab63620611ddd8006d5e9e4a2"; + hash = "sha256-11WajEDtisiJsKQjZMSd5sDog3DuuBzf1PcgSY+uuXY="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aspectlib/default.nix b/pkgs/development/python-modules/aspectlib/default.nix index 70fd8e8db2e22..3f4a87e0a334e 100644 --- a/pkgs/development/python-modules/aspectlib/default.nix +++ b/pkgs/development/python-modules/aspectlib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -47,12 +47,16 @@ buildPythonPackage rec { "aspectlib.test" ]; - checkInputs = [ + nativeCheckInputs = [ process-tests pytestCheckHook tornado ]; + pytestFlagsArray = [ + "-W ignore::DeprecationWarning" + ]; + __darwinAllowLocalNetworking = true; meta = { diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 49abd982a0f0f..0fc6631dd5904 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-XIRDm/loZOOPQ7UO/XAo86TzhtHHRrnWFU7MNI4f1vM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.cfg \ --replace " --cov=asteval --cov-report xml" "" diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 5fd0a5281b2c0..6d5c11104315f 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -2,55 +2,38 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, isPyPy -, lazy-object-proxy , setuptools -, wheel , typing-extensions -, typed-ast , pip , pylint , pytestCheckHook -, wrapt }: buildPythonPackage rec { pname = "astroid"; - version = "2.15.6"; # Check whether the version is compatible with pylint - format = "pyproject"; + version = "3.0.1"; # Check whether the version is compatible with pylint + pyproject = true; - disabled = pythonOlder "3.7.2"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "PyCQA"; - repo = pname; + repo = "astroid"; rev = "refs/tags/v${version}"; - hash = "sha256-0oNNEVD8rYGkM11nGUD+XMwE7xgk7mJIaplrAXaECFg="; + hash = "sha256-z6FmB3I3VmiIx0MSsrkvHmDVv2h3CaaeXlDG3DewGXw="; }; nativeBuildInputs = [ setuptools - wheel ]; - propagatedBuildInputs = [ - lazy-object-proxy - wrapt - ] ++ lib.optionals (pythonOlder "3.11") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ typing-extensions - ] ++ lib.optionals (!isPyPy && pythonOlder "3.8") [ - typed-ast ]; nativeCheckInputs = [ pip pytestCheckHook - typing-extensions - ]; - - disabledTests = [ - # DeprecationWarning: Deprecated call to `pkg_resources.declare_namespace('tests.testdata.python3.data.path_pkg_resources_1.package')`. - "test_identify_old_namespace_package_protocol" ]; passthru.tests = { @@ -62,6 +45,6 @@ buildPythonPackage rec { description = "An abstract syntax tree for Python with inference support"; homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix index d02ed1236154e..9f7280185aedd 100644 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -6,16 +6,18 @@ , pytestCheckHook , pythonOlder , pip +, setuptools , setuptools-scm +, tomli , wheel }: buildPythonPackage rec { pname = "extension-helpers"; version = "1.1.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -33,10 +35,15 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools setuptools-scm wheel ]; + propagatedBuildInputs = [ + tomli + ]; + nativeCheckInputs = [ findutils pip diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 6944ee4d8683e..c081463632171 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -6,6 +6,7 @@ , numpy , astropy , astropy-extension-helpers +, setuptools , setuptools-scm , pytestCheckHook , pytest-doctestplus @@ -14,13 +15,13 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "1.0.0"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - hash = "sha256-9ILvYqEOaGMD84xm8I3xe53e5a2CIZwjVx7oDXar7qM="; + hash = "sha256-74k4vfcpdXw4CowXNHlNc3StAOB2f8Si+mOma+8SYkI="; }; patches = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-extension-helpers + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/astropy-iers-data/default.nix b/pkgs/development/python-modules/astropy-iers-data/default.nix new file mode 100644 index 0000000000000..4089c6bc6cce1 --- /dev/null +++ b/pkgs/development/python-modules/astropy-iers-data/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, wheel +}: + +buildPythonPackage rec { + pname = "astropy-iers-data"; + version = "0.2023.12.04.00.30.20"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "astropy"; + repo = "astropy-iers-data"; + rev = "refs/tags/v${version}"; + hash = "sha256-r4YCBeAyqzwQghLK56d+nJ/TkoSIHmtiW5Gi5xXM2QM="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + pythonImportsCheck = [ "astropy_iers_data" ]; + + # no tests + doCheck = false; + + meta = with lib; { + description = "IERS data maintained by @astrofrog and astropy.utils.iers maintainers"; + homepage = "https://github.com/astropy/astropy-iers-data"; + license = licenses.bsd3; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 0a70e40e9e8a0..4814e1e70c40b 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -1,12 +1,11 @@ { lib , fetchPypi -, fetchpatch , buildPythonPackage , pythonOlder # build time , astropy-extension-helpers -, cython +, cython_3 , jinja2 , oldest-supported-numpy , setuptools-scm @@ -15,9 +14,9 @@ , pytestCheckHook , pytest-xdist , pytest-astropy -, python # runtime +, astropy-iers-data , numpy , packaging , pyerfa @@ -26,26 +25,19 @@ buildPythonPackage rec { pname = "astropy"; - version = "5.3.4"; - format = "pyproject"; + version = "6.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-1JD34vqsLMwBySRCAtYpFUJZr4qXkQTO2J3ErOTm8dg="; + hash = "sha256-A82AGlUwXaUjzY14DXY1n1clXc3Fn+C91x/VFU/Hd9k="; }; - # Relax cython dependency to allow this to build, upstream only doesn't - # support cython 3 as of writing. See: - # https://github.com/astropy/astropy/issues/15315 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'cython==' 'cython>=' - ''; nativeBuildInputs = [ astropy-extension-helpers - cython + cython_3 jinja2 oldest-supported-numpy setuptools-scm @@ -53,6 +45,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + astropy-iers-data numpy packaging pyerfa diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 452abd626e0bd..53fe96ff4d03b 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "asttokens"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-LgFxuZGyyVmsxsSTGASSNoRKXaHWW6JnLEiAwciUg04="; + hash = "sha256-sDhpcYuppusCfhNL/fafOKI21oHIPBYNUQdorxElS6A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-generator/default.nix b/pkgs/development/python-modules/async-generator/default.nix index 5ddb6df48ee92..92c281580d9e8 100644 --- a/pkgs/development/python-modules/async-generator/default.nix +++ b/pkgs/development/python-modules/async-generator/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , pytestCheckHook }: @@ -22,6 +23,10 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + "test_aclose_on_unstarted_generator" + ]; + pythonImportsCheck = [ "async_generator" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/async-tkinter-loop/default.nix b/pkgs/development/python-modules/async-tkinter-loop/default.nix index d376ec154263c..9d469ca43bc06 100644 --- a/pkgs/development/python-modules/async-tkinter-loop/default.nix +++ b/pkgs/development/python-modules/async-tkinter-loop/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "async-tkinter-loop"; - version = "0.9.2"; + version = "0.9.3"; format = "pyproject"; src = fetchPypi { inherit version; pname = "async_tkinter_loop"; - hash = "sha256-YwmW+zXAx9TAxgoRLEr7/3o1rrO4eSNScuoTh3ud2Vo="; + hash = "sha256-UJxBgTmEe8suR6WmttJKLi3KKQvEaNrWtrgCnoqGW/0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index 48ba646b74127..2d0066a86e13e 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/asyncio-mqtt/default.nix b/pkgs/development/python-modules/asyncio-mqtt/default.nix index 8274f5493967a..309e74ba4cc1b 100644 --- a/pkgs/development/python-modules/asyncio-mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio-mqtt/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-f3JqocjOEwNjo6Uv17ij6oEdrjb6Z2wTzdhdVhx46iM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm @@ -65,6 +63,9 @@ buildPythonPackage rec { "test_multiple_messages_generators" ]; + # newer version are packaged as aiomqtt + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Idomatic asyncio wrapper around paho-mqtt"; homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 9e43c0494d149..88591af61bbd8 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.28.0"; + version = "0.29.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-clLNw6yy9S/qo2ZCgNO814pGvWwQv9aBrP/++hEg4ng="; + hash = "sha256-0cSeH0T/+v2aVeGpsQFZCFnYgdY56ikiUW9dnFEtNU4="; }; # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index 4232716d48292..b6be40bc6c93c 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-NXjvRVYcWU9p7b8y2ICOzYe6TeMh1S70Edy/JvTG7a4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index 69da14683a095..50c64394d89da 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -1,18 +1,43 @@ -{ lib, fetchFromGitHub, buildPythonPackage, beautifulsoup4, httpx, pbkdf2, pillow, pyaes, rsa }: +{ lib +, fetchFromGitHub +, buildPythonPackage + +# build-system +, setuptools + +# dependencies +, beautifulsoup4 +, httpx +, pbkdf2 +, pillow +, pyaes +, rsa +}: buildPythonPackage rec { pname = "audible"; - version = "0.8.2"; - format = "setuptools"; + version = "0.9.1"; + pyproject = true; src = fetchFromGitHub { owner = "mkb79"; repo = "Audible"; rev = "refs/tags/v${version}"; - hash = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY="; + hash = "sha256-qLU8FjJBPKFgjpumPqRiiMBwZi+zW46iEmWM8UerMgs="; }; - propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + httpx + pbkdf2 + pillow + pyaes + rsa + ]; postPatch = '' sed -i "s/httpx.*/httpx',/" setup.py diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix index f3e74462f42e1..851839f0a7976 100644 --- a/pkgs/development/python-modules/audioread/default.nix +++ b/pkgs/development/python-modules/audioread/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, flit-core }: buildPythonPackage rec { pname = "audioread"; - version = "3.0.0"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-EhmVvSB+sf2j1Wa+uFHTU0J1klvDWk+22gyxHeD3JRo="; + hash = "sha256-rFRgpUmMSL3y6OdnQCWDpNzRP0QU0ob0LOQ3nos1Bm0="; }; + nativeBuildInputs = [ + flit-core + ]; + # No tests, need to disable or py3k breaks doCheck = false; diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index 03f2cb571b155..7f0540b6d0969 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -3,14 +3,17 @@ , aioresponses , buildPythonPackage , callee +, cryptography , fetchFromGitHub , mock , poetry-core , poetry-dynamic-versioning , pyjwt +, pyopenssl , pytestCheckHook , pythonOlder , requests +, urllib3 }: buildPythonPackage rec { @@ -33,8 +36,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - requests + aiohttp + cryptography pyjwt + pyopenssl + requests + urllib3 ] ++ pyjwt.optional-dependencies.crypto; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/autocommand/default.nix b/pkgs/development/python-modules/autocommand/default.nix index eeee08ec4927f..11ee55d6417df 100644 --- a/pkgs/development/python-modules/autocommand/default.nix +++ b/pkgs/development/python-modules/autocommand/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook , pythonOlder }: @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "autocommand"; version = "2.2.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +20,15 @@ buildPythonPackage rec { hash = "sha256-9bv9Agj4RpeyNJvTLUaMwygQld2iZZkoLb81rkXOd3E="; }; + postPatch = '' + # _MissingDynamic: `license` defined outside of `pyproject.toml` is ignored. + rm setup.py + ''; + + nativeBuildInputs = [ + setuptools + ]; + # fails with: SyntaxError: invalid syntax doCheck = false; diff --git a/pkgs/development/python-modules/autopage/default.nix b/pkgs/development/python-modules/autopage/default.nix index 0973220438ae8..c8fbd6b9473df 100644 --- a/pkgs/development/python-modules/autopage/default.nix +++ b/pkgs/development/python-modules/autopage/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "autopage"; - version = "0.5.1"; + version = "0.5.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Ab4+5hu3FOkJD8xcEPTPVGw5YzHGIMauUKIyGyjtMZk="; + hash = "sha256-gmmW10xaqfS2kWGVVHMSrGOEusOBC4UXBj8pMkgle3I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix index acb2ea9c99985..c0edd6033de7e 100644 --- a/pkgs/development/python-modules/avidtools/default.nix +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -6,7 +6,6 @@ , pydantic , pythonOlder , setuptools -, typing , typing-extensions }: @@ -22,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-t+ohPjOBwY8i+g7VC30ehEu6SFIsn1SwGR/ICkV9blg="; }; + postPatch = '' + sed -i "/'typing'/d" setup.py + ''; + nativeBuildInputs = [ setuptools ]; @@ -30,7 +33,6 @@ buildPythonPackage rec { datetime nvdlib pydantic - typing typing-extensions ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index e59a7d4750793..4158600e182f4 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "avro"; - version = "1.11.2"; + version = "1.11.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-U9zVv/zLmnITbwjQsYdxeV6vTu+wKLuq7V9OF4fw4mg="; + hash = "sha256-M5O7UTn5zweR0gV1bOHjmltYWGr1sVPWo7WhmWEOnRc="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 790a9c4bbb1dd..164b89ae4cc69 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -1,14 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder + +# build-system , poetry-core + +# tests +, pytest-snapshot , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { pname = "awesomeversion"; - version = "23.8.0"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,27 +22,28 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7JJNO25UfzLs1jEO7XpqFFuEqpY4UecUk25hpONRjrI="; + hash = "sha256-glnM32ha5eXVpoaDkEsbwdH1oiG9qMxFwbtqLx+Kl98="; }; - nativeBuildInputs = [ - poetry-core - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ --replace 'version = "0"' 'version = "${version}"' ''; + nativeBuildInputs = [ + poetry-core + ]; + pythonImportsCheck = [ "awesomeversion" ]; + nativeCheckInputs = [ + pytest-snapshot + pytestCheckHook + ]; + meta = with lib; { description = "Python module to deal with versions"; homepage = "https://github.com/ludeeus/awesomeversion"; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index a4d3fb4c838d6..b8f4b67c7c20b 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -11,6 +11,7 @@ , pyopenssl , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , requests-kerberos , toml @@ -32,6 +33,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "configparser" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 72930b85bb6d3..12e0a88035527 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -77,6 +77,8 @@ buildPythonPackage rec { "test_unexpected_sar_error_stops_processing" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/aws/serverless-application-model"; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index de02fdf8a88eb..53e69baa91820 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -14,6 +14,7 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , sqlalchemy , webtest , wrapt @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; version = "2.12.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -33,6 +34,10 @@ buildPythonPackage rec { hash = "sha256-NLFNst4Yqsz2u5IXwe8OdJPW77irLRO5tWWn1uV3tMg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ botocore jsonpickle diff --git a/pkgs/development/python-modules/awslambdaric/default.nix b/pkgs/development/python-modules/awslambdaric/default.nix index f63ed81b76fa9..3e20875ac15d5 100644 --- a/pkgs/development/python-modules/awslambdaric/default.nix +++ b/pkgs/development/python-modules/awslambdaric/default.nix @@ -11,20 +11,22 @@ , gcc , libtool , perl +, setuptools , simplejson }: buildPythonPackage rec { pname = "awslambdaric"; - version = "2.0.7"; - format = "setuptools"; + version = "2.0.8"; + pyproject = true; + disabled = isPy27; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-python-runtime-interface-client"; rev = "refs/tags/${version}"; - sha256 = "sha256-9PgdLzeSafglguXksMetzopbDlBWlGDSSXiZHfuWgE8="; + sha256 = "sha256-0ej+Gy9nF96SaGhohHF9EJObSpHdxIe9QXHNHejVwbQ="; }; patches = [ @@ -42,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson ]; - nativeBuildInputs = [ autoconf automake cmake libtool perl ]; + nativeBuildInputs = [ autoconf automake cmake libtool perl setuptools ]; buildInputs = [ gcc ]; diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index 1a4da01df6d43..105adef1efe40 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ax"; - version = "0.3.4"; + version = "0.3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "facebook"; repo = pname; - rev = version; - hash = "sha256-Yc6alEKXbtQ0hitIdPhkJWhZQg150b0NJJRLZ+f1hdY="; + rev = "refs/tags/${version}"; + hash = "sha256-AMnE5bHBUyfMGBxfhkByHY0dC/ft1/QLZgRGk0TyN10="; }; nativeBuildInputs = [ @@ -44,8 +44,6 @@ buildPythonPackage rec { typeguard ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ hypothesis mercurial diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index e0846bc605143..dfca02bc5b3f5 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-storage-blob"; - version = "12.18.2"; + version = "12.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4Rk1NImB/8AFuEi1XbJcBPLR+Q4e4zAAZZkGt2PPFMg="; + hash = "sha256-JsCkMgo0o8Kht0UoumgS68tjKgTNZ7HHN3IyxLAaWJc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index 0664362dd167b..3aaeec64280f3 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -11,15 +11,15 @@ , pytest-mock , pythonOlder , requests +, setuptools , setuptools-scm -, tqdm , typing-extensions }: buildPythonPackage rec { pname = "b2sdk"; version = "1.29.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -29,6 +29,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/babel/default.nix b/pkgs/development/python-modules/babel/default.nix index a97224b5c8604..97dfc7a1daf2c 100644 --- a/pkgs/development/python-modules/babel/default.nix +++ b/pkgs/development/python-modules/babel/default.nix @@ -4,27 +4,34 @@ , isPyPy , pythonAtLeast , pythonOlder -, tzdata + +# build-system +, setuptools # tests , freezegun , pytestCheckHook , pytz +, tzdata }: buildPythonPackage rec { pname = "babel"; - version = "2.12.1"; - format = "setuptools"; + version = "2.14.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Babel"; inherit version; - hash = "sha256-zC2ZmZzQHURCCuclohyeNxGzqtx5dtYUf2IthYGWNFU="; + hash = "sha256-aRmGfbA2OYuiHrXHoPayirjLw656c6ROvjSudKTn02M="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ pytz ]; diff --git a/pkgs/development/python-modules/backports-cached-property/default.nix b/pkgs/development/python-modules/backports-cached-property/default.nix index 27ad57237063a..dcce9b5fc6f0b 100644 --- a/pkgs/development/python-modules/backports-cached-property/default.nix +++ b/pkgs/development/python-modules/backports-cached-property/default.nix @@ -17,8 +17,6 @@ buildPythonPackage rec { hash = "sha256-rdgKbVQaELilPrN4ve8RbbaLiT14Xex0esy5vUX2ZBc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index 88e140ad82f5c..febf3d50bb4f3 100644 --- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -1,25 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# tests , pytz -, unittestCheckHook +, pytestCheckHook }: buildPythonPackage rec { pname = "backports-datetime-fromisoformat"; - version = "2.0.0"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "movermeyer"; repo = "backports.datetime_fromisoformat"; rev = "refs/tags/v${version}"; - hash = "sha256-aHF3E/fLN+j/T4W9lvuVSMy6iRSEn+ARWmL01rY+ixs="; + hash = "sha256-c3LCTOKva99+x96iLHNnL1e1Ft1M1CsjQX+nEqAlXUs="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytz - unittestCheckHook + pytestCheckHook + ]; + + disabledTestPaths = [ + # ModuleNotFoundError: No module named 'developmental_release' + "release/test_developmental_release.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 9804dd20f576c..9a30c1bbd6a94 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , wheel , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -11,7 +12,8 @@ buildPythonPackage rec { version = "0.18.6"; format = "setuptools"; - disabled = pythonOlder "3.9"; + # uses the removed asyncore module + disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "JoelBender"; diff --git a/pkgs/development/python-modules/bagit/default.nix b/pkgs/development/python-modules/bagit/default.nix index 7f671bb8a4704..0a07c39482db3 100644 --- a/pkgs/development/python-modules/bagit/default.nix +++ b/pkgs/development/python-modules/bagit/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { nativeBuildInputs = [ gettext setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeCheckInputs = [ mock pytestCheckHook diff --git a/pkgs/development/python-modules/barectf/default.nix b/pkgs/development/python-modules/barectf/default.nix index 429e03fbe9407..d2083c08fa60f 100644 --- a/pkgs/development/python-modules/barectf/default.nix +++ b/pkgs/development/python-modules/barectf/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , poetry-core , pytestCheckHook +, pythonRelaxDepsHook , setuptools , jsonschema , pyyaml @@ -22,8 +23,16 @@ buildPythonPackage rec { hash = "sha256-JelFfd3WS012dveNlIljhLdyPmgE9VEOXoZE3MBA/Gw="; }; - nativeBuildInputs = [ poetry-core ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "jsonschema" + "pyyaml" + "termcolor" + ]; propagatedBuildInputs = [ setuptools # needs pkg_resources at runtime @@ -33,7 +42,13 @@ buildPythonPackage rec { termcolor ]; - pythonImportsCheck = [ "barectf" ]; + pythonImportsCheck = [ + "barectf" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Generator of ANSI C tracers which output CTF data streams "; diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index df28d568b0103..93eb8d272887e 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -26,8 +26,14 @@ buildPythonPackage rec { hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs="; }; - propagatedBuildInputs = [ pyquaternion numpy ]; - buildInputs = [ poetry-core ]; + nativebuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyquaternion + numpy + ]; nativeCheckInputs = [ matplotlib @@ -36,7 +42,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "bbox" ]; + disabledTests = [ + # performance test, racy on busy machines + "test_multi_jaccard_index_2d_performance" + ]; + + pythonImportsCheck = [ + "bbox" + ]; meta = with lib; { description = "Python library for 2D/3D bounding boxes"; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index f0e23e713c3a1..fa440cc7fd2d1 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -5,10 +5,8 @@ , rustc , setuptools , setuptools-rust -, isPyPy , fetchPypi , pythonOlder -, cffi , pytestCheckHook , libiconv , stdenv @@ -51,14 +49,6 @@ buildPythonPackage rec { # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands. buildInputs = lib.optional stdenv.isDarwin libiconv; - propagatedBuildInputs = [ - cffi - ]; - - propagatedNativeBuildInputs = [ - cffi - ]; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index e65af66ba4497..04c6fe1444528 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -204,5 +204,7 @@ buildPythonPackage { changelog = "https://github.com/bentoml/BentoML/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ happysalada natsukium ]; + # https://github.com/bentoml/BentoML/issues/3885 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 115c80553cc5e..c70268dea0b54 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -2,20 +2,29 @@ , buildPythonPackage , fetchPypi , pythonOlder + +# build-system +, setuptools +, versioneer }: buildPythonPackage rec { pname = "bids-validator"; - version = "1.13.1"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cgXOTmj7oXIhUzLHhvGsFmUCW3Arbf8rHhWPAKLfmJA="; + hash = "sha256-M7D4ZcGqPjn7klGN8WP6a3lHjRqhAq9S/VNwSl7y6kY="; }; + nativeBuildInputs = [ + setuptools + versioneer + ]; + # needs packages which are not available in nixpkgs doCheck = false; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 6c641a16f9bea..15ccd234a7ac0 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.1.0"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; + hash = "sha256-mjwxhMsnWqF6cy+T9lsgxSXT2fJTci0mqCGUgDreWiw="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index ade9544f32d03..5fe28afbb5742 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -60,6 +60,11 @@ buildPythonPackage rec { time-machine ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + disabledTests = [ + # presumably regressed in pytest-asyncio 0.23.0 + "test_get_remote_position_too_old" + ]; + preCheck = '' export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo ''; diff --git a/pkgs/development/python-modules/bitstring/default.nix b/pkgs/development/python-modules/bitstring/default.nix index 537905778ba3d..52fdaece66ff3 100644 --- a/pkgs/development/python-modules/bitstring/default.nix +++ b/pkgs/development/python-modules/bitstring/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bitstring"; - version = "4.1.3"; + version = "4.1.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "scott-griffiths"; repo = pname; rev = "refs/tags/bitstring-${version}"; - hash = "sha256-RbHy36AnDlu/Ym5Ty2O9XfPj5xXd9hTgoClvISPoGBc="; + hash = "sha256-CO7R2SCb232OW1DCLo45UIarFG5FhR4WkwuQieXha0Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index 4e47e692657ae..b7d2b0dab6981 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ fastprogress jax diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 901eb76417ff7..c1fb4d77e8061 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -13,15 +13,20 @@ buildPythonPackage rec { pname = "bleach"; - version = "6.0.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "6.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-GhqFwVleB9jbFMXwnwnmQzUCxRxZWXDtwJBVHw25lBQ="; + hash = "sha256-CjHxg3ljxB1Gu/EzG4d44TCOoHkdsDzE5zV7l89CqP4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ html5lib packaging @@ -64,6 +69,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/mozilla/bleach"; downloadPage = "https://github.com/mozilla/bleach/releases"; + changelog = "https://github.com/mozilla/bleach/blob/v${version}/CHANGES"; license = licenses.asl20; maintainers = with maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 9864bbae3c616..2e5707d153890 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage , fetchPypi + +# build-system +, flit-core + +# tests , pytestCheckHook , pytest-asyncio -, setuptools }: buildPythonPackage rec { pname = "blinker"; - version = "1.6.2"; + version = "1.7.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Sv095m7zqfgGdVn7ehy+VVwX3L4VlxsF0bYlw+er4hM="; + hash = "sha256-5oIP9vpOTR2OJ0fCKDdJw/VH5P7hErmFVc3NrjKZYYI="; }; nativeBuildInputs = [ - setuptools + flit-core ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 0216d0f4305e1..c835531785c76 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -28,7 +28,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace ', "wheel~=0.40.0"' "" + --replace ', "wheel~=0.40.0"' "" \ + --replace "setuptools~=68.0" "setuptools" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index a4c1db3d7b700..f88c641de2aa9 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "blosc2"; - version = "2.2.7"; + version = "2.3.2"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { repo = "python-blosc2"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-5a94Zm6sYl/nSfkcFbKG7PkyXwLB6bAoIvfaq0yVGHo="; + hash = "sha256-tRcyntJlmLPbqnX7nzdBQ/50uXy0fVLb2YGVOIwJjxU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index adca1fe308b05..a697a15c54b93 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.2.2"; + version = "3.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-spWbhSTWnsTniGvDZAdEXwqS4fGVMNO/xARSNqG3pv8="; + hash = "sha256-rhgPhvd2Ul9+uBZzofJ+DrVoh9czdxZixRLsDYKkM/U="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/bootstrap/packaging/default.nix b/pkgs/development/python-modules/bootstrap/packaging/default.nix new file mode 100644 index 0000000000000..f8a10d4ddd121 --- /dev/null +++ b/pkgs/development/python-modules/bootstrap/packaging/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, python +, flit-core +, installer +, packaging +}: + +stdenv.mkDerivation { + pname = "${python.libPrefix}-bootstrap-${packaging.pname}"; + inherit (packaging) version src meta; + + buildPhase = '' + runHook preBuild + + PYTHONPATH="${flit-core}/${python.sitePackages}" \ + ${python.interpreter} -m flit_core.wheel + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + PYTHONPATH="${installer}/${python.sitePackages}" \ + ${python.interpreter} -m installer \ + --destdir "$out" --prefix "" dist/*.whl + + runHook postInstall + ''; +} diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 29357c0cc439b..060ac57ae00ed 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , build , coloredlogs @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-sHCPT6nTenE6mbTifNPtg0OMNIJCs7LRcF8Xuk+MwLs="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" + "twine" + "wheel" + ]; + propagatedBuildInputs = [ build coloredlogs diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 397dffa6e4329..83977abb6e832 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -363,12 +363,12 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.2"; + version = "1.33.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-PNsE3SPM9k8La03h+d9wNRskjzMy4uaDEFVf+MefaZU="; + hash = "sha256-zYXWvhQ+KewN50aBojagg/IbW/sBBfCZ3hCbHOxxGAY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 779871db10edb..717bb264283f9 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.28.57"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.33.6"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-+kuILCUK10tvpfTEAHZGvKKmpw6Pgn+v2kQkwCkPMKg="; + hash = "sha256-oOrUVBh1sbaOibU8A+bGZ4z7IEiE4gjHwZ+8889Hv60="; }; nativeBuildInputs = [ @@ -43,6 +43,10 @@ buildPythonPackage rec { "tests/integration" ]; + passthru.optional-dependencies = { + crt = [ botocore.optional-dependencies.crt ]; + }; + meta = with lib; { homepage = "https://github.com/boto/boto3"; changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index ddb9d35d05fd8..ea7ea23fc40d6 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -6,16 +6,17 @@ , urllib3 , pytestCheckHook , jsonschema +, awscrt }: buildPythonPackage rec { pname = "botocore"; - version = "1.31.57"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.33.6"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MBQ2F0Y1vsc5siW4QPw2XKAOXBpj5bKhnuZ50gTgG3g="; + hash = "sha256-k4BWurgxgp+Q4J7NcN1rKVr9UrFIL1WC7noR2CQ9lmE="; }; propagatedBuildInputs = [ @@ -41,6 +42,10 @@ buildPythonPackage rec { "botocore" ]; + passthru.optional-dependencies = { + crt = [ awscrt ]; + }; + meta = with lib; { homepage = "https://github.com/boto/botocore"; changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 746e04df5abe9..54300aaff04b6 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -40,8 +40,6 @@ buildPythonPackage rec { torch ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index e64883140316a..9e8d84950e5e6 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { pname = "bottle"; version = "0.12.25"; - - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-4anJSXCubXELP7RSYpTf64byy0qB7/OkuY3ED7Dl4CE="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -29,6 +34,12 @@ buildPythonPackage rec { "test_error_in_generator_callback" # timing sensitive "test_ims" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/bottlepy/bottle/issues/1422 + # ModuleNotFoundError: No module named 'bottle.ext' + "test_data_import" + "test_direkt_import" + "test_from_import" ]; __darwinAllowLocalNetworking = true; @@ -36,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://bottlepy.org/"; description = "A fast and simple micro-framework for small web-applications"; + downloadPage = "https://github.com/bottlepy/bottle"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 119e166e38455..3bd46a26b83bb 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-DH+XBj+VcS56+nAOGjjrKG0dnSKrqiU6N5vkILm+vSE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' # We don't want flake8 rm setup.cfg diff --git a/pkgs/development/python-modules/broadbean/default.nix b/pkgs/development/python-modules/broadbean/default.nix index cb2dff1b06e9c..edf4ca1080ce6 100644 --- a/pkgs/development/python-modules/broadbean/default.nix +++ b/pkgs/development/python-modules/broadbean/default.nix @@ -57,6 +57,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # on a 200ms deadline + "test_points" + ]; + pythonImportsCheck = [ "broadbean" ]; meta = { diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index 4b06298f1d26f..42c7786d78ae3 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -31,6 +31,11 @@ buildPythonPackage rec { hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k="; }; + postPatch = '' + # not strictly required, causes circular dependency cycle + sed -i '/importlib-metadata >= 4.6/d' pyproject.toml + ''; + nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index d52c2a9e2a92d..600fd1467b9c3 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchPypi , bwa @@ -11,7 +12,9 @@ buildPythonPackage rec { pname = "bwapy"; version = "0.1.4"; format = "setuptools"; - disabled = pythonOlder "3.6"; + + # uses the removed imp module + disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; @@ -35,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "bwapy" ]; meta = with lib; { - homepage = "https://github.com/ACEnglish/acebinf"; + homepage = "https://github.com/ACEnglish/bwapy"; description = "Python bindings to bwa mem aligner"; license = licenses.mpl20; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 4df83b9e45dfa..868279f4422c3 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { hash = "sha256-Jzsh0m00SiJjTP7hXMDmuR4XHmsCYdURuFDkVopGyIE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/bytewax/Cargo.lock b/pkgs/development/python-modules/bytewax/Cargo.lock index 2837d3c6ca95a..618736f138a56 100644 --- a/pkgs/development/python-modules/bytewax/Cargo.lock +++ b/pkgs/development/python-modules/bytewax/Cargo.lock @@ -20,16 +20,20 @@ dependencies = [ ] [[package]] -name = "ahash" -version = "0.7.6" +name = "addr2line" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ - "getrandom", - "once_cell", - "version_check", + "gimli", ] +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "ahash" version = "0.8.3" @@ -41,6 +45,21 @@ dependencies = [ "version_check", ] +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -62,46 +81,15 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" -[[package]] -name = "async-stream" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" -dependencies = [ - "async-stream-impl", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.18", -] - [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", -] - -[[package]] -name = "atoi" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" -dependencies = [ - "num-traits", + "syn 2.0.23", ] [[package]] @@ -118,7 +106,7 @@ checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43" dependencies = [ "async-trait", "axum-core 0.2.9", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -149,7 +137,7 @@ checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" dependencies = [ "async-trait", "axum-core 0.3.4", - "bitflags", + "bitflags 1.3.2", "bytes", "futures-util", "http", @@ -203,10 +191,19 @@ dependencies = [ ] [[package]] -name = "base64" -version = "0.13.1" +name = "backtrace" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base64" @@ -230,13 +227,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "block-buffer" -version = "0.10.4" +name = "bitflags" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" [[package]] name = "bumpalo" @@ -258,23 +252,23 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bytewax" -version = "0.16.2" +version = "0.17.2" dependencies = [ "axum 0.5.17", "bincode", "chrono", - "futures", + "fastrand", "num", - "openssl-src", "opentelemetry", "opentelemetry-jaeger", "opentelemetry-otlp", "pyo3", - "rdkafka", - "sasl2-sys", + "rusqlite", + "rusqlite_migration", + "seahash", "serde", + "serde_json", "serde_test", - "sqlx", "timely", "tokio", "tracing", @@ -307,15 +301,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "columnation" version = "0.1.0" @@ -330,30 +315,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -[[package]] -name = "cpufeatures" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" - [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -364,95 +325,13 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "dashmap" -version = "5.4.0" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "hashbrown 0.12.3", - "lock_api", - "once_cell", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "duct" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" -dependencies = [ - "libc", - "once_cell", - "os_pipe", - "shared_child", ] [[package]] @@ -471,31 +350,16 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "fallible-iterator" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] -name = "event-listener" -version = "2.5.3" +name = "fallible-streaming-iterator" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" @@ -506,24 +370,6 @@ dependencies = [ "instant", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "pin-project", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -532,28 +378,13 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.28" @@ -561,7 +392,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -581,17 +411,6 @@ dependencies = [ "futures-util", ] -[[package]] -name = "futures-intrusive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot 0.11.2", -] - [[package]] name = "futures-io" version = "0.3.28" @@ -606,7 +425,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -627,7 +446,6 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ - "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -639,16 +457,6 @@ dependencies = [ "slab", ] -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - [[package]] name = "getopts" version = "0.2.21" @@ -660,20 +468,26 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", "wasi", ] +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + [[package]] name = "h2" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -696,69 +510,28 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ - "ahash 0.8.3", + "ahash", + "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" -dependencies = [ - "hashbrown 0.13.2", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "libc", + "hashbrown 0.14.0", ] [[package]] name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "http" @@ -802,9 +575,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -838,9 +611,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -861,9 +634,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -900,22 +673,11 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "itertools" @@ -928,28 +690,19 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] -[[package]] -name = "krb5-src" -version = "0.3.2+1.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cd3b7e7735d48bc3793837041294f2eb747bd0f63bbc081e89972abb9e48fb" -dependencies = [ - "duct", -] - [[package]] name = "lazy_static" version = "1.4.0" @@ -958,44 +711,25 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libsqlite3-sys" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +version = "0.26.0" +source = "git+https://github.com/rusqlite/rusqlite.git?rev=7b0393210be4bce17156a08fde732083d6342a75#7b0393210be4bce17156a08fde732083d6342a75" dependencies = [ "cc", "pkg-config", "vcpkg", ] -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1003,9 +737,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "matchers" @@ -1013,7 +747,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -1028,15 +762,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest", -] - [[package]] name = "memchr" version = "2.5.0" @@ -1045,9 +770,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1059,10 +784,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] -name = "minimal-lexical" -version = "0.2.1" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] [[package]] name = "mio" @@ -1072,23 +800,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", + "windows-sys", ] [[package]] @@ -1179,68 +891,34 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] -name = "num_enum" -version = "0.5.11" +name = "object" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", + "memchr", ] [[package]] name = "once_cell" -version = "1.17.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b" - -[[package]] -name = "openssl-src" -version = "111.26.0+1.1.1u" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opentelemetry" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" dependencies = [ "opentelemetry_api", "opentelemetry_sdk", @@ -1248,9 +926,9 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" dependencies = [ "async-trait", "bytes", @@ -1261,34 +939,33 @@ dependencies = [ [[package]] name = "opentelemetry-jaeger" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e785d273968748578931e4dc3b4f5ec86b26e09d9e0d66b55adda7fce742f7a" +checksum = "876958ba9084f390f913fcf04ddf7bbbb822898867bb0a51cc28f2b9e5c1b515" dependencies = [ "async-trait", - "futures", - "futures-executor", - "once_cell", + "futures-core", + "futures-util", "opentelemetry", "opentelemetry-semantic-conventions", - "thiserror", "thrift", "tokio", ] [[package]] name = "opentelemetry-otlp" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", - "futures", - "futures-util", + "futures-core", "http", - "opentelemetry", "opentelemetry-http", "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "reqwest", "thiserror", @@ -1298,34 +975,31 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb" dependencies = [ - "futures", - "futures-util", - "opentelemetry", + "opentelemetry_api", + "opentelemetry_sdk", "prost", "tonic", - "tonic-build", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b02e0230abb0ab6636d18e2ba8fa02903ea63772281340ccac18e0af3ec9eeb" +checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269" dependencies = [ "opentelemetry", ] [[package]] name = "opentelemetry_api" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap", @@ -1333,25 +1007,27 @@ dependencies = [ "once_cell", "pin-project-lite", "thiserror", + "urlencoding", ] [[package]] name = "opentelemetry_sdk" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", + "ordered-float 3.7.0", "percent-encoding", "rand", + "regex", + "serde_json", "thiserror", "tokio", "tokio-stream", @@ -1359,21 +1035,20 @@ dependencies = [ [[package]] name = "ordered-float" -version = "1.1.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" dependencies = [ "num-traits", ] [[package]] -name = "os_pipe" -version = "1.1.4" +name = "ordered-float" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213" dependencies = [ - "libc", - "windows-sys 0.48.0", + "num-traits", ] [[package]] @@ -1382,17 +1057,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1400,83 +1064,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", - "windows-sys 0.45.0", + "windows-targets", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" [[package]] name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "petgraph" -version = "0.6.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" -dependencies = [ - "fixedbitset", - "indexmap", -] +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1496,31 +1136,11 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - [[package]] name = "proc-macro2" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -1535,28 +1155,6 @@ dependencies = [ "prost-derive", ] -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - [[package]] name = "prost-derive" version = "0.11.9" @@ -1570,27 +1168,18 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "pyo3" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" +checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38" dependencies = [ "cfg-if", "chrono", "indoc", "libc", "memoffset", - "parking_lot 0.12.1", + "parking_lot", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -1599,9 +1188,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" +checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5" dependencies = [ "once_cell", "target-lexicon", @@ -1609,9 +1198,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" +checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9" dependencies = [ "libc", "pyo3-build-config", @@ -1619,9 +1208,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" +checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1631,9 +1220,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" +checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536" dependencies = [ "proc-macro2", "quote", @@ -1642,9 +1231,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -1679,83 +1268,45 @@ dependencies = [ "getrandom", ] -[[package]] -name = "rdkafka" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de127f294f2dba488ed46760b129d5ecbeabbd337ccbf3739cb29d50db2161c" -dependencies = [ - "futures", - "libc", - "log", - "rdkafka-sys", - "serde", - "serde_derive", - "serde_json", - "slab", - "tokio", -] - -[[package]] -name = "rdkafka-sys" -version = "4.4.0+1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ac9d87c3aba1748e3112318459f2ac8bff80bfff7359e338e0463549590249" -dependencies = [ - "cmake", - "libc", - "libz-sys", - "num_enum", - "openssl-sys", - "pkg-config", - "sasl2-sys", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - [[package]] name = "redox_syscall" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata 0.3.0", + "regex-syntax 0.7.3", ] [[package]] -name = "regex" -version = "1.8.3" +name = "regex-automata" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax 0.7.2", + "regex-syntax 0.6.29", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" dependencies = [ - "regex-syntax 0.6.29", + "aho-corasick", + "memchr", + "regex-syntax 0.7.3", ] [[package]] @@ -1766,9 +1317,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" [[package]] name = "reqwest" @@ -1776,7 +1327,7 @@ version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.2", + "base64", "bytes", "encoding_rs", "futures-core", @@ -1805,80 +1356,45 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +name = "rusqlite" +version = "0.29.0" +source = "git+https://github.com/rusqlite/rusqlite.git?rev=7b0393210be4bce17156a08fde732083d6342a75#7b0393210be4bce17156a08fde732083d6342a75" dependencies = [ - "log", - "ring", - "sct", - "webpki", + "bitflags 2.3.3", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", ] [[package]] -name = "rustls-pemfile" +name = "rusqlite_migration" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "ef7dd29a4426624704d5966416682fb7ab3682f724986e9e3893eaca44accabc" dependencies = [ - "base64 0.21.2", + "log", + "rusqlite", ] [[package]] -name = "rustversion" -version = "1.0.12" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] -name = "ryu" +name = "rustversion" version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] -name = "sasl2-sys" -version = "0.1.20+2.1.28" +name = "ryu" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e645bd98535fc8fd251c43ba7c7c1f9be1e0369c99b6a5ea719052a773e655c" -dependencies = [ - "cc", - "duct", - "krb5-src", - "libc", - "openssl-sys", - "pkg-config", -] +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "scopeguard" @@ -1887,40 +1403,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sct" -version = "0.7.0" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" dependencies = [ "itoa", "ryu", @@ -1929,9 +1441,9 @@ dependencies = [ [[package]] name = "serde_test" -version = "1.0.163" +version = "1.0.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "100168a8017b89fd4bcbeb8d857d95a8cfcbde829a7147c09cc82d3ab8d8cb41" +checksum = "65c75585b65852643a745182a6fa82b0420165a70f67c5d3af80139c74ee12cc" dependencies = [ "serde", ] @@ -1948,28 +1460,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sharded-slab" version = "0.1.4" @@ -1979,16 +1469,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -2009,9 +1489,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -2023,145 +1503,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "sqlformat" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" -dependencies = [ - "itertools", - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" -dependencies = [ - "sqlx-core", - "sqlx-macros", -] - -[[package]] -name = "sqlx-core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" -dependencies = [ - "ahash 0.7.6", - "atoi", - "base64 0.13.1", - "bitflags", - "byteorder", - "bytes", - "chrono", - "crc", - "crossbeam-queue", - "dirs", - "dotenvy", - "either", - "event-listener", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "hashlink", - "hex", - "hkdf", - "hmac", - "indexmap", - "itoa", - "libc", - "libsqlite3-sys", - "log", - "md-5", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rand", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "sha1", - "sha2", - "smallvec", - "sqlformat", - "sqlx-rt", - "stringprep", - "thiserror", - "tokio-stream", - "url", - "webpki-roots", - "whoami", -] - -[[package]] -name = "sqlx-macros" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" -dependencies = [ - "dotenvy", - "either", - "heck", - "once_cell", - "proc-macro2", - "quote", - "sha2", - "sqlx-core", - "sqlx-rt", - "syn 1.0.109", - "url", -] - -[[package]] -name = "sqlx-rt" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" -dependencies = [ - "once_cell", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "stringprep" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - [[package]] name = "syn" version = "1.0.109" @@ -2175,9 +1516,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" dependencies = [ "proc-macro2", "quote", @@ -2204,41 +1545,28 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" - -[[package]] -name = "tempfile" -version = "3.5.0" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] +checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -2262,14 +1590,14 @@ dependencies = [ [[package]] name = "thrift" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09678c4cdbb4eed72e18b7c2af1329c69825ed16fcbac62d083fc3e2b0590ff0" +checksum = "7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09" dependencies = [ "byteorder", "integer-encoding", "log", - "ordered-float", + "ordered-float 2.10.0", "threadpool", ] @@ -2343,21 +1671,22 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2378,18 +1707,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", + "syn 2.0.23", ] [[package]] @@ -2417,33 +1735,15 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml_datetime" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" - -[[package]] -name = "toml_edit" -version = "0.19.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - [[package]] name = "tonic" -version = "0.8.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ - "async-stream", "async-trait", "axum 0.6.18", - "base64 0.13.1", + "base64", "bytes", "futures-core", "futures-util", @@ -2455,28 +1755,12 @@ dependencies = [ "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", ] [[package]] @@ -2505,7 +1789,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-util", @@ -2545,13 +1829,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", ] [[package]] @@ -2564,16 +1848,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -2587,9 +1861,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" dependencies = [ "once_cell", "opentelemetry", @@ -2623,12 +1897,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - [[package]] name = "unicode-bidi" version = "0.3.13" @@ -2637,9 +1905,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization" @@ -2650,12 +1918,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.10" @@ -2668,35 +1930,29 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "unindent" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", "percent-encoding", ] +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + [[package]] name = "valuable" version = "0.1.0" @@ -2717,11 +1973,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -2733,9 +1988,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2743,24 +1998,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -2770,9 +2025,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2780,73 +2035,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.23", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "whoami" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "winapi" version = "0.3.9" @@ -2875,16 +2090,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", + "windows-targets", ] [[package]] @@ -2893,132 +2099,66 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -[[package]] -name = "winnow" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ - "memchr", -] - [[package]] name = "winreg" version = "0.10.1" diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index c27d756070de4..ea0bfe9e32da9 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -1,22 +1,33 @@ { lib , stdenv , buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system , cmake -, confluent-kafka +, pkg-config +, rustPlatform + +# native dependencies , cyrus_sasl -, fetchFromGitHub , openssl -, pkg-config , protobuf + +# dependencies +, jsonpickle + +# optional dependencies +, confluent-kafka + +# test +, myst-docutils , pytestCheckHook -, pythonOlder -, rustPlatform -, setuptools-rust }: buildPythonPackage rec { pname = "bytewax"; - version = "0.17.1"; + version = "0.17.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +36,7 @@ buildPythonPackage rec { owner = "bytewax"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Cv2bTgs3XfYOcHK628/RgGol7S6E4WfHb7gHXXjBhig="; + hash = "sha256-BecZvBJsaTHIhJhWM9GZldSL6Irrc7fiedulTN9e76I="; }; env = { @@ -34,13 +45,16 @@ buildPythonPackage rec { # Remove docs tests, myst-docutils in nixpkgs is not compatible with package requirements. # Package uses old version. - patches = [ ./remove-docs-test.patch ]; + patches = [ + ./remove-docs-test.patch + ]; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "columnation-0.1.0" = "sha256-RAyZKR+sRmeWGh7QYPZnJgX9AtWqmca85HcABEFUgX8="; "timely-0.12.0" = "sha256-sZuVLBDCXurIe38m4UAjEuFeh73VQ5Jawy+sr3U/HbI="; + "libsqlite3-sys-0.26.0" = "sha256-WpJA+Pm5dWKcdUrP0xS5ps/oE/yAXuQvvsdyDfDet1o="; }; }; @@ -59,6 +73,10 @@ buildPythonPackage rec { protobuf ]; + propagatedBuildInputs = [ + jsonpickle + ]; + passthru.optional-dependencies = { kafka = [ confluent-kafka @@ -70,9 +88,15 @@ buildPythonPackage rec { ''; checkInputs = [ + myst-docutils pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + disabledTestPaths = [ + # dependens on an old myst-docutils version + "docs" + ]; + pythonImportsCheck = [ "bytewax" ]; diff --git a/pkgs/development/python-modules/bytewax/remove-docs-test.patch b/pkgs/development/python-modules/bytewax/remove-docs-test.patch index d5c9269a01b2e..93b2adad18dc6 100644 --- a/pkgs/development/python-modules/bytewax/remove-docs-test.patch +++ b/pkgs/development/python-modules/bytewax/remove-docs-test.patch @@ -1,10 +1,12 @@ diff --git a/pyproject.toml b/pyproject.toml -index 41b5c90..e7c7b2d 100644 +index 107cab8..34cc544 100644 --- a/pyproject.toml +++ b/pyproject.toml -@@ -50,6 +50,5 @@ doctest_optionflags = "NORMALIZE_WHITESPACE" +@@ -66,7 +66,6 @@ long_description_content_type = "text/markdown" + addopts = "-v --doctest-modules" + doctest_optionflags = "NORMALIZE_WHITESPACE" testpaths = [ - "pytests", - "pysrc", - "docs", + "pysrc", + "pytests", ] diff --git a/pkgs/development/python-modules/cachetools/default.nix b/pkgs/development/python-modules/cachetools/default.nix index 14682f23001f9..8a2f5397d6e12 100644 --- a/pkgs/development/python-modules/cachetools/default.nix +++ b/pkgs/development/python-modules/cachetools/default.nix @@ -1,14 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pythonOlder + +# build-system +, setuptools + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "cachetools"; - version = "5.3.0"; - format = "setuptools"; + version = "5.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +21,13 @@ buildPythonPackage rec { owner = "tkem"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7MbP3jz17lGwjAeWo8QmS5v1vGqIQmYLbKVcK/q89Z4="; + hash = "sha256-CmyAW9uV63OV/zZsWwZkXOWbHfHAJdYFGJsRhpqQ1f4="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index b637f714d26d7..304069b660d28 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -4,12 +4,13 @@ , cbor2 , fetchFromGitHub , exceptiongroup +, hatchling +, hatch-vcs , hypothesis , immutables , motor , msgpack , orjson -, poetry-core , pytest-xdist , pytestCheckHook , pythonOlder @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "cattrs"; - version = "23.1.2"; + version = "23.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,12 +30,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-attrs"; repo = pname; - rev = "v${version}"; - hash = "sha256-YO4Clbo5fmXbysxwwM2qCHJwO5KwDC05VctRVFruJcw="; + rev = "refs/tags/v${version}"; + hash = "sha256-zWM5zmZr2EiJb/4Dc6KjDL89p0C1V0Dsz949byz5OVM="; }; nativeBuildInputs = [ - poetry-core + hatchling + hatch-vcs ]; propagatedBuildInputs = [ @@ -62,9 +64,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" \ - --replace 'orjson = "^3.5.2"' "" \ - --replace "[tool.poetry.group.dev.dependencies]" "[tool.poetry.dev-dependencies]" + --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" substituteInPlace tests/test_preconf.py \ --replace "from orjson import dumps as orjson_dumps" "" \ --replace "from orjson import loads as orjson_loads" "" diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index fe320063362c4..5523d4f5e0a21 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,50 +2,59 @@ , stdenv , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# build-system +, setuptools , setuptools-scm + +# tests +, hypothesis +, pytestCheckHook }: buildPythonPackage rec { pname = "cbor2"; - version = "5.4.6"; - format = "setuptools"; + version = "5.5.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uJNQDbD+Az5XDDrclWr27vxX4oACa9LYb9U9qfHllNc="; + hash = "sha256-+eGS9GGp+PYILfKMA1sAbRU5BCE9yGQL7Ypy1yu8lHU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + nativeBuildInputs = [ + setuptools setuptools-scm ]; + pythonImportsCheck = [ + "cbor2" + ]; + nativeCheckInputs = [ + hypothesis pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; - # https://github.com/agronholm/cbor2/issues/99 disabledTests = lib.optionals stdenv.is32bit [ "test_huge_truncated_bytes" "test_huge_truncated_string" ]; - pythonImportsCheck = [ - "cbor2" - ]; - meta = with lib; { + changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; description = "Python CBOR (de)serializer with extensive tag support"; homepage = "https://github.com/agronholm/cbor2"; license = licenses.mit; - maintainers = with maintainers; [ taneb ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index b9b703af622ec..c6eaa72d2df12 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -3,13 +3,14 @@ , cacert , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "certifi"; - version = "2023.07.22"; - format = "setuptools"; + version = "2023.11.17"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "python-certifi"; rev = version; - hash = "sha256-V3bptJDNMGXlCMg6GHj792IrjfsG9+F/UpQKxeM0QOc="; + hash = "sha256-H3zsFJjWt2+tT7yqQOOZZwSL5y0AtfDz6Fqxwpm4Wl8="; }; patches = [ @@ -31,6 +32,10 @@ buildPythonPackage rec { ln -snvf "${cacert}/etc/ssl/certs/ca-bundle.crt" "certifi/cacert.pem" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedNativeBuildInputs = [ # propagate cacerts setup-hook to set up `NIX_SSL_CERT_FILE` cacert diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index f52bf2f667aeb..98f8208335e9a 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.79.11"; + version = "0.83.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aws-cloudformation"; - repo = "cfn-python-lint"; + repo = "cfn-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-dVLKMoZzP2q3bejEIslgpQgkPJOJUeEsXyyk8HRP6h0="; + hash = "sha256-0NHD8P+lKsrsEX/ypUS5dIwHOLudQcqkH8zG5RxANxE="; }; propagatedBuildInputs = [ @@ -57,12 +57,6 @@ buildPythonPackage rec { ''; disabledTests = [ - # These tests depend on the current date, for example because of issues like this. - # This makes it possible for them to succeed on hydra and then begin to fail without - # any code changes. - # https://github.com/aws-cloudformation/cfn-python-lint/issues/1705 - # See also: https://github.com/NixOS/nixpkgs/issues/108076 - "TestQuickStartTemplates" # Requires git directory "test_update_docs" # Tests depend on network access (fails in getaddrinfo) @@ -82,7 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; - homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; + homepage = "https://github.com/aws-cloudformation/cfn-lint"; changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index b827c48531aa9..4291f805d2c0d 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , cython , fetchPypi -, fetchpatch , numpy , pytestCheckHook , pythonOlder @@ -10,29 +9,20 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.6.2"; + version = "1.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hhTAD7ilBG3jBP3Ybb0iT5lAgYXXskWsZijQJ2WW5tI="; + hash = "sha256-0Kayn3KhPwjgCLm+z/JHzHXISsshMzLt4Yh5xbaqTf0="; }; - patches = [ - (fetchpatch { - # Fix test_num2date_precision by checking per platform precision - url = "https://github.com/Unidata/cftime/commit/221ff2195d588a43a7984597033b678f330fbc41.patch"; - hash = "sha256-3XTJuET20g9QElM/8WGnNzJBFZ0oUN4ikhWKppwcyNM="; - }) - ]; - postPatch = '' sed -i "/--cov/d" setup.cfg ''; - nativeBuildInputs = [ cython numpy diff --git a/pkgs/development/python-modules/charset-normalizer/default.nix b/pkgs/development/python-modules/charset-normalizer/default.nix index c2856a49060fc..2f6c3533dd77e 100644 --- a/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/pkgs/development/python-modules/charset-normalizer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "3.2.0"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Ousret"; repo = "charset_normalizer"; rev = "refs/tags/${version}"; - hash = "sha256-CfL5rlrwJs9453z+1xPUzs1B3OyjFBaU6klzY7gJCzA="; + hash = "sha256-T9lnlS05Ogb2eLLHYWFnjBtRaB/OBqGWHQ/2WLunrNY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 0c493e320ed55..fc563153a49ca 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -1,28 +1,35 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib +, buildPythonPackage +, fetchFromGitHub , mock , nose , plotly , pytest , requests , retrying +, setuptools , six }: buildPythonPackage rec { pname = "chart-studio"; - version = "5.17.0"; - format = "setuptools"; + version = "5.18.0"; + pyproject = true; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-Vaa/MgauSoSpzNtRVXq3fQSVqMYzLTqDtIbiHBgrXQY="; + hash = "sha256-hY8R4UjcTI5RBaaRU/oR63taKEgYRI3+oOxNuDWzg20="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ plotly requests diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 839894e1505b8..89d4d69b91614 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -14,7 +14,6 @@ , requests-toolbelt , requests-unixsocket , setuptools-scm -, setuptools-scm-git-archive , six }: @@ -30,9 +29,19 @@ buildPythonPackage rec { hash = "sha256-WcShh3/vmWmzw8CAyqrzd+J4CRlDeFP8DTKp30CzEfA="; }; + # remove setuptools-scm-git-archive dependency + # https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 + # there is a difference between the github source and the pypi tarball source, + # and it is not easy to apply patches. + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"setuptools_scm_git_archive>=1.1",' "" + substituteInPlace setup.cfg \ + --replace "setuptools_scm_git_archive>=1.0" "" + ''; + nativeBuildInputs = [ setuptools-scm - setuptools-scm-git-archive ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix index 31077bd109e4b..0563c2f1a71c1 100644 --- a/pkgs/development/python-modules/cirq-core/default.nix +++ b/pkgs/development/python-modules/cirq-core/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "cirq-core"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "refs/tags/v${version}"; - hash = "sha256-KEei5PJ0ammsduZVmMh2vaW3f58DYI4BCrFCl/SjUoo="; + hash = "sha256-JAJJciFg3BuRha1wTKixtKWcYy3NA2mNpniPyPHTTe8="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix index 275f6ccc77dc1..a01a3e88b1974 100644 --- a/pkgs/development/python-modules/click-odoo-contrib/default.nix +++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { manifestoo-core ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - passthru.updateScript = nix-update-script { }; pythonImportsCheck = [ "click_odoo_contrib" ]; diff --git a/pkgs/development/python-modules/click-odoo/default.nix b/pkgs/development/python-modules/click-odoo/default.nix index a618359735f1b..2dd211d24a01d 100644 --- a/pkgs/development/python-modules/click-odoo/default.nix +++ b/pkgs/development/python-modules/click-odoo/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { click ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index f8a8fc1c49f8c..aa375423769bc 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -1,24 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , click , prompt-toolkit , six + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "click-repl"; - version = "0.2.0"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "click-contrib"; repo = "click-repl"; - rev = version; - hash = "sha256-kaTUKaIomJL0u3NX40bL0I54vkR+Utcdw1QKSbnVy5s="; + rev = "refs/tags/${version}"; + hash = "sha256-xCT3w0DDY73dtDL5jbssXM05Zlr44OOcy4vexgHyWiE="; }; + postPatch = '' + sed -i '/--cov=/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ click prompt-toolkit diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 8569eede0bbb8..eb32212cde237 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -35,6 +35,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # test fails with filename normalization on zfs + "test_file_surrogates" + ]; + passthru.tests = { inherit black flask magic-wormhole mitmproxy typer; }; diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index e9296435e052f..3bd14047ad2a4 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, attrs , pillow , toml , numpy @@ -25,9 +26,17 @@ buildPythonPackage rec { hash = "sha256-mSaltlX2eNRLJ09zN5Tim8mW8mnjPi10W4QIEpiBQvI="; }; - propagatedBuildInputs = [ pillow toml numpy pyyaml ]; - - nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + attrs + numpy + pillow + pyyaml + toml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; postInstall = '' # Copying scripts directory needed by clickgen script at $out/bin/ diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 3c807716e03de..8abe4c1b3aa6a 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook +, setuptools , click , prompt-toolkit , pygments @@ -18,6 +20,15 @@ buildPythonPackage rec { hash = "sha256-gkgLAedUtzGv/4P+D56M2Pb5YecyqyVYp06ST62sjdY="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + + pythonRelaxDeps = [ + "sqlparse" + ]; + propagatedBuildInputs = [ click prompt-toolkit diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 9c6d88c9dab69..9715a41852b66 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "cliff"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-/FtuvI+4FTMncLJIXuNsCXU5N8N8zk8yJ83U4Qsz6sw="; + hash = "sha256-qo1ASqLWtNhjnGG9bcR6yzZW68P8Alsbe7B68rrveF8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 2acfe17327b6c..fc8f92f3fa8da 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -1,23 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pythonOlder + +# build-system +, flit-core + +# tests , psutil , pytestCheckHook -, pythonOlder }: buildPythonPackage rec { pname = "cloudpickle"; - version = "2.2.1"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-2JaEuN6eNKKkOzRg+8oH0J1uJc6FjfTVpEJAQDthePU="; + src = fetchFromGitHub { + owner = "cloudpipe"; + repo = "cloudpickle"; + rev = "refs/tags/v${version}"; + hash = "sha256-UeKVwzT0m4fhEVnG7TvQsFR99JsmwwoXmr+rWnTCeJU="; }; + nativeBuildInputs = [ + flit-core + ]; + nativeCheckInputs = [ psutil pytestCheckHook @@ -28,16 +39,12 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # ModuleNotFoundError: No module named '_cloudpickle_testpkg' + # ModuleNotFoundError: No module named 'psutil' "tests/cloudpickle_test.py" ]; - disabledTests = [ - # TypeError: cannot pickle 'EncodedFile' object - "test_pickling_special_file_handles" - ]; - meta = with lib; { + changelog = "https://github.com/cloudpipe/cloudpickle/blob/v${version}/CHANGES.md"; description = "Extended pickling support for Python objects"; homepage = "https://github.com/cloudpipe/cloudpickle"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/development/python-modules/coconut/default.nix b/pkgs/development/python-modules/coconut/default.nix index 1c930529a31e5..3a00891e60dd2 100644 --- a/pkgs/development/python-modules/coconut/default.nix +++ b/pkgs/development/python-modules/coconut/default.nix @@ -8,25 +8,42 @@ , pygments , pytestCheckHook , prompt-toolkit +, setuptools , tkinter , watchdog }: buildPythonPackage rec { pname = "coconut"; - version = "3.0.3"; - format = "setuptools"; + version = "3.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "evhub"; repo = "coconut"; rev = "refs/tags/v${version}"; - hash = "sha256-u1tcIu0U1VZrUx2hVdtRDv1N4jVf176kQSw47/7lOXY="; + hash = "sha256-TIYep9EuCfcN8bp0vkaoB5W626lrD4PVh+oYKmVrfeY="; }; - propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cpyparsing + ipykernel + mypy + pygments + prompt-toolkit + setuptools + watchdog + ]; - nativeCheckInputs = [ pexpect pytestCheckHook tkinter ]; + nativeCheckInputs = [ + pexpect + pytestCheckHook + tkinter + ]; # Currently most tests have performance issues pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index ab10055187d03..0d4dc1450d9f8 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -76,8 +76,6 @@ buildPythonPackage rec { cachetools ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeCheckInputs = [ distributed pyinstrument diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 36e7a27446850..133721ca4d741 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.32"; + version = "4.37"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OAd0e+mE8hHc6RHBM1vXE68qwrcPcpZ4OB5v9uRQ5oE="; + hash = "sha256-eIAh2dmSxsMdGYXZXMyyd8cmWILErNekmz5H2ne0vsg="; }; patches = [ diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index 452908a62c69e..8a7ff6494e4df 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -1,22 +1,31 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "colorlog"; - version = "6.7.0"; - format = "setuptools"; + version = "6.8.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; + hash = "sha256-+7b9+dVoXyUX84j7Kbsn1U6GVN0x9YvCo7IX6WepXKY="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - pythonImportsCheck = [ "colorlog" ]; + pythonImportsCheck = [ + "colorlog" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Log formatting with colors"; diff --git a/pkgs/development/python-modules/colout/default.nix b/pkgs/development/python-modules/colout/default.nix index 0679270200d86..e01193cd36ecc 100644 --- a/pkgs/development/python-modules/colout/default.nix +++ b/pkgs/development/python-modules/colout/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-7Dtf87erBElqVgqRx8BYHYOWv1uI84JJ0LHrcneczCI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/comm/default.nix b/pkgs/development/python-modules/comm/default.nix index 627c1630489d2..e03eae5ffdbb1 100644 --- a/pkgs/development/python-modules/comm/default.nix +++ b/pkgs/development/python-modules/comm/default.nix @@ -8,7 +8,7 @@ let pname = "comm"; - version = "0.1.4"; + version = "0.2.0"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "ipython"; repo = "comm"; rev = "refs/tags/v${version}"; - hash = "sha256-6GvAyiTm+zQ5sSynuJhAg50PaMTY9EFqVVsD3K2wTkY="; + hash = "sha256-bErZNTm0spO0A/Lc8kq5u7sB0FMXm/WMWtFbCNGJVXE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/confight/default.nix b/pkgs/development/python-modules/confight/default.nix index 8ee09009fb974..5933ffc5d842d 100644 --- a/pkgs/development/python-modules/confight/default.nix +++ b/pkgs/development/python-modules/confight/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , toml }: buildPythonPackage rec { pname = "confight"; version = "2.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-iodoexnh9tG4dgkjDXCUzWRFDhRlJ3HRgaNhxG2lwPY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ toml ]; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 33e3caf90cae9..b610f1d405909 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "confluent-kafka"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "confluentinc"; repo = "confluent-kafka-python"; rev = "refs/tags/v${version}"; - hash = "sha256-6CdalNFKkgF7JUqCGtt4nB1/H3u4SVqt9xCAg5DR3T0="; + hash = "sha256-sPlLlp0niR45lQPCvVd6NPtGI1cFbmPeQpIF1RnnY0I="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index d4eb668d73edb..40a166c14be44 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -1,30 +1,40 @@ { lib -, aiohttp -, aiohttp-jinja2 -, aiohttp-remotes -, aiohttp-swagger -, buildPythonPackage -, clickclick -, decorator , fetchFromGitHub -, flask +, buildPythonPackage +, pythonOlder + +# build-system +, poetry-core + +# dependencies +, asgiref +, httpx , inflection , jsonschema -, openapi-spec-validator -, packaging -, pytest-aiohttp -, pytestCheckHook -, pythonOlder +, jinja2 +, python-multipart , pyyaml , requests +, starlette +, typing-extensions +, werkzeug + +# optional-dependencies +, a2wsgi +, flask , swagger-ui-bundle +, uvicorn + +# tests +, pytest-aiohttp +, pytestCheckHook , testfixtures }: buildPythonPackage rec { pname = "connexion"; - version = "2.14.2"; - format = "setuptools"; + version = "3.0.5"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -32,31 +42,45 @@ buildPythonPackage rec { owner = "spec-first"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1v1xCHY3ZnZG/Vu9wN/it7rLKC/StoDefoMNs+hMjIs="; + hash = "sha256-VaHdUxZ72JCm9zFMSEg3EW1uwfn+IIYy3yrtW9qC6rA="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ - aiohttp - aiohttp-jinja2 - aiohttp-swagger - clickclick - flask + asgiref + httpx inflection jsonschema - openapi-spec-validator - packaging + jinja2 + python-multipart pyyaml requests - swagger-ui-bundle + starlette + typing-extensions + werkzeug ]; + passthru.optional-dependencies = { + flask = [ + a2wsgi + flask + ]; + swagger-ui = [ + swagger-ui-bundle + ]; + uvicorn = [ + uvicorn + ]; + }; + nativeCheckInputs = [ - aiohttp-remotes - decorator pytest-aiohttp pytestCheckHook testfixtures - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "connexion" diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 4aad363632c23..bee00f7d4fa2b 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -1,36 +1,60 @@ -{ lib, buildPythonPackage, fetchFromGitHub, twisted }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools +, versioneer + +# tests +, twisted +}: let self = buildPythonPackage rec { pname = "constantly"; - version = "15.1.0"; - format = "setuptools"; + version = "23.10.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "twisted"; repo = "constantly"; - rev = version; - hash = "sha256-0RPK5Vy0b6V4ubvm+vfNOAua7Qpa6j+G+QNExFuHgUU="; + rev = "refs/tags/${version}"; + hash = "sha256-HTj6zbrCrxvh0PeSkeCSOCloTrVGUX6+o57snrKf6PA="; }; + nativeBuildInputs = [ + setuptools + versioneer + ] ++ versioneer.optional-dependencies.toml; + # would create dependency loop with twisted doCheck = false; - nativeCheckInputs = [ twisted ]; + nativeCheckInputs = [ + twisted + ]; checkPhase = '' + runHook preCheck trial constantly + runHook postCheck ''; - pythonImportsCheck = [ "constantly" ]; + pythonImportsCheck = [ + "constantly" + ]; passthru.tests.constantly = self.overridePythonAttrs { doCheck = true; }; meta = with lib; { + description = "Module for symbolic constant support"; homepage = "https://github.com/twisted/constantly"; - description = "symbolic constant support"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; }; in diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index f6c5bb50b59dc..917a6f4f95dba 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "construct"; - version = "2.10.69"; + version = "2.10.70"; pyproject = true; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "construct"; repo = "construct"; rev = "refs/tags/v${version}"; - hash = "sha256-v1ieZytX9I2BR6UBD6TztCBT4KWtqfFZVKNtXIRNEB0="; + hash = "sha256-5otjjIyje0+z/Y/C2ivmu08PNm0oJcSSvZkQfGxHDuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/container-inspector/default.nix b/pkgs/development/python-modules/container-inspector/default.nix index 12375681c58f4..4a3f6918b9e8b 100644 --- a/pkgs/development/python-modules/container-inspector/default.nix +++ b/pkgs/development/python-modules/container-inspector/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-J9glnfs6l36/IQoIvE8a+Cw4B8x/6r5UeAU8+T/OiQg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - dontConfigure = true; postPatch = '' diff --git a/pkgs/development/python-modules/contourpy/default.nix b/pkgs/development/python-modules/contourpy/default.nix index f5af82e55ff31..5e12a4531b33c 100644 --- a/pkgs/development/python-modules/contourpy/default.nix +++ b/pkgs/development/python-modules/contourpy/default.nix @@ -25,7 +25,7 @@ let countourpy = buildPythonPackage rec { pname = "contourpy"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ let countourpy = buildPythonPackage rec { owner = "contourpy"; repo = "contourpy"; rev = "refs/tags/v${version}"; - hash = "sha256-7M+5HMDqQI4UgVfW/MXsVyz/yM6wjTcJEdw7vPvzuNY="; + hash = "sha256-5yZrIwwe9dL5vtdSJnOhY9X4BdK/cdEY4DkVVjCq1uw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 8d3374b9c9101..35e14b394e2e4 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPyPy +, setuptools , pytest, pytest-cov, pytest-mock, freezegun, safety, pre-commit -, jinja2, future, binaryornot, click, jinja2-time, requests +, jinja2, binaryornot, click, jinja2-time, requests , python-slugify , pyyaml , arrow @@ -9,17 +10,21 @@ buildPythonPackage rec { pname = "cookiecutter"; - version = "2.3.0"; - format = "setuptools"; + version = "2.5.0"; + pyproject = true; # not sure why this is broken disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-lCp5SYF0f21/Q51uSdOdyRqaZBKDYUFgyTxHTHLCliE="; + hash = "sha256-5h6QNHSOP0G4vSwR8A0DB4S0hxHE1cQjY8UJiaZTMew="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest pytest-cov diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix index 7a79c38554782..15f48da9264fd 100644 --- a/pkgs/development/python-modules/correctionlib/default.nix +++ b/pkgs/development/python-modules/correctionlib/default.nix @@ -47,8 +47,6 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeCheckInputs = [ awkward pytestCheckHook @@ -64,5 +62,6 @@ buildPythonPackage rec { homepage = "https://cms-nanoaod.github.io/correctionlib/"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index cd761b45e1013..eba9e13865d8d 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -3,20 +3,26 @@ , fetchPypi , mock , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "coverage"; - version = "7.3.1"; - format = "setuptools"; + version = "7.3.2"; + pyproject = true; + # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-bLf+FYHetnt4LBUxNlQeIJAaoxLO7a8UZ9yzUlV4eVI="; + hash = "sha256-vjKtKTQbAXDnlcpZDhwH6B/AYctbEMdM5yA0kUhEBO8="; }; + nativeBuildInputs = [ + setuptools + ]; + # No tests in archive doCheck = false; nativeCheckInputs = [ mock ]; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index 1ee4fe1658787..cd34ebf1da1f0 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.7.2.1.2"; + version = "2.4.7.2.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "evhub"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Y3EyX9Gjssez0DkD6dIaOpazNLy7rDYzjKO1u+lLGFI="; + hash = "sha256-vnzZdJ7pZz1QxlTqw5UKjxB4GVcXuCfKWX4lu3ORWas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index 12268dc72aee2..6ac6f5db0509e 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook , python-dateutil , pythonOlder @@ -10,23 +11,27 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.4.1"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Gm32DqzsO3oKpSqPLvJRrj3Sp8fIuYdOc+eRY21Vo2E="; + hash = "sha256-0Zmy7D6l6CmI0fcgIkM8X5MCs7Pqnmv9ahUY9upecAo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-dateutil + pytz ]; nativeCheckInputs = [ pytestCheckHook - pytz tzlocal ]; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 501cdd442ab92..0c006b281e2d5 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , pytestCheckHook , sphinx @@ -18,6 +19,15 @@ buildPythonPackage rec { hash = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc="; }; + patches = [ + (fetchpatch { + # Add support for Python 3.12 + # https://github.com/dabeaz/curio/pull/363 + url = "https://github.com/dabeaz/curio/commit/a5590bb04de3f1f201fd1fd0ce9cfe5825db80ac.patch"; + hash = "sha256-dwatxLOPAWLQSyNqJvkx6Cbl327tX9OpZXM5aaDX58I="; + }) + ]; + nativeCheckInputs = [ pytestCheckHook sphinx diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 4a17769e18e82..2dd039f00ee2f 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -8,6 +8,7 @@ , pyte , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-br4zIVvXyShRpQYEnHIMykz1wZLBZlwdepigTEcCdg4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ blessed cwcwidth diff --git a/pkgs/development/python-modules/cvelib/default.nix b/pkgs/development/python-modules/cvelib/default.nix index b44c51e4014c1..0f9d292a51514 100644 --- a/pkgs/development/python-modules/cvelib/default.nix +++ b/pkgs/development/python-modules/cvelib/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-hJPcxnc4iQzsYNNVJ9fw6yQl+5K7pdtjHT6oMmBx/Zs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - propagatedBuildInputs = [ click jsonschema diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix index 97f2ff499c3e2..cfd1cebd66200 100644 --- a/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cwl-upgrader"; - version = "1.2.9"; + version = "1.2.10"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yvgGMGo4QK+PRDzqlOH4rP49fnJUlbYB9B5AnlX+LF8="; + hash = "sha256-D/MIvn/jyxK++CMgKM8EYDVo94WFgdlTtMZjsXoQ4W4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/cwl-utils/default.nix b/pkgs/development/python-modules/cwl-utils/default.nix index 77f81963eefc0..aaa57e86ae00d 100644 --- a/pkgs/development/python-modules/cwl-utils/default.nix +++ b/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.29"; + version = "0.32"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-XxfeBikJcRcUCIVDAmPTtcrrgvZYrRKpjs5bmMokeeI="; + hash = "sha256-CM2UlJ86FcjsOm0msBNpY2li8bhm5T/aMD1q292HpLM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 07be526f659b9..18e9fa7ed5980 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -1,34 +1,38 @@ { lib , buildPythonPackage -, fetchPypi -, coverage -, nose -, six -, python +, fetchFromGitHub + +# build-system +, setuptools + +# tests +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "cycler"; - version = "0.11.0"; - format = "setuptools"; + version = "0.12.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"; + src = fetchFromGitHub { + owner = "matplotlib"; + repo = "cycler"; + rev = "refs/tags/v${version}"; + hash = "sha256-5L0APSi/mJ85SuKCVz+c6Fn8zZNpRm6vCeBO0fpGKxg="; }; - nativeCheckInputs = [ coverage nose ]; - propagatedBuildInputs = [ six ]; - - checkPhase = '' - ${python.interpreter} run_tests.py - ''; + nativeBuildInputs = [ + setuptools + ]; - # Tests were not included in release. - # https://github.com/matplotlib/cycler/issues/31 - doCheck = false; + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; meta = { + changelog = "https://github.com/matplotlib/cycler/releases/tag/v${version}"; description = "Composable style cycles"; homepage = "https://github.com/matplotlib/cycler"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index dc6d412f24593..29911ad692d92 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -10,12 +10,12 @@ assert pariSupport -> pari != null; buildPythonPackage rec { pname = "cysignals"; - version = "1.11.2"; + version = "1.11.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "5858b1760fbe21848121b826b2463a67ac5a45caf3d73105497a68618c5a6fa6"; + hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM="; }; # explicit check: diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/cython/default.nix similarity index 98% rename from pkgs/development/python-modules/Cython/default.nix rename to pkgs/development/python-modules/cython/default.nix index c2bb5811336d2..72ba4a68f038f 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/cython/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchPypi , fetchpatch +, setuptools , python , pkg-config , gdb @@ -25,6 +26,7 @@ let in buildPythonPackage rec { pname = "cython"; version = "0.29.36"; + pyproject = true; src = fetchPypi { pname = "Cython"; @@ -34,6 +36,7 @@ in buildPythonPackage rec { nativeBuildInputs = [ pkg-config + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/Cython/setup-hook.sh b/pkgs/development/python-modules/cython/setup-hook.sh similarity index 100% rename from pkgs/development/python-modules/Cython/setup-hook.sh rename to pkgs/development/python-modules/cython/setup-hook.sh diff --git a/pkgs/development/python-modules/Cython/trashcan.patch b/pkgs/development/python-modules/cython/trashcan.patch similarity index 100% rename from pkgs/development/python-modules/Cython/trashcan.patch rename to pkgs/development/python-modules/cython/trashcan.patch diff --git a/pkgs/development/python-modules/daiquiri/default.nix b/pkgs/development/python-modules/daiquiri/default.nix index 9c5a0abdbd1c5..c7d6602de5fee 100644 --- a/pkgs/development/python-modules/daiquiri/default.nix +++ b/pkgs/development/python-modules/daiquiri/default.nix @@ -3,20 +3,22 @@ , fetchPypi , pytestCheckHook , python-json-logger +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "daiquiri"; - version = "3.2.1"; - format = "setuptools"; + version = "3.2.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QIxNKOyPDqI+llN0R5gpvSI2TQwI15HL63u6JFlj4P0="; + hash = "sha256-P8rvN2/WgIi5I5E3R6t+4S2Lf7Kvf4xfIOWYCZfp6DU="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index c07cd8d6db5ab..cbe7cc5845ab4 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-MfZ3mdCCShD/rcqHx7xyujXax5t96RQI1e2Ckyif9e4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonRelaxDeps = [ "awkward" ]; diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 5bdcb2458e45c..c465baf233091 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { dask ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index d088850fc58ed..92d6adf55a11e 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.17.7"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "databricks"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Eg6qpoEvWlbOJbMIkbJiHfHVrglVfVNq/TCOhQxukl0="; + hash = "sha256-dH95C2AY/B6F9BROr6rh+gVtKqxsg1gyEU5MzCd5aqs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index f47949a6198ed..01b565df96e9a 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.9.3"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-y4Pmkgq3hv6mVu0zBsoiqNOcsHM0mxTNiJOCCZ+rwA8="; + hash = "sha256-ymR/PL+LC7Bt+thtCJs5kfbJgKDgioUo+T79E7ZUQWY="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index 0802ae5cf6f60..0505ea7e13ccd 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "2.14.5"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -30,9 +30,15 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oLB6laY/Si071mBKoWlZpd1fqr/wNtAnhRvBKLjeEuE="; + hash = "sha256-Q8cSgupfj6xKD0bYgL6bvYBwdYDdNaiWEWWUrRvwc4g="; }; + # remove pyarrow<14.0.1 vulnerability fix + postPatch = '' + substituteInPlace src/datasets/features/features.py \ + --replace "import pyarrow_hotfix" "#import pyarrow_hotfix" + ''; + propagatedBuildInputs = [ aiohttp dill diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 5b1e9aeeb9463..9e276cf143f2c 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.6.4"; + version = "1.7.2"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-m458gg5TQ7jznhA9QNi8KQ+ICxdQn58mS0jvyZ88Fmg="; + hash = "sha256-CzRcnS/aECBq/9L8U+mLuHYo00HyBtKK6jmU8S03feM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 93c738314fbcc..d0a4f3b984385 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.6.2"; + version = "1.7.3"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zmZdFOB0jQHamRJ7Zuzr/augP6Y2smAdUvqSXDZDuwo="; + hash = "sha256-sz5d5tV6OP8TJMq73gYwCas+jizGzGEnywmOddgpSJQ="; }; sourceRoot = "${src.name}/core"; diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 694b2c7f73729..736e4497e037e 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.2.2"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; - rev = "v${version}"; - hash = "sha256-pnhmfj349uMjSsmdr53dY1Xur6huRKHiXWI7DXYK1gE="; + rev = "refs/tags/v${version}"; + hash = "sha256-nl+V8Rtc5FWHIPUkcQmcaex6zwIdzdmEaim59pG497I="; }; propagatedBuildInputs = [ @@ -58,5 +58,7 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; + # https://github.com/dbt-labs/dbt-semantic-interfaces/issues/134 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index dccf0ed7f989a..028050eea7c14 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.6.2"; + version = "1.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "dbt-labs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AOO3VbU1R3/snH7U7K9XXokBGXtf9Udpv7eR5HCBxss="; + hash = "sha256-v+9uxHeROZU7vZvvB7UYUFNM6ez97qiZmgDiunUKf04="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus-deviation/default.nix b/pkgs/development/python-modules/dbus-deviation/default.nix index 164c543a5ed79..739c9ba43aca8 100644 --- a/pkgs/development/python-modules/dbus-deviation/default.nix +++ b/pkgs/development/python-modules/dbus-deviation/default.nix @@ -2,14 +2,14 @@ , buildPythonPackage , fetchPypi , lxml +, setuptools , setuptools-git -, sphinx }: buildPythonPackage rec { pname = "dbus-deviation"; version = "0.6.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -21,8 +21,8 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools setuptools-git - sphinx ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus-python/default.nix similarity index 89% rename from pkgs/development/python-modules/dbus/default.nix rename to pkgs/development/python-modules/dbus-python/default.nix index f929f58de1c38..be7504e5dc372 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus-python/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchPypi, buildPythonPackage, python, pkg-config, dbus, dbus-glib, isPyPy -, ncurses, pygobject3, isPy3k }: +, ncurses, pygobject3, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "dbus-python"; version = "1.2.18"; - disabled = isPyPy; + # ModuleNotFoundError: No module named 'distutils' + disabled = isPyPy || pythonAtLeast "3.12"; format = "other"; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/dbus/fix-includedir.patch b/pkgs/development/python-modules/dbus-python/fix-includedir.patch similarity index 100% rename from pkgs/development/python-modules/dbus/fix-includedir.patch rename to pkgs/development/python-modules/dbus-python/fix-includedir.patch diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index 6e1f2b154a53f..f0def3a3ad38b 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -1,34 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, six, pyyaml, mock +, pythonOlder + +# build-system +, setuptools + +# tests +, aiounittest +, mock , pytestCheckHook -, enum34 -, isPy3k +, pyyaml +, six }: buildPythonPackage rec { pname = "ddt"; - version = "1.6.0"; - format = "setuptools"; + version = "1.7.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9xs0hzG4x4wxAL/72VGnafvUOQiNH9uzhB7uAZr4Cs0="; + hash = "sha256-0XjRFavyWhuDJ+lPhaA+8JsdewyiVvYgMoSwJPL8cN8="; }; - propagatedBuildInputs = lib.optionals (!isPy3k) [ - enum34 + nativeBuildInputs = [ + setuptools ]; - nativeCheckInputs = [ six pyyaml mock pytestCheckHook ]; + # aiounittest is not compatible with Python 3.12. + doCheck = pythonOlder "3.12"; - preCheck = '' - # pytest can't import one file even with PYTHONPATH set - rm test/test_named_data.py - ''; + nativeCheckInputs = [ + aiounittest + mock + pytestCheckHook + pyyaml + six + ]; meta = with lib; { + changelog = "https://github.com/datadriventests/ddt/releases/tag/${version}"; description = "Data-Driven/Decorated Tests, a library to multiply test cases"; homepage = "https://github.com/txels/ddt"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 13704b20939a8..941efb1311119 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "deal"; - version = "4.24.2"; + version = "4.24.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "life4"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bdIoKOOC7qSer9Cp9A55HG960xunKXT2WiXp0UC6tsI="; + hash = "sha256-QlM3d/jmg6v3L3D45+cgcCej71U1dl4uZ6sAYGGm3tU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index cc6a4fffc422d..eb0b89ba9871c 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-RglPlTRksmm7CYVere7jySy2tIegv6JuulN7Usw9a0c="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - dontConfigure = true; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 93deb8c10b815..64cae1af74c1d 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "6.4.1"; + version = "6.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = "refs/tags/${version}"; - hash = "sha256-oO5+ZCDgqonxaHR95tSrPkZDar/fzr1FXtl6J2W3PeU="; + hash = "sha256-YGYprSC5j06Ozg0dUJN5xnba0HUgiXa+d9Ci3czGWoY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 034be82d7e391..8d3f0cf20e11f 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { wheel ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ libdeltachat ]; diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index b553a1b0837a8..42205ac652f9a 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , pydantic , fetchFromGitHub +, fetchpatch , poetry-core , yarl , aresponses @@ -27,6 +28,16 @@ buildPythonPackage rec { hash = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc="; }; + patches = [ + # https://github.com/frenck/python-demetriek/pull/531 + (fetchpatch { + name = "pydantic_2-compatibility.patch"; + url = "https://github.com/frenck/python-demetriek/commit/e677fe5b735b6b28572e3e5fd6aab56fc056f5e6.patch"; + excludes = [ "pyproject.toml" "poetry.lock" ]; + hash = "sha256-oMVR45KHDhcPId/0X9obJXCPE8s1gk5IgsGsgZesdZw="; + }) + ]; + postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ @@ -56,6 +67,8 @@ buildPythonPackage rec { "demetriek" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Python client for LaMetric TIME devices"; homepage = "https://github.com/frenck/python-demetriek"; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index ff00a9fd200ab..0b575412e8541 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -78,5 +78,7 @@ buildPythonPackage rec { changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${version}/docs/main/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; + # https://github.com/ets-labs/python-dependency-injector/issues/726 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index e614f206f3285..8d06b409d5781 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-4AyC1DDYtKl8SwJf75BbzoOAhbZXmBZ05ma9YmLzksM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 5fac8fd6aa0fb..ad34b49280f6b 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -33,8 +33,6 @@ buildPythonPackage rec { --replace "protobuf>=4.22.0" "protobuf" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dictdiffer/default.nix b/pkgs/development/python-modules/dictdiffer/default.nix index 2bb16eb097b99..acbc3996fbc6b 100644 --- a/pkgs/development/python-modules/dictdiffer/default.nix +++ b/pkgs/development/python-modules/dictdiffer/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix index bab6cd3f6c7bb..7a7c28fbe4bc0 100644 --- a/pkgs/development/python-modules/diff-cover/default.nix +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "diff-cover"; - version = "7.7.0"; + version = "8.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "diff_cover"; inherit version; - hash = "sha256-YGFM9+ciz3+xveSXr6wLUUKU4eJlNESWItrE2ilhI/s="; + hash = "sha256-zDnRmety/kG83P7hZOtbWRUztMYlWA4/mprMaGkGTXw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dirty-equals/default.nix b/pkgs/development/python-modules/dirty-equals/default.nix index 9f40226e6bb36..8ef6259761678 100644 --- a/pkgs/development/python-modules/dirty-equals/default.nix +++ b/pkgs/development/python-modules/dirty-equals/default.nix @@ -12,7 +12,7 @@ let dirty-equals = buildPythonPackage rec { pname = "dirty-equals"; - version = "0.7.0"; + version = "0.7.1-post0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ let owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; + hash = "sha256-U6DNluthDgxzh6IOaKrN/JhX4u+ztY/jVp9IKh0iP34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diskcache/default.nix b/pkgs/development/python-modules/diskcache/default.nix index 6f275a01fa70a..328777370782f 100644 --- a/pkgs/development/python-modules/diskcache/default.nix +++ b/pkgs/development/python-modules/diskcache/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "diskcache"; - version = "5.4.0"; + version = "5.6.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "grantjenks"; repo = "python-diskcache"; rev = "v${version}"; - hash = "sha256-c/k8mx/T4RkseDobJ2gtcuom0A6Ewyw4aP2Bk9pxV+o="; + hash = "sha256-1cDpdf+rLaG14TDd1wEHAiYXb69NFTFeOHD1Ib1oOVY="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/dissect-cim/default.nix b/pkgs/development/python-modules/dissect-cim/default.nix index 37de761ca567f..acac46050a273 100644 --- a/pkgs/development/python-modules/dissect-cim/default.nix +++ b/pkgs/development/python-modules/dissect-cim/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-+HHjDUSepAEebMD5ckjXbfgA4AKlNMBYHwxDq+jdhxw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-clfs/default.nix b/pkgs/development/python-modules/dissect-clfs/default.nix index 8dc3c9e20c123..0f44c587c7464 100644 --- a/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/pkgs/development/python-modules/dissect-clfs/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-JdfO9KVuK1TsDyqEQkuHPJtSHDCym63imvLSHsVwQ3k="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index c232bdb0bf4ae..7b25a817aa649 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { hash = "sha256-CS50c3r7sdxp3CRS6XJ4QUmUFtmhFg6rSdKfYzJSOV4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-cstruct/default.nix b/pkgs/development/python-modules/dissect-cstruct/default.nix index a40b806ab01d5..cecc7dffef3fb 100644 --- a/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-cdBojvFI0cN6mEZ98xLa3XldvIoR+Jv1c0/hvVkKVoQ="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-esedb/default.nix b/pkgs/development/python-modules/dissect-esedb/default.nix index 76e9eae46fa4f..1253b9ebb9c8b 100644 --- a/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/pkgs/development/python-modules/dissect-esedb/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-RlXnUD+KiBmntM/f7jEzdZ0Tdb8vPGvW0e3XoANaPnk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-etl/default.nix b/pkgs/development/python-modules/dissect-etl/default.nix index de6a49ba9e262..1e110a915f9a9 100644 --- a/pkgs/development/python-modules/dissect-etl/default.nix +++ b/pkgs/development/python-modules/dissect-etl/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-z6P7XpA+j9JIJJsp/Z4uewFw9OAPSZV+57eJu7rd17I="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-eventlog/default.nix b/pkgs/development/python-modules/dissect-eventlog/default.nix index 9c11a3ee87781..60f9d52cac74d 100644 --- a/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-h1LrBt8f9YFkc1uAAb4WwY3LjPuvsdVFvxji3QxKF0A="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-evidence/default.nix b/pkgs/development/python-modules/dissect-evidence/default.nix index b1d8bb2b1b843..e60f81e419626 100644 --- a/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/pkgs/development/python-modules/dissect-evidence/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-b7Ls3Xfd0scMe/gccjvRfuADITnz5QpJNLUaIgmZtpI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-executable/default.nix b/pkgs/development/python-modules/dissect-executable/default.nix index d8f3e6cb08c2d..7b3757d0f3ad5 100644 --- a/pkgs/development/python-modules/dissect-executable/default.nix +++ b/pkgs/development/python-modules/dissect-executable/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-h9eOTWJR0Bd3DY8WDYWqLCl1jYJcqP6cRTgWubf/rKI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-extfs/default.nix b/pkgs/development/python-modules/dissect-extfs/default.nix index 1523749bf8bb1..86206ee27ac14 100644 --- a/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/pkgs/development/python-modules/dissect-extfs/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-RsAWqtoarn/2sZU5dkQYt794dXGOr5fe68VgMNDBst4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 0a22c7b8b7baf..be5043fd27de5 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-YfWshytfj4p2MqLpzE3b1/RtrL1/+Xd/5+RNbrH/Jfc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-ffs/default.nix b/pkgs/development/python-modules/dissect-ffs/default.nix index 8e5dbaac04450..3d1afcf31ccbe 100644 --- a/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/pkgs/development/python-modules/dissect-ffs/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-eyqqsOKcRmzOY+fj1FYudh9FUanD0Z59zZPtsNz6I0s="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index e7f17cb0286c2..975526db71581 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-ntfs/default.nix b/pkgs/development/python-modules/dissect-ntfs/default.nix index 96b3cb3a67455..4d69844c9884d 100644 --- a/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-bnFimn5ektIKiX73NZ+1Iz3Uoew138a0nFJgypffC4o="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-ole/default.nix b/pkgs/development/python-modules/dissect-ole/default.nix index d76e11cb3f530..3d47252b829f8 100644 --- a/pkgs/development/python-modules/dissect-ole/default.nix +++ b/pkgs/development/python-modules/dissect-ole/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-4shxYKR6IrrMj2BIb5yFD7+C0SNyqsGOoBkWpad1EbI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 94881ca3ca42a..a2050fe6bd3c0 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-4tKu7oPkpNcWr2XJvZg94yZZcbTeeXBphPCLoZYzg6U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index ad2fb1ed7a750..77e1e6344fe29 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-g8o6W5MZ7E8AKYs5QGQGw3IQhZehrOcY6wJrt9TJf4s="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index 173170396f726..208096a56e52b 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-BHwm88IPtfg/bi5veFGnciQeH4s0asVnxiMVsIi8vV8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index cc1f4999d8589..d42058f952cc4 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-MJKC05/8NnJFdyBB5YPbqe8mp1zlIoS2FglKEPSSYd8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index 3aa4c39b9f521..62f4a745156c6 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -51,8 +51,6 @@ buildPythonPackage rec { hash = "sha256-vp1upVwohMXFKxlHy5lWmigdq9MUk1UknSsPpCXt50s="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-thumbcache/default.nix b/pkgs/development/python-modules/dissect-thumbcache/default.nix index e63e7bb4ac916..1e6d36a0cdc6d 100644 --- a/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-q35VL3BUZrxNBB5mHegqVObG76BYG4FAk/KIAvdm6B8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-util/default.nix b/pkgs/development/python-modules/dissect-util/default.nix index 94c193b5b1911..495294db9c3f7 100644 --- a/pkgs/development/python-modules/dissect-util/default.nix +++ b/pkgs/development/python-modules/dissect-util/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-GUDYr3lP0BV7zJaaUen78CplRA7jfn1zYes7kczNGEU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-vmfs/default.nix b/pkgs/development/python-modules/dissect-vmfs/default.nix index d3efbcdf6420c..740b9f668f0c5 100644 --- a/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-FDxB87TeAMUp0hP9YS/nrqNx71+ZlHf3Bsaqvuwx36U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-volume/default.nix b/pkgs/development/python-modules/dissect-volume/default.nix index 1ef6ffb449982..1a2ce1e273550 100644 --- a/pkgs/development/python-modules/dissect-volume/default.nix +++ b/pkgs/development/python-modules/dissect-volume/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-5ZO++l6BWA085U5IkghjCT46YhKc85SB7sNU2h4Fpec="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect-xfs/default.nix b/pkgs/development/python-modules/dissect-xfs/default.nix index d4f36cbc04d5c..1f46b745edc35 100644 --- a/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/pkgs/development/python-modules/dissect-xfs/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-unrkmhLvjWWKHiqJWCEVEVcUjxWXMznjOytRbDwAxKw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix index 54787ec221828..2d15c4f5a7202 100644 --- a/pkgs/development/python-modules/dissect/default.nix +++ b/pkgs/development/python-modules/dissect/default.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { hash = "sha256-6y+p+Ulc1Viu5s1AL/ecVtO4YRnmem/ZleY8xC4CJrU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 074a450a39e4e..c5be90d0af98a 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -10,6 +10,7 @@ , packaging , psutil , pythonOlder +, pythonRelaxDepsHook , pyyaml , setuptools , setuptools-scm @@ -43,11 +44,16 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools setuptools-scm versioneer ] ++ versioneer.optional-dependencies.toml; + pythonRelaxDeps = [ + "dask" + ]; + propagatedBuildInputs = [ click cloudpickle diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 5e1e1a57928d4..bbbb2aeabd032 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -9,18 +9,19 @@ , responses , unittest-xml-reporting , python +, setuptools }: buildPythonPackage rec { pname = "dj-rest-auth"; - version = "5.0.1"; - format = "setuptools"; + version = "5.0.2"; + pyproject = true; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = "refs/tags/${version}"; - hash = "sha256-PTFUZ54vKlufKCQyJb+QB/+hI15r+Z0auTjnc38yMLg="; + hash = "sha256-TqeNpxXn+v89fEiJ4AVNhp8blCfYQKFQfYmZ6/QlRbQ="; }; patches = [ @@ -37,6 +38,10 @@ buildPythonPackage rec { --replace "==" ">=" ''; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index a4944b830d23d..7ff0038eb33eb 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -5,24 +5,28 @@ , requests , django , boto3 -, python , mock , pytestCheckHook , pytest-django +, setuptools }: buildPythonPackage rec { pname = "django-anymail"; - version = "10.1"; - format = "setuptools"; + version = "10.2"; + pyproject = true; src = fetchFromGitHub { owner = "anymail"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-unmbYQFLeqfqE1uFLMPLUad1UqA+sgbTzwRfpRhM3ik="; + hash = "sha256-k4C82OYm2SdjxeLScrkkitumjYgWkMNFlNeGW+C1Z8o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six requests diff --git a/pkgs/development/python-modules/django-auditlog/default.nix b/pkgs/development/python-modules/django-auditlog/default.nix index fa52f1b3d59cc..4a176b0b14ec3 100644 --- a/pkgs/development/python-modules/django-auditlog/default.nix +++ b/pkgs/development/python-modules/django-auditlog/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-QHSGqtpkOgltAg+RlG/Ik3DfEjtSWt45sqlD+Zw4Bh0="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix index b0df11aefd0c8..530efc2a56140 100644 --- a/pkgs/development/python-modules/django-ckeditor/default.nix +++ b/pkgs/development/python-modules/django-ckeditor/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-mZQ5s3YbumYmT0zRWPFIvzt2TbtDLvVcJjZVAwn31E8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index 60e04b184e9fa..a5c85a485695b 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -43,8 +43,6 @@ buildPythonPackage rec { hash = "sha256-X3bJ6STFq6zGIzXHSd2C67d4kSOVJJR5aBSM3o5T850="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ gettext nodejs diff --git a/pkgs/development/python-modules/django-js-asset/default.nix b/pkgs/development/python-modules/django-js-asset/default.nix index f579a31dc3e7c..54c4c4b90eb45 100644 --- a/pkgs/development/python-modules/django-js-asset/default.nix +++ b/pkgs/development/python-modules/django-js-asset/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "django-js-asset"; - version = "2.1"; + version = "2.2"; format = "pyproject"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rxJ9TgVBiJByiFSLTg/dtAR31Fs14D4sh2axyBcKGTU="; + hash = "sha256-qAkE5ubzfTNO1LuMQXMW2Sot1cn/bhuXlWa/J/wD5SI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-login-required-middleware/default.nix b/pkgs/development/python-modules/django-login-required-middleware/default.nix index 6c69ef7ef27af..b288e79290599 100644 --- a/pkgs/development/python-modules/django-login-required-middleware/default.nix +++ b/pkgs/development/python-modules/django-login-required-middleware/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index f5942b9b9bf4a..74a2dd61f7cd0 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.9"; + version = "1.3.11"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-GpI1W0O9aJpLF/mcS23ktJDZsP69S2zQy7drOiWBnTM="; + hash = "sha256-uIjJaZHWL2evj+oISLprvKWT5Sm5f2EKgUD1twL1VbQ="; }; patches = [ diff --git a/pkgs/development/python-modules/django-maintenance-mode/default.nix b/pkgs/development/python-modules/django-maintenance-mode/default.nix index 8dd2ad71b242e..e6940c53b4309 100644 --- a/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-maintenance-mode"; - version = "0.18.0"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Mcj8O20hCINGf5T3PCG9jq0onSrm4R+Ke5CLMqMDmuU="; + hash = "sha256-NAm3xMcHePTYxysihYj48bk7r9ykEtPcxPjSEju/zMM="; }; patches = [ diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 648634b0f32cc..6c82422cf0e09 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-p3/JO6wNwZPYX7MIgMj/0caHt5s+uL51Sxa28/VITxo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 620960797ea04..2aa349e71bc71 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "0.22.2"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "vitalik"; repo = "django-ninja"; rev = "v${version}"; - hash = "sha256-oeisurp9seSn3X/5jFF9DMm9nU6uDYIU1b6/J3o2be0="; + hash = "sha256-hF6Z8i8M4mQtVPIupTSEIkJh0i/oMFFuE9PpODxq4fw="; }; propagatedBuildInputs = [ django pydantic ]; @@ -38,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { changelog = "https://github.com/vitalik/django-ninja/releases/tag/v${version}"; description = "Web framework for building APIs with Django and Python type hints"; - homepage = "https://django-ninja.rest-framework.com/"; + homepage = "https://django-ninja.dev"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 76d376d11c092..89f998c058b9c 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "django-pattern-library"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "torchbox"; repo = "django-pattern-library"; - rev = "v${version}"; - hash = "sha256-Q8rv7RDlstTSlwmbmHV0vrnCV/lwz6VJf27BUllA34Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-9uuLYwG0/NYGouncuaN8S+3CBABSxSOkcrP59p5v84U="; }; patches = [ diff --git a/pkgs/development/python-modules/django-payments/default.nix b/pkgs/development/python-modules/django-payments/default.nix index 577a2ca5132ef..d470bb57a2e50 100644 --- a/pkgs/development/python-modules/django-payments/default.nix +++ b/pkgs/development/python-modules/django-payments/default.nix @@ -33,8 +33,6 @@ buildPythonPackage rec { --replace "django-phonenumber-field[phonenumberslite]" "django-phonenumber-field" ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-phonenumber-field/default.nix b/pkgs/development/python-modules/django-phonenumber-field/default.nix index 41b3dee76f426..759bcdbfccca3 100644 --- a/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-QEmwCdSiaae7mhmCPcV5F01f1GRxmIur3tyhv0XK7I4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index 5ed17c5f6425b..a38671d97c0ff 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-XY6YNajwX5z3AXkYYGFtrURDqxub9EQwu52jQ7CZwrI="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index 96811351269df..a6a873bee00ef 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -2,41 +2,73 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , django , tablib -, python + +# tests +, lxml +, openpyxl +, psycopg2 +, pytz +, pyyaml +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { pname = "django-tables2"; - version = "2.6.0"; - format = "setuptools"; + version = "2.7.0"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jieter"; repo = pname; rev = "v${version}"; - hash = "sha256-n8qvsm/i+2VclFc00jQGO0Z4l6Ke8qZ03EYuEQcPuVQ="; + hash = "sha256-VB7xmcBncTUYllzKS4o7G7u+KoivMiiEQGZ4x+Rnces="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ django - tablib ]; - pythonImportsCheck = [ - # Requested setting DJANGO_TABLES2_TEMPLATE, but settings are not configured. - ]; + passthru.optional-dependencies = { + tablib = [ + tablib + ] + ++ tablib.optional-dependencies.xls + ++ tablib.optional-dependencies.yaml; + }; - doCheck = false; # needs django-boostrap{3,4} packages + env.DJANGO_SETTINGS_MODULE = "tests.app.settings"; - # Leave this in! Discovering how to run tests is annoying in Django apps - checkPhase = '' - ${python.interpreter} example/manage.py test - ''; + nativeCheckInputs = [ + lxml + openpyxl + psycopg2 + pytz + pyyaml + pytest-django + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + disabledTestPaths = [ + # requires django-filters + "tests/test_views.py" + ]; meta = with lib; { + changelog = "https://github.com/jieter/django-tables2/blob/v${version}/CHANGELOG.md"; description = "Django app for creating HTML tables"; homepage = "https://github.com/jieter/django-tables2"; license = licenses.bsd2; diff --git a/pkgs/development/python-modules/django-types/default.nix b/pkgs/development/python-modules/django-types/default.nix index 5c16312538ace..e79530ccda731 100644 --- a/pkgs/development/python-modules/django-types/default.nix +++ b/pkgs/development/python-modules/django-types/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "django-types"; - version = "0.18.0"; + version = "0.19.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-uOIzTIEIZNer8RzTzbHaOyAVtn5/EnAAfjN3f/G9hlQ="; + hash = "sha256-WueYhhLPb7w1ewGLvDs6h4tl4EJ1zEbg011mpwja/xI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index 88dc763aa15fb..beb49f409270d 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "2.1.3"; + version = "3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HrcQt0Mdko+/XJd0srQTBYMtHaLZyImMuQn39HIwDfY="; + hash = "sha256-S7n14nv6DZgusntVXh65PM/oaYZGCxaFylPbVXxmLj4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-widget-tweaks/default.nix b/pkgs/development/python-modules/django-widget-tweaks/default.nix index b77af5e47491c..547df7c7fdfbd 100644 --- a/pkgs/development/python-modules/django-widget-tweaks/default.nix +++ b/pkgs/development/python-modules/django-widget-tweaks/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-/3UIsg75X3R9YGv9cEcoPw3IN2vkhUb+HCy68813d2E="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 69c438739f23f..5dd27fd833274 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.7"; + version = "4.2.8"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-jg8cLCeGtcDjn+GvziTJJgQPrUfI6orTCq8RiN8p/EE="; + hash = "sha256-1p1eNsxdn060hyvjbGIoeK/NzpQGJxbPPiW87csWi2I="; }; patches = [ diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 1d1d76ed3b685..7cefe674b24b1 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.14.2"; + version = "3.14.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = "djangorestframework-stubs"; - rev = version; - hash = "sha256-T357ocJvDC+vt0I4VyAu0Q9YzY9cSK7shgp9fQ1qHyY="; + rev = "refs/tags/${version}"; + hash = "sha256-DNoD6V7l224yQa+AfI+KNviUJBxKB0u0m9B5qX5HuzQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 80c73f2fe0a61..579584c531049 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -3,28 +3,38 @@ , buildPythonPackage , fetchPypi , pythonOlder + +# build-system +, setuptools +, setuptools-scm + +# dependencies , packaging -, paramiko -, pytestCheckHook , requests -, setuptools-scm , urllib3 + +# optional-dependenices +, paramiko , websocket-client + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "docker"; - version = "6.1.3"; + version = "7.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qm0XgwBFul7wFo1eqjTTe+6xE5SMQTr/4dWZH8EfmiA="; + hash = "sha256-Mjc2+5LNlBj8XnEzvJU+EanaBPRIP4KLUn21U/Hn5aM="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -32,16 +42,24 @@ buildPythonPackage rec { packaging requests urllib3 - websocket-client ]; - passthru.optional-dependencies.ssh = [ - paramiko + passthru.optional-dependencies = { + ssh = [ + paramiko + ]; + websockets = [ + websocket-client + ]; + }; + + pythonImportsCheck = [ + "docker" ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "tests/unit" @@ -49,16 +67,13 @@ buildPythonPackage rec { # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.isDarwin [ - "api_test" "stream_response" "socket_file" - ]; - - dontUseSetuptoolsCheck = true; - - pythonImportsCheck = [ - "docker" + "api_test" + "stream_response" + "socket_file" ]; meta = with lib; { + changelog = "https://github.com/docker/docker-py/releases/tag/${version}"; description = "An API client for docker written in Python"; homepage = "https://github.com/docker/docker-py"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix index 7023af73f1dfe..d0b9180570fa0 100644 --- a/pkgs/development/python-modules/dockerspawner/default.nix +++ b/pkgs/development/python-modules/dockerspawner/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , jupyterhub , escapism , docker @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "dockerspawner"; - version = "12.1.0"; - format = "setuptools"; + version = "13.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "3894ed8a9157f8ac8f42e0130f43932490ac5d1e89e6f295b1252f08c00ba36b"; + hash = "sha256-POlTZ9luS9wQ/vt9w8VMfTEqGzg/DhfB45ePfvnyito="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jupyterhub escapism diff --git a/pkgs/development/python-modules/docstring-to-markdown/default.nix b/pkgs/development/python-modules/docstring-to-markdown/default.nix index 2832228394c31..958adb3ffbf19 100644 --- a/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "docstring-to-markdown"; - version = "0.12"; + version = "0.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c0gk1s/+25+pWUpi8geDQZ0f9JBeuvvFQ9MFskRnY6U="; + hash = "sha256-r+TRYofTRDCBC0s+bJRhagepEQbbj5WeI5FRtaVPt24="; }; patches = [ diff --git a/pkgs/development/python-modules/dominate/default.nix b/pkgs/development/python-modules/dominate/default.nix index 38aaccf4b15a7..24aa9efa2a848 100644 --- a/pkgs/development/python-modules/dominate/default.nix +++ b/pkgs/development/python-modules/dominate/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "dominate"; - version = "2.8.0"; - format = "setuptools"; + version = "2.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-TJDDvvr4jmErcfSzmve8vviXes+oVc7JVyJaj79QQAc="; + hash = "sha256-sVeR6+pDIhhUOhcC12rkXS/5X/mU5SAUuGhqadrXcv0="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/dtschema/default.nix b/pkgs/development/python-modules/dtschema/default.nix index 1e890aba3309c..cb4fa7fcdf47d 100644 --- a/pkgs/development/python-modules/dtschema/default.nix +++ b/pkgs/development/python-modules/dtschema/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { ./fix_libfdt_name.patch ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 5ff9956849926..a7cd1aa36dd45 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -32,7 +32,6 @@ buildPythonPackage rec { ''; BUILD_HTTPFS = 1; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ pybind11 diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 46e2361d9db99..7cbd3ea50efcc 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.18.0"; + version = "1.19.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-QKXEFwOAa5nIQZA6DHNqnWyshnN+/6qovdqjCd9WF4k="; + hash = "sha256-wMIqm1bUub89ExnbvJBzuZ9479el8EgwVcfPpI+SD5Y="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 129ec14cd0a79..4339f69183049 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "duo-client"; - version = "5.0.1"; + version = "5.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "duosecurity"; repo = "duo_client_python"; rev = "refs/tags/${version}"; - hash = "sha256-G0XLZZaQTPD64WXN34wq2z+YtzECgtC2nJXzDxAlgyg="; + hash = "sha256-MnSAFxKgExq+e8TOwgsPAoO4GEfsc3sjPNGLxzch5f0="; }; postPatch = '' @@ -53,6 +53,11 @@ buildPythonPackage rec { # Tests require network access "test_server_hostname" "test_server_hostname_with_port" + "test_get_billing_edition" + "test_get_telephony_credits" + "test_set_business_billing_edition" + "test_set_enterprise_billing_edition" + "test_set_telephony_credits" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index fee36f66d8865..0575558920bab 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dvc-azure"; - version = "2.22.1"; + version = "2.23.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v3VRCN1OoST5RlfUOP9Dpfmf3o9C/ckusmh91Ya2Cik="; + hash = "sha256-0+G2n1ysRF/ggl5hkOsUW2UPOm6Y1ExZFBSMfOrEQyg="; }; # Prevent circular dependency diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 7c5489e3648ad..f342412dc63eb 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-OySGTJFHBb+Ot5NUZsQZ4gJkbc6ojrSyDWDPp32q74E="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-http/default.nix b/pkgs/development/python-modules/dvc-http/default.nix index 49737d9b21ce6..efe97c502cec3 100644 --- a/pkgs/development/python-modules/dvc-http/default.nix +++ b/pkgs/development/python-modules/dvc-http/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-ru/hOFv/RcS/7SBpTJU8xFxdllmaiH4dV1ouS6GGKkY="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index b5df60a987e64..ba583f4a8aa4e 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-nxZN0Q9mRAZJUOoxfE58lXZVOrY0r05iROcuo+nV99A="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pyproject.toml \ --replace " --benchmark-skip" "" diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index 1d7de80cf6612..a4527cd1b6c58 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-OrfepQuLBNa5m3Sy4NzFOArtFFvaNtNNVJ8DNN3yT6s="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index bfc3cc84e67a9..cc4b2149b1c3d 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-ZgjNshF5UFOY5TewNMlJDOajjI1Bfd/a4v7HrAKwaMw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 6cec59e72ac1f..9596957b96125 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-nrE8PdvzhH7lO0flvNkGC61NOVT4aj2E2gKEDRkp+b4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index f97a418a61ea3..440f7595de748 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-apk1akdFLtps5fq28GUgLef2VEgZulj7vuhxsGpCqJE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/dynalite-devices/default.nix b/pkgs/development/python-modules/dynalite-devices/default.nix index 7066271182ef4..b9ef5d1b5d716 100644 --- a/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/pkgs/development/python-modules/dynalite-devices/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-asyncio , pytestCheckHook , pythonOlder @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; }; + patches = [ + (fetchpatch { + # remove asynctest from tests + url = "https://github.com/ziv1234/python-dynalite-devices/commit/1729035f2b435b345b4e694aeae5d1823d732208.patch"; + hash = "sha256-LqFXrJrZTPPjPnWT4+blHFYS3W1fD9T+iwaLUauxjNE="; + }) + ]; + postPatch = '' sed -i '/^addopts/d' setup.cfg ''; diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix index a025eb3873084..abf6c957b0479 100644 --- a/pkgs/development/python-modules/echo/default.nix +++ b/pkgs/development/python-modules/echo/default.nix @@ -42,8 +42,6 @@ buildPythonPackage rec { qtpy ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - # collecting ... qt.qpa.xcb: could not connect to display # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. doCheck = false; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index c93ddff879bee..71e14320cb4e8 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -55,8 +55,6 @@ buildPythonPackage rec { "test_basic_parse" ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonImportsCheck = [ "edk2toollib" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e93388a1bbcc9..f2e5a4b599a68 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -1,25 +1,51 @@ -{ buildPythonPackage +{ lib +, aiohttp +, buildPythonPackage +, certifi +, elastic-transport , fetchPypi -, urllib3, requests -, nosexcover, mock -, lib +, pythonOlder +, requests +, urllib3 }: -buildPythonPackage (rec { +buildPythonPackage rec { pname = "elasticsearch"; - version = "8.9.0"; + version = "8.11.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-0zZ/wBPgT8eq00mm3p+tHuBPttYnsOeJaqUFwS/eXgQ="; + sha256 = "sha256-nghBO+r/Oka8EMbFcGmoRwTfaqqTCFxzffB/WKKBG3g="; + }; + + nativeBuildInputs = [ + elastic-transport + ]; + + propagatedBuildInputs = [ + urllib3 + certifi + ]; + + passthru.optional-dependencies = { + requests = [ + requests + ]; + async = [ + aiohttp + ]; }; + pythonImportsCheck = [ + "elasticsearch" + ]; + # Check is disabled because running them destroy the content of the local cluster! # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch doCheck = false; - propagatedBuildInputs = [ urllib3 requests ]; - buildInputs = [ nosexcover mock ]; meta = with lib; { description = "Official low-level client for Elasticsearch"; @@ -28,4 +54,4 @@ buildPythonPackage (rec { license = licenses.asl20; maintainers = with maintainers; [ desiderius ]; }; -}) +} diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 99ae071f4ae3c..0f176e45fd077 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "email-validator"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "JoshData"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - hash = "sha256-o7UREa+IBiFjmqx0p+4XJCcoHQ/R6r2RtoezEcWvgbg="; + hash = "sha256-58DuQslADM7glrnlSSP6TtIDTlwuS0/GK8+izatqDxI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index 3dbf9c9b65460..772fb64d1f14d 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-K2cPSbR7jnl9Vzf2sEiPZqk2vTwgChNWAf6CAerhZCg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index fb192e100c5a9..4479f50659279 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-DYLDQ9QwdK/a8eY0bFX31UNgxm8FUOaeNAnisFcyFNI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 35c702ea06d87..07f19e3493d9b 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -2,12 +2,19 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pythonOlder +, fetchpatch +, pythonAtLeast + +# build-system +, setuptools + +# dependencies , dnspython , greenlet , isPyPy -, monotonic , six + +# tests , nose3 , iana-etc , pytestCheckHook @@ -17,7 +24,7 @@ buildPythonPackage rec { pname = "eventlet"; version = "0.33.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "eventlet"; @@ -26,12 +33,25 @@ buildPythonPackage rec { hash = "sha256-iSSEZgPkK7RrZfU11z7hUk+JbFsCPH/SD16e+/f6TFU="; }; + patches = [ + # Python 3.12 fixes: + # - remove usage of distutils + # - replace ssl.wrap_socket usage + ./remove-distutils-usage.patch + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/python-eventlet/raw/rawhide/f/python3.12.patch"; + hash = "sha256-MxzprFaVcV1uamjjTeIz+2gPvfPy+Y1QaA20znMdwoA="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dnspython greenlet six - ] ++ lib.optionals (pythonOlder "3.5") [ - monotonic ]; nativeCheckInputs = [ @@ -41,7 +61,8 @@ buildPythonPackage rec { # libredirect is not available on darwin # tests hang on pypy indefinitely - doCheck = !stdenv.isDarwin && !isPyPy; + # nose3 is incompatible with Python 3.12. + doCheck = !stdenv.isDarwin && !isPyPy && !(pythonAtLeast "3.12"); preCheck = lib.optionalString doCheck '' echo "nameserver 127.0.0.1" > resolv.conf @@ -95,6 +116,7 @@ buildPythonPackage rec { # pythonImportsCheck = [ "eventlet" ]; meta = with lib; { + changelog = "https://github.com/eventlet/eventlet/blob/v${version}/NEWS"; description = "A concurrent networking library for Python"; homepage = "https://github.com/eventlet/eventlet/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch b/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch new file mode 100644 index 0000000000000..614a41f0a9785 --- /dev/null +++ b/pkgs/development/python-modules/eventlet/remove-distutils-usage.patch @@ -0,0 +1,143 @@ +diff --git a/eventlet/hubs/hub.py b/eventlet/hubs/hub.py +index db55958..c27b81f 100644 +--- a/eventlet/hubs/hub.py ++++ b/eventlet/hubs/hub.py +@@ -21,7 +21,7 @@ else: + + import eventlet.hubs + from eventlet.hubs import timer +-from eventlet.support import greenlets as greenlet, clear_sys_exc_info ++from eventlet.support import greenlets as greenlet + try: + from monotonic import monotonic + except ImportError: +@@ -309,7 +309,6 @@ class BaseHub(object): + cur.parent = self.greenlet + except ValueError: + pass # gets raised if there is a greenlet parent cycle +- clear_sys_exc_info() + return self.greenlet.switch() + + def squelch_exception(self, fileno, exc_info): +@@ -397,13 +396,11 @@ class BaseHub(object): + if self.debug_exceptions: + traceback.print_exception(*exc_info) + sys.stderr.flush() +- clear_sys_exc_info() + + def squelch_timer_exception(self, timer, exc_info): + if self.debug_exceptions: + traceback.print_exception(*exc_info) + sys.stderr.flush() +- clear_sys_exc_info() + + def add_timer(self, timer): + scheduled_time = self.clock() + timer.seconds +@@ -478,7 +475,6 @@ class BaseHub(object): + raise + except: + self.squelch_timer_exception(timer, sys.exc_info()) +- clear_sys_exc_info() + + # for debugging: + +diff --git a/eventlet/hubs/kqueue.py b/eventlet/hubs/kqueue.py +index bad4a87..8438805 100644 +--- a/eventlet/hubs/kqueue.py ++++ b/eventlet/hubs/kqueue.py +@@ -109,4 +109,3 @@ class Hub(hub.BaseHub): + raise + except: + self.squelch_exception(fileno, sys.exc_info()) +- support.clear_sys_exc_info() +diff --git a/eventlet/hubs/poll.py b/eventlet/hubs/poll.py +index 1bbd401..d3f9c6a 100644 +--- a/eventlet/hubs/poll.py ++++ b/eventlet/hubs/poll.py +@@ -113,7 +113,6 @@ class Hub(hub.BaseHub): + raise + except: + self.squelch_exception(fileno, sys.exc_info()) +- support.clear_sys_exc_info() + + if self.debug_blocking: + self.block_detect_post() +diff --git a/eventlet/hubs/selects.py b/eventlet/hubs/selects.py +index 0ead5b8..0386a1e 100644 +--- a/eventlet/hubs/selects.py ++++ b/eventlet/hubs/selects.py +@@ -61,4 +61,3 @@ class Hub(hub.BaseHub): + raise + except: + self.squelch_exception(fileno, sys.exc_info()) +- support.clear_sys_exc_info() +diff --git a/eventlet/support/__init__.py b/eventlet/support/__init__.py +index 43bac91..b1c1607 100644 +--- a/eventlet/support/__init__.py ++++ b/eventlet/support/__init__.py +@@ -30,15 +30,6 @@ def get_errno(exc): + return None + + +-if sys.version_info[0] < 3 and not greenlets.preserves_excinfo: +- from sys import exc_clear as clear_sys_exc_info +-else: +- def clear_sys_exc_info(): +- """No-op In py3k. +- Exception information is not visible outside of except statements. +- sys.exc_clear became obsolete and removed.""" +- pass +- + if sys.version_info[0] < 3: + def bytes_to_str(b, encoding='ascii'): + return b +diff --git a/eventlet/support/greenlets.py b/eventlet/support/greenlets.py +index d4e1793..b939328 100644 +--- a/eventlet/support/greenlets.py ++++ b/eventlet/support/greenlets.py +@@ -1,8 +1,4 @@ +-import distutils.version +- + import greenlet + getcurrent = greenlet.greenlet.getcurrent + GreenletExit = greenlet.greenlet.GreenletExit +-preserves_excinfo = (distutils.version.LooseVersion(greenlet.__version__) +- >= distutils.version.LooseVersion('0.3.2')) + greenlet = greenlet.greenlet +diff --git a/setup.py b/setup.py +index a8f4684..9b927e0 100644 +--- a/setup.py ++++ b/setup.py +@@ -19,7 +19,7 @@ setuptools.setup( + packages=setuptools.find_packages(exclude=['benchmarks', 'tests', 'tests.*']), + install_requires=( + 'dnspython >= 1.15.0', +- 'greenlet >= 0.3', ++ 'greenlet >= 1.0', + 'monotonic >= 1.4;python_version<"3.5"', + 'six >= 1.10.0', + ), +diff --git a/tests/hub_test.py b/tests/hub_test.py +index a531b75..05c0024 100644 +--- a/tests/hub_test.py ++++ b/tests/hub_test.py +@@ -194,7 +194,6 @@ class TestExceptionInMainloop(tests.LimitedTestCase): + + class TestExceptionInGreenthread(tests.LimitedTestCase): + +- @skip_unless(greenlets.preserves_excinfo) + def test_exceptionpreservation(self): + # events for controlling execution order + gt1event = eventlet.Event() +diff --git a/tests/test__refcount.py b/tests/test__refcount.py +index 1090a1f..5c1c002 100644 +--- a/tests/test__refcount.py ++++ b/tests/test__refcount.py +@@ -57,7 +57,6 @@ def run_interaction(run_client): + + def run_and_check(run_client): + w = run_interaction(run_client=run_client) +- # clear_sys_exc_info() + gc.collect() + fd = w() + print('run_and_check: weakref fd:', fd) diff --git a/pkgs/development/python-modules/exceptiongroup/default.nix b/pkgs/development/python-modules/exceptiongroup/default.nix index 61eef0a05abee..f19abc446058f 100644 --- a/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/pkgs/development/python-modules/exceptiongroup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.1.2"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,15 +18,13 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-19taP6adzmO4zH2As1OTXeYNFj6KwjhxBr09X+SrZRk="; + hash = "sha256-iGeaRVJeFAWfJpwr7N4kST7d8YxpX3WgDqQemlR0cLU="; }; nativeBuildInputs = [ flit-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/executing/default.nix b/pkgs/development/python-modules/executing/default.nix index 484f5690054ae..aad9455156d1f 100644 --- a/pkgs/development/python-modules/executing/default.nix +++ b/pkgs/development/python-modules/executing/default.nix @@ -1,18 +1,23 @@ { lib -, asttokens , buildPythonPackage , fetchFromGitHub -, littleutils -, pytestCheckHook , pythonAtLeast , pythonOlder -, rich + +# build-system +, setuptools , setuptools-scm + +# tests +, asttokens +, littleutils +, rich +, pytestCheckHook }: buildPythonPackage rec { pname = "executing"; - version = "1.2.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,12 +26,11 @@ buildPythonPackage rec { owner = "alexmojaki"; repo = pname; rev = "v${version}"; - hash = "sha256-3M3uSJ5xQ5Ciy8Lz21u9zjju/7SBSFHobCqSiJ6AP8M="; + hash = "sha256-PBvfkv9GQ5Vj5I5SygtmHXtqqHMJ4XgNV1/I+lSU0/U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ + setuptools setuptools-scm ]; @@ -38,6 +42,11 @@ buildPythonPackage rec { rich ]; + disabledTests = [ + # requires ipython, which causes a circular dependency + "test_two_statement_lookups" + ]; + pythonImportsCheck = [ "executing" ]; diff --git a/pkgs/development/python-modules/expandvars/default.nix b/pkgs/development/python-modules/expandvars/default.nix index 60055c6547ba3..14d637fa63cec 100644 --- a/pkgs/development/python-modules/expandvars/default.nix +++ b/pkgs/development/python-modules/expandvars/default.nix @@ -2,34 +2,39 @@ , buildPythonPackage , fetchPypi , pythonOlder -, setuptools -, wheel + +# build-system +, hatchling + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "expandvars"; - version = "0.11.0"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Q7Qn9dMnqzYAY98mFR+Y0qbwj+GPKJWjKn9fDxF7W1I="; + hash = "sha256-fRrfpVcoz0tdgS7OPQh3A/rqlT4MChp4QV3p31Ak2EQ="; }; nativeBuildInputs = [ - setuptools - wheel + hatchling ]; - # The PyPi package does not supply any tests - doCheck = false; - pythonImportsCheck = [ "expandvars" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { description = "Expand system variables Unix style"; homepage = "https://github.com/sayanarijit/expandvars"; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 7f414741b39eb..68e0e4e3b5ea4 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -5,6 +5,7 @@ , pillow , pytestCheckHook , python-dateutil +, setuptools , text-unidecode , ukpostcodeparser , validators @@ -12,15 +13,19 @@ buildPythonPackage rec { pname = "faker"; - version = "19.6.1"; - format = "setuptools"; + version = "20.1.0"; + pyproject = true; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-XWt4gLO+pwgHXd+Rk4QkRT8HBTpZ+PoEU8GHDfb/MpI="; + hash = "sha256-Vio6CcPtOhp7IOE9efkE39/F50D3KBPs+V5M9x5aL1I="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-dateutil text-unidecode diff --git a/pkgs/development/python-modules/farm-haystack/default.nix b/pkgs/development/python-modules/farm-haystack/default.nix index 43988b76e7d55..efc68f4cb0ad3 100644 --- a/pkgs/development/python-modules/farm-haystack/default.nix +++ b/pkgs/development/python-modules/farm-haystack/default.nix @@ -286,5 +286,7 @@ buildPythonPackage rec { homepage = "https://github.com/deepset-ai/haystack"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; + # https://github.com/deepset-ai/haystack/issues/5304 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/fast-histogram/default.nix b/pkgs/development/python-modules/fast-histogram/default.nix index 7eb3944d690af..229e448ea704f 100644 --- a/pkgs/development/python-modules/fast-histogram/default.nix +++ b/pkgs/development/python-modules/fast-histogram/default.nix @@ -42,8 +42,6 @@ buildPythonPackage rec { pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonImportsCheck = [ "fast_histogram" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index 52d3c44357244..258425e35f852 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -11,6 +11,7 @@ , jinja2 , poetry-core , pydantic +, pydantic-settings , pytest-asyncio , pytestCheckHook , python-multipart @@ -19,23 +20,23 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.3.1"; - format = "pyproject"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sabuhish"; - repo = pname; + repo = "fastapi-mail"; rev = "refs/tags/${version}"; - hash = "sha256-m8d4y75+mSh9A+YVaV/yZhN3ckOe2mV1jdtfeNFtU/w="; + hash = "sha256-2iTZqZIxlt1GKhElasTcnys18UbNNDwHoZziHBOIGBo="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'version = "1.2.5"' 'version = "${version}"' \ --replace 'aiosmtplib = "^2.0"' 'aiosmtplib = "*"' \ - --replace 'pydantic = "^1.8"' 'pydantic = "*"' \ + --replace 'pydantic = "^2.0"' 'pydantic = "*"' \ ''; nativeBuildInputs = [ @@ -52,6 +53,7 @@ buildPythonPackage rec { httpx jinja2 pydantic + pydantic-settings python-multipart ]; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 428cf9f8d91d1..89c1c2ffbe409 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook # build-system , hatchling @@ -31,11 +32,13 @@ , orjson , email-validator , uvicorn +, pydantic-settings +, pydantic-extra-types }: buildPythonPackage rec { pname = "fastapi"; - version = "0.103.1"; + version = "0.104.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -44,11 +47,18 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2J8c3S4Ca+c5bI0tyjMJArJKux9qPmu+ohqve5PhSGI="; + hash = "sha256-xTTFBc+fswLYUhKRkWP/eiYSbG3j1E7CASkEtHVNTlk="; }; nativeBuildInputs = [ hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "anyio" + # https://github.com/tiangolo/fastapi/pull/9636 + "starlette" ]; propagatedBuildInputs = [ @@ -67,8 +77,9 @@ buildPythonPackage rec { orjson email-validator uvicorn - # pydantic-settings - # pydantic-extra-types + ] ++ lib.optionals (lib.versionAtLeast pydantic.version "2") [ + pydantic-settings + pydantic-extra-types ] ++ uvicorn.optional-dependencies.standard; nativeCheckInputs = [ @@ -87,6 +98,9 @@ buildPythonPackage rec { # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py "-W ignore::DeprecationWarning" + + # http code mismatches + "--deselect=tests/test_annotated.py::test_get" ]; disabledTestPaths = [ @@ -112,6 +126,10 @@ buildPythonPackage rec { "test_warn_duplicate_operation_id" # assert state["except"] is True "test_dependency_gets_exception" + # Fixtures drift + "test_openapi_schema_sub" + # 200 != 404 + "test_flask" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix index 54a475c08b017..f685d210b87bc 100644 --- a/pkgs/development/python-modules/fastavro/default.nix +++ b/pkgs/development/python-modules/fastavro/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-W+fFZAQU7W6gDqB6LOrG8se6mBATFZWmepTt1HSphbE="; + hash = "sha256-10r12Ya+FKMgdOTmgYH1xb6vOXNLLw073VzCvo2x9kg="; }; preBuild = '' diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 38d09c47705cf..3dcdb073aeea6 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "fasteners"; - version = "0.18"; + version = "0.19"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "harlowja"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FGcGGRfObOqXuURyEuNt/KDn51POpdNPUJJKtMcLJNI="; + hash = "sha256-XFa1ItFqkSYE940p/imWFp5e9gS6n+D1uM6Cj+Vzmmg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix index 8c1be492ec156..93edef365178d 100644 --- a/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastjsonschema"; - version = "2.16.2"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "python-fastjsonschema"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg="; + hash = "sha256-t6JnqQgsWAL8oL8+LO0xrXMYsZOlTF3DlXkRiqUzYtU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index 7be3e25698ba2..69cdd4c3e3782 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "fastnumbers"; - version = "5.0.1"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "SethMMorton"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-y9QnFh44zHC+CSlYtKPmkhLSFBUquYZv4qP/pQxu9e0="; + hash = "sha256-TC9+xOvskABpChlrSJcHy6O7D7EnIKL6Ekt/vaLBX2E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 05cb76f1dd48f..9105fbd406121 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -32,8 +32,6 @@ buildPythonPackage rec { hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ cython oldest-supported-numpy diff --git a/pkgs/development/python-modules/filecheck/default.nix b/pkgs/development/python-modules/filecheck/default.nix index b7b9c2948ae2e..9d8c22756fb9a 100644 --- a/pkgs/development/python-modules/filecheck/default.nix +++ b/pkgs/development/python-modules/filecheck/default.nix @@ -1,30 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry-core +, hatchling , pytestCheckHook }: buildPythonPackage rec { pname = "filecheck"; - version = "0.0.23"; + version = "0.0.24"; format = "pyproject"; src = fetchFromGitHub { owner = "mull-project"; repo = "FileCheck.py"; rev = "refs/tags/v${version}"; - hash = "sha256-R+e4Z1EX6Nk7INLar3gtkUpk+30xIJO7yiZbUvrhN74="; + hash = "sha256-VbMlCqGd3MVpj0jEKjSGC2L0s/3e/d53b+2eZcXZneo="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry>=0.12" "poetry-core" \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; - nativeBuildInputs = [ - poetry-core + hatchling ]; nativeCheckInputs = [ @@ -36,6 +30,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/mull-project/FileCheck.py/releases/tag/v${version}"; homepage = "https://github.com/mull-project/FileCheck.py"; license = licenses.asl20; description = "Python port of LLVM's FileCheck, flexible pattern matching file verifier"; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 74cd6e727dbd6..b32335bb24754 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "filelock"; - version = "3.12.4"; + version = "3.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Lm8knx82VCkWBuBGsJ8f1erDmzYGZMJ/Wq0HIBL4vL0="; + hash = "sha256-Uh9fVsUPhCb14DrTsoG0kKh+8VvGxSbxaCkPDHFI1E4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix index 4bb5e9fe30d96..1be41854b52ea 100644 --- a/pkgs/development/python-modules/flasgger/default.nix +++ b/pkgs/development/python-modules/flasgger/default.nix @@ -33,6 +33,11 @@ buildPythonPackage rec { url = "https://github.com/flasgger/flasgger/commit/ab77be7c6de1d4b361f0eacfa37290239963f890.patch"; hash = "sha256-ZbE5pPUP23nZAP/qcdeWkwzrZgqJSRES7oFta8U1uVQ="; }) + (fetchpatch { + # python 3.12 compat + url = "https://github.com/flasgger/flasgger/commit/6f5fcf24c1d816cf7ab529b3a8a764f86df4458d.patch"; + hash = "sha256-37Es1sgBQ9qX3YHQYub4HJkSNTSt3MbtCfV+XdTQZyY="; + }) ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix index 6309e0ddd2c07..68c9895f2b905 100644 --- a/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.3.6"; + version = "4.3.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-AppBuilder"; inherit version; - hash = "sha256-jKlxD6fScEdH0ZXhG0h9RaVx9AVZ2DmdnV36QuofPHg="; + hash = "sha256-QXPIeOVrgcasrF48gMEz9Bg/Q0Qv2URVK9n0Aj9brOs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index 33caa223ea3bc..def8f7b7754fb 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -1,14 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, flask, webassets, flask-script, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, flask +, webassets +, flask-script +, nose +}: buildPythonPackage rec { pname = "flask-assets"; - version = "2.0"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; src = fetchPypi { pname = "Flask-Assets"; inherit version; - hash = "sha256-Hf3qNeQHRNRqracoMfdhPWe/OOiyDMqqnpH9w3qjuMI="; + hash = "sha256-+E1lMv/lnJ/zUoheh0D/TaJcC8+s2AXwqAaBXkQ1SBM="; }; patchPhase = '' @@ -17,7 +25,16 @@ buildPythonPackage rec { substituteInPlace tests/test_integration.py --replace "'/foo'" "'/x/foo'" ''; - propagatedBuildInputs = [ flask webassets flask-script nose ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + flask + webassets + flask-script + nose + ]; meta = with lib; { homepage = "https://github.com/miracle2k/flask-assets"; diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index fe23711495238..2810ab2270081 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -43,8 +43,6 @@ buildPythonPackage rec { "flask_compress" ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = with lib; { description = "Compress responses in your Flask app with gzip, deflate or brotli"; homepage = "https://github.com/colour-science/flask-compress"; diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 81abf369a8a41..116a3f5cb5e48 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , setuptools +, pydantic # extras: babel , babel @@ -127,5 +128,7 @@ buildPythonPackage rec { description = "Simple security for Flask apps (fork)"; license = licenses.mit; maintainers = with maintainers; [ gador ]; + # https://github.com/Flask-Middleware/flask-security/pull/851 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index 6b7c57100017c..24075891c61e9 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { hash = "sha256-2nx9kWq/2TzauOW+c67g9a3JZ2dhBM4QzKyK/sqWOPo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ flit-core setuptools-scm diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 2c8de577dc279..23fe47c7cac72 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-Yg42nA0dRjHormpmpbOuZYuvBpNz9XEpf84XI2iJpYY="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 8b29b61fe6984..f6c3ba99ede4c 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { hash = "sha256-xaz9oelkyS8lWECCmKs8P3mHB3Usv0KMUoh/K7rBnAs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 3c167debba37c..db66e46f3d9d4 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.42.1"; + version = "4.46.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fcFFJi9Hr0m74LwFIhhhm/bMfxepAvg4/ymU53MmsPg="; + hash = "sha256-QpC1OWpqhJpzS59OG8A/nndWDoeYyAFUTIcsppLzM8Y="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index e119eb9f3b4f3..0530b2e1903c3 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-82+j3JAkjltXuzRhdvO4hoesSTWlNCY6w2mn6TsZqGM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 8450d4b78c01e..2de77cfbd69d9 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,30 +1,42 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , buildPythonPackage + +# build-system +, cysignals +, cython_3 , pkgconfig +, setuptools + , gmp , pari , mpfr , fplll -, cython -, cysignals , numpy -, pytest + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "fpylll"; - version = "0.5.9"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "fplll"; repo = "fpylll"; - rev = version; - hash = "sha256-T6l6hKzRDevlLyLu5H+bnEdl0OhsPer1coCDiftbPAk="; + rev = "refs/tags/${version}"; + hash = "sha256-EyReCkVRb3CgzIRal5H13OX/UdwWi+evDe7PoS1qP4A="; }; + nativeBuildInputs = [ + cython_3 + cysignals + pkgconfig + setuptools + ]; + buildInputs = [ gmp pari @@ -33,25 +45,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cython - cysignals numpy ]; - nativeBuildInputs = [ - pkgconfig - ]; - nativeCheckInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' + preCheck = '' # Since upstream introduced --doctest-modules in # https://github.com/fplll/fpylll/commit/9732fdb40cf1bd43ad1f60762ec0a8401743fc79, # it is necessary to ignore import mismatches. Not sure why, but the files # should be identical anyway. - PY_IGNORE_IMPORTMISMATCH=1 pytest + export PY_IGNORE_IMPORTMISMATCH=1 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 112b5210173b1..e8c564a477bab 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -1,31 +1,26 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi , pytestCheckHook , python-dateutil -, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "freezegun"; - version = "1.2.2"; - format = "setuptools"; + version = "1.3.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zSLRugaUE4RBDNln2KmdWuJEL1ffr+/y/aXejcXAVEY="; + hash = "sha256-SJhDl7O1jvXfxkXWowSwBg9hK87P2q9Fzor/AHemy2o="; }; - patches = lib.optionals (pythonAtLeast "3.10") [ - # Staticmethods in 3.10+ are now callable, prevent freezegun to attempt to decorate them - (fetchpatch { - url = "https://github.com/spulec/freezegun/pull/397/commits/e63874ce75a74a1159390914045fe8e7955b24c4.patch"; - hash = "sha256-FNABqVN5DFqVUR88lYzwbfsZj3xcB9/MvQtm+I2VjnI="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -43,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library that allows your Python tests to travel through time"; homepage = "https://github.com/spulec/freezegun"; + changelog = "https://github.com/spulec/freezegun/blob/${version}/CHANGELOG"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 14a356e21e224..f0a096ae87d98 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -1,23 +1,34 @@ { lib , buildPythonPackage -, isPy3k , fetchPypi +, pythonOlder + +# build-system +, poetry-core + +# dependencies , wcwidth + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "ftfy"; - version = "6.1.1"; - format = "setuptools"; + version = "6.1.3"; + pyproject = true; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-v8IBn4T82FFBkVIyCmN1YEoPFFnCgbWxmbLNDS5yf48="; + hash = "sha256-aTJ0rq2BHP8kweh4QWWqdVzS9uRCpexTXH1pf2QipCI="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ wcwidth ]; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 264771ed5a4b3..021ac6dd1d118 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ cython mecab setuptools-scm ]; nativeCheckInputs = [ ipadic pytestCheckHook ] diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index 7c4a5507b5404..7c6c21d4d356e 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -1,19 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch + +# build-system +, setuptools }: buildPythonPackage rec { pname = "future"; version = "0.18.3"; - - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-NKF0Nu0elml6hvnePRWjsL4B2LyN6cHf/Vn7gjTtUwc="; }; + patches = [ + (fetchpatch { + url = "https://github.com/PythonCharmers/python-future/commit/1901c1c347bcad603e8404b64656994eb2cc0439.patch"; + hash = "sha256-wUSWVs7+KTsTmEM4OkpViAjDGWqx5h0SLPIacMZCpWU="; + excludes = [ + "build.sh" + "docs/whatsnew.rst" + ]; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "future.builtins" "future.moves" diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 2273e6bd6eff1..cfb4ac57d5636 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-dWYnD+Byh0orRg20/nhu8ILooFBeHysxQ403boDVqYk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 53e1544ed018e..bd82927766e66 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -40,10 +40,6 @@ buildPythonPackage rec { pytestCheckHook ] ++ passthru.optional-dependencies.shapely; - env = { - SETUPTOOLS_SCM_PRETEND_VERSION = version; - }; - disabledTestPaths = [ # tests require live databases "tests/gallery/test_decipher_raster.py" diff --git a/pkgs/development/python-modules/geocachingapi/default.nix b/pkgs/development/python-modules/geocachingapi/default.nix index 61e2a1f7a80ab..d7ad9cb5fd8a0 100644 --- a/pkgs/development/python-modules/geocachingapi/default.nix +++ b/pkgs/development/python-modules/geocachingapi/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ aiohttp backoff diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 69cd2ed30653f..28e05315861da 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -1,22 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub -, glibcLocales +, setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "geojson"; - version = "3.0.1"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "jazzband"; repo = "geojson"; rev = "refs/tags/${version}"; - hash = "sha256-VlP/odzRH6Eg0BMZPBQkbHL/O2cIwWTKJcL5SfZoUWQ="; + hash = "sha256-OL+7ntgzpA63ALQ8whhKRePsKxcp81PLuU1bHJvxN9U="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "geojson" ]; diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 52adbbe07eed2..4616dd3866c8d 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -1,10 +1,10 @@ { lib -, async-generator , buildPythonPackage , docutils , fetchFromGitHub , geographiclib , pytestCheckHook +, pythonAtLeast , pythonOlder , pytz }: @@ -27,7 +27,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - async-generator docutils pytestCheckHook pytz @@ -38,6 +37,10 @@ buildPythonPackage rec { "test_user_agent_default" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.12") [ + "test/test_init.py" + ]; + pytestFlagsArray = [ "--skip-tests-requiring-internet" ]; pythonImportsCheck = [ "geopy" ]; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 906fcdbdb6080..ad732575b4e12 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.0.10"; + version = "2.0.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-t8l7JlEZV6NqiU7FRlHAiJCmnhGLaXVfjnS/w3xjORs="; + hash = "sha256-VJ0POvCEILmtK+7aIRFTx2BbW6QJsijbfxuByL++xrQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index dc6be575153c6..996387f45135c 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , setuptools , smmap }: @@ -21,6 +22,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "smmap" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gitpython/default.nix b/pkgs/development/python-modules/gitpython/default.nix index 43925e357a90a..50afd5ea4aa86 100644 --- a/pkgs/development/python-modules/gitpython/default.nix +++ b/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.37"; + version = "3.1.40"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-w3aSgIaD6tkxhYctkvvsdKlWXS8xU4+F0cCYeYTNHig="; + hash = "sha256-a5Ez6SuSqrJE306FrFjEnSoVhALVvubF1pLW4awK4gM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glueviz/default.nix b/pkgs/development/python-modules/glueviz/default.nix index a972c9310de68..45e55aee3f4f7 100644 --- a/pkgs/development/python-modules/glueviz/default.nix +++ b/pkgs/development/python-modules/glueviz/default.nix @@ -65,8 +65,6 @@ buildPythonPackage rec { dontConfigure = true; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - # collecting ... qt.qpa.xcb: could not connect to display # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. doCheck = false; diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix index 65cbc5b3b2059..61e4b63c08e8d 100644 --- a/pkgs/development/python-modules/glyphslib/default.nix +++ b/pkgs/development/python-modules/glyphslib/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-2Y7JhaZJXKERQXEI9cDCx7m95El6AicU0t+X3Gntbxk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 9df9562c3d15e..76fbdf7fa4254 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.11.1"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-JdKeBaAFjtXxnGHAp4sbU63qTZNktGTQFPvalB9tHJo="; + hash = "sha256-U2ikUCt5PZu/gSpZEuE+Tmn5vYf277UIRgxD9bvRzkE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index ecf2b36ab9db5..b6f73cc406ebc 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.99.0"; + version = "2.109.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5zP9DyyHk7GgANXmmsgbG57AZltEW37YO9u7ADiXMwY="; + hash = "sha256-0GOQwlR3w2HVJjn+AO+RLD+rja/H+/KVgMEUTpJSOnk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 7edbedb80c6a3..5eeb88cd9d0f9 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.11.4"; + version = "3.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aX3xFyQaIoO8u5OyHhC63BTlHJqQgA0qfho+HH2EKXQ="; + hash = "sha256-eUzPyTzLDgrWiUQviW+cgt5W2g/hihlVMbs3CWwmV9Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index ec412c732dddc..9e1ca821bdae7 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.12.1"; + version = "2.12.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/lBwhUR+z0Ydr9LNS4AWxYmeWOUgvQS1G7Orb2sI+v8="; + hash = "sha256-YDHQwZEfx5zguLuPb+FkUoO5wakYi0g9rmI7U7TYGBw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 5daa5fe466f61..32949b14c332c 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.19.1"; + version = "2.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ia3XCpLUXJ93AGEHdDaOidQEagUkMVAnb2UYK+ktzKc="; + hash = "sha256-F6UDRZLoXvADHSW75YlL2y1xlGCFWYC/62iqTo/8Er0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index ebcb32bf2b455..ba7573452940a 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -12,20 +12,25 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.10.0"; - format = "setuptools"; + version = "2.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k0sx6tXzmU5TYPn/V1CYLFtrEWBNwHK8RSwlll4Hbcc="; + hash = "sha256-9i3Ex7bNQ2DQcuPesoA1+9rUkaw9mwsYFaEtrqEPN8c="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-auth google-cloud-core diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 60233f91fbbcb..e8a469e51b06f 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , grpc , protobuf }: buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.60.0"; - format = "setuptools"; + version = "1.61.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-5z67QECY20BbqV0eGuCqkcPhWnHaAxou62suI+e8Nwg="; + hash = "sha256-imSGapf2MEpxeYc6Rl1u7pe3ok7Gz9eOD1delrghJAs="; }; - propagatedBuildInputs = [ grpc protobuf ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + grpc + protobuf + ]; # does not contain tests doCheck = false; diff --git a/pkgs/development/python-modules/gpsoauth/default.nix b/pkgs/development/python-modules/gpsoauth/default.nix index 80b8350410f1d..e8b84b492bcae 100644 --- a/pkgs/development/python-modules/gpsoauth/default.nix +++ b/pkgs/development/python-modules/gpsoauth/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pycryptodomex , pythonOlder , requests }: buildPythonPackage rec { - version = "1.0.2"; - format = "setuptools"; pname = "gpsoauth"; + version = "1.0.4"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-68rnLrMlp/BsvqlbnV5kvsJTcDEtsV6OLkbE1U5ynno="; + hash = "sha256-SWYXNYrnzK8P4oK9f7bmOiVdWUQHp8WvhNzIS7Y0msg="; }; - propagatedBuildInputs = [ pycryptodomex requests ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pycryptodomex + requests + ]; # upstream tests are not very comprehensive doCheck = false; diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 1fea3699d9f54..65b49a74aa7ed 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix new file mode 100644 index 0000000000000..d2bbfecefdc38 --- /dev/null +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hatch-fancy-pypi-readme +, hatch-requirements-txt +, hatchling +, gradio +, gradio-client +}: + +buildPythonPackage rec { + pname = "gradio-pdf"; + version = "0.0.3"; + format = "pyproject"; + + src = fetchPypi { + pname = "gradio_pdf"; + inherit version; + hash = "sha256-l9bcH/6paEdKk9Q7HM3ap9MI1Qi7rPZ/ucAibBUEPKI="; + }; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-requirements-txt + hatchling + ]; + + propagatedBuildInputs = [ + gradio-client + ]; + + buildInputs = [ + gradio.sans-reverse-dependencies + ]; + disallowedReferences = [ + gradio.sans-reverse-dependencies + ]; + + pythonImportsCheck = [ "gradio_pdf" ]; + + # tested in `gradio` + doCheck = false; + + meta = with lib; { + description = "Python library for easily interacting with trained machine learning models"; + homepage = "https://pypi.org/project/gradio-pdf/"; + license = licenses.asl20; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index ce866a67b4cc2..e68f793f73012 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -20,28 +20,14 @@ , pytestCheckHook , pytest-asyncio , pydub +, rich +, tomlkit , gradio }: -let - - # Cyclic dependencies are fun! - # This is gradio without gradio-client, only needed for checkPhase - gradio' = (gradio.override (old: { - gradio-client = null; - })).overridePythonAttrs (old: { - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pythonRelaxDepsHook ]; - pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio_client" ]; - doInstallCheck = false; - doCheck = false; - pythonImportsCheck = null; - }); - -in - buildPythonPackage rec { - pname = "gradio_client"; - version = "0.5.0"; + pname = "gradio-client"; + version = "0.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -51,18 +37,26 @@ buildPythonPackage rec { owner = "gradio-app"; repo = "gradio"; #rev = "refs/tags/v${gradio.version}"; - rev = "ba4c6d9e65138c97062d1757d2a588c4fc449daa"; # v3.43.1 is not tagged... + rev = "dc131b64f05062447643217819ca630e483a11df"; # v4.9.1 is not tagged... sparseCheckout = [ "client/python" ]; - hash = "sha256-savka4opyZKSWPeBqc2LZqvwVXLYIZz5dS1OWJSwvHo="; + hash = "sha256-Zp1Zl53Va0pyyZEHDUpnldi4dtH2uss7PZQD+Le8+cA="; }; prePatch = '' cd client/python ''; + # upstream adds upper constraints because they can, not because the need to + # https://github.com/gradio-app/gradio/pull/4885 + pythonRelaxDeps = [ + # only backward incompat is dropping py3.7 support + "websockets" + ]; + nativeBuildInputs = [ hatchling hatch-requirements-txt hatch-fancy-pypi-readme + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -71,20 +65,20 @@ buildPythonPackage rec { httpx huggingface-hub packaging - requests typing-extensions websockets ]; - nativeCheckInputs =[ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pydub - gradio' - ]; - disallowedReferences = [ - gradio' # ensuring we don't propagate this intermediate build + rich + tomlkit + gradio.sans-reverse-dependencies ]; + # ensuring we don't propagate this intermediate build + disallowedReferences = [ gradio.sans-reverse-dependencies ]; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). preCheck = '' @@ -94,7 +88,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "test/" - #"-m" "not flaky" # doesn't work, even when advertised + "-m 'not flaky'" #"-x" "-W" "ignore" # uncomment for debugging help ]; diff --git a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py index 4738de3175526..eb2385bca8d6f 100644 --- a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py +++ b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py @@ -28,6 +28,8 @@ def iterate_exc_chain(exc: Exception): for exc in iterate_exc_chain(call.excinfo.value): if isinstance(exc, NixNetworkAccessDeniedError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." + if isinstance(exc, httpx.ConnectError): + tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, FileNotFoundError): # gradio specific tr.outcome, tr.wasxfail = 'skipped', "reason: Pypi dist bad." return tr diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 19474d8d9fbfe..78e6f99505e3b 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -3,6 +3,8 @@ , fetchPypi , pythonOlder , pythonRelaxDepsHook +, writeShellScriptBin +, gradio # pyproject , hatchling @@ -31,15 +33,16 @@ , python-multipart , pydub , pyyaml -, requests , semantic-version , typing-extensions , uvicorn -, websockets +, typer +, tomlkit # check , pytestCheckHook , boto3 +, gradio-pdf , ffmpeg , ipython , pytest-asyncio @@ -53,23 +56,30 @@ buildPythonPackage rec { pname = "gradio"; - version = "3.44.3"; + version = "4.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; - # We use the Pypi release, as it provides prebuilt webui assets, - # and has more frequent releases compared to github tags + # We use the Pypi release, since it provides prebuilt webui assets, + # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-3mXs9PwlzUo89VosBWtnsOzDQf/T22Yv7s5j6OLLp3M="; + hash = "sha256-KosxlmU5pYvuy5zysscuWM25IGXin7RLGEM9V2xPQrU="; }; # fix packaging.ParserSyntaxError, which can't handle comments postPatch = '' sed -ie "s/ #.*$//g" requirements*.txt + + # they bundle deps? + rm -rf venv/ ''; + pythonRelaxDeps = [ + "tomlkit" + ]; + nativeBuildInputs = [ pythonRelaxDepsHook hatchling @@ -99,16 +109,17 @@ buildPythonPackage rec { python-multipart pydub pyyaml - requests semantic-version typing-extensions uvicorn - websockets - ]; + typer + tomlkit + ] ++ typer.passthru.optional-dependencies.all; nativeCheckInputs = [ pytestCheckHook boto3 + gradio-pdf ffmpeg ipython pytest-asyncio @@ -119,7 +130,10 @@ buildPythonPackage rec { tqdm transformers vega-datasets - ]; + + # mock npm to make `shutil.which("npm")` pass + (writeShellScriptBin "npm" "false") + ] ++ pydantic.passthru.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. @@ -148,12 +162,14 @@ buildPythonPackage rec { "test_shapley_text" ]; disabledTestPaths = [ + # 100% touches network + "test/test_networking.py" # makes pytest freeze 50% of the time "test/test_interfaces.py" ]; pytestFlagsArray = [ "-x" # abort on first failure - #"-m" "not flaky" # doesn't work, even when advertised + "-m 'not flaky'" #"-W" "ignore" # uncomment for debugging help ]; @@ -165,6 +181,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "gradio" ]; + # Cyclic dependencies are fun! + # This is gradio without gradio-client and gradio-pdf + passthru = { + sans-reverse-dependencies = (gradio.override (old: { + gradio-client = null; + gradio-pdf = null; + })).overridePythonAttrs (old: { + pname = old.pname + "-sans-client"; + nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pythonRelaxDepsHook ]; + pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; + doInstallCheck = false; + doCheck = false; + pythonImportsCheck = null; + dontCheckRuntimeDeps = true; + }); + }; + meta = with lib; { homepage = "https://www.gradio.app/"; description = "Python library for easily interacting with trained machine learning models"; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 6af54cbb6d6da..8f145c13e7220 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -3,11 +3,13 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch , substituteAll , graphviz , xdg-utils , makeFontsConf , freefont_ttf +, setuptools , mock , pytest , pytest-mock @@ -17,7 +19,7 @@ buildPythonPackage rec { pname = "graphviz"; version = "0.20.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -35,6 +37,12 @@ buildPythonPackage rec { inherit graphviz; xdgutils = xdg-utils; }) + # https://github.com/xflr6/graphviz/issues/209 + (fetchpatch { + name = "fix-tests-with-python312.patch"; + url = "https://github.com/xflr6/graphviz/commit/5ce9fc5de4f2284baa27d7a8d68ab0885d032868.patch"; + hash = "sha256-jREPACSc4aoHY3G+39e8Axqajw4eeKkAeVu2s40v1nI="; + }) ]; postPatch = '' @@ -46,6 +54,10 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ mock pytest diff --git a/pkgs/development/python-modules/graspologic/default.nix b/pkgs/development/python-modules/graspologic/default.nix index 513a60bd432e9..745cf90b4b9e6 100644 --- a/pkgs/development/python-modules/graspologic/default.nix +++ b/pkgs/development/python-modules/graspologic/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchFromGitHub +, setuptools , pytestCheckHook , pytest-cov , hyppo @@ -15,8 +16,8 @@ buildPythonPackage rec { pname = "graspologic"; - version = "3.2.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; disabled = isPy27; @@ -24,9 +25,13 @@ buildPythonPackage rec { owner = "microsoft"; repo = "graspologic"; rev = "refs/tags/v${version}"; - hash = "sha256-yXhEI/8qm526D+Ehqqfb+j+sbbh83Q4OWC+UM7cgCjU="; + hash = "sha256-hd3OyV95N8vhc4s50HbKkrcUOeSegn66Dkw7dixim00="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ hyppo matplotlib diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 98c9b5bf302fc..3bbaf7e8ab356 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-j0j13bJtHlPc00pjmfpg/QJKzYQQcyA+jE7q538Uu08="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pdm-backend ]; diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index 96be86458422a..e94278fec3104 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , grpcio , googleapis-common-protos }: buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.12.6"; - format = "setuptools"; + version = "0.12.7"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-K8S4/fIhFaZddRyTFzKTImAsObfIaiicm3LSKNlg718="; + hash = "sha256-AJGXp/HqqiIUnJbl4FSsWTS6ckGXTpJmPY01KKISA9E="; }; - propagatedBuildInputs = [ grpcio googleapis-common-protos ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + grpcio + googleapis-common-protos + ]; # no tests run doCheck = false; diff --git a/pkgs/development/python-modules/gunicorn/default.nix b/pkgs/development/python-modules/gunicorn/default.nix index 9a425be27878a..ec2ed2aaf63d6 100644 --- a/pkgs/development/python-modules/gunicorn/default.nix +++ b/pkgs/development/python-modules/gunicorn/default.nix @@ -1,17 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, packaging , pythonOlder + +# build-system +, setuptools + +# dependencies +, packaging + +# optional-dependencies , eventlet , gevent +, tornado +, setproctitle + , pytestCheckHook }: buildPythonPackage rec { pname = "gunicorn"; version = "21.2.0"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { @@ -26,19 +37,40 @@ buildPythonPackage rec { --replace "--cov=gunicorn --cov-report=xml" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ]; - nativeCheckInputs = [ - eventlet - gevent - pytestCheckHook + passthru.optional-dependencies = { + gevent = [ + gevent + ]; + eventlet = [ + eventlet + ]; + tornado = [ + tornado + ]; + gthread = []; + setproctitle = [ + setproctitle + ]; + }; + + pythonImportsCheck = [ + "gunicorn" ]; - pythonImportsCheck = [ "gunicorn" ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); meta = with lib; { + changelog = "https://github.com/benoitc/gunicorn/releases/tag/${version}"; homepage = "https://github.com/benoitc/gunicorn"; description = "gunicorn 'Green Unicorn' is a WSGI HTTP Server for UNIX, fast clients and sleepy applications"; license = licenses.mit; diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index 5c102f10a5517..2c4389549afff 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -2,13 +2,15 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , tkinter }: buildPythonPackage rec { pname = "guppy3"; version = "3.1.4.post1"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -18,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-HHy57P6WEHZKygAbdjEh6XAApFlQueiYGr02eSQMWfc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ tkinter ]; # Tests are starting a Tkinter GUI diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 1c97861f1eee4..334289b034e2d 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -11,18 +11,16 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-f2snM73gbqJXW3mmRQ2b1cOJGP9MsqNVvyK76Mhsa88="; + hash = "sha256-oXHAJ9rrNLJMJKO2MEGVuOq7tvEMdIJW7Tz+GYBjg88="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 3fb20fad4c3bb..fc30a7536a335 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -21,7 +21,7 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.9.0"; + version = "3.10.0"; pname = "h5py"; format = "pyproject"; @@ -29,7 +29,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-5gTbZSHB42fGvX+tI5yEf1PMRmRvLSZRNy0Frl6V+Bc="; + hash = "sha256-2TrcSM7rMzR+skpjT7eH78euRkTm6kunM9CZYFBFwEk="; }; # avoid strict pinning of numpy diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 202678344145f..55ce0e3583076 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -49,5 +49,6 @@ buildPythonPackage rec { changelog = "https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index e69d518870506..9d27417a6f6f5 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.11.4"; + version = "2023.12.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LB0BGj/DWjHGAFkyACkkzGY1oYNc7hJ2BeT1lHlNjqU="; + hash = "sha256-FqorpdGpm9uAzvEuX6F2Guvq795ix1A8RfX4KUi9jk8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index edb90b477d0e9..ece6e001fd656 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -13,6 +13,7 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , setuptools , snitun , syrupy @@ -43,6 +44,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "acme" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix index 4fa2c56cabfb9..25884829b5d2b 100644 --- a/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "hatch-vcs"; - version = "0.3.0"; + version = "0.4.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "hatch_vcs"; inherit version; - hash = "sha256-zsUQfPzkgsZ/i8lvGLvDIMmqDQaBgOFK0xe77loVP+4="; + hash = "sha256-CTgQdI/gHbDUUfq88sGsJojK79Iy1O3pZwkLHBsH2fc="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/ofek/hatch-vcs/releases/tag/v${version}"; description = "A plugin for Hatch that uses your preferred version control system (like Git) to determine project versions"; homepage = "https://github.com/ofek/hatch-vcs"; license = licenses.mit; diff --git a/pkgs/development/python-modules/hatchling/default.nix b/pkgs/development/python-modules/hatchling/default.nix index 8a886112fed99..221c266287f9b 100644 --- a/pkgs/development/python-modules/hatchling/default.nix +++ b/pkgs/development/python-modules/hatchling/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "hatchling"; - version = "1.18.0"; + version = "1.21.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UOmcMRDOCvw/e9ut/xxxwXdY5HZzHCdgeUDPpmhkico="; + hash = "sha256-XAhncjV6UHI7gl/V2lJ4rH42l833eX0HVBpskLb/dUw="; }; # listed in backend/pyproject.toml diff --git a/pkgs/development/python-modules/help2man/default.nix b/pkgs/development/python-modules/help2man/default.nix index 38cff88b4a12c..edcd479458fef 100644 --- a/pkgs/development/python-modules/help2man/default.nix +++ b/pkgs/development/python-modules/help2man/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-BIDn+LQzBtDHUtFvIRL3NMXNouO3cMLibuYBoFtCUxI="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ jinja2 setuptools-scm diff --git a/pkgs/development/python-modules/histoprint/default.nix b/pkgs/development/python-modules/histoprint/default.nix index 3c65fbf0eb801..66f06feac946e 100644 --- a/pkgs/development/python-modules/histoprint/default.nix +++ b/pkgs/development/python-modules/histoprint/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { uhi ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/hiyapyco/default.nix b/pkgs/development/python-modules/hiyapyco/default.nix index 72b206e297c8f..9dc8ae08c7245 100644 --- a/pkgs/development/python-modules/hiyapyco/default.nix +++ b/pkgs/development/python-modules/hiyapyco/default.nix @@ -1,30 +1,39 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pyyaml , jinja2 }: buildPythonPackage rec { pname = "hiyapyco"; - version = "0.5.1"; - format = "setuptools"; + version = "0.5.4"; + pyproject = true; src = fetchFromGitHub { owner = "zerwes"; repo = pname; rev = "refs/tags/release-${version}"; - hash = "sha256-MVJoMnEi+319ZkhffYWYVi/wj0Ihm0nfVeEXvx7Ac/4="; + hash = "sha256-hKTqdclWMKTGeRtQuNj0gYdiGFovFh5FQ2rRjCgbvBM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml jinja2 ]; checkPhase = '' + runHook preCheck + set -e find test -name 'test_*.py' -exec python {} \; + + runHook postCheck ''; pythonImportsCheck = [ "hiyapyco" ]; diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index cea6592b42b80..c2485c217a4c8 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/html5tagger/default.nix b/pkgs/development/python-modules/html5tagger/default.nix index 42bc3aa18ad6c..e9a96b8ddd113 100644 --- a/pkgs/development/python-modules/html5tagger/default.nix +++ b/pkgs/development/python-modules/html5tagger/default.nix @@ -16,8 +16,6 @@ buildPythonPackage rec { hash = "sha256-Or0EizZC9FMjTcbgecDvgGB09KNGyxHreSDojgB7ysg="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index d88832f81acd4..bc3351feb3d84 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-acTziJM5H5Td+eG/LNrlNwgpVvFDyl/tf6//YuE1XZk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index cc15e00748c0c..48de08ee3b4c5 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -1,18 +1,26 @@ { lib -, brotlicffi , buildPythonPackage -, decorator , fetchPypi -, flask -, flask-limiter +, pythonRelaxDepsHook + +# build-system +, setuptools + +# dependencies +, brotlicffi +, decorator , flasgger -, itsdangerous -, markupsafe -, raven +, flask +, greenlet , six -, pytestCheckHook -, setuptools , werkzeug + +# optional-dependencies +, gunicorn +, gevent + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -27,20 +35,29 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "greenlet" ]; propagatedBuildInputs = [ brotlicffi decorator flask - flask-limiter flasgger - itsdangerous - markupsafe - raven + greenlet six werkzeug - ] ++ raven.optional-dependencies.flask; + ]; + + passthru.optional-dependencies = { + mainapp = [ + gunicorn + gevent + ]; + }; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index 91cd904e3afe6..d9fd192b7bd1b 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -13,8 +13,8 @@ , pytest-trio , pytestCheckHook , pythonOlder -, sniffio , socksio +, trio # for passthru.tests , httpx , httpx-socks @@ -22,16 +22,16 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.18.0"; + version = "1.0.2"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "httpcore"; rev = "refs/tags/${version}"; - hash = "sha256-UEpERsB7jZlMqRtyHxLYBisfDbTGaAiTtsgU1WUpvtA="; + hash = "sha256-gjAScRBzAuNiTSxspX6vzwTAdBIwVQbaSLEUFV1QP+E="; }; nativeBuildInputs = [ @@ -40,19 +40,23 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - anyio certifi h11 - sniffio ]; passthru.optional-dependencies = { + asyncio = [ + anyio + ]; http2 = [ h2 ]; socks = [ socksio ]; + trio = [ + trio + ]; }; nativeCheckInputs = [ @@ -61,19 +65,7 @@ buildPythonPackage rec { pytest-httpbin pytest-trio pytestCheckHook - ] ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.socks; - - disabledTests = [ - # https://github.com/encode/httpcore/discussions/813 - "test_connection_pool_timeout_during_request" - "test_connection_pool_timeout_during_response" - "test_h11_timeout_during_request" - "test_h11_timeout_during_response" - "test_h2_timeout_during_handshake" - "test_h2_timeout_during_request" - "test_h2_timeout_during_response" - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "httpcore" @@ -86,7 +78,7 @@ buildPythonPackage rec { }; meta = with lib; { - changelog = "https://github.com/encode/httpcore/releases/tag/${version}"; + changelog = "https://github.com/encode/httpcore/blob/${version}/CHANGELOG.md"; description = "A minimal low-level HTTP client"; homepage = "https://github.com/encode/httpcore"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index c201bc3126c83..aa4abf313d201 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-1Pl+l28J7crfO2UY/9/D019IzOHWOwjR+UvVEHICTqU="; + hash = "sha256-76gdiRbF535CEaNXwNqsVeVc0dKglovMPQpGsOkbd/4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index c516267629cdc..116ab28dc9895 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-n8bkCa04y9aLF3zVFY/EBCx5a4LKiNmex48HvtbGt5Y="; + hash = "sha256-xuJsMEVWALldlLG4NghROOgvF3NRRU7oQcFI+TqbrVo="; }; # Tests are not included in pypi tarball diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 7e451532af04a..0bbb64652737d 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, anyio , brotli , brotlicffi , buildPythonPackage @@ -11,12 +12,12 @@ , hatch-fancy-pypi-readme , hatchling , httpcore +, idna , isPyPy , multipart , pygments , python , pythonOlder -, rfc3986 , rich , sniffio , socksio @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.25.0"; + version = "0.25.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zQVavjU66ksO0FB1h32e0YUhOGiQ4jHPvjgLhtxjU6s="; + hash = "sha256-rGtIrs4dffs7Ndtjb400q7JrZh+HG9k0uwHw9pRlC5s="; }; nativeBuildInputs = [ @@ -47,9 +48,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + anyio certifi httpcore - rfc3986 + idna sniffio ]; @@ -83,14 +85,7 @@ buildPythonPackage rec { pytest-trio trustme uvicorn - ] ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.brotli - ++ passthru.optional-dependencies.socks; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "rfc3986[idna2008]>=1.3,<2" "rfc3986>=1.3" - ''; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # testsuite wants to find installed packages for testing entrypoint preCheck = '' diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index aa11d109dbc3a..a15a8988a7900 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.18.0"; + version = "0.19.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-/KbD3TNSbQ9ueXYFLoXnIRIoi/y3l0w72GZ1+JC8ULk="; + hash = "sha256-bK/Cg+ZFhf9TrTVlDU35cLMDuTmdH4bN/QuPVeUVDsI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index ca06ac2abfd77..1ae941be385d4 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-sLlgR6c65RmUNZdH2pHuxzo7dm71uUZXGqzcqyxCrk4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index 68cba094ab31a..1b2da27594289 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -47,5 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 4cc5aab3bffe7..c74631817866d 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPyPy , fetchFromGitHub +, setuptools , attrs , exceptiongroup , pexpect @@ -21,9 +22,8 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.84.3"; - outputs = [ "out" ]; - format = "setuptools"; + version = "6.91.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-wymZ/tJBGcP57B3BuDlBT7kbUxNwW4/SSmvwLSa5PvM="; + hash = "sha256-2iBeB5pLVOunOJb6aGNQ/ZTj8HyeH+UkqvLPF3YVuLk="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -49,6 +49,10 @@ buildPythonPackage rec { postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs sortedcontainers diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index d6ce47e380506..5754612b1f29d 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Uj2gTAY7hzko1sKO8WUGz2S/MXdwOYN+F+a73G4szNs="; + hash = "sha256-h5kXemST6DLIF0aEKoaGdSs7G7lTDW6DK64XWEENrzo="; }; patches = [ diff --git a/pkgs/development/python-modules/iaqualink/default.nix b/pkgs/development/python-modules/iaqualink/default.nix index 6e72b5a8519b5..56dde70d3e3be 100644 --- a/pkgs/development/python-modules/iaqualink/default.nix +++ b/pkgs/development/python-modules/iaqualink/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-ewPP2Xq+ecZGc5kokvLEsRokGqTWlymrzkwk480tapk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 9b77a6be51d0d..8c2e49a6e4e5a 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -63,14 +63,15 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - rev = "2b3968deaa1a28791b2901dbbcc9bfd3d2f23e9b"; - hash = "sha256-q1b5IcOl5oIFXP7/P5RufncjHEVrWp4NjoU2uo/BE9U="; + # https://github.com/ibis-project/ibis/blob/7.1.0/nix/overlay.nix#L20-L26 + rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476"; + hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "6.1.0"; + version = "7.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -80,7 +81,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-+AtXgRNxPryP/fd/GQlLNxWbP6ozikqG2yBCp3dE0tY="; + hash = "sha256-E7jryoidw6+CjTIex4wcTXcU+8Kg8LDwg7wJvcwj+7Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icecream/default.nix b/pkgs/development/python-modules/icecream/default.nix index 601a55e80f6e9..db9e56bb8b6e3 100644 --- a/pkgs/development/python-modules/icecream/default.nix +++ b/pkgs/development/python-modules/icecream/default.nix @@ -1,18 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi -, asttokens, colorama, executing, pygments +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, setuptools + +# dependencies +, asttokens +, colorama +, executing +, pygments + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "icecream"; version = "2.1.3"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; }; - propagatedBuildInputs = [ asttokens colorama executing pygments ]; + postPatch = '' + substituteInPlace tests/test_icecream.py \ + --replace assertRegexpMatches assertRegex + ''; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + asttokens + colorama + executing + pygments + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # icecream.icecream.NoSourceAvailableError + "testSingledispatchArgumentToString" + # AssertionError: assert [[('REPL (e.g...ion?', None)]] == [[('a', '1')], [('c', '3')]] + "testEnableDisable" + ]; meta = with lib; { description = "A little library for sweet and creamy print debugging"; diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index a21125c2379e4..77aeb4483dc3d 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "idna"; - version = "3.4"; + version = "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-gU9Sjo3q19MpgzuRxfqofWC/cYJM0Sp1MLVSYGPQLLQ="; + hash = "sha256-ns270IOwZ5iuHoaty/6KsUec+GTk7jD+TkagA9Ekkco="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index eb1c71601c923..99f2ae1c62765 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ifcopenshell"; - version = "230915"; + version = "231201"; format = "other"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ buildPythonPackage rec { repo = "IfcOpenShell"; rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "sha256-dHw+5AlJbeuUeaxv7eE2XfLjR/K5S00dMSCtoWVcEB8="; + sha256 = "sha256-T7XT5gvfzhagecB3jrTyWOawOm4iye7SCsmYhnjtOTE="; }; nativeBuildInputs = [ gcc10 cmake ]; diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 555fa80acd64f..5d762be3fb860 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "3.0.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "refs/tags/v${version}"; - hash = "sha256-DsvKtiy9sawGKpQu3f5OMUtE2Emq3Br8FupopUcLVew="; + hash = "sha256-z03s2mOJiMVnvLmeFJFgCRvkP+9VUcALiIoIPBAHUPw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index b4c20163cb7a9..8e8346fffdd78 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "6.8.0"; + version = "6.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-26zniS2MDErBrQlmYiMvgx1OZPTEVFvVMBaj6dRlR0M="; + hash = "sha256-6Ky1I8M1qRgiZ04Um0bAOZ7E0yjE0fbknCc9pf8CAbk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 8b6afb522b6a7..80533173c9bb7 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "6.0.1"; + version = "6.1.1"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - hash = "sha256-Q1lFfkJwhGK5YmoEZXxiCK15nOtB5cWMV/+g5qCYpdQ="; + hash = "sha256-OJOgASLq/eaJTFmRREalEvcooMGkX5u5tjchtrrPC0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 9d5ea1bebd203..4e3b4294991cd 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-imread"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit version; pname = "imread"; - sha256 = "0kvlpy62vc16i0mysv1b2gv746in41q75hb815q6h8d227psv1q4"; + sha256 = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; }; diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index 10f5a56763ef7..d6317d00841ba 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -24,6 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ + # https://errors.pydantic.dev/2.5/v/string_too_short + "inflect.engine.compare" + ]; + pythonImportsCheck = [ "inflect" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ipadic/default.nix b/pkgs/development/python-modules/ipadic/default.nix index 841eccc9e1573..bb7724a505768 100644 --- a/pkgs/development/python-modules/ipadic/default.nix +++ b/pkgs/development/python-modules/ipadic/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { # no tests doCheck = false; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ cython mecab setuptools-scm ]; pythonImportsCheck = [ "ipadic" ]; diff --git a/pkgs/development/python-modules/ipython-genutils/default.nix b/pkgs/development/python-modules/ipython-genutils/default.nix index e3a7b6c0a4449..c11c63797f0a6 100644 --- a/pkgs/development/python-modules/ipython-genutils/default.nix +++ b/pkgs/development/python-modules/ipython-genutils/default.nix @@ -4,6 +4,7 @@ , setuptools , nose , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -11,6 +12,9 @@ buildPythonPackage rec { version = "0.2.0"; pyproject = true; + # uses the imp module, upstream says "DO NOT USE" + disabled = pythonAtLeast "3.12"; + src = fetchPypi { pname = "ipython_genutils"; inherit version; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index a730531bf8737..09121fb1f24a7 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -29,13 +29,13 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.15.0"; + version = "8.18.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-K661vmlJ7uv1MhUPgXRvgzPizM4C3hx+7d4/I+1enx4="; + sha256 = "sha256-ym8Hm7M0V8ZuIz5FgOv8QSiFW0z2Nw3d1zhCqVY+iic="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index c91e44f7825f0..ca84beae2eeff 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -10,13 +10,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2023.1.2"; + version = "2023.2.5"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NsNI1N9ZuNYWr1i3dl7hSaTP3jdsTYsIpoF98vrZG9Y="; + sha256 = "sha256-3XQ5i682k4q7fCqdmCjMGi5UnGyASFzsiwaymr+q0Y8="; }; postConfigure = '' diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index ade0c71ee887d..a4982c27f852b 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "iso8601"; - version = "2.0.0"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c5lg03x0x3vZvVRqdlYsy1gf49SCD/XDFB60nIOf2o8="; + hash = "sha256-ax04Ke6JIcQwGZjJCfeCn6ntPL2sDTsWry10Ou0bqN8="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple module to parse ISO 8601 dates"; homepage = "https://pyiso8601.readthedocs.io/"; + changelog = "https://github.com/micktwomey/pyiso8601/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix index c6e2115391030..670b473e61953 100644 --- a/pkgs/development/python-modules/iterative-telemetry/default.nix +++ b/pkgs/development/python-modules/iterative-telemetry/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-n67nc9a/Qrz2v1EYbHZb+pGhuMDqofUMpgfD/0BwqLM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/itsdangerous/default.nix b/pkgs/development/python-modules/itsdangerous/default.nix index 3810eabf46c71..cfc364a4a3997 100644 --- a/pkgs/development/python-modules/itsdangerous/default.nix +++ b/pkgs/development/python-modules/itsdangerous/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "Safely pass data to untrusted environments and back"; homepage = "https://itsdangerous.palletsprojects.com"; diff --git a/pkgs/development/python-modules/jaraco-abode/default.nix b/pkgs/development/python-modules/jaraco-abode/default.nix index cbd739d5a955f..821c11b01e272 100644 --- a/pkgs/development/python-modules/jaraco-abode/default.nix +++ b/pkgs/development/python-modules/jaraco-abode/default.nix @@ -3,7 +3,6 @@ , bx-py-utils , colorlog , fetchFromGitHub -, fetchPypi , importlib-resources , jaraco-classes , jaraco-collections @@ -40,6 +39,10 @@ buildPythonPackage rec { postPatch = '' # https://github.com/jaraco/jaraco.abode/issues/19 echo "graft jaraco" > MANIFEST.in + + # https://github.com/jaraco/jaraco.abode/commit/9e3e789efc96cddcaa15f920686bbeb79a7469e0 + substituteInPlace jaraco/abode/helpers/timeline.py \ + --replace "call_aside" "invoke" ''; nativeBuildInputs = [ @@ -47,8 +50,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ requests lomond diff --git a/pkgs/development/python-modules/jaraco-classes/default.nix b/pkgs/development/python-modules/jaraco-classes/default.nix index 317fc3e3dc1a5..6364f89e4cac0 100644 --- a/pkgs/development/python-modules/jaraco-classes/default.nix +++ b/pkgs/development/python-modules/jaraco-classes/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { pythonNamespaces = [ "jaraco" ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/pkgs/development/python-modules/jaraco-collections/default.nix b/pkgs/development/python-modules/jaraco-collections/default.nix index 1d8f9a8f22417..3c0d0b6a9aa6a 100644 --- a/pkgs/development/python-modules/jaraco-collections/default.nix +++ b/pkgs/development/python-modules/jaraco-collections/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { setuptools-scm ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ jaraco-classes jaraco-text diff --git a/pkgs/development/python-modules/jaraco-context/default.nix b/pkgs/development/python-modules/jaraco-context/default.nix index 7a882c80195c1..637e23b2cdd86 100644 --- a/pkgs/development/python-modules/jaraco-context/default.nix +++ b/pkgs/development/python-modules/jaraco-context/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { hash = "sha256-YdbkpKv7k62uyhmjKoxeA9uf5BWnRD/rK+z46FJN4xk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonNamespaces = [ "jaraco" ]; diff --git a/pkgs/development/python-modules/jaraco-email/default.nix b/pkgs/development/python-modules/jaraco-email/default.nix index b23d9504dea1d..7e4ca68deb04c 100644 --- a/pkgs/development/python-modules/jaraco-email/default.nix +++ b/pkgs/development/python-modules/jaraco-email/default.nix @@ -45,8 +45,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ jaraco-text jaraco-collections diff --git a/pkgs/development/python-modules/jaraco-functools/default.nix b/pkgs/development/python-modules/jaraco-functools/default.nix index 0cc2fa124db50..28a7d64e11f96 100644 --- a/pkgs/development/python-modules/jaraco-functools/default.nix +++ b/pkgs/development/python-modules/jaraco-functools/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "jaraco-functools"; - version = "3.9.0"; + version = "4.0.0"; format = "pyproject"; src = fetchPypi { pname = "jaraco.functools"; inherit version; - hash = "sha256-ixN7D+rMF/70us7gTAEcnobyNBCZyHCh0S0743sypjg="; + hash = "sha256-wnnLJMk9aU73Jw+XDUmcq004E/TggnP5U5hlGmNPCSU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/jaraco-net/default.nix b/pkgs/development/python-modules/jaraco-net/default.nix index 565395d84023a..4765c1dc301c0 100644 --- a/pkgs/development/python-modules/jaraco-net/default.nix +++ b/pkgs/development/python-modules/jaraco-net/default.nix @@ -49,8 +49,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ more-itertools beautifulsoup4 diff --git a/pkgs/development/python-modules/jaraco-text/default.nix b/pkgs/development/python-modules/jaraco-text/default.nix index eacbf2cbfd966..5f6bc4021c0ff 100644 --- a/pkgs/development/python-modules/jaraco-text/default.nix +++ b/pkgs/development/python-modules/jaraco-text/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "jaraco-text"; - version = "3.11.1"; + version = "3.12.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jaraco.text"; inherit version; - hash = "sha256-Mzpd8hSPcTlxhgfN81L+HZUWKXGnKZw4Dcwk2rAWiYA="; + hash = "sha256-OJ4lyNSzLpcVv1MFlvqw9c06pHKW5DlpOS4YpUGvWSw="; }; pythonNamespaces = [ diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index fa7e2b18e6f4c..1d2424dca7eb4 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -2,23 +2,30 @@ , buildPythonPackage , fetchFromGitHub , defusedxml +, filemagic , flaky +, ipython , keyring +, packaging +, pyjwt +, pytestCheckHook +, pythonOlder +, requests +, requests-futures , requests-mock , requests-oauthlib , requests-toolbelt +, setuptools , setuptools-scm -, setuptools-scm-git-archive -, pytestCheckHook -, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "jira"; version = "3.5.2"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pycontribs"; @@ -28,19 +35,35 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + setuptools setuptools-scm - setuptools-scm-git-archive ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ defusedxml - keyring + packaging + requests requests-oauthlib requests-toolbelt + typing-extensions ]; + passthru.optional-dependencies = { + cli = [ + ipython + keyring + ]; + opt = [ + filemagic + pyjwt + # requests-jwt + # requests-keyberos + ]; + async = [ + requests-futures + ]; + }; + nativeCheckInputs = [ flaky pytestCheckHook @@ -65,5 +88,6 @@ buildPythonPackage rec { changelog = "https://github.com/pycontribs/jira/releases/tag/${version}"; license = licenses.bsd2; maintainers = with maintainers; [ ]; + mainProgram = "jirashell"; }; } diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 76eea5097581d..298a2ce83adfb 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch +, pythonAtLeast , stdenv # build-system @@ -30,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-kvhl5iHhd4TnlVCAttBCSJ47jilJScxExurDBPWXcrE="; }; + patches = [ + (fetchpatch { + name = "suppress-deprecation-warnings-with-python312.patch"; + url = "https://github.com/joblib/joblib/commit/05caf0772d605799e5d2337018fd32ac829b37aa.patch"; + hash = "sha256-bfqxCLFkCnuWMIkIbcjh+nCTv38A8jxvyCHeJPxoZwg="; + }) + ]; + nativeBuildInputs = [ setuptools ]; @@ -54,6 +64,10 @@ buildPythonPackage rec { "test_nested_parallel_warnings" # tests is flaky under load ] ++ lib.optionals stdenv.isDarwin [ "test_dispatch_multiprocessing" # test_dispatch_multiprocessing is broken only on Darwin. + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # deprecation warnings with python3.12 https://github.com/joblib/joblib/issues/1478 + "test_main_thread_renamed_no_warning" + "test_background_thread_parallelism" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index f8a76641f537b..1206c816b3d83 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , cryptography -, fetchpatch , fetchPypi +, poetry-core , pyopenssl , pytestCheckHook , pythonOlder @@ -10,24 +10,18 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.13.0"; - format = "setuptools"; + version = "1.14.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iTHa84+KTIUnSg6LfLJa3f2NHyj5+4++0FPdUa7HXck="; + hash = "sha256-MIs7+c6CWtTUu6djcs8ZtdwcLOlqnSmPlkKXXmS9E90="; }; - patches = [ - # https://github.com/certbot/josepy/pull/158 - (fetchpatch { - name = "fix-setuptools-deprecation.patch"; - url = "https://github.com/certbot/josepy/commit/8f1b4b57a29a868a87fd6eee19a67a7ebfc07ea1.patch"; - hash = "sha256-9d+Bk/G4CJXpnjJU0YkXLsg0G3tPxR8YN2niqriQQkI="; - includes = [ "tests/test_util.py" ]; - }) + nativeBuildInputs = [ + poetry-core ]; propagatedBuildInputs = [ @@ -39,20 +33,15 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --flake8 --cov-report xml --cov-report=term-missing --cov=josepy --cov-config .coveragerc" "" - sed -i '/flake8-ignore/d' pytest.ini - ''; - pythonImportsCheck = [ "josepy" ]; meta = with lib; { + changelog = "https://github.com/certbot/josepy/blob/v${version}/CHANGELOG.rst"; description = "JOSE protocol implementation in Python"; - homepage = "https://github.com/jezdez/josepy"; + homepage = "https://github.com/certbot/josepy"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix index c67fea93b13a8..b7c2a1e296efe 100644 --- a/pkgs/development/python-modules/jproperties/default.nix +++ b/pkgs/development/python-modules/jproperties/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { hash = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix index e0769f4ffa191..3630c0b38eaf5 100644 --- a/pkgs/development/python-modules/js2py/default.nix +++ b/pkgs/development/python-modules/js2py/default.nix @@ -1,6 +1,8 @@ { lib , fetchPypi , buildPythonPackage +, pythonAtLeast +, setuptools , tzlocal , six , pyjsparser @@ -9,7 +11,11 @@ buildPythonPackage rec { pname = "js2py"; version = "0.74"; - format = "setuptools"; + pyproject = true; + + # broken with Python 3.12 + # https://github.com/PiotrDabkowski/Js2Py/issues/317 + disabled = pythonAtLeast "3.12"; src = fetchPypi { pname = "Js2Py"; @@ -17,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyjsparser six diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index 7b925777b2d71..bff05f2562473 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -1,42 +1,49 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pythonAtLeast + +# build-system +, setuptools , setuptools-scm -, toml -, importlib-metadata + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "jsonpickle"; version = "3.0.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-43q7pL+zykpGR9KLufRwZDb3tGyKgzO0pxirr6jkazc="; }; - nativeCheckInputs = [ pytest ]; - nativeBuildInputs = [ + setuptools setuptools-scm - toml - ]; - - propagatedBuildInputs = [ - importlib-metadata ]; - checkPhase = '' + preCheck = '' rm pytest.ini - pytest tests/jsonpickle_test.py ''; - meta = { + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # imports distutils + "test_thing_with_submodule" + ]; + + meta = with lib; { description = "Python library for serializing any arbitrary object graph into JSON"; + downloadPage = "https://github.com/jsonpickle/jsonpickle"; homepage = "http://jsonpickle.github.io/"; - license = lib.licenses.bsd3; + license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/jsonschema-path/default.nix b/pkgs/development/python-modules/jsonschema-path/default.nix new file mode 100644 index 0000000000000..598b0fdf3e834 --- /dev/null +++ b/pkgs/development/python-modules/jsonschema-path/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pathable +, pyyaml +, referencing +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "jsonschema-path"; + version = "0.3.2"; + + disabled = pythonOlder "3.8"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "p1c2u"; + repo = "jsonschema-path"; + rev = version; + hash = "sha256-HC0yfACKFIQEQoIa8/FUKyV8YS8TQ0BY7i3n9xCdKz8="; + }; + + postPatch = '' + sed -i '/--cov/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pathable + pyyaml + referencing + ]; + + pythonImportsCheck = [ "jsonschema_path" ]; + + nativeCheckInputs = [ + pytestCheckHook + responses + ]; + + meta = { + description = "JSONSchema Spec with object-oriented paths"; + homepage = "https://github.com/p1c2u/jsonschema-path"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/jsonschema-spec/default.nix b/pkgs/development/python-modules/jsonschema-spec/default.nix index 0da22f2cf98f0..7e8c668a07915 100644 --- a/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook # build , poetry-core @@ -40,6 +41,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "referencing" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonschema-specifications/default.nix b/pkgs/development/python-modules/jsonschema-specifications/default.nix index 54b8d6df6ea1e..07fd3dcd58954 100644 --- a/pkgs/development/python-modules/jsonschema-specifications/default.nix +++ b/pkgs/development/python-modules/jsonschema-specifications/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jsonschema-specifications"; - version = "2023.7.1"; + version = "2023.11.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jsonschema_specifications"; inherit version; - hash = "sha256-yRpQQE6Iofa6QGNneOLuCPbiTFYT/kxTrCRXilp/crs="; + hash = "sha256-lHL8T+pHTNdL6korGQ2uzLWp5NsuqA7896G1gvyagbg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index d8c235efed235..10074463f80a1 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.19.0"; + version = "4.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bh51aawTvoE5st0sIaVdNQBm7j+A3wbGCLOYzcbzDo8="; + hash = "sha256-T2FP1G2NYSWGEJmJl3Q+xUkqZIszz0eMHdwj7UWYpfo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 631a853833d46..69d0734bfa00e 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -65,7 +65,10 @@ buildPythonPackage rec { pythonRelaxDeps = [ "docutils" - "sphinx-design" + "myst-nb" + "sphinx" + "sphinx-thebe" + "sphinxcontrib-bibtex" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/jupyter-lsp/default.nix b/pkgs/development/python-modules/jupyter-lsp/default.nix index fd8820bcb1d45..1cc43ebc60013 100644 --- a/pkgs/development/python-modules/jupyter-lsp/default.nix +++ b/pkgs/development/python-modules/jupyter-lsp/default.nix @@ -1,20 +1,24 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi +, setuptools , jupyter-server }: buildPythonPackage rec { pname = "jupyter-lsp"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-jrvLUzrbQeXWNeuP6ClWsKr78P1EO2xL+pBu3uuGNaE="; + hash = "sha256-sX+rbXD+g8iJawz/WSN2QAOCR8GWBWtDaEoJArap4Ps="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jupyter-server ]; diff --git a/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/pkgs/development/python-modules/jupyterlab-lsp/default.nix index 82d912923895f..004bddfbe8acf 100644 --- a/pkgs/development/python-modules/jupyterlab-lsp/default.nix +++ b/pkgs/development/python-modules/jupyterlab-lsp/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , jupyterlab , jupyter-lsp }: buildPythonPackage rec { pname = "jupyterlab-lsp"; - version = "5.0.0"; - format = "setuptools"; + version = "5.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-D4jiaAPQ8+TIyL7wip+GHycGp3ym1NkvZQJsCelYFks="; + hash = "sha256-jQ8mhTfZ+6F9EgDfBWVI6I/I3n2lIlJs+mM0OJ0MKTQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jupyterlab jupyter-lsp diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index a408137650ac5..4eed7af804c03 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.25.1"; + version = "2.25.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-ZJEoOwAAaY6uGjjEhQeTBWDfz3RhrqABU2hpiqs03Zw="; + hash = "sha256-vQ7HqZ687ci8/5Oe+G5Sw3jkTCcH4FP82B0EbOl57mM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix index eb60f61d5f3c9..fc53fc81ed709 100644 --- a/pkgs/development/python-modules/kanidm/default.nix +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch +, fetchFromGitHub , pythonOlder # build @@ -9,6 +8,7 @@ # propagates , aiohttp +, authlib , pydantic , toml @@ -20,25 +20,30 @@ let pname = "kanidm"; - version = "0.0.3"; + version = "0.0.3-unstable-2023-08-23"; in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-sTkAKxtJa7CVYKuXC//eMmf3l8ABsrEr2mdf1r2Gf9A="; + src = fetchFromGitHub { + owner = "kanidm"; + repo = "kanidm"; + rev = "def4420c4c5c3ec4f9b02776e1d5fdb07aa3a729"; + hash = "sha256-5qQb+Itguw2v1Wdvc2vp00zglfvNd3LFEDvaweRJcOc="; }; + sourceRoot = "source/pykanidm"; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp + authlib pydantic toml ]; diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index 04d5b17c55e99..ec41ce9f27f94 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-git-versioning diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index f5275ea1a2a67..b91925b574e6d 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.14.0"; + version = "3.0.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - hash = "sha256-10KdHSExzH6x8uouwzAifH2dONqz398ueN7+5OzEP80="; + hash = "sha256-/z8++iqlzBNLHYuFaTqrMlWLHZyGBjChP1iTTm0ckI0="; python = "py3"; dist = "py3"; }; diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index 815ef3aa3104f..c3e13d8b0fc4a 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -15,6 +15,7 @@ , requests , requests-kerberos , requests-mock +, setuptools , six , stestr , stevedore @@ -24,12 +25,12 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "5.3.0"; - format = "setuptools"; + version = "5.4.0"; + pyproject= true; src = fetchPypi { inherit pname version; - hash = "sha256-AXwrm1mUU8kpQHUO27IPF2hxIbKJARS/nTbfFKBicRc="; + hash = "sha256-GsE0FRzrAuULaK143smCG/if5TvTb8hlhQHEewfL31M="; }; postPatch = '' @@ -38,6 +39,10 @@ buildPythonPackage rec { rm test-requirements.txt ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ betamax iso8601 diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix index 5f2906cc8cca3..84eb2697eaac5 100644 --- a/pkgs/development/python-modules/kiss-headers/default.nix +++ b/pkgs/development/python-modules/kiss-headers/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "kiss-headers"; - version = "2.3.1"; + version = "2.4.3"; format = "setuptools"; src = fetchFromGitHub { owner = "Ousret"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xPjw/uJTmvmQZDrI3i1KTUeAZuDF1mc13hvFBl8Erh0="; + hash = "sha256-WeAzlC1yT+0nPSuB278z8T0XvPjbre051f/Rva5ujAk="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 2b28f76d051ae..bb3bd33e469ec 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "kubernetes"; - version = "27.2.0"; + version = "28.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "kubernetes-client"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-KqQ7wUu5Se4WYOdtk9vMU3M5oyz0WgIltSEliCD7s10="; + hash = "sha256-NKrxv5a5gkgpNG7yViTKYBYnU249taWl6fkPJa7/Rzo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 2c10a95ca5d1d..0dbdb7774f26f 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -99,5 +99,7 @@ buildPythonPackage rec { changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; + # https://github.com/Labelbox/labelbox-python/issues/1246 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 4a66ff5a364ac..15474fa5b6593 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -57,10 +57,6 @@ buildPythonPackage rec { xmodem ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" - ''; - nativeCheckInputs = [ mock psutil diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index c2fabc40c03a1..429689452a83e 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.334"; + version = "0.0.344"; pyproject = true; disabled = pythonOlder "3.8"; @@ -93,7 +93,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-mXPqc8wF9DhEtITm8h5R9kHBcMJ7AEK4kL5Z7V2p8NE="; + hash = "sha256-pvoY2QuGTZhqeCi9oLOH1XrxfT4FMfHwNkIGIaYTEo8="; }; sourceRoot = "${src.name}/libs/langchain"; diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix index 3158b626c2a63..5366311fed3ca 100644 --- a/pkgs/development/python-modules/lark/default.nix +++ b/pkgs/development/python-modules/lark/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , regex , pytestCheckHook , js2py @@ -10,25 +9,16 @@ buildPythonPackage rec { pname = "lark"; - version = "1.1.7"; + version = "1.1.8"; format = "pyproject"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = "refs/tags/${version}"; - hash = "sha256-k74tozIgJuwtUqKKmYHlfLpCWyT2hdoygRJiIpw+GDE="; + hash = "sha256-bGNoQeiAC2JIFOhgYUnc+nApa2ovFzXnpl9JQAE11hM="; }; - patches = [ - # include .lark files in package data - # https://github.com/lark-parser/lark/pull/1308 - (fetchpatch { - url = "https://github.com/lark-parser/lark/commit/656334cb8793fd4e08a12843eaced5a7bb518be3.patch"; - hash = "sha256-pYeNnFfXJ8xkR0KsU/KMWJ8nF+BhP9PXEANiVhT254s="; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix index f1b55e0ae817e..336fb029c4766 100644 --- a/pkgs/development/python-modules/leidenalg/default.nix +++ b/pkgs/development/python-modules/leidenalg/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "leidenalg"; - version = "0.9.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-flz+O2+A8yuQ9V81xo1KmQsEibEoLPP6usjNpJiJdfM="; + hash = "sha256-RXrZaYKoC9XGVxifQt/rd+6807dEoRDlosFhjS64C0c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix index abad21fe6760d..d1fc8ec75e33c 100644 --- a/pkgs/development/python-modules/libcst/default.nix +++ b/pkgs/development/python-modules/libcst/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , cargo , hypothesis , libiconv @@ -40,14 +41,21 @@ buildPythonPackage rec { cargoRoot = "native"; + patches = [ + # https://github.com/Instagram/LibCST/pull/1042 + (fetchpatch { + name = "remove-distutils.patch"; + url = "https://github.com/Instagram/LibCST/commit/a6834aa0e6eb78e41549fd1087d7ba60ca4dd237.patch"; + hash = "sha256-lyIXJhm4UMwdCOso6McDslIvtK7Ar8sF5Zy7qo1nicQ="; + }) + ]; + postPatch = '' # avoid infinite recursion by not formatting the release files substituteInPlace libcst/codegen/generate.py \ --replace '"ufmt"' '"true"' ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-rust setuptools-scm diff --git a/pkgs/development/python-modules/libretranslate/default.nix b/pkgs/development/python-modules/libretranslate/default.nix index 12e33f45895f6..9dab13428a955 100644 --- a/pkgs/development/python-modules/libretranslate/default.nix +++ b/pkgs/development/python-modules/libretranslate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "libretranslate"; - version = "1.3.11"; + version = "1.5.2"; format = "setuptools"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "LibreTranslate"; repo = "LibreTranslate"; rev = "refs/tags/v${version}"; - hash = "sha256-S2J7kcoZFHOjVm2mb3TblWf9/FzkxZEB3h27BCaPYgY="; + hash = "sha256-8bbVpC53wH9GvwwHHlPEYQd/zqMXIqrwixwn4HY6FMg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index f94608c1b452a..c0df7019ed963 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.23.2"; + version = "0.25.0"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-W1gBhukBooPo8uej6i8i3UxLuDeBBeSX5xU50SyjjlA="; + hash = "sha256-cAogRdhJdXC0lMQRlWwSHQj205mG9uwd1XkFJYsAetA="; }; postPatch = '' - sed -i '/addopts/d' setup.cfg + sed -i '/addopts/d' pyproject.toml ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix index 71443bb0144a1..4988a3d25674c 100644 --- a/pkgs/development/python-modules/license-expression/default.nix +++ b/pkgs/development/python-modules/license-expression/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-vsQsHi2jdB0OiV6stm1APjQvr+238UoKgaaeXVx/isI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - dontConfigure = true; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 2146f1b9a0bca..f55fd087cad9d 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-VLfFWFcwLgEEvPUKQ00QjEq1HN28OpE6Eu1eyF+TwXU="; + hash = "sha256-0h3ofungHkjycUvNJ3jf+VB/GSrshgUDECN2YoPGzzg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear_operator/default.nix index 1bf11865dfc0b..f2e9c0b84929e 100644 --- a/pkgs/development/python-modules/linear_operator/default.nix +++ b/pkgs/development/python-modules/linear_operator/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 0f210be88119f..c0c54862c6e85 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , requests , pytestCheckHook , mock @@ -9,8 +10,9 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.7.2"; - format = "setuptools"; + version = "5.10.0"; + pyproject = true; + disabled = pythonOlder "3.6"; # Sources from Pypi exclude test fixtures @@ -18,10 +20,16 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; rev = "refs/tags/v${version}"; - sha256 = "sha256-RU/GyNYV05iYVNanMqKMmoksXWrxTQ2H2XvaIwSSslA="; + hash = "sha256-LQW1AKgCbsE2OxZHtuU6zSHv7/Ak2S07O8YuoC9mS+U="; }; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index f6e5379fb2710..70d4fc1862f01 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { hash = "sha256-LU8rQmXrEIoOBTTFotGvMeHqksYGrtNo2YSl2l2e/UI="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ installShellFiles setuptools diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index 695a23d90ac58..d7dd857c360b3 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , python }: buildPythonPackage rec { pname = "lit"; - version = "17.0.1"; - format = "setuptools"; + version = "17.0.6"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RIZ65Xa1eQVnsSC8Pw2fAh2slCTRsIQMdazYX0YQrAQ="; + hash = "sha256-36mvm1X8RQmla+e/I0bwedf0okLVg7ny4LB4/Qq64xs="; }; + nativeBuildInputs = [ + setuptools + ]; + passthru = { inherit python; }; diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix index 39b35e3306a9b..fa3140a9f6617 100644 --- a/pkgs/development/python-modules/lizard/default.nix +++ b/pkgs/development/python-modules/lizard/default.nix @@ -27,12 +27,19 @@ buildPythonPackage rec { mock ]; + disabledTestPaths = [ + # re.error: global flags not at the start of the expression at position 14 + "test/test_languages/testFortran.py" + ]; + pythonImportsCheck = [ "lizard" ]; meta = with lib; { + changelog = "https://github.com/terryyin/lizard/blob/${version}/CHANGELOG.md"; description = "Code analyzer without caring the C/C++ header files"; + downloadPage = "https://github.com/terryyin/lizard"; homepage = "http://www.lizard.ws"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 925c449ae9988..ac74a6e3403b4 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -2,34 +2,36 @@ , stdenv , fetchFromGitHub , buildPythonPackage -, python -, llvm -, pythonOlder , isPyPy -, enum34 -, isPy3k +, pythonAtLeast + +# build-system +, llvm +, setuptools + +# tests +, python }: buildPythonPackage rec { pname = "llvmlite"; - # The main dependency of llvmlite is numba, which we currently package an - # untagged version of it (for numpy>1.25 support). That numba version - # requires at least this version of llvmlite (also not yet officially - # released, but at least tagged). - version = "0.41.0dev0"; - format = "setuptools"; + version = "0.41.1"; + pyproject = true; - disabled = isPyPy || !isPy3k; + # uses distutils in setup.py + disabled = isPyPy || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "numba"; repo = "llvmlite"; - rev = "v${version}"; - hash = "sha256-fsH+rqouweNENU+YlWr7m0bC0YdreQLNp1n2rwrOiFw="; + rev = "refs/tags/v${version}"; + hash = "sha256-RBgs8L5kOJ8BhEDLB8r8/iVhwuVIPT/rUSmwmBWm4D0="; }; - nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = lib.optional (pythonOlder "3.4") enum34; + nativeBuildInputs = [ + llvm + setuptools + ]; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -45,7 +47,9 @@ buildPythonPackage rec { ''; checkPhase = '' + runHook preCheck ${python.executable} runtests.py + runHook postCheck ''; __impureHostDeps = lib.optionals stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; @@ -53,7 +57,9 @@ buildPythonPackage rec { passthru.llvm = llvm; meta = with lib; { + changelog = "https://github.com/numba/llvmlite/blob/v${version}/CHANGE_LOG"; description = "A lightweight LLVM python binding for writing JIT compilers"; + downloadPage = "https://github.com/numba/llvmlite"; homepage = "http://llvmlite.pydata.org/"; license = licenses.bsd2; maintainers = with maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/localstack-ext/default.nix b/pkgs/development/python-modules/localstack-ext/default.nix index 90e743f839e72..1386ce2cb7120 100644 --- a/pkgs/development/python-modules/localstack-ext/default.nix +++ b/pkgs/development/python-modules/localstack-ext/default.nix @@ -1,14 +1,26 @@ { lib , buildPythonPackage , fetchPypi + +# build-system +, setuptools +, plux + +# dependencies +, cachetools +, click +, cryptography , dill , dnslib , dnspython -, plux -, pyaes -, python-jose +, psutil +, python-dotenv +, pyyaml , requests -, tabulate +, rich +, semver +, stevedore +, tailer # Sensitive downstream dependencies , localstack @@ -16,12 +28,12 @@ buildPythonPackage rec { pname = "localstack-ext"; - version = "2.3.2"; - format = "setuptools"; + version = "3.0.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Ex5ZPlteDaiyex90QumucVdTTbpp9uWiBrvw1kMr++8="; + hash = "sha256-KNM/HjSWVwenLqtXbaRP70k7b7YXk//aKGEkBxPp1fA="; }; postPatch = '' @@ -38,15 +50,27 @@ buildPythonPackage rec { --replace "requests>=2.20.0,<2.26" "requests~=2.20" ''; + nativeBuildInputs = [ + plux + setuptools + ]; + propagatedBuildInputs = [ + cachetools + click + cryptography dill dnslib dnspython plux - pyaes - python-jose + psutil + python-dotenv + pyyaml + rich requests - tabulate + semver + stevedore + tailer ]; pythonImportsCheck = [ "localstack_ext" ]; diff --git a/pkgs/development/python-modules/localstack/default.nix b/pkgs/development/python-modules/localstack/default.nix index 6a408c9359205..39b27be9f93fa 100644 --- a/pkgs/development/python-modules/localstack/default.nix +++ b/pkgs/development/python-modules/localstack/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , apispec , boto3 , cachetools @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "localstack"; - version = "3.0.0"; - format = "setuptools"; + version = "3.0.2"; + pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-N/Mc1bubCcq38VxUqkO9LGG25pEetEyJ+VJMdg/7hrU="; + hash = "sha256-HncD/lhYfBrqtXF8F1Gz7JqwrASoHbsXvp1HXM5rldw="; }; postPatch = '' @@ -37,6 +38,10 @@ buildPythonPackage rec { --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ apispec boto3 diff --git a/pkgs/development/python-modules/lsprotocol/default.nix b/pkgs/development/python-modules/lsprotocol/default.nix index 5ee4d3ed11260..06776c0eec3e2 100644 --- a/pkgs/development/python-modules/lsprotocol/default.nix +++ b/pkgs/development/python-modules/lsprotocol/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "lsprotocol"; - version = "2023.0.0b1"; + version = "2023.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Y/Mp/8MskRB6irNU3CBOKmo2Zt5S69h+GyMg71sQ9Uw="; + hash = "sha256-K5jocKVxMNoUYYUi9YO2+N7hHWj0MFLprqGOzsg1QRs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/luddite/default.nix b/pkgs/development/python-modules/luddite/default.nix index 9996e3574ce37..d6ff66594f47c 100644 --- a/pkgs/development/python-modules/luddite/default.nix +++ b/pkgs/development/python-modules/luddite/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , packaging , pytestCheckHook , pytest-mock @@ -14,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jumptrading"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-JXIM7/5LO95oabM16GwAt3v3a8uldGpGXDWmVic8Ins="; }; @@ -24,10 +25,22 @@ buildPythonPackage rec { --replace "--disable-socket" "" ''; - propagatedBuildInputs = [ packaging ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytestCheckHook pytest-mock ]; - pythonImportsCheck = [ "luddite" ]; + propagatedBuildInputs = [ + packaging + ]; + + pythonImportsCheck = [ + "luddite" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; meta = with lib; { description = "Checks for out-of-date package versions"; diff --git a/pkgs/development/python-modules/lz4/default.nix b/pkgs/development/python-modules/lz4/default.nix index ed06dca7c4c5a..8bc09d315a3a7 100644 --- a/pkgs/development/python-modules/lz4/default.nix +++ b/pkgs/development/python-modules/lz4/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-aVnXCrTh+0Ip+FgYWN7hLw8N3iQCmXSywhReD5RTUfI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' sed -i '/pytest-cov/d' setup.py ''; diff --git a/pkgs/development/python-modules/magicgui/default.nix b/pkgs/development/python-modules/magicgui/default.nix index ef327dd0f08b3..2e8f1b529a14b 100644 --- a/pkgs/development/python-modules/magicgui/default.nix +++ b/pkgs/development/python-modules/magicgui/default.nix @@ -22,8 +22,6 @@ hash = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index fc868ffefd2c4..79be6d7b5bc75 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -47,5 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/makefun/default.nix b/pkgs/development/python-modules/makefun/default.nix index 03d6e587eafe7..bc26604826acb 100644 --- a/pkgs/development/python-modules/makefun/default.nix +++ b/pkgs/development/python-modules/makefun/default.nix @@ -1,18 +1,23 @@ { lib , fetchPypi , buildPythonPackage + +# build-system +, setuptools , setuptools-scm + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "makefun"; - version = "1.15.1"; - format = "setuptools"; + version = "1.15.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-QLDxGLbe0NjXjHjx62ebi2skYuPBs+BfsbLajNRrSKU="; + hash = "sha256-FvKis02e4MK1eMlgoYCMl04oIs959um5xFWqzhCILUU="; }; postPatch = '' @@ -21,6 +26,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index d9b3ecefc9ed5..0a84359b27b6a 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -4,32 +4,39 @@ , fetchPypi , isPyPy +# build-system +, setuptools + # propagates , markupsafe -# extras: Babel +# optional-dependencies , babel +, lingua # tests +, chameleon , mock , pytestCheckHook -, lingua -, chameleon }: buildPythonPackage rec { pname = "mako"; - version = "1.2.4"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Mako"; inherit version; - hash = "sha256-1go5A9w7sBoYrWqJzb4uTq3GnAvI7x43c7pT1Ew/ejQ="; + hash = "sha256-46nTiP0A6HBD7b6HkvRYgKwBFOnErcafbpv7LFXjsRs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ markupsafe ]; @@ -38,14 +45,16 @@ buildPythonPackage rec { babel = [ babel ]; + lingua = [ + lingua + ]; }; nativeCheckInputs = [ chameleon - lingua mock pytestCheckHook - ] ++ passthru.optional-dependencies.babel; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); disabledTests = lib.optionals isPyPy [ # https://github.com/sqlalchemy/mako/issues/315 diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index cec9773449c5c..b67a4a13304a4 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { lib.optionals (pythonOlder "3.7") [ importlib-resources ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/development/python-modules/manifestoo/default.nix b/pkgs/development/python-modules/manifestoo/default.nix index c9499eb113103..63383eb76ee09 100644 --- a/pkgs/development/python-modules/manifestoo/default.nix +++ b/pkgs/development/python-modules/manifestoo/default.nix @@ -38,8 +38,6 @@ buildPythonPackage rec { ++ typer.passthru.optional-dependencies.all ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/development/python-modules/markdown-include/default.nix b/pkgs/development/python-modules/markdown-include/default.nix index f56a8b40e4bc6..b2b21fb831eb8 100644 --- a/pkgs/development/python-modules/markdown-include/default.nix +++ b/pkgs/development/python-modules/markdown-include/default.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-1MEk0U00a5cpVhqnDZkwBIk4NYgsRXTVsI/ANNQ/OH0="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 7de193bbbbd79..4041a1aa3035b 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -6,27 +6,25 @@ , pyyaml , setuptools , unittestCheckHook -, wheel }: buildPythonPackage rec { pname = "markdown"; - version = "3.4.4"; + version = "3.5.1"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-5PIIhbJVsotGwZ3BQ4x0I7WjgnGF3opNrn8J+xZCflg="; + hash = "sha256-OeCr72N3ygYYJnI+bIXCt63tSLDFLKznYekTk1sYHZI="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ @@ -38,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "markdown" ]; meta = with lib; { - changelog = "https://github.com/Python-Markdown/markdown/blob/${src.rev}/docs/change_log/index.md"; + changelog = "https://github.com/Python-Markdown/markdown/blob/${src.rev}/docs/changelog.md"; description = "Python implementation of John Gruber's Markdown"; homepage = "https://github.com/Python-Markdown/markdown"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 4ac081e26a200..1100d1bdbc99d 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -79,7 +79,7 @@ let in buildPythonPackage rec { - version = "3.8.0"; + version = "3.8.2"; pname = "matplotlib"; format = "pyproject"; @@ -87,7 +87,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-34UF4cGdXCwmr/NJeny9PM/C6XBD0eTbPnavo5kWS2k="; + hash = "sha256-Aal4uHG4ge52AXFS8fGgy/a9X3uP+Mlt8N8b1X2HVaE="; }; env.XDG_RUNTIME_DIR = "/tmp"; diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index b5f7fb9d5db03..1bd579afe70c7 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maxminddb"; - version = "2.4.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-geVOU0CL1QJlDllpzLoWeAr2WewdscRLLJl+QzCl7ZY="; + hash = "sha256-SAfTdOZFvWgzTk9Ie6haJxidvBJnqY5kSqaGp5J+BVk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index cff34c84442d9..865e2a6ee774e 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "11.0.1"; + version = "11.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1jPIsFEJ17kjtCBiX4IvSf2FxYw9DkH3MrrJ85N71tc="; + hash = "sha256-LYhd35FsredNaMgMfkj7LntNK3NRoVpniEUT6WHoXx8="; }; postPatch = '' @@ -56,6 +56,8 @@ buildPythonPackage rec { # DNS features are limited in the sandbox "test_query" "test_query_retry" + "test_resolve_localhost" + "test_async_resolve_localhost" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index 3323e8c198ff2..c16b03d8e829b 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { sphinx ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov=measurement" "" diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index fe4e8dd598d5c..4a9001ff1b9c0 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mesa"; - version = "2.1.1"; + version = "2.1.5"; format = "setuptools"; # According to their docs, this library is for Python 3+. @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mesa"; inherit version; - hash = "sha256-1wyXndB7xQy1jnfHsIqMQgsvmGYUhjDuSBB2M0GcXC4="; + hash = "sha256-UMf3z1bEElygfqwgY65qhOEK4i9K9gH42muId3mZUjY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 84031db71b808..9d34cb27c8cdc 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "meson-python"; - version = "0.14.0"; + version = "0.15.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "meson_python"; - hash = "sha256-uWhmaQMmVE3+RSWDdTrD9DMTIn6f2UFnAajfkK8hIjQ="; + hash = "sha256-/dtz7s1J6JwcQch5N82JwtC2WhxjuigjhoHUvZSE0m8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/miauth/default.nix b/pkgs/development/python-modules/miauth/default.nix index 380fe8e23e1fc..a48690ab0b07a 100644 --- a/pkgs/development/python-modules/miauth/default.nix +++ b/pkgs/development/python-modules/miauth/default.nix @@ -1,14 +1,21 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, pythonRelaxDepsHook + +# build-system , setuptools -, wheel + +# dependencies , bluepy -, pythonOlder , cryptography + +# tests +, pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { pname = "miauth"; version = "0.9.1"; pyproject = true; @@ -26,7 +33,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "cryptography" ]; propagatedBuildInputs = [ @@ -38,6 +49,8 @@ buildPythonPackage rec { "miauth" ]; + doCheck = false; # no tests + meta = with lib; { description = "Authenticate and interact with Xiaomi devices over BLE"; homepage = "https://github.com/dnandha/miauth"; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 5181d8bef54e0..ddb2905bc1d95 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# build-system +, setuptools + +# dependencies +, argon2-cffi , certifi -, configparser +, urllib3 +, pycryptodome + +# test , faker -, fetchFromGitHub -, future , mock -, nose , pytestCheckHook -, python-dateutil -, pythonOlder -, pytz -, urllib3 }: buildPythonPackage rec { pname = "minio"; - version = "7.1.17"; - format = "setuptools"; + version = "7.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,22 +29,23 @@ buildPythonPackage rec { owner = "minio"; repo = "minio-py"; rev = "refs/tags/${version}"; - hash = "sha256-I0Q1SkZ1zQ9s2HbMTc2EzUnnOti14zQBxHVJasaukug="; + hash = "sha256-hZn1T75JbnJ5lIyWnX3f8r6OET/d6ZltuRr6jjYOp2o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + argon2-cffi certifi - configparser - future - python-dateutil - pytz urllib3 + pycryptodome ]; nativeCheckInputs = [ faker mock - nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index d64fbf32614a2..f5d2735bf54be 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage , pythonOlder # Mitmproxy requirements -, aioquic +, aioquic-mitmproxy , asgiref , blinker , brotli @@ -29,7 +29,7 @@ , setuptools , sortedcontainers , tornado -, urwid +, urwid-mitmproxy , wsproto , zstandard # Additional check requirements @@ -57,7 +57,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - aioquic + aioquic-mitmproxy asgiref blinker brotli @@ -81,7 +81,7 @@ buildPythonPackage rec { setuptools sortedcontainers tornado - urwid + urwid-mitmproxy wsproto zstandard ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 59c433145b02f..e8df6bbc82537 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -1,54 +1,86 @@ { lib -, callPackage , buildPythonPackage , fetchFromGitHub -, colorama + +# build-system , hatch-requirements-txt , hatch-nodejs-version , hatchling +, trove-classifiers + +# dependencies +, babel +, colorama , jinja2 , markdown , mkdocs , mkdocs-material-extensions +, paginate , pygments , pymdown-extensions , pythonOlder , regex , requests + +# optional-dependencies +, mkdocs-minify-plugin +, mkdocs-redirects +, mkdocs-git-revision-date-localized-plugin +, pillow +, cairosvg }: buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.3.1"; - format = "pyproject"; + version = "9.4.14"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "squidfunk"; - repo = pname; + repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-2Z1U71agXxkYp1OFYd/xInAfN5SVI9FQf39b8DkX10o="; + hash = "sha256-oP0DeSRgoLx6boEOa3if5BitGXmJ11DoUVZK16Sjlwg="; }; nativeBuildInputs = [ hatch-requirements-txt hatch-nodejs-version hatchling + trove-classifiers ]; propagatedBuildInputs = [ + babel colorama jinja2 markdown mkdocs mkdocs-material-extensions + paginate pygments pymdown-extensions regex requests ]; + passthru.optional-dependencies = { + recommended = [ + mkdocs-minify-plugin + mkdocs-redirects + # TODO: mkdocs-rss-plugin + ]; + git = [ + # TODO: gmkdocs-git-committers-plugin + mkdocs-git-revision-date-localized-plugin + ]; + imaging = [ + cairosvg + pillow + ]; + }; + # No tests for python doCheck = false; @@ -57,7 +89,9 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/squidfunk/mkdocs-material/blob/${src.rev}/CHANGELOG"; description = "Material for mkdocs"; + downloadPage = "https://github.com/squidfunk/mkdocs-material"; homepage = "https://squidfunk.github.io/mkdocs-material/"; license = licenses.mit; maintainers = with maintainers; [ dandellion ]; diff --git a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix index 4e1c47a8c49d4..239d3507d59b3 100644 --- a/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix +++ b/pkgs/development/python-modules/mkdocs-material/mkdocs-material-extensions.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mkdocs-material-extensions"; - version = "1.1.1"; + version = "1.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-FHI6WEQRd/Ff6pmU13f8f0zPSeFhhbmDdk4/0rdIl4I="; + hash = "sha256-/jU30Ol10/4haR3ZPJWZ3iWRfXG/RUOU1oclOYGjjAY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-minify/default.nix b/pkgs/development/python-modules/mkdocs-minify-plugin/default.nix similarity index 92% rename from pkgs/development/python-modules/mkdocs-minify/default.nix rename to pkgs/development/python-modules/mkdocs-minify-plugin/default.nix index fcab8677cffa4..dbb09cc5795b9 100644 --- a/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/pkgs/development/python-modules/mkdocs-minify-plugin/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - pname = "mkdocs-minify"; + pname = "mkdocs-minify-plugin"; version = "0.7.1"; format = "setuptools"; src = fetchFromGitHub { owner = "byrnereese"; - repo = "${pname}-plugin"; + repo = "mkdocs-minify-plugin"; rev = "refs/tags/${version}"; hash = "sha256-LDCAWKVbFsa6Y/tmY2Zne4nOtxe4KvNplZuWxg4e4L8="; }; diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 61c8bdcd13c15..8a402510ec18d 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -3,6 +3,7 @@ lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder # buildtime @@ -23,23 +24,27 @@ , pyyaml-env-tag , watchdog -# testing deps +# optional-dependencies , babel +, setuptools + +# testing deps , mock , unittestCheckHook }: buildPythonPackage rec { pname = "mkdocs"; - version = "1.5.2"; - format = "pyproject"; - disabled = pythonOlder "3.6"; + version = "1.5.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9sV1bewsHVJEc2kTyGxDM6SjDTEKEc/HSY6gWBC5tvE="; + hash = "sha256-axH4AeL+osxoUIVJbW6YjiTfUr6TAXMB4raZ3oO0fyw="; }; nativeBuildInputs = [ @@ -63,18 +68,27 @@ buildPythonPackage rec { importlib-metadata ]; + passthru.optional-dependencies = { + i18n = [ + babel + ] ++ lib.optionals (pythonAtLeast "3.12") [ + setuptools + ]; + }; + nativeCheckInputs = [ unittestCheckHook - babel mock - ]; + ] ++ passthru.optional-dependencies.i18n; unittestFlagsArray = [ "-v" "-p" "'*tests.py'" "mkdocs" ]; pythonImportsCheck = [ "mkdocs" ]; meta = with lib; { + changelog = "https://github.com/mkdocs/mkdocs/releases/tag/${version}"; description = "Project documentation with Markdown / static website generator"; + downloadPage = "https://github.com/mkdocs/mkdocs"; longDescription = '' MkDocs is a fast, simple and downright gorgeous static site generator that's geared towards building project documentation. Documentation source files diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 41ebc9545ceff..2c89781564016 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.7.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3q8PXydgjpUm1p//zKcMgirJDqKQpvPkuz36GyCbARE="; + hash = "sha256-5OW90tnvsLOG7Lzi335D8ExGoyCAIIQU3FO1/XFVlng="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mlxtend/default.nix b/pkgs/development/python-modules/mlxtend/default.nix index 7a17e9a81925d..7f84aaac49ba1 100644 --- a/pkgs/development/python-modules/mlxtend/default.nix +++ b/pkgs/development/python-modules/mlxtend/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , isPy27 +, setuptools , pytestCheckHook , scipy , numpy @@ -13,23 +14,21 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.22.0"; - format = "setuptools"; + version = "0.23.0"; + pyproject = true; + disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YLCNLpg2qrdFon0/gdggJd9XovHwRHAdleBFQc18qzE="; + hash = "sha256-TUZ8SdQAOV1CaIlDl4uXYVHvdlEkOz6E48S3pUS6UE0="; }; - nativeCheckInputs = [ pytestCheckHook ]; - # image tests download files over the network - pytestFlagsArray = [ "-sv" "--ignore=mlxtend/image" ]; - # Fixed in master, but failing in release version - # see: https://github.com/rasbt/mlxtend/pull/721 - disabledTests = [ "test_variance_explained_ratio" ]; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ scipy @@ -40,6 +39,19 @@ buildPythonPackage rec { joblib ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "-sv" + ]; + + disabledTestPaths = [ + # image tests download files over the network + "mlxtend/image" + ]; + meta = with lib; { description = "A library of Python tools and extensions for data science"; homepage = "https://github.com/rasbt/mlxtend"; diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index ff071c0669541..a73d1fff7d358 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mmengine"; - version = "0.8.4"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "open-mmlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kJhcw6Hpzx3s5WHeLTF8pydbAKXwfVgvxo7SsSN5gls="; + hash = "sha256-PG6KSoM5VUyU84z66eZknQfMhS4YWAmyWCIIpRwUOpU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 940c633d4115f..8a85f487d2d22 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.5.1"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-djVQkj8ktIOxe1xmi+XuIvdS1WdDzozgTJNJhWAhuBo="; + hash = "sha256-OoaXNHGL2svOpNL5GHcVRfQc9GxIRpZRhpZ5Hi1JTzM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mockfs/default.nix b/pkgs/development/python-modules/mockfs/default.nix index 234a3d14d696f..680a6c9fc795b 100644 --- a/pkgs/development/python-modules/mockfs/default.nix +++ b/pkgs/development/python-modules/mockfs/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , setuptools , setuptools-scm -, wheel +, importlib-metadata , pytestCheckHook }: @@ -23,12 +23,13 @@ buildPythonPackage rec { sed -i '/addopts/d' pytest.ini ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm - wheel + ]; + + propagatedBuildInputs = [ + importlib-metadata ]; pythonImportsCheck = [ "mockfs" ]; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index cebb9c382c7c2..8e9ac1b408d23 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2023.9.5"; + version = "2023.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VzOu0gLQcobWQs8uMFzI4CyN+1OVx94VqhJYB+rMpMI="; + hash = "sha256-SENrAHCCWYEMWqPQSy61E8bMYkCBJepK5otb7B7UGXA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix index 8f849b42f1378..39e467a59963e 100644 --- a/pkgs/development/python-modules/moreorless/default.nix +++ b/pkgs/development/python-modules/moreorless/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-N11iqsxMGgzwW2QYeOoHQaR/aDEuoUnnd/2Mc5culN0="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index a76f39fc2a52f..7f5b42e4d2f04 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "moto"; - version = "4.2.10"; + version = "4.2.11"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kllf4odHSjGsPvhHlB67CX6P+ww9bBBuR89XPbBpM7I="; + hash = "sha256-LaYtUuqnZd/idiySDwqIpY86CeBFgckduWfZL67ISPE="; }; nativeBuildInputs = [ @@ -113,6 +113,9 @@ buildPythonPackage rec { # Fails at local name resolution "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" + "--deselect=tests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks::test_create_multipart" + "--deselect=tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_aws_and_http_requests" + "--deselect=tests/test_core/test_responses_module.py::TestResponsesMockWithPassThru::test_http_requests" # Fails at resolving google.com "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" @@ -125,13 +128,12 @@ buildPythonPackage rec { # Connection Reset by Peer, when connecting to localhost:5678 "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay" - # Requires docker, but isn't marked - # https://github.com/getmoto/moto/pull/6938 - "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers" - # Flaky under parallel execution "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" "--deselect=tests/test_core/test_moto_api.py::TestModelDataResetForClassDecorator::test_should_find_bucket" + + # AssertionError: assert ResourceWarning not in [, ] + "--deselect=ests/test_s3/test_s3_file_handles.py::TestS3FileHandleClosuresUsingMocks::test_delete_object_with_version" ]; disabledTestPaths = [ @@ -151,7 +153,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows your tests to easily mock out AWS Services"; - homepage = "https://github.com/spulec/moto"; + homepage = "https://github.com/getmoto/moto"; changelog = "https://github.com/getmoto/moto/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 3e4cf4d574add..1725547b1d7b0 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motor"; - version = "3.3.1"; + version = "3.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iJz3JiW9cVT3G1rLQwWQXcPfPBRGsIwVLs4gauM+pYo="; + hash = "sha256-ajlZleaaq0LIEW5PdTRQWL312guYA+7+x1xtPNKZQC0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mpl-scatter-density/default.nix b/pkgs/development/python-modules/mpl-scatter-density/default.nix index 48d05b1e6ca58..152c07f10a7eb 100644 --- a/pkgs/development/python-modules/mpl-scatter-density/default.nix +++ b/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ matplotlib numpy fast-histogram ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeCheckInputs = [ pytestCheckHook pytest-mpl diff --git a/pkgs/development/python-modules/mpris-server/default.nix b/pkgs/development/python-modules/mpris-server/default.nix index 783fc6aab959f..e792426491f1b 100644 --- a/pkgs/development/python-modules/mpris-server/default.nix +++ b/pkgs/development/python-modules/mpris-server/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "mpris-server"; - version = "0.4.2"; + version = "0.8.1"; pyproject = true; src = fetchPypi { pname = "mpris_server"; inherit version; - hash = "sha256-p3nM80fOMtRmeKvOXuX40Fu9xH8gPgYyneXbUS678fE="; + hash = "sha256-dfnFX+u7PhQb4ScHIkRHnGVpCABZhhlw/R+ks63zcec="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index ab54e9e5adea3..c489f5b75b2db 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.24.1"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qglyiEs8b97FPZoL0VwS5b17cawbZtdG9U0Shwnz+Pg="; + hash = "sha256-9EMp/bWfTwRMd5Fko0R0uKRK2eSUCvvEw6Oiu+kDJNk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index d44166b82f7de..7bcdb42095b33 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "msgpack"; - version = "1.0.5"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-wHVUQoTq3Fzdxw9HVzMdmdy8FrK71ISdFfiq5M820xw="; + hash = "sha256-Vy78k9t6TSfkBFAZdcptLZd1cFwtkiOQ2Hj892jZLIc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 236af1eb5d1ff..2ffaadaffeaac 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -3,6 +3,9 @@ , pythonOlder , fetchPypi +# build-system +, setuptools + # docs , python , sphinx @@ -31,6 +34,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools sphinx sphinx-rtd-theme ]; diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index f3c06701eb65c..d63e6f9791e5b 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.19.1"; + version = "7.21.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-Gz6OJ2ER60R14aTmhPfodX22FlbicUClBtlqNglTjC4="; + hash = "sha256-lj9Jkp1AGWIAdGzakpt0BMnmdwe1Uf04PI9sMfEBTbw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix index acefdcc14bca0..9072ada93f420 100644 --- a/pkgs/development/python-modules/napari-console/default.nix +++ b/pkgs/development/python-modules/napari-console/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-vHLCVMgrcs54pGb48wQpc0h7QBIfE6r7hCSoDNI3QvA="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/napari-npe2/default.nix b/pkgs/development/python-modules/napari-npe2/default.nix index 53fffeaadcbad..64659858258bf 100644 --- a/pkgs/development/python-modules/napari-npe2/default.nix +++ b/pkgs/development/python-modules/napari-npe2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "napari-npe2"; - version = "0.7.2"; + version = "0.7.2-unstable-2023-10-20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,11 +25,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "napari"; repo = "npe2"; - rev = "refs/tags/v${version}"; - hash = "sha256-PjoLocNTkcAnBNRbPi+MZqZtQ2bjWPIUVz0+k8nIn2A="; + rev = "9d29e4d6dbbec75c2d36273647efd9ddfb59ded0"; + hash = "sha256-JLu/5pXijPdpKY2z2rREtSKPiP33Yy4viegbxUiQg7Y="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + # fix this in the next release + env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.7.2"; nativeBuildInputs = [ hatchling diff --git a/pkgs/development/python-modules/napari-plugin-engine/default.nix b/pkgs/development/python-modules/napari-plugin-engine/default.nix index 8b9a015e00657..499f87ecf716f 100644 --- a/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/napari-svg/default.nix b/pkgs/development/python-modules/napari-svg/default.nix index b07ca1e2cf188..9150abfb252b0 100644 --- a/pkgs/development/python-modules/napari-svg/default.nix +++ b/pkgs/development/python-modules/napari-svg/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-lvI6RWT9oUE95vL6WO75CASc/Z+1G5UMm2p8vhqIjA0="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/napari/default.nix b/pkgs/development/python-modules/napari/default.nix index 9df87e357dd36..9997d58eb50be 100644 --- a/pkgs/development/python-modules/napari/default.nix +++ b/pkgs/development/python-modules/napari/default.nix @@ -50,8 +50,6 @@ mkDerivationWith buildPythonPackage rec { hash = "sha256-xF0DYK+226MZpB050IukNvTg2iHMQAIZW0serKRJd/0="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.cfg \ --replace "scikit-image>=0.19.1" "scikit-image" \ diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 745de65f4b2e4..e2d4fc2810c50 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -19,7 +19,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uBCYmrl/Zfw58hd12z20jLVwGSPv+M3fMo1mfV2GO/M="; + hash = "sha256-m0Tke/JlTeKE3PJZ1rBejra/HPEXCSS0ur/cPiSBJZw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index e1bb3e84079be..582d46b521089 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "nbdime"; - version = "3.2.1"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-MUCaMPhI/8azJUBpfoLVoKG4TcwycWynTni8xLRXxFM="; + hash = "sha256-8adgwLAMG6m0lFwWzpJXfzk/tR0YTzUbdoW6boUCCY4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index 4b656fd72fd04..c3040475cf2e3 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.13"; + version = "0.6.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NrilXB1NFcqNCGrwshhuLdhQoeHJ12PSp4MBScT9kYc="; + hash = "sha256-mdFoSTUS4QhY05rY0fqKTpRQTR9oLvOMTVr4kWJbiUQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nengo/default.nix b/pkgs/development/python-modules/nengo/default.nix index da5d79e31e655..86231c3f04017 100644 --- a/pkgs/development/python-modules/nengo/default.nix +++ b/pkgs/development/python-modules/nengo/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchFromGitHub, buildPythonPackage +{ lib +, fetchFromGitHub +, buildPythonPackage +, setuptools , numpy , scipySupport ? false, scipy , scikitSupport ? false, scikit-learn @@ -6,16 +9,20 @@ buildPythonPackage rec { pname = "nengo"; - version = "3.2.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "nengo"; repo = "nengo"; - rev = "v${version}"; - sha256 = "12lz8lzirxvwnpa74k9k48c64gs6gi092928rh97siya3i6gjs6i"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-b9mPjKdewIqIeRrddV1/M3bghSyox7Lz6VbfSLCHZjA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy ] ++ lib.optionals scipySupport [ scipy ] ++ lib.optionals scikitSupport [ scikit-learn ]; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 98c886d2825e3..65f4fcd61421b 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -2,32 +2,40 @@ , buildPythonPackage , fetchPypi , pythonOlder -, glibcLocales -, importlib-resources +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "netaddr"; - version = "0.8.0"; - format = "setuptools"; + version = "0.9.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0hx2npi0wnhwlcybilgwlddw6qffx1mb7a3sj4p9s7bvl33mgk6n"; + sha256 = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; }; - LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ + setuptools + ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ glibcLocales pytestCheckHook ]; + pythonImportsCheck = [ + "netaddr" + ]; meta = with lib; { - homepage = "https://netaddr.readthedocs.io/en/latest/"; - downloadPage = "https://github.com/netaddr/netaddr/releases"; - changelog = "https://netaddr.readthedocs.io/en/latest/changes.html"; description = "A network address manipulation library for Python"; + homepage = "https://netaddr.readthedocs.io/"; + downloadPage = "https://github.com/netaddr/netaddr/releases"; + changelog = "https://github.com/netaddr/netaddr/blob/${version}/CHANGELOG"; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix index 7c2fbda27ced6..f893ce204455b 100644 --- a/pkgs/development/python-modules/netmiko/default.nix +++ b/pkgs/development/python-modules/netmiko/default.nix @@ -1,18 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools, paramiko, scp, tenacity -, textfsm, ntc-templates, pyserial, pytestCheckHook, pyyaml }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, poetry-core + +# dependencies +, ntc-templates +, paramiko +, pyserial +, pyyaml +, scp +, textfsm +}: buildPythonPackage rec { pname = "netmiko"; - version = "4.2.0"; - format = "setuptools"; + version = "4.3.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-et3m/j6mMzYij0moY2UMLYP7DmgODw0Vi1sPsExBAOE="; + hash = "sha256-2pD2798ztBQOts1/InJ3PCzhRPp0rDTV7KwbTUYH8fs="; }; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ paramiko scp tenacity pyyaml textfsm ntc-templates pyserial ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "poetry==1.3.2" "poetry-core" \ + --replace "poetry.masonry.api" "poetry.core.masonry.api" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + ntc-templates + paramiko + pyserial + pyyaml + scp + textfsm + ]; # tests require closed-source pyats and genie packages doCheck = false; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index 20c73fb6adf86..51e580af4eb29 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -1,30 +1,67 @@ { lib , buildPythonPackage , fetchPypi -, nose -, pytestCheckHook -, decorator -, setuptools , pythonOlder + +# build-system +, setuptools + +# optional-dependencies +, lxml +, matplotlib +, numpy +, pandas +, pydot +, pygraphviz +, scipy +, sympy + +# tests +, pytest-xdist +, pytestCheckHook }: buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "3.1"; - format = "setuptools"; + version = "3.2.1"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3jRjNUCPhN4Orab/n6+v/5vNoR8KDfqpMRM967FGq2E="; + hash = "sha256-nxu1zzQJvzJOCnIsIL20wg7jm/HDDOiuSZyFArC14MY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + passthru.optional-dependencies = { + default = [ + numpy + scipy + matplotlib + pandas + ]; + extra = [ + lxml + pygraphviz + pydot + sympy + ]; }; - propagatedBuildInputs = [ decorator setuptools ]; - nativeCheckInputs = [ nose pytestCheckHook ]; + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; meta = { + changelog = "https://github.com/networkx/networkx/blob/networkx-${version}/doc/release/release_${version}.rst"; homepage = "https://networkx.github.io/"; + downloadPage = "https://github.com/networkx/networkx"; description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index 376e56041b614..dc9dc51da5b8e 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -4,8 +4,8 @@ , isPy3k , isPyPy , python + ,pythonAtLeast , coverage -, buildPackages }: buildPythonPackage rec { @@ -13,6 +13,9 @@ buildPythonPackage rec { format = "setuptools"; pname = "nose"; + # unmaintained, relies on the imp module + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b49900e1576f0..28dd8df3e263d 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -1,16 +1,22 @@ { lib , buildPythonPackage , fetchPypi -, python -, six , pythonOlder + +# build-system +, setuptools + +# optional-dependencies , coverage + +# tests +, unittestCheckHook }: buildPythonPackage rec { pname = "nose2"; version = "0.14.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,21 +25,32 @@ buildPythonPackage rec { hash = "sha256-XCjXcKC5pwKGK9bDdVuizS95lN1RjJguXOKY1/N0ZqQ="; }; - propagatedBuildInputs = [ - coverage - six + nativeBuildInputs = [ + setuptools ]; - __darwinAllowLocalNetworking = true; - - checkPhase = '' - ${python.interpreter} -m unittest - ''; + passthru.optional-dependencies = { + coverage = [ + coverage + ]; + }; pythonImportsCheck = [ "nose2" ]; + __darwinAllowLocalNetworking = true; + + nativeCheckInputs = [ + unittestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + preCheck = '' + # https://github.com/nose-devs/nose2/issues/588 + substituteInPlace nose2/tests/functional/test_junitxml_plugin.py \ + --replace "test_skip_reason_in_message" "dont_test_skip_reason_in_message" + ''; + meta = with lib; { description = "Test runner for Python"; homepage = "https://github.com/nose-devs/nose2"; diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 21d11f0d6d907..19d34904739ba 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , coverage , nose }: @@ -10,6 +11,9 @@ buildPythonPackage rec { version = "1.0.11"; format = "setuptools"; + # requires the imp module + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "298c3c655da587f6cab8a666e9f4b150320032431062dea91353988d45c8b883"; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 88f4c975a8588..e26ec900682a6 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.0.3"; + version = "7.0.6"; disabled = pythonOlder "3.8"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-B/PFBi/Q5uaYZEN6A0erxIXZkaroepLEfWWWmfVxtyk="; + hash = "sha256-7GETsGUpAZ9/KHgZrwbJeiuvepWsIaj24yGSiY6fmlg="; }; postPatch = '' diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix index 9848868f0062e..0e24bb60ad48d 100644 --- a/pkgs/development/python-modules/notion-client/default.nix +++ b/pkgs/development/python-modules/notion-client/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, setuptools , anyio , httpx , pytest-asyncio @@ -11,17 +12,22 @@ buildPythonPackage rec { pname = "notion-client"; - version = "2.0.0"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ramnes"; repo = "notion-sdk-py"; - rev = version; - hash = "sha256-zfG1OgH/2ytDUC+ogIY9/nP+xkgjiMt9+HVcWEMXoj8="; + rev = "refs/tags/${version}"; + hash = "sha256-u10iPSbFPv9RewEYru3V6MpwhhySzmnymmv4CsefGC8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ httpx ]; diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index e8c1be951a4f6..66277133d432b 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "3.5.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FhKMDSAW+MifAy2EnHePbSfY56rdK1SfOe85bFte6ps="; + hash = "sha256-tenztWqSjVVDJygBvJpdLFbKmz+TPKYu0UhscqJBhLc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index d5722053c6e1a..a0a452a0ecc22 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -1,30 +1,40 @@ { lib , stdenv , buildPythonPackage +, fetchpatch , fetchPypi -, isPy27 , setuptools , setuptools-scm , cython -, entrypoints , numpy , msgpack , py-cpuinfo , pytestCheckHook , python +, pythonOlder }: buildPythonPackage rec { pname = "numcodecs"; - version = "0.11.0"; - format ="pyproject"; - disabled = isPy27; + version = "0.12.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bAWLMh3oShcpKZsOrk1lKy5I6hyn+d8NplyxNHDmNes="; + hash = "sha256-BdkaQzcz5+7yaNfoDsImoCMtokQolhSo84JpAa7BCY4="; }; + patches = [ + # https://github.com/zarr-developers/numcodecs/pull/487 + (fetchpatch { + name = "fix-tests.patch"; + url = "https://github.com/zarr-developers/numcodecs/commit/4896680087d3ff1f959401c51cf5aea0fd56554e.patch"; + hash = "sha256-+lMWK5IsNzJ7H2SmLckgxbSSRIIcC7FtGYSBKQtuo+Y="; + }) + ]; + nativeBuildInputs = [ setuptools setuptools-scm @@ -33,17 +43,21 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - entrypoints numpy - msgpack ]; + passthru.optional-dependencies = { + msgpack = [ msgpack ]; + # zfpy = [ zfpy ]; + }; + preBuild = if (stdenv.hostPlatform.isx86 && !stdenv.hostPlatform.avx2Support) then '' export DISABLE_NUMCODECS_AVX2= '' else null; nativeCheckInputs = [ pytestCheckHook + msgpack ]; pytestFlagsArray = [ diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 6acc3e53f4e4a..6316ba29356c9 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.8.6"; + version = "2.8.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Yzb426P0VuQaT/w8l+tj2JxzWJ/24XBxQSJLkwJjJg0="; + hash = "sha256-WW7rO7/ryRL0tuqvhCthunIs69uLxC3++mV9OnSVOEk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch b/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch new file mode 100644 index 0000000000000..b9bc53e0b84df --- /dev/null +++ b/pkgs/development/python-modules/numpy/0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch @@ -0,0 +1,71 @@ +From 0d0476328a1a2e3dd3e96340bd4ddd04d98c067b Mon Sep 17 00:00:00 2001 +From: Ralf Gommers +Date: Thu, 26 Oct 2023 16:57:03 +0200 +Subject: [PATCH] BLD: remove last usage of `distutils` in + `_core/code_generators/` + +--- + numpy/core/code_generators/genapi.py | 9 --------- + numpy/core/code_generators/generate_numpy_api.py | 7 +------ + numpy/core/code_generators/generate_ufunc_api.py | 7 +------ + 3 files changed, 2 insertions(+), 21 deletions(-) + +diff --git a/numpy/core/code_generators/genapi.py b/numpy/core/code_generators/genapi.py +index 2cdaba52d..d9d7862b2 100644 +--- a/numpy/core/code_generators/genapi.py ++++ b/numpy/core/code_generators/genapi.py +@@ -304,15 +304,6 @@ def find_functions(filename, tag='API'): + fo.close() + return functions + +-def should_rebuild(targets, source_files): +- from distutils.dep_util import newer_group +- for t in targets: +- if not os.path.exists(t): +- return True +- sources = API_FILES + list(source_files) + [__file__] +- if newer_group(sources, targets[0], missing='newer'): +- return True +- return False + + def write_file(filename, data): + """ +diff --git a/numpy/core/code_generators/generate_numpy_api.py b/numpy/core/code_generators/generate_numpy_api.py +index ae38c4efc..640bae9e5 100644 +--- a/numpy/core/code_generators/generate_numpy_api.py ++++ b/numpy/core/code_generators/generate_numpy_api.py +@@ -148,12 +148,7 @@ def generate_api(output_dir, force=False): + targets = (h_file, c_file) + + sources = numpy_api.multiarray_api +- +- if (not force and not genapi.should_rebuild(targets, [numpy_api.__file__, __file__])): +- return targets +- else: +- do_generate_api(targets, sources) +- ++ do_generate_api(targets, sources) + return targets + + def do_generate_api(targets, sources): +diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py +index e03299a52..3734cbd6a 100644 +--- a/numpy/core/code_generators/generate_ufunc_api.py ++++ b/numpy/core/code_generators/generate_ufunc_api.py +@@ -125,12 +125,7 @@ def generate_api(output_dir, force=False): + targets = (h_file, c_file) + + sources = ['ufunc_api_order.txt'] +- +- if (not force and not genapi.should_rebuild(targets, sources + [__file__])): +- return targets +- else: +- do_generate_api(targets, sources) +- ++ do_generate_api(targets, sources) + return targets + + def do_generate_api(targets, sources): +-- +2.42.0 + diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 62ffc91e87677..ff50cf872f9cb 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -53,17 +53,20 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.26.1"; + version = "1.26.2"; pyproject = true; disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-yMbHLUqfgx8yjvsTEmQqHK+vqoiYHZq3Y2jVDQfZPL4="; + hash = "sha256-9lc4RHZ2q1d38R5ru9uM4Rt4XhBfaQvEWWZXSBa20+o="; }; patches = [ + # Remove last usage of distutils to enable numpy on Python 3.12 + ./0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch + # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index f189c16eafb20..428ea03ed2870 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -2,36 +2,41 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , jinja2 , sphinx +, tabulate , pytestCheckHook , matplotlib }: buildPythonPackage rec { pname = "numpydoc"; - version = "1.5.0"; - format = "setuptools"; + version = "1.6.0"; + pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - hash = "sha256-sNt7daMjZ6DiXCOzl4QsZeNEoSBlJNFsgGnwockbX0w="; + hash = "sha256-rnpTgPCgY3PDr+FszRW9ebxrB/JwTLxvHn7MlLT1/A0="; }; postPatch = '' - substituteInPlace setup.py \ - --replace "Jinja2>=2.10,<3.1" "Jinja2>=2.10,<3.2" - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "--cov-report=" "" \ --replace "--cov=numpydoc" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jinja2 sphinx + tabulate ]; nativeCheckInputs = [ @@ -51,6 +56,7 @@ buildPythonPackage rec { ]; meta = { + changelog = "https://github.com/numpy/numpydoc/releases/tag/v${version}"; description = "Sphinx extension to support docstrings in Numpy format"; homepage = "https://github.com/numpy/numpydoc"; license = lib.licenses.free; diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 421131e7f8e23..803a4f1c04fd1 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nutils"; - version = "8.3"; + version = "8.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "evalf"; repo = "nutils"; rev = "refs/tags/v${version}"; - hash = "sha256-6VvzUKKUB5SkmvC7PFPqGayc51t3PTMPwrxgZI5+jHA="; + hash = "sha256-cwMo3ixTK7UO9sxhcQBN4/gNZNAoBH/xL2tZ1Orh8LE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index 7b948c4ffdf3d..13a146b1dce67 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { requests ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - passthru.updateScript = nix-update-script { }; pythonImportsCheck = [ "oca_port" ]; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 3f3f0fd186eff..ac4de4f611199 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -9,6 +9,7 @@ , pythonOlder , pythonRelaxDepsHook , pytz +, setuptools }: buildPythonPackage rec { @@ -32,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index c6e16c25d52c2..32b9ae799ffb8 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "15.4.0"; + version = "15.4.4"; disabled = pythonOlder "3.9"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -47,11 +47,9 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-cbKqisaRAeT8ljANbYiUDrptAoQmmIkMu1ya8O6nXvQ="; + hash = "sha256-Ff0OrSJFglVPpSNB0KvDMnatj+P57zWdcVAFaM+Sg0s="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - patches = [ (substituteAll { src = ./paths.patch; diff --git a/pkgs/development/python-modules/ocrmypdf/paths.patch b/pkgs/development/python-modules/ocrmypdf/paths.patch index a1db7c690bcfa..1701a73215d0e 100644 --- a/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,16 +1,16 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index 92b73a0a..9f04555c 100644 +index 94eec244..4bb15db9 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -58,7 +58,7 @@ log.addFilter(DuplicateFilter(log)) - - +@@ -31,7 +31,7 @@ COLOR_CONVERSION_STRATEGIES = frozenset( + ] + ) # Ghostscript executable - gswin32c is not supported -GS = 'gswin64c' if os.name == 'nt' else 'gs' +GS = '@gs@' - def version() -> Version: + log = logging.getLogger(__name__) diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py index 5a34a95a..5ee1b333 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py diff --git a/pkgs/development/python-modules/oemthermostat/default.nix b/pkgs/development/python-modules/oemthermostat/default.nix index b97ddf64eb5bc..f40e39f10bf63 100644 --- a/pkgs/development/python-modules/oemthermostat/default.nix +++ b/pkgs/development/python-modules/oemthermostat/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { sha256 = "vrMw3/X8MtejO1WyUA1DOlfVCPTCPgcK5p3+OlTWcM4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/oldest-supported-numpy/default.nix b/pkgs/development/python-modules/oldest-supported-numpy/default.nix index 5d6e11c34daf8..7349a63a2c2a0 100644 --- a/pkgs/development/python-modules/oldest-supported-numpy/default.nix +++ b/pkgs/development/python-modules/oldest-supported-numpy/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "oldest-supported-numpy"; - version = "2023.8.3"; + version = "2023.10.25"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-yJp+wzsihagnI3crGPDBo+CqbVO4Xhxulj/o/NitxU0="; + hash = "sha256-dBqJrxLoyCMl9zEmtTORXc4QYNoPnk7GQtpGZoBoYpY="; }; # The purpose of oldest-supported-numpy is to build a project against the diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index c6dfada82bd28..8ee54d3c6925e 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -1,6 +1,7 @@ { lib , antlr4 , antlr4-python3-runtime +, attrs , buildPythonPackage , fetchFromGitHub , setuptools @@ -55,6 +56,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + attrs pydevd pytest-mock pytestCheckHook diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index d0866f6c0a83d..810ddbf62cf27 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -20,7 +20,7 @@ let gtestStatic = gtest.override { static = true; }; in buildPythonPackage rec { pname = "onnx"; - version = "1.14.1"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ in buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZVSdk6LeAiZpQrrzLxphMbc1b3rNUMpcxcXPP8s/5tE="; + hash = "sha256-Jzga1IiUO5LN5imSUmnbsjYtapRatTihx38EOUjm9Os="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3c13e035bf025..c0ebdd86aac1a 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, pythonRelaxDepsHook , hatchling # propagated , httpx @@ -28,6 +29,7 @@ buildPythonPackage rec { version = "1.3.7"; pyproject = true; + disabled = pythonOlder "3.7.1"; src = fetchFromGitHub { @@ -39,6 +41,12 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + # https://github.com/openai/openai-python/issues/921 + "anyio" ]; propagatedBuildInputs = [ @@ -72,6 +80,10 @@ buildPythonPackage rec { dirty-equals ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + OPENAI_API_KEY = "sk-foo"; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 282c659291a4e..a6ddc2f5a61c6 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -28,8 +28,8 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.18.1"; - format = "pyproject"; + version = "0.18.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-8zD4SDGH7Pcu54CcBTJ9Q2sbYfWP4OyNh5STatZ7pAk="; + hash = "sha256-5sNI6ujqDQ5L4afVHYZkm2pKa8yATtHFo7MF3eFF8Ig="; }; postPatch = '' @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client-side and server-side support for the OpenAPI Specification v3"; - homepage = "https://github.com/p1c2u/openapi-core"; + homepage = "https://github.com/python-openapi/openapi-core"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index 39074543b42f6..4b0608c7572e4 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-859v6KqIRfUq4d/KbkvGnGqlxz6BXTl+tKQHPhtkTH0="; + hash = "sha256-CfSlF6DWkYxxVNTNBkr0+KVeKpqxEEqkz4VBenqo+l0="; }; postPatch = '' @@ -47,12 +47,19 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/python-openapi/openapi-schema-validator/issues/153 + "test_array_prefixitems_invalid" + ]; + + pytestFlagsArray = [ "-vvv" ]; + pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { changelog = "https://github.com/python-openapi/openapi-schema-validator/releases/tag/${version}"; description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0"; - homepage = "https://github.com/p1c2u/openapi-schema-validator"; + homepage = "https://github.com/python-openapi/openapi-schema-validator"; license = licenses.bsd3; maintainers = with maintainers; [ AluisioASG ]; }; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 9312f4b1b2b94..4c89b69999075 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -9,7 +9,7 @@ # propagates , importlib-resources , jsonschema -, jsonschema-spec +, jsonschema-path , lazy-object-proxy , openapi-schema-validator @@ -19,17 +19,17 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.6.0"; - format = "pyproject"; + version = "0.7.1"; + pyproject = true; disabled = pythonOlder "3.8"; # no tests via pypi sdist src = fetchFromGitHub { - owner = "p1c2u"; + owner = "python-openapi"; repo = "openapi-spec-validator"; rev = "refs/tags/${version}"; - hash = "sha256-sGr4dH6Twyi4OeCAXZiboN75dYZ6wJ0pWMzV9zOfee0="; + hash = "sha256-X0ePdHQeBSWjsCFQgCoNloQZRhKbvPBE43aavBppvmg="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema - jsonschema-spec + jsonschema-path lazy-object-proxy openapi-schema-validator ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index ab39bf6c11b91..c091ad4511882 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.4.22"; + version = "0.4.34"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-Hgwc4rneY0d7KZHuBIWRpndLksts5DTvaYuwZOO4sdI="; + hash = "sha256-hRY+M9M1AcwlAnNWvaqxfrt4UWiUfvwmY51eE1kJY8Q="; }; sourceRoot = "source/openllm-core"; diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 748149ae1f44e..08abdc61d204d 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.5.0"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-FBtR+ijGsc3rmOvcOMHO5qTnVL1ryEq3qqDQwrzlRD4="; + hash = "sha256-aXy2JRXFSNO3/Fyz+GXiebkw05433OsR2HH4H5+lkeg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 289784d4ac414..72957901af41d 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -14,7 +14,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.20.0"; + version = "1.21.0"; disabled = pythonOlder "3.7"; # to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta @@ -22,7 +22,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tOg3G6BjHInY5TFYyS7/JA4mQajeP0b1QjrZBGqiqnM="; + hash = "sha256-igG0oHRa6M4d7pMp7fgBo13x5XADZeYgFAL8WzDXsyw="; }; sourceRoot = "${src.name}/opentelemetry-api"; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 4661bb4dcf4cf..b66b62fa3bb4e 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -1,30 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, requests, zeroconf, wakeonlan -, python }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build-system +, setuptools + +# dependencies +, aiohttp + +# tests +, pytestCheckHook +}: buildPythonPackage rec { pname = "openwebifpy"; - version = "3.2.7"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0n9vi6b0y8b41fd7m9p361y3qb5m3b9p9d8g4fasqi7yy4mw2hns"; + hash = "sha256-4KYLjRD2n98t/MVan4ox19Yhz0xkSEMUKYdWqcwmBs4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - requests - zeroconf - wakeonlan + aiohttp ]; - checkPhase = '' - ${python.interpreter} setup.py test - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Provides a python interface to interact with a device running OpenWebIf"; + downloadPage = "https://github.com/autinerd/openwebifpy"; homepage = "https://openwebifpy.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index fd51ead5a0e3b..e943d67c7baa2 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi +, setuptools , numpy , pytestCheckHook , pythonOlder @@ -9,7 +11,7 @@ buildPythonPackage rec { version = "3.3.0"; pname = "opt-einsum"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -19,6 +21,19 @@ buildPythonPackage rec { hash = "sha256-WfZHX3e7w33PfNdIUZwOxgci6R5jyhFOaIIcDFSkZUk="; }; + patches = [ + # https://github.com/dgasmith/opt_einsum/pull/208 + (fetchpatch { + name = "python312-compatibility.patch"; + url = "https://github.com/dgasmith/opt_einsum/commit/0beacf96923bbb2dd1939a9c59398a38ce7a11b1.patch"; + hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index 92edbdf84eb9e..c3cea1d5bcde5 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -3,6 +3,7 @@ , asn1crypto , buildPythonPackage , fetchFromGitHub +, fetchpatch , openssl , pytestCheckHook , pythonOlder @@ -24,6 +25,12 @@ buildPythonPackage rec { patches = [ ./support-openssl-3.0.10.patch + + (fetchpatch { + # backport removal of imp module usage + url = "https://github.com/wbond/oscrypto/commit/3865f5d528740aa1205d16ddbee84c5b48aeb078.patch"; + hash = "sha256-lQGoPM7EicwCPWapEDkqWEqMqXk4tijiImxndcDFqY4="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 351c213faffd8..708bbd62c36fa 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -7,6 +7,7 @@ , oslo-utils , oslotest , pbr +, setuptools , sqlalchemy , sqlalchemy-migrate , stestr @@ -16,16 +17,19 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "14.0.0"; - format = "setuptools"; + version = "14.1.0"; + pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-nAipzYOOv/rSHrMBL64AKg93v5Vpb6RNBbG2OiJ+n8E="; + hash = "sha256-UFilywqwhXaGnle8K5VNdZqMvhklkTMdHPMDMvz62h8="; }; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + pbr + setuptools + ]; propagatedBuildInputs = [ alembic diff --git a/pkgs/development/python-modules/oslo-i18n/default.nix b/pkgs/development/python-modules/oslo-i18n/default.nix index 6c7f2065a8368..99e22ea549938 100644 --- a/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/pkgs/development/python-modules/oslo-i18n/default.nix @@ -3,19 +3,20 @@ , fetchPypi , oslotest , pbr +, setuptools , testscenarios , stestr }: buildPythonPackage rec { pname = "oslo-i18n"; - version = "6.1.0"; - format = "setuptools"; + version = "6.2.0"; + pyproject = true; src = fetchPypi { pname = "oslo.i18n"; inherit version; - hash = "sha256-4rgp8gW/HrYgR1bMNAJ9EZSUti0nH+7oYL+BbKegfq0="; + hash = "sha256-cPikzphxKRvGCdB+MeblAyZmVWmS/xrlPnjy7SpavoI="; }; postPatch = '' @@ -24,7 +25,10 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + pbr + setuptools + ]; nativeCheckInputs = [ oslotest diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index 688402199bfc9..196228ce37cef 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -14,8 +14,10 @@ , pbr , pyparsing , pytz +, setuptools , stestr , testscenarios +, tzdata , pyyaml , iana-etc , libredirect @@ -23,13 +25,13 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "6.2.1"; - format = "setuptools"; + version = "6.3.0"; + pyproject = true; src = fetchPypi { pname = "oslo.utils"; inherit version; - hash = "sha256-EyK6BfoP88Gor8cn/PlF31qoLWWEcn0uBK8Di1roQkQ="; + hash = "sha256-dY2UWyutW+qBq+2ArTP/6h0deTNIrF61s4Zrp0WxHVU="; }; postPatch = '' @@ -38,7 +40,10 @@ buildPythonPackage rec { rm test-requirements.txt ''; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + pbr + setuptools + ]; propagatedBuildInputs = [ debtcollector @@ -49,6 +54,7 @@ buildPythonPackage rec { packaging pyparsing pytz + tzdata ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index ac933f65e1c22..13797c4d17f83 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-A+Rg5oPsLOD4OTU936PEyP+lCauM9qKyr7tYb6RT4YA="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - dontUseCmakeConfigure = true; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index 9b30afeb49277..baa808a7062c5 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-v6QZgv1QwBrQpCwP/1z6704UNvQyoCrpQGkhTmncbjQ="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonRelaxDeps = [ "aiooss2" "fsspec" diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index f081bbed2bcb6..0fa4ba74deabc 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -1,19 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools , attrs , pytest }: buildPythonPackage rec { pname = "outcome"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.0.post0"; + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - hash = "sha256-b4K9PeRdowPPH3ceyvoWM3UKNYQ2qLtg4Goc63RdJnI="; + hash = "sha256-nc8C5l8pcbgAR7N3Ro5yomjhXArzzxI45v8U9/kRQ7g="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ attrs ]; # Has a test dependency on trio, which depends on outcome. diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix index 7fc464143081b..8109a428140d9 100644 --- a/pkgs/development/python-modules/overrides/default.nix +++ b/pkgs/development/python-modules/overrides/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , pytestCheckHook }: @@ -23,6 +24,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # KeyError: 'assertRaises' + "test_enforcing_when_incompatible" + ]; + pythonImportsCheck = [ "overrides" ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 0c4678a460acf..123c1230fc87a 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -1,23 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder + +# build-system , flit-core + +# tests , pretend , pytestCheckHook -, pythonOlder }: let packaging = buildPythonPackage rec { pname = "packaging"; - version = "23.1"; - format = "pyproject"; + version = "23.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o5KYDSts/6ZEQxiYvlSwBFFRMZ0efsNPDP7Uh2fdM08="; + hash = "sha256-BI+w6UBQNlGOqvSKVZU8dQwR4aG2jg3RqdYu0MCSz8U="; }; nativeBuildInputs = [ @@ -29,18 +33,27 @@ let pretend ]; + pythonImportsCheck = [ + "packaging" + "packaging.metadata" + "packaging.requirements" + "packaging.specifiers" + "packaging.tags" + "packaging.version" + ]; + # Prevent circular dependency with pytest doCheck = false; - pythonImportsCheck = [ "packaging" ]; - passthru.tests = packaging.overridePythonAttrs (_: { doCheck = true; }); meta = with lib; { + changelog = "https://github.com/pypa/packaging/blob/${version}/CHANGELOG.rst"; description = "Core utilities for Python packages"; - homepage = "https://github.com/pypa/packaging"; + downloadPage = "https://github.com/pypa/packaging"; + homepage = "https://packaging.pypa.io/"; license = with licenses; [ bsd2 asl20 ]; - maintainers = with maintainers; [ bennofs ]; + maintainers = teams.python.members ++ (with maintainers; [ bennofs ]); }; }; in diff --git a/pkgs/development/python-modules/paginate/default.nix b/pkgs/development/python-modules/paginate/default.nix new file mode 100644 index 0000000000000..ad22a818aee32 --- /dev/null +++ b/pkgs/development/python-modules/paginate/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast + +# build-system +, setuptools + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "paginate"; + version = "0.5.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Pylons"; + repo = "paginate"; + rev = version; + hash = "sha256-HZWwOYOCk4mAmz8OnM9hhlf8HA+jC75dYVeo0l4a09o="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "paginate" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/Pylons/paginate/issues/19 + "test_wrong_collection" + "test_unsliceable_sequence3" + ]; + + meta = with lib; { + description = "Python pagination module"; + homepage = "https://github.com/Pylons/paginate"; + changelog = "https://github.com/Pylons/paginate/blob/${src.rev}/CHANGELOG.txt"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 588dae7b7840d..7351e6536416a 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -2,10 +2,12 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder # build-system , cython +, cython_3 , meson-python , meson , oldest-supported-numpy @@ -23,7 +25,6 @@ , beautifulsoup4 , bottleneck , blosc2 -, brotlipy , fsspec , gcsfs , html5lib @@ -39,7 +40,6 @@ , pymysql , pyqt5 , pyreadstat -, python-snappy , qtpy , s3fs , scipy @@ -63,9 +63,9 @@ , runtimeShell }: -buildPythonPackage rec { +let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.1.1"; + version = "2.1.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -74,17 +74,19 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-6SgW4BtO7EFnS8P8LL4AGk5EdPwOQ0+is0wXgqsm9w0="; + hash = "sha256-okGYzPJC3mpG+Sq4atjWwLlocUDnpjgGRPmQ+4ehQX0="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace "Cython>=0.29.33,<3" "Cython" \ --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ --replace "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ - cython + # TODO: hack to support pandas on python3.12, remove with pandas 2.2.0 + (if pythonAtLeast "3.12" then cython_3 else cython) meson-python meson numpy @@ -116,8 +118,6 @@ buildPythonPackage rec { qtpy ]; compression = [ - brotlipy - python-snappy zstandard ]; computation = [ @@ -187,16 +187,23 @@ buildPythonPackage rec { all = lib.concatLists (lib.attrValues extras); }; + doCheck = false; # various infinite recursions + + passthru.tests.pytest = pandas.overridePythonAttrs (_: { doCheck = true; }); + nativeCheckInputs = [ glibcLocales hypothesis pytest-asyncio pytest-xdist pytestCheckHook - ] ++ lib.optionals (stdenv.isLinux) [ + ] + ++ lib.flatten (lib.attrValues passthru.optional-dependencies) + ++ lib.optionals (stdenv.isLinux) [ # for locale executable glibc - ] ++ lib.optionals (stdenv.isDarwin) [ + ] + ++ lib.optionals (stdenv.isDarwin) [ # for locale executable adv_cmds ]; @@ -263,4 +270,5 @@ buildPythonPackage rec { ''; maintainers = with maintainers; [ raskin fridh knedlsepp ]; }; -} +}; +in pandas diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 7fe1be6f7458d..c47cea4567a83 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "panel"; - version = "1.2.3"; + version = "1.3.4"; format = "wheel"; @@ -25,7 +25,7 @@ buildPythonPackage rec { # tries to fetch even more artifacts src = fetchPypi { inherit pname version format; - hash = "sha256-CAW6z0phPohpFjv4D1DlmomDiv52vb5qBatWN/Mmg/c="; + hash = "sha256-FK/ekqXCtTHyzLeFs0tHEeH0VXk0yFcns1lOLa5z0KU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index d5c2f3018d302..65b5f7c0035d8 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic="; + hash = "sha256-6ntwwFU/Vv6RsPqcxeFwEs1pkyCosBU3PnhwxeYIbHI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index a37cf7c7f03dc..c05f906d5b106 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -1,14 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook , pythonOlder + +# build-system +, hatchling +, hatch-vcs + +# tests +, numpy +, pandas +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "param"; - version = "1.13.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,19 +25,21 @@ buildPythonPackage rec { owner = "holoviz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5b3UTzb7OXBwcyYyDVCGLUpWxNOYZ3cv8Gfw+x7jsBI="; + hash = "sha256-8R1+utY3e3py4iJTgOVfzt5Y7bp2Rn6OfoITGuOsb5c="; }; + nativeBuildInputs = [ + hatchling + hatch-vcs + ]; + nativeCheckInputs = [ + numpy + pandas + pytest-asyncio pytestCheckHook ]; - postPatch = '' - # Version is not set properly - substituteInPlace setup.py \ - --replace 'version=get_setup_version("param"),' 'version="${version}",' - ''; - pythonImportsCheck = [ "param" ]; diff --git a/pkgs/development/python-modules/parameter-expansion-patched/default.nix b/pkgs/development/python-modules/parameter-expansion-patched/default.nix index 19149d8db2411..8e73457557f7e 100644 --- a/pkgs/development/python-modules/parameter-expansion-patched/default.nix +++ b/pkgs/development/python-modules/parameter-expansion-patched/default.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-/128ifveWC8zNlYtGWtxB3HpK6p7bVk1ahSwhaC2dAs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index fb08e07ec04b2..9f8fa4ad1e9fb 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -20,10 +20,12 @@ buildPythonPackage rec { }; postPatch = '' - # broken with pytest 7 + # broken with pytest 7 and python 3.12 # https://github.com/wolever/parameterized/issues/167 + # https://github.com/wolever/parameterized/pull/162 substituteInPlace parameterized/test.py \ - --replace 'assert_equal(missing, [])' "" + --replace 'assert_equal(missing, [])' "" \ + --replace "assertRaisesRegexp" "assertRaisesRegex" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 7956a2971b514..9c6272e94a5cd 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -5,16 +5,20 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.19.1"; + version = "1.20.0"; format = "pyproject"; src = fetchFromGitHub { owner = "r1chardj0n3s"; repo = "parse"; rev = "refs/tags/${version}"; - hash = "sha256-f08SlkGnwhSh0ajTKFqBAGGFvLj8nWBZVb6uClbRaP4="; + hash = "sha256-InYOgqTvMvQ/HWIa0WrJ4M2LL4LL87KwBst8yYnt3dk="; }; + postPatch = '' + rm .pytest.ini + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index db823218a61b8..728ed09b735c0 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , pytest , locket , numpy @@ -12,15 +13,20 @@ buildPythonPackage rec { pname = "partd"; - version = "1.4.0"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; + disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-qg/zXbvMgHrjdNtWMy9MGzm0b2e/KXX1FR4LQYau0NU="; + hash = "sha256-VsJd1J5v6lcn5zEgPEZsbgkvMI2PACThmdAvaqIWf2c="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; diff --git a/pkgs/development/python-modules/pathvalidate/default.nix b/pkgs/development/python-modules/pathvalidate/default.nix index 31ec1f003144d..c3098c24b56d1 100644 --- a/pkgs/development/python-modules/pathvalidate/default.nix +++ b/pkgs/development/python-modules/pathvalidate/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pathvalidate"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QmlwIm4kGZ/ZDZOZXSI8Hii9qWfN9DcHVaFM33KiqO4="; + hash = "sha256-XoN4z2cSv/Z/vnqDB9mfqMGgyyiqR3BW+Pw3Tw3/JK0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index a1ed788dda12d..ae4022f860020 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -1,6 +1,7 @@ { lib , fetchPypi , buildPythonPackage +, setuptools , six , numpy , scipy # optional, allows spline-related features (see patsy's docs) @@ -9,14 +10,18 @@ buildPythonPackage rec { pname = "patsy"; - version = "0.5.3"; - format = "setuptools"; + version = "0.5.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-vcGAAYdeMZvJHIEsHrahC+S7E8uB63Y/RmF53KO2cnc="; + hash = "sha256-favFJ1lzCN4OjxiPqiCvfgaom9qjBnVt/HeDaT6havQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six numpy diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index bda6c9080f0c5..dbf6afe6f3302 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -7,16 +7,17 @@ buildPythonPackage rec { pname = "pbr"; - version = "5.11.1"; - format = "setuptools"; + version = "6.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rvxRZ1sLUz1Wu1/RyMbAUi/jGJZnmILhxMY9XkoPzLM="; + hash = "sha256-0TdxIqWgDi+UDuSCmZUY7+FtdF1COmcMJ3c9+8PJp9k="; }; - # importlib-metadata could be added here if it wouldn't cause an infinite recursion - propagatedBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + ]; # check in passthru.tests.pytest to escape infinite recursion with fixtures doCheck = false; diff --git a/pkgs/development/python-modules/pdm-backend/default.nix b/pkgs/development/python-modules/pdm-backend/default.nix index 0572a1e633b83..3d32a02768b41 100644 --- a/pkgs/development/python-modules/pdm-backend/default.nix +++ b/pkgs/development/python-modules/pdm-backend/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pdm-backend"; - version = "2.1.6"; + version = "2.1.7"; format = "pyproject"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm-backend"; rev = "refs/tags/${version}"; - hash = "sha256-ZEci8VeKYuORs9iAzaEqrtVBh9fMWHlLsFH1e5PRLwA="; + hash = "sha256-1YM/vba+8+2wKcWzPKzkpaWVmHqbFsYdhQSY/VBBAfo="; }; env.PDM_BUILD_SCM_VERSION = version; diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix index 2a7a3062741fb..9ac25c2880b61 100644 --- a/pkgs/development/python-modules/pegen/default.nix +++ b/pkgs/development/python-modules/pegen/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index a2aac534366e8..71682cd62c41b 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,42 +1,51 @@ { lib -, beautifulsoup4 -, blinker , buildPythonPackage -, docutils -, feedgenerator , fetchFromGitHub -, git +, pythonOlder +, pythonRelaxDepsHook + +# build-system +, pdm-backend + +# native dependencies , glibcLocales +, git +, pandoc +, typogrify + +# dependencies +, backports-zoneinfo +, blinker +, docutils +, feedgenerator , jinja2 -, lxml , markdown -, markupsafe -, mock -, pytestCheckHook -, pandoc -, pillow +, ordered-set , pygments , python-dateutil -, pythonOlder -, pytz , rich -, pytest-xdist -, six -, typogrify +, tzdata , unidecode +, watchfiles + +# tests +, mock +, pytestCheckHook +, pytest-xdist }: buildPythonPackage rec { pname = "pelican"; - version = "4.8.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "4.9.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "getpelican"; - repo = pname; + repo = "pelican"; rev = "refs/tags/${version}"; - hash = "sha256-T+XBRBfroG1gh9ZHU7V5wsgnI1xuNTXYAe6g5Xk8Qyg="; + hash = "sha256-nz2OnxJ4mGgnafz4Xp8K/BTyVgXNpNYqteNL1owP8Hk="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -44,43 +53,51 @@ buildPythonPackage rec { ''; }; + postPatch = '' + substituteInPlace pelican/tests/test_pelican.py \ + --replace "'git'" "'${git}/bin/git'" + ''; + + nativeBuildInputs = [ + pdm-backend + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "unidecode" + ]; + buildInputs = [ glibcLocales pandoc git - mock markdown typogrify ]; propagatedBuildInputs = [ - beautifulsoup4 blinker docutils feedgenerator jinja2 - lxml - markupsafe - pillow + ordered-set pygments python-dateutil - pytz rich - six + tzdata unidecode + watchfiles + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo ]; nativeCheckInputs = [ + mock pytest-xdist pytestCheckHook pandoc ]; - postPatch = '' - substituteInPlace pelican/tests/test_pelican.py \ - --replace "'git'" "'${git}/bin/git'" - ''; - pytestFlagsArray = [ # DeprecationWarning: 'jinja2.Markup' is deprecated and... "-W ignore::DeprecationWarning" @@ -93,7 +110,7 @@ buildPythonPackage rec { "test_custom_locale_generation_works" ]; - LC_ALL = "en_US.UTF-8"; + env.LC_ALL = "en_US.UTF-8"; # We only want to patch shebangs in /bin, and not those # of the project scripts that are created by Pelican. diff --git a/pkgs/development/python-modules/pem/default.nix b/pkgs/development/python-modules/pem/default.nix index f4608995dd73c..84500acaccb0f 100644 --- a/pkgs/development/python-modules/pem/default.nix +++ b/pkgs/development/python-modules/pem/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-rVYlnvISGugh9qvf3mdrIyELmeOUU4g6291HeoMkoQc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-fancy-pypi-readme diff --git a/pkgs/development/python-modules/pendulum/3.nix b/pkgs/development/python-modules/pendulum/3.nix new file mode 100644 index 0000000000000..1f59b1a106396 --- /dev/null +++ b/pkgs/development/python-modules/pendulum/3.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, isPyPy + +# build-system +, poetry-core +, rustPlatform + +# dependencies +, backports-zoneinfo +, importlib-resources +, python-dateutil +, time-machine +, tzdata + +# tests +, pytestCheckHook +, pytz +}: + +buildPythonPackage rec { + pname = "pendulum"; + version = "3.0.0b1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sdispater"; + repo = "pendulum"; + rev = "refs/tags/${version}"; + hash = "sha256-11W22RpoYUcL9Nya32HRX4Jdo4L9XP2Zftevc+7eFzw="; + }; + + cargoRoot = "rust"; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "source/rust"; + name = "${pname}-${version}"; + hash = "sha256-qyyPR4a+IHrRSZzOZaW+DXGpOTyFcEVu/+Mt5QlQFqw="; + }; + + nativeBuildInputs = [ + poetry-core + rustPlatform.maturinBuildHook + rustPlatform.cargoSetupHook + ]; + + propagatedBuildInputs = [ + python-dateutil + tzdata + ] ++ lib.optional (!isPyPy) [ + time-machine + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + importlib-resources + ]; + + pythonImportsCheck = [ + "pendulum" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytz + ]; + + disabledTestPaths = [ + "tests/benchmarks" + ]; + + meta = with lib; { + description = "Python datetimes made easy"; + homepage = "https://github.com/sdispater/pendulum"; + changelog = "https://github.com/sdispater/pendulum/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index ebe63b4a4170b..e8c5efc3cba3f 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -1,19 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , ptyprocess }: buildPythonPackage (rec { pname = "pexpect"; - version = "4.8.0"; - format = "setuptools"; + version = "4.9.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"; + hash = "sha256-7n1BEj88mREFDqLC2sEHVo3EOy07DHVXozISw5jq0w8="; }; + nativeBuildInputs = [ + setuptools + ]; + # Wants to run pythonin a subprocess doCheck = false; @@ -22,6 +27,7 @@ buildPythonPackage (rec { meta = with lib; { homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc"; + downloadPage = "https://github.com/pexpect/pexpect"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index ee580829bbe00..12144a0bb8d2d 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.30.1"; + version = "1.30.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wEKA5mocz7UWbbXBZBZMLhuPYq+u3/0hFFGlMproSik="; + hash = "sha256-Tnx1dHpDpJwVYj+SWDu24dAj6ubq8sLh5t5Nf7f6QE8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 0942dd0662c80..6370a8fa72cc2 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.20"; + version = "8.13.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vys1qAbTeXnlNhEJQp2kbZoEflnZr5hjnXM8g059qyI="; + hash = "sha256-k31wrs6zF/WDHf7CjehVpgJg70qdVRlkvsjnp9DPgc0="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix index a70fc8eecbe19..221493eb2194c 100644 --- a/pkgs/development/python-modules/picobox/default.nix +++ b/pkgs/development/python-modules/picobox/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-JtrwUVo3b4G34OUShX4eJS2IVubl4vBmEtB/Jhk4eJI="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 0891ad28ec3f9..4ba20f5aef315 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -5,9 +5,10 @@ , hypothesis , pythonOlder , jbig2dec -, deprecation +, deprecated , lxml , mupdf +, numpy , packaging , pillow , psutil @@ -24,8 +25,8 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.4.0"; - format = "pyproject"; + version = "8.9.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +40,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk="; + hash = "sha256-ia+D0OeB/MQWRniYkBEWZsDCwEApYGgu0++I/HupK6w="; }; patches = [ @@ -68,6 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ attrs hypothesis + numpy pytest-xdist psutil pytestCheckHook @@ -76,7 +78,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - deprecation + deprecated lxml packaging pillow diff --git a/pkgs/development/python-modules/pikepdf/paths.patch b/pkgs/development/python-modules/pikepdf/paths.patch index 43e472f5598ac..c9c61176aa6f4 100644 --- a/pkgs/development/python-modules/pikepdf/paths.patch +++ b/pkgs/development/python-modules/pikepdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py -index 2a170c6..5ee3ba1 100644 +index d27c660..6796984 100644 --- a/src/pikepdf/_methods.py +++ b/src/pikepdf/_methods.py -@@ -80,7 +80,7 @@ def _mudraw(buffer, fmt) -> bytes: +@@ -72,7 +72,7 @@ def _mudraw(buffer, fmt) -> bytes: tmp_in.flush() proc = run( @@ -12,22 +12,22 @@ index 2a170c6..5ee3ba1 100644 check=True, ) diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py -index 28c596b..aff3565 100644 +index f89b4f9..f187ebd 100644 --- a/src/pikepdf/jbig2.py +++ b/src/pikepdf/jbig2.py -@@ -28,7 +28,7 @@ def _extract_jbig2_bytes(jbig2: bytes, jbig2_globals: bytes) -> bytes: - output_path = Path(tmpdir) / "outfile" - - args = [ -- "jbig2dec", -+ "@jbig2dec@", - "--embedded", - "--format", - "png", -@@ -88,7 +88,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): +@@ -63,7 +63,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): + output_path = Path(tmpdir) / "outfile" + + args = [ +- "jbig2dec", ++ "@jbig2dec@", + "--embedded", + "--format", + "png", +@@ -90,7 +90,7 @@ class JBIG2Decoder(JBIG2DecoderInterface): def _version(self) -> Version: try: - proc = run( + proc = self._run( - ['jbig2dec', '--version'], stdout=PIPE, check=True, encoding='ascii' + ['@jbig2dec@', '--version'], stdout=PIPE, check=True, encoding='ascii' ) diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 1d0505e22ed58..2496bd1b36096 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -6,6 +6,7 @@ # build-system , cmake , nasm +, pkg-config # native dependencies , libheif @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "pillow-heif"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "bigcat88"; repo = "pillow_heif"; rev = "refs/tags/v${version}"; - hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; + hash = "sha256-HFcywrH687CBGTbZQ2rQrr/AdJ2+pFoI+NvYhUCanic="; }; postPatch = '' @@ -42,6 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake nasm + pkg-config ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 3b5dffb42cf07..7cf0bb9420fee 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,7 +5,7 @@ , fetchPypi , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 -, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools +, libxcb, openjpeg, libimagequant, numpy, pytestCheckHook, setuptools # for passthru.tests , imageio, matplotlib, pilkit, pydicom, reportlab }@args: diff --git a/pkgs/development/python-modules/pillow/generic.nix b/pkgs/development/python-modules/pillow/generic.nix index 80863c904a510..33276d3abd08e 100644 --- a/pkgs/development/python-modules/pillow/generic.nix +++ b/pkgs/development/python-modules/pillow/generic.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ olefile ] ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; + nativeCheckInputs = [ pytestCheckHook numpy ]; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 91ca5ca0e75fa..2b75974996320 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy , pyyaml , python-dateutil @@ -13,14 +14,18 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "2.2.4"; - format = "setuptools"; + version = "2.2.5"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LBzB1mSLK+ZulE2y/6WRZqN7kWTRE1rVJdnNix4pgWg="; + hash = "sha256-F2mWUpFMn2ipopa3UjvzrmNZsHtdRrUwfkuHbDYBElo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy pyyaml diff --git a/pkgs/development/python-modules/pint-pandas/default.nix b/pkgs/development/python-modules/pint-pandas/default.nix index 6cc7cd22a97da..d446483502236 100644 --- a/pkgs/development/python-modules/pint-pandas/default.nix +++ b/pkgs/development/python-modules/pint-pandas/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-FuH6wksSCkkL2AyQN46hwTnfeAZFwkWRl6KEEhsxmUY="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pip-requirements-parser/default.nix b/pkgs/development/python-modules/pip-requirements-parser/default.nix index 21d0679ce8ef9..84cc2ed513a17 100644 --- a/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-UMrwDXxk+sD3P2jk7s95y4OX6DRBjWWZZ8IhkR6tnZ4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - dontConfigure = true; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index 484a15e858769..f597887ddd2ca 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pip"; - version = "23.2.1"; + version = "23.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-mUlzfYmq1FE3X1/2o7sYJzMgwHRI4ib4EMhpg83VvrI="; + hash = "sha256-mJesZxFyZkGTR1s8/C88eWprW6WVGlwORXoKXc6NnoM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 7e15814fa6849..c1131e6592d23 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-rlnJmGe9LYwIJxV02IjiKtT1iS1O9ik8dAfjsPHsa8U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index ef4e789249ceb..ae575ec0a2635 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipx"; - version = "1.2.1"; + version = "1.3.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-eNZJXznKgamGR9yrswrrLEqUTxFhLGxWTkYbi13bebY="; + hash = "sha256-JZt4I0zw/Kmdgpd5tw6c+fHrHuxkN6jvN3fDmk0//vc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix index 777ba72bcc2c8..6cf9822c5e417 100644 --- a/pkgs/development/python-modules/platformdirs/default.nix +++ b/pkgs/development/python-modules/platformdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "3.10.0"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,11 +20,9 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ytilbs29oxuwLfoKTXNQxlh8qBF39F2ZRK8imd57A1w="; + hash = "sha256-27Cy8VEmbrO96G2mVStxkoWSRXlwZLWirI3tH6kBsus="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/playwright/default.nix b/pkgs/development/python-modules/playwright/default.nix index 555f7aa301970..31ded41872f1c 100644 --- a/pkgs/development/python-modules/playwright/default.nix +++ b/pkgs/development/python-modules/playwright/default.nix @@ -11,6 +11,7 @@ , setuptools , setuptools-scm , playwright-driver +, pythonRelaxDepsHook }: let @@ -54,10 +55,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'requires = ["setuptools==68.2.2", "setuptools-scm==8.0.4", "wheel==0.41.2", "auditwheel==5.4.0"]' \ - 'requires = ["setuptools", "setuptools-scm", "wheel"]' \ - --replace 'version_file = "playwright/_repo_version.py"' "" - # FIXME version_file is available in setuptools-scm>=8.0.0 - echo "__version__ = version = '${version}'" > playwright/_repo_version.py + 'requires = ["setuptools", "setuptools-scm", "wheel"]' # Skip trying to download and extract the driver. # This is done manually in postInstall instead. @@ -70,8 +68,16 @@ buildPythonPackage rec { ''; - nativeBuildInputs = [ git setuptools-scm setuptools ] - ++ lib.optionals stdenv.isLinux [ auditwheel ]; + nativeBuildInputs = [ + git + setuptools-scm + setuptools + pythonRelaxDepsHook + ] ++ lib.optionals stdenv.isLinux [ auditwheel ]; + + pythonRelaxDeps = [ + "pyee" + ]; propagatedBuildInputs = [ greenlet @@ -82,8 +88,6 @@ buildPythonPackage rec { ln -s ${driver} $out/${python.sitePackages}/playwright/driver ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Skip tests because they require network access. doCheck = false; diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index fc2c8b49069d3..13d9334fd9501 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.16.1"; + version = "5.18.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-KVrCXt6xjIk6u3Hcrc6gdbeP1v3wfO5CF6ThAJZnkls="; + hash = "sha256-Ngox5vu0nRKwBwNutpKVITQ9a+4iNvhFmRWCG676LLs="; }; propagatedBuildInputs = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; + downloadPage = "https://github.com/plotly/plotly.py"; homepage = "https://plot.ly/python/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index 241dced9f7e5f..18a54a2b05c7f 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.12.3"; + version = "0.12.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o43LNgf8ADweWa4MnVNdrngXZQ0cvC5W5W5bPeiN/pk="; + hash = "sha256-rcQaZyUDWURFqPoZhyeZJTvQeEzb1aHMFmV6HdILqQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index 1128d1c69eaf8..6b1c8e67f1eb5 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - # To prevent infinite recursion with pytest doCheck = false; passthru.tests = { diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index e6ffa43b32935..7fb6a0ec82404 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { --replace '"--cov-config=setup.cfg", ' "" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 050d6ef56f6bc..2eff69c4ad8da 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -1,17 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, numpy +{ lib +, fetchFromGitHub +, buildPythonPackage + +# build-system +, pdm-pep517 + +# dependencies +, numpy + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "plyfile"; - version = "1.0.1"; - format = "setuptools"; + version = "1.0.2"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-TOrt8e2Ss6Jrdm/IxWzaG5sjkOwpmxbe3i5f1FCXJho="; + src = fetchFromGitHub { + owner = "dranjan"; + repo = "python-plyfile"; + rev = "refs/tags/v${version}"; + hash = "sha256-HlyqljfjuaZoG5f2cfDQj+7KS0en7pW2PPEnpvH8U+E="; }; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + numpy + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index fc8da7447ffba..9b3174a3b3bd8 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.7.0"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; + hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 9c6440cd4c326..052cb9c4d7d61 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "1.0.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BGAo3c0TzyhIiDtZjoEP+Eeu51WJB3Wg71poFMWJ+VM="; + hash = "sha256-qkRnlLLzbYf7C2VjPDjYfllej8an4WftNahPLz/Wkxw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/polars/default.nix b/pkgs/development/python-modules/polars/default.nix index d967ca27c8ff1..5d1406fe3926c 100644 --- a/pkgs/development/python-modules/polars/default.nix +++ b/pkgs/development/python-modules/polars/default.nix @@ -38,7 +38,6 @@ buildPythonPackage { # thus the `sed` command # Make sure to check that the right substitutions are made when updating the package preBuild = '' - cd py-polars #sed -i 's/version = "0.18.0"/version = "${version}"/g' Cargo.lock ''; @@ -49,7 +48,7 @@ buildPythonPackage { }; }; - cargoRoot = "py-polars"; + sourceRoot = "source/py-polars"; # Revisit this whenever package or Rust is upgraded RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index 5ab360ae7e379..6ed2daae7e887 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , setuptools @@ -10,7 +9,7 @@ buildPythonPackage rec { pname = "polyline"; - version = "2.0.0"; + version = "2.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,19 +17,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frederickjansen"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-e9ZDqcS3MaMlXi2a2JHI6NtRPqIV7rjsucGXEH6V8LA="; + rev = "refs/tags/v${version}"; + hash = "sha256-fbGGfZdme4OiIGNlXG1uVl1xP+rPVI9l5hjHM0gwAsE="; }; - patches = [ - # https://github.com/frederickjansen/polyline/pull/15 - (fetchpatch { - name = "relax-build-dependencies.patch"; - url = "https://github.com/frederickjansen/polyline/commit/cb9fc80606c33dbbcaa0d94de25ae952358443b6.patch"; - hash = "sha256-epg2pZAG+9QuICa1ms+/EO2DDmYEz+KEtxxnvG7rsWY="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=polyline --cov-report term-missing" "" diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 57d6dd0b9ab60..93c42374876c5 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -2,14 +2,20 @@ , lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, apricot-select +, networkx , numpy +, scikit-learn , scipy -, cython -, networkx -, joblib -, pandas -, nose -, pyyaml +, torch + +# tests +, pytestCheckHook }: @@ -26,9 +32,22 @@ buildPythonPackage rec { sha256 = "sha256-EnxKlRRfsOIDLAhYOq7bUSbI/NvPoSyYCZ9D5VCXFGQ="; }; - propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + apricot-select + networkx + numpy + scikit-learn + scipy + torch + ]; - nativeCheckInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 70cf9bc721ddb..7166577d8c74f 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -13,21 +13,20 @@ , semver , rich , tomlkit -, typing-extensions }: buildPythonPackage rec { pname = "pontos"; - version = "23.9.1"; - format = "pyproject"; + version = "23.12.1"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-HRIGS2B6tc4qaOMTud5/uhEr1k7puqJUugDj1WuacqU="; + hash = "sha256-N10Jn5jq/PktpmeRNlqZyN/rUyAeW+ghY3/RK9Aas7I="; }; nativeBuildInputs = [ @@ -42,10 +41,7 @@ buildPythonPackage rec { python-dateutil semver rich - typing-extensions tomlkit - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ] ++ httpx.optional-dependencies.http2; nativeCheckInputs = [ @@ -70,6 +66,9 @@ buildPythonPackage rec { # Tests require git executable "test_github_action_output" "test_initial_release" + # Tests are out-dated + "test_getting_version_without_version_config" + "test_verify_version_does_not_match" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix index b8ba613ba350e..6c3e28cd9b4cd 100644 --- a/pkgs/development/python-modules/pooch/default.nix +++ b/pkgs/development/python-modules/pooch/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pooch"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-8XShBBtkR/Du+IYPdtF/YO0vhX3A76OHp/CCKK8F2Zg="; + hash = "sha256-9ZmB/VubXQMtzej0oR6qSSwqxjQ/rjWWov2uNfxUsKA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 34845722ce4fc..cd66b0950eefb 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -1,40 +1,56 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# build-system +, setuptools +, setuptools-scm + +# dependencies , redis + +# tests +, pygments +, pytestCheckHook }: buildPythonPackage rec { pname = "portalocker"; - version = "2.7.0"; - format = "setuptools"; + version = "2.8.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ay6B1TSojsFzbQP3gLoHPwR6BsR4sG4pN0hvM06VXFE="; + hash = "sha256-KwNap4KORsWOmzE5DuHxabmOEGarELmmqGH+fiXuTzM="; }; + postPatch = '' + sed -i "/--cov/d" pytest.ini + ''; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ redis ]; nativeCheckInputs = [ + pygments pytestCheckHook ]; - disabledTests = [ - "test_combined" # no longer compatible with setuptools>=58 - ]; - pythonImportsCheck = [ "portalocker" ]; meta = with lib; { + changelog = "https://github.com/wolph/portalocker/releases/tag/v${version}"; description = "A library to provide an easy API to file locking"; homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 1fffa8cde714c..33ad076f93387 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -36,8 +36,6 @@ buildPythonPackage rec { --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index e0d37c51a2b12..557045649425f 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "preshed"; - version = "3.0.9"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-chhjxSRP/NJlGtCSiVGix8d7EC9OEaJRrYXTfudiFmA="; + hash = "sha256-XisLKgfdGo3uqtZhIBmEXGAu4kkH9pNuqvF6q9VuVEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index b0efbcb373d4f..91d2d5a427a71 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.8.0"; + version = "3.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,11 +20,9 @@ buildPythonPackage rec { owner = "jazzband"; repo = "prettytable"; rev = "refs/tags/${version}"; - hash= "sha256-JnxUjUosQJgprIbA9szSfw1Fi21Qc4WljoRAQv4x5YM="; + hash= "sha256-yIO4eO2VdOnUt9qoNQOeq/c0os2LQ3mqAkCOIuoGpyg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 436ca00267584..acffc0dca510d 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -1,18 +1,23 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "process-tests"; - version = "2.1.2"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "a3747ad947bdfc93e5c986bdb17a6d718f3f26e8577a0807a00962f29e26deba"; + hash = "sha256-5dV96nFhJR6RytuEvz7MhSdfsSH9R45Xn4AHd7HUJL0="; }; + nativeBuildInputs = [ + setuptools + ]; + # No tests doCheck = false; diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index b3e1e12400c21..4c4c2338445a8 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.17.1"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "prometheus"; repo = "client_python"; rev = "refs/tags/v${version}"; - hash = "sha256-ag9gun47Ar0Sw3ZGIXAHjtv4GdhX8x51UVkgwdQ8A+s="; + hash = "sha256-7mVqfzK0E8RQAlQyQD8/DIcPJZ52V13JqU22tsQJp+Q="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/prompt-toolkit/default.nix b/pkgs/development/python-modules/prompt-toolkit/default.nix index 2869c042d2d08..034203068baa6 100644 --- a/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.39"; + version = "3.0.41"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - hash = "sha256-BFBa3mh9wm3EKEsa0ZqDvi8q/oPnqCis4McvOh33Kqw="; + hash = "sha256-lBNn2X/IFVSIIqomwqJp/cTrIensBfxdRHzwm61ddfA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/propka/default.nix b/pkgs/development/python-modules/propka/default.nix index 0894e05a9886c..d9d28cb209de8 100644 --- a/pkgs/development/python-modules/propka/default.nix +++ b/pkgs/development/python-modules/propka/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pythonOlder , setuptools , pytestCheckHook @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "propka"; version = "3.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,16 @@ buildPythonPackage rec { hash = "sha256-NbvrlapBALGbUyBqdqDcDG/igDf/xqxC35DzVUrbHlo="; }; - propagatedBuildInputs = [ + patches = [ + # https://github.com/jensengroup/propka/pull/171 + (fetchpatch { + name = "python312-compatibility.patch"; + url = "https://github.com/jensengroup/propka/commit/1c8885d4003e5fd8a2921909268001b197066beb.patch"; + hash = "sha256-fB2WKVHoIgqDA/EYt7369HrIDCEJ1rmKP2tmxAdhCRs="; + }) + ]; + + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index d66f21ca26790..b651412571e6b 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -35,13 +35,13 @@ let pname = "psycopg"; - version = "3.1.14"; + version = "3.1.15"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zocRBnrQoJDWI4qhxDnxxIeiLdaWolvsujqfHBYQc/A="; + hash = "sha256-8M2Rm9AtOvZwZhKGuR96XiOOmllqcWAZJuEmUXxzsRw="; }; patches = [ @@ -50,12 +50,6 @@ let libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) - - (fetchpatch { - # add fixture to mark flaky ref count tests - url = "https://github.com/psycopg/psycopg/commit/70ef364324ba3448ef9ac0e29329c9d802380e4b.patch"; - hash = "sha256-8PlrBcIumlxFjNXCAfm4NpSIxAnvLR8TopHzneJyzf0="; - }) ]; baseMeta = { diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 43a06e5a9e4d4..88f3a8b24483e 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "psycopg2"; - version = "2.9.7"; + version = "2.9.9"; format = "setuptools"; # Extension modules don't work well with PyPy. Use psycopg2cffi instead. @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; + hash = "sha256-0UVL3pP7HiJBZoEWlNYA50ZDDABvuwMeoG7MLqQb8VY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index 36ae22a67b680..890d397c532ff 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -11,6 +11,7 @@ , toolz , typing-extensions , wrapt +, attrs }: buildPythonPackage rec { @@ -27,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-eDfGWmTKJrkkzRy1I3wl3WYPCxtPHSRzqAoOiO7QQ9Y="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ hatch-vcs hatchling @@ -45,6 +44,7 @@ buildPythonPackage rec { pytestCheckHook toolz wrapt + attrs ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index dd053d439070d..a0c0e144c3ba8 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.1.0"; + version = "6.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-W3gfHCbScAZ/j6gNzrPwhcmrYoTXi+0BuSEzjOKSo4M="; + hash = "sha256-K1Ov8yp6cD7h2kAXNRfcoJp24WA9VpO/y0Aga+9BHz4="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix index f21f4d7fe4cc8..60615c0a0640b 100644 --- a/pkgs/development/python-modules/pure-eval/default.nix +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-9N+UcgAv30s4ctgsBrOHiix4BoXhKPgxH/GOz/NIFdU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pure-protobuf/default.nix b/pkgs/development/python-modules/pure-protobuf/default.nix index c2d7f7e3d8ad1..ba8b1836ba624 100644 --- a/pkgs/development/python-modules/pure-protobuf/default.nix +++ b/pkgs/development/python-modules/pure-protobuf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pure-protobuf"; - version = "2.3.0"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,11 +21,9 @@ buildPythonPackage rec { owner = "eigenein"; repo = "protobuf"; rev = "refs/tags/${version}"; - hash = "sha256-nJ3F8dUrqMeWqTV9ErGqrMvofJwBKwNUDfxWIqFh4nY="; + hash = "sha256-MjxJTX672LSEqZkH39vTD/+IhCTp6FL2z15S7Lxj6Dc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix index 592a5c107dad7..4d39db14d7145 100644 --- a/pkgs/development/python-modules/pvextractor/default.nix +++ b/pkgs/development/python-modules/pvextractor/default.nix @@ -40,8 +40,6 @@ buildPythonPackage rec { spectral-cube ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - # collecting ... qt.qpa.xcb: could not connect to display # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. doCheck = false; diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix index 1ed79995b4eea..6d63a7db9c8f0 100644 --- a/pkgs/development/python-modules/py-desmume/default.nix +++ b/pkgs/development/python-modules/py-desmume/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "py-desmume"; - version = "0.0.5.post0"; + version = "0.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; - rev = version; - hash = "sha256-q6E7J7e0yXt+jo1KNqqAw2cG/Us+Tw0dLfTqAKWfAlc="; + rev = "refs/tags/${version}"; + hash = "sha256-AgUdILCqpmuVI3uMSdGl+lIfUVXnIo/egm/48FMRF3M="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/py-tree-sitter/default.nix b/pkgs/development/python-modules/py-tree-sitter/default.nix index f8c1997220a74..9358a0fbca887 100644 --- a/pkgs/development/python-modules/py-tree-sitter/default.nix +++ b/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "py-tree-sitter"; - version = "0.20.1"; + version = "0.20.4"; format = "pyproject"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "py-tree-sitter"; - rev = "v${version}"; - hash = "sha256-mdV5zGvVI1MltmOD1BtXxsKB/yigk8d56WwLlX6Uizg="; + rev = "refs/tags/v${version}"; + hash = "sha256-R97WcsHQMcuEOCg/QQ9YbGTRD30G9PRv0xAbxuoFyC4="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/py-ubjson/default.nix b/pkgs/development/python-modules/py-ubjson/default.nix index 175b635257619..f9518fdead937 100644 --- a/pkgs/development/python-modules/py-ubjson/default.nix +++ b/pkgs/development/python-modules/py-ubjson/default.nix @@ -20,9 +20,18 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + disabledTests = [ + # https://github.com/Iotic-Labs/py-ubjson/issues/18 + "test_recursion" + ]; + + pytestFlagsArray = [ + "test/test.py" + ]; - pythonImportsCheck = [ "ubjson" ]; + pythonImportsCheck = [ + "ubjson" + ]; meta = with lib; { description = "Universal Binary JSON draft-12 serializer for Python"; diff --git a/pkgs/development/python-modules/pyairnow/default.nix b/pkgs/development/python-modules/pyairnow/default.nix index f425eaeaa17ca..c4a549847a26a 100644 --- a/pkgs/development/python-modules/pyairnow/default.nix +++ b/pkgs/development/python-modules/pyairnow/default.nix @@ -3,6 +3,7 @@ , aioresponses , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp , poetry-core , pytest-asyncio @@ -22,6 +23,16 @@ buildPythonPackage rec { hash = "sha256-aab+3xrEiCjysa+DzXWelQwz8V2tr74y8v0NpDZiuTk="; }; + patches = [ + (fetchpatch { + # remove setuptools, wheel from build-system requirements + # https://github.com/asymworks/pyairnow/pull/7 + name = "pyairnow-build-system.patch"; + url = "https://github.com/asymworks/pyairnow/commit/e3cc892ffce855d8213264248b6b4ed78ee791bd.patch"; + hash = "sha256-L0MV2okkf6Nf1S4zS7lb4lt5eSfTF10yDJLzpyDrSl8="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 3fcf2468aea31..70c660e0daad4 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pyyaml , unidecode }: buildPythonPackage rec { pname = "pyaml"; - version = "23.9.6"; - format = "setuptools"; + version = "23.9.7"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-Kyw5AXtxihJ775+WvFX4lBTZYIdmaNaYgKrmb0upiVc="; + hash = "sha256-WB6k6Z8OMIhkQH4EwDxgkkGu+joV37qJZNp2RLrzshc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pyarr/default.nix b/pkgs/development/python-modules/pyarr/default.nix index 7f2a4ce78878d..9ffcaffba8389 100644 --- a/pkgs/development/python-modules/pyarr/default.nix +++ b/pkgs/development/python-modules/pyarr/default.nix @@ -1,26 +1,52 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage -, types-requests +, fetchpatch + +# build-system +, poetry-core + +# dependencies +, overrides , requests +, types-requests }: buildPythonPackage rec { pname = "pyarr"; version = "5.2.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-jlcc9Kj1MYSsnvJkKZXXWWJVDx3KIuojjbGtl8kDUpw="; + src = fetchFromGitHub { + owner = "totaldebug"; + repo = "pyarr"; + rev = "refs/tags/v${version}"; + hash = "sha256-yvlDnAjmwDNdU1SWHGVrmoD3WHwrNt7hXoNNPo1hm1w="; }; + patches = [ + (fetchpatch { + # fix build hook specification + url = "https://github.com/totaldebug/pyarr/commit/e0aaf53fdb3ab2f60c27c1ec74ce361eca5278d6.patch"; + hash = "sha256-vD7to465/tviY25D+FUjsg6mJ+N8ZP6qJbWCw9hx/84="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ + overrides requests types-requests ]; - pythonImportsCheck = [ "pyarr" ]; + pythonImportsCheck = [ + "pyarr" + ]; + + doCheck = false; # requires running *arr instances meta = with lib; { description = "Python client for Servarr API's (Sonarr, Radarr, Readarr, Lidarr)"; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index 39c0420542074..fc424376477ee 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -17,8 +17,9 @@ , pytest-lazy-fixture , pkg-config , scipy -, fetchpatch +, setuptools , setuptools-scm +, oldest-supported-numpy }: let @@ -27,18 +28,25 @@ in buildPythonPackage rec { pname = "pyarrow"; - format = "setuptools"; inherit (arrow-cpp) version src; + pyproject = true; disabled = pythonOlder "3.7"; sourceRoot = "apache-arrow-${version}/python"; + postPatch = '' + substituteInPlace pyproject.toml setup.py \ + --replace "setuptools_scm < 8.0.0" "setuptools_scm" + ''; + nativeBuildInputs = [ cmake cython pkg-config + setuptools setuptools-scm + oldest-supported-numpy ]; buildInputs = [ arrow-cpp ]; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index 3888f66d776a4..d4fb73d509986 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -2,20 +2,25 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyasn1"; - version = "0.5.0"; - format = "setuptools"; + version = "0.5.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l7cpDKaOYqgyVY7Dl28Vy/kRv118cDnYuGHCoOzmn94="; + hash = "sha256-bTkaluWbIxMKXPp01v1/OI274mzI8e3zn93fCNnWZ2w="; }; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "pyasn1" ]; diff --git a/pkgs/development/python-modules/pyatag/default.nix b/pkgs/development/python-modules/pyatag/default.nix index 47cbf5b6c7976..1920466295e68 100644 --- a/pkgs/development/python-modules/pyatag/default.nix +++ b/pkgs/development/python-modules/pyatag/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyatag"; - version = "0.3.7.1"; + version = "3.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "MatsNl"; repo = "pyatag"; rev = "refs/tags/${version}"; - hash = "sha256-3h9mpopTbEULCx7rcEt/I/ZnUA0L/fJ7Y3L5h/6EuC4="; + hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 544990ba7521c..3ae7b9799a11a 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-ASjAmkM/BFWzZYnLeXATbZzSG6KBDcmy66/R1MgzAwQ="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.cfg \ --replace "oauthlib~=3.1" "oauthlib" \ diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix index 1fcb88c0c77ed..4443dfee6252c 100644 --- a/pkgs/development/python-modules/pyaussiebb/default.nix +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "pyaussiebb"; - version = "0.0.18"; - format = "pyproject"; + version = "0.1.1"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yaleman"; repo = "aussiebb"; rev = "refs/tags/v${version}"; - hash = "sha256-tEdddVsLFCHRvyLCctDakioiop2xWaJlfGE16P1ukHc="; + hash = "sha256-XNf9vYMlTLqhYIVNw9GjPcXpOm5EYCcC4aGukR8g3zc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index ef8a82a1cd429..45cf827a82a8a 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -1,39 +1,44 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook + +# build-system +, setuptools +, setuptools-scm + +# tests , astropy -, astropy-helpers +, numpy , pillow +, pytestCheckHook }: buildPythonPackage rec { pname = "pyavm"; - version = "0.9.5"; - format = "setuptools"; + version = "0.9.6"; + pyproject = true; src = fetchPypi { pname = "PyAVM"; inherit version; - hash = "sha256-gV78ypvYwohHmdjP3lN5F97PfmxuV91tvw5gsYeZ7i8="; + hash = "sha256-s7eLPoAHDbY9tPt3RA5zJg+NuTtVV/SqpUUR3NrG8m0="; }; - propagatedBuildInputs = [ - astropy-helpers + nativeBuildInputs = [ + setuptools + setuptools-scm ]; nativeCheckInputs = [ astropy + numpy pillow pytestCheckHook ]; - # Disable automatic update of the astropy-helper module - postPatch = '' - substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" - ''; - - pythonImportsCheck = [ "pyavm" ]; + pythonImportsCheck = [ + "pyavm" + ]; meta = with lib; { description = "Simple pure-python AVM meta-data handling"; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index e60079ed24179..9519ca65e2469 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage , lib , fetchPypi -, fetchpatch +, setuptools , formulaic , click , num2words @@ -9,7 +9,6 @@ , scipy , pandas , nibabel -, patsy , bids-validator , sqlalchemy , pytestCheckHook @@ -18,35 +17,43 @@ }: buildPythonPackage rec { - version = "0.16.3"; - format = "setuptools"; pname = "pybids"; + version = "0.16.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-EOJ5NQyNFMpgLA1EaaXkv3/zk+hkPIMaVGrnNba4LMM="; + hash = "sha256-pahl8wi6Sf8AuVqkvi7H90ViHr+9utb14ZVmKK3rFm4="; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + versioneer + ] ++ versioneer.optional-dependencies.toml; pythonRelaxDeps = [ "sqlalchemy" ]; propagatedBuildInputs = [ + bids-validator click formulaic + nibabel num2words numpy - scipy pandas - nibabel - patsy - bids-validator + scipy sqlalchemy - versioneer ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "bids" ]; + pythonImportsCheck = [ + "bids" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + disabledTests = [ # looks for missing data: "test_config_filename" diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 197d079071287..3c11dd822c211 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , libGLU, libGL , xorg , numpy @@ -8,14 +9,18 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.2.5"; - format = "setuptools"; + version = "3.2.6"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-G8ua+4eghr4bLeGPCE0f2rgZTaG/cfJkdDyia6o5w1E="; + hash = "sha256-2idSVDPIhpjcn9i8IPpK5NB3OLRlZjNlnr2CwtKITgg="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ libGLU libGL xorg.libX11 @@ -30,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source software for robot simulation, integrated with OpenAI Gym"; + downloadPage = "https://github.com/bulletphysics/bullet3"; homepage = "https://pybullet.org/"; license = licenses.zlib; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 6aa58056cad91..628853a89ce01 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.24.0"; + version = "1.25.1"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "refs/tags/v${version}"; - hash = "sha256-eAE0YPZAV90MP6g1V1T80suaRV15ts38kYt6Djb78Xk="; + hash = "sha256-HH4BjdSkdL8lI8L/Z2ltuuWWOkfetfgv4WQm6PIoEa0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 84a7cbe1ba42c..fcd6327bd2224 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pycares"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xUJpb22sl46dmRkjhHRaZfgKfZRQUBFR5KdWPgYBDUU="; + hash = "sha256-9HV51Qjy9W7d0WznIEV4KtOxs7Z4CYaZ4rahswcz4cI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycfmodel/default.nix b/pkgs/development/python-modules/pycfmodel/default.nix index f6173a18966dc..0ee92706afc9c 100644 --- a/pkgs/development/python-modules/pycfmodel/default.nix +++ b/pkgs/development/python-modules/pycfmodel/default.nix @@ -48,5 +48,6 @@ buildPythonPackage rec { homepage = "https://github.com/Skyscanner/pycfmodel"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix index 45e5ff27ee558..b7b15c260fdbf 100644 --- a/pkgs/development/python-modules/pyclipper/default.nix +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-FKpP+tgJFzhij3wDQsAgwrTNnny7lgmN+tlSQ9JgG+Q="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm cython diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 250537774c2a4..761e9c0562a4d 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.11.0"; + version = "2.11.1"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-JZvMF4V9ios7SiMnMkt55fAgoTwWB0Zw+cjI+HLqdtA="; + hash = "sha256-QboOevyXUt+1PO1UieifgYa+AOWZ5xJmBpW3p1/yZj8="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 47e90eb8726a9..4b37a0765f0e4 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,14 +10,14 @@ let in buildPythonPackage rec { pname = "pycryptodome"; - version = "3.18.0"; + version = "3.19.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Legrandin"; repo = "pycryptodome"; rev = "refs/tags/v${version}"; - hash = "sha256-6oXXy18KlSjfyZhfMnIgnu34u/9sG0TPYvPJ8ovTqMA="; + hash = "sha256-WD+OEjePVtqlmn7h1CIfraLuEQlodkvjmYQ8q7nNoGU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index c84b22b7b54d2..fa95336d3b3fa 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pycyphal"; - version = "1.15.2"; + version = "1.15.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KVX+DwcJp1sjpcG1Utl9me1LwWDZPof+O6hoUt1xlXA="; + hash = "sha256-0Mp8d/rNOOPLg0gUPWdOgp/d5n148dxcLceW1VtjrkQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic-core/default.nix b/pkgs/development/python-modules/pydantic-core/default.nix index 6e273aaef4c90..4569ea3286b8d 100644 --- a/pkgs/development/python-modules/pydantic-core/default.nix +++ b/pkgs/development/python-modules/pydantic-core/default.nix @@ -17,14 +17,14 @@ let pydantic-core = buildPythonPackage rec { pname = "pydantic-core"; - version = "2.6.3"; + version = "2.14.5"; format = "pyproject"; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-core"; rev = "refs/tags/v${version}"; - hash = "sha256-bEVACTlzELXPoCtEHMR1s87KJn/qnE0lO1O4RmdjmPM="; + hash = "sha256-UguZpA3KEutOgIavjx8Ie//0qJq+4FTZNQTwb/ZIgb8="; }; patches = [ @@ -34,7 +34,7 @@ let cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-h9SmMLg/W11h/SQz8Te5OoCKdyG6Fctc5ftqbVQFSwU="; + hash = "sha256-mMgw922QjHmk0yimXfolLNiYZntTsGydQywe7PTNnwc="; }; nativeBuildInputs = [ @@ -78,6 +78,7 @@ let ]; meta = with lib; { + changelog = "https://github.com/pydantic/pydantic-core/releases/tag/v${version}"; description = "Core validation logic for pydantic written in rust"; homepage = "https://github.com/pydantic/pydantic-core"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pydantic-scim/default.nix b/pkgs/development/python-modules/pydantic-scim/default.nix index 9441bcc0eb845..b8ac4c729a69a 100644 --- a/pkgs/development/python-modules/pydantic-scim/default.nix +++ b/pkgs/development/python-modules/pydantic-scim/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.py \ --replace 'version=get_version(),' 'version="${version}",' diff --git a/pkgs/development/python-modules/pydantic-settings/default.nix b/pkgs/development/python-modules/pydantic-settings/default.nix index c27bb5f275766..3034b2f927119 100644 --- a/pkgs/development/python-modules/pydantic-settings/default.nix +++ b/pkgs/development/python-modules/pydantic-settings/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , hatchling , pydantic , python-dotenv @@ -11,14 +12,16 @@ buildPythonPackage rec { pname = "pydantic-settings"; - version = "2.0.3"; - format = "pyproject"; + version = "2.1.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-settings"; rev = "v${version}"; - hash = "sha256-3V6daCibvVr8RKo2o+vHC++QgIYKAOyRg11ATrCzM5Y="; + hash = "sha256-hU7u/AzaqCHKSUDHybsgXTW8IWi9hzBttPYDmMqdZbI="; }; nativeBuildInputs = [ @@ -38,6 +41,11 @@ buildPythonPackage rec { pytest-mock ]; + disabledTests = [ + # expected to fail + "test_docs_examples[docs/index.md:212-246]" + ]; + preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix new file mode 100644 index 0000000000000..e1fc840f0ee14 --- /dev/null +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, cython +, email-validator +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, python-dotenv +, pythonOlder +, setuptools +, typing-extensions +, libxcrypt +}: + +buildPythonPackage rec { + pname = "pydantic"; + version = "1.10.13"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydantic"; + repo = "pydantic"; + rev = "refs/tags/v${version}"; + hash = "sha256-ruDVcCLPVuwIkHOjYVuKOoP3hHHr7ItIY55Y6hUgR74="; + }; + + nativeBuildInputs = [ + setuptools + cython + ]; + + buildInputs = lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + passthru.optional-dependencies = { + dotenv = [ + python-dotenv + ]; + email = [ + email-validator + ]; + }; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + pytestFlagsArray = [ + # https://github.com/pydantic/pydantic/issues/4817 + "-W" "ignore::pytest.PytestReturnNotNoneWarning" + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + enableParallelBuilding = true; + + pythonImportsCheck = [ "pydantic" ]; + + meta = with lib; { + description = "Data validation and settings management using Python type hinting"; + homepage = "https://github.com/pydantic/pydantic"; + changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md"; + license = licenses.mit; + maintainers = with maintainers; [ wd15 ]; + }; +} diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index 4384e51db22b5..d58ec6e53f5f5 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -1,124 +1,87 @@ { lib -, stdenv , buildPythonPackage -, autoflake -, cython -, devtools -, email-validator , fetchFromGitHub -, fetchpatch -, pytest-mock -, pytestCheckHook -, python-dotenv -, pythonAtLeast , pythonOlder -, pyupgrade -, typing-extensions -# dependencies for building documentation. -# docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 -, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin && pythonAtLeast "3.10") -, ansi2html -, markdown-include -, mike -, mkdocs -, mkdocs-exclude -, mkdocs-material -, mdx-truly-sane-lists -, sqlalchemy -, ujson -, orjson -, hypothesis + +# build-system +, hatchling +, hatch-fancy-pypi-readme + +# native dependencies , libxcrypt + +# dependencies +, annotated-types +, pydantic-core +, typing-extensions + +# tests +, cloudpickle +, email-validator +, dirty-equals +, faker +, pytestCheckHook +, pytest-mock }: buildPythonPackage rec { pname = "pydantic"; - version = "1.10.12"; - format = "setuptools"; - - outputs = [ - "out" - ] ++ lib.optionals withDocs [ - "doc" - ]; + version = "2.5.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pydantic"; - repo = pname; + repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-3XnbPGU90wLCPEryFAOky6Iy73Dvgzzh+GbOKW8hZ4U="; + hash = "sha256-D0gYcyrKVVDhBgV9sCVTkGq/kFmIoT9l0i5bRM1qxzM="; }; - postPatch = '' - sed -i '/flake8/ d' Makefile - ''; - buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; nativeBuildInputs = [ - cython - ] ++ lib.optionals withDocs [ - # dependencies for building documentation - autoflake - ansi2html - markdown-include - mdx-truly-sane-lists - mike - mkdocs - mkdocs-exclude - mkdocs-material - sqlalchemy - ujson - orjson - hypothesis + hatch-fancy-pypi-readme + hatchling ]; propagatedBuildInputs = [ - devtools - pyupgrade + annotated-types + pydantic-core typing-extensions ]; passthru.optional-dependencies = { - dotenv = [ - python-dotenv - ]; email = [ email-validator ]; }; nativeCheckInputs = [ + cloudpickle + dirty-equals + faker pytest-mock pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - pytestFlagsArray = [ - # https://github.com/pydantic/pydantic/issues/4817 - "-W" "ignore::pytest.PytestReturnNotNoneWarning" - ]; - preCheck = '' export HOME=$(mktemp -d) + substituteInPlace pyproject.toml \ + --replace "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \ + --replace "'--benchmark-group-by', 'group'," "" \ + --replace "'--benchmark-warmup', 'on'," "" \ + --replace "'--benchmark-disable'," "" ''; - # Must include current directory into PYTHONPATH, since documentation - # building process expects "import pydantic" to work. - preBuild = lib.optionalString withDocs '' - PYTHONPATH=$PWD:$PYTHONPATH make docs - ''; + disabledTestPaths = [ + "tests/benchmarks" - # Layout documentation in same way as "sphinxHook" does. - postInstall = lib.optionalString withDocs '' - mkdir -p $out/share/doc/$name - mv ./site $out/share/doc/$name/html - ''; - - enableParallelBuilding = true; + # avoid cyclic dependency + "tests/test_docs.py" + ]; pythonImportsCheck = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/pydevd/default.nix b/pkgs/development/python-modules/pydevd/default.nix index 8ee2f8d98acf4..df840a24db8f7 100644 --- a/pkgs/development/python-modules/pydevd/default.nix +++ b/pkgs/development/python-modules/pydevd/default.nix @@ -2,10 +2,11 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, setuptools , numpy , psutil , pytestCheckHook +, pythonAtLeast , pythonOlder , trio , untangle @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "pydevd"; - version = "2.9.6"; - format = "setuptools"; + version = "2.10.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,16 +23,11 @@ buildPythonPackage rec { owner = "fabioz"; repo = "PyDev.Debugger"; rev = "pydev_debugger_${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-TDU/V7kY7zVxiP4OVjGqpsRVYplpkgCly2qAOqhZONo="; + hash = "sha256-1tWiPj30x/ZXIBu2qzUCpyF1bLsJ0wW1QaxklD3h3A8="; }; - patches = [ - # https://github.com/fabioz/PyDev.Debugger/pull/258 - (fetchpatch { - name = "numpy-1.25-test-compatibility.patch"; - url = "https://github.com/fabioz/PyDev.Debugger/commit/6f637d951cda62dc2202a2c7b6af526c4d1e8a00.patch"; - hash = "sha256-DLzZZwQHtqGZGA8nsBLNQqamuI4xUfQ89Gd21sJa9/s="; - }) + nativeBuildInputs = [ + setuptools ]; __darwinAllowLocalNetworking = true; @@ -61,6 +57,11 @@ buildPythonPackage rec { # AssertionError pydevd_tracing.set_trace_to_threads(tracing_func) == 0 "test_tracing_other_threads" "test_tracing_basic" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + "test_case_handled_and_unhandled_exception_generator" + "test_case_stop_async_iteration_exception" + "test_case_unhandled_exception_generator" + "test_function_breakpoints_async" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing_simple" "test_evaluate_exception_trace" diff --git a/pkgs/development/python-modules/pydexcom/default.nix b/pkgs/development/python-modules/pydexcom/default.nix index 3a22435412910..bd639205c1116 100644 --- a/pkgs/development/python-modules/pydexcom/default.nix +++ b/pkgs/development/python-modules/pydexcom/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-46+Ml73F6EUbMwRJB93FD+No/g65RJwnCnFzH4Pb5ek="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index dc36f149a9b1c..8159a71daa5ff 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 0efcb94259fec..281611c31bddd 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyee"; - version = "11.0.0"; + version = "11.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-J8aCvOYL2txdPiPqzUEB3zKMAoCISj2cB/Ok4+WV3ic="; + hash = "sha256-tTr5j2mQyBDt2bVrh3kQIaj1T9E9tO3RFCQ41EuiJj8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index 817a39cedf9e9..206062b5316fd 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyelftools"; - version = "0.29"; + version = "0.30"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "eliben"; repo = pname; rev = "v${version}"; - hash = "sha256-tPY0C5CoA9hGHeEA/KWQ1RAVT5kqMlAwuWpOSH+KJ9Y="; + hash = "sha256-A9etnN7G24/Gu8YlV/YDpxZV+TG2eVXGx2ZjVnA9ZD4="; }; doCheck = stdenv.hostPlatform.system == "x86_64-linux" && stdenv.hostPlatform.isGnu; diff --git a/pkgs/development/python-modules/pyerfa/default.nix b/pkgs/development/python-modules/pyerfa/default.nix index fda4be537d921..8561738f8428c 100644 --- a/pkgs/development/python-modules/pyerfa/default.nix +++ b/pkgs/development/python-modules/pyerfa/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , jinja2 , oldest-supported-numpy , setuptools-scm @@ -16,21 +15,13 @@ buildPythonPackage rec { pname = "pyerfa"; format = "pyproject"; - version = "2.0.0.3"; + version = "2.0.1.1"; src = fetchPypi { inherit pname version; - hash = "sha256-13+7+lg1DBlMy5nl2TqgXTwrFNWq2LZi2Txq2f/0Hzk="; + hash = "sha256-26x07409Ow8i7wrTu72zCyqeEFcLH6Wpi+NMe+Nsmms="; }; - patches = [ - # Sort of helps maybe for https://github.com/liberfa/pyerfa/issues/112 - (fetchpatch { - url = "https://github.com/liberfa/pyerfa/commit/4866342b94c5e7344711146f1186a4c3e7534da8.patch"; - hash = "sha256-uPFFdLYfRweQdeEApBAw6Ulqh31NTQwwmnaU+x/M+C0="; - }) - ]; - nativeBuildInputs = [ jinja2 oldest-supported-numpy diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index c1d081baaadbb..d16b02d1c3a41 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, importlib-metadata , nose , numpy , setuptools @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + importlib-metadata six ]; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index f1c07d89d2dcf..fdd7982a78983 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -2,19 +2,25 @@ , stdenv , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# build-system +, setuptools + +# tests +, pytestCheckHook }: buildPythonPackage rec { - version = "5.2.4"; - format = "setuptools"; pname = "pyfakefs"; + version = "5.3.2"; + pyproject = true; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-PgQPN5IIYIag3CGRsF/nCUOOFoqv4ulPzb7444WSCNg="; + hash = "sha256-qDd2o8EEbU0QPy9TACmqbN/18Dht/9WcFe4WkmE1STw="; }; postPatch = '' @@ -30,21 +36,26 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - nativeCheckInputs = [ pytestCheckHook ]; - # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) - disabledTests = [ "test_open_existing_pipe" ]; + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "pyfakefs" + ]; - disabledTestPaths = [ - # try to import opentimelineio but nixpkgs doesn't have it as of 2023-09-16 - "pyfakefs/pytest_tests/segfault_test.py" + nativeCheckInputs = [ + pytestCheckHook ]; - pythonImportsCheck = [ "pyfakefs" ]; + # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) + #disabledTests = [ "test_open_existing_pipe" ]; + meta = with lib; { description = "Fake file system that mocks the Python file system modules"; homepage = "http://pyfakefs.org/"; - changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/master/CHANGES.md"; + changelog = "https://github.com/jmcgeheeiv/pyfakefs/blob/v${version}/CHANGES.md"; license = licenses.asl20; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index 4470ac383042a..4b6de769859b4 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -1,20 +1,30 @@ { lib , buildPythonPackage , fetchPypi + +# build-system +, setuptools + +# dependencies +, importlib-metadata + +# optional-dependencies , lxml , cairosvg + +# tests , pyquery , pytestCheckHook }: buildPythonPackage rec { pname = "pygal"; - version = "3.0.0"; - format = "setuptools"; + version = "3.0.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KSP5XS5RWTCqWplyGdzO+/PZK36vX8HJ/ruVsJk1/bI="; + hash = "sha256-bF2jPxBB6LMMvJgPijSRDZ7cWEuDMkApj2ol32VCUok="; }; postPatch = '' @@ -22,6 +32,14 @@ buildPythonPackage rec { --replace pytest-runner "" ''; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + importlib-metadata + ]; + passthru.optional-dependencies = { lxml = [ lxml ]; png = [ cairosvg ]; @@ -38,6 +56,8 @@ buildPythonPackage rec { ''; meta = with lib; { + changelog = "https://github.com/Kozea/pygal/blob/${version}/docs/changelog.rst"; + downloadPage = "https://github.com/Kozea/pygal"; description = "Sexy and simple python charting"; homepage = "http://www.pygal.org"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index ad506999d5958..ab5727b33add7 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -1,17 +1,39 @@ -{ stdenv, lib, substituteAll, fetchFromGitHub, buildPythonPackage, python, pkg-config, libX11 -, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig -, AppKit +{ stdenv +, lib +, substituteAll +, fetchFromGitHub +, buildPythonPackage , pythonOlder + +# build-system +, cython_3 +, setuptools +, pkg-config + +# native dependencies +, AppKit +, fontconfig +, freetype +, libjpeg +, libpng +, libX11 +, portmidi +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf + +# tests +, python }: buildPythonPackage rec { pname = "pygame"; - version = "2.5.1"; + version = "2.5.2"; + pyproject = true; disabled = pythonOlder "3.6"; - format = "setuptools"; - src = fetchFromGitHub { owner = pname; repo = pname; @@ -19,7 +41,7 @@ buildPythonPackage rec { # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The documentation # has such files and will be removed. - hash = "sha256-0mVbjfNYTfuo8uyd7NFKlneUZMt78mcitQ5nCgPxmFs="; + hash = "sha256-+gRv3Rim+2aL2uhPPGfVD0QDgB013lTf6wPx8rOwgXg="; postFetch = "rm -rf $out/docs/reST"; }; @@ -46,12 +68,22 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pkg-config SDL2 + cython_3 + pkg-config + SDL2 + setuptools ]; buildInputs = [ - SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg - portmidi libX11 freetype + freetype + libjpeg + libpng + libX11 + portmidi + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 5505b1c3a83fd..50211bda64002 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.13.0"; + version = "1.13.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bd43Q2+rFCZK09bLxarj/VVeualoCnv91uVkzXe14rg="; + hash = "sha256-AlfGJgEeSvuZvbIIdUQ/cG+EIB1MkmN/AiFbmOrBPe0="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/pygithub/default.nix b/pkgs/development/python-modules/pygithub/default.nix index cbfacc2c4f362..1efcb940f1a4b 100644 --- a/pkgs/development/python-modules/pygithub/default.nix +++ b/pkgs/development/python-modules/pygithub/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-ysa1RAWuFFQCF6bYwAUVFou7nxCKHLZbUtrUtXiSpPk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyglm/default.nix b/pkgs/development/python-modules/pyglm/default.nix index f5d0d0aa21623..17fe906a47c5f 100644 --- a/pkgs/development/python-modules/pyglm/default.nix +++ b/pkgs/development/python-modules/pyglm/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyglm"; - version = "2.7.1"; + version = "2.7.1-rev1"; pyproject = true; src = fetchFromGitHub { owner = "Zuzu-Typ"; repo = "PyGLM"; rev = "refs/tags/${version}"; - hash = "sha256-nCkwYZLibQcmlF1Nvv2I6qi+97ue7Q1HVxpw32G5qpo="; + hash = "sha256-MA/NoeKv6yxXL9A36SBqU7GNuPbCKDvxpOkWP8OmED4="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/pygmars/default.nix b/pkgs/development/python-modules/pygmars/default.nix index e186cd99d98d7..1cfa0838dac82 100644 --- a/pkgs/development/python-modules/pygmars/default.nix +++ b/pkgs/development/python-modules/pygmars/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-PiH1lV1Vt9VTSOB+jep8FHIdk8qnauxj4nP3CIi/m7o="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' # https://github.com/nexB/pygmars/pull/9 substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/pygments/default.nix b/pkgs/development/python-modules/pygments/default.nix index f2b89cbcefd50..4be48e1c93309 100644 --- a/pkgs/development/python-modules/pygments/default.nix +++ b/pkgs/development/python-modules/pygments/default.nix @@ -3,7 +3,7 @@ , fetchPypi # build-system -, setuptools +, hatchling # tests , pytestCheckHook @@ -13,17 +13,16 @@ let pygments = buildPythonPackage rec { pname = "pygments"; - version = "2.16.1"; - format = "pyproject"; + version = "2.17.2"; + pyproject = true; src = fetchPypi { - pname = "Pygments"; - inherit version; - hash = "sha256-Ha/wSUggxpvIlB5AeqIPV3N07og2TuEKmP2+Cuzpbik="; + inherit pname version; + hash = "sha256-2kbOyf0t5b46inhPQ05MSrZwtP9U1gXEwnF+nUnEw2c="; }; nativeBuildInputs = [ - setuptools + hatchling ]; # circular dependencies if enabled by default diff --git a/pkgs/development/python-modules/pygti/default.nix b/pkgs/development/python-modules/pygti/default.nix index 6db8efa7aa310..5c7631a31c3ef 100644 --- a/pkgs/development/python-modules/pygti/default.nix +++ b/pkgs/development/python-modules/pygti/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ aiohttp pytz diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index f9111d7f74081..951bd81e02e85 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhamcrest"; - version = "2.0.4"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "hamcrest"; repo = "PyHamcrest"; rev = "refs/tags/V${version}"; - hash = "sha256-CIkttiijbJCR0zdmwM5JvFogQKYuHUXHJhdyWonHcGk="; + hash = "sha256-VkfHRo4k8g9/QYG4r79fXf1NXorVdpUKUgVrbV2ELMU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix index a5b58dc5cdaef..1600baba392d6 100644 --- a/pkgs/development/python-modules/pyheos/default.nix +++ b/pkgs/development/python-modules/pyheos/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pytest-asyncio , pytestCheckHook }: @@ -25,6 +26,10 @@ buildPythonPackage rec { disabledTests = [ # accesses network "test_connect_timeout" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # stuck in epoll + "test_disconnect" + "test_commands_fail_when_disconnected" ]; pythonImportsCheck = [ "pyheos" ]; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 76197c47c2fdb..1019d573a46e5 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -44,7 +44,6 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - SETUPTOOLS_SCM_PRETEND_VERSION = version; CMAKE_ARGS = [ "-DEXTERNAL_PYBIND11=ON" ]; preBuild = '' diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index 901bec161445b..c44bfcd29974b 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pyicu"; - version = "2.11"; + version = "2.12"; format = "setuptools"; src = fetchPypi { pname = "PyICU"; inherit version; - hash = "sha256-OrUxJkz+kTKz0qxdcI2ppGSdJfbmgTcwrIjPBAoIqEQ="; + hash = "sha256-vXq176k61pLm2qKc0kk2TlISGDKSIXJqETyjyygchhE="; }; nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 0841559769212..13a5a9e8f9d84 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-OvWdKr8RlXRnAUMHSPhJDacvKeRa8QGPmGPQWLG2ouk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.py \ --replace 'version_format="{tag}"' 'version="${version}"' diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index cef52b754ad6f..aca1907ef5376 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , cryptography , pytestCheckHook , pythonOlder @@ -32,6 +33,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools sphinxHook sphinx-rtd-theme zope_interface diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 385239b5ad521..76e2711ee18c2 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM=="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 0ba615277e360..46e4b24ceef66 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -1,25 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, pytestCheckHook, openmp }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, cython_3 +, numpy +, setuptools + +# native dependencies +, openmp + +# tests +, pytestCheckHook +}: buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.7.post0"; - format = "setuptools"; + version = "1.3.10"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-7KHWHTPbYh74An62ka6I25xl0ZarpLLMkMGQy5C7UI4="; + hash = "sha256-QefF1mnK3CGIrMS7tLC03K9JLYRRLx5lF6erLRIskR0="; }; - buildInputs = [ openmp ]; + nativeBuildInputs = [ + cython_3 + numpy + setuptools + ]; + + buildInputs = [ + openmp + ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; preCheck = '' # make sure we don't import pykdtree from the source tree mv pykdtree tests ''; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 54fabf00b0b87..9d4ef111f7e1a 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-6yxsqruosSOJ5LeIBbvuEko4s9qU/ObNZiJD5YH/hvY="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 978394e60e27a..d12e7268a24f8 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.3"; + version = "2.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = "v${version}"; - hash = "sha256-5xEXjNMkOetRM9NDz0S4DsC6v39YQi34s2s+Fs56hYU="; + rev = "refs/tags/v${version}"; + hash = "sha256-MNgu3LvFoohXA+JzUiHIaYFw0ssEe+H5T8Ea56LcGuI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index d4a89aa000bf5..948b2afc5a15b 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , astroid , dill @@ -19,40 +18,24 @@ , pytest-timeout , pytest-xdist , pytestCheckHook -, wheel }: buildPythonPackage rec { pname = "pylint"; - version = "2.17.5"; - format = "pyproject"; + version = "3.0.3"; + pyproject = true; - disabled = pythonOlder "3.7.2"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pylint-dev"; - repo = pname; - rev = "v${version}"; - hash = "sha256-cmH6Q6/XJXx8EXDIsik1Aheu9hYGvvlNvWBUCdmC3P8="; + repo = "pylint"; + rev = "refs/tags/v${version}"; + hash = "sha256-JwSzit4oDxAqrQFlvTNF7lrirhaHbJ15MRKbl7c7bEg="; }; - patches = [ - (fetchpatch { - name = "update-setuptools.patch"; - url = "https://github.com/pylint-dev/pylint/commit/1d029b594aa258fa01570632d001e801f9257d60.patch"; - hash = "sha256-brQwelZVkSX9h0POH8OJeapZuWZ8p7BY/ZzhYzGbiHY="; - }) - # https://github.com/pylint-dev/pylint/pull/8961 - (fetchpatch { - name = "unpin-setuptools.patch"; - url = "https://github.com/pylint-dev/pylint/commit/a0ac282d6f8df381cc04adc0a753bec66fc4db63.patch"; - hash = "sha256-15O72LE2WQK590htNc3jghdbVoGLHUIngERDpqT8pK8="; - }) - ]; - nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ @@ -123,6 +106,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://pylint.readthedocs.io/en/stable/"; description = "A bug and style checker for Python"; + changelog = "https://github.com/pylint-dev/pylint/releases/tag/v${version}"; longDescription = '' Pylint is a Python static code analysis tool which looks for programming errors, helps enforcing a coding standard, sniffs for code smells and offers simple diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 3a58796331143..3d4ed41414736 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.7"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-ZsNIw0xjxnU9Ue0C7TlhzVOCOCKEbCa2CsiiqeMb14I="; + hash = "sha256-oEWUXkE8U7/ye6puJZRSkQFi10BPGuc8XZQbHwqOPEI="; }; patches = [ diff --git a/pkgs/development/python-modules/pylsqpack/default.nix b/pkgs/development/python-modules/pylsqpack/default.nix index 54123b656e1b2..f1e595f88b472 100644 --- a/pkgs/development/python-modules/pylsqpack/default.nix +++ b/pkgs/development/python-modules/pylsqpack/default.nix @@ -1,19 +1,24 @@ { lib , fetchPypi , buildPythonPackage +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "pylsqpack"; - version = "0.3.17"; - format = "setuptools"; + version = "0.3.18"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LyB3jblW3H5LGop5ci1XpGUMRZl/tlwTUsv4XreqPOI="; + hash = "sha256-Ra5V5yGHdQX01czUlZHWk1PypUioZz36+yUdOFs8CX8="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pylsqpack" ]; diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix index 0d10efd616a4c..5e3b39dd523a7 100644 --- a/pkgs/development/python-modules/pymatting/default.nix +++ b/pkgs/development/python-modules/pymatting/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage rec { pname = "pymatting"; - version = "1.1.2"; + version = "1.1.10"; format = "setuptools"; src = fetchFromGitHub { owner = "pymatting"; repo = "pymatting"; - rev = "v${version}"; - hash = "sha256-9eRpsWwXAkp6aw1ZWJsUFf0BMIN0UBFc2rW1lltL2cw="; + rev = "refs/tags/v${version}"; + hash = "sha256-wHCTqcBvVN/pTXH3iW57DPpMEsnehutRQB5NaugS6Zs="; }; patches = [ ./01-kdtree-signature.patch ]; diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix index f6fea35270e5a..3a06e511a344f 100644 --- a/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -44,14 +44,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "10.3"; + version = "10.5"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; rev = "refs/tags/${version}"; - hash = "sha256-R35R2dHfjcVQbEa2319FEMjPGl1Y5/u2KEHeR0wTYEo="; + hash = "sha256-S9xnGzX9VHRWDfrlIVcywiyuyyxIFYitwTMdGZ2NEqo="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index b1605fac01b5a..f62b039bbb45b 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.3.0"; + version = "2.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,11 +28,9 @@ buildPythonPackage rec { owner = "milvus-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hp00iUT1atyTQk532z7VAajpfvtnKE8W2la9MW7NxoE="; + hash = "sha256-qnm6JaeF2Li2NgVGZ6yJ2yz1n3pVZqkF4Ee+q4v/kdA="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonRelaxDeps = [ "grpcio" ]; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index bb6196f775a23..6d69cc3556c49 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pymongo"; - version = "4.5.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aB8lLkOz7wVMqRYWNfgbcw9NjK3Siz8rIAT1py+FOYI="; + hash = "sha256-Mdqx8+HQzdV+jfAbZF9S1DzBtlPtOv1TXSiR9PxPlxI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 1c21e6b90c1a4..fb9603c18d5fb 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -3,10 +3,15 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, pytestCheckHook , python + +# build-system +, libclang +, psutil +, setuptools , swig -, mupdf + +# native dependencies , freetype , harfbuzz , openjpeg @@ -14,7 +19,13 @@ , libjpeg_turbo , gumbo , memstreamHook + +# dependencies +, mupdf + +# tests , fonttools +, pytestCheckHook }: let @@ -22,21 +33,31 @@ let mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; in buildPythonPackage rec { pname = "pymupdf"; - version = "1.23.6"; - format = "setuptools"; + version = "1.23.7"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pymupdf"; repo = "PyMuPDF"; - rev = version; - hash = "sha256-60KT5+EGP+s7HD4UIeaf9x2QVNU9IUbC5WKEJbrIBCI="; + rev = "refs/tags/${version}"; + hash = "sha256-XVf9nKbcTS/rxRCD2u5u8ecCf0bWZ3FXXN/YulI9etU="; }; + # swig is not wrapped as python package + # libclang calls itself just clang in wheel metadata + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"swig",' "" \ + --replace "libclang" "clang" + ''; + nativeBuildInputs = [ - pytestCheckHook + libclang swig + psutil + setuptools ]; buildInputs = [ @@ -69,13 +90,16 @@ in buildPythonPackage rec { done ''; - checkInputs = [ + nativeCheckInputs = [ + pytestCheckHook fonttools ]; disabledTests = [ # fails for indeterminate reasons "test_color_count" + "test_2753" + "test_2548" ] ++ lib.optionals stdenv.isDarwin [ # darwin does not support OCR right now "test_tesseract" diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index c61063058a3d5..6a240c8bf213c 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-rYqwZIqcNeSpXsICL8WGLJ3Tcnwnnm6gvRBEJ/5iE/Q="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index 91d39a4ab0a22..172b853d96bca 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -52,5 +52,7 @@ buildPythonPackage rec { homepage = "https://github.com/yezz123/pyngo"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; + # https://github.com/yezz123/pyngo/issues/70 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 0038db89f6cc9..bddd7fa9b73c1 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , pythonOlder , fetchPypi +, setuptools , pyyaml }: buildPythonPackage rec { pname = "pyngrok"; version = "7.0.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,6 +18,10 @@ buildPythonPackage rec { hash = "sha256-RNi0ivQKsLb/JD9+vdJYGf5HDC6BmeNdseR2OU8v1uY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 6c7f1c0f59a2f..34a6f158f1217 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.9"; + version = "1.0.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hlN5uUlgmcipQqmr22rB245oEXOUe5WB9jWo7MXXViE="; + hash = "sha256-JyK3ldIhKd3VJHA4u6cnrgbs2zpZQgcIF758jUpoDjE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index fb796ab6c331b..9817ba9935d9b 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.10"; + version = "0.5.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-XV3Gg8A+9V/j3faThZcgyhj4XG5uW7C08UhwJ41SiK0="; + hash = "sha256-b0TO2dWp2iyH2bL/8wu1MIVAwGV2BeTVzeftMnW7rVA="; }; patches = [ diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 8dc1ee0f8780a..407166e98c901 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -34,8 +34,6 @@ buildPythonPackage rec { }) ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ pillow ]; nativeBuildInputs = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index d8cf1f260da2e..b20d4618167db 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.39"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - hash = "sha256-5Si7cN1tYpnuQphokl3whm4+kZx3K57/ecjheSDY8RY="; + hash = "sha256-A9fQsE1akVYJnOjQPpLzlWeDdG+pI0629bXPwStkUBE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index 428bd4084ae0b..10333862bb8db 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pyopengl"; - version = "3.1.6"; + version = "3.1.7"; format = "setuptools"; src = fetchPypi { pname = "PyOpenGL"; inherit version; - hash = "sha256-jqbIdzkn7adAW//G9buTvoFWmnsFyMrFDNlOlp3OXic="; + hash = "sha256-7vMaOIjmmE/U2ObJlhsYTJgTyoJgTTf+PagOsACnbIY="; }; propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index bc841cc2fd4e0..611666e851d3a 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pyopenssl"; - version = "23.2.0"; + version = "23.3.0"; format = "setuptools"; src = fetchPypi { pname = "pyOpenSSL"; inherit version; - hash = "sha256-J2+TH1WkUufeppxxc+mE6ypEB85BPJGKo0tV+C+bi6w="; + hash = "sha256-ayy6XMRugidQ7D5age4SgZhQsRMDYw1XXpgQigecKxI="; }; outputs = [ diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix index c57fd7f12276b..ed969bb4c220e 100644 --- a/pkgs/development/python-modules/pyopenuv/default.nix +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -3,6 +3,7 @@ , aresponses , backoff , buildPythonPackage +, certifi , fetchFromGitHub , poetry-core , pytest-aiohttp @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp backoff + certifi ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 40090532fea1b..d35b5d7241b6e 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyosmium"; - version = "3.6.0"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; + hash = "sha256-DBFDAKNrD93MRXjoM8dIJQ/HJ9Aj8oMJuPVQxTrKYfI="; }; patches = [ diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index e621a80d7acd5..9fbf388e7d2dd 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyparsing"; - version = "3.0.9"; + version = "3.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pyparsing"; repo = pname; - rev = "pyparsing_${version}"; - hash = "sha256-aCRyJQyLf8qQ6NO41q+HC856TjIHzIt0vyVBLV+3teE="; + rev = "refs/tags/${version}"; + hash = "sha256-54XMw5ahMZH4cevTFg2GXhgSu0QX1mfITWFezWirt1E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index df58a17aee206..def7c354fec69 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "3.16.0"; + version = "3.17.1"; format = "pyproject"; src = fetchFromGitHub { @@ -34,7 +34,7 @@ buildPythonPackage rec { rev = "refs/tags/${version}"; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-vE5ujknMpufBuwWqtjkLegTRe4eDAvBVPCVM6It2pHQ="; + hash = "sha256-KQPCPs5Rbs11J4LYuksQchwqqulQlmsA/KPvNcXFLxQ="; }; outputs = [ @@ -87,6 +87,8 @@ buildPythonPackage rec { disabledTests = [ # requires fpdf2 which we don't package yet "test_compression" + # infinite recursion when including fpdf2 + "test_merging_many_temporary_files" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyproject-api/default.nix b/pkgs/development/python-modules/pyproject-api/default.nix index 4ba62fc1e3101..efcc356320152 100644 --- a/pkgs/development/python-modules/pyproject-api/default.nix +++ b/pkgs/development/python-modules/pyproject-api/default.nix @@ -44,8 +44,6 @@ buildPythonPackage rec { "doc" ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/pyprusalink/default.nix b/pkgs/development/python-modules/pyprusalink/default.nix index 97fff5b0687cd..0a1d8afc3bd1c 100644 --- a/pkgs/development/python-modules/pyprusalink/default.nix +++ b/pkgs/development/python-modules/pyprusalink/default.nix @@ -2,16 +2,14 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "pyprusalink"; - version = "1.1.0"; - format = "pyproject"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,21 +17,11 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XRtbb7kceiqi8pioTWStRo0drCtQfy1t62jCMihlIec="; + hash = "sha256-wboyISggzC50cZ+J/NC0ytWXwCLBmBpP9/MtPkRb+Zs="; }; - patches = [ - # https://github.com/home-assistant-libs/pyprusalink/pull/55 - (fetchpatch { - name = "unpin-setuptools-dependency.patch"; - url = "https://github.com/home-assistant-libs/pyprusalink/commit/8efc3229c491a1763456f0f4017251d5789c6d0a.patch"; - hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs="; - }) - ]; - nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ @@ -50,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with PrusaLink "; homepage = "https://github.com/home-assistant-libs/pyprusalink"; + changelog = "https://github.com/home-assistant-libs/pyprusalink/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pypytools/default.nix b/pkgs/development/python-modules/pypytools/default.nix index ecc86e4fe2f89..870768dc81129 100644 --- a/pkgs/development/python-modules/pypytools/default.nix +++ b/pkgs/development/python-modules/pypytools/default.nix @@ -2,18 +2,20 @@ , buildPythonPackage , fetchpatch , fetchPypi +, attrs , freezegun , numpy , py , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pypytools"; version = "0.6.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +24,13 @@ buildPythonPackage rec { hash = "sha256-oUDAU+TRwLroNfQGYusAQKdRkHcazysqiDLfp77v5Sk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + # attrs is an implicit dependency + attrs py ]; diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index ad1ed8e170381..1bf96713a4fe5 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.15.3"; + version = "1.15.4"; format = "pyproject"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - hash = "sha256-WzPpnty3fUpjo4YF9EV6BM/04lTHce1SnryViZBszbE="; + hash = "sha256-OfjHXbF9nOF8trvz3xZQtc68HqTlvXOEPSHMlmErKuE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqt/sip.nix b/pkgs/development/python-modules/pyqt/sip.nix index ea8a518afd0db..3702bad5cac7a 100644 --- a/pkgs/development/python-modules/pyqt/sip.nix +++ b/pkgs/development/python-modules/pyqt/sip.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pyqt5-sip"; - version = "12.11.0"; + version = "12.13.0"; src = fetchPypi { pname = "PyQt5_sip"; inherit version; - hash = "sha256-tHEP2FtX7e9xbMVfrkW/1b+sb8e6kQNvHcw/Mxyg6zk="; + hash = "sha256-fzIdr4S5ydvKYbgOHvN72v/A6TMS7a4s19oluVOXHZE="; }; # There is no test code and the check phase fails with: diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 699bcd0fbc592..f1de975c418bf 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -4,6 +4,7 @@ , fetchPypi , lxml , pytestCheckHook +, pythonAtLeast , pythonOlder , requests , webob @@ -52,6 +53,11 @@ buildPythonPackage rec { "--deselect=tests/test_pyquery.py::TestWebScrappingEncoding::test_get" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/gawel/pyquery/issues/249 + "pyquery.pyquery.PyQuery.serialize_dict" + ]; + meta = with lib; { description = "A jquery-like library for Python"; homepage = "https://github.com/gawel/pyquery"; diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index c822014dd843f..f980365202dd8 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.5.4"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GQ7vzuUu0PCeLkqKWUSNJyJ01wseOwNL2jJaVTNGF9s="; + hash = "sha256-LLhTK/wE42mBTrqjBbnkPvqSG8gP7Vx/3ip66hKHxXc="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix index 3aa0d42e2d508..0b3218e190a44 100644 --- a/pkgs/development/python-modules/pyrate-limiter/default.nix +++ b/pkgs/development/python-modules/pyrate-limiter/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyrate-limiter"; - version = "2.10.0"; + version = "3.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "vutran1710"; repo = "PyrateLimiter"; - rev = "v${version}"; - hash = "sha256-CPusPeyTS+QyWiMHsU0ii9ZxPuizsqv0wQy3uicrDw0="; + rev = "refs/tags/v${version}"; + hash = "sha256-WL+nNk68NaK36Lwalj23ugiSuB5acSLumLJGQaXE06A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index 6f1affd9063ee..4d875032ef94c 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -32,9 +32,7 @@ buildPythonPackage rec { hash = "sha256-r2STKnZwNvonXATrQ5q9NVD9QftlWI1RWl4F+GZSxVg="; }; - env = { - SETUPTOOLS_SCM_PRETEND_VERSION = version; - } // lib.optionalAttrs stdenv.cc.isClang { + env = lib.optionalAttrs stdenv.cc.isClang { # Try to remove on next update. generated code returns a NULL in a # function where an int is expected. NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index 9885d4f5443fa..9345b819f75cc 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -1,21 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder + +# build-system +, setuptools + +# dependencies , pytz + +# tests , nose }: buildPythonPackage rec { pname = "pyRFC3339"; version = "1.1"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "06jv7ar7lpvvk0dixzwdr3wgm0g1lipxs429s2z7knwwa7hwpf41"; }; - propagatedBuildInputs = [ pytz ]; - buildInputs = [ nose ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pytz + ]; + + doCheck = pythonOlder "3.12"; + + nativeCheckInputs = [ + nose + ]; meta = with lib; { description = "Generate and parse RFC 3339 timestamps"; diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index 888ad2f43ceb0..60415585b1cdf 100644 --- a/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -42,6 +42,11 @@ buildPythonPackage rec { pytest-httpx ]; + disabledTests = [ + # should fail, but times out + "test__query_rmv_api_fail" + ]; + patches = [ # Can be removed with next release, https://github.com/cgtobi/PyRMVtransport/pull/55 (fetchpatch { diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index b9669e41d3b22..99fb8bec5f095 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -1,37 +1,59 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast + +# build-system +, setuptools + +# dependencies +, build , docutils -, python +, flit-core +, packaging , pygments -, setuptools , requests +, trove-classifiers + +# test +, pytestCheckHook }: buildPythonPackage rec { pname = "pyroma"; - version = "3.2"; - format = "setuptools"; + version = "4.2"; + pyproject = true; + + # https://github.com/regebro/pyroma/issues/104 + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "regebro"; - repo = pname; + repo = "pyroma"; rev = version; - sha256 = "0ln9w984n48nyxwzd1y48l6b18lnv52radcyizaw56lapcgxrzdr"; + sha256 = "sha256-ElSw+bY6fbHJPTX7O/9JZ4drttfbUQsU/fv3Cqqb/J4="; }; propagatedBuildInputs = [ + build docutils + flit-core + packaging pygments setuptools requests + trove-classifiers + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; - # https://github.com/regebro/pyroma/blob/3.2/Makefile#L23 - # PyPITest requires network access - checkPhase = '' - ${python.interpreter} -m unittest -k 'not PyPITest' pyroma.tests - ''; + disabledTests = [ + # tries to reach pypi + "test_complete" + "test_distribute" + ]; pythonImportsCheck = [ "pyroma" ]; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index 2f21caa001d39..fae4bba430d36 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 +, setuptools , six , pytestCheckHook , hypothesis @@ -9,26 +10,24 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.19.3"; - format = "setuptools"; + version = "0.20.0"; + pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-GimUdzcGu7SZXDGpe8lPFBgxSSO9EEjG2WSDcEA3ZEA="; + hash = "sha256-TEj3j2KrWWxnkIYITQ3RMlSuTz1scqg//fXr3vjyZaQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ]; nativeCheckInputs = [ pytestCheckHook hypothesis ]; - postPatch = '' - substituteInPlace setup.py \ - --replace 'pytest<5' 'pytest' \ - --replace 'hypothesis<5' 'hypothesis' - ''; - pythonImportsCheck = [ "pyrsistent" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pysam/default.nix b/pkgs/development/python-modules/pysam/default.nix index 50661d9246919..d2887eda58474 100644 --- a/pkgs/development/python-modules/pysam/default.nix +++ b/pkgs/development/python-modules/pysam/default.nix @@ -4,19 +4,20 @@ , bzip2 , bcftools , curl -, cython +, cython_3 , htslib , libdeflate , xz , pytestCheckHook +, setuptools , samtools , zlib }: buildPythonPackage rec { pname = "pysam"; - version = "0.21.0"; - format = "setuptools"; + version = "0.22.0"; + pyproject = true; # Fetching from GitHub instead of PyPi cause the 0.13 src release on PyPi is # missing some files which cause test failures. @@ -25,10 +26,14 @@ buildPythonPackage rec { owner = "pysam-developers"; repo = "pysam"; rev = "refs/tags/v${version}"; - hash = "sha256-C4/AJwcUyLoUEUEnsATLHJb5F8mltP8X2XfktYu0OTo="; + hash = "sha256-TLqZF5NS9ROH8z7c2ZxfOYNRIe5pabMNBuhQ4azFmDU="; }; - nativeBuildInputs = [ samtools ]; + nativeBuildInputs = [ + cython_3 + samtools + setuptools + ]; buildInputs = [ bzip2 @@ -38,8 +43,6 @@ buildPythonPackage rec { zlib ]; - propagatedBuildInputs = [ cython ]; - # Use nixpkgs' htslib instead of the bundled one # See https://pysam.readthedocs.io/en/latest/installation.html#external # NOTE that htslib should be version compatible with pysam @@ -73,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python module for reading, manipulating and writing genome data sets"; + downloadPage = "https://github.com/pysam-developers/pysam"; homepage = "https://pysam.readthedocs.io/"; maintainers = with maintainers; [ unode ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index d4b8d2970a1ee..7cd43cf609f1a 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-arodPjiigEx90W8ycneD8Ho6SLQaB9FfFtdV74fZp2w="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix index 3edc3b57cc4de..42854750bbbbf 100644 --- a/pkgs/development/python-modules/pysmart/default.nix +++ b/pkgs/development/python-modules/pysmart/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-1k+5XnIT/AfZmzKUxkyU/uc0eW05CvugpY6OdJCoALc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pySMART/utils.py \ --replace "which('smartctl')" '"${smartmontools}/bin/smartctl"' diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 67dae25bdd025..0f16f4503d192 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp , async-timeout , bitstring , buildPythonPackage @@ -27,6 +28,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp async-timeout bitstring pyserial-asyncio diff --git a/pkgs/development/python-modules/pysolcast/default.nix b/pkgs/development/python-modules/pysolcast/default.nix index f4121a53e7948..5e740e78e6a87 100644 --- a/pkgs/development/python-modules/pysolcast/default.nix +++ b/pkgs/development/python-modules/pysolcast/default.nix @@ -1,4 +1,5 @@ { lib +, anyconfig , buildPythonPackage , fetchFromGitHub , isodate @@ -29,6 +30,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + anyconfig isodate pyyaml requests diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 650af9af50a6b..ae1d4f2d1beb7 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -8,13 +8,14 @@ , pytest-mock , pytestCheckHook , pythonOlder +, setuptools , glibcLocales }: buildPythonPackage rec { pname = "pyspnego"; - version = "0.9.2"; - format = "setuptools"; + version = "0.10.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,14 +23,29 @@ buildPythonPackage rec { owner = "jborean93"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A0vVpEI8TKelZ96dIqSc01SX1gU3pDUVSOV6jap2WtU="; + hash = "sha256-60aIRrhRynbuuFZzzBhJTlmU74CWuao8jWhr126cPrc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography - gssapi - krb5 - ruamel-yaml + ]; + + passthru.optional-dependencies = { + kerberos = [ + gssapi + krb5 + ]; + yaml = [ + ruamel-yaml + ]; + }; + + pythonImportsCheck = [ + "spnego" ]; nativeCheckInputs = [ @@ -38,16 +54,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # struct.error: unpack requires a buffer of 1 bytes - "test_credssp_invalid_client_authentication" - ]; - - LC_ALL = "en_US.UTF-8"; - - pythonImportsCheck = [ "spnego" ]; + env.LC_ALL = "en_US.UTF-8"; meta = with lib; { + changelog = "https://github.com/jborean93/pyspnego/blob/v${version}/CHANGELOG.md"; description = "Python SPNEGO authentication library"; homepage = "https://github.com/jborean93/pyspnego"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pystardict/default.nix b/pkgs/development/python-modules/pystardict/default.nix index 4e5cbd64e4b62..c36dac0e7ae2e 100644 --- a/pkgs/development/python-modules/pystardict/default.nix +++ b/pkgs/development/python-modules/pystardict/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { hash = "sha256-YrZpIhyxfA3G7rP0SJ+EvzGwAXlne80AYilkj6cIDnA="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ six ]; nativeBuildInputs = [ setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix index 34f6de519266a..a8f8774256b7f 100644 --- a/pkgs/development/python-modules/pysuez/default.nix +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , setuptools +, regex , requests , pythonOlder }: @@ -20,11 +21,17 @@ buildPythonPackage rec { hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'datetime'" "" + ''; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ + regex requests ]; diff --git a/pkgs/development/python-modules/pytautulli/default.nix b/pkgs/development/python-modules/pytautulli/default.nix index 5d2c51675c43b..ae39788541e22 100644 --- a/pkgs/development/python-modules/pytautulli/default.nix +++ b/pkgs/development/python-modules/pytautulli/default.nix @@ -27,6 +27,10 @@ buildPythonPackage rec { # are not in their focus substituteInPlace setup.py \ --replace 'version="main",' 'version="${version}",' + + # yarl 1.9.4 requires ports to be ints + substituteInPlace pytautulli/models/host_configuration.py \ + --replace "str(self.port)" "int(self.port)" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 9cd6ec0491a92..85dd9b7bf5375 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { wheel ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 3b1def125e0f0..1a83d0ed064f2 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { --replace '/usr/bin/env' '${coreutils}/bin/env' ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index 7984a390a6883..2fc73552d5495 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -9,18 +9,16 @@ buildPythonPackage rec { pname = "pytest-arraydiff"; - version = "0.5.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "714149beffd0dfa085477c65791c1139b619602b049536353ce1a91397fb3bd2"; + sha256 = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 40fb270b199a5..33ffb661d73ed 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -12,22 +12,25 @@ , pytest-mock , pytest-openfiles , pytest-remotedata +, setuptools , setuptools-scm , pythonOlder }: buildPythonPackage rec { pname = "pytest-astropy"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hePGbO7eTOZo9HOzzzd/yyqjxI4k8oqqN3roYATM4hE="; + hash = "sha256-Tq6qme2RFj7Y+arBMscKgfJbxMEvPNVNujKfwmxnObU="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 96179595a9aed..e373e5b1f6544 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -2,17 +2,14 @@ , buildPythonPackage , callPackage , fetchFromGitHub -, flaky -, hypothesis , pytest -, pytestCheckHook , pythonOlder , setuptools-scm }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.21.1"; + version = "0.21.1"; # N.B.: when updating, tests bleak and aioesphomeapi tests format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,8 +26,6 @@ buildPythonPackage rec { "testout" ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-cases/default.nix b/pkgs/development/python-modules/pytest-cases/default.nix index c1813c6994c4e..bbc67a2788559 100644 --- a/pkgs/development/python-modules/pytest-cases/default.nix +++ b/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.14"; - format = "setuptools"; + version = "3.8.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dFXmylelRMG/3YtWrOCMHBzkxlcqiquPG9NR3CWhC2s="; + hash = "sha256-Sdf2+K1TTlpuc/uPX9OJhmBvF7Ru5V9+vuB6VcZ3ygE="; }; nativeBuildInputs = [ @@ -33,11 +33,6 @@ buildPythonPackage rec { makefun ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "pytest-runner" "" - ''; - # Tests have dependencies (pytest-harvest, pytest-steps) which # are not available in Nixpkgs. Most of the packages (decopatch, # makefun, pytest-*) have circular dependencies. diff --git a/pkgs/development/python-modules/pytest-console-scripts/default.nix b/pkgs/development/python-modules/pytest-console-scripts/default.nix index 5170a7a902acd..81b31c256cfdf 100644 --- a/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-WoJu2EzAr6IC655EOB19di973ajgwj+feafx9Ez0qJU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index 90b7e6f55e2b8..4adaee73ceaee 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 048bd9d483380..a9c8743badf85 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -1,29 +1,55 @@ { lib , buildPythonPackage , fetchPypi -, pytest , django +, setuptools , setuptools-scm , django-configurations +, pytest +, pytestCheckHook , pytest-xdist -, six }: buildPythonPackage rec { pname = "pytest-django"; - version = "4.5.2"; - format = "setuptools"; + version = "4.7.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "d9076f759bb7c36939dbdd5ae6633c18edfc2902d1a69fdbefd2426b970ce6c2"; + hash = "sha256-ktb9RrHXm1T7awYLuzlCgHM5bOxxfV8uEiqZDUtqpeg="; }; - nativeBuildInputs = [ pytest setuptools-scm ]; - nativeCheckInputs = [ pytest django-configurations pytest-xdist six ]; - propagatedBuildInputs = [ django ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + buildInputs = [ + pytest + ]; + + propagatedBuildInputs = [ + django + ]; + + nativeCheckInputs = [ + django-configurations + pytestCheckHook + pytest-xdist + ]; + + preCheck = '' + # bring pytest_django_test module into PYTHONPATH + export PYTHONPATH="$(pwd):$PYTHONPATH" + + # test the lightweight sqlite flavor + export DJANGO_SETTINGS_MODULE="pytest_django_test.settings_sqlite" + ''; - # Complicated. Requires Django setup. - doCheck = false; + disabledTests = [ + # AttributeError: type object 'TestLiveServer' has no attribute '_test_settings_before_run' + "test_settings_restored" + ]; meta = with lib; { description = "py.test plugin for testing of Django applications"; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 92ed531c6fbf6..c5589f1cccd4b 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-env"; - version = "1.0.1"; + version = "1.1.3"; format = "pyproject"; src = fetchPypi { pname = "pytest_env"; inherit version; - hash = "sha256-YD/iFujgOl0TSYnLQTF8Waq+8BPSJQxxuGSrB5j75vY="; + hash = "sha256-/NfcI7tx79PTVjK94bvl7oyNxEidZhf7AQZ0iA2WIWs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index e4727abadb7c4..2aa92cc3e21f6 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { wheel ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 3375a7a0a0bd4..6d4233e043b17 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -11,12 +11,12 @@ }: let pname = "pytest-html"; - version = "4.0.2"; + version = "4.1.1"; src = fetchPypi { pname = "pytest_html"; inherit version; - hash = "sha256-iGgrno5ROSRyVGpwohObJ9a8GDSkr9PkHaM8nZ+R5KQ="; + hash = "sha256-cKAeiuWAD0oHS1akyxAlyPT5sDi7pf4x48mOuZZobwc="; }; web-assets = buildNpmPackage { diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 01ef1025904e6..2c825897edb10 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "csernazs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-bjysG+7niSUBl8YMWR8pr7oOz9GDbSfq3PeloYBkq3s="; + hash = "sha256-hbhS1kL5VNiGjvnYkDI1LwgkqqfBMqgcao3zy716q+A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index dbcfafc0a5fed..186c81a93c602 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -7,24 +7,26 @@ , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, setuptools }: buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.25.0"; - format = "setuptools"; + version = "0.27.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-8cuXsHyS9OaYXzKXgwan+mBFocyr39B9G8wr8I1pmg4="; + hash = "sha256-5CDmIjehW9/aBxoFVbo8W2fAwgIrPPxEqHQjxsTPlpY="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 4ab9c74be35e7..d550b4b274693 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pytest-localserver"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-XZDOfQhddB51n6hU29LnxbVXMh1pUXmJTrQOIQ6i/zA="; + hash = "sha256-ZlacNP7zGldQsW7/0c0SiKepC1kVXQBef5FqzNPe5PE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-logdog/default.nix b/pkgs/development/python-modules/pytest-logdog/default.nix index f9bd63d8ee66a..176bde51525b3 100644 --- a/pkgs/development/python-modules/pytest-logdog/default.nix +++ b/pkgs/development/python-modules/pytest-logdog/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 260c71ac71ff5..f956a62e1a5a0 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -1,28 +1,31 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchPypi -, fetchpatch , pytest , pytest-asyncio , pytestCheckHook +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "pytest-mock"; - version = "3.11.1"; + version = "3.12.0"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "setuptools"; - src = fetchPypi { inherit pname version; - hash = "sha256-f2sSVgKsbXQ+Ujrgv6ceGml6L1U0BkUoxv+EwvfC/H8="; + hash = "sha256-MaQPA4wiytMih7tDkyBURR/1WD/wlLym9nXfL4vBpuk="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; buildInputs = [ pytest @@ -33,6 +36,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # Regression in 3.11.7 and 3.12.1; https://github.com/pytest-dev/pytest-mock/issues/401 + "test_failure_message_with_name" + "test_failure_message_with_no_name" + ]; + pythonImportsCheck = [ "pytest_mock" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 9e90f9533d855..f0ea49d1b7672 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { pytest ]; - SETUPTOOLS_SCM_PRETEND_VERSION=version; - propagatedBuildInputs = [ jinja2 matplotlib diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index 29ea593acc374..da894eff91e35 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , isPy27 +, packaging , pytest , pytestCheckHook , psutil @@ -19,11 +21,21 @@ buildPythonPackage rec { sha256 = "179c2911d8aee3441fee051aba08e0d9b4dab61b829ae4811906d5c49a3b0a58"; }; + patches = [ + (fetchpatch { + name = "replace-distutils-with-packaging.patch"; + url = "https://github.com/astropy/pytest-openfiles/commit/e17e8123936689b0b0ecfb713976588d6793d8bb.patch"; + includes = [ "pytest_openfiles/plugin.py" ]; + hash = "sha256-+6xqOwnBO+jxenXxPdDhLqqm3w+ZRjWeVqqgz8j22bU="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ pytest ]; propagatedBuildInputs = [ + packaging psutil ]; diff --git a/pkgs/development/python-modules/pytest-playwright/default.nix b/pkgs/development/python-modules/pytest-playwright/default.nix index 3e27b075efa7f..ff4cde9c73e5b 100644 --- a/pkgs/development/python-modules/pytest-playwright/default.nix +++ b/pkgs/development/python-modules/pytest-playwright/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-5qjfZGDM1OqXXNyj81O49ClKKGiAPdgyZZu6TgpskGs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-pytestrail/default.nix b/pkgs/development/python-modules/pytest-pytestrail/default.nix index 228e952436daa..618bccfa3bc5e 100644 --- a/pkgs/development/python-modules/pytest-pytestrail/default.nix +++ b/pkgs/development/python-modules/pytest-pytestrail/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { version = "0.10.5"; format = "setuptools"; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - src = fetchFromGitHub { owner = "tolstislon"; repo = "pytest-pytestrail"; diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index c306f8ef8f6d0..e9950b01fdf18 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonOlder , matplotlib , numpy @@ -25,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-gYx4hMHP87q/ie67AsvCezB4VrGYVCfCTVLLgSoQb9k="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; @@ -47,6 +46,15 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + + disabledTestPathss = lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: partially initialized module 'pandas' has no attribute '_pandas_datetime_CAPI' (most likely due to a circular import) + "tests/test_num_regression.py" + ]; + pythonImportsCheck = [ "pytest_regressions" "pytest_regressions.plugin" diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index bc8c89caacc14..581145212f906 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-viHFWONNfBGw9q61CVbAlSC//NArf86cb46FMaQBocg="; + hash = "sha256-BcCL9jjN0e1m6wFzihZHw8cUc3w+w6vgCdLB95O0u1k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix index 7db1992d5f852..45c08d21f3218 100644 --- a/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/pkgs/development/python-modules/pytest-repeat/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytest-repeat"; - version = "0.9.2"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eWc0Ra6ZruMzuBHH0AN660CPkzuImDdf8vT/8eO6aGs="; + hash = "sha256-/9ODbfzWe7JwvsZIszDiC+N9KWZEjEFIxAktHoq6gYU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index f030960df6553..59d459adb6c92 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-rerunfailures"; - version = "12.0"; + version = "13.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eE9GL6h/6b33gdACfYVrR6S/5sEq8Qj2vYhwV6kXtI4="; + hash = "sha256-4TLb5CC8R29US5bnA27dCmlwdXQgm2Z3JjyVDRmwkZk="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-snapshot/default.nix b/pkgs/development/python-modules/pytest-snapshot/default.nix index 7047eef03eef5..f8f207c64b6a9 100644 --- a/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-0PZu9wL29iEppLxxbl4D0E4WfOHe61KUUld003cRBRU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index 6a1d75be5315a..966ca16dd0ba3 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytest , pytestCheckHook , docutils @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -25,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; @@ -38,6 +43,10 @@ buildPythonPackage rec { anyio ]; + pytestFlagsArray = [ + "-W ignore::DeprecationWarning" + ]; + meta = with lib; { description = "A plugin to fake subprocess for pytest"; homepage = "https://github.com/aklajnert/pytest-subprocess"; diff --git a/pkgs/development/python-modules/pytest-subtests/default.nix b/pkgs/development/python-modules/pytest-subtests/default.nix index b391ece3556aa..eb292e61537da 100644 --- a/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/pkgs/development/python-modules/pytest-subtests/default.nix @@ -1,10 +1,17 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# build-system , setuptools , setuptools-scm + +# dependencies +, attrs + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -24,6 +31,10 @@ buildPythonPackage rec { setuptools-scm ]; + propagatedBuildInputs = [ + attrs + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pytest-test-utils/default.nix b/pkgs/development/python-modules/pytest-test-utils/default.nix index cf2322d39a8c1..127b0c1633561 100644 --- a/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 9064b4283ba82..c0a97dd414ac1 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-timeout"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wHygdATGEvirviIpSyPDaOLlEEtSHBeQGVVh834aw9k="; + hash = "sha256-OwuV2r88tQusnvXKkS+gz8KGUmrxevyAaCTfIML3LJA="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 243ea9781f3e6..291b10f9b1b87 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, trio, async-generator, hypothesis, outcome, pytest }: +, trio, hypothesis, outcome, pytest }: buildPythonPackage rec { pname = "pytest-trio"; @@ -18,7 +18,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ trio - async-generator outcome ]; diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index 5c260f4321612..947040fbf5fd6 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pytest-xdist"; - version = "3.3.1"; + version = "3.5.0"; disabled = pythonOlder "3.7"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1e4FIOsbe8ylCmClGKt6dweZKBLFeBmPi0T9+seOjJM="; + hash = "sha256-y7NvPWfgxHi6pX+k7ciEOIfg9s/ELWd1MKNtdHKzLYo="; }; nativeBuildInputs = [ @@ -60,6 +60,8 @@ buildPythonPackage rec { "test_rsyncignore" # flakey "test_internal_errors_propagate_to_controller" + # https://github.com/pytest-dev/pytest-xdist/issues/985 + "test_workqueue_ordered_by_size" ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 734acd5f8f4e3..601eaecd3e05c 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.22.2"; + version = "0.23.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-WZ7iW5OOjyWeGNnFtNY4SIT4pqKMpR7tMtDZUmvc93w="; + hash = "sha256-+NQEGiChwe8ZQwVOSj33rHtD5/KR9kD0PDTp3MSzTfo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index a00b59c425b7f..67fb6989df01a 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -5,18 +5,26 @@ , fetchPypi , writeText -# build +# build-system , setuptools , setuptools-scm -# propagates +# dependencies , attrs , exceptiongroup , iniconfig , packaging , pluggy -, py , tomli + +# optional-dependencies +, argcomplete +, hypothesis +, mock +, nose +, pygments +, requests +, xmlschema }: buildPythonPackage rec { @@ -40,16 +48,28 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - attrs iniconfig packaging pluggy - py - tomli ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup + tomli ]; + passthru.optional-dependencies = { + testing = [ + argcomplete + attrs + hypothesis + mock + nose + pygments + requests + setuptools + xmlschema + ]; + }; + postInstall = '' mkdir $testout cp -R testing $testout/testing diff --git a/pkgs/development/python-modules/pytest/tests.nix b/pkgs/development/python-modules/pytest/tests.nix index 3fc078148b203..8bf8dafdf9279 100644 --- a/pkgs/development/python-modules/pytest/tests.nix +++ b/pkgs/development/python-modules/pytest/tests.nix @@ -1,23 +1,19 @@ { buildPythonPackage , isPyPy , pytest -, hypothesis -, pygments }: buildPythonPackage rec { pname = "pytest-tests"; inherit (pytest) version; + format = "other"; src = pytest.testout; dontBuild = true; dontInstall = true; - nativeCheckInputs = [ - hypothesis - pygments - ]; + nativeCheckInputs = pytest.optional-dependencies.testing; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 @@ -25,7 +21,7 @@ buildPythonPackage rec { # test_missing_required_plugins will emit deprecation warning which is treated as error checkPhase = '' runHook preCheck - ${pytest.out}/bin/py.test -x testing/ \ + ${pytest.out}/bin/pytest -x testing/ \ --ignore=testing/test_junitxml.py \ --ignore=testing/test_argcomplete.py \ -k "not test_collect_pyargs_with_testpaths and not test_missing_required_plugins" diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 2949b8b7ea9d5..d21408c2c6781 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "7.8.0"; + version = "7.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,11 +41,9 @@ buildPythonPackage rec { owner = "ArangoDB-Community"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-lZ+9l1kPE/Piw1QLYW+qjFQmTtZd4m/kDOTOxkTsla0="; + hash = "sha256-R/59SMEVPZow9aG32gqQApuvB2zQLmPCxf/Mz70ubUU="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index b100ba2292c92..65a27c9b53cfa 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.32.1"; + version = "0.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-q9EIOMmUcttL1ohxQD+SkZTxKv8PwdN29+ez2xB7rvM="; + hash = "sha256-SJBU7jMnyLBdWQPQ/UGbVklKUOrCM3fMnOkXKHQnyPI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index a987dc12e6bbb..9b0c5a070e7c4 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -7,6 +7,7 @@ , pygobject3 , bluez , networkmanager +, setuptools , setuptools-scm , runCommand }: @@ -20,19 +21,18 @@ let ''; in buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.29.1"; - format = "setuptools"; + version = "0.30.0"; + pyproject = true; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sfvVLPTSTXjwyB0a2NyDIONv01FXZ40nHZwwo3oqI90="; + hash = "sha256-jYlVbxeBXEmKiVvkFGdmChETCKUHllQG53VW4tTa0Tc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 79ba5c871a5ff..37a10bdd542c8 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -3,33 +3,55 @@ , buildPythonPackage , fetchPypi , lxml -, pytest -, pyparsing , mock +, pyparsing +, pytestCheckHook +, pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "python-docx"; - version = "0.8.11"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1105d233a0956dd8dd1e710d20b159e2d72ac3c301041b95f4d4ceb3e0ebebc4"; + hash = "sha256-WCm3IhQc8at5rt8MNNn+mSSyl2RYTA8hZOsrAtzfF8k="; }; - nativeCheckInputs = [ behave mock pyparsing pytest ]; - propagatedBuildInputs = [ lxml ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = '' - py.test tests + propagatedBuildInputs = [ + lxml + typing-extensions + ]; + + nativeCheckInputs = [ + behave + mock + pyparsing + pytestCheckHook + ]; + + postCheck = '' behave --format progress --stop --tags=-wip ''; - meta = { + pythonImportsCheck = [ + "docx" + ]; + + meta = with lib; { description = "Create and update Microsoft Word .docx files"; - homepage = "https://python-docx.readthedocs.io/en/latest/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.alexchapman ]; + homepage = "https://python-docx.readthedocs.io/"; + changelog = "https://github.com/python-openxml/python-docx/blob/v${version}/HISTORY.rst"; + license = licenses.mit; + maintainers = with maintainers; [ alexchapman ]; }; } diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 990cbd1be317e..59cd210a0a04e 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -2,6 +2,7 @@ , stdenv , aiohttp , buildPythonPackage +, setuptools , eventlet , fetchFromGitHub , iana-etc @@ -17,8 +18,8 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.7.1"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -26,9 +27,13 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-jHXpPnrQlIpmQ2sY4y6AUx/6W8Pf+683s4NmmlwZO58="; + hash = "sha256-btXwx9GRLBcjtcGdgckb2Y/MxC0E/rKTWKgkP8olezo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ simple-websocket ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 0c0ded8af09f3..9c708b735ce28 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,6 +2,11 @@ , buildPythonPackage , pythonOlder , fetchPypi + +# build-system +, setuptools + +# dependencies , argcomplete , requests , requests-toolbelt @@ -10,16 +15,20 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "3.15.0"; - format = "setuptools"; + version = "4.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yeZet2Eqn7uKvwM5ly7Kf9enPU2mbJtEb/5SiTCv9TQ="; + hash = "sha256-+HDXb5jJXQXEM5nXOx6qtZxnGzJ5ODDNL53fMsyTVB4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests requests-toolbelt diff --git a/pkgs/development/python-modules/python-izone/default.nix b/pkgs/development/python-modules/python-izone/default.nix index 19dbbf733dc6c..0173c277a5261 100644 --- a/pkgs/development/python-modules/python-izone/default.nix +++ b/pkgs/development/python-modules/python-izone/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ aiohttp netifaces diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index b9400a2239ae0..0a02ccb688add 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonAtLeast }: buildPythonPackage rec { @@ -16,6 +17,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/madzak/python-json-logger/issues/185 + "test_custom_object_serialization" + "test_percentage_format" + "test_rename_reserved_attrs" + ]; + meta = with lib; { description = "Json Formatter for the standard python logger"; homepage = "https://github.com/madzak/python-json-logger"; diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 27057d92ea12b..040d901a7e73f 100644 --- a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-5WN/31e6WCgXVzevMuQbNjyo/2jjWDF+m48nrLKS+64="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml --cov pylsp_jsonrpc --cov test" "" diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 763154732943a..96ba4c3670333 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -53,8 +53,6 @@ buildPythonPackage rec { --replace "--cov pylsp --cov test" "" ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonRelaxDeps = [ "autopep8" "flake8" diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 60be5e80c8c78..3a6648373fb1a 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.6.0"; + version = "4.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JFdpPX2lVSGN/jVsKMOOKrPm51fwpD476TnQo/0AYWQ="; + hash = "sha256-blkE+pLzZQ8BCHAmk6yNjzqbBAlK2ab1FySGFB/kN2c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index 86c5894d81789..b82549955bdad 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -1,9 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook -, pythonOlder + +# build-system , setuptools + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -11,8 +14,6 @@ buildPythonPackage rec { version = "1.8.3"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; @@ -22,14 +23,14 @@ buildPythonPackage rec { setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - pythonImportsCheck = [ "pythonosc" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Open Sound Control server and client in pure python"; homepage = "https://github.com/attwad/python-osc"; diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix index 788ab4a35f916..260b26730728d 100644 --- a/pkgs/development/python-modules/python-pkcs11/default.nix +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv"; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ cython setuptools-scm diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f046f7c811892..f8e189f4bd8cc 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -1,31 +1,46 @@ { lib -, aiohttp -, bidict , buildPythonPackage , fetchFromGitHub -, mock -, msgpack -, pytestCheckHook -, python-engineio , pythonOlder + +# build-system +, setuptools + +# dependencies +, bidict +, python-engineio + +# optional-dependencies +, aiohttp , requests , websocket-client + +# tests +, msgpack +, pytestCheckHook +, simple-websocket +, uvicorn + }: buildPythonPackage rec { pname = "python-socketio"; - version = "5.9.0"; - format = "setuptools"; + version = "5.10.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; - rev = "v${version}"; - hash = "sha256-1lyTZwkRpGRbeBqt6Thv5o+bUzkD1sC3T9T1GbWMEkI="; + rev = "refs/tags/v${version}"; + hash = "sha256-nlzTzIswMRjvJ9l9TOtVvRvbKlQPvNH0/P1NIbQCmy8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bidict python-engineio @@ -42,10 +57,11 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - mock msgpack pytestCheckHook - ]; + uvicorn + simple-websocket + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "socketio" diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index c6b59b0ac985d..77f694dbb2497 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-socks"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.6.2"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "python-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-HnZrnsxPmRJzrvJbKS5r+di+msykDwWS7TB5CitIve8="; + hash = "sha256-go8MH/ZW+W4aBOqscvcGim8KOW249sSCrmvCMLrQ5HU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-trovo/default.nix b/pkgs/development/python-modules/python-trovo/default.nix index ae2b610ca3c7b..b4e7194b842ce 100644 --- a/pkgs/development/python-modules/python-trovo/default.nix +++ b/pkgs/development/python-modules/python-trovo/default.nix @@ -2,21 +2,26 @@ , buildPythonPackage , fetchPypi , pythonOlder +, poetry-core , requests }: buildPythonPackage rec { pname = "python-trovo"; - version = "0.1.6"; - format = "setuptools"; + version = "0.1.7"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-g1RDHSNGbGT1G2ej7A8WzyR17FaNPySfsAuKbHddmtQ="; + hash = "sha256-3EVSF4+nLvvM2RocNM2xz9Us5VrRRTCu/MWCcqwwikw="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ requests ]; # No tests found diff --git a/pkgs/development/python-modules/python-ulid/default.nix b/pkgs/development/python-modules/python-ulid/default.nix index db1456dc3186c..e70c1004ecf77 100644 --- a/pkgs/development/python-modules/python-ulid/default.nix +++ b/pkgs/development/python-modules/python-ulid/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-d5jCPxWUOfw/OCtbA9Db9+s1D5DAdL+vbPR8zavgbbo="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-fancy-pypi-readme hatch-vcs diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 61d780809db5e..dcf29a4662d9a 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -18,8 +18,6 @@ buildPythonPackage rec { hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/python-xz/default.nix b/pkgs/development/python-modules/python-xz/default.nix index b5a2ed4e21f92..a66ddd6ea8573 100644 --- a/pkgs/development/python-modules/python-xz/default.nix +++ b/pkgs/development/python-modules/python-xz/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-xz"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-OYdGWTtwb6n6xZuMmI6rhgPh/iupGVERwLRSJ6OnfbM="; + hash = "sha256-oYjwQ26BFFXxvaYdzp2+bw/BQwM0v/n1r9DmaLs1R3Q="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix index 7a5d8bccaa316..e9880c45ec46b 100644 --- a/pkgs/development/python-modules/python3-saml/default.nix +++ b/pkgs/development/python-modules/python3-saml/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python3-saml"; - version = "1.15.0"; + version = "1.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "onelogin"; repo = "python3-saml"; rev = "refs/tags/v${version}"; - hash = "sha256-xPPR2z3h8RpoAROpKpu9ZoDxGq5Stm9wQVt4Stj/6fg="; + hash = "sha256-KyDGmqhg/c29FaXPKK8rWKSBP6BOCpKKpOujCavXUcc="; }; patches = [ diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 25e0484041a70..c9e0ca669c9ad 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -3,6 +3,7 @@ , cached-property , click , fetchFromGitHub +, fetchpatch , packaging , pydantic , pytest-timeout @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "pythonfinder"; - version = "2.0.5"; - format = "pyproject"; + version = "2.0.6"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,11 +23,20 @@ buildPythonPackage rec { owner = "sarugaku"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-L/+6w5lLqHO5c9CThoUPOHXRPVxBlOWFDAmfoYxRw5g="; + hash = "sha256-C/Em8Vmv7q030hmH3jU/apBRSSC9QFK9mbBWjBjJHXg="; }; + patches = [ + # https://github.com/sarugaku/pythonfinder/issues/142 + (fetchpatch { + name = "pydantic_2-compatibility.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/python-pythonfinder/-/raw/2.0.6-1/python-pythonfinder-2.0.6-pydantic2.patch"; + hash = "sha256-mON1MeA+pj6VTB3zpBjF3LfB30wG0QH9nU4bD1djWwg="; + }) + ]; + postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace " --cov" "" ''; @@ -35,9 +45,10 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - cached-property packaging pydantic + ] ++ lib.optionals (pythonOlder "3.8") [ + cached-property ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pythran/default.nix b/pkgs/development/python-modules/pythran/default.nix index 2c4095b532f5b..047a4ea1af07e 100644 --- a/pkgs/development/python-modules/pythran/default.nix +++ b/pkgs/development/python-modules/pythran/default.nix @@ -2,14 +2,22 @@ , python , buildPythonPackage , fetchFromGitHub +, fetchpatch +, isPy3k +, substituteAll + +# build-system +, setuptools + +# native dependencies , openmp +, xsimd + +# dependencies , ply , gast , numpy , beniget -, xsimd -, isPy3k -, substituteAll }: let @@ -17,14 +25,14 @@ let in buildPythonPackage rec { pname = "pythran"; - version = "0.13.1"; - format = "setuptools"; + version = "0.14.0"; + pyproject = true; src = fetchFromGitHub { owner = "serge-sans-paille"; repo = "pythran"; rev = version; - hash = "sha256-baDrReJgQXbaKA8KNhHiFjr0X34yb8WK/nUJmiM9EZs="; + hash = "sha256-in0ty0aBAIx7Is13hjiHZGS8eKbhxb6TL3bENzfx5vQ="; }; patches = [ @@ -33,6 +41,11 @@ in buildPythonPackage rec { src = ./0001-hardcode-path-to-libgomp.patch; gomp = "${if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) + (fetchpatch { + # Python 3.12 support + url = "https://github.com/serge-sans-paille/pythran/commit/258ab9aaf26172f669eab1bf2a346b5f65db3ac0.patch"; + hash = "sha256-T+FLptDYIgzHBSXShULqHr/G8ttBFamq1M5JlB2HxDM="; + }) ]; # xsimd: unvendor this header-only C++ lib @@ -41,11 +54,16 @@ in buildPythonPackage rec { ln -s '${lib.getDev xsimd}'/include/xsimd third_party/ ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ply gast numpy beniget + setuptools ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 69f33db742a6a..fad1ff1d13fd6 100644 --- a/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , fetchFromGitHub , lib +, setuptools , numpy , onnx , packaging @@ -13,16 +14,20 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.7.2"; - format = "setuptools"; + version = "0.7.4"; + pyproject = true; src = fetchFromGitHub { owner = "pfnet"; - repo = pname; + repo = "pytorch-pfn-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-juoLw/qfq4YF7opyR7cTYCVzUa9pXVvQnvGntcQhBr4="; + hash = "sha256-X7N2RQS8he9FJPfEjPJH6GdxkAPV6uxOIfRVOnJId0U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; nativeCheckInputs = [ onnx pytestCheckHook torchvision ]; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 83ab0a9879f34..b4de887f54559 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -48,5 +48,7 @@ buildPythonPackage rec { changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + # https://github.com/home-assistant-libs/pytradfri/issues/720 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index 609d8bfcebae9..ef09f1285183d 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -24,6 +24,24 @@ buildPythonPackage rec { six ]; + postPatch = '' + for path in \ + customauthenticator_test.py \ + hardware_test.py \ + hidtransport_test.py \ + localauthenticator_test.py \ + model_test.py \ + u2f_test.py \ + util_test.py \ + hid/macos_test.py; \ + do + # https://docs.python.org/3/whatsnew/3.12.html#id3 + substituteInPlace pyu2f/tests/$path \ + --replace "assertEquals" "assertEqual" \ + --replace "assertRaisesRegexp" "assertRaisesRegex" + done + ''; + nativeCheckInputs = [ mock pyfakefs diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 20d632456ea64..f70b6ca744ac6 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-FTvlRCPajRqKLCb5x1Gz/EGZIdMhXow4nP+WlWbjLko="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.py \ --replace "version_config=True," 'version="${version}",' \ diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 626d87b796aeb..58d538ec98ade 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -51,8 +51,6 @@ buildPythonPackage rec { pytestCheckHook ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = with lib; { description = "Module that implements the Virtual Instrument Software Architecture"; homepage = "https://github.com/pyvisa/pyvisa-py"; diff --git a/pkgs/development/python-modules/pyvisa-sim/default.nix b/pkgs/development/python-modules/pyvisa-sim/default.nix index 55d6ff6b5db61..9fcce19d6a202 100644 --- a/pkgs/development/python-modules/pyvisa-sim/default.nix +++ b/pkgs/development/python-modules/pyvisa-sim/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyvisa-sim"; - version = "0.5.1"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyVISA-sim"; inherit version; - hash = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY="; + hash = "sha256-kHahaRKoEUtDxEsdMolPwfEy1DidiytxmvYiQeQhYcE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvisa/default.nix b/pkgs/development/python-modules/pyvisa/default.nix index a104726ac8034..3d017f8ad2e50 100644 --- a/pkgs/development/python-modules/pyvisa/default.nix +++ b/pkgs/development/python-modules/pyvisa/default.nix @@ -10,8 +10,8 @@ buildPythonPackage rec { pname = "pyvisa"; - version = "1.13.0"; - format = "setuptools"; + version = "1.14.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,16 +19,16 @@ buildPythonPackage rec { owner = "pyvisa"; repo = "pyvisa"; rev = "refs/tags/${version}"; - hash = "sha256-TBu3Xko0IxFBT2vzrsOxqEG3y4XfPzISEtbkWkIaCvM="; + hash = "sha256-GKrgUK2nSZi+8oJoS45MjpU9+INEgcla9Kaw6ceNVp0="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ typing-extensions - setuptools ]; nativeCheckInputs = [ @@ -40,10 +40,6 @@ buildPythonPackage rec { "test_visa_info" ]; - postConfigure = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}" - ''; - meta = with lib; { description = "Python package for support of the Virtual Instrument Software Architecture (VISA)"; homepage = "https://github.com/pyvisa/pyvisa"; diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index 21dc11f2d6668..006f6070439f3 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-Zv4piGWs/XJbxfGHUHctfxuImbjluxd1chUgvtV9lcs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix index 9db835f1d5471..93b881435cb5b 100644 --- a/pkgs/development/python-modules/pywebview/default.nix +++ b/pkgs/development/python-modules/pywebview/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pywebview"; - version = "4.3.3"; + version = "4.4.1"; pyproject = true; disabled = pythonOlder "3.5"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "r0x0r"; repo = "pywebview"; rev = "refs/tags/${version}"; - hash = "sha256-8BkbO7C8cYDIQWWCKaXFjfD45L5KVG1tDZJl+uW5g9g="; + hash = "sha256-uanv6v/xwi4COY0WjoyxG4khK1kAucBmpr/plCKYxkQ="; }; nativeBuildInputs = [ @@ -50,8 +50,6 @@ buildPythonPackage rec { xvfb-run ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkPhase = '' # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pyyaml-include/default.nix b/pkgs/development/python-modules/pyyaml-include/default.nix index 176d402e99c19..3b5b9faeec9ef 100644 --- a/pkgs/development/python-modules/pyyaml-include/default.nix +++ b/pkgs/development/python-modules/pyyaml-include/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-xsNMIEBYqMVQp+H8R7XpFCwROXA8I6bFvAuHrRvC+DI="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 88fbf7d63c05d..442577fcc5e3c 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -1,6 +1,17 @@ { lib , buildPythonPackage , fetchPypi +, isPyPy + +# build-system +, cython_3 +, setuptools +, setuptools-scm +, packaging +, cffi + +# dependencies + , py , pytestCheckHook , python @@ -13,7 +24,7 @@ buildPythonPackage rec { pname = "pyzmq"; version = "25.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -22,12 +33,22 @@ buildPythonPackage rec { hash = "sha256-JZwiSFtxq6zfqL95cgzXvPS50SizDqVU8BrnH9v9qiM="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + packaging + ] ++ (if isPyPy then [ + cffi + ] else [ + cython_3 + ]); + buildInputs = [ zeromq ]; - propagatedBuildInputs = [ - py + propagatedBuildInputs = lib.optionals isPyPy [ + cffi ]; nativeCheckInputs = [ @@ -45,6 +66,7 @@ buildPythonPackage rec { # pytest.ini is missing in pypi's sdist # https://github.com/zeromq/pyzmq/issues/1853#issuecomment-1592731986 "--asyncio-mode auto" + "--ignore=$out/lib/python3.12/site-packages/zmq/tests/test_mypy.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/qasync/default.nix b/pkgs/development/python-modules/qasync/default.nix index 182e1b209df4f..d8eb5b4c7c694 100644 --- a/pkgs/development/python-modules/qasync/default.nix +++ b/pkgs/development/python-modules/qasync/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "qasync"; - version = "0.27.0"; + version = "0.27.1"; format = "pyproject"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "CabbageDevelopment"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kU8QgcBZSzQQO3V4zKaIBuodUCQS4CLHOH7qHYU8ja0="; + hash = "sha256-oXzwilhJ1PhodQpOZjnV9gFuoDy/zXWva9LhhK3T00g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 16ad74dd24695..d7b733f83322b 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2023.10.54"; + version = "2023.11.57"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-xCHB/pPURc1+vje6IhBHZ6HogUsmYfBE9977Qtwoc2w="; + hash = "sha256-fmFJW4PDQc7szu0ymE+fV9k6wUDLRHkOriEHDnzDSQg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 7db5c72f80c51..779e7b390b219 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.42.0"; + version = "0.42.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -57,7 +57,7 @@ buildPythonPackage rec { owner = "QCoDeS"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-+NtPE9mQKWftk3vR5WFZgM+7jl8HWr9MxVA+VpbuHvE="; + hash = "sha256-oNQLIL5L3gtFS6yxqgLDI1s4s9UYqxGc8ASqHuZv6Rk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index ecd8905583e2b..c8c6883342f66 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.12.2"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = "refs/tags/${version}"; - hash = "sha256-K8Avh1j9j5CGdEYIeJJRF+PjUFXvVILkZLqX1QClInE="; + hash = "sha256-GxQgqCUDwalgM9m+XeRiZCRL93KrCSUPoLvDgHJJGCQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 559ed8f69bbea..115a3dd9e5fc5 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -2,6 +2,10 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + # Python Inputs , fastdtw , numpy @@ -22,8 +26,8 @@ buildPythonPackage rec { pname = "qiskit-finance"; - version = "0.3.4"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -31,13 +35,17 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Ijoqn6nANLsEVKA5nycd1xbW5htJ+TQm6LkiMUWTsSs="; + hash = "sha256-V0o3U2Tn8OXTe2n84tqAhQql4sQ3UBZ8bLNt8S9Iz9w="; }; postPatch = '' substituteInPlace requirements.txt --replace "pandas<1.4.0" "pandas" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ fastdtw numpy diff --git a/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/pkgs/development/python-modules/qiskit-machine-learning/default.nix index da26fa3a27318..16ed373894e91 100644 --- a/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -1,9 +1,11 @@ { lib , pythonOlder -, pythonAtLeast , buildPythonPackage , fetchFromGitHub -, fetchpatch + +# build-system +, setuptools + # Python Inputs , fastdtw , numpy @@ -21,8 +23,8 @@ buildPythonPackage rec { pname = "qiskit-machine-learning"; - version = "0.6.1"; - format = "setuptools"; + version = "0.7.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -30,9 +32,13 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oSLQvZGEq/nBj7ktDEq3BMk7xyYiLGpBDmKxuXtMTfs="; + hash = "sha256-qTHacEUTp0RY2piplE6XoYKpJyeFswTPBvjfQ9Gvwt0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ fastdtw numpy diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index b9083bdcd51fd..660762f2d2fd1 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -2,6 +2,10 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + # Python Inputs , h5py , numpy @@ -21,8 +25,8 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.6.2"; - format = "setuptools"; + version = "0.7.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -30,9 +34,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-X/4jA/e2nmmaVEiCgd/4KJc/sAdcYDkyKzvyVztovXM="; + hash = "sha256-RspjHEFYdu1k6azmifbpd57tH+SxPeepw5EQzWP/Yc8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ h5py numpy diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index bd3d8251f10a0..f377a2b9cabaa 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -2,6 +2,10 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + # Python Inputs , decorator , docplex @@ -18,8 +22,8 @@ buildPythonPackage rec { pname = "qiskit-optimization"; - version = "0.5.0"; - format = "setuptools"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -27,13 +31,17 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-N4mf5ins0x+yUAIq+yyjSnUrHcaEhH/Jpid/QMhIjE0="; + hash = "sha256-vVSFvLVjptSgGocGR6i1Fp0BSRaT3uBBxf0OrFaF9EQ="; }; postPatch = '' substituteInPlace requirements.txt --replace "networkx>=2.2,<2.6" "networkx" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ docplex decorator diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 13d70a2d472aa..b7c0a2677bf69 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -2,6 +2,10 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + # Python Inputs , qiskit-aer , qiskit-ibmq-provider @@ -28,8 +32,8 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.41.1"; - format = "setuptools"; + version = "0.45.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -37,9 +41,13 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = "refs/tags/${version}"; - hash = "sha256-ICJJvbekvpaBMnSf+NHbTiarb+Ye3NtktcRYAq8KaCs="; + hash = "sha256-XAAQc6oX9zy9MFze1UQbalUBfhbkY5u/0xOmc5J66kM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ qiskit-aer qiskit-ibmq-provider diff --git a/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/pkgs/development/python-modules/qmk-dotty-dict/default.nix index 8b7a7b553699f..39b7fe21b88c7 100644 --- a/pkgs/development/python-modules/qmk-dotty-dict/default.nix +++ b/pkgs/development/python-modules/qmk-dotty-dict/default.nix @@ -1,15 +1,24 @@ -{ buildPythonPackage, fetchPypi, lib, setuptools-scm }: +{ buildPythonPackage +, fetchFromGitHub +, lib +, poetry-core +}: buildPythonPackage rec { pname = "qmk_dotty_dict"; - version = "1.3.0.post1"; + version = "1.3.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-O2EeOTZgv6poNcaOlHhLroD+B7hJCXi17KsDoNL8fqI="; + src = fetchFromGitHub { + owner = "pawelzny"; + repo = "dotty_dict"; + rev = "refs/tags/v${version}"; + hash = "sha256-kY7o9wgfsV7oc5twOeuhG47C0Js6JzCt02S9Sd8dSGc="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + poetry-core + ]; doCheck = false; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index a49b63eaeb159..101239257853d 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.4.4"; + version = "5.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t/+1PXTyPO4p9M21Xdb6vI7DEtlPPEa6OOHd5FhpPfs="; + hash = "sha256-oOgGxpUduUkGKOTfgMrslmm2UUnHukD5vwM8AlpbVrw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 9555ef07c36af..aa6eed8ec5731 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-WI1z8vrbZiJw6fDHK27mKA+1FyZEQTMttIDNzSIX+PU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 15806119cb787..ef1df14b21847 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -58,8 +58,6 @@ buildPythonPackage rec { --replace /usr/include/libdrm ${lib.getDev libdrm}/include/libdrm ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ pkg-config setuptools diff --git a/pkgs/development/python-modules/quaternion/default.nix b/pkgs/development/python-modules/quaternion/default.nix index ad53a085d3277..4b7eef5c5ab2e 100644 --- a/pkgs/development/python-modules/quaternion/default.nix +++ b/pkgs/development/python-modules/quaternion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "quaternion"; - version = "2022.4.3"; + version = "2022.4.4"; format = "pyproject"; src = fetchFromGitHub { owner = "moble"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iLjVQ6eGwpLQXi8Sr5ShJdXMqYNclGEuq/oxR4ExDLA="; + hash = "sha256-fgyi50purfqUIe7zuz/52K6Sw3TjuvAX0EnzkXD//B4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index 6f9b0488c5d27..98a50c6079ca0 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -6,6 +6,7 @@ , prompt-toolkit , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -24,6 +25,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "prompt_toolkit" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 6a223bb4fb762..3a247bc6a81ed 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -35,8 +35,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' # https://github.com/vanstinator/raincloudy/pull/60 substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 6bde7864d2af9..97f2a09e55e21 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-D7Z0xKqAJAPKSAEK+3Mpz/LaEKqKYczp+m6SqfzufwA="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "Cython==3.0.3" "Cython" + ''; + nativeBuildInputs = [ cmake cython_3 diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 0e216ce185087..e9e611cb19bce 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.3.9"; + version = "4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -38,8 +38,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; - rev = "refs/tags/${version}"; - hash = "sha256-Tp6BSU33FaszrIXQgU0Asb7IMue0C939o/atAKz+3Q4="; + rev = "refs/tags/release-test-${version}"; + hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; }; patches = [ diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 471439b28e5ce..04f5206b96a5e 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -24,6 +24,7 @@ , pip , pytest-cov , pytestCheckHook +, setuptools }: buildPythonPackage rec { @@ -67,6 +68,7 @@ buildPythonPackage rec { pip pytest-cov pytestCheckHook + setuptools ] ++ passthru.optional-dependencies.networkx ++ passthru.optional-dependencies.html; diff --git a/pkgs/development/python-modules/readchar/default.nix b/pkgs/development/python-modules/readchar/default.nix index 8517bb34654f2..aab318a38178f 100644 --- a/pkgs/development/python-modules/readchar/default.nix +++ b/pkgs/development/python-modules/readchar/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub +# build-system +, setuptools + # tests , pytestCheckHook , pexpect @@ -10,7 +13,7 @@ buildPythonPackage rec { pname = "readchar"; version = "4.0.5"; - format = "setuptools"; + pyproject = true; # Don't use wheels on PyPI src = fetchFromGitHub { @@ -22,13 +25,18 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=readchar" "" + --replace "--cov=readchar" "" \ + --replace "attr: readchar.__version__" "${version}" # run Linux tests on Darwin as well # see https://github.com/magmax/python-readchar/pull/99 for why this is not upstreamed substituteInPlace tests/linux/conftest.py \ --replace 'sys.platform.startswith("linux")' 'sys.platform.startswith(("darwin", "linux"))' ''; + nativeBuildInputs = [ + setuptools + ]; + pythonImportsCheck = [ "readchar" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 0ce923663f886..3490b6a914b98 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -1,29 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , requests -, pytest +, pytestCheckHook , mock , sphinx }: buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.2.2"; - format = "setuptools"; + version = "2.2.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kiF77xTZE3e88nvffaNj5XSzseQYC2Xu9ufPpV8P0Lg="; + hash = "sha256-ZYPCZ5GlhT7p5Xzp24ZOL7BoCLpHD4BddNU/xQgR4BI="; }; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + setuptools + ]; - nativeCheckInputs = [ pytest mock sphinx ]; + propagatedBuildInputs = [ + requests + ]; - checkPhase = '' - py.test - ''; + nativeCheckInputs = [ + pytestCheckHook + mock + sphinx + ]; meta = with lib; { description = "Sphinx extension for Read the Docs overrides"; diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix index c5b7fcb88b762..b9f29be757fec 100644 --- a/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "recipe-scrapers"; - version = "14.46.0"; + version = "14.52.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hhursev"; repo = "recipe-scrapers"; rev = "refs/tags/${version}"; - hash = "sha256-XCcunwqmcvPC5AVxR9mit06BRDTYfu/CeTXg3IH7Dy0="; + hash = "sha256-VdJZnwo+DwVDZuuuqk0X26CXs7ZrUFXqC8qEYaX74Zc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index 2616e1da9f4d2..d987092e48f02 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "5.0.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XOpsDTNcmnMypGDthynOq7TQxInHKFsKhtu/igF70SA="; + hash = "sha256-DatJXNV1MGnTvGUKDd6Kj57d4W/FaRtomlZu2lgQDQ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 4bd4b3c146190..f0845e50d5190 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.914"; + version = "2.0.917"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-fGOo9FgVMI6ayyB3EMN6RGThwWciShcBZzWTZWtOt8E="; + hash = "sha256-Qrh6ruB/e7ZeZ33fD9VmtAX+I6OUL5I/zjRv9oh1bO0="; }; # remove addops as they add test directory and coverage parameters to pytest diff --git a/pkgs/development/python-modules/referencing/default.nix b/pkgs/development/python-modules/referencing/default.nix index dc09aa3594a4b..8de065b054f21 100644 --- a/pkgs/development/python-modules/referencing/default.nix +++ b/pkgs/development/python-modules/referencing/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "referencing"; - version = "0.30.2"; + version = "0.31.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,11 +25,9 @@ let repo = "referencing"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-C2gKjoaMcUWz/QOsqpv4TkozQyI+zEIQf3GMf5w40aw="; + hash = "sha256-6Kol8TdOxImRq0aff+aAR/jbDrkHX/EPrIv1ZEMRWZU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index c3b959a65ef00..b71d2e45d5e0e 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -2,6 +2,7 @@ , aiohttp , aresponses , buildPythonPackage +, certifi , fetchFromGitHub , poetry-core , pytest-aiohttp @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + certifi typing-extensions ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 2df8bf922ea7e..66bb26fb60071 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2023.8.8"; + version = "2023.10.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/L3F8rDxzQ9qVs20b+QdLM4eZE47aIMvPu68X7D3cS4="; + hash = "sha256-P+9PhE0ikO4LpXrdzsF+7J499z8QonSEhd/Wo6GIzA8="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/regress/default.nix b/pkgs/development/python-modules/regress/default.nix new file mode 100644 index 0000000000000..4526c735a1898 --- /dev/null +++ b/pkgs/development/python-modules/regress/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchPypi +, buildPythonPackage +, rustPlatform +}: + +buildPythonPackage rec { + pname = "regress"; + version = "0.4.5"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-tCrFBjkK6obzaYkYiJ3WQ5yi3KkC86/cbXCSnRRGZu8="; + }; + + nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-wHObfXWgcbSYxk5d17s44+1qIGYD/Ygefxp+el0fsEc="; + }; + + meta = with lib; { + description = "Python bindings to the Rust regress crate, exposing ECMA regular expressions."; + homepage = "https://github.com/Julian/regress"; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + }; +} diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 664d87040c452..af73624d1ae6a 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -13,7 +13,7 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "4.0.4"; + version = "4.0.7"; format = "pyproject"; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -21,7 +21,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-f3CztWr/XxHLQTbFGg9aVv5uTI+7rHuQMHbbmajvMcE="; + hash = "sha256-lnx38A79kYzCMc+LbY9OR33Jc7XBZVfjvRjfrrWnAjQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 81ab320c77f97..488a045211a18 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "reproject"; - version = "0.12.0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-jb4efKT5jMY0ECV+ab5rpUHEk+tT4T2MioCRxs92TbI="; + hash = "sha256-lL6MkKVSWmV6KPkG/9fjc2c2dFQ14i9fiJAr3VFfcuI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index d04f25ae0e013..f3ec2c4123a8f 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "1.1.0"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "requests-cache"; repo = "requests-cache"; rev = "refs/tags/v${version}"; - hash = "sha256-kJqy7aK67JFtmsrwMtze/wTM9qch9YYj2eUzGJRJreQ="; + hash = "sha256-0KBx6nplD/l8GZfMbyUtgHj2e4/vH9EAgdyNFm+kPyM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 36b993d795530..d0eda6329cda2 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-sW2vYqT/nY27DvEKHdptc3dUpuqKmD7PLMs+Xp+cpeU="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix index 5acc7ae6ae260..bc6054ffad1b6 100644 --- a/pkgs/development/python-modules/requirements-detector/default.nix +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , packaging , poetry-core -, poetry-semver +, semver , pytestCheckHook , pythonOlder , toml @@ -31,8 +31,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ astroid packaging - poetry-semver toml + semver ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index a35b03680a448..37294dba1e215 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -7,20 +7,20 @@ , pythonOlder , pyyaml , requests +, setuptools , tomli , tomli-w , types-pyyaml , types-toml -, typing-extensions , urllib3 }: buildPythonPackage rec { pname = "responses"; - version = "0.23.3"; - format = "setuptools"; + version = "0.24.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; __darwinAllowLocalNetworking = true; @@ -28,20 +28,21 @@ buildPythonPackage rec { owner = "getsentry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VJmcRMn0O+3mDwzkCwxIX7RU3/I9T9p9N8t6USWDZJQ="; + hash = "sha256-fvfEHJioyjQoEvIgZZKt9/AKtzTgo0APGUK7lDrbahs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyyaml requests types-pyyaml types-toml urllib3 - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; - nativeCheckInputs = [ pytest-asyncio pytest-httpserver diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index 889c729950e08..f419a3afbaa33 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -1,28 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, looseversion , six , setuptools }: buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.9"; - format = "setuptools"; + version = "2.4.10"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dV8I9xdTWlXAUSj2vmwoJI+pr/JningWqrh+H59YFcE="; + hash = "sha256-Vez3RH3BH+wOLOmqxLpMC1f9xcnFfXfuZz1Z0kXHRmY="; }; - propagatedBuildInputs = [ six setuptools ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + looseversion + six + ]; doCheck = false; + pythonImportsCheck = [ "rethinkdb" ]; meta = with lib; { description = "Python driver library for the RethinkDB database server"; - homepage = "https://pypi.python.org/pypi/rethinkdb"; + homepage = "https://github.com/RethinkDB/rethinkdb-python"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 86c3ac1ffeeb7..0fb67ed8a805a 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -2,10 +2,20 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, markdown-it-py + +# build-system , poetry-core + +# dependencies +, markdown-it-py , pygments , typing-extensions + +# optional-dependencies +, ipywidgets + +# tests +, attrs , pytestCheckHook , setuptools @@ -18,7 +28,7 @@ buildPythonPackage rec { pname = "rich"; - version = "13.5.2"; + version = "13.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +37,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ycDmFJa68OOrNqIy/hGKxbjoaIbiniiO4UAPNSyZvDk="; + hash = "sha256-L72an7vHC+aBj8NlLOjofDrQGvmFxJpdbfiEubfg0GM="; }; nativeBuildInputs = [ @@ -37,13 +47,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ markdown-it-py pygments - setuptools ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; + passthru.optional-dependencies = { + jupyter = [ + ipywidgets + ]; + }; + nativeCheckInputs = [ + attrs pytestCheckHook + setuptools ]; disabledTests = [ diff --git a/pkgs/development/python-modules/riscv-config/default.nix b/pkgs/development/python-modules/riscv-config/default.nix index 397259d30fe35..f2ddbff5d43fb 100644 --- a/pkgs/development/python-modules/riscv-config/default.nix +++ b/pkgs/development/python-modules/riscv-config/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "riscv-config"; - version = "3.13.3"; + version = "3.14.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tMV5mRqOLURkr8HQN1yvq5Cf3yz2NRBY6uaaxNKCy2c="; + hash = "sha256-a6rTKCLAHrdfP/M8Q8YYSck4q+7tmospMFcCdIdNyy0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rnginline/default.nix b/pkgs/development/python-modules/rnginline/default.nix index d006fc950d805..acea2482f32cf 100644 --- a/pkgs/development/python-modules/rnginline/default.nix +++ b/pkgs/development/python-modules/rnginline/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , poetry-core +, pythonRelaxDepsHook , lxml , docopt-ng , typing-extensions @@ -14,21 +15,20 @@ buildPythonPackage rec { pname = "rnginline"; version = "1.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; hash = "sha256-JWqzs+OqOynIAWYVgGrZiuiCqObAgGe6rBt0DcP3U6E="; }; - format = "pyproject"; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'importlib-metadata = "^6.6.0"' 'importlib-metadata = "^6.0.0"' - ''; - nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "docopt-ng" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 0586fccd8853f..d24bcf5bfc7a5 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -1,24 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , robotframework }: buildPythonPackage rec { - version = "1.3.1"; - format = "setuptools"; pname = "robotframework-databaselibrary"; + version = "1.4.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-C+shwpGbiA+YS8t9ApJEv6mYQVd3fVvY3qWzDF6vYqU="; + sha256 = "sha256-/n4+xA/eLrcVEwlWyLQLrkX5waYaJKRkphwT22b7hTU="; }; + nativeBuildInputs = [ + robotframework + setuptools + ]; + + propagatedBuildInputs = [ + robotframework + ]; + # unit tests are impure doCheck = false; - propagatedBuildInputs = [ robotframework ]; - meta = with lib; { description = "Database Library contains utilities meant for Robot Framework"; homepage = "https://github.com/franz-see/Robotframework-Database-Library"; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index e1c43eb66b875..6d009c61a80cc 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework-requests"; - version = "0.9.5"; + version = "0.9.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "MarketSquare"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PvhMo1r/4962nntPQb4fQxcMMXIvKjp0FdNyOA43Euc="; + hash = "sha256-TuKfR+pUcQ4kf9HsX6s9WYukhwLBbJkwModoreAgo60="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 1412fbe22a7f3..d014d04419759 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,8 +1,7 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub -, python +, setuptools , robotframework , robotframework-pythonlibcore , selenium @@ -13,18 +12,22 @@ }: buildPythonPackage rec { - version = "6.1.2"; - format = "setuptools"; pname = "robotframework-seleniumlibrary"; + version = "6.2.0"; + pyproject = true; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QbAwPm1Y76KPIcHkopiyISULQSwUet021erFa/zi8Zw="; + sha256 = "sha256-lvtu6z/PD2Ckj70SgDF69BwrhaoA36SDrAvj0XJsmCc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ robotframework robotframework-pythonlibcore diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 814f178c81f36..91bb5a00231cb 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.3.6"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-sbkUHFUv/+nY6AT3wu/ipuDF45VUjQalsYcIvUFR9PE="; + hash = "sha256-bwRfu3SM/+Y9B06vjwqOjd9YmmO+EwBVvhWSdHTaRAk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rpds-py/default.nix b/pkgs/development/python-modules/rpds-py/default.nix index 6cd3f5dea28ef..b86ed00e3594a 100644 --- a/pkgs/development/python-modules/rpds-py/default.nix +++ b/pkgs/development/python-modules/rpds-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rpds-py"; - version = "0.10.3"; + version = "0.10.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,13 +20,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "rpds_py"; inherit version; - hash = "sha256-/MHrt1YaPiSmWI98be0V2ArsIsZqBwx1dVm1exf/0cs="; + hash = "sha256-TOWnCNZajb83SNJHS1gNYGsbn5G1xqsqMW4LDPekulA="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-iWy6BHVsKsZB0SVrh3CVhryaavk4gAQVvRdu9xBiDRg="; + hash = "sha256-8bXCTrZErdE7JhuoudU/4dDndCMwvjy2a+2IY0DWDzg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rstcheck-core/default.nix b/pkgs/development/python-modules/rstcheck-core/default.nix index 0a250a83fa5b8..74a1dd2dbff2e 100644 --- a/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/pkgs/development/python-modules/rstcheck-core/default.nix @@ -5,38 +5,45 @@ , fetchFromGitHub , importlib-metadata , mock -, poetry-core , pydantic , pytest-mock , pytestCheckHook , pythonOlder -, types-docutils +, setuptools +, setuptools-scm , typing-extensions +, wheel }: buildPythonPackage rec { pname = "rstcheck-core"; - version = "1.0.3"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "rstcheck"; - repo = pname; + repo = "rstcheck-core"; rev = "refs/tags/v${version}"; - hash = "sha256-9U+GhkwBr+f3yEe7McOxqPRUuTp9vP+3WT5wZ92n32w="; + hash = "sha256-cKJNktIB4vXt1MPRgYrJQ0aksmrVu7Y2uTyUjdx5YdA="; }; nativeBuildInputs = [ - poetry-core + setuptools + setuptools-scm + wheel ]; + env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-strict-prototypes"; + }; + propagatedBuildInputs = [ docutils - importlib-metadata pydantic - types-docutils + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-metadata typing-extensions ]; @@ -46,10 +53,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals stdenv.isDarwin [ - # Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved. - "test_error_without_config_file_macos" - "test_file_1_is_bad_without_config_macos" + disabledTests = [ + # https://github.com/rstcheck/rstcheck-core/issues/84 + "test_check_yaml_returns_error_on_bad_code_block" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/ruamel-yaml/default.nix b/pkgs/development/python-modules/ruamel-yaml/default.nix index 56df9d20c5911..e06aaff73dc86 100644 --- a/pkgs/development/python-modules/ruamel-yaml/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , ruamel-base , ruamel-yaml-clib , isPyPy @@ -8,15 +9,19 @@ buildPythonPackage rec { pname = "ruamel-yaml"; - version = "0.17.32"; - format = "setuptools"; + version = "0.18.5"; + pyproject = true; src = fetchPypi { pname = "ruamel.yaml"; inherit version; - hash = "sha256-7JOQY3YZFOFFQpcqXLptM8I7CFmrY0L2HPBwz8YA78I="; + hash = "sha256-YZF+OjWlacETOo93LhImlhv1oRmL6n4j8GoIQd6hqw4="; }; + nativeBuildInputs = [ + setuptools + ]; + # Tests use relative paths doCheck = false; diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index 8779325d9b23d..e5b2108831df1 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , distro , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , setuptools-scm -, setuptools-scm-git-archive }: buildPythonPackage rec { @@ -22,13 +22,26 @@ buildPythonPackage rec { sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; }; + patches = [ + (fetchpatch { + name = "remove-setuptools-scm-git-archive-from-setupcfg.patch"; + url = "https://github.com/pycontribs/ruyaml/commit/8922dd826cbb97b29e9826b00fb28a65d584e985.patch"; + includes = [ "setup.cfg" ]; + hash = "sha256-XAsORoPvYRElHswlZ4S377UwuJNCU1JuCz5iyFXoXOQ="; + }) + + # https://github.com/pycontribs/ruyaml/pull/107 + (fetchpatch { + name = "remove-setuptools-scm-git-archive-from-pyproject.patch"; + url = "https://github.com/pycontribs/ruyaml/commit/4d605bf63f799696c8ba3c1f0a0f505db0ca33ce.patch"; + hash = "sha256-X6HWXBot5ZIo+odoSHhXMb03tgpQfRw/Ze8nFgH43ZI="; + }) + ]; + nativeBuildInputs = [ setuptools-scm - setuptools-scm-git-archive ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ distro ]; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 50e5f1482cecf..9f947a78ad2a1 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { sha256 = "0jldnlzbfg5jm1nbgv91mlvcqkswd9f2n3qj9aqlbmj1cxq19yz8"; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 748b6abecf452..0400ab4b8cd87 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.7.0"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "boto"; repo = pname; rev = version; - hash = "sha256-EvLqRvm9E1Taf+JvbhQbfJqIlbu2a+rB2MX0IO90x98="; + hash = "sha256-sdoPjkZHN5wVCK9V6V+fkGvQvEQo2ABy2lqefEKfg6o="; }; propagatedBuildInputs = [ botocore ]; @@ -36,6 +36,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "s3transfer" ]; + passthru.optional-dependencies = { + crt = [ botocore.optional-dependencies.crt ]; + }; + meta = with lib; { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index d20ea73186204..406d46590a7ee 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { pname = "sabctools"; - version = "7.1.2"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 + version = "8.0.0"; # needs to match version sabnzbd expects, e.g. https://github.com/sabnzbd/sabnzbd/blob/4.0.x/requirements.txt#L3 format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-wDgFXuxclmqMlRXyr9qpruJJcOXfOiOWTZXX53uYEB8="; + hash = "sha256-hrRpEVhmnm4ABSqN/F3MllCgoJCg1PdM+oVrQR+uZbk="; }; pythonImportsCheck = ["sabctools"]; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 0f6dd64690462..db1d0b3f0abd0 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.198.0"; + version = "2.199.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-iaO+wbMs2FsnPB3Y4zwC49fWqP/zHQGzGisxNtPxOUA="; + hash = "sha256-zAYO8zf3FpEI1sr6Iv9WP56NFmwYGH2dtRTSJhsSYC8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 39a35038fb0ad..2e617fa8c3fc6 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.4.20230808163024"; + version = "8.5.20231201181309"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ai4vv6EFX4yTR8sgRspiG+M8a8oa83LIlJPGX7q+Kd0="; + hash = "sha256-q4djcBt+8PEUekWNKlivKnDXrJBAUKGZ1252ym/E4bI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix index 5344c1de3b4cb..9f07bb88d58e3 100644 --- a/pkgs/development/python-modules/schwifty/default.nix +++ b/pkgs/development/python-modules/schwifty/default.nix @@ -1,55 +1,63 @@ { lib , buildPythonPackage , fetchPypi -, importlib-resources -, importlib-metadata + +# build-system +, hatchling +, hatch-vcs + +# dependencies , iso3166 , pycountry + +# optional-dependencies +, pydantic + +# tests , pytestCheckHook , pytest-cov , pythonOlder -, setuptools -, setuptools-scm -, wheel }: buildPythonPackage rec { pname = "schwifty"; - version = "2023.6.0"; + version = "2023.11.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hDNAoITt2Ak5aVWmMgqg2oA9rDFsiuum5JXc7v7sspU="; + hash = "sha256-lyyAx8VDIRO72xW64gjcsZw2C31hV3YCLIGSmdlIJeI="; }; nativeBuildInputs = [ - setuptools - setuptools-scm - wheel + hatchling + hatch-vcs ]; propagatedBuildInputs = [ iso3166 pycountry - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-resources - ] ++ lib.optionals (pythonOlder "3.7") [ - importlib-metadata ]; + passthru.optional-dependencies = { + pydantic = [ + pydantic + ]; + }; + nativeCheckInputs = [ pytest-cov pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "schwifty" ]; meta = with lib; { + changelog = "https://github.com/mdomke/schwifty/blob/${version}/CHANGELOG.rst"; description = "Validate/generate IBANs and BICs"; homepage = "https://github.com/mdomke/schwifty"; license = licenses.mit; diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index bea510faa93af..07dd522001438 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.5.1"; + version = "0.7.0"; format = "pyproject"; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-xtrVpRJ7Kr+qI8uR0jrCEFn9d83fcSKzP9B3kQJNz78="; + hash = "sha256-hffyRpxWjGzjWrL6Uv4tJqBODeUH06JMGrtyg3Vlf9M="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 5b868bb42a6fc..7ced95754fe51 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -34,6 +34,12 @@ buildPythonPackage rec { hash = "sha256-tRpRo2s3xCZQmUtQR5EvWbIuMhCyPjIfKHYR+e9uXJ0="; }; + patches = [ + # https://github.com/scikit-build/scikit-build/pull/1032 + # https://github.com/scikit-build/scikit-build/issues/1047 + ./python312-compatibility.patch + ]; + # This line in the filterwarnings section of the pytest configuration leads to this error: # E UserWarning: Distutils was imported before Setuptools, but importing Setuptools also replaces the `distutils` module in `sys.modules`. This may lead to undesirable behaviors or errors. To avoid these issues, avoid using distutils directly, ensure that setuptools is installed in the traditional way (e.g. not an editable install), and/or make sure that setuptools is always imported before distutils. postPatch = '' diff --git a/pkgs/development/python-modules/scikit-build/python312-compatibility.patch b/pkgs/development/python-modules/scikit-build/python312-compatibility.patch new file mode 100644 index 0000000000000..8e86eccf010b7 --- /dev/null +++ b/pkgs/development/python-modules/scikit-build/python312-compatibility.patch @@ -0,0 +1,40 @@ +diff --git a/skbuild/resources/cmake/FindPythonExtensions.cmake b/skbuild/resources/cmake/FindPythonExtensions.cmake +index 59b30c2..62298d5 100644 +--- a/skbuild/resources/cmake/FindPythonExtensions.cmake ++++ b/skbuild/resources/cmake/FindPythonExtensions.cmake +@@ -254,19 +254,23 @@ endif() + include(targetLinkLibrariesWithDynamicLookup) + + set(_command " +-import distutils.sysconfig ++import sys ++ ++if sys.version_info >= (3,10): ++ import sysconfig ++else: ++ from distutils import sysconfig + import itertools + import os + import os.path + import site +-import sys + + result = None + rel_result = None + candidate_lists = [] + + try: +- candidate_lists.append((distutils.sysconfig.get_python_lib(),)) ++ candidate_lists.append((sysconfig.get_python_lib(),)) + except AttributeError: pass + + try: +@@ -293,7 +297,7 @@ sys.stdout.write(\";\".join(( + sys.prefix, + result, + rel_result, +- distutils.sysconfig.get_config_var('EXT_SUFFIX') ++ sysconfig.get_config_var('EXT_SUFFIX') + ))) + ") + diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 520c83575005f..de78e1dc93604 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.34"; + version = "0.4.35"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,11 +20,9 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-kHpJXqFQI3vtDJIcH2ebzbaReHecwItDh73/NcoPk9A="; + hash = "sha256-1SROsrl7zBaZRDju1M6wlKLZypk9OswA8kromiJGeqw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 7987f3bba1cb4..58b85429efb6c 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -34,7 +34,7 @@ let installedPackageRoot = "${builtins.placeholder "out"}/${python.sitePackages}"; self = buildPythonPackage rec { pname = "scikit-image"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -42,16 +42,10 @@ let src = fetchFromGitHub { owner = "scikit-image"; repo = "scikit-image"; - rev = "v${version}"; - hash = "sha256-WJ2WNlcFCEtPr+bV/af6MoBBhbXDpOBEsJu4FmudoIo="; + rev = "refs/tags/v${version}"; + hash = "sha256-M18y5JBPf3DR7SlJcCf82nG2MzwILg2w1AhJMzZXslg="; }; - patches = [ - # https://github.com/scikit-image/scikit-image/pull/7052 - # prepare a patch file because the commit contains additional changes - ./suppress-deprecation-warning.patch - ]; - postPatch = '' patchShebangs skimage/_build_utils/{version,cythoner}.py diff --git a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch b/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch deleted file mode 100644 index f51f1d9860a4e..0000000000000 --- a/pkgs/development/python-modules/scikit-image/suppress-deprecation-warning.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py -index ed8dd6bc8..8ec7d13bf 100644 ---- a/skimage/exposure/tests/test_exposure.py -+++ b/skimage/exposure/tests/test_exposure.py -@@ -368,19 +368,16 @@ def test_rescale_nan_warning(in_range, out_range): - ) - - # 2019/11/10 Passing NaN to np.clip raises a DeprecationWarning for -- # versions above 1.17 -- # TODO: Remove once NumPy removes this DeprecationWarning -+ # versions above 1.17, "|\A\Z" marks as optional warning -+ # TODO: Remove once NumPy 1.25.0 is minimal dependency - numpy_warning_1_17_plus = ( -- "Passing `np.nan` to mean no clipping in np.clip" -+ "|\\A\\ZPassing `np.nan` to mean no clipping in np.clip" - ) - -- if in_range == "image": -- exp_warn = [msg, numpy_warning_1_17_plus] -- else: -- exp_warn = [msg] -+ with expected_warnings([msg, numpy_warning_1_17_plus]): -+ result = exposure.rescale_intensity(image, in_range, out_range) - -- with expected_warnings(exp_warn): -- exposure.rescale_intensity(image, in_range, out_range) -+ assert np.all(np.isnan(result)) - - - @pytest.mark.parametrize( diff --git a/pkgs/development/python-modules/scikit-learn/default.nix b/pkgs/development/python-modules/scikit-learn/default.nix index 6a7c5fa705735..cd66ed54be76c 100644 --- a/pkgs/development/python-modules/scikit-learn/default.nix +++ b/pkgs/development/python-modules/scikit-learn/default.nix @@ -2,30 +2,36 @@ , lib , buildPythonPackage , fetchPypi -, fetchpatch + +# build-system +, cython , gfortran -, glibcLocales , numpy +, oldest-supported-numpy , scipy +, setuptools + +# native dependencies +, glibcLocales +, llvmPackages , pytestCheckHook , pytest-xdist , pillow -, cython , joblib -, llvmPackages , threadpoolctl , pythonOlder }: buildPythonPackage rec { pname = "scikit-learn"; - version = "1.3.0"; - format = "setuptools"; + version = "1.3.2"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-i+VJiG9e2kZDa25VWw5Ic7TxCqIcB99FxLwXNa+8zXo="; + hash = "sha256-ovVMdqzMFaNL+5Bm5selbB5yNd2ldiuZB5IzC1LM+wU="; }; buildInputs = [ @@ -38,19 +44,26 @@ buildPythonPackage rec { nativeBuildInputs = [ cython gfortran + numpy + oldest-supported-numpy + scipy + setuptools ]; propagatedBuildInputs = [ + joblib numpy - scipy numpy.blas - joblib + scipy threadpoolctl ]; - nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ]; - LC_ALL="en_US.UTF-8"; + env.LC_ALL="en_US.UTF-8"; preBuild = '' export SKLEARN_BUILD_PARALLEL=$NIX_BUILD_CORES diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix index d7df6518903e0..17f0c2a1764e7 100644 --- a/pkgs/development/python-modules/scikit-posthocs/default.nix +++ b/pkgs/development/python-modules/scikit-posthocs/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "scikit-posthocs"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "maximtrp"; repo = "scikit-posthocs"; - rev = "v${version}"; - hash = "sha256-IkvAc684AWEK427OGAa4qVy6leWmd3b8Dnhd5bYAt5I="; + rev = "refs/tags/v${version}"; + hash = "sha256-ojXVrsZsvX7UytldcWkhOndix4by1uBeVpG7nQrcvmA="; }; patches = [ diff --git a/pkgs/development/python-modules/scikit-rf/default.nix b/pkgs/development/python-modules/scikit-rf/default.nix index a2cf6d82a35be..6ab88fea48b87 100644 --- a/pkgs/development/python-modules/scikit-rf/default.nix +++ b/pkgs/development/python-modules/scikit-rf/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "scikit-rf"; - version = "0.29.1"; + version = "0.30.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "scikit-rf"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sLE6rcBGUKmk5y7oO06rHON3GVIjcvnKlr6Tgddj64Y="; + hash = "sha256-rJjuraiTvCmZgz8ysFBbYPowkLIuwt8RaFNl+gDSfLk="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 2c5ecd42585c5..caca48153b72b 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -13,7 +13,6 @@ , pkg-config , pythran , wheel -, nose , pytestCheckHook , pytest-xdist , numpy @@ -32,8 +31,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.11.3"; - srcHash = "sha256-swxRfFjTcKjKQv6GFdWNR6IKhdJQYhZSR7UWLtcnrXw="; + version = "1.11.4"; + srcHash = "sha256-hNAZOMDFYqZpb67Pzg/WALWagFYvqYO1jOmcipDDRbE="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -79,7 +78,7 @@ in buildPythonPackage { # Relax deps a bit postPatch = '' substituteInPlace pyproject.toml \ - --replace 'meson-python>=0.12.1,<0.14.0' 'meson-python' \ + --replace 'meson-python>=0.12.1,<0.15.0' 'meson-python' \ --replace 'numpy==' 'numpy>=' \ --replace "pybind11>=2.10.4,<2.11.1" "pybind11>=2.10.4,<2.12.0" \ --replace 'wheel<0.41.0' 'wheel' @@ -109,7 +108,6 @@ in buildPythonPackage { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - nose pytestCheckHook pytest-xdist ]; @@ -214,6 +212,7 @@ in buildPythonPackage { SCIPY_USE_G77_ABI_WRAPPER = 1; meta = with lib; { + changelog = "https://github.com/scipy/scipy/releases/tag/v${version}"; description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 36e69d778db8e..8e13e48219c6c 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { hash = "sha256-eEK2U1gTw3PP7kt2lNjiEs8yZX9Cmty0LIgZqg7FsJc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix index f1f6716c917f5..6140fd13323c7 100644 --- a/pkgs/development/python-modules/scooby/default.nix +++ b/pkgs/development/python-modules/scooby/default.nix @@ -38,8 +38,6 @@ buildPythonPackage rec { scipy ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - preCheck = '' export PATH="$PATH:$out/bin"; ''; diff --git a/pkgs/development/python-modules/screed/default.nix b/pkgs/development/python-modules/screed/default.nix index 4d8f88772dff9..c7ecd86c68751 100644 --- a/pkgs/development/python-modules/screed/default.nix +++ b/pkgs/development/python-modules/screed/default.nix @@ -18,7 +18,6 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonImportsCheck = [ "screed" ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/screenlogicpy/default.nix b/pkgs/development/python-modules/screenlogicpy/default.nix index 73564d11e8f87..2475418316353 100644 --- a/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/pkgs/development/python-modules/screenlogicpy/default.nix @@ -2,25 +2,31 @@ , async-timeout , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder , pytest-asyncio +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.9.4"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "dieselrabbit"; - repo = pname; + repo = "screenlogicpy"; rev = "refs/tags/v${version}"; - hash = "sha256-OdAhA+vzIrUnE8Xdv52x7ij0LJKyxawaSY4QORP1TUg="; + hash = "sha256-pilPmHE5amCQ/mGTy3hJqtSEElx7SevQpeMJZKYv7BA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ async-timeout ]; @@ -32,11 +38,18 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access - "test_gateway_discovery" "test_async_discovery" - "test_gateway" "test_async" "test_asyncio_gateway_discovery" + "test_discovery_async_discover" + "test_gateway_discovery" + "test_gateway" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # Tests block on Python 3.12 + "test_sub_unsub" + "test_attach_existing" + "test_login_async_connect_to_gateway" + "test_login_async_gateway_connect" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 9101c654b9c6d..78750d84b24f9 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -1,13 +1,21 @@ { lib , fetchFromGitHub , buildPythonPackage -, cython + +# build-system +, cython_3 , git , pkgconfig +, setuptools , setuptools-scm -, future + +# dependneices , numpy + +# optional-dependenices , pyusb + +# tests , mock , pytestCheckHook , zipp @@ -20,35 +28,35 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "1.3.0"; - format = "setuptools"; + version = "2.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; - rev = "v${version}"; - sha256 = "1hm9aalpb9sdp8s7ckn75xvyiacp5678pv9maybm5nz0z2h29ibq"; + rev = "refs/tags/v${version}"; + hash = "sha256-25rFGpfwJKj9lLDO/ZsqJ2NfCsgSSJghLZxffjX/+7w="; leaveDotGit = true; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; - nativeBuildInputs = [ - cython + cython_3 git pkgconfig + setuptools setuptools-scm ]; propagatedBuildInputs = [ - future numpy - pyusb ]; + passthru.optional-dependencies = { + pyseabreeze = [ + pyusb + ]; + }; + postInstall = '' mkdir -p $out/etc/udev/rules.d cp os_support/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules @@ -59,7 +67,7 @@ buildPythonPackage rec { pytestCheckHook mock zipp - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); setupPyBuildFlags = [ "--without-cseabreeze" ]; diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index 981b2d7da8691..0acce07138e6d 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 17689019a4065..ccc89a2900356 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { hash = "sha256-REi38rIVZmWawFGcrPl9QzSthW4jHZDr/0ug7kJRz3Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "hatchling==1.18.0" "hatchling" + ''; + nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/segno/default.nix b/pkgs/development/python-modules/segno/default.nix index 3e7bb08164486..98c332af73895 100644 --- a/pkgs/development/python-modules/segno/default.nix +++ b/pkgs/development/python-modules/segno/default.nix @@ -1,10 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder # build-system , setuptools +# dependencies +, importlib-metadata + # tests , pytestCheckHook , pypng @@ -13,26 +17,35 @@ buildPythonPackage rec { pname = "segno"; - version = "1.5.3"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "heuer"; repo = "segno"; - rev = version; - hash = "sha256-j7DUCeMoYziu19WfJu/9YiIMa2ysOPYfqW8AMcE5LaU="; + rev = "refs/tags/${version}"; + hash = "sha256-lgitNnVHvvPLKtDqJvc/zsVlFu9Gw0D3S4lt/20TlhE="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + nativeCheckInputs = [ pytestCheckHook pypng pyzbar ]; + disabledTests = [ + # https://github.com/heuer/segno/issues/132 + "test_plugin" + ]; + pythonImportsCheck = [ "segno" ]; diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix index 8f73ebd5e5ae5..fb1f4d28e6165 100644 --- a/pkgs/development/python-modules/segyio/default.nix +++ b/pkgs/development/python-modules/segyio/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "segyio"; - version = "1.9.11"; + version = "1.9.12"; postPatch = '' # Removing unecessary build dependency @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "equinor"; repo = pname; - rev = "v${version}"; - hash = "sha256-4izeMRgg5nJ9pRfSEMDlKSYYNWkhbKEzIz7czea6Vrc="; + rev = "refs/tags/v${version}"; + hash = "sha256-+N2JvHBxpdbysn4noY/9LZ4npoQ9143iFEzaxoafnms="; }; nativeBuildInputs = [ cmake ninja python scikit-build ]; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 086c53108976e..5a5c4304c636a 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.14.0"; + version = "4.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-cTMCKfFLUlJDbTUQA3Z/pKCE1RQQRMb4K8hKKn9HqvU="; + hash = "sha256-AacpHZw6N6RruuBO+bZ3/cxOODe9VPGblKmIm1ffqrc="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index c33db77b72d23..3c752df0a62a4 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "semver"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-semver"; repo = "python-semver"; rev = "refs/tags/${version}"; - hash = "sha256-vVi0+Pq8VpYMy73JSrvi9ranOzvFaHpcPZRt8gMkkFs="; + hash = "sha256-772PSUq1dqtn9aOol+Bo0S0OItBmoiCNP8q/YCBvKU4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 6f3e9914243c7..82f336a7fd43c 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.10.0"; + version = "6.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "sendgrid-python"; rev = "refs/tags/${version}"; - hash = "sha256-/un/m4Br0Ylk00fS/U+QKeXwM1Ix5TFedaPhCyScWvs="; + hash = "sha256-wcQLdU80pcyEplzL8lnehtToqYiTrX1n5TjmK5zturE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index cabee11f0d6df..42fc5953fac14 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.37.1"; + version = "1.38.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-y1fZe3ql8twSsTl24bP0fqA6myMv71I6IgzOVucbuvM="; + hash = "sha256-j250VS3GDvMP2XMfe2mkBvTNmLUnkCGilXLgUo+xuns="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index 09d29ad34533a..dfbee6e92469d 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -2,25 +2,34 @@ , buildPythonPackage , pythonOlder , fetchPypi +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "setproctitle"; - version = "1.3.2"; - format = "setuptools"; + version = "1.3.3"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; + hash = "sha256-yRPhUefqAVZ4N/8DeiPKh0AZKIAZi3+7kLFtGBYHyq4="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; # tries to compile programs with dependencies that aren't available - pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ]; + disabledTestPaths = [ + "tests/setproctitle_test.py" + ]; meta = with lib; { description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; diff --git a/pkgs/development/python-modules/setuptools-generate/default.nix b/pkgs/development/python-modules/setuptools-generate/default.nix index e4293bd118cd5..9f2b71697e9bb 100644 --- a/pkgs/development/python-modules/setuptools-generate/default.nix +++ b/pkgs/development/python-modules/setuptools-generate/default.nix @@ -25,8 +25,6 @@ buildPythonPackage rec { hash = "sha256-xDjxkWy/n0jStI9eLcM6WduyU9vGjtBOmJ86dpXjceQ="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/setuptools-gettext/default.nix b/pkgs/development/python-modules/setuptools-gettext/default.nix index 725c71eeafdc3..aff7572d3f62b 100644 --- a/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.5"; + version = "0.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-16kzKB0xq3ApQlGQYp12oB7K99QCQMUwqpP54QiI3gg="; + hash = "sha256-R1zgE1Ai2r23bve+sKo27XkUcIAmlWSreHZNt5yh2DY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-odoo/default.nix b/pkgs/development/python-modules/setuptools-odoo/default.nix index 5e262daa580e3..5a6a9ac88819f 100644 --- a/pkgs/development/python-modules/setuptools-odoo/default.nix +++ b/pkgs/development/python-modules/setuptools-odoo/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { ]; # HACK https://github.com/NixOS/nixpkgs/pull/229460 - SETUPTOOLS_SCM_PRETEND_VERSION = version; - patchPhase = '' runHook prePatch diff --git a/pkgs/development/python-modules/setuptools-rust/default.nix b/pkgs/development/python-modules/setuptools-rust/default.nix index e1c04780b8e82..ddfcdcb4f67ba 100644 --- a/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/pkgs/development/python-modules/setuptools-rust/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.7.0"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xxAJmZSCNaOK5+VV/hmapmwlPcOEsSX12FRzv4Hq46M="; + hash = "sha256-lLHdXVMIsxONW5M8OitV5taSfRoiYy5Qn86p3dD35IY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 7e555298907aa..c5b9808440c85 100644 --- a/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,30 +1,45 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, pytestCheckHook +}: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; - version = "1.4"; - format = "setuptools"; + version = "1.4.1"; + pyproject = true; src = fetchPypi { inherit version; pname = "setuptools_scm_git_archive"; - sha256 = "b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0"; + hash = "sha256-xBi8d7OXTTrGXyaPBY8j4B3F+ZHyIzEosOFqad4iewk="; }; - nativeBuildInputs = [ setuptools-scm ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pytestFlagsArray = [ "tests.py" ]; - pythonImportsCheck = [ "setuptools_scm_git_archive" ]; + pythonImportsCheck = [ + "setuptools_scm_git_archive" + ]; meta = with lib; { description = "setuptools_scm plugin for git archives"; homepage = "https://github.com/Changaco/setuptools_scm_git_archive"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + # https://github.com/Changaco/setuptools_scm_git_archive/pull/22 + broken = versionAtLeast setuptools-scm.version "8"; }; } diff --git a/pkgs/development/python-modules/setuptools-scm/default.nix b/pkgs/development/python-modules/setuptools-scm/default.nix index 36373efda5302..01a1f0ff0d4b4 100644 --- a/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,29 +1,35 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , callPackage , fetchPypi +, pythonOlder + +# build-system +, setuptools + +# dependencies , packaging , typing-extensions , tomli -, setuptools -, pythonOlder -, lib + +# optional-dependencies +, rich }: buildPythonPackage rec { pname = "setuptools-scm"; - version = "7.1.0"; - format = "pyproject"; + version = "8.0.4"; + pyproject = true; src = fetchPypi { - pname = "setuptools_scm"; - inherit version; - hash = "sha256-bFCDRadxqtfVbr/w5wYovysOx1c3Yr6ZYCFHMN4njyc="; + inherit pname version; + hash = "sha256-tfQ/9oAGaVlRk/0JiRVk7p0dfcsZbKtLJQbVOi4clcc="; }; nativeBuildInputs = [ - packaging setuptools - typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; propagatedBuildInputs = [ @@ -34,6 +40,12 @@ buildPythonPackage rec { tomli ]; + passthru.optional-dependencies = { + rich = [ + rich + ]; + }; + pythonImportsCheck = [ "setuptools_scm" ]; @@ -45,7 +57,10 @@ buildPythonPackage rec { pytest = callPackage ./tests.nix { }; }; + setupHook = ./setup-hook.sh; + meta = with lib; { + changelog = "https://github.com/pypa/setuptools_scm/blob/${version}/CHANGELOG.md"; homepage = "https://github.com/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; diff --git a/pkgs/development/python-modules/setuptools-scm/setup-hook.sh b/pkgs/development/python-modules/setuptools-scm/setup-hook.sh new file mode 100644 index 0000000000000..f8c30f91ca07b --- /dev/null +++ b/pkgs/development/python-modules/setuptools-scm/setup-hook.sh @@ -0,0 +1,32 @@ +# Let built package know its version. +# Usually, when a package uses setuptools-scm as a build-time dependency, it +# expects to get the package version from SCM data. However, while doing a nix +# build, the source tree doesn't contain SCM data, so we should almost always +# get the version from the derivation attribute. +version-pretend-hook() { + if [ -z "$dontPretendSetuptoolsSCMVersion" -a -z "$SETUPTOOLS_SCM_PRETEND_VERSION" ]; then + echo Setting SETUPTOOLS_SCM_PRETEND_VERSION to $version + export SETUPTOOLS_SCM_PRETEND_VERSION="$version" + fi +} + +# Include all tracked files. +# When a package uses setuptools-scm as a build-time dependency, it usually +# expects it to include all scm-tracked files in the built package, by default. +# This is the official setuptools-scm behavior, documented in +# https://setuptools-scm.readthedocs.io/en/latest/usage/#file-finders-hook-makes-most-of-manifestin-unnecessary +# and https://setuptools.pypa.io/en/latest/userguide/datafiles.html. +# However, while doing a nix build, the source tree doesn't contain SCM data, +# so it would include only `.py` files by default. +# We generate a MANIFEST.in automatically that includes all tracked files to +# emulate this behavior of setuptools-scm. +include-tracked-files-hook() { + if [ -z "$dontIncludeSetuptoolsSCMTrackedFiles" ]; then + echo Including all tracked files automatically + old_manifest="$(if [ -f MANIFEST.in ]; then cat MANIFEST.in; fi)" + echo 'global-include **' > MANIFEST.in + echo "$old_manifest" >> MANIFEST.in + fi +} + +preBuildHooks+=(version-pretend-hook include-tracked-files-hook) diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 93912d4b4ad31..231580cf9675e 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "setuptools"; - version = "68.2.2"; + version = "69.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "setuptools"; rev = "refs/tags/v${version}"; - hash = "sha256-PpZbITlYp/cA+8jmObw8g69TK+oE9YEXD3NNJixExB4="; + hash = "sha256-7xOZC85glpXPKdPTYOpwjQHRpkKL1hgbMFgJF3q5EW0="; }; patches = [ diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index ee1616f7b775d..05c9784b367f1 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -72,5 +72,6 @@ buildPythonPackage rec { changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index ee368852422a7..71b5d5e438bf4 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "shellingham"; - version = "1.5.1"; + version = "1.5.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sarugaku"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7hMlKw9oSGp57FQmbxdAgUsm5cFRr1oTW1ymJyYsgOg="; + hash = "sha256-xeBo3Ok+XPrHN4nQd7M8/11leSV/8z1f7Sj33+HFVtQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index e50717d5a8079..ebfbd86aeb03a 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.6.4"; + version = "1.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,11 +20,9 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BMwi3a7CPq58G30XlkJdSfSP6oc6u2AuSPAwEExI9zM="; + hash = "sha256-jplcKVXWogSrYRGch0qypWGNzO9HErR5B9S1iT4eFcM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix new file mode 100644 index 0000000000000..ae64e1eb057bc --- /dev/null +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, flit-core + +# dependencies +, appdirs +, cryptography +, id +, importlib-resources +, pydantic +, pyjwt +, pyopenssl +, requests +, rich +, securesystemslib +, sigstore-protobuf-specs +, sigstore-rekor-types +, tuf + +# tests +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sigstore-python"; + version = "2.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sigstore"; + repo = "sigstore-python"; + rev = "v${version}"; + hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + appdirs + cryptography + id + importlib-resources + pydantic + pyjwt + pyopenssl + requests + rich + securesystemslib + sigstore-protobuf-specs + sigstore-rekor-types + tuf + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "sigstore" + ]; + + meta = with lib; { + description = "A codesigning tool for Python packages"; + homepage = "https://github.com/sigstore/sigstore-python"; + changelog = "https://github.com/sigstore/sigstore-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 6863d1f1a889c..6d659cb7a490e 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -4,6 +4,7 @@ , backoff , beautifulsoup4 , buildPythonPackage +, certifi , docutils , fetchFromGitHub , poetry-core @@ -40,6 +41,7 @@ buildPythonPackage rec { aiohttp backoff beautifulsoup4 + certifi docutils pytz voluptuous diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index e1544a0b89a64..91b1b6c7002ee 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -5,26 +5,24 @@ , setuptools , setuptools-scm , py -, pytestCheckHook }: +, pytestCheckHook +}: buildPythonPackage rec { pname = "simpy"; - version = "4.0.2"; - format = "setuptools"; + version = "4.1.1"; + pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-bYrcAinfawL7fibc0TOHA7T09j8WelrCpyE8uAq6RIQ="; + hash = "sha256-BtB1CniEsR4OjiDOC8fG1O1fF0PUVmlTQNE/3/lQAaY="; }; nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ setuptools + setuptools-scm ]; nativeCheckInputs = [ @@ -33,6 +31,7 @@ buildPythonPackage rec { ]; meta = with lib; { + downloadPage = "https://github.com/simpx/simpy"; homepage = "https://simpy.readthedocs.io/en/${version}/"; description = "Process-based discrete-event simulation framework based on standard Python"; license = [ licenses.mit ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index ec9c843dc885e..4053e20a08d09 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "sip"; - version = "6.7.12"; + version = "6.8.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-COZvdCWS64GKyP2kFz4u1kyfLUC3C+4R2xxJkSfZhFA="; + hash = "sha256-LtGQSCDLZhtyB+sdzPrr7BpUY9ytkDukSK0ZRVAtCJw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix index 471f02e50bd86..f72eef539134d 100644 --- a/pkgs/development/python-modules/smbprotocol/default.nix +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jborean93"; repo = "smbprotocol"; rev = "refs/tags/v${version}"; - hash = "sha256-MhkeizBorDAlTLrvbsuzvrwrbBZv/dYA7Khvg/FrKoI="; + hash = "sha256-1huM+/WDrVJsB4ARh6fB6rLFOe9IqSQWr/A78FAk/Ag="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 5cfc8917a8c1d..70b538e43fa04 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -1,15 +1,27 @@ -{ lib, fetchPypi, buildPythonPackage, nosexcover }: +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +, nosexcover +}: buildPythonPackage rec { pname = "smmap"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.0"; + pyproject = true; + src = fetchPypi { inherit pname version; - sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; + hash = "sha256-jXkCjqbMEx2l6rCZpdlamY1DxneZVv/+O0VQQJEQdto="; }; - nativeCheckInputs = [ nosexcover ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + nosexcover + ]; meta = { description = "A pure python implementation of a sliding window memory map manager"; diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 41f7c2e10c3d7..d8857b971a31a 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.5.0"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PtD3fQnIqd79NcYFdDMlpNwhCY6PHGL/wDR/QnKdsFo="; + hash = "sha256-TxODQC/8iTEZdL2BDe4iADrvSvDzEqD9tVd4MzrRq/c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index cb07518e95d7d..cb39e27373a7f 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-9xAUMr1SWFePEvIz6DFEexk9Txex3u8wPNfMAdxEUCA="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index d81101ac9a9dc..e92218f0dfea3 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -14,12 +14,13 @@ , pythonOlder , requests , requests-oauthlib +, setuptools }: buildPythonPackage rec { pname = "social-auth-core"; - version = "4.5.0"; - format = "setuptools"; + version = "4.5.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,9 +28,13 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-core"; rev = "refs/tags/${version}"; - hash = "sha256-5WEXXLl0IUPMbji8bWjTbAjY8VSLOTQvrfSCE9+ui5Y="; + hash = "sha256-yji10s3oHwUcKUs1njctkkmODyQRgiQDSRqolJFTifw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography defusedxml diff --git a/pkgs/development/python-modules/soxr/default.nix b/pkgs/development/python-modules/soxr/default.nix index 941b6e596a2f0..b5d01a5ddbb2c 100644 --- a/pkgs/development/python-modules/soxr/default.nix +++ b/pkgs/development/python-modules/soxr/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { hash = "sha256-H2sueQq32o/9EHENANKVoiWlFoSF88P0LZ7DfEh/Esg="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ cython_3 gnutar diff --git a/pkgs/development/python-modules/spdx-tools/default.nix b/pkgs/development/python-modules/spdx-tools/default.nix index 06faf6ca261fd..415534bff531f 100644 --- a/pkgs/development/python-modules/spdx-tools/default.nix +++ b/pkgs/development/python-modules/spdx-tools/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { hash = "sha256-KB+tfuz0ZnoQcMX3H+IZXjcmPZ4x2ecl8ofz1/3r0/8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index f0eda6956e2cb..007528e228659 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-gJzrr3+/FsQN/HHDERxf/NECArwOaTqFwmI/Q2Z9HTM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index 59f832b999d64..7fff4b80debd2 100644 --- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -10,7 +10,7 @@ let pname = "sphinx-autodoc-typehints"; - version = "1.24.1"; + version = "1.25.2"; in buildPythonPackage { @@ -22,7 +22,7 @@ buildPythonPackage { src = fetchPypi { pname = "sphinx_autodoc_typehints"; inherit version; - hash = "sha256-Bmg6K3bDx7GTG3XkDgIRhm+7ULpMToAtCQHZtOhJrdI="; + hash = "sha256-PKvCU34XmJsvkuZKOZQlxMi/Vh7XPwh7x0FKUANhalA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/pkgs/development/python-modules/sphinx-mdinclude/default.nix index d20446e91bb04..64928f4379081 100644 --- a/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -1,11 +1,17 @@ { lib , buildPythonPackage -, fetchpatch , fetchPypi + +# build-system , flit-core + +# dependencies , docutils , mistune , pygments + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -19,13 +25,24 @@ buildPythonPackage rec { hash = "sha256-KZjj0YswIsmYPRtyGR/jfiX/zNVBZcvjrLIszu3ZGvQ="; }; - nativeBuildInputs = [ flit-core ]; - propagatedBuildInputs = [ mistune docutils ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + docutils + mistune + pygments + ]; - nativeCheckInputs = [ pygments ]; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { - homepage = "https://github.com/miyakogi/m2r"; + broken = true; # https://github.com/omnilib/sphinx-mdinclude/issues/22 + homepage = "https://github.com/omnilib/sphinx-mdinclude"; + changelog = "https://github.com/omnilib/sphinx-mdinclude/blob/v${version}/CHANGELOG.md"; description = "Sphinx extension for including or writing pages in Markdown format."; longDescription = '' A simple Sphinx extension that enables including Markdown documents from within diff --git a/pkgs/development/python-modules/sphinx-prompt/default.nix b/pkgs/development/python-modules/sphinx-prompt/default.nix index 776752d74c459..4d96a831d6263 100644 --- a/pkgs/development/python-modules/sphinx-prompt/default.nix +++ b/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -1,9 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook + +# build-system , poetry-core , poetry-dynamic-versioning + +# dependencies +, docutils +, pygments , sphinx + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -26,9 +36,27 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core poetry-dynamic-versioning + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "docutils" + "pygments" + "Sphinx" + ]; + + propagatedBuildInputs = [ + docutils + pygments + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook ]; - propagatedBuildInputs = [ sphinx ]; + # versions >=1.8.0 cannot be build from source + passthru.skipBulkUpdate = true; meta = with lib; { description = "A sphinx extension for creating unselectable prompt"; diff --git a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index fe056b3e70bca..1e8e0cd4b1e71 100644 --- a/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sphinx-rtd-theme"; - version = "1.3.0"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { pname = "sphinx_rtd_theme"; inherit version; - hash = "sha256-WQsDDHq7nPA47AU7leU4C1xw1hWR6wtVIGP758QfCTE="; + hash = "sha256-vV17gGIkBnYgc6BO+PrcX5FRJhVj1HAn3gmRDOA6/ms="; }; preBuild = '' diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 6dac59106f5f2..90dfcb1e6ef64 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -100,6 +100,11 @@ buildPythonPackage rec { disabledTests = [ # requires network access "test_latex_images" + # racy + "test_defaults" + "test_check_link_response_only" + "test_anchors_ignored_for_url" + "test_autodoc_default_options" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 3e8fe11d192fe..8a47fc39c5d74 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { ]; # Check is disabled due to circular dependency of sphinx + dontCheckRuntimeDeps = true; doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index b254d4b64327b..8d326fe1e0f92 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { ]; # Check is disabled due to circular dependency of sphinx + dontCheckRuntimeDeps = true; doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 56fae964eca0c..5a6b90fd3454a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { ]; # Check is disabled due to circular dependency of sphinx + dontCheckRuntimeDeps = true; doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 16c57f5886b78..fef662c85daef 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -26,9 +26,10 @@ buildPythonPackage rec { hash = "sha256-dc9bhr/af3NmrIfoVabM1lNpXbGVsJoj7jq0E1BAtHw="; }) (fetchpatch { - name = "fix-tests-with-sphinx7.2.patch"; - url = "https://github.com/sphinx-contrib/jquery/commit/03f1595b3793e087a407933fbcb757bdd3f558fc.patch"; - hash = "sha256-4gNG1DL/63N2FwXDy5fMApZpf/AGOGBruwPuVqgnVkc="; + # https://github.com/sphinx-contrib/jquery/pull/28 + name = "fix-tests-with-sphinx7.2-and-python312.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/3318a82854fccec528cd73e12ab2ab96d8e71064.patch"; + hash = "sha256-pNeKE50sm4b/KhNDAEQ3oJYGV4I8CVHnbR76z0obT3E="; }) ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 30c94a088fbff..9420c9882cbd2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-katex"; - version = "0.9.7"; + version = "0.9.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OmdUsc/JDhQeP3Pgg16vyCYtpfr+ekxnT6cI+rec69c="; + hash = "sha256-1ZTILfVLBI1Z1I5GsQn2IhezEaublSCMq5bZAvmj/ik="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 7fd16c67bdd46..3cba5c5011da6 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -33,8 +33,6 @@ buildPythonPackage rec { sphinxcontrib-httpdomain ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index d526f8aad8ee6..e098f7c919bdb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { ]; # Check is disabled due to circular dependency of sphinx + dontCheckRuntimeDeps = true; doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 4604eec5f1842..0f06dce774c51 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -23,6 +23,7 @@ buildPythonPackage rec { ]; # Check is disabled due to circular dependency of sphinx + dontCheckRuntimeDeps = true; doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index bd9ae779c081a..fec28e068154a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml ]; + # circular dependency on sphinx + dontCheckRuntimeDeps = true; doCheck = false; pythonNamespaces = [ "sphinxcontrib" ]; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 85a736bd880c6..4d2efd05dfd30 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-ZLIxbFgayG+WVvSXu74eZJ/PbSHg6dzkkIr1OBry4DE="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index a05a02966e07a..5015535680fb0 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -27,6 +27,7 @@ , pypemicro , pyserial , ruamel-yaml +, setuptools , sly , spsdk , testers @@ -37,18 +38,19 @@ buildPythonPackage rec { pname = "spsdk"; - version = "1.11.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B3qedAXSG3A8rcWu1O2GnZ1ZqHN+7fQK43qXzGnDEY0="; + hash = "sha256-1aW5ivdpnSscTaMIRn4tlsBG6StN95gHAyRIzmAO9Uo="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index 1821ed3ef8dfb..54422df03e5a6 100644 --- a/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-4zLXB3UQh6pgQ80KrxkLeC5yiv1R8t2+JmSukmGXr7I="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 95e357cabda94..5c000e9c7c800 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -52,6 +52,10 @@ buildPythonPackage rec { hash = "sha256-ldBn+pdZfqnBKdYkOcG47ScH/hBgeJBeIvn1hCIBw/A="; }; + postPatch = '' + sed -i '/tag_build = dev/d' setup.cfg + ''; + nativeBuildInputs =[ setuptools ] ++ lib.optionals (!isPyPy) [ diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index b0bb24399122b..76c6027fca4b1 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-aImshQ5jf0k62ucpK4X8G7uHGAFQkhGgjMYo4mvSvew="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; # optional dependency used in the sqlglot optimizer diff --git a/pkgs/development/python-modules/sqltrie/default.nix b/pkgs/development/python-modules/sqltrie/default.nix index 09eac58bae7ca..2fd40b96cfb84 100644 --- a/pkgs/development/python-modules/sqltrie/default.nix +++ b/pkgs/development/python-modules/sqltrie/default.nix @@ -23,8 +23,6 @@ buildPythonPackage rec { hash = "sha256-4+jj9kRT6AR8u9nIlEkILY+/GQ7EBRd5V2oLeMLSo3o="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 295ebc98a9415..cc7c4e5667dff 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-mORjMEg7Q/2CKZBLICSGF8dcdl98S6mBgJ4jujPGs6M="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov" "" diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix index 07c8f6a6c5849..c9550c57715ba 100644 --- a/pkgs/development/python-modules/sshfs/default.nix +++ b/pkgs/development/python-modules/sshfs/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-6MueDHR+jZFDZg4zufEVhBtSwcgDd7KnW9gJp2hDu0A="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/stack-data/default.nix b/pkgs/development/python-modules/stack-data/default.nix index 370aaf8746f96..d6cbacf3abd08 100644 --- a/pkgs/development/python-modules/stack-data/default.nix +++ b/pkgs/development/python-modules/stack-data/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-brXFrk1UU5hxCVeRvGK7wzRA0Hoj9fgqoxTIwInPrEc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ git setuptools-scm diff --git a/pkgs/development/python-modules/stanio/default.nix b/pkgs/development/python-modules/stanio/default.nix index 83fcc79031071..daf889dba6889 100644 --- a/pkgs/development/python-modules/stanio/default.nix +++ b/pkgs/development/python-modules/stanio/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "stanio"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DFBK5nG41Sah2nEYWsAqJ3VQj/5tPbkfJC6shbz2BG8="; + hash = "sha256-i1hqwUs1zeGq0Yjb+FgkUVxoQtyVGitBHdE4+1w1/J8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index acac9c99f13ab..137bd59c703c7 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.31.1"; + version = "0.32.0.post1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Tq414cEpXX8MQDR0KYyB+J7lFqorbiwP/sGnUFvs7wA="; + hash = "sha256-1twyN3fSlxwfDtyqaFFuCAVehLZ8vCV4voCT7CVSEbk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix index cdaca053ee1da..3ec25b5061e8b 100644 --- a/pkgs/development/python-modules/starline/default.nix +++ b/pkgs/development/python-modules/starline/default.nix @@ -2,14 +2,13 @@ , buildPythonPackage , pythonOlder , fetchPypi -, fetchpatch , setuptools , requests }: buildPythonPackage rec { pname = "starline"; - version = "0.1.5"; + version = "0.2.0"; disabled = pythonOlder "3.5"; @@ -17,17 +16,9 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-F1P1/NKml2rtd1r7A/g5IVnwQMZzkXzAxjRRDZXBPLk="; + hash = "sha256-VQsAq5XPWdkz93CKurQKTkHleQ5itlNHGv6Go68zIOY="; }; - patches = [ - # https://github.com/Anonym-tsk/starline/pull/5 - (fetchpatch { - url = "https://github.com/Anonym-tsk/starline/commit/4e6cdf8e05c5fb8509ee384e77b39a2495587160.patch"; - hash = "sha256-y9b6ePH3IEgmt3ALHQGwH102rlm4KfmH4oIoIC93cWU="; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index adc6db83dd9bd..aba55ddfcb09f 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -58,5 +58,7 @@ buildPythonPackage rec { changelog = "https://github.com/steamship-core/python-client/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; + # https://github.com/steamship-core/python-client/issues/503 + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/stestr/default.nix b/pkgs/development/python-modules/stestr/default.nix index 160b3d15b1133..8f23b10060514 100644 --- a/pkgs/development/python-modules/stestr/default.nix +++ b/pkgs/development/python-modules/stestr/default.nix @@ -5,20 +5,22 @@ , fixtures , future , pbr +, setuptools , subunit , testtools +, tomlkit , voluptuous , callPackage }: buildPythonPackage rec { pname = "stestr"; - version = "4.0.1"; - format = "setuptools"; + version = "4.1.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wsHHO/x8/KORJxWeP7x0GTrr8s0C2KBCfy5YZI42zyY="; + hash = "sha256-X2HDae7OY8KS0TWZ4SqhWK92hZkGQ/JN1vp/q/406Yo="; }; postPatch = '' @@ -27,6 +29,11 @@ buildPythonPackage rec { rm test-requirements.txt ''; + nativeBuildInputs = [ + pbr + setuptools + ]; + propagatedBuildInputs = [ cliff fixtures @@ -34,6 +41,7 @@ buildPythonPackage rec { pbr subunit testtools + tomlkit voluptuous ]; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 55a86231aa708..00de51ea66f5b 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -1,30 +1,53 @@ { lib , buildPythonPackage -, isPy27 , fetchPypi + +# build-system +, flit-core + +# dependenices , progress , pyserial -, pytest -, mock + +# optional-dependencies +, intelhex + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "stm32loader"; - version = "0.5.1"; - format = "setuptools"; + version = "0.7.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "0135qzxlrivvkq6wgkw7shfz94n755qs2c1754p1hc2jk0nqayrg"; + hash = "sha256-QTLSEjdJtDH4GCamnKHN5pEjW41rRtAMXxyZZMM5K3w="; }; - propagatedBuildInputs = [ progress pyserial ]; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + progress + pyserial + ]; + + passthru.optional-dependencies = { + hex = [ + intelhex + ]; + }; - nativeCheckInputs = [ pytest ] ++ lib.optional isPy27 mock; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); - checkPhase = '' - pytest --strict tests/unit - ''; + pytestFlagsArray = [ + "tests/unit" + ]; meta = with lib; { description = "Flash firmware to STM32 microcontrollers in Python"; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 8954713338025..194d942669ad6 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -61,6 +61,12 @@ buildPythonPackage rec { url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; }) + (fetchpatch { + # https://github.com/strawberry-graphql/strawberry/pull/3255 + name = "fix-tests-with-pydantic_2.patch"; + url = "https://github.com/strawberry-graphql/strawberry/commit/0a0dc284ee6d31d4e82ac7ff1ed9fea4dff39fa6.patch"; + hash = "sha256-LACWD7XA6YL/apJwhpx3LPCKxKUfa+XWyTLK+Zkxlaw="; + }) ]; postPatch = '' @@ -176,6 +182,8 @@ buildPythonPackage rec { "tests/websockets/test_graphql_transport_ws.py" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "A GraphQL library for Python that leverages type annotations"; homepage = "https://strawberry.rocks"; diff --git a/pkgs/development/python-modules/stringparser/default.nix b/pkgs/development/python-modules/stringparser/default.nix index 44e6d6baa52f4..900f102088060 100644 --- a/pkgs/development/python-modules/stringparser/default.nix +++ b/pkgs/development/python-modules/stringparser/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-gj0ooeb869JhlB9Mf5nBydiV2thTes8ys+BLJ516iSA="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 20d1ba2c0a56e..f53e3c90945dd 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -8,9 +8,9 @@ , pretend , pytest-asyncio , pytestCheckHook -, pythonAtLeast , pythonOlder , simplejson +, twisted , typing-extensions }: @@ -28,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-KSHKgkv+kObKCdWZDg5o6QYe0AMND9VLdEuseY/GyDY="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-fancy-pypi-readme hatch-vcs @@ -46,6 +44,12 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook simplejson + twisted + ]; + + disabledTests = [ + # _pickle.PicklingError: Only BytesLoggers to sys.stdout and sys.stderr can be pickled. + "test_pickle" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index eb27ffdfb9829..299d7a2ecd29c 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -7,6 +7,7 @@ , pythonOlder # python dependencies +, extras , fixtures , hypothesis , pytestCheckHook @@ -32,7 +33,11 @@ buildPythonPackage { ]; buildInputs = [ check cppunit ]; - propagatedBuildInputs = [ testtools ]; + + propagatedBuildInputs = [ + extras + testtools + ]; nativeCheckInputs = [ testscenarios diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index a676f28d2758b..732828e908ac1 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7tmyywyfQw1T9qr5UbPH/KR+AmmhSaHunkeUGRKDl+Q="; + hash = "sha256-C5UnKp0EqzxSHTokdSJmfIOMBI6yXpWSazTxcSLOIvI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index f0d65a96ddc53..e7c3aaa04589a 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -36,8 +36,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "superqt" ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - meta = with lib; { description = "Missing widgets and components for Qt-python (napari/superqt)"; homepage = "https://github.com/napari/superqt"; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 55638abad0031..aaa7cba6494e5 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { six ]; + doCheck = pythonOlder "3.12"; # nose requires imp module + nativeCheckInputs = [ nose ]; diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 6f3cd92d90eda..13ebaed72c6d4 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -1,22 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi, jinja2, flake8 }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +# build-system +, poetry-core + +# dependencies +, importlib-resources +, jinja2 + + }: buildPythonPackage rec { pname = "swagger-ui-bundle"; - version = "0.0.9"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; src = fetchPypi { pname = "swagger_ui_bundle"; inherit version; - sha256 = "b462aa1460261796ab78fd4663961a7f6f347ce01760f1303bbbdf630f11f516"; + hash = "sha256-IGc8NDHIcz1dFhXs952azzDP91ICrK8hp9nH9IlxRSk="; }; - # patch away unused test requirements since package contains no tests - postPatch = '' - substituteInPlace setup.py --replace "setup_requires=['pytest-runner', 'flake8']" "setup_requires=[]" - ''; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ jinja2 ]; + propagatedBuildInputs = [ + jinja2 + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ]; # package contains no tests doCheck = false; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 3879520b25100..56cb2898bf1f4 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -12,6 +12,7 @@ , numpy , numexpr , packaging +, setuptools , sphinx # Test inputs , python @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "tables"; - version = "3.8.0"; - format = "setuptools"; + version = "3.9.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NPP6I2bOILGPHfVzp3wdJzBs4fKkHZ+e/2IbUZLqh4g="; + hash = "sha256-1HAmPC5QxLfIY1oNmawf8vnnBMJNceX6M8RSnn0K2cM="; }; patches = [ @@ -48,6 +49,7 @@ buildPythonPackage rec { nativeBuildInputs = [ blosc2 cython + setuptools sphinx ]; diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 3ce734237ce4d..bdc31012cf2d0 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -31,8 +31,6 @@ buildPythonPackage rec { --replace '"java"' '"${lib.getExe jre}"' ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 99420e9e32feb..f857585c9b238 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-AJWxK/WWbeUpwP6x+ghnFnGzNo7sd9fverEUviwGizw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/tank-utility/default.nix b/pkgs/development/python-modules/tank-utility/default.nix index 03d9c6c77d732..358ebbb0d82c7 100644 --- a/pkgs/development/python-modules/tank-utility/default.nix +++ b/pkgs/development/python-modules/tank-utility/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tank-utility"; version = "1.5.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,11 +24,14 @@ buildPythonPackage rec { hash = "sha256-h9y3X+FSzSFt+bd/chz+x0nocHaKZ8DvreMxAYMs8/E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests urllib3 - setuptools - ] ++ urllib3.optional-dependencies.secure; + ]; nativeCheckInputs = [ mock diff --git a/pkgs/development/python-modules/tatsu/default.nix b/pkgs/development/python-modules/tatsu/default.nix index 4d376dc6d2ca0..635f9f34fcf9f 100644 --- a/pkgs/development/python-modules/tatsu/default.nix +++ b/pkgs/development/python-modules/tatsu/default.nix @@ -5,12 +5,13 @@ , pytestCheckHook , pythonOlder , regex +, setuptools }: buildPythonPackage rec { pname = "tatsu"; - version = "5.8.3"; - format = "setuptools"; + version = "5.10.6"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - hash = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro="; + hash = "sha256-oCYvDP8TbafyJAgl3k7fZ8MKk9prPytvl971s2BCyWA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ colorama regex diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index e735f6aae217a..283bfcd83e402 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -1,15 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi + +# build-system +, setuptools +}: buildPythonPackage rec { pname = "tblib"; - version = "2.0.0"; - format = "setuptools"; + version = "3.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-pt8w8nLAi/i+ZuB3X62GIAXZUKa4RJuU98eIcx1w7Nc="; + hash = "sha256-k2InkKCingTwNGRY+s4eFE3E0y9JNxTGw9/4Kkrbd+Y="; }; + nativeBuildInputs = [ + setuptools + ]; + meta = with lib; { description = "Traceback fiddling library. Allows you to pickle tracebacks."; homepage = "https://github.com/ionelmc/python-tblib"; diff --git a/pkgs/development/python-modules/tcxreader/default.nix b/pkgs/development/python-modules/tcxreader/default.nix index 9442567eec085..1334708fc7f72 100644 --- a/pkgs/development/python-modules/tcxreader/default.nix +++ b/pkgs/development/python-modules/tcxreader/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "tcxreader"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "alenrajsp"; repo = "tcxreader"; rev = "refs/tags/v${version}"; - hash = "sha256-CiOLcev9fo2BPgnPZZ2borU25f/gKISqRAapAHgLN3w="; + hash = "sha256-J7yzJfJr2EK/0hZLVgk+Poqr/vY/9bsgA6cePTQ45U0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboard-data-server/default.nix b/pkgs/development/python-modules/tensorboard-data-server/default.nix index 5ff48c7cc3d12..6277049f92a0e 100644 --- a/pkgs/development/python-modules/tensorboard-data-server/default.nix +++ b/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "tensorboard-data-server"; - version = "0.7.1"; + version = "0.7.2"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { inherit version format; dist = "py3"; python = "py3"; - hash = "sha256-mTi9OfUEF5ezOSEGb7oOqwOg3RDRiHoF5irliEGtTD8="; + hash = "sha256-fgYQ0gWIlYiYODbsBdwJjoD5e357v/fplOu3j1eNDds="; }; pythonImportsCheck = [ "tensorboard_data_server" ]; diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 73c76d74771c4..d06c9e6d7d8ed 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.14.0"; + version = "2.15.1"; format = "wheel"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-Nmf5dF2ZKAg2rWcwIjYshA9g7Y/v1aPjC/Bx9aj9ABc="; + hash = "sha256-xGwdHPE6RYxCmGiniyUx2P9faCBY1p7AhAsLx6OPHA8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 6097d2ecfd811..e0a72af7a1358 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -36,8 +36,6 @@ buildPythonPackage rec { # required to make tests deterministic env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ crc32c numpy diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 0d40a1b44f96c..9a0af4e558e23 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "termcolor"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-tbCPaJN/E4/pL2wIm5nx4toK5WxSt4v3B1/ZVCD9mlo="; + hash = "sha256-qrnlYEfIrEHteY+jbYkqN6yms+kVnz4MJLxkqbOse3o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 3c75305e9078f..3de51ffcad2cc 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.17.1"; + version = "0.18.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-bMu806T4olpewEmR85oLjbUt/NSH6g5XjZd+Z1I4AzM="; + hash = "sha256-HqCKibg13RuMDJANkoSBR87yU3JDNhsuP03BXfm2/e0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix index 50fc9b2be6bbe..1feefef49b6f5 100644 --- a/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -5,12 +5,13 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "tesla-powerwall"; - version = "0.3.19"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "jrester"; repo = "tesla_powerwall"; rev = "refs/tags/v${version}"; - hash = "sha256-ClrMgPAMBtDMfD6hCJIN1u4mp75QW+c3re28v3FreQg="; + hash = "sha256-IqUxWwEvrSEbLAEnHG84oCV75qO0L5LmgpHOfaM6G8o="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 64b49efbd1de9..911d1496165f1 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -1,10 +1,12 @@ { lib , buildPythonPackage +, fetchpatch , fetchPypi , mock , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools , sybil , twisted , zope-component @@ -12,8 +14,8 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "7.2.0"; - format = "setuptools"; + version = "7.2.2"; + pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. # Any attempt by non-standard pip workflows to comment on issues will @@ -25,9 +27,22 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-jIwg3TDqETVIUHWEodqud5JI26pXEmcseruXCfD7+LI="; + hash = "sha256-gHdK7LAklFgnWreD9TCT++dXlf8rMhjSLOP/8KEsTaY="; }; + patches = [ + # https://github.com/simplistix/testfixtures/pull/188 + (fetchpatch { + name = "python3.12-compatibility.patch"; + url = "https://github.com/simplistix/testfixtures/commit/2b80b195e30e12c739dc4f98e9de17dec8f3558a.patch"; + hash = "sha256-LrC0uI4k3F6ZGTqbKi319tRbVk5557xbyzQN36Y1160="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ mock pytestCheckHook diff --git a/pkgs/development/python-modules/testrail-api/default.nix b/pkgs/development/python-modules/testrail-api/default.nix index b6bb8a1b22568..e23563de6ec8a 100644 --- a/pkgs/development/python-modules/testrail-api/default.nix +++ b/pkgs/development/python-modules/testrail-api/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-lIlTrAdNtBJdwiSFwpcHA2e+fRC+MbHS0PX7prAN+RY="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index 4a9d43d6246d6..724a6c3643583 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -1,23 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, python -, pbr, fixtures, testtools }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pbr +, fixtures +, testtools +, unittestCheckHook +}: buildPythonPackage rec { pname = "testresources"; version = "2.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "ee9d1982154a1e212d4e4bac6b610800bfb558e4fb853572a827bc14a96e4417"; }; - propagatedBuildInputs = [ pbr ]; + postPatch = '' + substituteInPlace testresources/tests/test_resourced_test_case.py \ + --replace "failIf" "assertFalse" + ''; - nativeCheckInputs = [ fixtures testtools ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = '' - ${python.interpreter} -m testtools.run discover - ''; + propagatedBuildInputs = [ + pbr + ]; + + nativeCheckInputs = [ + fixtures + testtools + unittestCheckHook + ]; meta = with lib; { description = "Pyunit extension for managing expensive test resources"; diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 4e7dcef3e90d8..8218947d68683 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -1,13 +1,22 @@ { lib , buildPythonPackage , fetchPypi + +# build-system +, pbr +, setuptools + +# dependencies , testtools + +# tests +, python }: buildPythonPackage rec { pname = "testscenarios"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -20,11 +29,27 @@ buildPythonPackage rec { --replace "catch = 1" "" ''; - propagatedBuildInputs = [ testtools ]; + nativeBuildInputs = [ + pbr + setuptools + ]; + + propagatedBuildInputs = [ + pbr + testtools + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} -m testtools.run testscenarios.tests.test_suite + + runHook postCheck + ''; meta = with lib; { description = "A pyunit extension for dependency injection"; - homepage = "https://pypi.python.org/pypi/testscenarios"; + homepage = "https://github.com/testing-cabal/testscenarios"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 24fa17a446239..ffc007af7acf6 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -1,33 +1,43 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , pythonRelaxDepsHook -, pbr -, python-mimeparse -, extras -, traceback2 -, testscenarios + +# build-system +, hatchling +, hatch-vcs + +# dependencies +, setuptools }: buildPythonPackage rec { pname = "testtools"; - version = "2.6.0"; - format = "setuptools"; + version = "2.7.1"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-KLZeFMDy0+y7+19VydzeXk+qgKwWo3qCOQmh/jy8swo="; + sha256 = "sha256-323pYBDinuIfY3oUfqvzDVCyXjhB3R1o+T7onOd+Nmw="; }; - propagatedBuildInputs = [ pbr python-mimeparse extras ]; - buildInputs = [ traceback2 ]; - nativeBuildInputs = [ pythonRelaxDepsHook ]; + nativeBuildInputs = [ + hatchling + hatch-vcs + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "fixtures" + ]; + + propagatedBuildInputs = lib.optionals (pythonAtLeast "3.12") [ + setuptools + ]; # testscenarios has a circular dependency on testtools doCheck = false; - nativeCheckInputs = [ testscenarios ]; - - pythonRemoveDeps = [ "fixtures" ]; meta = { description = "A set of extensions to the Python standard library's unit testing framework"; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 14d7c34cf4068..0bca52547c757 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -19,6 +19,12 @@ buildPythonPackage rec { hash = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg="; }; + # upstream forgot to update the release version + postPatch = '' + substituteInPlace textfsm/__init__.py \ + --replace "1.1.2" "1.1.3" + ''; + propagatedBuildInputs = [ six future diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 3a5486ff86e69..d407212eb963a 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.41.0"; + version = "0.44.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-K3JpAVkw6njUT2AGGLL3ACagPK0K6Ny4PvCsbmuNvTo="; + hash = "sha256-8PMK4fPbtIEUuy7bVWE6JUZzknBP5DnGT3kYKwHf6Zs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thelogrus/default.nix b/pkgs/development/python-modules/thelogrus/default.nix index 1dc3f301dfea1..5fe496bda795f 100644 --- a/pkgs/development/python-modules/thelogrus/default.nix +++ b/pkgs/development/python-modules/thelogrus/default.nix @@ -5,6 +5,7 @@ , poetry-core , pyaml , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -23,6 +24,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pyaml" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/threat9-test-bed/default.nix b/pkgs/development/python-modules/threat9-test-bed/default.nix index 4eab16c304e37..b7d523b376846 100644 --- a/pkgs/development/python-modules/threat9-test-bed/default.nix +++ b/pkgs/development/python-modules/threat9-test-bed/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-0YSjMf2gDdrvkDaT77iwfCkiDDXKHnZyI8d7JmBSuCg="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 1b9582a71c8b9..20858e870c73e 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.8.30"; + version = "2023.9.26"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-aoxTsBKihrddCaFJirMvIC8kzGJwoQW11ZEdxEJvFio="; + hash = "sha256-Z+NV5Flaqzl/hAXQSv4bSufG9ipE4i2TP+4aVxpIx64="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 516a22f44ccef..d7c724ab25d2e 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.23.0"; + version = "0.24.0"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; rev = "refs/tags/${version}"; - hash = "sha256-QxqUYu8y+k5SLRFtxpcs57gnAHgXIre0smURlqUzC1s="; + hash = "sha256-EcWqh/xFyFvTuyzsPuAkT67O0y8TPWt2MvXVPnaQzrg="; }; nativeBuildInputs = [ @@ -48,8 +48,6 @@ buildPythonPackage rec { TILEDB_PATH = tiledb; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - disabled = !isPy3k; # Not bothering with python2 anymore postPatch = '' diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 799570ada1b85..6ce2e7194c8cd 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonAtLeast , pythonOlder +, setuptools , backports-zoneinfo , python-dateutil , pytestCheckHook @@ -10,18 +11,22 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.12.0"; - format = "setuptools"; + version = "2.13.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "adamchainz"; repo = pname; rev = version; - hash = "sha256-vBww78/3vC3IA4Nh9Ne+rBo/CO9FggjP+TUUV2/ih9c="; + hash = "sha256-SjenPLLr4JoWK5HAokwgW+bw3mfAZiuDb1N7Za5wtrw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ @@ -33,6 +38,8 @@ buildPythonPackage rec { ]; disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # https://github.com/adamchainz/time-machine/issues/405 + "test_destination_string_naive" # Assertion Errors related to Africa/Addis_Ababa "test_destination_datetime_tzinfo_zoneinfo_nested" "test_destination_datetime_tzinfo_zoneinfo_no_orig_tz" @@ -45,6 +52,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/adamchainz/time-machine/blob/${src.rev}/CHANGELOG.rst"; description = "Travel through time in your tests"; homepage = "https://github.com/adamchainz/time-machine"; license = licenses.mit; diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 04c14fe5f0680..d51cb5b35eeeb 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.11.2"; + version = "23.11.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PPB/BTZLuHmbKmUIe5gZMAwV+TUDqXBYg6fKsokTotg="; + hash = "sha256-YzS69Sapwbg29usIz93hSEPiDjulFdCTeXbX4I8ZW+Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 6cd8e7faa1e13..026a033357fd2 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-aJbbfNnQvmmYPXVOO+xx7ADetsxE+jnVQOVDzV5jUp8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 58dffe94a66b9..12b6c51a76791 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -27,8 +27,6 @@ buildPythonPackage rec { hash = "sha256-/VBbU8FuB8MEuX6MgGO44+gfqVjl1aHHDHncHY2Jo38="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index c3b08bad24e00..ee0dfefab6456 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -83,6 +83,9 @@ buildPythonPackage rec { "toggl" ]; + # updates to a bogus tag + passthru.skipBulkUpdate = true; + meta = with lib; { description = "Command line tool and set of Python wrapper classes for interacting with toggl's API"; homepage = "https://toggl.uhlir.dev/"; diff --git a/pkgs/development/python-modules/tokenize-rt/default.nix b/pkgs/development/python-modules/tokenize-rt/default.nix index 46af9553fcd15..695ce44c20a83 100644 --- a/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/pkgs/development/python-modules/tokenize-rt/default.nix @@ -2,23 +2,31 @@ , lib , fetchFromGitHub , isPy27 +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "tokenize-rt"; - version = "4.2.1"; - format = "setuptools"; + version = "5.2.0"; + pyproject = true; + disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - hash = "sha256-YNt4YwkuA3DVq4EjJaIES9V3A6ENa3k6/qVKisjA5Pc="; + hash = "sha256-G4Dn6iZLVOovzfEt9eMzp93mTX+bo0tHI5cCbaJLxBQ="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "A wrapper around the stdlib `tokenize` which roundtrips"; diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock index ced7f15387348..295d232e6b38e 100644 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -79,15 +79,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -97,9 +100,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -107,9 +110,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -119,21 +122,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -255,9 +258,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -267,9 +270,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -280,25 +283,14 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "esaxx-rs" version = "0.1.10" @@ -322,9 +314,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -339,9 +331,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "humantime" @@ -405,9 +397,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "lazy_static" @@ -417,21 +409,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -439,9 +431,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "macro_rules_attribute" @@ -461,9 +453,9 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", @@ -471,9 +463,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -508,7 +500,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] @@ -536,9 +528,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -555,9 +547,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -623,15 +615,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -648,9 +640,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "ppv-lite86" @@ -660,9 +652,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -729,9 +721,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -805,41 +797,47 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustc-hash" @@ -849,11 +847,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "ffb93593068e9babdad10e4fce47dc9b3ac25315a72a59766ffd9e9a71996a04" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -862,41 +860,41 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.171" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.102" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -905,9 +903,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "spm_precompiled" @@ -940,9 +938,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.25" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -951,15 +949,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", @@ -970,36 +968,36 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.39", ] [[package]] name = "tokenizers" -version = "0.14.1" +version = "0.15.0" dependencies = [ "aho-corasick", "clap", @@ -1018,7 +1016,7 @@ dependencies = [ "rayon", "rayon-cond", "regex", - "regex-syntax", + "regex-syntax 0.7.5", "serde", "serde_json", "spm_precompiled", @@ -1030,7 +1028,7 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.14.1" +version = "0.15.0" dependencies = [ "env_logger", "itertools", @@ -1048,9 +1046,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization-alignments" @@ -1115,9 +1113,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1143,7 +1141,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -1163,17 +1161,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -1184,9 +1182,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -1196,9 +1194,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -1208,9 +1206,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -1220,9 +1218,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -1232,9 +1230,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -1244,9 +1242,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -1256,6 +1254,6 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index d8a731825feb3..4486d9f9f0f3b 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.14.1"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -69,7 +69,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; + hash = "sha256-+yfX12eKtgZV1OQvPOlMVTONbpFuigHcl4SjoCIZkSk="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 6d2ad4815b5a2..040dc6c1ed296 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-2OQaJR70bx8qWs1IPErF+B3X1iRvHW74axTqtdvum3U="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 605291edda0b5..fa978be73bbd2 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.12.1"; + version = "0.12.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OOH/jtuZEnPsn2GBJEpqORrDDp9QmOdTVkDqa+l6fIY="; + hash = "sha256-dbr1AS0GUB8HvuW/joAbnzQ+eqxaklgfIPgM5jLmtaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index f9635d5617d46..f6f3baaefe252 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.11.1"; + version = "2023.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-XyoyPMhp7KZrizAehuFnBAWYliv9A7D2JjGA+lO3p7Y="; + hash = "sha256-iEQC02KuBWtk8yQwM/fU28ilbmCWeAjilvR6fHVexuI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 1b0bf1755ab73..8d227bb5df85c 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.11.3"; + version = "4.11.4"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-VLoWRAiQ1TP9S0f8TKwQ0H2Lgemd+dTzSM+TjhioDMk="; + hash = "sha256-pZmT8392YuHzCrAquPpveByYw3x6bkMGCUToCAqAGc8="; }; postPatch = '' @@ -39,8 +39,6 @@ buildPythonPackage rec { --replace "packaging>=22" "packaging" ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatchling hatch-vcs diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 640e62212081f..6cf4c9713f9e4 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, pythonAtLeast , setuptools , setuptools-scm , wheel @@ -19,6 +20,9 @@ buildPythonPackage rec { version = "4.66.1"; format = "pyproject"; + # https://github.com/tqdm/tqdm/issues/1537 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-2I5lH5242FUaYlVtPP+eMDQnTKXWbpMZfPJJDi3Lacc="; diff --git a/pkgs/development/python-modules/tracerite/default.nix b/pkgs/development/python-modules/tracerite/default.nix index 981cd2087456d..9b98e986bb362 100644 --- a/pkgs/development/python-modules/tracerite/default.nix +++ b/pkgs/development/python-modules/tracerite/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-rI1MNdYl/P64tUHyB3qV9gfLbGbCVOXnEFoqFTkaqgg="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 6df71a041b253..f138489cf2bf0 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -1,27 +1,46 @@ { lib , buildPythonPackage , fetchPypi -, pytestCheckHook , pythonOlder + +# build-system , hatchling + +# tests +, argcomplete +, pytest-mock +, pytestCheckHook }: buildPythonPackage rec { pname = "traitlets"; - version = "5.10.0"; + version = "5.14.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9YTqIJJARm5m6R88gap9AEukz3lJkLDHdZOKFUQhfNE="; + hash = "sha256-/NqorEnATfoO0+4zhO9t/bXW83QVAr4kcnlAdnkpZ3I="; }; - nativeBuildInputs = [ hatchling ]; + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + argcomplete + pytest-mock + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # requires mypy-testing + "tests/test_typing.py" + ]; meta = { + changelog = "https://github.com/ipython/traitlets/blob/v${version}/CHANGELOG.md"; description = "Traitlets Python config system"; homepage = "https://github.com/ipython/traitlets"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index efee6e3d1fa47..c6d8e538e6a60 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.35.2"; + version = "4.36.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-h1RMSEcuali05AWeTm1wyZQJz6XrHamCF1eHrSnFnfM="; + hash = "sha256-sVWDpChLjiSZQXyXsZtTUZMF/CckTaJzitk3hpagM64="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 69e0c2c9d40d6..b2f020a8e3793 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,25 +1,41 @@ { lib , fetchPypi , buildPythonPackage + +# build-system +, incremental +, setuptools + +# dependenices +, attrs +, hyperlink , requests , twisted -, incremental + +# tests , httpbin }: buildPythonPackage rec { pname = "treq"; - version = "22.2.0"; - format = "setuptools"; + version = "23.11.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-33V+PxQfx4Lt4HamBFIRlP/LQPomRc9I5aNwYDB/Uuw="; + hash = "sha256-CRT/kp/RYyzhZ5cjUmD4vBnSD/fEWcHeq9ZbjGjL6sU="; }; + nativeBuildInputs = [ + incremental + setuptools + ]; + propagatedBuildInputs = [ - requests + attrs + hyperlink incremental + requests twisted ] ++ twisted.optional-dependencies.tls; @@ -29,7 +45,11 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck + trial treq + + runHook postCheck ''; meta = with lib; { diff --git a/pkgs/development/python-modules/trio-asyncio/default.nix b/pkgs/development/python-modules/trio-asyncio/default.nix index 3585e2519918a..de238ddc7c23f 100644 --- a/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/pkgs/development/python-modules/trio-asyncio/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , trio , outcome , sniffio +, exceptiongroup , pytest-trio , pytestCheckHook , pythonAtLeast @@ -12,15 +14,15 @@ buildPythonPackage rec { pname = "trio-asyncio"; - version = "0.12.0"; - format = "setuptools"; + version = "0.13.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "trio_asyncio"; inherit version; - sha256 = "824be23b0c678c0df942816cdb57b92a8b94f264fffa89f04626b0ba2d009768"; + hash = "sha256-fKJLIaGxes3mV1LWkziGuiQoTlL0srDe/k6o7YpjSmI="; }; postPatch = '' @@ -28,10 +30,16 @@ buildPythonPackage rec { --replace "'pytest-runner'" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ trio outcome sniffio + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; nativeCheckInputs = [ @@ -39,26 +47,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - # https://github.com/python-trio/trio-asyncio/issues/112 - "-W" "ignore::DeprecationWarning" - # trio.MultiError is deprecated since Trio 0.22.0; use BaseExceptionGroup (on Python 3.11 and later) or exceptiongroup.BaseExceptionGroup (earlier versions) instead (https://github.com/python-trio/trio/issues/2211) - "-W" "ignore::trio.TrioDeprecationWarning" - ]; - disabledTestPaths = [ "tests/python" # tries to import internal API test.test_asyncio ]; - disabledTests = lib.optionals (pythonAtLeast "3.11") [ - "test_run_task" - ]; - pythonImportsCheck = [ "trio_asyncio" ]; meta = with lib; { + changelog = "https://github.com/python-trio/trio-asyncio/blob/v${version}/docs/source/history.rst"; description = "Re-implementation of the asyncio mainloop on top of Trio"; homepage = "https://github.com/python-trio/trio-asyncio"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index c01db3259a7d9..648f91f07b9ba 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -1,20 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv + +# build-system +, setuptools + +# dependencies , attrs -, sortedcontainers -, async-generator , exceptiongroup , idna , outcome +, sniffio +, sortedcontainers + +# tests +, astor +, coreutils +, jedi +, pyopenssl , pytestCheckHook , pytest-trio -, pyopenssl , trustme -, sniffio -, stdenv -, jedi -, astor , yapf -, coreutils }: let @@ -28,22 +37,26 @@ let in buildPythonPackage rec { pname = "trio"; - version = "0.22.2"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.23.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OIfPGMi8yJRDNCAwVGg4jax2ky6WaK+hxJqjgGtqzLM="; + hash = "sha256-FviffcyPe53N7B/Nhj4MA5r20PmiL439Vvdddexz/Ug="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs - sortedcontainers - async-generator idna outcome sniffio + sortedcontainers ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ]; @@ -81,6 +94,11 @@ buildPythonPackage rec { "test_static_tool_sees_class_members" ]; + disabledTestPaths = [ + # linters + "trio/_tests/tools/test_gen_exports.py" + ]; + pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" ]; diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix index 041f3db4c803b..3485c0f1fd2ce 100644 --- a/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/pkgs/development/python-modules/trove-classifiers/default.nix @@ -4,19 +4,20 @@ , calver , pytestCheckHook , pythonOlder +, setuptools }: let self = buildPythonPackage rec { pname = "trove-classifiers"; - version = "2023.11.22"; - format = "setuptools"; + version = "2023.11.29"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wxp+kvll8GCiRLV9jtXub1P8tBPuF855DgBXfLNprZk="; + hash = "sha256-/49/2Cx5MhE7RufvZ0LHAJHMY2QMjGXbANkfLpQLlRQ="; }; postPatch = '' @@ -26,6 +27,7 @@ let nativeBuildInputs = [ calver + setuptools ]; doCheck = false; # avoid infinite recursion with hatchling diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 790a9e4f1a07d..bb1835ff7b9be 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.8.5"; + version = "7.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-o/U8bmCAotgDYY81eX+vXOxJC3f4aQvOF6ohMOHLuLY="; + hash = "sha256-/Xb6YOQ8nV+bXTdt/iAgYkBkmV6fRVFjR+86SfKU+aw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index fdc750fa89627..f15a45509e58b 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "twill"; - version = "3.1"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tWcZRvBvkRyQ7gD5zjocBzFVlzQ0Mhf1unF3gUkhB94="; + hash = "sha256-JJheUl/Ar8BWNpzJzMvVgk4KeitoQZ8GjbFPN9dEd+g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 801adb77da376..8259d0e1e4aea 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pname = "twisted"; - version = "23.8.0"; + version = "23.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -62,15 +62,10 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-PHM2Ct0XM2piLA2BHCos4phmtuWbESX9ZQmxclIJiiQ="; + hash = "sha256-mHhHoHkKLFlxl2E2huJ4T9VBZ986VdD7F8hBIwXXbOU="; }; patches = [ - (fetchpatch { - name = "11787.diff"; - url = "https://github.com/twisted/twisted/commit/da3bf3dc29f067e7019b2a1c205834ab64b2139a.diff"; - hash = "sha256-bQgUmbvDa61Vg8p/o/ivfkOAHyj1lTgHkrRVEGLM9aU="; - }) (fetchpatch { # Conditionally skip tests that require METHOD_CRYPT # https://github.com/twisted/twisted/pull/11827 @@ -112,6 +107,8 @@ buildPythonPackage rec { echo 'FileObserverTests.test_getTimezoneOffsetWestOfUTC.skip = "mktime argument out of range"'>> src/twisted/test/test_log.py echo 'FileObserverTests.test_getTimezoneOffsetWithoutDaylightSavingTime.skip = "tuple differs, values not"'>> src/twisted/test/test_log.py + echo 'FileDescriptorTests.test_expectedFDs.skip = "Expected duplicate file descriptor to be greater than original"' >> src/twisted/internet/test/test_posixprocess.py + echo 'MulticastTests.test_joinLeave.skip = "No such device"'>> src/twisted/test/test_udp.py echo 'MulticastTests.test_loopback.skip = "No such device"'>> src/twisted/test/test_udp.py echo 'MulticastTests.test_multicast.skip = "Reactor was unclean"'>> src/twisted/test/test_udp.py @@ -127,6 +124,10 @@ buildPythonPackage rec { # tests for missing https support in usage echo 'ServiceTests.test_HTTPSFailureOnMissingSSL.skip = "Expectation Mismatch"' >> src/twisted/web/test/test_tap.py + # fail on Python 3.12 + echo 'WorkerReporterTests.test_addSkipPyunit.skip = "'WorkerReporter' object has no attribute '_testStarted'"' >> src/twisted/trial/_dist/test/test_workerreporter.py + echo 'LocalWorkerAMPTests.test_runSkip.skip = "twisted.protocols.amp.UnknownRemoteError: Code: Unknown Error"' >> src/twisted/trial/_dist/test/test_worker.py + # not packaged substituteInPlace src/twisted/test/test_failure.py \ --replace "from cython_test_exception_raiser import raiser # type: ignore[import]" "raiser = None" @@ -197,6 +198,7 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/twisted/twisted/blob/twisted-${version}/NEWS.rst"; homepage = "https://github.com/twisted/twisted"; description = "Asynchronous networking framework written in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/txi2p-tahoe/default.nix b/pkgs/development/python-modules/txi2p-tahoe/default.nix index 3d891c6eeed1d..9ddc10885788a 100644 --- a/pkgs/development/python-modules/txi2p-tahoe/default.nix +++ b/pkgs/development/python-modules/txi2p-tahoe/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ parsley twisted diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index 3511a87127ba4..6415e590af064 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "23.0.1"; + version = "23.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-gnwiSCVWU0mpUDiHt9GE2DtfFd2xpOsDL5r/fFctkg4="; + hash = "sha256-0esWiZ0dVnIJ+TDSD+0+zq63I1JcKH3iVe34pFRQX9U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 94810408f0cac..cc87952ac6907 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.18"; + version = "0.19.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-T1pZyHwFgraev5lNYU4Pt2zC0KXsPzLk0dscCRhnzdM="; + hash = "sha256-hQ1a2V2PM3sV+xVHkPOa8Hf69cCNQ3WP11Dzeah9X3M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix index 8e01ec2c3ff34..fcfd7f5d0a658 100644 --- a/pkgs/development/python-modules/types-psutil/default.nix +++ b/pkgs/development/python-modules/types-psutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-psutil"; - version = "5.9.5.16"; + version = "5.9.5.17"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-TpshnvtiXT0E9r8QaTT4fKtJqkGpSwo7MIlAP0enkig="; + hash = "sha256-99h2mBLXKktRPX7J61WA/i9gE/wnA5SmA8tlNIEfPk0="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-pyyaml/default.nix b/pkgs/development/python-modules/types-pyyaml/default.nix index 58a66197d00b7..c8735dbfe6de4 100644 --- a/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.11"; + version = "6.0.12.12"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - hash = "sha256-fTQLGcoozd/bpDjuY4zUCEveIT5QGjl4c4VD4nCUd1s="; + hash = "sha256-M0Nz05L94P35WvXD8WYYhfoQxSFnsUWT64ViieGFUGI="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 9c705d4bfbecf..8af9b7e22e621 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "68.2.0.2"; + version = "69.0.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ce/DgK1cf3jjC8oVRvcGRpVozyYITPq3Ps+D3qHShEY="; + hash = "sha256-sKBiGfYoxlJ7L4zncKT0dVDgDT6MOtg+LcMbxubtqV0="; }; # Module doesn't have tests diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 72302723c855c..6a908dfd8e540 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -2,21 +2,20 @@ , buildPythonPackage , fetchPypi , flit-core -, python , pythonOlder }: buildPythonPackage rec { pname = "typing-extensions"; - version = "4.7.1"; - format = "pyproject"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-t13cJk8LpWFdt7ohfa65lwGtKVNTxF+elZYzN87u/7I="; + hash = "sha256-345DOenLdzV1WMvbzsozwwNxTPhh0e7xXhBwBVrot+8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uasiren/default.nix b/pkgs/development/python-modules/uasiren/default.nix index b6771266f2ab7..25f28f3d15d32 100644 --- a/pkgs/development/python-modules/uasiren/default.nix +++ b/pkgs/development/python-modules/uasiren/default.nix @@ -28,8 +28,6 @@ buildPythonPackage { hash = "sha256-NHrnG5Vhz+JZgcTJyfIgGz0Ye+3dFVv2zLCCqw2++oM="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/uharfbuzz/default.nix b/pkgs/development/python-modules/uharfbuzz/default.nix index 34bb5fef6df46..c7e823b74a2df 100644 --- a/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/pkgs/development/python-modules/uharfbuzz/default.nix @@ -24,8 +24,6 @@ buildPythonPackage rec { hash = "sha256-876gFYyMqeGYoXMdBguV6bi7DJKHJs9HNLw9xRu+Mxk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ cython setuptools-scm diff --git a/pkgs/development/python-modules/ukrainealarm/default.nix b/pkgs/development/python-modules/ukrainealarm/default.nix index 4cd4d2a852a99..c5950ef0152bd 100644 --- a/pkgs/development/python-modules/ukrainealarm/default.nix +++ b/pkgs/development/python-modules/ukrainealarm/default.nix @@ -28,8 +28,6 @@ buildPythonPackage { hash = "sha256-0gsxXQiSkJIM/I0VYsjdCCB3NjPr6QJbD/rBkGrwtW8="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/unidic/default.nix b/pkgs/development/python-modules/unidic/default.nix index c138ea8e8d0cd..cd8363d6fc972 100644 --- a/pkgs/development/python-modules/unidic/default.nix +++ b/pkgs/development/python-modules/unidic/default.nix @@ -35,8 +35,6 @@ buildPythonPackage rec { # no tests doCheck = false; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ requests tqdm wasabi plac platformdirs ]; nativeBuildInputs = [ cython mecab setuptools-scm ]; diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index e6633ab2e6768..3af7ba636e9e6 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -21,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-cEhWXGtMSXVjT5QigDedjT/lwYQnVqPCE5vbctXWznk="; }; + postPatch = '' + sed -i '/"black"/d' pyproject.toml + ''; + propagatedBuildInputs = [ unidecode sphinx diff --git a/pkgs/development/python-modules/uri-template/default.nix b/pkgs/development/python-modules/uri-template/default.nix index 7bebffce194a3..a403417b10934 100644 --- a/pkgs/development/python-modules/uri-template/default.nix +++ b/pkgs/development/python-modules/uri-template/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { hash = "sha256-38HFFqM6yfpsPrhIpE639ePy/NbLqKw7gbnE3y8sL3w="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 7a374f7c0c2c5..3c7da587cdded 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,18 +1,20 @@ { lib -, backports-zoneinfo -, brotli -, brotlicffi , buildPythonPackage -, certifi -, cryptography , fetchPypi -, hatchling -, idna , isPyPy -, pyopenssl + +# build-system +, hatchling + +# optional-dependencies +, brotli +, brotlicffi , pysocks -, pytest-timeout + +# tests +, backports-zoneinfo , pytestCheckHook +, pytest-timeout , pythonOlder , tornado , trustme @@ -20,12 +22,12 @@ let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.0.7"; + version = "2.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yX394fe9Q6ccjSpY42npsr9pLRM06p+crlWt19DdD4Q="; + hash = "sha256-33qor7AUj6eEiOeJmyxZtfT/z6gubFTMud03wde1LVQ="; }; nativeBuildInputs = [ @@ -38,13 +40,6 @@ let self = buildPythonPackage rec { ] else [ brotli ]; - # Use carefully since pyopenssl is not supported aarch64-darwin - secure = [ - certifi - cryptography - idna - pyopenssl - ]; socks = [ pysocks ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7f9512be2cb18..66a8d830cc2da 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,11 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub # build-system , setuptools , setuptools-scm -, wheel # tests , glibcLocales @@ -14,12 +13,14 @@ buildPythonPackage rec { pname = "urwid"; - version = "2.2.1"; + version = "2.2.3"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-4zkRqxjyxz/dvpvyFtAh504gstWqm+MEA8WPVRMbuKE="; + src = fetchFromGitHub { + owner = "urwid"; + repo = "urwid"; + rev = "refs/tags/${version}"; + hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo="; }; postPatch = '' @@ -29,7 +30,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; nativeCheckInputs = [ @@ -39,9 +39,13 @@ buildPythonPackage rec { env.LC_ALL = "en_US.UTF8"; + pytestFlagsArray = [ + "tests" + ]; + disabledTestPaths = [ # expect call hangs - "urwid/tests/test_vterm.py" + "tests/test_vterm.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index d8369260587e3..2bea93e08275b 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { hash = "sha256-emnrghdsUs+VfvYiJExG13SKQNrXAEtGNAJQLScADnw="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ hatch-vcs hatchling diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index bbec8df096fa2..11df7fd78c6e1 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.23.2"; + version = "0.24.0.post1"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-98Ahb6syD/J9StwaOqVj/MCdzbHOgey0sixp7SJnROE="; + hash = "sha256-WMXOmQOTj/yPazPEAuteho4UH9enXcIa1mMDDl2eaIk="; }; outputs = [ diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 21e99902929fa..fb3197b6b9e57 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , pythonOlder +, pythonRelaxDepsHook , fetchFromGitHub , setuptools , construct @@ -26,6 +27,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "websockets" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 5b48ee52fadc7..b992f518c5fbe 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -2,22 +2,31 @@ , buildPythonPackage , fetchPypi , isPy27 -, pytest +, pytestCheckHook , pytest-cov +, setuptools }: buildPythonPackage rec { pname = "venusian"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; + hash = "sha256-63LNym8xOaFdyA+cldPBD4pUoLqIHu744uxbQtPuOpU="; }; - nativeCheckInputs = [ pytest pytest-cov ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; checkPhase = '' pytest diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 74a29ae175e9c..b87ec1e1a9aa6 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -8,6 +8,7 @@ , tomli , pytestCheckHook , build +, hatchling , pydantic , pytest-mock , git @@ -16,14 +17,14 @@ buildPythonPackage rec { pname = "versioningit"; - version = "2.2.0"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; + hash = "sha256-HQ1xz6PCvE+N+z1KFcFE64qmoJ2dqYkj1BCZSi74Juo="; }; postPatch = '' @@ -33,9 +34,12 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging - setuptools ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.11") [ @@ -45,6 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook build + hatchling pydantic pytest-mock git diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index 5c0d66e7c0cfc..99a10fd320d3c 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -30,8 +30,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ getmac requests diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 18db218039d3f..a79b5bcd6cc14 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.24.5"; + version = "20.25.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6DYZZ/bab73xQmSDv+n8qCh8JCrAvDBCmQVyHO+/91I="; + hash = "sha256-v1HA2cfdY+qORAhvoeT7EJOjHpY7hpWSVzeK7wIOHxs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vispy/default.nix b/pkgs/development/python-modules/vispy/default.nix index ae52494d78cd2..ad8d696f91d90 100644 --- a/pkgs/development/python-modules/vispy/default.nix +++ b/pkgs/development/python-modules/vispy/default.nix @@ -3,22 +3,25 @@ , buildPythonPackage , substituteAll , fetchPypi -, cython +, cython_3 , fontconfig , freetype-py , hsluv , kiwisolver , libGL , numpy +, oldest-supported-numpy +, packaging , pythonOlder +, setuptools , setuptools-scm -, setuptools-scm-git-archive +, wheel }: buildPythonPackage rec { pname = "vispy"; version = "0.14.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -36,9 +39,11 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython + cython_3 + oldest-supported-numpy + setuptools setuptools-scm - setuptools-scm-git-archive + wheel ]; buildInputs = [ @@ -46,11 +51,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - fontconfig freetype-py hsluv kiwisolver numpy + packaging ]; doCheck = false; # otherwise runs OSX code on linux. diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index 452d95eede33f..47e3d029106b7 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -1,21 +1,29 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "voluptuous"; - version = "0.13.1"; - format = "setuptools"; + version = "0.14.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alecthomas"; - repo = pname; - rev = version; - hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; + repo = "voluptuous"; + rev = "refs/tags/${version}"; + hash = "sha256-7KXuypcKoqZboHTzoNKK5sYUR57wWGJu6y9zkLecep0="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,7 +38,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python data validation library"; + downloadPage = "https://github.com/alecthomas/voluptuous"; homepage = "http://alecthomas.github.io/voluptuous/"; + changelog = "https://github.com/alecthomas/voluptuous/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 2622b1800684e..3914f5cd0cb34 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.15.11"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -61,7 +61,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WaVgyF+pQgFCqIsi5Tcu+btyUKU2e3/qJi4Ma8dnx8M="; + hash = "sha256-XXs9KjiAPzZ932r4UJ87RpM+qhg/bNDWEYsq2Ua6SRw="; }; patches = [ diff --git a/pkgs/development/python-modules/wavedrom/default.nix b/pkgs/development/python-modules/wavedrom/default.nix index 25e7222608b0f..32fa68a9dabd4 100644 --- a/pkgs/development/python-modules/wavedrom/default.nix +++ b/pkgs/development/python-modules/wavedrom/default.nix @@ -22,8 +22,6 @@ buildPythonPackage rec { hash = "sha256-MntNXcpZPIElfCAv6lFvepCHR/sRUnw1nwNPW3r39Hs="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/wavefile/default.nix b/pkgs/development/python-modules/wavefile/default.nix index 4ced79638a826..4a8272e2f6681 100644 --- a/pkgs/development/python-modules/wavefile/default.nix +++ b/pkgs/development/python-modules/wavefile/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "wavefile"; - version = "1.5"; - format = "setuptools"; + version = "1.6.2"; + pyproject = true; src = fetchFromGitHub { owner = "vokimon"; repo = "python-wavefile"; - rev = "python-wavefile-${version}"; - sha256 = "9sHj1gb93mCVpejRGSdLJzeFDCeTflZctE7kMWfqFrE="; + rev = "refs/tags/python-wavefile-${version}"; + hash = "sha256-TLSWhLARY+3sHkl2p3d3LDGzLu6DggjTJWFpyrwRXSI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index badb09bbef11a..ee12162a0632a 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -4,17 +4,21 @@ buildPythonPackage rec { pname = "wcwidth"; - version = "0.2.6"; - format = "setuptools"; + version = "0.2.12"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pSIHgKQE2+M1N4mHCXjkcs/kd3YfBu5VB3JW5QmxVtA="; + hash = "sha256-8BwQTv31eXG8t1bwVN1Y3exSBN0V+jHWUD6leUfZfAI="; }; - nativeCheckInputs = [ pytestCheckHook ]; + nativeBuildInputs = [ + setuptools + ]; - propagatedBuildInputs = [ setuptools ]; + nativeCheckInputs = [ + pytestCheckHook + ]; # To prevent infinite recursion with pytest doCheck = false; diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index d1ba11d15ec30..48297d6747e3e 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -20,8 +20,6 @@ buildPythonPackage rec { hash = "sha256-iU33APwfCpMvo3ACn2RK9AYvhxgCb9pa0HZH01fZUWc="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace setup.cfg \ --replace "validators>=0.18.2,<=0.21.0" "validators>=0.18.2" \ diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 22c1ea8a964e6..cc353777f632f 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -28,8 +28,6 @@ buildPythonPackage rec { hash = "sha256-Le/gABaUxMmSW2SjgucsBKqjxOq1h9UCAWl5YyUsCPk="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov" "" diff --git a/pkgs/development/python-modules/websocket-client/default.nix b/pkgs/development/python-modules/websocket-client/default.nix index 26c27825f7bd9..f4d33df531445 100644 --- a/pkgs/development/python-modules/websocket-client/default.nix +++ b/pkgs/development/python-modules/websocket-client/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , pytestCheckHook , python-socks +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "websocket-client"; - version = "1.6.3"; - format = "setuptools"; + version = "1.6.4"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Oq0l0xKEJmvPz9H9inQ/YygjBaNkuNCUikO9YGrMZS8="; + hash = "sha256-szJAGbPChXIIbEoxn5HR3NRObhHNNAIyl4xoSnZQ0N8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ python-socks ]; diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index ec6e429f5945e..770e6e654caf5 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -4,12 +4,13 @@ , fetchFromGitHub , unittestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "websockets"; - version = "11.0.3"; - format = "setuptools"; + version = "12.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "aaugustin"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RdkbIiZI/UYsWdnnl5gJPsnJ/6adfFtkiXC7MO/HwcI="; + hash = "sha256-sOL3VI9Ib/PncZs5KN4dAIHOrBc7LfXqT15LO4M6qKg="; }; + nativeBuildInputs = [ + setuptools + ]; + patchPhase = '' # Disable all tests that need to terminate within a predetermined amount of # time. This is nondeterministic. diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index ce34b045fd678..52d48505df473 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -2,6 +2,7 @@ , beautifulsoup4 , buildPythonPackage , fetchPypi +, fetchpatch , pastedeploy , pyquery , pytestCheckHook @@ -25,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-VL2WlyWDjZhhqfon+Nlx950nXZSuJV9cUB9Tu22ZKes="; }; + patches = [ + (fetchpatch { + # Replace deprecated unittest aliases for Python 3.12 + name = "webtest-python312-compat.patch"; + url = "https://github.com/Pylons/webtest/commit/d82ec5bd2cf3c7109a1d49ad9fa802ae1eae1763.patch"; + hash = "sha256-hSwxAxAI3Eo28I8S+r2k/hFG8TlzrVYup3MuTsE+xXk="; + }) + ]; + propagatedBuildInputs = [ beautifulsoup4 six diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 16c6c2dc087d1..2b96261905005 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "wheel"; - version = "0.41.1"; + version = "0.42.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = pname; - rev = version; - hash = "sha256-/EaDJ2zI/ly2BrrGhiZGwiBYDVPYWTki+87UqtCS3bw="; + rev = "refs/tags/${version}"; + hash = "sha256-WML3/gAK1R9DEeRVZWeO0VRFuNVKP52i5I5mYV6vQcI="; postFetch = '' cd $out mv tests/testdata/unicode.dist/unicodedist/åäö_日本語.py \ diff --git a/pkgs/development/python-modules/wikitextparser/default.nix b/pkgs/development/python-modules/wikitextparser/default.nix index b7af5aeeb652e..5f4435c91694e 100644 --- a/pkgs/development/python-modules/wikitextparser/default.nix +++ b/pkgs/development/python-modules/wikitextparser/default.nix @@ -1,6 +1,7 @@ { buildPythonPackage , fetchFromGitHub , lib +, setuptools , pytestCheckHook , regex , wcwidth @@ -18,6 +19,10 @@ buildPythonPackage rec { hash = "sha256-cmzyRbq4tCbuyrNnT0UYxoxuwXrFkIcWdrogSTfxSys="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ wcwidth regex diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 1787faa38905a..7f5b06223ee69 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "willow"; - version = "1.6.2"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "2.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "wagtail"; repo = "Willow"; rev = "refs/tags/v${version}"; - hash = "sha256-dW2FVN3/mBAhVQ094uBsnXzdyTRKgHUDx0SWLm3g374="; + hash = "sha256-+ubylc/Zuw3DSSgtTg2dO3Zj0gpTJcLbb1J++caxS7w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/withings-api/default.nix b/pkgs/development/python-modules/withings-api/default.nix index 5be701fa298ff..226907f9e95da 100644 --- a/pkgs/development/python-modules/withings-api/default.nix +++ b/pkgs/development/python-modules/withings-api/default.nix @@ -52,5 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/vangorra/python_withings_api"; license = licenses.mit; maintainers = with maintainers; [ kittywitch ]; + broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 268f2775d5cf9..3995e291bc3ad 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "wrapt"; - version = "1.14.1"; + version = "1.16.0"; outputs = [ "out" "doc" ]; format = "setuptools"; src = fetchFromGitHub { owner = "GrahamDumpleton"; repo = pname; - rev = version; - hash = "sha256-nXwDuNo4yZxgjnkus9bVwIZltPaSH93D+PcZMGT2nGM="; + rev = "refs/tags/${version}"; + hash = "sha256-lVpSriXSvRwAKX4iPOIBvJwhqhKjdrUdGaEG4QoTQyo="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/wsme/default.nix b/pkgs/development/python-modules/wsme/default.nix index 764977051635d..7af0f410969b0 100644 --- a/pkgs/development/python-modules/wsme/default.nix +++ b/pkgs/development/python-modules/wsme/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonAtLeast , pbr +, setuptools , six , simplegeneric , netaddr @@ -22,18 +23,21 @@ buildPythonPackage rec { pname = "wsme"; - version = "0.11.0"; - format = "setuptools"; + version = "0.12.1"; + pyproject = true; disabled = pythonAtLeast "3.9"; src = fetchPypi { pname = "WSME"; inherit version; - sha256 = "bd2dfc715bedcc8f4649611bc0c8a238f483dc01cff7102bc1efa6bea207b64b"; + hash = "sha256-m36yJErzxwSskUte0iGVS7aK3QqLKy84okSwZ7M3mS0="; }; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + pbr + setuptools + ]; propagatedBuildInputs = [ netaddr diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index deffda6ef5fee..4b724ce6acbd2 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -1,29 +1,45 @@ { lib , buildPythonPackage -, fetchPypi -, markupsafe +, fetchFromGitHub +, pythonOlder + +# build-system , babel -, pytestCheckHook +, hatchling +, setuptools + +# dependencies +, markupsafe + +# optional-dependencies , email-validator -, pythonOlder + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "wtforms"; - version = "3.0.1"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "WTForms"; - inherit version; - hash = "sha256-azUbuxLdWK9X/+8FvHhCXQjRkU4P1o7hQUO3reAjxbw="; + src = fetchFromGitHub { + owner = "wtforms"; + repo = "wtforms"; + rev = "refs/tags/${version}"; + hash = "sha256-9EryEXGlGCtDH/XPM4Oihla42HnY0nho9DaauHfYnNQ="; }; + nativeBuildInputs = [ + babel + hatchling + setuptools + ]; + propagatedBuildInputs = [ markupsafe - babel ]; passthru.optional-dependencies = { @@ -34,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "wtforms" diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 12cefa0332aa0..70b99d5091f64 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,18 +13,16 @@ buildPythonPackage rec { pname = "xarray"; - version = "2023.8.0"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-glxtZCAqcxpOSTIe3R6d+r9L4GgC8bjIo8AKPr/Izt8="; + hash = "sha256-mkXhB0GES1+UjY4edotGDffpBpbRji7/LB1H9dnVAlI="; }; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index c2caa4fb37784..c5180c1f15c0d 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -2,54 +2,51 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, aiohttp +, setuptools , appdirs , ecdsa +, httpx , ms-cv , pydantic -, aresponses , pytest-asyncio , pytestCheckHook +, respx }: buildPythonPackage rec { pname = "xbox-webapi"; - version = "2.0.11"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "OpenXbox"; repo = "xbox-webapi-python"; rev = "v${version}"; - sha256 = "0li0bq914xizx9fj49s1iwfrv4bpzvl74bwsi5a34r9yizw02cvz"; + hash = "sha256-9A3gdSlRjBCx5fBW+jkaSWsFuGieXQKvbEbZzGzLf94="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ - aiohttp appdirs ecdsa + httpx ms-cv pydantic ]; nativeCheckInputs = [ - aresponses pytest-asyncio pytestCheckHook - ]; - - pytestFlagsArray = [ - "--asyncio-mode=auto" + respx ]; meta = with lib; { + changelog = "https://github.com/OpenXbox/xbox-webapi-python/blob/${src.rev}/CHANGELOG.md"; description = "Library to authenticate with Windows Live/Xbox Live and use their API"; homepage = "https://github.com/OpenXbox/xbox-webapi-python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index bf2d415b3e7d5..164513da94c87 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -25,7 +25,7 @@ #, flash-attn }: let - version = "0.0.22.post7"; + version = "0.03"; in buildPythonPackage { pname = "xformers"; @@ -38,7 +38,7 @@ buildPythonPackage { owner = "facebookresearch"; repo = "xformers"; rev = "refs/tags/v${version}"; - hash = "sha256-7lZi3+2dVDZJFYCUlxsyDU8t9qdnl+b2ERRXKA6Zp7U="; + hash = "sha256-G8f7tny5B8SAQ6+2uOjhY7nD0uOT4sskIwtTdwivQXo="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index 931d08e12c1c7..ded7c68f88544 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "xhtml2pdf"; - version = "0.2.11"; + version = "0.2.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L/HCw+O8bidtE5nDdO+cLS54m64dlJL+9Gjcye5gM+w="; + hash = "sha256-K7gsTLYcXmKmEQzOXrJ2kvvLzKaDkZ/NRLRc0USii5M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 4f226e7312959..6eb774677bfc8 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -1,27 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, pythonOlder +, setuptools }: buildPythonPackage rec { - version = "3.3.0"; - format = "setuptools"; pname = "xxhash"; + version = "3.4.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w/njIrHr7r1E49nS2bEk4MVQwe9BvVUq/c3XGVFu5Bo="; + hash = "sha256-A3nWzx/5h81CFgmiZM4CXnTzRuPhRd0QbAzC4+w/mak="; }; nativeBuildInputs = [ - setuptools-scm + setuptools + ]; + + pythonImportsCheck = [ + "xxhash" ]; meta = with lib; { + description = "Python Binding for xxHash"; homepage = "https://github.com/ifduyue/python-xxhash"; - description = "Python Binding for xxHash https://pypi.org/project/xxhash/"; + changelog = "https://github.com/ifduyue/python-xxhash/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd2; - maintainers = [ maintainers.teh ]; + maintainers = with maintainers; [ teh ]; }; } diff --git a/pkgs/development/python-modules/xyzservices/default.nix b/pkgs/development/python-modules/xyzservices/default.nix index 797242993f925..8836d5195fc2a 100644 --- a/pkgs/development/python-modules/xyzservices/default.nix +++ b/pkgs/development/python-modules/xyzservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "xyzservices"; - version = "2023.7.0"; + version = "2023.10.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-DskodCIn1vXUNn6ntFf8/tlDQp9N4pSbWwKoLN9VadY="; + hash = "sha256-CRIpJpBDvIJYBC7b7a1Py0RoSwRz7eAntWcq1A3J+gI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix index 0084082c1687f..70f31fe5308b0 100644 --- a/pkgs/development/python-modules/yapf/default.nix +++ b/pkgs/development/python-modules/yapf/default.nix @@ -1,25 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy -, nose + +# build-system +, setuptools + +# dependencies , importlib-metadata , platformdirs , tomli + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "yapf"; - version = "0.40.1"; - format = "setuptools"; + version = "0.40.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lYWH61yOxshgEZqcJdAq3fMKRPdaoVKkIg0w5WqYA3w="; + hash = "sha256-TauKXtcTTibVfBZHx0g6+z8TaHi1eQYreGyboWuUY3s="; }; - # nose is unavailable on pypy - doCheck = !isPyPy; + nativeBuildInputs = [ + setuptools + ]; propagatedBuildInputs = [ importlib-metadata @@ -27,11 +34,15 @@ buildPythonPackage rec { tomli ]; + # nose is unavailable on pypy + #doCheck = !isPyPy; + nativeCheckInputs = [ - nose + pytestCheckHook ]; meta = { + changelog = "https://github.com/google/yapf/blob/v${version}/CHANGELOG.md"; homepage = "https://github.com/google/yapf"; description = "Yet Another Python Formatter"; longDescription = '' diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index c4d8dac9995c2..6b8e17d2ed194 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,40 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch -, pythonAtLeast , pythonOlder +, cython_3 +, expandvars +, setuptools , idna , multidict , typing-extensions +, pytest-xdist , pytestCheckHook }: buildPythonPackage rec { pname = "yarl"; - version = "1.9.2"; + version = "1.9.4"; disabled = pythonOlder "3.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-BKudS59YfAbYAcKr/pMXt3zfmWxlqQ1ehOzEUBCCNXE="; + hash = "sha256-Vm24ZxfPgIC5m1iwg7dzqQiuQPBmgeh+WJqXb6+CRr8="; }; - patches = [ - # https://github.com/aio-libs/yarl/issues/876 - (fetchpatch { - url = "https://github.com/aio-libs/yarl/commit/0a94c6e4948e00fff072c0cf367afbf4ac36f906.patch"; - hash = "sha256-bqT46OLZLkBef8FQ1L95ITD70mC3+WIkr3+h2ekKrvE="; - }) - ]; - postPatch = '' - sed -i '/^addopts/d' setup.cfg + sed -i '/cov/d' pytest.ini ''; + nativeBuildInputs = [ + cython_3 + expandvars + setuptools + ]; + propagatedBuildInputs = [ idna multidict @@ -48,6 +48,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ + pytest-xdist pytestCheckHook ]; diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 40af2c4fb629f..dd476330e97cf 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -26,8 +26,6 @@ buildPythonPackage rec { setuptools-scm ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 78610073af012..8be14e23e7d01 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -4,6 +4,7 @@ , fasteners , fetchPypi , numcodecs +, msgpack , numpy , pytestCheckHook , pythonOlder @@ -31,7 +32,7 @@ buildPythonPackage rec { numpy fasteners numcodecs - ]; + ] ++ numcodecs.optional-dependencies.msgpack; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index e94f5f23834ba..75e23838c0a4b 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -76,6 +76,15 @@ buildPythonPackage rec { ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + disabledTests = [ + # Failed: External connections not allowed during tests. + "test_has_expired" + "test_has_not_expired" + "test_memory_cache_timeout" + "test_bytes_like_password_digest" + "test_password_digest" + ]; + preCheck = '' export HOME=$TMPDIR ''; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index b830634eb52ad..39ee5b6cba7d4 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -1,16 +1,30 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, openssl, bzip2 }: +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, setuptools +, bzip2 +, openssl +}: buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.9.1"; - format = "setuptools"; + version = "3.7.10"; + pyproject = true; src = fetchPypi { inherit version pname; - hash = "sha256-MOVsYfUq3n62hPEUIOGA75RviGofHcXaJKMnYERxg74="; + hash = "sha256-Bwn2Y/Bbu6O89iaSNWvMpXBhyJRmj6eL8j6HiPpbQbM="; }; - buildInputs = [ openssl bzip2 ]; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + bzip2 + openssl + ]; pythonImportsCheck = [ "Ice" ]; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 12253f43d8681..fc3b710919bc1 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -1,20 +1,25 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pyutil , twisted }: buildPythonPackage rec { pname = "zfec"; - version = "1.5.7.2"; - format = "setuptools"; + version = "1.5.7.4"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-TuUZvg3MfaLohIK8/Av5d6Ql4dfoJ4z1u7uNAPiir7Y="; + hash = "sha256-EGmFchj4ur5AhEOXEnIIA6Ef6RsU8gvHepak5vThER8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyutil ]; nativeCheckInputs = [ twisted ]; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 1b033810b5b48..6555d172ce2e1 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.16.2"; + version = "3.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-68FZRqp4vWNFiZL8gew7b3sektUcNebeHDgE5zt5kUc="; + hash = "sha256-hOZKHCjPfpHtIHi7jMjCWcsZt2lCCWyNe4SUdpDKuvA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 0d1e5a7ddb420..8ee46c58943f0 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -1,21 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , zope-testing }: buildPythonPackage rec { pname = "zope-hookable"; - version = "5.4"; - format = "setuptools"; + version = "6.0"; + pyproject = true; src = fetchPypi { pname = "zope.hookable"; inherit version; - hash = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; + hash = "sha256-FmiZPUCnz9yGeEPdVyWSnn+DpbDBlccJrx2u+CdPQ8s="; }; - nativeCheckInputs = [ zope-testing ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + zope-testing + ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; diff --git a/pkgs/development/python-modules/zope-i18nmessageid/default.nix b/pkgs/development/python-modules/zope-i18nmessageid/default.nix index fa8f4c1a30ee6..d4cd2d38e71bf 100644 --- a/pkgs/development/python-modules/zope-i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope-i18nmessageid/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "zope-i18nmessageid"; - version = "6.0.1"; + version = "6.1.0"; format = "setuptools"; src = fetchPypi { pname = "zope.i18nmessageid"; inherit version; - hash = "sha256-LVvOb7MfHOoO+iZEZJvIZ9KXIwPx272f/vzlsuueAXY="; + hash = "sha256-Rawm/chvq997ePHBvM/B1DctGlSDi7rt2p26dEStiUE="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index 2bc20be4d4ed2..ae75db9f7b137 100644 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.21.0"; + version = "0.22.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8I46ENAaJHh35MthqCoxnqdGw1ajeGVYvtJIHmxAVUY="; + hash = "sha256-giajPFQry1TNa9CjZgZ7YQtBcTtkyavsG8RTPWn1HnA="; }; propagatedNativeBuildInputs = [ diff --git a/pkgs/development/python2-modules/wcwidth/default.nix b/pkgs/development/python2-modules/wcwidth/default.nix index 8424fa4625039..023b92a869071 100644 --- a/pkgs/development/python2-modules/wcwidth/default.nix +++ b/pkgs/development/python2-modules/wcwidth/default.nix @@ -3,7 +3,7 @@ }: wcwidth.overridePythonAttrs(oldAttrs: { - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ + propagatedBuildInputs = oldAttrs.propagatedBuildInputs or [] ++ [ backports-functools-lru-cache ]; }) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 9d2e2e0bb821f..093c5a1ab9e03 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -24,12 +24,19 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ "aws-sam-translator" "boto3-stubs" "tzlocal" + "cookiecutter" + "docker" + "aws-lambda-builders" + "tomlkit" + "rich" + "jsonschema" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index 01b31266d0a39..3731e3e7e5f35 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.25.0"; + version = "0.27.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = version; - hash = "sha256-Hss4MgE09v2KvL8OIapFgocO+5EWE2WEr5xBAjhwNeE="; + hash = "sha256-WXvhlkU1dRNKhW3sMakd644W56xv8keMjSZL4MrQEc8="; }; propagatedBuildInputs = [ @@ -21,6 +21,7 @@ buildPythonApplication rec { jsonschema requests click + regress ]; nativeCheckInputs = [ diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index f960106629147..08ea01ca240b5 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -15,8 +15,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-kax4gnvRkHSqj0Y6Rk8eyPpT7Wia2QngCQtxpqWSl9s="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - pythonRelaxDeps = [ "semver" ]; diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index aff3646340ed8..158e0971e633b 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -33,8 +33,6 @@ python3.pkgs.buildPythonApplication rec { pytest-dependency ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - preCheck = '' export ASPELL_CONF="dict-dir ${aspellDicts.en}/lib/aspell" ''; diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index c145504015c25..2e967097d065f 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -2,19 +2,25 @@ , stdenv , fetchPypi , python3 +, cargo , git }: python3.pkgs.buildPythonApplication rec { pname = "hatch"; - version = "1.7.0"; + version = "1.9.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-evxwH9WzNoSmZQ4eyriVfhloX4JCQLp0WNys1m+Q+0Y="; + hash = "sha256-4ealEeFS7HzU26vE9Pahh0hwvUnJfRfTkLkjLdpoXOM="; }; + nativeBuildInputs = with python3.pkgs; [ + hatchling + hatch-vcs + ]; + propagatedBuildInputs = with python3.pkgs; [ click hatchling @@ -24,21 +30,25 @@ python3.pkgs.buildPythonApplication rec { packaging pexpect platformdirs - pyperclip rich shellingham tomli-w tomlkit userpath virtualenv + zstandard ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = [ + cargo + ] ++ (with python3.pkgs; [ + binary git pytestCheckHook pytest-mock pytest-xdist - ]; + setuptools + ]); preCheck = '' export HOME=$(mktemp -d); @@ -61,10 +71,17 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" - # tomlkit 0.12 changes - "test_no_strict_naming" - "test_project_location_basic_set_first_project" - "test_project_location_complex_set_first_project" + # cli table output mismatch + "test_context_formatting" + # expects sh, finds bash + "test_all" + "test_already_installed_update_flag" + "test_already_installed_update_prompt" + # unmet expectations about the binary module we provide + "test_dependency_not_found" + "test_marker_unmet" + # output capturing mismatch, likely stdout/stderr mixup + "test_no_compatibility_check_if_exists" ] ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/209358 "test_scripts_no_environment" diff --git a/pkgs/development/tools/language-servers/fortls/default.nix b/pkgs/development/tools/language-servers/fortls/default.nix index 9aed276a63fa5..74f07f84ffc1f 100644 --- a/pkgs/development/tools/language-servers/fortls/default.nix +++ b/pkgs/development/tools/language-servers/fortls/default.nix @@ -21,8 +21,6 @@ buildPythonApplication rec { propagatedBuildInputs = [ json5 packaging ]; - preBuild = "export SETUPTOOLS_SCM_PRETEND_VERSION=${version}"; - doCheck = true; checkPhase = "$out/bin/fortls --help 1>/dev/null"; diff --git a/pkgs/games/portmod/default.nix b/pkgs/games/portmod/default.nix index f9631c6d764f1..a0e7d38d178c3 100644 --- a/pkgs/games/portmod/default.nix +++ b/pkgs/games/portmod/default.nix @@ -51,8 +51,6 @@ python3Packages.buildPythonApplication rec { pname = "portmod"; format = "pyproject"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - # build the rust library independantly prePatch = '' substituteInPlace setup.py \ diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 29427a31c1be0..2cc4e666fca46 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -228,6 +228,18 @@ let }; }); + pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec { + version = "0.0.18"; + src = fetchFromGitHub { + owner = "yaleman"; + repo = "aussiebb"; + rev = "refs/tags/v${version}"; + hash = "sha256-tEdddVsLFCHRvyLCctDakioiop2xWaJlfGE16P1ukHc="; + }; + }); + + pydantic = super.pydantic_1; + pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { version = "0.2.3"; src = fetchFromGitHub { @@ -286,6 +298,25 @@ let }; }); + versioningit = super.versioningit.overridePythonAttrs (oldAttrs: rec { + version = "2.2.0"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-6xjnunJoqIC/HM/pLlNOlqs04Dl/KNy8s/wNpPaltr0="; + }; + }); + + voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { + version = "0.13.1"; + src = fetchFromGitHub { + owner = "alecthomas"; + repo = "voluptuous"; + rev = "refs/tags/${version}"; + hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; + }; + }); + # Pinned due to API changes ~1.0 vultr = super.vultr.overridePythonAttrs (oldAttrs: rec { version = "0.1.2"; @@ -297,6 +328,29 @@ let }; }); + xbox-webapi = super.xbox-webapi.overridePythonAttrs (oldAttrs: rec { + version = "2.0.11"; + src = fetchFromGitHub { + owner = "OpenXbox"; + repo = "xbox-webapi-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-fzMB+I8+ZTJUiZovcuj+d5GdHY9BJyJd6j92EhJeIFI="; + }; + postPatch = '' + sed -i '/pytest-runner/d' setup.py + ''; + propagatedBuildInputs = with self; [ + aiohttp + appdirs + ms-cv + pydantic + ecdsa + ]; + nativeCheckInputs = with self; [ + aresponses + ]; + }); + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -329,7 +383,7 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.10"; + disabled = python.pythonOlder "3.11"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -351,27 +405,17 @@ in python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook setuptools - wheel ]; pythonRelaxDeps = [ - "aiohttp" - "attrs" "awesomeversion" - "bcrypt" "ciso8601" "cryptography" - "home-assistant-bluetooth" "httpx" - "ifaddr" + "lru-dict" "orjson" - "pip" - "PyJWT" - "pyOpenSSL" - "PyYAML" - "requests" - "typing-extensions" - "voluptuous-serialize" + "pyopenssl" + "voluptuous" "yarl" ]; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 86e05cfed45ac..fac861d56b02a 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -18,12 +18,13 @@ with python3.pkgs; buildPythonApplication rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'sqlalchemy = "^1.4"' 'sqlalchemy = "*"' - ''; + pythonRelaxDeps = [ + "docutils" + "sqlalchemy" + ]; propagatedBuildInputs = [ click diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix index 058fe91ab7653..b09864492d7fc 100644 --- a/pkgs/servers/search/khoj/default.nix +++ b/pkgs/servers/search/khoj/default.nix @@ -2,74 +2,83 @@ , stdenv , fetchFromGitHub , python3 -, qt6 +, postgresql +, postgresqlTestHook }: python3.pkgs.buildPythonApplication rec { pname = "khoj"; - version = "0.3.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "debanjum"; repo = "khoj"; rev = "refs/tags/${version}"; - hash = "sha256-9kKK0DXpLfPB2LMnYcC6BKgZaoRsNHBZVe4thI7b9tk="; + hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "dateparser == 1.1.1" "dateparser" \ - --replace "defusedxml == 0.7.1" ""defusedxml"" \ - --replace "fastapi == 0.77.1" "fastapi" \ - --replace "jinja2 == 3.1.2" "jinja2" \ - --replace "openai == 0.20.0" "openai" \ - --replace "pillow == 9.3.0" "pillow" \ - --replace "pydantic == 1.9.1" "pydantic" \ - --replace "pyyaml == 6.0" "pyyaml" \ - --replace "pyqt6 == 6.3.1" "pyqt6" \ - --replace "rich >= 13.3.1" "rich" \ - --replace "schedule == 1.1.0" "schedule" \ - --replace "sentence-transformers == 2.2.2" "sentence-transformers" \ - --replace "torch == 1.13.1" "torch" \ - --replace "uvicorn == 0.17.6" "uvicorn" - ''; + env = { + DJANGO_SETTINGS_MODULE = "khoj.app.settings"; + postgresqlEnableTCP = 1; + }; nativeBuildInputs = with python3.pkgs; [ hatch-vcs hatchling - ] ++ (with qt6; [ - wrapQtAppsHook - ]); - - buildInputs = lib.optionals stdenv.isLinux [ - qt6.qtwayland - ] ++ lib.optionals stdenv.isDarwin [ - qt6.qtbase ]; propagatedBuildInputs = with python3.pkgs; [ + aiohttp + anyio + authlib + beautifulsoup4 dateparser defusedxml + django fastapi + google-auth + # gpt4all + gunicorn + httpx + itsdangerous jinja2 - numpy + langchain + lxml openai + openai-whisper + pgvector pillow + psycopg2 pydantic - pyqt6 + pymupdf + python-multipart pyyaml + # rapidocr-onnxruntime + requests rich schedule sentence-transformers + stripe + tenacity + tiktoken torch + transformers + tzdata uvicorn ]; nativeCheckInputs = with python3.pkgs; [ + freezegun + factory-boy + pytest-xdist + trio + psutil + pytest-django pytestCheckHook + ] ++ [ + (postgresql.withPackages (p: with p; [ pgvector ])) + postgresqlTestHook ]; preCheck = '' @@ -82,32 +91,51 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access - "test_search_with_valid_content_type" - "test_update_with_valid_content_type" - "test_regenerate_with_valid_content_type" - "test_image_search" - "test_notes_search" - "test_notes_search_with_only_filters" - "test_notes_search_with_include_filter" - "test_notes_search_with_exclude_filter" + "test_different_user_data_not_accessed" + "test_get_api_config_types" + "test_get_configured_types_via_api" "test_image_metadata" "test_image_search" - "test_image_search_query_truncated" "test_image_search_by_filepath" - "test_asymmetric_setup_with_missing_file_raises_error" - "test_asymmetric_setup_with_empty_file_raises_error" - "test_asymmetric_reload" - "test_asymmetric_setup" - "test_asymmetric_search" - "test_entry_chunking_by_max_tokens" - "test_incremental_update" + "test_image_search_query_truncated" + "test_index_update" + "test_index_update_with_no_auth_key" + "test_notes_search" + "test_notes_search_with_exclude_filter" + "test_notes_search_with_include_filter" + "test_parse_html_plaintext_file" + "test_regenerate_index_with_new_entry" + "test_regenerate_with_github_fails_without_pat" + "test_regenerate_with_invalid_content_type" + "test_regenerate_with_valid_content_type" + "test_search_for_user2_returns_empty" + "test_search_with_invalid_auth_key" + "test_search_with_invalid_content_type" + "test_search_with_no_auth_key" + "test_search_with_valid_content_type" + "test_text_index_same_if_content_unchanged" + "test_text_indexer_deletes_embedding_before_regenerate" + "test_text_search" + "test_text_search_setup_batch_processes" + "test_update_with_invalid_content_type" + "test_user_no_data_returns_empty" + + # Tests require rapidocr-onnxruntime + "test_multi_page_pdf_to_jsonl" + "test_single_page_pdf_to_jsonl" + "test_ocr_page_pdf_to_jsonl" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_conversation_utils.py" ]; meta = with lib; { description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos"; homepage = "https://github.com/debanjum/khoj"; changelog = "https://github.com/debanjum/khoj/releases/tag/${version}"; - license = licenses.gpl3Only; + license = licenses.agpl3Plus; maintainers = with maintainers; [ dit7ya ]; # src/tcmalloc.cc:333] Attempt to free invalid pointer broken = stdenv.isDarwin; diff --git a/pkgs/tools/admin/ansible/lint.nix b/pkgs/tools/admin/ansible/lint.nix index fbac95d019ba5..e1c168f8bf537 100644 --- a/pkgs/tools/admin/ansible/lint.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -23,6 +23,11 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ruamel.yaml" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 7bbc1e14efbe2..73c86278df703 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -10,14 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.30.2"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.31.6"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-XbYsPbYUIJPCS+nhcE3A5K7yxHcGUkulT5vHPT5T9kM="; + hash = "sha256-PINiNkP2vopPgc9bH0x7mifeUt7gdXi3/i2Ye96RANg="; }; - propagatedBuildInputs = with python3.pkgs; [ botocore bcdoc diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index f53f684f6facd..32d21bfa4eafc 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -27,6 +27,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "wyoming" ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 33c5aa5272188..d7853d0506f64 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -14,7 +14,22 @@ , fetchPypi }: -python3Packages.buildPythonApplication rec { +let + python = python3Packages.python.override { + packageOverrides = self: super: { + msgpack = super.msgpack.overrideAttrs (oldAttrs: rec { + version ="1.0.4"; + + src = fetchPypi { + pname = "msgpack"; + inherit version; + hash = "sha256-9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "borgbackup"; version = "1.2.7"; format = "pyproject"; @@ -30,7 +45,7 @@ python3Packages.buildPythonApplication rec { --replace "0o4755" "0o0755" ''; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python.pkgs; [ cython setuptools-scm pkgconfig @@ -55,7 +70,7 @@ python3Packages.buildPythonApplication rec { acl ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ msgpack packaging (if stdenv.isLinux then pyfuse3 else llfuse) @@ -72,7 +87,7 @@ python3Packages.buildPythonApplication rec { --zsh scripts/shell_completions/zsh/_borg ''; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python.pkgs; [ e2fsprogs py python-dateutil diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 15b8a33de6755..452fab128e146 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -36,8 +36,6 @@ python3.pkgs.buildPythonApplication rec { ./linux-disable-timezone-test.patch ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - preConfigure = '' # fix version displayed by duplicity --version # see SourceCopy in setup.py diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix index 53db44bb2e11f..74c442c09583e 100644 --- a/pkgs/tools/backup/gphotos-sync/default.nix +++ b/pkgs/tools/backup/gphotos-sync/default.nix @@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec { version = "3.1.2"; format = "pyproject"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - src = fetchFromGitHub { owner = "gilesknap"; repo = "gphotos-sync"; diff --git a/pkgs/tools/misc/cc2538-bsl/default.nix b/pkgs/tools/misc/cc2538-bsl/default.nix index 602327ab79b17..a4b3c992544a9 100644 --- a/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/pkgs/tools/misc/cc2538-bsl/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; - version = "unstable-2023-08-14"; + version = "2.1-unstable-2023-10-03"; format = "pyproject"; src = fetchFromGitHub { owner = "JelmerT"; repo = "cc2538-bsl"; - rev = "641305fb5cae98415a28cbfab6e63436c1753abf"; - hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; + rev = "4d64ac633dbaf29d098842c5937ed6eea2fd7c45"; + hash = "sha256-NX2jPYAz15bSucj/YR5E/0eJy/cbszSrNxyJHRsbXxo="; }; patches = [ diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index fa4e7cc34a484..ea77f4db163ec 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -22,8 +22,6 @@ python3Packages.buildPythonApplication rec { patchShebangs crudini.py crudini-help tests/test.sh ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ help2man installShellFiles diff --git a/pkgs/tools/misc/instaloader/default.nix b/pkgs/tools/misc/instaloader/default.nix index 634693f6144be..57601ae975501 100644 --- a/pkgs/tools/misc/instaloader/default.nix +++ b/pkgs/tools/misc/instaloader/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , sphinx , requests }: @@ -20,6 +21,10 @@ buildPythonPackage rec { sha256 = "sha256-ZxvJPDj+r7KSyXpYNQIgnda5OS77GOFM901ZHgR6c4k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests sphinx diff --git a/pkgs/tools/misc/lektor/default.nix b/pkgs/tools/misc/lektor/default.nix index 638ce2ee3ce7c..1b20b4355d8e4 100644 --- a/pkgs/tools/misc/lektor/default.nix +++ b/pkgs/tools/misc/lektor/default.nix @@ -46,8 +46,6 @@ in python.pkgs.buildPythonApplication rec { npmHooks.npmConfigHook ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python.pkgs; [ babel click diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix index 04b7abb353a2f..c260b1e528931 100644 --- a/pkgs/tools/misc/mpremote/default.nix +++ b/pkgs/tools/misc/mpremote/default.nix @@ -19,7 +19,6 @@ buildPythonApplication rec { }; sourceRoot = "source/tools/mpremote"; format = "pyproject"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ hatchling diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index dec7eb1aa1136..0c55c78f7b496 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -7,15 +7,20 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; - version = "1.7.0"; + version = "1.7.1"; + pyproject = true; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; - rev = version; - hash = "sha256-CTF5HisBS44Ta18cVT04UrMIF30WmEBwZBGW7fkKXwk="; + rev = "refs/tags/${version}"; + hash = "sha256-a/FuhJyf8BmZekUibzEiGgkHL51A+75R4a6S+h5i28s="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + passthru.optional-dependencies = { black = [ black ]; blacken-docs = [ blacken-docs ]; @@ -76,9 +81,6 @@ python3.pkgs.buildPythonApplication rec { "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" - # Broken since ruff was updated to 0.1.2 - # A PR was opened upstream: https://github.com/nbQA-dev/nbQA/issues/834 - "test_ruff_works" ]; disabledTestPaths = [ diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 2ee18cb3da1c0..1bfde93c39e50 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { mkdocs python3 python3Packages.mkdocs-material - python3Packages.mkdocs-minify + python3Packages.mkdocs-minify-plugin python3Packages.mkdocs-simple-hooks ]; diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/tools/misc/remote-exec/default.nix index afedab81cbd6e..557bde26c4650 100644 --- a/pkgs/tools/misc/remote-exec/default.nix +++ b/pkgs/tools/misc/remote-exec/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , buildPythonApplication , click -, pydantic +, pydantic_1 , toml , watchdog , pytestCheckHook @@ -29,7 +29,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click - pydantic + pydantic_1 toml watchdog ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index c78c12c8fa776..018da51f77018 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index b8689fdf9966e..e23d50bab5a36 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -28,8 +28,6 @@ buildPythonApplication rec { ./steam-run.patch ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/coercer/default.nix b/pkgs/tools/security/coercer/default.nix index 3d1e6cb469637..f380d130bb07f 100644 --- a/pkgs/tools/security/coercer/default.nix +++ b/pkgs/tools/security/coercer/default.nix @@ -5,22 +5,28 @@ python3.pkgs.buildPythonApplication rec { pname = "coercer"; - version = "1.6"; + version = "2.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p0dalirius"; repo = "Coercer"; rev = "refs/tags/${version}"; - hash = "sha256-xftYnwu6uUTvJTZU9E7wvdgBxqa8xy83K5GOlgNSCvc="; + hash = "sha256-WeaKToKYIB+jjTNIQvAUQQNb25TsNWALYZwIZuBjkPE="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "impacket" ]; propagatedBuildInputs = with python3.pkgs; [ impacket + xlsxwriter ]; pythonImportsCheck = [ diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index b049ea1661083..49de8f68ed97e 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonPackage rec { halo networkx pefile - pydantic + pydantic_1 rich tabulate tqdm diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index f80f5c70c98c9..bc23c3845b896 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -14,8 +14,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-+M8P/VSF9SKPvq+yNPjokyhggY7hzQ9qLLhkiTNbJls="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index 2abcf2065ced5..bf83c7303eef4 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -17,6 +17,11 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ruamel.yaml" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/tools/security/stacs/default.nix index 672cd082849cf..205d85f0622e9 100644 --- a/pkgs/tools/security/stacs/default.nix +++ b/pkgs/tools/security/stacs/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ click - pydantic + pydantic_1 typing-extensions yara-python ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04c9c3793efd9..32669e40f1fd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17946,9 +17946,9 @@ with pkgs; python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; - python310Packages = recurseIntoAttrs python310.pkgs // { pythonPackages = python310.pkgs // { __attrsFailEvaluation = true; }; }; + python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; - python312Packages = python312.pkgs // { __attrsFailEvaluation = true; }; + python312Packages = recurseIntoAttrs python312.pkgs // { pythonPackages = python312.pkgs // { __attrsFailEvaluation = true; }; }; python313Packages = python313.pkgs // { __attrsFailEvaluation = true; }; pypyPackages = pypy.pkgs // { __attrsFailEvaluation = true; }; pypy2Packages = pypy2.pkgs // { __attrsFailEvaluation = true; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fc1cd2d4a1747..cdaa659cc3770 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -246,6 +246,7 @@ mapAliases ({ memory_profiler = memory-profiler; # added 2023-10-09 mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12 mistune_2_0 = mistune; # added 2022-08-12 + mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mrkd = throw "mrkd has been promoted to a top-level attribute"; # added 2023-08-01 multi_key_dict = multi-key-dict; # added 2023-11-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29bad9f62b31a..00136d5f8c4aa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16,6 +16,9 @@ self: super: with self; { build = toPythonModule (callPackage ../development/python-modules/bootstrap/build { inherit (bootstrap) flit-core installer; }); + packaging = toPythonModule (callPackage ../development/python-modules/bootstrap/packaging { + inherit (bootstrap) flit-core installer; + }); }; setuptools = callPackage ../development/python-modules/setuptools { }; @@ -798,6 +801,8 @@ self: super: with self; { astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astropy-iers-data = callPackage ../development/python-modules/astropy-iers-data { }; + astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { }; astroquery = callPackage ../development/python-modules/astroquery { }; @@ -2530,13 +2535,13 @@ self: super: with self; { cysignals = callPackage ../development/python-modules/cysignals { }; - cython = callPackage ../development/python-modules/Cython { }; + cython = callPackage ../development/python-modules/cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.3"; + version = "3.0.6"; src = old.src.override { inherit version; - hash = "sha256-MnMJMBsB9ynxc6lFEcsigMh7oDyJ7UKOiPkT93gkUDA="; + hash = "sha256-OZ0YVnLGZ7Juq73KQgyYVkWDeYrzvEdnCooJ6fGd1mA="; }; patches = [ ]; }); @@ -2685,7 +2690,7 @@ self: super: with self; { dbus-next = callPackage ../development/python-modules/dbus-next { }; - dbus-python = callPackage ../development/python-modules/dbus { + dbus-python = callPackage ../development/python-modules/dbus-python { inherit (pkgs) dbus; }; @@ -4816,6 +4821,8 @@ self: super: with self; { gradio-client = callPackage ../development/python-modules/gradio/client.nix { }; + gradio-pdf = callPackage ../development/python-modules/gradio-pdf { }; + grafanalib = callPackage ../development/python-modules/grafanalib/default.nix { }; grammalecte = callPackage ../development/python-modules/grammalecte { }; @@ -5870,6 +5877,8 @@ self: super: with self; { jsonschema = callPackage ../development/python-modules/jsonschema { }; + jsonschema-path = callPackage ../development/python-modules/jsonschema-path { }; + jsonschema-spec = callPackage ../development/python-modules/jsonschema-spec { }; jsonschema-specifications = callPackage ../development/python-modules/jsonschema-specifications { }; @@ -6684,6 +6693,8 @@ self: super: with self; { rtmixer = callPackage ../development/python-modules/rtmixer { }; + regress = callPackage ../development/python-modules/regress { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; makefun = callPackage ../development/python-modules/makefun { }; @@ -7052,7 +7063,7 @@ self: super: with self; { mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; mkdocs-material-extensions = callPackage ../development/python-modules/mkdocs-material/mkdocs-material-extensions.nix { }; - mkdocs-minify = callPackage ../development/python-modules/mkdocs-minify { }; + mkdocs-minify-plugin = callPackage ../development/python-modules/mkdocs-minify-plugin { }; mkdocs-redirects = callPackage ../development/python-modules/mkdocs-redirects { }; mkdocs-simple-hooks = callPackage ../development/python-modules/mkdocs-simple-hooks { }; mkdocs-swagger-ui-tag = callPackage ../development/python-modules/mkdocs-swagger-ui-tag { }; @@ -8850,6 +8861,8 @@ self: super: with self; { pagelabels = callPackage ../development/python-modules/pagelabels { }; + paginate = callPackage ../development/python-modules/paginate { }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; palace = callPackage ../development/python-modules/palace { }; @@ -9062,7 +9075,10 @@ self: super: with self; { pem = callPackage ../development/python-modules/pem { }; - pendulum = callPackage ../development/python-modules/pendulum { }; + pendulum = if pythonAtLeast "3.12" then + callPackage ../development/python-modules/pendulum/3.nix { } + else + callPackage ../development/python-modules/pendulum { }; pep440 = callPackage ../development/python-modules/pep440 { }; @@ -10174,6 +10190,8 @@ self: super: with self; { pydantic = callPackage ../development/python-modules/pydantic { }; + pydantic_1 = callPackage ../development/python-modules/pydantic/1.nix { }; + pydantic-core = callPackage ../development/python-modules/pydantic-core { }; pydantic-extra-types = callPackage ../development/python-modules/pydantic-extra-types { }; @@ -13090,6 +13108,8 @@ self: super: with self; { sigrok = callPackage ../development/python-modules/sigrok { }; + sigstore = callPackage ../development/python-modules/sigstore { }; + sigstore-protobuf-specs = callPackage ../development/python-modules/sigstore-protobuf-specs { }; sigstore-rekor-types = callPackage ../development/python-modules/sigstore-rekor-types { };