Skip to content

Commit

Permalink
Move install requirements to setup.py and clean up Travis file
Browse files Browse the repository at this point in the history
  • Loading branch information
JayH5 committed Feb 16, 2016
1 parent dfed310 commit 9ef456c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ cache:
directories:
- $HOME/.cache/pip
install:
- pip install "cryptography<=1.0" # NOTE: because pypy<2.5 on Travis
- pip install twine
- pip install coveralls
- pip install --upgrade pip
- pip install flake8
- pip install "cryptography<=1.0" # NOTE: because pypy<2.5 on Travis
- pip install -r requirements-dev.txt
- pip install -e .
- pip install coveralls
- pip install twine
script:
- flake8 consular
- py.test consular --cov consular
Expand Down
6 changes: 2 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
Twisted
Klein
treq
click
# Our dependencies are all specified in setup.py.
-e .
11 changes: 6 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
with open(os.path.join(here, 'README.rst')) as f:
README = f.read()

with open(os.path.join(here, 'requirements.txt')) as f:
requires = filter(None, f.readlines())

with open(os.path.join(here, 'VERSION')) as f:
version = f.read().strip()

Expand All @@ -29,8 +26,12 @@
packages=find_packages(exclude=['docs']),
include_package_data=True,
zip_safe=False,
install_requires=requires,
tests_require=requires,
install_requires=[
'click',
'Klein',
'treq',
'Twisted',
],
entry_points={
'console_scripts': ['consular = consular.cli:main'],
})

0 comments on commit 9ef456c

Please sign in to comment.