Skip to content

Commit

Permalink
A few more infrastructural changes:
Browse files Browse the repository at this point in the history
1. Add a "make test" rule in the Makefile.
2. Get rid of an unneccesary install in travis
3. Move requirements handling from version to setup (reading from the
   requirements file directly).
  • Loading branch information
arokem committed Nov 4, 2017
1 parent ee9b266 commit 4524105
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: python
sudo: false
env:
global:
- PIP_DEPS="pip flake8 pytest coveralls pytest-cov"
- PIP_DEPS="flake8 pytest coveralls pytest-cov"
- secure: "QYQAN3SKBS8d3YT5yRiXGaZbq2DErimCDDUywazKhOQiEnnvdBTKBh8F/NPuJl0TqAdrCWeH2f25925eoHNfJuPpIfrLexK04RWt4npC7aTl9+6+qMZWt8oovyK/kJu7L+n4E6NozeVSoUWoxD30U9ldbCqqNbaSwvWdWZjhvLjUDKo5Iz69CAYgAjH2F55n8sNvI6gWVI4fvrgWFkfhuqcSFXomuT5QGu5NcfULXDAm1moH6keLbWHl8quCVn83mylolg2YFDEsjTHpKkuxmalZswKis6Iane18gpRCxIAwlh+saAY9/Pt0h9tCe2x44mCrj6VwiGtrmZK9SvF2UHHxypX02X9ZmQY7tJ/i9BRLc0AJjBVl/iPy78Uor6xYPSjDTs5r8jaRZX3lls6zfqntWtlDOQajh3apYg81ZP7TLNFmIVoENAD324iLth3KKNxVJaIO1XpxCxfPUg0VdXSAD7b+B2cD+GArRQoPxhyYVoSGmxkyc2i+p586ALCHZ0oBp/AXaOq92Oa7pSiR+IZVJ5U+FJbdek4eaoIwysg0QE0LfsONVy4wF1GOspsoNDRBot0ELJ3W5Y4M+3JEAwuTythq1M9MyMoFbGPTlkbQLUIyxDrV5L3Mj6qLr/+L0QdiiMb3AH0vNmrHIdFC71O1lDBh6W3h3V/GIkRnd0k="

python:
Expand Down
5 changes: 4 additions & 1 deletion Makefile
@@ -1,2 +1,5 @@
serve:
cd afqbrowser/site/client/ && python -m http.server
cd afqbrowser/site/client/ && python -m http.server

test:
py.test --pyargs afqbrowser --cov-report term-missing --cov=afqbrowser && flake8 --ignore N802,N806 `find . -name \*.py | grep -v setup.py | grep -v version.py | grep -v __init__.py | grep -v /doc/`
1 change: 0 additions & 1 deletion afqbrowser/version.py
Expand Up @@ -66,5 +66,4 @@
pjoin('site', 'client', 'data', '*'),
pjoin('site', 'client', 'css', '*'),
pjoin('site', 'client', 'js', '*')]}
REQUIRES = ["numpy", "pandas", "scipy", "pygithub", "gitpython"]
SCRIPTS = [op.join('bin', op.split(f)[-1]) for f in glob.glob('bin/*')]
8 changes: 8 additions & 0 deletions setup.py
Expand Up @@ -7,6 +7,14 @@
with open(ver_file) as f:
exec(f.read())

REQUIRES = []
with open('requirements.txt') as f:
l = f.readline()[:-1].split("=")[0].split(">")[0]
while l:
REQUIRES.append(l)
l = f.readline()[:-1].split("=")[0].split(">")[0]


opts = dict(name=NAME,
maintainer=MAINTAINER,
maintainer_email=MAINTAINER_EMAIL,
Expand Down

0 comments on commit 4524105

Please sign in to comment.