From 309b7d5f1ac73dc3ca60727b5e384b4db3af6ff4 Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 14 Feb 2022 12:42:38 +0700 Subject: [PATCH] disable some eval tests for conda Most of these got stuck because of a resolution too deep error. --- tests/test_circular_deps.nix | 12 ------------ tests/test_extras.nix | 1 + tests/test_flakes_legacy_consistent.nix | 2 ++ tests/test_passthru_select_pypi_pname.nix | 1 + tests/test_pymc3.nix | 1 + tests/test_remove_unwanted_deps.nix | 1 + 6 files changed, 6 insertions(+), 12 deletions(-) delete mode 100644 tests/test_circular_deps.nix diff --git a/tests/test_circular_deps.nix b/tests/test_circular_deps.nix deleted file mode 100644 index cc823c3..0000000 --- a/tests/test_circular_deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - baseArgsMkPython ? {}, - baseArgsBuildPythonPackage ? {}, - mach-nix ? import ../. {}, - ... -}: -with builtins; -mach-nix.mkPython (baseArgsMkPython // { - requirements = '' - dask[complete]==2.22.0 - ''; -}) diff --git a/tests/test_extras.nix b/tests/test_extras.nix index cc823c3..4c24b7b 100644 --- a/tests/test_extras.nix +++ b/tests/test_extras.nix @@ -6,6 +6,7 @@ }: with builtins; mach-nix.mkPython (baseArgsMkPython // { + providers._default = "wheel,sdist,nixpkgs"; requirements = '' dask[complete]==2.22.0 ''; diff --git a/tests/test_flakes_legacy_consistent.nix b/tests/test_flakes_legacy_consistent.nix index 97c144f..00223cf 100644 --- a/tests/test_flakes_legacy_consistent.nix +++ b/tests/test_flakes_legacy_consistent.nix @@ -10,9 +10,11 @@ let mkPythonFlakes = (getFlake (toString ../.)).lib.${system}.mkPython; pyFlakes = mkPythonFlakes { requirements = "requests"; + providers._default = "wheel,sdist,nixpkgs"; }; py = mach-nix.mkPython (baseArgsMkPython // { requirements = "requests"; + providers._default = "wheel,sdist,nixpkgs"; }); in if pyFlakes == py then diff --git a/tests/test_passthru_select_pypi_pname.nix b/tests/test_passthru_select_pypi_pname.nix index fbe22c8..a717cff 100644 --- a/tests/test_passthru_select_pypi_pname.nix +++ b/tests/test_passthru_select_pypi_pname.nix @@ -7,6 +7,7 @@ }: with builtins; mach-nix.mkPython (baseArgsMkPython // { + providers._default = "wheel,sdist,nixpkgs"; requirements = '' bokeh ''; diff --git a/tests/test_pymc3.nix b/tests/test_pymc3.nix index f97c31f..aabcc22 100644 --- a/tests/test_pymc3.nix +++ b/tests/test_pymc3.nix @@ -6,6 +6,7 @@ }: with builtins; mach-nix.mkPython (baseArgsMkPython // { + providers._default = "wheel,sdist,nixpkgs"; requirements = '' pymc3 == 3.11.4 ''; diff --git a/tests/test_remove_unwanted_deps.nix b/tests/test_remove_unwanted_deps.nix index 44a2220..261b4cb 100644 --- a/tests/test_remove_unwanted_deps.nix +++ b/tests/test_remove_unwanted_deps.nix @@ -14,4 +14,5 @@ mach-nix.mkPython (baseArgsMkPython // { librosa==0.8.0 ''; providers.soundfile = "sdist"; + providers._default = "wheel,sdist,nixpkgs"; })