Skip to content

Commit

Permalink
Update env files
Browse files Browse the repository at this point in the history
  • Loading branch information
mrouhi13 committed May 23, 2019
1 parent 3bc299b commit c346ad4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ install:
- make init

# command to run tests
script: pipenv run tox
script: pipenv run tox -v

after_success: pipenv run codecov
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ help:
@echo " make build create python package"
@echo " make upload upload package to pypi"
@echo " make init create virtual environment and install dependencies"
@echo " make setup do migrations and collect static files"
@echo " make activate enter virtual environment"
@echo " make test run the test suite"
@echo " exit leave virtual environment"
Expand All @@ -20,6 +21,11 @@ init:
pip install pipenv
pipenv install --dev --three

setup:
cp testproject/settings.py.sample testproject/settings.py
sed -i -e "s/SECRET_KEY = '.*'/SECRET_KEY = '_'/" testproject/settings.py


activate:
pipenv shell -c

Expand Down
13 changes: 7 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[tox]
envlist =
py{35,36,37}-django20
py{35,36,37}-django21
py{35,36,37}-django22
py{35,36,37}-dj20
py{35,36,37}-dj21
py{35,36,37}-dj22
skipsdist = true

[testenv]
passenv = CI TRAVIS TRAVIS_*
Expand All @@ -11,8 +12,8 @@ basepython =
py36: python3.6
py37: python3.7
deps =
django22: django>=2.2,<2.3
django21: django>=2.1,<2.2
django20: django>=2.0,<2.1
dj22: django>=2.2,<2.3
dj21: django>=2.1,<2.2
dj20: django>=2.0,<2.1
commands =
make test

0 comments on commit c346ad4

Please sign in to comment.