Merge pull request #2194 from numbbo/release

for release 2.6.3

.circleci/config.yml

@@ -1,5 +1,12 @@
 version: 2
 
+on:
+  push:
+    branches-ignore:
+      - 'gh-pages'
+    paths-ignore:
+      - 'README.md'
+
 jobs:
 
   test_ubuntu_rolling_python3:
@@ -36,7 +43,7 @@ jobs:
           command: apt-get install -y libclang-dev
       - run:
           name: Install bindgen with cargo
-          command: cargo install bindgen
+          command: cargo install bindgen-cli
 #      - run:
 #          name: Install tkinter with apt-get
 #          command: apt-get install -y python3-tk

.github/workflows/cmake.yml

@@ -1,26 +1,36 @@
-name: CMake
+name: ci_cmake
 
 on:
   workflow_dispatch:
   push:
+    paths:
+      - "do.py"
+      - ".github/workflows/cmake.yml"
+      - "code-experiments/build/c/CMakeLists.txt"
+      - "code-experiments/src/**.c"
+      - "code-experiments/src/**.h"
   pull_request:
     branches: [ master, development ]
 
-env:
-  BUILD_TYPE: Release
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        build_type: [Release, Debug]
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{matrix.os}}
     steps:
-    - uses: actions/checkout@v2
-
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
     - name: Build C amalgamation
-      run: python ${{github.workspace}}/do.py build-c
-
+      run: python ${{github.workspace}}/do.py amalgamate-c
     - name: Configure CMake
-      run: cmake -S ${{github.workspace}}/code-experiments/build/c/ -B ${{github.workspace}}/code-experiments/build/c/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
-
+      run: cmake -S ${{github.workspace}}/code-experiments/build/c/ -B build/ -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
     - name: Build
-      run: cmake --build ${{github.workspace}}/code-experiments/build/c/build --config ${{env.BUILD_TYPE}}
+      run: cmake --build build/ --config ${{matrix.build_type}}

.github/workflows/meson.yml

