Merge pull request #325963 from eclairevoyant/py-llm-fix

treewide: remove uses of `python3` within the python package set
2024-11-27 09:23:01 +00:00 · 2024-07-15 15:09:35 +02:00 · 2024-07-15 15:09:35 +02:00 · a8c466e330
commit a8c466e330
parent f1d1a7b4e7 bedf04b195
14 changed files with 43 additions and 31 deletions
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@ -17,7 +17,7 @@
  packaging,
  pathspec,
  protobuf,
-  python3,
+  python,
  pythonOlder,
  pytz,
  pyyaml,
@ -85,7 +85,7 @@ buildPythonPackage rec {
  doCheck = false;

  passthru = {
-    withAdapters = python3.pkgs.callPackage ./with-adapters.nix { };
+    withAdapters = python.pkgs.callPackage ./with-adapters.nix { };
  };

  meta = with lib; {
--- a/pkgs/development/python-modules/dbt-core/with-adapters.nix
+++ b/pkgs/development/python-modules/dbt-core/with-adapters.nix
@ -1,5 +1,5 @@
 {
-  python3,
+  python,
  dbt-bigquery,
  dbt-core,
  dbt-postgres,
@ -17,7 +17,7 @@ let
  };
 in
 adapterFun:
-(python3.buildEnv.override {
+(python.buildEnv.override {
  extraLibs = [ dbt-core ] ++ (adapterFun adapters);
  ignoreCollisions = true;
 }).overrideAttrs
--- a/pkgs/development/python-modules/django-currentuser/default.nix
+++ b/pkgs/development/python-modules/django-currentuser/default.nix
@ -2,7 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  python3,
+  python,
  pythonOlder,
  django,
  hatchling,
@ -38,7 +38,7 @@ buildPythonPackage {

  checkPhase = ''
    runHook preCheck
-    ${python3.interpreter} manage.py test testapp
+    ${python.interpreter} manage.py test testapp
    runHook postCheck
  '';

--- a/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
+++ b/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
@ -7,7 +7,7 @@
  icu,
  pkg-config,
  fetchFromGitHub,
-  python3,
+  python,
  openblas,
  zlib,
  gfortran,
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    pkg-config
-    python3
+    python
    gfortran
  ];

--- a/pkgs/development/python-modules/laces/default.nix
+++ b/pkgs/development/python-modules/laces/default.nix
@ -4,7 +4,6 @@
  django,
  fetchFromGitHub,
  flit-core,
-  python3,
 }:

 buildPythonPackage rec {
--- a/pkgs/development/python-modules/lcd-i2c/default.nix
+++ b/pkgs/development/python-modules/lcd-i2c/default.nix
@ -1,6 +1,5 @@
 {
  lib,
-  python3,
  fetchPypi,
  buildPythonPackage,
  smbus2,
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@ -5,10 +5,22 @@
  fetchFromGitHub,
  makeWrapper,
  pytestCheckHook,
-  python3,
+  python,
  pythonOlder,
  ruff,
  setuptools,
+  click-default-group,
+  numpy,
+  openai,
+  pip,
+  pluggy,
+  pydantic,
+  python-ulid,
+  pyyaml,
+  sqlite-migrate,
+  cogapp,
+  pytest-httpx,
+  sqlite-utils,
 }:
 let
  llm = buildPythonPackage rec {
@ -29,7 +41,7 @@ let

    nativeBuildInputs = [ setuptools ];

-    propagatedBuildInputs = with python3.pkgs; [
+    propagatedBuildInputs = [
      click-default-group
      numpy
      openai
@ -43,7 +55,7 @@ let
      sqlite-utils
    ];

-    nativeCheckInputs = with python3.pkgs; [
+    nativeCheckInputs = [
      cogapp
      numpy
      pytest-httpx
@ -89,7 +101,7 @@ let

      installPhase = ''
        makeWrapper ${llm}/bin/llm $out/bin/llm \
-          --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH"
+          --prefix PYTHONPATH : "${llm}/${python.sitePackages}:$PYTHONPATH"
        ln -sfv ${llm}/lib $out/lib
      '';

--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@ -5,7 +5,7 @@
  fetchFromGitHub,
  isPyPy,
  ordered-set,
-  python3,
+  python,
  setuptools,
  zstandard,
  wheel,
@ -40,7 +40,7 @@ buildPythonPackage rec {
  checkPhase = ''
    runHook preCheck

-    ${python3.interpreter} tests/basics/run_all.py search
+    ${python.interpreter} tests/basics/run_all.py search

    runHook postCheck
  '';
--- a/pkgs/development/python-modules/pybars3/default.nix
+++ b/pkgs/development/python-modules/pybars3/default.nix
@ -1,5 +1,5 @@
 {
-  python3,
+  python,
  fetchPypi,
  lib,
  pymeta3,
@ -19,7 +19,7 @@ buildPythonPackage rec {

  checkPhase = ''
    runHook preCheck
-    ${python3.interpreter} tests.py
+    ${python.interpreter} tests.py
    runHook postCheck
  '';

--- a/pkgs/development/python-modules/pytest-image-diff/default.nix
+++ b/pkgs/development/python-modules/pytest-image-diff/default.nix
@ -1,6 +1,5 @@
 {
  lib,
-  python3,
  buildPythonPackage,
  fetchFromGitHub,
  typing-extensions,
--- a/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
+++ b/pkgs/development/python-modules/python-secp256k1-cardano/default.nix
@ -1,11 +1,14 @@
 {
  lib,
  fetchFromGitHub,
-  python3,
+  buildPythonPackage,
  pkg-config,
+  cffi,
+  secp256k1,
+  pytestCheckHook,
 }:

-python3.pkgs.buildPythonPackage {
+buildPythonPackage {
  pname = "python-secp256k1-cardano";
  version = "0.2.3";

@ -20,20 +23,20 @@ python3.pkgs.buildPythonPackage {

  nativeBuildInputs = [ pkg-config ];

-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
    cffi
    secp256k1
  ];

-  nativeCheckInputs = [ python3.pkgs.pytestCheckHook ];
+  nativeCheckInputs = [ pytestCheckHook ];

  # Tests expect .so files and are failing
  doCheck = false;

  preConfigure = ''
-    cp -r ${python3.pkgs.secp256k1.src} libsecp256k1
-    export INCLUDE_DIR=${python3.pkgs.secp256k1}/include
-    export LIB_DIR=${python3.pkgs.secp256k1}/lib
+    cp -r ${secp256k1.src} libsecp256k1
+    export INCLUDE_DIR=${secp256k1}/include
+    export LIB_DIR=${secp256k1}/lib
  '';

  meta = {
--- a/pkgs/development/python-modules/rtp/default.nix
+++ b/pkgs/development/python-modules/rtp/default.nix
@ -2,7 +2,6 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  python3,

  # nativeCheckInputs
  hypothesis,
--- a/pkgs/development/python-modules/ssg/default.nix
+++ b/pkgs/development/python-modules/ssg/default.nix
@ -4,7 +4,7 @@
  fetchFromGitHub,
  fetchpatch,

-  python3,
+  python,
  unittestCheckHook,
  setuptools,

@ -45,7 +45,7 @@ buildPythonPackage {

  pythonImportsCheck = [ "ssg" ];

-  postInstall = "rm -rf $out/${python3.sitePackages}/scripts";
+  postInstall = "rm -rf $out/${python.sitePackages}/scripts";

  meta = with lib; {
    description = "TCRF syllable segmenter for Thai";
--- a/pkgs/development/python-modules/tabcmd/default.nix
+++ b/pkgs/development/python-modules/tabcmd/default.nix
@ -10,7 +10,7 @@
  pyinstaller-versionfile,
  pytest-order,
  pytestCheckHook,
-  python3,
+  python,
  pythonOlder,
  requests,
  setuptools,
@ -79,7 +79,7 @@ buildPythonPackage rec {
    cp -r build/lib/tabcmd/__main__.py $out/bin/

    # Create a 'tabcmd' script with python3 shebang
-    echo "#!${python3}/bin/python3" > $out/bin/tabcmd
+    echo "#!${python.interpreter}" > $out/bin/tabcmd

    # Append __main__.py contents
    cat $out/bin/__main__.py >> $out/bin/tabcmd
@ -91,6 +91,7 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "tabcmd" ];

  meta = with lib; {
+    broken = true;
    description = "Command line client for working with Tableau Server";
    homepage = "https://github.com/tableau/tabcmd";
    changelog = "https://github.com/tableau/tabcmd/releases/tag/v${version}";