diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-19 17:14:52 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-19 17:14:52 +0100 |
commit | f4d4283e3992c3f559831b1c030cd1fda6d45f98 (patch) | |
tree | c2cc63060849298d9a8e7a329010bb0fc4abb219 /nixpkgs/pkgs/development/python-modules | |
parent | dac53cd746c10feddd48d4a1981235a653d7d32a (diff) | |
parent | 0ace63bed8f561e4cc5b1c8fa5fee6be61fbcf8b (diff) | |
download | nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.gz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.bz2 nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.lz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.xz nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.tar.zst nixlib-f4d4283e3992c3f559831b1c030cd1fda6d45f98.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules')
75 files changed, 963 insertions, 232 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/nixpkgs/pkgs/development/python-modules/acquire/default.nix index 4426f930b0d8..87e1ef293071 100644 --- a/nixpkgs/pkgs/development/python-modules/acquire/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-ppkfnPJEvCImTA0+NjYD8r6SHcx9eBN9GBvo0IZYcjY="; + hash = "sha256-8fvVK/mH+pgPaaxNKvKOw1qU0ElWAmNVP6YAqvBTwio="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index d1dc513c0b0b..17d09d6525fa 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.4.1"; + version = "18.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o1Yv4/wSM2k+L2/JP3teUj129QlyLjoShCRWJ3lIN98="; + hash = "sha256-k4CqpvmsKBO42oLkzogfm0ALenxRJnngdgxt1HK5i+Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index af7635184a0d..463518ef2f98 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.5.2"; - format = "pyproject"; + version = "5.5.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-ioFTayuPkxXIaaKKVHBLyU47jID6dGWCX1G9kVkD5Yo="; + hash = "sha256-6kfkHLW5PftzrhKjywc670HpKCrrU0POEiJ3u2doBTk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/bbox/default.nix b/nixpkgs/pkgs/development/python-modules/bbox/default.nix index 4f1d0cef7fd0..df28d568b010 100644 --- a/nixpkgs/pkgs/development/python-modules/bbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bbox/default.nix @@ -1,23 +1,40 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder -, pyquaternion +, matplotlib , numpy +, pendulum +, pillow +, poetry-core +, pyquaternion }: buildPythonPackage rec { pname = "bbox"; version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GGQhKkdwmrYPEhtldPY3WUInSniU/B40NZvt1gXEuzg="; + src = fetchFromGitHub { + owner = "varunagrawal"; + repo = pname; + # matches 0.9.4 on PyPi + tests + rev = "d3f07ed0e38b6015cf4181e3b3edae6a263f8565"; + hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs="; }; propagatedBuildInputs = [ pyquaternion numpy ]; + buildInputs = [ poetry-core ]; + + nativeCheckInputs = [ + matplotlib + pendulum + pillow + pytestCheckHook + ]; pythonImportsCheck = [ "bbox" ]; diff --git a/nixpkgs/pkgs/development/python-modules/bork/default.nix b/nixpkgs/pkgs/development/python-modules/bork/default.nix index 5cd247cf2872..2b3b27108d1b 100644 --- a/nixpkgs/pkgs/development/python-modules/bork/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bork/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder , build , coloredlogs , packaging +, pip , toml , twine , wheel @@ -13,21 +15,22 @@ buildPythonPackage rec { pname = "bork"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "duckinator"; repo = pname; - rev = "v${version}"; - hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg="; + rev = "refs/tags/v${version}"; + hash = "sha256-y/p2uuU+QKgJSdJmMt3oebm/zcuatYWTW8Jl79YxA3g="; }; propagatedBuildInputs = [ build coloredlogs packaging + pip toml twine wheel @@ -39,6 +42,13 @@ buildPythonPackage rec { "bork.cli" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ + "-m 'not network'" + ]; + meta = with lib; { description = "Python build and release management tool"; homepage = "https://github.com/duckinator/bork"; diff --git a/nixpkgs/pkgs/development/python-modules/brian2/default.nix b/nixpkgs/pkgs/development/python-modules/brian2/default.nix index 2b3bcbff5076..a85e26b485f4 100644 --- a/nixpkgs/pkgs/development/python-modules/brian2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/brian2/default.nix @@ -22,12 +22,6 @@ buildPythonPackage rec { hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; }; - patches = [ - # Fix deprecated numpy types - # https://sources.debian.org/data/main/b/brian/2.5.1-3/debian/patches/numpy1.24.patch - ./numpy1.24.patch - ]; - propagatedBuildInputs = [ cython jinja2 diff --git a/nixpkgs/pkgs/development/python-modules/brian2/numpy1.24.patch b/nixpkgs/pkgs/development/python-modules/brian2/numpy1.24.patch deleted file mode 100644 index 01af8f77c0ed..000000000000 --- a/nixpkgs/pkgs/development/python-modules/brian2/numpy1.24.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Remove deprecated use of np.float -Author: Marcel Stimberg <marcel.stimberg@inserm.fr> -Bug-Debian: https://bugs.debian.org/1027193 -Applied-Upstream: 61ef84b316a3d0a892298adf51abd8ac50900758 -Last-Update: 2023-01-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- brian.orig/brian2/units/fundamentalunits.py -+++ brian/brian2/units/fundamentalunits.py -@@ -1597,7 +1597,7 @@ - unitless = np.array(self / best_unit, copy=False) - threshold = np.get_printoptions()['threshold'] // 100 - if unitless.ndim == 0: -- sympy_quantity = np.float(unitless) -+ sympy_quantity = float(unitless) - elif unitless.ndim == 1: - array_str = np.array2string(unitless, separator=" & ", threshold=threshold, - max_line_width=sys.maxsize) diff --git a/nixpkgs/pkgs/development/python-modules/circus/default.nix b/nixpkgs/pkgs/development/python-modules/circus/default.nix index 90cf6a4be7f7..95d29a4401bc 100644 --- a/nixpkgs/pkgs/development/python-modules/circus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/circus/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , flit-core @@ -34,6 +35,11 @@ buildPythonPackage rec { pyyaml ]; + # On darwin: Too many open files + preCheck = lib.optionalString stdenv.isDarwin '' + ulimit -n 1024 + ''; + disabledTests = [ # these tests raise circus.tests.support.TimeoutException "test_reload1" diff --git a/nixpkgs/pkgs/development/python-modules/dasbus/default.nix b/nixpkgs/pkgs/development/python-modules/dasbus/default.nix index a7e0b754273f..dceb2e74ca86 100644 --- a/nixpkgs/pkgs/development/python-modules/dasbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dasbus/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = "https://github.com/rhinstaller/dasbus"; description = "DBus library in Python3"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix index 9fa9457b2848..0a22c7b8b7ba 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.6"; + version = "3.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-3Zyjo7yoSLtAnC5lOLzjWsqMRoJxsrw2LKjQ2Qy38sg="; + hash = "sha256-YfWshytfj4p2MqLpzE3b1/RtrL1/+Xd/5+RNbrH/Jfc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix index 55ce876fe216..e7f17cb0286c 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-AcDlyLKrRyt1mhh7nb9Oln/cjVKw8s1g78J8sgE2p2g="; + hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix index 9671bb33c8ab..94881ca3ca42 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0="; + hash = "sha256-4tKu7oPkpNcWr2XJvZg94yZZcbTeeXBphPCLoZYzg6U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix b/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix index c7192854fcf8..173170396f72 100644 --- a/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-CMUXMSkrutziAIYjUFbLEpsYpCZUiPmV16puXneGeHE="; + hash = "sha256-BHwm88IPtfg/bi5veFGnciQeH4s0asVnxiMVsIi8vV8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/distlib/default.nix b/nixpkgs/pkgs/development/python-modules/distlib/default.nix index ca91e77a6672..cf31574e6fdb 100644 --- a/nixpkgs/pkgs/development/python-modules/distlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { setuptools ]; - postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' find $out -name '*.exe' -delete ''; diff --git a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index 01e1593a82ce..5832d9a06933 100644 --- a/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchNpmDeps , buildPythonPackage +, nix-update-script # build-system , gettext @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-y8KT/Fbk2eQDbGzcJtLdwS6jPCNoTWXousvqY+GlFnQ="; + hash = "sha256-E5gM/5MIB65gdyv/I+Kuw8rbjPvtUnbCPXpasaIDzyo="; }; postPatch = '' @@ -39,7 +40,7 @@ buildPythonPackage rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-FLfMCn2jsLlTTsC+LRMX0dmVCCbNAr2pQUsSQRKgo6E="; + hash = "sha256-4ZVb+V/oYfflIZdme6hbpoSBFVV7lk5wLfEzzBqZv/Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -67,6 +68,9 @@ buildPythonPackage rec { "-W" "ignore::DeprecationWarning" ]; + # needed for npmDeps update + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; homepage = "https://github.com/arteria/django-hijack"; diff --git a/nixpkgs/pkgs/development/python-modules/echo/default.nix b/nixpkgs/pkgs/development/python-modules/echo/default.nix new file mode 100644 index 000000000000..af3a3d43a6d7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/echo/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, setuptools-scm +, libxcrypt +, numpy +, qt6 +, qtpy +, pyqt6 +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "echo"; + version = "0.8.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "glue-viz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0FmUA7kOFSRZXwbj8d7asujBPOjE2pFhu6TDNSGD4r0="; + }; + + nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; + + buildInputs = lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; + + propagatedBuildInputs = [ + qt6.qtconnectivity + qt6.qtbase + qt6.qttools + pyqt6 + numpy + 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; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov + ]; + + pythonImportsCheck = [ "echo" ]; + + meta = with lib; { + homepage = "https://github.com/glue-viz/echo"; + description = "Callback Properties in Python"; + license = licenses.mit; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix b/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix new file mode 100644 index 000000000000..fd00ff5df8e2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fast-histogram/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, fetchFromGitHub +, python +, pythonOlder +, setuptools +, setuptools-scm +, numpy +, wheel +, hypothesis +, pytest-cov +}: + +buildPythonPackage rec { + pname = "fast-histogram"; + version = "0.12"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "astrofrog"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Cz4BgbtxbUPxL2NSzvZYjbYIN4KUuliUV0bXRRtyvfM="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + hypothesis + pytest-cov + ]; + + pytestFlagsArray = [ "${builtins.placeholder "out"}/${python.sitePackages}" ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonImportsCheck = [ "fast_histogram" ]; + + meta = with lib; { + homepage = "https://github.com/astrofrog/fast-histogram"; + description = "Fast 1D and 2D histogram functions in Python"; + license = licenses.bsd2; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/flow-record/default.nix b/nixpkgs/pkgs/development/python-modules/flow-record/default.nix index 1562600a231f..2c8de577dc27 100644 --- a/nixpkgs/pkgs/development/python-modules/flow-record/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flow-record/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.12"; + version = "3.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-b9MCgs3Imo0DHtPyvQuRgYvsLWe8N2Y9TIWdU1E04L8="; + hash = "sha256-Yg42nA0dRjHormpmpbOuZYuvBpNz9XEpf84XI2iJpYY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/geomet/default.nix b/nixpkgs/pkgs/development/python-modules/geomet/default.nix index fb5f098f0d9f..0f9742c34381 100644 --- a/nixpkgs/pkgs/development/python-modules/geomet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geomet/default.nix @@ -2,14 +2,15 @@ , buildPythonPackage , fetchFromGitHub , click +, setuptools , six , pythonOlder }: buildPythonPackage rec { pname = "geomet"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "geomet"; repo = "geomet"; rev = "refs/tags/${version}"; - hash = "sha256-dN0d6wu5FqL/5FQrpQn+wlyEvp52pa5dkxLu3j3bxnw="; + hash = "sha256-YfI29925nffzRBMJb6Gm3muvlpwP3zSw2YJ2vWcf+Bo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ click six diff --git a/nixpkgs/pkgs/development/python-modules/glances-api/default.nix b/nixpkgs/pkgs/development/python-modules/glances-api/default.nix index b0f54b53dc62..fc8d2edac2be 100644 --- a/nixpkgs/pkgs/development/python-modules/glances-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glances-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.3"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A="; + hash = "sha256-DUTZLLWO4xUeUlxHGGVr/MD5uKqRxUf+p0crYsELgzw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/glueviz/default.nix b/nixpkgs/pkgs/development/python-modules/glueviz/default.nix new file mode 100644 index 000000000000..c6fb2859b413 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/glueviz/default.nix @@ -0,0 +1,87 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, dill +, astropy +, numpy +, pandas +, qt6 +, pyqt6 +, pyqt-builder +, qtconsole +, setuptools +, setuptools-scm +, scipy +, ipython +, ipykernel +, h5py +, matplotlib +, xlrd +, mpl-scatter-density +, pvextractor +, openpyxl +, echo +, pytest +, pytest-flakes +, pytest-cov +}: + +buildPythonPackage rec { + pname = "glueviz"; + version = "1.14.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "glue-viz"; + repo = "glue"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-pHUcvyDziE7l0foEz7cygMuAwggnIWzsQy9SFZCDkXA="; + }; + + buildInputs = [ pyqt-builder ]; + nativeBuildInputs = [ setuptools setuptools-scm qt6.wrapQtAppsHook ]; + propagatedBuildInputs = [ + astropy + dill + setuptools + scipy + numpy + matplotlib + pandas + pyqt6 + qtconsole + ipython + ipykernel + h5py + xlrd + mpl-scatter-density + pvextractor + openpyxl + echo + ]; + + 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; + + nativeCheckInputs = [ pytest pytest-flakes pytest-cov ]; + + pythonImportsCheck = [ "glue" ]; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://glueviz.org"; + description = "Linked Data Visualizations Across Multiple Files"; + license = licenses.bsd3; # https://github.com/glue-viz/glue/blob/main/LICENSE + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2aa7834ace8a..2e91f2704c77 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; + hash = "sha256-VU+vB+x2DElwzl1cO7qTdV91Mn1i2Dsq2safnMrwuqI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 336f8ed962c3..1e460fa3c7fa 100644 --- a/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.31.0"; + version = "1.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hF+gptNLAeLtpZGrwOezwFeihDt1smCp4QkK5lENMHo="; + hash = "sha256-vX85fDFNGJ8zJe6YCPn7VFOdvPkT35VbM3Do+cP2b/Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix b/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix index 92966821d4bb..cea6592b42b8 100644 --- a/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hledger-utils"; - version = "1.13.2"; + version = "1.14.0"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "nobodyinperson"; repo = "hledger-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw="; + hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/iceportal/default.nix b/nixpkgs/pkgs/development/python-modules/iceportal/default.nix index 251f13727895..ffc0335761b3 100644 --- a/nixpkgs/pkgs/development/python-modules/iceportal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iceportal/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "iceportal"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-iceportal"; rev = "refs/tags/${version}"; - hash = "sha256-edG4tF5nYaEOCcbunetYNL9moi9vA75IOkorDuLEx1c="; + hash = "sha256-s+jEpxKsa3eIV4a/Ltso51jqZC4jzsvPLTjDFMV9FIA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/imgtool/default.nix b/nixpkgs/pkgs/development/python-modules/imgtool/default.nix new file mode 100644 index 000000000000..88ceeb233706 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/imgtool/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, cbor2 +, click +, cryptography +, intelhex +}: + +buildPythonPackage rec { + pname = "imgtool"; + version = "1.10.0"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-A7NOdZNKw9lufEK2vK8Rzq9PRT98bybBfXJr0YMQS0A="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cbor2 + click + cryptography + intelhex + ]; + + pythonImportsCheck = [ + "imgtool" + ]; + + meta = with lib; { + description = "MCUboot's image signing and key management"; + homepage = "https://github.com/mcu-tools/mcuboot"; + license = licenses.asl20; + maintainers = with maintainers; [ samueltardieu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix index ae479120ed1a..c70ab0ac2b32 100644 --- a/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix @@ -136,8 +136,8 @@ let arch = # KeyError: ('Linux', 'arm64') - if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64" - else stdenv.targetPlatform.linuxArch; + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" + else stdenv.hostPlatform.linuxArch; bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -219,7 +219,7 @@ let build --python_path="${python}/bin/python" build --distinct_host_configuration=false build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" - '' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) '' + '' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) '' build --config=avx_posix '' + lib.optionalString mklSupport '' build --config=mkl_open_source_only @@ -298,13 +298,13 @@ let inherit meta; }; platformTag = - if stdenv.targetPlatform.isLinux then + if stdenv.hostPlatform.isLinux then "manylinux2014_${arch}" else if stdenv.system == "x86_64-darwin" then "macosx_10_9_${arch}" else if stdenv.system == "aarch64-darwin" then "macosx_11_0_${arch}" - else throw "Unsupported target platform: ${stdenv.targetPlatform}"; + else throw "Unsupported target platform: ${stdenv.hostPlatform}"; in buildPythonPackage { diff --git a/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix b/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix index e03e005ad7b2..65d5f064ce57 100644 --- a/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "lightning-utilities"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-vSeHtvsIt4L4qJCVlTPVjIjd62+08JWBnr9+9+ujOfw="; + hash = "sha256-lp/+ArgoMIa7Q2ufWghr8OYUMlFcj8123Et73ORNI5U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/linknlink/default.nix b/nixpkgs/pkgs/development/python-modules/linknlink/default.nix new file mode 100644 index 000000000000..59c02c466093 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/linknlink/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "linknlink"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "xuanxuan000"; + repo = "python-linknlink"; + rev = "refs/tags/${version}"; + hash = "sha256-pr0FwNweg7hFcvaOHQyXjIzH1L6Q4q/1llwfdl9k0Sk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + pythonImportsCheck = [ + "linknlink" + ]; + + # Module has no test + doCheck = false; + + meta = with lib; { + description = "Module and CLI for controlling Linklink devices locally"; + homepage = "https://github.com/xuanxuan000/python-linknlink"; + changelog = ""; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch b/nixpkgs/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch new file mode 100644 index 000000000000..cef7fba13343 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch @@ -0,0 +1,34 @@ +diff --git a/llm/cli.py b/llm/cli.py +index af37feb..18b078a 100644 +--- a/llm/cli.py ++++ b/llm/cli.py +@@ -1014,18 +1014,7 @@ def templates_path(): + ) + def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + """Install packages from PyPI into the same environment as LLM""" +- args = ["pip", "install"] +- if upgrade: +- args += ["--upgrade"] +- if editable: +- args += ["--editable", editable] +- if force_reinstall: +- args += ["--force-reinstall"] +- if no_cache_dir: +- args += ["--no-cache-dir"] +- args += list(packages) +- sys.argv = args +- run_module("pip", run_name="__main__") ++ click.echo("Install command has been disabled for Nix. If you want to install extra llm plugins, use llm.withPlugins([]) expression.") + + + @cli.command() +@@ -1033,8 +1022,7 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation") + def uninstall(packages, yes): + """Uninstall Python packages from the LLM environment""" +- sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else []) +- run_module("pip", run_name="__main__") ++ click.echo("Uninstall command has been disabled for Nix. If you want to uninstall extra llm plugins, just remove them from llm.withPlugins([]) list expression.") + + + @cli.command() diff --git a/nixpkgs/pkgs/development/python-modules/llm/default.nix b/nixpkgs/pkgs/development/python-modules/llm/default.nix new file mode 100644 index 000000000000..318f67353308 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/llm/default.nix @@ -0,0 +1,107 @@ +{ + buildPythonApplication, + buildPythonPackage, + fetchFromGitHub, + lib, + makeWrapper, + pytestCheckHook, + python3, + pythonOlder, + ruff, + setuptools, +}: let + llm = buildPythonPackage rec { + pname = "llm"; + version = "0.12"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-aCqdw2co/cXrBwVY/k/aSLl3C22nlH5LvU2yir1/NnQ="; + }; + + patches = [ + ./001-disable-install-uninstall-commands.patch + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click-default-group + numpy + openai + pluggy + pydantic + python-ulid + pyyaml + setuptools # for pkg_resources + sqlite-migrate + sqlite-utils + ]; + + nativeCheckInputs = with python3.pkgs; [ + cogapp + numpy + pytestCheckHook + requests-mock + ]; + + doCheck = true; + + pytestFlagsArray = [ + "-svv" + "tests/" + ]; + + pythonImportsCheck = [ + "llm" + ]; + + passthru = {inherit withPlugins;}; + + meta = with lib; { + homepage = "https://github.com/simonw/llm"; + description = "Access large language models from the command-line"; + changelog = "https://github.com/simonw/llm/releases/tag/${version}"; + license = licenses.asl20; + mainProgram = "llm"; + maintainers = with maintainers; [aldoborrero]; + }; + }; + + withPlugins = plugins: buildPythonApplication { + inherit (llm) pname version; + format = "other"; + + disabled = pythonOlder "3.8"; + + dontUnpack = true; + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + makeWrapper ${llm}/bin/llm $out/bin/llm \ + --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH" + ln -sfv ${llm}/lib $out/lib + ''; + + propagatedBuildInputs = llm.propagatedBuildInputs ++ plugins; + + passthru = llm.passthru // { + withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); + }; + + inherit (llm) meta; + }; +in + llm diff --git a/nixpkgs/pkgs/development/python-modules/md-toc/default.nix b/nixpkgs/pkgs/development/python-modules/md-toc/default.nix index 800fc6227b01..18aeac19b3ca 100644 --- a/nixpkgs/pkgs/development/python-modules/md-toc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.2.0"; + version = "8.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc="; + hash = "sha256-fL3JlZWTEEinYILNeHw0cuvVza27atLLxjrBZkVLRiU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/meraki/default.nix b/nixpkgs/pkgs/development/python-modules/meraki/default.nix index c97624c73c8a..0720a290cb9c 100644 --- a/nixpkgs/pkgs/development/python-modules/meraki/default.nix +++ b/nixpkgs/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.38.0"; + version = "1.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LYwjcm4qZfzrDSujQ9eaxjPN9z0qWDSfT+IU1f32cY0="; + hash = "sha256-B3+2KnRXWkB83Sy/NH9kJwgSha9L17tx37fFwBjT3Mw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mido/default.nix b/nixpkgs/pkgs/development/python-modules/mido/default.nix index 65702b23c7ad..84fe78a59475 100644 --- a/nixpkgs/pkgs/development/python-modules/mido/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mido/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./libportmidi-cdll.patch; - libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}"; + libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy-macos/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy-macos/default.nix new file mode 100644 index 000000000000..39798d90b15d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy-macos/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +}: + +buildPythonPackage rec { + pname = "mitmproxy-macos"; + version = "0.3.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "mitmproxy_rs"; + rev = version; + hash = "sha256-V6LUr1jJiTo0+53jipkTyzG5JSw6uHaS6ziyBaFbETw="; + }; + + sourceRoot = "${src.name}/mitmproxy-macos"; + pythonImportsCheck = [ "mitmproxy_macos" ]; + nativeBuildInputs = [ + hatchling + ]; + + meta = with lib; { + description = "The MacOS Rust bits in mitmproxy"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs/tree/main/mitmproxy-macos"; + changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ boltzmannrain ]; + platforms = platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix index 15850ab7cd78..d90e1e0c2a96 100644 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix @@ -4,6 +4,8 @@ , fetchFromGitHub , rustPlatform , darwin +, libiconv +, mitmproxy-macos }: buildPythonPackage rec { @@ -34,13 +36,15 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + libiconv + mitmproxy-macos ]; pythonImportsCheck = [ "mitmproxy_rs" ]; meta = with lib; { description = "The Rust bits in mitmproxy"; - homepage = " https://github.com/mitmproxy/mitmproxy_rs"; + homepage = "https://github.com/mitmproxy/mitmproxy_rs"; changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index 1c57361a6406..566c1e0b3298 100644 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, stdenv # Mitmproxy requirements , aioquic , asgiref @@ -15,6 +16,7 @@ , hyperframe , kaitaistruct , ldap3 +, mitmproxy-macos , mitmproxy-rs , msgpack , passlib @@ -81,6 +83,8 @@ buildPythonPackage rec { urwid wsproto zstandard + ] ++ lib.optionals stdenv.isDarwin [ + mitmproxy-macos ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 318bd9a00bbd..a5bb698aa1af 100644 --- a/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "mopeka-iot-ble"; - version = "0.4.1"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM="; + hash = "sha256-m27As3tB77JbgY0kDDJ6kmYFTv2O/Sh6y9tFiKDIjbI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "mopeka_iot_ble" ]; diff --git a/nixpkgs/pkgs/development/python-modules/mpl-scatter-density/default.nix b/nixpkgs/pkgs/development/python-modules/mpl-scatter-density/default.nix new file mode 100644 index 000000000000..f0523c3594dc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mpl-scatter-density/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pytestCheckHook +, fetchFromGitHub +, fetchpatch +, pythonOlder +, setuptools-scm +, setuptools +, fast-histogram +, matplotlib +, numpy +, wheel +, pytest-mpl +}: + +buildPythonPackage rec { + pname = "mpl-scatter-density"; + version = "0.7"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "astrofrog"; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-MMxM+iv5p9ZLcBpqa3tBBPbsMM/PTg6BXaDpGgSw+DE="; + }; + + patches = [ + # https://github.com/astrofrog/mpl-scatter-density/pull/37 + (fetchpatch { + name = "distutils-removal.patch"; + url = "https://github.com/ifurther/mpl-scatter-density/commit/6feedabe1e82da67d8eec46a80eb370d9f334251.patch"; + sha256 = "sha256-JqWlSm8mIwqjRPa+kMEaKipJyzGEO+gJK+Q045N1MXA="; + }) + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ matplotlib numpy fast-histogram ]; + + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mpl + ]; + + disabledTests = [ + # AssertionError: (240, 240) != (216, 216) + # Erroneous pinning of figure DPI, sensitive to runtime environment + "test_default_dpi" + ]; + + pythonImportsCheck = [ "mpl_scatter_density" ]; + + meta = with lib; { + homepage = "https://github.com/astrofrog/mpl-scatter-density"; + description = "Fast scatter density plots for Matplotlib"; + license = licenses.bsd2; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/mpv/default.nix b/nixpkgs/pkgs/development/python-modules/mpv/default.nix index c956bb90aa8f..3763e25660a5 100644 --- a/nixpkgs/pkgs/development/python-modules/mpv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mpv/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace mpv.py \ --replace "sofile = ctypes.util.find_library('mpv')" \ - 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"' + 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; # tests impure, will error if it can't load libmpv.so diff --git a/nixpkgs/pkgs/development/python-modules/msprime/default.nix b/nixpkgs/pkgs/development/python-modules/msprime/default.nix index 008ce7f2711e..2ec32c255dfa 100644 --- a/nixpkgs/pkgs/development/python-modules/msprime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/msprime/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , oldest-supported-numpy , setuptools-scm , wheel @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; }; + patches = [ + # upstream patch fixes 2 failing unittests. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/tskit-dev/msprime/commit/639125ec942cb898cf4a80638f229e11ce393fbc.patch"; + hash = "sha256-peli4tdu8Bv21xIa5H8SRdfjQnTMO72IPFqybmSBSO8="; + includes = [ "tests/test_ancestry.py" ]; + }) + ]; + nativeBuildInputs = [ gsl oldest-supported-numpy diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index ba963ff0d5dd..575c438eb551 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { patches = [ # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. # This makes the installation with nixpkgs fail. I suspect, that's - # because stdenv.targetPlatform.darwinSdkVersion is (currently) set to + # because stdenv.hostPlatform.darwinSdkVersion is (currently) set to # 10.12. The patch reverts # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch diff --git a/nixpkgs/pkgs/development/python-modules/oca-port/default.nix b/nixpkgs/pkgs/development/python-modules/oca-port/default.nix index 0a603b0b91c8..7b948c4ffdf3 100644 --- a/nixpkgs/pkgs/development/python-modules/oca-port/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oca-port/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.13"; + version = "0.14"; format = "pyproject"; src = fetchPypi { inherit version; pname = "oca_port"; - hash = "sha256-9ihqjnGdBPasiRD2pZeaiibwzFQKI9t+s/zMzvyLLHQ="; + hash = "sha256-P+uCoC2u5lR4oTtloNFd4N+CjssUa5PbzbnhEulaRoc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix b/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix index 68f692e4c37a..7983abd2e985 100644 --- a/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix @@ -2,22 +2,23 @@ , fetchFromGitHub , buildPythonPackage , substituteAll -, cudaSupport ? false + +# build-system +, setuptools # runtime , ffmpeg-headless # propagates -, numpy -, torch -, torchWithCuda -, tqdm , more-itertools -, transformers , numba +, numpy , openai-triton , scipy , tiktoken +, torch +, tqdm +, transformers # tests , pytestCheckHook @@ -25,14 +26,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20230918"; - format = "setuptools"; + version = "20231117"; + pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wBAanFVEIIzTcoX40P9eI26UdEu0SC/xuife/zi2Xho="; + hash = "sha256-MJ1XjB/GuYUiECCuuHS0NWHvvs+ko0oTvLuDI7zLNiY="; }; patches = [ @@ -42,32 +43,22 @@ buildPythonPackage rec { }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - numpy - tqdm more-itertools - transformers numba + numpy + openai-triton scipy tiktoken - ] ++ lib.optionals (!cudaSupport) [ torch - ] ++ lib.optionals (cudaSupport) [ - openai-triton - torchWithCuda + tqdm + transformers ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "tiktoken==0.3.3" "tiktoken>=0.3.3" - '' - # openai-triton is only needed for CUDA support. - # triton needs CUDA to be build. - # -> by making it optional, we can build whisper without unfree packages enabled - + lib.optionalString (!cudaSupport) '' - sed -i '/if sys.platform.startswith("linux") and platform.machine() == "x86_64":/{N;d}' setup.py - ''; - preCheck = '' export HOME=$TMPDIR ''; @@ -85,7 +76,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/openai/whisper/blob/v$[version}/CHANGELOG.md"; + changelog = "https://github.com/openai/whisper/blob/v${version}/CHANGELOG.md"; description = "General-purpose speech recognition model"; homepage = "https://github.com/openai/whisper"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix b/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix index 4cce64c43008..326f7d2aceda 100644 --- a/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/opensensemap-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lz2G7vXUadhTFgfHpIq9kHfojf+iytjitFZZ7rgqeO8="; + hash = "sha256-UrgQjZYw7TlFvhnaI7wFUpuUYeVKO5hsnx8h1OKfV8w="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 85f92e478354..64df3dc82e47 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4="; + hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/nixpkgs/pkgs/development/python-modules/owslib/default.nix index 26c62b70c0aa..5e5e5a07b9c5 100644 --- a/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.29.2"; + version = "0.29.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; rev = "refs/tags/${version}"; - hash = "sha256-dbL4VdnPszwiDO+UjluuyqeBRMKojTnZPEFKEYiIWS0="; + hash = "sha256-yAJXknSsGXcerzaOVSrFO4j5E6B/4/0JfoSxZ+Szmws="; }; postPatch = '' @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; - changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/geopython/OWSLib/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.geospatial.members; }; diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index a88ce34ab0d9..1fcff9e47803 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "17.0.0"; + version = "18.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-rVYyS2Wc3PC3BvkzUSe88sSXxJCElmP5s7B1NxSFAWY="; + hash = "sha256-1OV/oybxZXF2kjLoSA2KyQaTR91jqEWstpELSlUIg2o="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 0802156dcd3a..14e77c816b88 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.34.5"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Lg8oNFb0nc6T8E0fksv2w/bkHB/7PPXipMDGC0i8Kc0="; + hash = "sha256-eHJQXLiuWmJo/Eo4B8gEo44rwpPA7ASjxKSmdu6Tv9M="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix b/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix new file mode 100644 index 000000000000..315d0411b8e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pvextractor/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, astropy +, qtpy +, pyqt6 +, pyqt-builder +, setuptools +, setuptools-scm +, scipy +, matplotlib +, spectral-cube +, pytestCheckHook +, pytest-astropy +}: + +buildPythonPackage rec { + pname = "pvextractor"; + version = "0.3"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "radio-astro-tools"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HYus2Gk3hzKq+3lJLOJQ+EE6LeO+DrvqLK3NpqrUYeI="; + }; + + buildInputs = [ pyqt-builder ]; + nativeBuildInputs = [ setuptools setuptools-scm ]; + propagatedBuildInputs = [ + astropy + scipy + matplotlib + pyqt6 + qtpy + 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; + + nativeCheckInputs = [ + pytestCheckHook + pytest-astropy + ]; + + pythonImportsCheck = [ "pvextractor" ]; + + meta = with lib; { + homepage = "http://pvextractor.readthedocs.io"; + description = "Position-velocity diagram extractor"; + license = licenses.bsd3; + maintainers = with maintainers; [ ifurther ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix index f2c2668f4043..9dde5d012225 100644 --- a/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, black -, codespell -, isort -, mypy -, pre-commit , pygobject3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.9.0"; - format = "pyproject"; + version = "2.10.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0="; + hash = "sha256-fz+qzFWl9JJu9CEVkeiV6XUIPDvwWgrfhTo/nj1EH5c="; }; nativeBuildInputs = [ @@ -32,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 561 Typing Stubs for PyGObject"; homepage = "https://github.com/pygobject/pygobject-stubs"; - changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ hacker1024 ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 8980da8e24bd..176e9fcd1545 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; + hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyproj/default.nix b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix index 0d77ed937cf1..576688accc07 100644 --- a/nixpkgs/pkgs/development/python-modules/pyproj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyproj/default.nix @@ -100,11 +100,11 @@ buildPythonPackage rec { "pyproj.exceptions" ]; - meta = { + meta = with lib; { description = "Python interface to PROJ library"; homepage = "https://github.com/pyproj4/pyproj"; changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lsix dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ lsix dotlambda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix b/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix index db9565607a66..5bc9f3fecfcc 100644 --- a/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix @@ -2,27 +2,41 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pyasn1 -, pyasn1-modules -, pythonAtLeast , pythonOlder -, pytestCheckHook + +# build-system +, setuptools + +# native dependencies , openldap , cyrus_sasl + +# dependencies +, pyasn1 +, pyasn1-modules + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.3"; + version = "3.4.4"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-ldap"; + repo = "python-ldap"; rev = "refs/tags/python-ldap-${version}"; - hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58="; + hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ openldap cyrus_sasl @@ -53,7 +67,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { + changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; description = "Python modules for implementing LDAP clients"; + downloadPage = "https://github.com/python-ldap/python-ldap"; homepage = "https://www.python-ldap.org/"; license = licenses.psfl; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index 29b1e5f8d530..8c3c0d86f3b8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -1,5 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage -, six, udev, pytest, mock, hypothesis, docutils +{ lib +, fetchPypi +, buildPythonPackage +, six +, udev +, pytest +, mock +, hypothesis +, docutils +, stdenvNoCC }: buildPythonPackage rec { @@ -11,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-deVNNyGPWsRbDaHw/ZzF5SajysPvHPrUEM96sziwFHE="; }; - postPatch = '' + postPatch = lib.optionalString stdenvNoCC.isLinux '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; @@ -27,9 +35,10 @@ buildPythonPackage rec { # https://github.com/pyudev/pyudev/issues/187 doCheck = false; - meta = { + meta = with lib; { homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ frogamic ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix index 7a740efe5a4e..f395f88bf7dc 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, lxml , requests , six +, pyopenssl , pythonOlder }: buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.2.0"; + version = "8.0.2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +19,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IoYxk/lS7dhw0q3kfpq7y/oDNmc1dOra0YA3CiHe8YM="; + hash = "sha256-Y7Zor70P4lhkAslckg/prfCmnszVMFPntWdJpfWnvIM="; }; propagatedBuildInputs = [ @@ -25,6 +27,13 @@ buildPythonPackage rec { six ]; + passthru.optional-dependencies = { + sso = [ + lxml + pyopenssl + ]; + }; + # Requires old version of vcrpy doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index f56921a691aa..674c508696bf 100644 --- a/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-6kfD87GlEb+f6hUSqhyPIy4Xg63f8zDdGKMaOxQYWoM="; + hash = "sha256-A7FQeeYym0nAQlkbpejpZqd5ZgX2cw3/DbshDxlrivw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scs/default.nix b/nixpkgs/pkgs/development/python-modules/scs/default.nix index 0a242e231373..5e95bed4cbdb 100644 --- a/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -2,6 +2,10 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch +, meson-python +, pkg-config +, Accelerate , blas , lapack , numpy @@ -12,19 +16,43 @@ buildPythonPackage rec { pname = "scs"; - version = "3.2.3"; + version = "3.2.4"; + pyproject = true; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; rev = version; - hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM="; + hash = "sha256-UmMbnj7QZSvHWSUk1Qa0VP4i3iDCYHxoa+qBmEdFjRs="; fetchSubmodules = true; }; - buildInputs = [ - lapack + patches = [ + # needed for building against netlib's reference blas implementation and + # the pkg-config patch. remove on next update + (fetchpatch { + name = "find-and-ld-lapack.patch"; + url = "https://github.com/bodono/scs-python/commit/a0aea80e7d490770d6a47d2c79396f6c3341c1f9.patch"; + hash = "sha256-yHF8f7SLoG7veZ6DEq1HVH6rT2KtFONwJtqSiKcxOdg="; + }) + # add support for pkg-config. remove on next update + (fetchpatch { + name = "use-pkg-config.patch"; + url = "https://github.com/bodono/scs-python/commit/dd17e2e5282ebe85f2df8a7c6b25cfdeb894970d.patch"; + hash = "sha256-vSeSJeeu5Wx3RXPyB39YTo0RU8HtAojrUw85Q76/QzA="; + }) + ]; + + nativeBuildInputs = [ + meson-python + pkg-config + ]; + + buildInputs = if stdenv.isDarwin then [ + Accelerate + ] else [ blas + lapack ]; propagatedBuildInputs = [ @@ -51,6 +79,6 @@ buildPythonPackage rec { homepage = "https://github.com/cvxgrp/scs"; # upstream C package downloadPage = "https://github.com/bodono/scs-python"; license = licenses.mit; - maintainers = with maintainers; [ drewrisinger ]; + maintainers = with maintainers; [ a-n-n-a-l-e-e drewrisinger ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/nixpkgs/pkgs/development/python-modules/shapely/default.nix index 488e936abb82..7f87ddf6befa 100644 --- a/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zqaxo+cuzpf8hVNqKBR2+bd5TeLmRsqKRRfi48FEaJM="; + hash = "sha256-FxPMBMFxuv/Fslm6hTHFiswqMBcHt/Ah2IoV7QkGSec="; }; nativeBuildInputs = [ @@ -44,8 +44,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # Fix a ModuleNotFoundError. Investigated at: + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' - rm -r shapely # prevent import of local shapely + cd $out ''; disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix b/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix index c0439dcec706..e21580162cfe 100644 --- a/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "siobrultech-protocols"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sdwilsh"; repo = "siobrultech-protocols"; rev = "refs/tags/v${version}"; - hash = "sha256-71iFZS5CLYXNw57psLXswNJKfvbeKOqSncLoSsNXqjc="; + hash = "sha256-6BGhelyv0FoPyGwzgIX5Gbbu9Ks19MtL1AZQRZWKzhM="; }; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqids/default.nix b/nixpkgs/pkgs/development/python-modules/sqids/default.nix index dc6befc17991..a9d5fe372953 100644 --- a/nixpkgs/pkgs/development/python-modules/sqids/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqids/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; + hash = "sha256-/8P7/vY0kb7ouUCpgGU4g0Xb77BtSeQVt6nkdcogD50="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 88c2ccf45963..3f91435b3aa7 100644 --- a/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -1,23 +1,28 @@ { lib , buildPythonPackage , fetchPypi -, requests , pythonOlder +, requests +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "stripe"; - version = "7.4.0"; - format = "setuptools"; + version = "7.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pcfdgjk20yYt1DCr5XQ4rzLokQNS27NOspa/21nvCuw="; + hash = "sha256-duDfcHHaXvORNNkpuMf6zxMZqkfCIr8ScrSKxVq/PW8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests typing-extensions diff --git a/nixpkgs/pkgs/development/python-modules/succulent/default.nix b/nixpkgs/pkgs/development/python-modules/succulent/default.nix index 3b191bae9b85..e1ad7981b047 100644 --- a/nixpkgs/pkgs/development/python-modules/succulent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/succulent/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "succulent"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "firefly-cpp"; repo = "succulent"; - rev = version; - hash = "sha256-fSsb2UQM69AAjJd/Rvzuok7jBeAa6udbB8FbuNP8Ztw="; + rev = "refs/tags/${version}"; + hash = "sha256-CGDgt6tv+KysrytJsgDKwf2yv6shXizvD67XsGBg+nI="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/syrupy/default.nix b/nixpkgs/pkgs/development/python-modules/syrupy/default.nix index 8759f3562596..84bc944317e1 100644 --- a/nixpkgs/pkgs/development/python-modules/syrupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; + hash = "sha256-FjDGwSOKvDWx+LwUCNGEOBKV3rFG+09gtFpLLi0xgD4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/testpath/default.nix b/nixpkgs/pkgs/development/python-modules/testpath/default.nix index 5635a6156159..eb66bea56f57 100644 --- a/nixpkgs/pkgs/development/python-modules/testpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testpath/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # exe are only required when testpath is used on windows # https://github.com/jupyter/testpath/blob/de8ca59539eb23b9781e55848b7d2646c8c61df9/testpath/commands.py#L128 - preBuild = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm testpath/cli-32.exe testpath/cli-64.exe ''; diff --git a/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix b/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix index 6da3e202672a..b6bb8a1b2256 100644 --- a/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix @@ -1,29 +1,44 @@ { lib , buildPythonPackage , fetchFromGitHub -, requests , pytestCheckHook +, pythonOlder +, requests , responses +, setuptools-scm }: buildPythonPackage rec { pname = "testrail-api"; - version = "1.12.0"; + version = "1.12.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tolstislon"; repo = "testrail-api"; - rev = version; - sha256 = "sha256-VuAW5Dl3pkA6mtn/mbzxTFoavO5jPoqFSFVlrxc7KRk="; + rev = "refs/tags/${version}"; + hash = "sha256-lIlTrAdNtBJdwiSFwpcHA2e+fRC+MbHS0PX7prAN+RY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + requests + ]; + nativeCheckInputs = [ pytestCheckHook responses ]; - propagatedBuildInputs = [ - requests + pythonImportsCheck = [ + "testrail_api" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/torch/default.nix b/nixpkgs/pkgs/development/python-modules/torch/default.nix index c9bf7c45766f..f89fed489f84 100644 --- a/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -16,9 +16,10 @@ filelock, jinja2, networkx, - openai-triton, sympy, numpy, pyyaml, cffi, click, typing-extensions, + # ROCm build and `torch.compile` requires `openai-triton` + tritonSupport ? (!stdenv.isDarwin), openai-triton, # Unit tests hypothesis, psutil, @@ -189,7 +190,7 @@ in buildPythonPackage rec { '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0 inline void *aligned_alloc(size_t align, size_t size)' @@ -303,12 +304,13 @@ in buildPythonPackage rec { "-Wno-pass-failed" ] ++ [ "-Wno-unused-command-line-argument" - "-Wno-maybe-uninitialized" "-Wno-uninitialized" "-Wno-array-bounds" - "-Wno-stringop-overflow" "-Wno-free-nonheap-object" "-Wno-unused-result" + ] ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-maybe-uninitialized" + "-Wno-stringop-overflow" ])); nativeBuildInputs = [ @@ -377,12 +379,10 @@ in buildPythonPackage rec { # the following are required for tensorboard support pillow six future tensorboard protobuf - # ROCm build and `torch.compile` requires openai-triton - openai-triton - # torch/csrc requires `pybind11` at runtime pybind11 ] + ++ lib.optionals tritonSupport [ openai-triton ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; diff --git a/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix b/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix index 5ce5deace5d0..fb510b7e764c 100644 --- a/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.7"; + version = "2023.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk="; + hash = "sha256-UTMYuSKNn5ACKg9BmeUf1SFhDV1jknbxggkmCgzB/xk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/towncrier/default.nix b/nixpkgs/pkgs/development/python-modules/towncrier/default.nix index 03b916883438..e90648ec0810 100644 --- a/nixpkgs/pkgs/development/python-modules/towncrier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/towncrier/default.nix @@ -1,38 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder , click -, click-default-group +, fetchPypi +, git # shells out to git +, hatchling +, importlib-resources , incremental , jinja2 , mock , pytestCheckHook -, toml +, pythonOlder +, tomli , twisted -, setuptools -, git # shells out to git }: buildPythonPackage rec { pname = "towncrier"; - version = "23.6.0"; - format = "setuptools"; + version = "23.11.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; + hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "hatchling ~= 1.17.1" "hatchling" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click - click-default-group incremental jinja2 - toml - setuptools + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; preCheck = '' diff --git a/nixpkgs/pkgs/development/python-modules/trainer/default.nix b/nixpkgs/pkgs/development/python-modules/trainer/default.nix index 466d6db8da5a..734bc324e266 100644 --- a/nixpkgs/pkgs/development/python-modules/trainer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trainer/default.nix @@ -4,19 +4,19 @@ , coqpit , fsspec -, torch-bin +, torch , tensorboard , protobuf , psutil , pytestCheckHook , soundfile -, torchvision-bin +, torchvision }: let pname = "trainer"; - version = "0.0.31"; + version = "0.0.32"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; + hash = "sha256-lSfkokPFB09KZBHe/Qkon2gUsA82AK52WNK1bJfzCNc="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage { psutil soundfile tensorboard - torch-bin + torch ]; # only one test and that requires training data from the internet @@ -48,7 +48,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - torchvision-bin + torchvision ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix index 801b108e5042..97ceedec0d26 100644 --- a/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "3.0.0"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; rev = "refs/tags/${version}"; - hash = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; + hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for wake on lan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; + changelog = "https://github.com/remcohaszing/pywakeonlan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/web-cache/default.nix b/nixpkgs/pkgs/development/python-modules/web-cache/default.nix index 9246b2b571e7..dba9d91875c2 100644 --- a/nixpkgs/pkgs/development/python-modules/web-cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/web-cache/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Simple Python key-value storage backed up by sqlite3 database"; homepage = "https://github.com/desbma/web_cache"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix b/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix index f19fe38366cd..5bd96b3aa1b6 100644 --- a/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xlsxwriter/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "xlsxwriter"; - version = "3.1.7"; + version = "3.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "jmcnamara"; repo = "XlsxWriter"; rev = "RELEASE_${version}"; - hash = "sha256-ZOKS9sTZvlopfIYOEhOk/rq4qtcMrNQ4Bwb8lDtKfxs="; + hash = "sha256-FkSInLinyn/eXBMSuivzFxCTZijOKdSG4l+gHyKENuY="; }; nativeCheckInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for creating Excel XLSX files"; homepage = "https://xlsxwriter.readthedocs.io/"; + changelog = "https://xlsxwriter.readthedocs.io/changes.html"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/xnd/default.nix b/nixpkgs/pkgs/development/python-modules/xnd/default.nix index 3657997f5a74..eac1153b4f50 100644 --- a/nixpkgs/pkgs/development/python-modules/xnd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xnd/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , buildPythonPackage , python , ndtypes @@ -15,6 +16,17 @@ buildPythonPackage { propagatedBuildInputs = [ ndtypes ]; + buildInputs = [ libndtypes ]; + + patches = [ + # python311 fixes which are on main. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/xnd-project/xnd/commit/e1a06d9f6175f4f4e1da369b7e907ad6b2952c00.patch"; + hash = "sha256-xzrap+FL5be13bVdsJ3zeV7t57ZC4iyhuZhuLsOzHyE="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 2531a6648e36..40af2c4fb629 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.3.1"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-6dsMOFyZ8cX2zKXX682b5znJvXYTeKt99Wafz7RkfQw="; + hash = "sha256-vDkrKVqyisPkswvfb+UPH95mehwNgyFxRmeT+1UHvXs="; }; nativeBuildInputs = [ |