Skip to content

Commit

Permalink
Merge pull request #1938 from numbbo/development
Browse files Browse the repository at this point in the history
Merge of development branch into master for release 2.3.2
  • Loading branch information
brockho authored Jan 27, 2020
2 parents 9f117c4 + d6aea9f commit f161fea
Show file tree
Hide file tree
Showing 51 changed files with 6,603 additions and 5,099 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ apt-get install build-essential python-dev python-numpy python-matplotlib \
Under Windows, two alternative compile toolchains can be used:

1. [Cygwin](https://www.cygwin.com/) which comes with gcc and make, available in 32- and 64-bit versions.
2. MinGW's gcc (http://www.mingw.org/), which only comes in 32-bit, but also runs on 64-bit machines.
2. MinGW's gcc (http://www.mingw.org/ for 32-bit or https://mingw-w64.org for 64-bit machines). Make sure to update the Windows path to MinGW's make.exe and rename/link the gcc.exe to cc.exe.

For using `git` under Windows (optional), we recommend installing [TortoiseGit](https://tortoisegit.org/).

Expand Down Expand Up @@ -644,10 +644,10 @@ Comprehensive List of Documentations <a name="Documentations"></a>

* APIs
- ``C`` experiments code: http://numbbo.github.io/coco-doc/C
- Python experiments code `cocoex`: http://coco.gforge.inria.fr/apidocs-cocoex/cocoex.html
- Python experiments code (module `cocoex`): http://coco.gforge.inria.fr/apidocs-cocoex/cocoex.html
- Python short [beginners example experiment](code-experiments/build/python/example_experiment_for_beginners.py)
- Python `example_experiment2.py`: http://coco.gforge.inria.fr/apidocs-example_experiment/example_experiment2.html
- Postprocessing code: http://coco.gforge.inria.fr/apidocs-cocopp/cocopp.html
- Postprocessing code (module `cocopp`): http://coco.gforge.inria.fr/apidocs-cocopp/cocopp.html

* Somewhat outdated documents:
- Full description of the platform: http://coco.lri.fr/COCOdoc/
Expand Down
6 changes: 4 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ init:


install:
- cmd: conda install -y matplotlib numpy scipy setuptools six pytest cython
- cmd: python do.py run-python
# - cmd: conda install -y matplotlib numpy scipy setuptools six pytest cython
- cmd: pip install matplotlib numpy scipy setuptools six pytest cython # use pip because conda install numpy fails with Python != 3.6
- cmd: python do.py run-python install-user
- cmd: python do.py install-postprocessing

test_script:
Expand All @@ -34,4 +35,5 @@ test_script:
- cmd: python do.py test-preprocessing
- cmd: python do.py test-postprocessing
- cmd: python do.py test-suites
- cmd: python do.py test-c
# - cmd: python do.py test-postprocessing-all
Loading

0 comments on commit f161fea

Please sign in to comment.