diff --git a/.appveyor.yml b/.appveyor.yml index 8cc839889..eff2b99dd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,13 +29,12 @@ install: - ps: wget https://github.com/clab/dynet/releases/download/2.1/eigen-b2e267dc99d4.zip -OutFile eigen.zip - cmd: mkdir C:\projects\eigen - cmd: 7z x eigen.zip -o"C:\projects\eigen" -y > nul - - set PATH=%MINICONDA%;%MINICONDA%\Scripts;C:\Program Files (x86)\Pandoc;%PATH% + - set PATH=%MINICONDA%;%MINICONDA%\Scripts;%PATH% - conda config --set always_yes yes --set changeps1 no - conda update -q conda - conda info -a - - conda create -q -n test-env python=%PYTHON_VERSION% cython numpy pypandoc + - conda create -q -n test-env python=%PYTHON_VERSION% cython numpy - activate test-env - - cinst pandoc - ps: if ($env:APPVEYOR_REPO_TAG -eq $True) { (gc setup.py) -replace '. (version=.)0.0.0', "`${1}$env:APPVEYOR_REPO_TAG_NAME" | Out-File -encoding 'UTF8' setup.py } before_build: diff --git a/.travis/build_linux_wheel.sh b/.travis/build_linux_wheel.sh index 2e1143642..e7cbfc9c5 100755 --- a/.travis/build_linux_wheel.sh +++ b/.travis/build_linux_wheel.sh @@ -14,10 +14,7 @@ fi for PYBIN in /opt/python/*${PYVER/./}*/bin; do "$PYBIN/pip" install -U pip "$PYBIN/pip" install --prefer-binary cryptography - "$PYBIN/pip" install -U numpy pypandoc twine cython - if [[ "$BUILD_ARCH" != i686 ]]; then - "$PYBIN/python" -c 'from pypandoc.pandoc_download import *; download_pandoc()' - fi || true # It's ok if we fail installing pandoc; only important for deployment + "$PYBIN/pip" install -U numpy twine cython if [[ -n "$DYNET_TEST" ]]; then "$TRAVIS_BUILD_DIR"/.travis/test_dynet.sh else # build diff --git a/.travis/build_macos_wheel.sh b/.travis/build_macos_wheel.sh index 386c0d3a2..a3c646065 100755 --- a/.travis/build_macos_wheel.sh +++ b/.travis/build_macos_wheel.sh @@ -3,6 +3,5 @@ set -xe cd "$TRAVIS_BUILD_DIR" source activate "$PYVER" -pip install pypandoc python setup.py bdist_wheel cp -vr build/py*/python/dist ./ diff --git a/.travis/install_dependencies.sh b/.travis/install_dependencies.sh index d4407b2c0..4c5b367b7 100755 --- a/.travis/install_dependencies.sh +++ b/.travis/install_dependencies.sh @@ -1,24 +1,22 @@ #!/bin/bash set -xe -# Boost, Pandoc, Python packages +# Boost, Python packages if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt-get -qq update sudo apt-get install -y gcc-4.8 g++-4.8 libssl-dev - PYTHON_PACKAGES="numpy pypandoc twine auditwheel cython" + PYTHON_PACKAGES="numpy twine auditwheel cython" if [[ "$PYTHON_INSTALL" == manual ]]; then sudo apt-get install -y --allow-unauthenticated libboost-filesystem1.55-dev libboost-program-options1.55-dev libboost-serialization1.55-dev libboost-test1.55-dev libboost-regex1.55-dev sudo -H pip install -U $PYTHON_PACKAGES else - sudo apt-get install -y pandoc pip install -U pip pip install --prefer-binary cryptography pip install -U $PYTHON_PACKAGES fi else brew update - brew install pandoc # Install Miniconda export MINICONDA_OS_NAME=MacOSX MINICONDA_ARCH=x86_64 wget "https://repo.continuum.io/miniconda/Miniconda3-latest-$MINICONDA_OS_NAME-$MINICONDA_ARCH.sh" -O miniconda.sh @@ -31,7 +29,7 @@ else # Useful for debugging any issues with conda conda info -a source activate "$PYVER" - pip install pypandoc twine + pip install twine fi # CUDA