diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax-platform/default.nix similarity index 79% rename from pkgs/development/python-modules/ax/default.nix rename to pkgs/development/python-modules/ax-platform/default.nix index 7b3cc8f2b1c2..f0d274ef85ae 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax-platform/default.nix @@ -2,17 +2,14 @@ lib, buildPythonPackage, fetchFromGitHub, - ax, botorch, ipywidgets, jinja2, pandas, plotly, - python, setuptools, setuptools-scm, typeguard, - wheel, hypothesis, mercurial, pyfakefs, @@ -22,24 +19,23 @@ }: buildPythonPackage rec { - pname = "ax"; - version = "0.4.0"; - format = "pyproject"; + pname = "ax-platform"; + version = "0.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "facebook"; - repo = pname; + repo = "ax"; rev = "refs/tags/${version}"; - hash = "sha256-dj6Gig8N4oLtcZLwPl4QDHG/FwA2nFBtYxSARnWiJJU="; + hash = "sha256-ygMMMKY5XsoQGp9yUMFAQqkSUlXNBJCb8xgGE10db4U="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ botorch ipywidgets jinja2 @@ -51,7 +47,7 @@ buildPythonPackage rec { env.ALLOW_BOTORCH_LATEST = "1"; - checkInputs = [ + nativeCheckInputs = [ hypothesis mercurial pyfakefs @@ -83,12 +79,8 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "ax" ]; - # Many portions of the test suite fail under Python 3.12 - doCheck = lib.versions.majorMinor python.version != "3.12"; - - passthru.tests.check = ax.overridePythonAttrs { doCheck = true; }; - meta = with lib; { + changelog = "https://github.com/facebook/Ax/releases/tag/${version}"; description = "Ax is an accessible, general-purpose platform for understanding, managing, deploying, and automating adaptive experiments"; homepage = "https://ax.dev/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 9a5d003475aa..da41939cde90 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -8,7 +8,6 @@ pyro-ppl, setuptools, setuptools-scm, - wheel, torch, scipy, pytestCheckHook, @@ -16,20 +15,19 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.11.1"; - format = "pyproject"; + version = "0.11.3"; + pyproject = true; src = fetchFromGitHub { owner = "pytorch"; - repo = pname; + repo = "botorch"; rev = "refs/tags/v${version}"; - hash = "sha256-YX/G46U09y/VZuWZhKY8zU0Y+bf0NKumzSGYUWvrq/0="; + hash = "sha256-AtRU5KC8KlkxMCU0OUAHDFK7BsPO3TbRmmzDGV7+yVk="; }; build-system = [ setuptools setuptools-scm - wheel ]; dependencies = [ @@ -48,9 +46,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ "test_all_cases_covered" ]; + pythonImportsCheck = [ "botorch" ]; meta = with lib; { + changelog = "https://github.com/pytorch/botorch/blob/${src.rev}/CHANGELOG.md"; description = "Bayesian Optimization in PyTorch"; homepage = "https://botorch.org"; license = licenses.mit; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58b2f56152b0..eb8026a0d9b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1090,7 +1090,7 @@ self: super: with self; { awswrangler = callPackage ../development/python-modules/awswrangler { }; - ax = callPackage ../development/python-modules/ax { }; + ax-platform = callPackage ../development/python-modules/ax-platform { }; axis = callPackage ../development/python-modules/axis { };