Skip to content

Commit

Permalink
TT-1073 set up tox for gdc-ng-models (#6)
Browse files Browse the repository at this point in the history
* TT-1073 set up tox for gdc-ng-models

* TT-1073 edited tox/travis files according to Jimmy's/Greg's comments

* feat(TT-1073): re-arrange tox commands

* fix(whoa): simplify

* fix(tox): small fix to tox to generalize py3

* fix(pr): pr issues fixed
  • Loading branch information
dariatarasova authored and scintillating7 committed Aug 28, 2019
1 parent 1cde9dd commit e17f64d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ gdc_ng_models.egg-info/

# Virtualenv
venv/

# Tox
.tox
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@ language: python
python:
- "2.7"
- "3.5"
- "3.6"

addons:
postgresql: '9.5'

before_script:
- psql -c "create user gdc_test with superuser password 'gdc_test';" -U postgres
- psql -c 'create database automated_test with owner "gdc_test";' -U postgres
install: "pip install tox-travis"

install:
- pip install -r requirements.txt
- pip install -r dev-requirements.txt
- python setup.py install
before_script:
- psql -c 'create database automated_test;' -U postgres

script: "./service_wrapper.sh pytest -v"
script: "tox"
1 change: 1 addition & 0 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
flake8==3.7.7
pytest==4.6.3
tox==3.13.2

-e git+https://[email protected]/NCI-GDC/[email protected]#egg=cdisutils
10 changes: 10 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[tox]
envlist= py27, py3

[testenv]
deps=
-rrequirements.txt
-rdev-requirements.txt
commands=
python setup.py develop
./service_wrapper.sh pytest -vvs tests/

0 comments on commit e17f64d

Please sign in to comment.