Skip to content

Commit c1a9fdd

Browse files
committed
Remove Pandoc dependency
1 parent 0b1b6cb commit c1a9fdd

File tree

5 files changed

+5
-21
lines changed

5 files changed

+5
-21
lines changed

.appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@ init:
1414

1515
install:
1616
- cmd: git submodule update --init --recursive
17-
- set PATH=%MINICONDA%;%MINICONDA%\Scripts;C:\Program Files (x86)\Pandoc;%PATH%
17+
- set PATH=%MINICONDA%;%MINICONDA%\Scripts;%PATH%
1818
- conda config --set always_yes yes --set changeps1 no
1919
- conda update -q conda
2020
- conda info -a
21-
- conda create -q -n test-env python=3.6 cython numpy pypandoc pytest
21+
- conda create -q -n test-env python=3.6 cython numpy pytest
2222
- activate test-env
23-
- cinst pandoc
2423
- pip install .
2524
- python -m spacy download en_core_web_md
2625
- python -m spacy download de_core_news_md

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ sudo: false
33
group: edge
44
language: python
55
python: 3.6
6-
addons:
7-
apt:
8-
packages:
9-
- pandoc
106
install:
117
- pip uninstall -y numpy
128
- pip install .

ci/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -xe
33

4-
pip install collective.checkdocs pypandoc twine
4+
pip install collective.checkdocs twine
55
python setup.py checkdocs || exit 1
66
python setup.py sdist bdist_wheel
77
twine upload --skip-existing dist/*

docs/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
pypandoc>=1.4
21
sphinx-automodapi>=0.12

setup.py

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,8 @@
1717
with open("requirements.txt") as f:
1818
install_requires = f.read().splitlines()
1919

20-
try:
21-
# noinspection PyPackageRequirements
22-
import pypandoc
23-
try:
24-
pypandoc.convert_file("README.md", "rst", outputfile="README.rst")
25-
except (IOError, ImportError, RuntimeError):
26-
pass
27-
long_description = pypandoc.convert_file("README.md", "rst")
28-
except (IOError, ImportError, RuntimeError):
29-
long_description = ""
30-
20+
with open(os.path.join(SCRIPT_DIR, 'README.md'), encoding='utf-8') as f:
21+
long_description = f.read()
3122

3223
class install(_install):
3324
# noinspection PyBroadException
@@ -57,7 +48,6 @@ def run(self):
5748
author="Daniel Hershcovich",
5849
author_email="[email protected]",
5950
url="https://github.com/huji-nlp/tupa",
60-
setup_requires=["pypandoc"],
6151
install_requires=install_requires,
6252
extras_require={"server": open(os.path.join("server", "requirements.txt")).read().splitlines(),
6353
"viz": ["scipy", "pillow", "matplotlib"],

0 commit comments

Comments
 (0)