Commit ce0806ec authored by Stefan Behnel's avatar Stefan Behnel

Merge branch '0.29.x'

parents 059e53c1 b7438cab
...@@ -105,9 +105,9 @@ before_install: ...@@ -105,9 +105,9 @@ before_install:
if [ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]; then if [ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]; then
echo "Installing Miniconda" echo "Installing Miniconda"
if [ "$TRAVIS_OS_NAME" == "osx" ]; then CONDA_PLATFORM=MacOSX; else CONDA_PLATFORM=Linux; fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then CONDA_PLATFORM=MacOSX; else CONDA_PLATFORM=Linux; fi
travis_retry wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-${CONDA_PLATFORM}-x86_64.sh travis_retry wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda$PY-latest-${CONDA_PLATFORM}-x86_64.sh || exit 1
bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh || exit 1
conda --version conda --version || exit 1
#conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt #conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt
if [ "$TRAVIS_OS_NAME" == "osx" ]; then if [ "$TRAVIS_OS_NAME" == "osx" ]; then
which clang && clang --version && export CC=clang || true which clang && clang --version && export CC=clang || true
......
...@@ -245,6 +245,8 @@ Features added ...@@ -245,6 +245,8 @@ Features added
* ``std::move()`` is now available from ``libcpp.utility``. * ``std::move()`` is now available from ``libcpp.utility``.
Patch by Omer Ozarslan. (Github issue #2169) Patch by Omer Ozarslan. (Github issue #2169)
* The ``@cython.binding`` decorator is available in Python code.
Bugs fixed Bugs fixed
---------- ----------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment