Unverified Commit 5f3726c1 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

python3Packages.cma: 4.3.0 -> 4.4.0, python3Packages.pymoo: fix build (#448307)

parents 3cd40a7c bad08fc8

pkgs/development/python-modules/cma/default.nix

+26 −12
Original line number Diff line number Diff line
@@ -2,19 +2,22 @@ 
  lib,

  buildPythonPackage,

  fetchFromGitHub,



  # build-system

  setuptools,



  # dependencies

  numpy,



  # tests

  python,

  pythonOlder,

  setuptools,

}:



buildPythonPackage rec {

  pname = "cma";

  version = "4.3.0";

  version = "4.4.0";

  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "CMA-ES";

    repo = "pycma";
@@ -22,22 +25,33 @@ buildPythonPackage rec { 
    hash = "sha256-2uCn5CZma9RLK8zaaPhiQCqnK+2dWgLNr5+Ck2cV6vI=";

  };



  # setuptools.errors.PackageDiscoveryError:

  # Multiple top-level packages discovered in a flat-layout: ['cma', 'notebooks'].

  postPatch = ''

    rm -rf notebooks

  '';



  build-system = [ setuptools ];



  dependencies = [ numpy ];



  checkPhase = ''

  pythonImportsCheck = [ "cma" ];



  # At least one doctest fails, thus only limited amount of files is tested

    ${python.executable} -m cma.test interfaces.py purecma.py logger.py optimization_tools.py transformations.py

  checkPhase = ''

    ${python.executable} -m cma.test \

      interfaces.py \

      purecma.py \

      logger.py \

      optimization_tools.py \

      transformations.py

  '';



  pythonImportsCheck = [ "cma" ];



  meta = with lib; {

  meta = {

    description = "Library for Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization";

    homepage = "https://github.com/CMA-ES/pycma";

    changelog = "https://github.com/CMA-ES/pycma/releases/tag/r${src.tag}";

    license = licenses.bsd3;

    changelog = "https://github.com/CMA-ES/pycma/releases/tag/${src.tag}";

    license = lib.licenses.bsd3;

    maintainers = [ ];

  };

}

pkgs/development/python-modules/pymoo/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ buildPythonPackage rec { 
        "ProgressBar() if progress else None" \

        "print('Missing alive_progress needed for progress=True!') if progress else None"



    substituteInPlace pymoo/algorithms/soo/nonconvex/es.py \

      --replace-fail "np.math.ceil" "np.ceil"

    substituteInPlace pymoo/util/mnn.py \

      --replace-fail "np.product" "np.prod"



    substituteInPlace pymoo/config.py \

      --replace-fail \

        "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
@@ -81,9 +76,9 @@ buildPythonPackage rec { 
    scipy

  ];



  preCheck = ''

  # Some tests require a grad backend to be configured, this is a hacky way to do so.

  # The choice must be either "jax.numpy" or "autograd.numpy"

  preCheck = ''

    echo 'from pymoo.gradient import activate; activate("autograd.numpy")' >> tests/conftest.py

  '';

  nativeCheckInputs = [
@@ -103,6 +98,11 @@ buildPythonPackage rec { 
    # sensitive to float precision

    "test_cd_and_pcd"



    # AssertionError:

    # Not equal to tolerance rtol=0, atol=0.0001

    # Mismatched elements: 1200 / 1200 (100%)

    "test_pf"



    # TypeError: 'NoneType' object is not subscriptable

    "test_dascomp"

    "test_mw"