Skip to content

Commit

Permalink
Clarify reasons for dev-requirements.txt
Browse files Browse the repository at this point in the history
and load the file in setup.py, so it's not duplicated
  • Loading branch information
singingwolfboy committed Mar 7, 2014
1 parent 8f9f777 commit 83b533d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ git:
submodules: false
install:
- sudo apt-get install -qq python-enchant
- if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then pip install backports.ssl_match_hostname; fi
- pip install -r dev-requirements.txt
- pip install coveralls
script:
Expand Down
2 changes: 2 additions & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# python modules that must be installed before the tests can run
backports.ssl_match_hostname
lxml
pygeoip
praw
Expand Down
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ def do_setup():
tmp_main_script = os.path.join(tmp_dir, 'willie')
shutil.copy('willie.py', tmp_main_script)

with open("dev-requirements.txt") as f:
requires = [line for line in f.readlines()
if not line.startswith("#")]

setup(
name='willie',
version=__version__,
Expand All @@ -30,8 +34,7 @@ def do_setup():
scripts=[tmp_main_script],
license='Eiffel Forum License, version 2',
platforms='Linux x86, x86-64',
requires=[b'feedparser', b'pytz', b'lxml', b'praw', b'enchant',
b'pygeoip', b'backports.ssl_match_hostname']
requires=requires,
)
finally:
try:
Expand Down

0 comments on commit 83b533d

Please sign in to comment.