@@ -0,0 +1,75 @@
+name: ci_meson
+
+on:
+  push:
+    paths:
+      - "do.py"
+      - ".github/workflows/meson.yml"
+      - "code-experiments/build/c/meson.build"
+      - "code-experiments/src/**.c"
+      - "code-experiments/src/**.h"
+  pull_request:
+    branches: [ master, development ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+    - run: pip install meson ninja
+    - run: python ${{github.workspace}}/do.py amalgamate-c
+    - run: meson setup builddir/ ${{github.workspace}}/code-experiments/build/c/
+      env:
+        CC: gcc
+    - run: meson test -C builddir/ -v
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: Linux_Meson_Testlog
+        path: builddir/meson-logs/testlog.txt
+
+  macos:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+    - run: brew install gcc
+    - run: pip install meson ninja
+    - run: python ${{github.workspace}}/do.py amalgamate-c
+    - run: meson setup builddir/ ${{github.workspace}}/code-experiments/build/c/
+      env:
+        CC: gcc
+    - run: meson test -C builddir/ -v
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: MacOS_Meson_Testlog
+        path: builddir/meson-logs/testlog.txt
+
+  windows:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+    - run: pip install meson ninja
+    - run: python ${{github.workspace}}/do.py amalgamate-c
+    - run: meson setup builddir/ ${{github.workspace}}/code-experiments/build/c/
+      env:
+        CC: gcc
+    - run: meson test -C builddir/ -v
+    - uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: Windows_Meson_Testlog
+        path: builddir/meson-logs/testlog.txt

.github/workflows/python.yml

@@ -0,0 +1,35 @@
+name: ci_python
+
+on:
+  push:
+    paths:
+      - "do.py"
+      - ".github/workflows/python.yml"
+      - "code-experiments/build/python/*"
+      - "code-experiments/src/**.c"
+      - "code-experiments/src/**.h"
+  pull_request:
+    branches: [ master, development ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  run:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+    runs-on: ${{matrix.os}}
+    defaults:
+      run:
+        working-directory: ${{github.workspace}}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: ${{matrix.version}}
+        cache: "pip"
+    - run: pip install -r code-experiments/build/python/requirements.txt
+    - run: python do.py verbose run-python --user and-test

.github/workflows/rust.yml

@@ -0,0 +1,26 @@
+name: ci_rust
+
+on:
+  push:
+    paths:
+      - "do.py"
+      - ".github/workflows/rust.yml"
+      - "code-experiments/build/rust/**"
+      - "code-experiments/src/**.c"
+      - "code-experiments/src/**.h"
+  pull_request:
+    branches: [ master, development ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.9'
+    - run: python ${{github.workspace}}/do.py build-rust

.gitignore

@@ -0,0 +1,30 @@
+*.o
+.*.pyc
+.*\.orig
+.*\.swp
+REVISION
+VERSION
+__pycache__
+*.egg-info/
+
+
+code-experiments/build/*/coco.[ch]
+code-experiments/build/c/Makefile
+code-experiments/build/c/example_experiment
+code-experiments/build/python/build/
+code-experiments/build/python/dist/
+code-experiments/examples/*/coco.[ch]
+code-experiments/test/*/coco.[ch]
+code-experiments/test/example-test/
+code-experiments/test/integration-test/Makefile
+code-experiments/test/integration-test/bbob2009_testcases.txt
+code-experiments/test/integration-test/bbob2009_testcases2.txt
+code-experiments/test/integration-test/test_bbob-constrained
+code-experiments/test/integration-test/test_bbob-largescale
+code-experiments/test/integration-test/test_bbob-mixint
+code-experiments/test/integration-test/test_biobj
+code-experiments/test/integration-test/test_coco
+code-experiments/test/integration-test/test_instance_extraction
+
+code-postprocessing/build/
+code-postprocessing/dist/

.mailmap

@@ -0,0 +1,68 @@
+<nicolaum@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Alexandre Chotard <chotard_a@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Anne Auger <anne.auger@inria.fr>
+Anne Auger <anne.auger@inria.fr> <auger@AAMB.local>
+Anne Auger <anne.auger@inria.fr> <auger@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Anne Auger <anne.auger@inria.fr> <auger@client-172-18-88-22.clients.u-psud.fr>
+Anne Auger <anne.auger@inria.fr> <auger@client-172-18-92-85.clients.u-psud.fr>
+Anne Auger <anne.auger@inria.fr> <auger@pc4-223.lri.fr>
+Asma Atamna <asma.atamna@inria.fr>
+Asma Atamna <asma.atamna@inria.fr> <aatamna@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Asma Atamna <asma.atamna@inria.fr> <asma@pc5-30.lri.fr>
+Asma Atamna <asma.atamna@inria.fr> <asmaatamna@users.noreply.github.com>
+Asma Atamna <asma.atamna@inria.fr> <atamnaasmaines@gmail.com>
+Bernd Bischl <bernd_bischl@gmx.net>
+Bernd Bischl <bernd_bischl@gmx.net> <bernd_bischl@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Dejan Tušar <dejan.tusar@inria.fr>
+Dejan Tušar <dejan.tusar@inria.fr> <dejan@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Dejan Tušar <dejan.tusar@inria.fr> <dtusar@users.noreply.github.com>
+Dimo Brockhof <dimo.brockhoff@inria.fr>
+Dimo Brockhof <dimo.brockhoff@inria.fr> <brockho@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Duc Manh Nguyen <nguyenducmanh1982@yahoo.com>
+Filip Matzner <floop@floop.cz>
+GitHub <noreply@github.com>
+Heike Trautmann <trautmann@wi.uni-muenster.de> <trautmann@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Konstantinos Varelas <kostantinosv@hotmail.com>
+Leopold Luley <git@leopoldluley.de>
+Manuel López-Ibáñez <2620021+MLopez-Ibanez@users.noreply.github.com>
+Mike Preuss <mike.preuss@tu-dortmund.de>
+Mike Preuss <mike.preuss@tu-dortmund.de> <mikepreuss@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Nikolaus Hansen <nikolaus.hansen@inria.fr> 
+Nikolaus Hansen <nikolaus.hansen@inria.fr> <hansen@Ns-MacBook-Pro.local>
+Nikolaus Hansen <nikolaus.hansen@inria.fr> <hansen@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Nikolaus Hansen <nikolaus.hansen@inria.fr> <nikohansen@users.noreply.github.com>
+Nikolaus Hansen <nikolaus.hansen@inria.fr> <nikohansen@users.noreply.github.com>
+Nikolaus Hansen <nikolaus.hansen@inria.fr> <nikolaus.hansen@gmail.com>
+Olaf Mersmann <olafm@p-value.net>
+Olaf Mersmann <olafm@p-value.net> <olafm@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Olaf Mersmann <olafm@p-value.net> <olafmersmann@users.noreply.github.com>
+Oswin Krause <oswin.krause@di.ku.dk>
+Ouassim Ait ElHara <ouassim.aitelhara@octopeek.com> 
+Ouassim Ait ElHara <ouassim.aitelhara@octopeek.com> <ait_elhara@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Ouassim Ait ElHara <ouassim.aitelhara@octopeek.com> <ouassimaitelhara@gmail.com>
+Ouassim Ait ElHara <ouassim.aitelhara@octopeek.com> <ouassimaitelhara@yahoo.fr>
+Paul Dufossé <paul.dufosse@inria.fr>
+Paul Dufossé <paul.dufosse@inria.fr> <paulduf@users.noreply.github.com>
+Paul Dufossé <paul.dufosse@inria.fr> <{ID}+{username}@users.noreply.github.com>
+Paul Dufossé <paul.dufosse@inria.fr> <{ID}+{username}@users.noreply.github.com>
+Paweł Szynkiewicz <sed s/x/pszynk/  x@gmail.com>
+Petr Pošík <petr.posik@cvut.cz>
+Petr Pošík <petr.posik@cvut.cz> <petrposik@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Petr Pošík <petr.posik@cvut.cz> <petrposik@users.noreply.github.com>
+Phillipe Rodrigues Sampaio <phillipece@gmail.com>
+Phillipe Sampaio <phillipece@gmail.com>
+Raymond Ros <raymond.ros@inria.fr> <rros@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Tea Tušar <tea.tusar@ijs.si>
+Tea Tušar <tea.tusar@ijs.si> <tea.tusar@inria.fr>
+Tea Tušar <tea.tusar@ijs.si> <tea@Teas-MacBook-Pro.local>
+Tea Tušar <tea.tusar@ijs.si> <ttusar@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Tea Tušar <tea.tusar@ijs.si> <ttusar@users.noreply.github.com>
+Thanh-Do Tran <trantdo@gmail.com>
+Tobias Wagner <wagner@isf.de>
+Tomas Giro <girotomas@gmail.com>
+Umut Batu <umut.batu@gmail.com>
+Verena Heidrich-Meisner <vhm@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+Youhei Akimoto <akimoto@cs.tsukuba.ac.jp> <youhei@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+evomarc <evomarc@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+finck <finck@bd143551-dd2f-0410-b9f7-ac39b51fe4c9>
+islandblue <umut.batu@gmail.com>

LICENSE

@@ -52,4 +52,5 @@ We acknowledge in particular:
   ``code-experiments/test/unit-test/minunit_c89.h``, distributed under
   the terms of the MIT Licence.
 * the Rust code by Leopold Luley in `code-experiments/build/rust/`, distributed unter the terms of both the MIT License and the Apache 2.0 License.
+* the code for Brent's method in ``code-experiments/src/brentq.c`` is a modified copy of ``scipy.optimize.brentq`` originally written by Charles Harris and distributed under the BSD 3-Clause "New" or "Revised" License.