Skip to content

Commit b564545

Browse files
committed
Remove pandoc dependency, not needed since PyPI supports Markdown
1 parent 7be57e6 commit b564545

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

.appveyor.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ install:
2929
- ps: wget https://github.com/clab/dynet/releases/download/2.1/eigen-b2e267dc99d4.zip -OutFile eigen.zip
3030
- cmd: mkdir C:\projects\eigen
3131
- cmd: 7z x eigen.zip -o"C:\projects\eigen" -y > nul
32-
- set PATH=%MINICONDA%;%MINICONDA%\Scripts;C:\Program Files (x86)\Pandoc;%PATH%
32+
- set PATH=%MINICONDA%;%MINICONDA%\Scripts;%PATH%
3333
- conda config --set always_yes yes --set changeps1 no
3434
- conda update -q conda
3535
- conda info -a
36-
- conda create -q -n test-env python=%PYTHON_VERSION% cython numpy pypandoc
36+
- conda create -q -n test-env python=%PYTHON_VERSION% cython numpy
3737
- activate test-env
38-
- cinst pandoc
3938
- 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 }
4039

4140
before_build:

.travis/build_linux_wheel.sh

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ fi
1414
for PYBIN in /opt/python/*${PYVER/./}*/bin; do
1515
"$PYBIN/pip" install -U pip
1616
"$PYBIN/pip" install --prefer-binary cryptography
17-
"$PYBIN/pip" install -U numpy pypandoc twine cython
18-
if [[ "$BUILD_ARCH" != i686 ]]; then
19-
"$PYBIN/python" -c 'from pypandoc.pandoc_download import *; download_pandoc()'
20-
fi || true # It's ok if we fail installing pandoc; only important for deployment
17+
"$PYBIN/pip" install -U numpy twine cython
2118
if [[ -n "$DYNET_TEST" ]]; then
2219
"$TRAVIS_BUILD_DIR"/.travis/test_dynet.sh
2320
else # build

.travis/build_macos_wheel.sh

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ set -xe
33

44
cd "$TRAVIS_BUILD_DIR"
55
source activate "$PYVER"
6-
pip install pypandoc
76
python setup.py bdist_wheel
87
cp -vr build/py*/python/dist ./

.travis/install_dependencies.sh

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
#!/bin/bash
22
set -xe
33

4-
# Boost, Pandoc, Python packages
4+
# Boost, Python packages
55
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
66
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
77
sudo apt-get -qq update
88
sudo apt-get install -y gcc-4.8 g++-4.8 libssl-dev
9-
PYTHON_PACKAGES="numpy pypandoc twine auditwheel cython"
9+
PYTHON_PACKAGES="numpy twine auditwheel cython"
1010
if [[ "$PYTHON_INSTALL" == manual ]]; then
1111
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
1212
sudo -H pip install -U $PYTHON_PACKAGES
1313
else
14-
sudo apt-get install -y pandoc
1514
pip install -U pip
1615
pip install --prefer-binary cryptography
1716
pip install -U $PYTHON_PACKAGES
1817
fi
1918
else
2019
brew update
21-
brew install pandoc
2220
# Install Miniconda
2321
export MINICONDA_OS_NAME=MacOSX MINICONDA_ARCH=x86_64
2422
wget "https://repo.continuum.io/miniconda/Miniconda3-latest-$MINICONDA_OS_NAME-$MINICONDA_ARCH.sh" -O miniconda.sh
@@ -31,7 +29,7 @@ else
3129
# Useful for debugging any issues with conda
3230
conda info -a
3331
source activate "$PYVER"
34-
pip install pypandoc twine
32+
pip install twine
3533
fi
3634

3735
# CUDA

0 commit comments

Comments
 (0)