From 025ef1fed91c86690a21e9ed81713062d29398ff Mon Sep 17 00:00:00 2001 From: nikohansen Date: Thu, 23 Apr 2020 22:24:57 +0200 Subject: [PATCH] version 3.0.3 fix args bug in interfaces.OOOptimizer.optimize --- README.md | 2 +- cma/__init__.py | 2 +- setup.py | 14 ++++++++++---- tools/conda.recipe/meta.yaml | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c061814..8043812 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ either of these with ``sudo``. ## Version History -* [Release ``3.0.2``](https://github.com/CMA-ES/pycma/releases/tag/r3.0.2) provides parallelization with ``OOOptimizer.optimize(..., n_jobs=...)`` and improved `pickle` support. +* [Release ``3.0.3``](https://github.com/CMA-ES/pycma/releases/tag/r3.0.3) provides parallelization with ``OOOptimizer.optimize(..., n_jobs=...)`` (fix for ``3.0.1/2``) and improved `pickle` support. * [Release ``3.0.0``](https://github.com/CMA-ES/pycma/releases/tag/r3.0.0) provides non-linear constraints handling, improved plotting and termination options and better resilience to injecting bad solutions, and further various fixes. diff --git a/cma/__init__.py b/cma/__init__.py index 209eebe..2c98cdb 100644 --- a/cma/__init__.py +++ b/cma/__init__.py @@ -146,7 +146,7 @@ # fcts = ff # historical reasons only, replace cma.fcts with cma.ff first -__version__ = "3.0.2 $Revision: 4430 $ $Date: 2020-04-21 01:19:04 +0200 (Tue, 21 Apr 2020) $" +__version__ = "3.0.3 $Revision: 4430 $ $Date: 2020-04-21 01:19:04 +0200 (Tue, 21 Apr 2020) $" # $Source$ # according to PEP 8 style guides, but what is it good for? # $Id: __init__.py 4430 2020-04-20 23:19:04Z hansen $ # bash $: svn propset svn:keywords 'Date Revision Id' __init__.py diff --git a/setup.py b/setup.py index 44af5db..4950525 100644 --- a/setup.py +++ b/setup.py @@ -12,24 +12,30 @@ backup --recover # see script-make-doc for syncing to gforge -To prepare a distribution from a dirty code folder:: +Final final changes to version numbers and such:: + + __init__.py # edit version number + tools/conda.recipe/meta.yaml # edit version number + README.md # add release description + +To prepare a distribution from a (usual) dirty code folder:: backup cma --move # backup is a homebrew minitool git checkout -- cma python setup.py check python setup.py sdist bdist_wheel --universal > dist_call_output.txt ; less dist_call_output.txt # bdist_wininst - twdiff cma build/lib/cma/ # just checking + # twdiff cma build/lib/cma/ # just checking backup --recover # recover above moved folder (and backup current, just in case) Check distribution and project description: tree build # check that the build folders are clean twine check dist/* - python setup.py --long-description | rst2html.py > long-description.html ; open long-description.html + # python setup.py --long-description | rst2html.py > long-description.html ; open long-description.html Finally upload the distribution:: - twine upload dist/*3.0.3* # to not upload outdated stuff + twine upload dist/*3.x.x* # to not upload outdated stuff Anaconda:: diff --git a/tools/conda.recipe/meta.yaml b/tools/conda.recipe/meta.yaml index dd68031..444cd76 100644 --- a/tools/conda.recipe/meta.yaml +++ b/tools/conda.recipe/meta.yaml @@ -1,5 +1,5 @@ package: - version: "3.0.2" + version: "3.0.3" name: 'cma' source: