diff options
| author | Stefan Behnel <stefan_ml@behnel.de> | 2020-04-12 22:37:25 +0200 |
|---|---|---|
| committer | Stefan Behnel <stefan_ml@behnel.de> | 2020-04-12 22:37:25 +0200 |
| commit | ce0806ec558b91a91a56677327ba010b99ee9d11 (patch) | |
| tree | 076699840eb945b70e3e373c8a68a7e28b263b6b | |
| parent | 059e53c1d3b07b6f30b6fbc5e0db1164163f1c0a (diff) | |
| parent | b7438cab32a6dcb8b634cb216b6ed556ffd56b70 (diff) | |
| download | cython-ce0806ec558b91a91a56677327ba010b99ee9d11.tar.gz | |
Merge branch '0.29.x'
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | CHANGES.rst | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index c4c48ea4a..9359ef7bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,9 +105,9 @@ before_install: if [ "$TRAVIS_OS_NAME" == "osx" -o "$STACKLESS" == "true" ]; then echo "Installing Miniconda" 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 - bash miniconda.sh -b -p $HOME/miniconda && rm miniconda.sh - conda --version + 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 || exit 1 + conda --version || exit 1 #conda install --quiet --yes nomkl --file=test-requirements.txt --file=test-requirements-cpython.txt if [ "$TRAVIS_OS_NAME" == "osx" ]; then which clang && clang --version && export CC=clang || true diff --git a/CHANGES.rst b/CHANGES.rst index 6ef509e7c..839b2f948 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -245,6 +245,8 @@ Features added * ``std::move()`` is now available from ``libcpp.utility``. Patch by Omer Ozarslan. (Github issue #2169) +* The ``@cython.binding`` decorator is available in Python code. + Bugs fixed ---------- |