Skip to content

Commit

Permalink
Remove pandoc dependency, not needed since PyPI supports Markdown
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhers committed Oct 21, 2020
1 parent 7be57e6 commit b564545
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
5 changes: 2 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions .travis/build_linux_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .travis/build_macos_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./
8 changes: 3 additions & 5 deletions .travis/install_dependencies.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down

0 comments on commit b564545

Please sign in to comment.