Skip to content

Commit

Permalink
Merge pull request #158 from deanmalmgren/doc-build-fix
Browse files Browse the repository at this point in the history
Attempt for fixing documentation build
  • Loading branch information
Dean Malmgren committed Jun 17, 2017
2 parents ecaeab3 + 34ac238 commit c1fb233
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .pyup.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
update: all
branch: master
schedule: "every two weeks on Thursday"
schedule: "every two weeks"
pin: True
requirements:
- requirements/python:
updates: all
- requirements/python-dev:
updates: all
- requirements/python+compile:
- requirements/python-doc:
updates: all
assignees:
- deanmalmgren
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ before_install:
# virtualenv
install:
- ./provision/python.sh
- pip install .

# commands to run the testing suite. if any of these fail, travic lets us know
script:
Expand Down
4 changes: 0 additions & 4 deletions provision/python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@ fi
pip install -U pip

# Install the requirements for this package as well as this module.
pip install -r requirements/python+compile
pip install .

# Install the requirements for this package in development
pip install -r requirements/python-dev
4 changes: 4 additions & 0 deletions requirements/python
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# This file contains all python dependencies that are required by the textract
# package in order for it to properly work.

argcomplete==1.8.2
chardet==2.3.0
python-pptx==0.6.5
Expand All @@ -10,3 +13,4 @@ EbookLib==0.15
SpeechRecognition==3.6.3
https://github.com/mattgwwalker/msg-extractor/zipball/master
six==1.10.0
pocketsphinx==0.1.3
10 changes: 0 additions & 10 deletions requirements/python+compile

This file was deleted.

12 changes: 8 additions & 4 deletions requirements/python-dev
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# This includes all packages that are used in development, including all
# packages that are required by textract itself (python), packages for
# documentation builds (python-doc)

-r python
-r python-doc

# needed for tests/run.py script to read .travis.yml file
PyYAML==3.12
pep8==1.7.0
coveralls==1.1
requests==2.13.0
nose==1.3.7

# for documentation
sphinx==1.5.3
sphinx_rtd_theme==0.2.4
sphinx-argparse==0.1.17
# needed for managing versions
bumpversion==0.5.3
8 changes: 4 additions & 4 deletions requirements/python-doc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# install everything that is required for the documentation build on
# readthedocs
# this only includes packages that are needed for documentation build.

-r python
-r python-dev
sphinx==1.5.3
sphinx_rtd_theme==0.2.4
sphinx-argparse==0.1.17
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def parse_requirements(requirements_filename):
return dependencies, dependency_links


requirements_filename = os.path.join("requirements", "python+compile")
requirements_filename = os.path.join("requirements", "python")
dependencies, dependency_links = parse_requirements(requirements_filename)


Expand Down

0 comments on commit c1fb233

Please sign in to comment.