diff --git a/.travis.yml b/.travis.yml index c73747c..e001cd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,8 +41,8 @@ matrix: # # See: https://github.com/travis-ci/travis-ci/issues/3239 # -before_script: - - pip install tox codecov +before_install: + - cat tox-requirements.txt >> requirements.txt script: - tox diff --git a/ramlfications/config.py b/ramlfications/config.py index c39a88b..c2ec633 100644 --- a/ramlfications/config.py +++ b/ramlfications/config.py @@ -19,6 +19,7 @@ def _load_media_types(): with open(media_types_file, "r") as f: return json.load(f) + HTTP_METHODS = [ "get", "post", "put", "delete", "patch", "head", "options", "trace", "connect" diff --git a/tox-requirements.txt b/tox-requirements.txt index b0bc3da..b702a9c 100644 --- a/tox-requirements.txt +++ b/tox-requirements.txt @@ -1,6 +1,8 @@ +coverage==4.0.1 +tox pytest==2.8.2 pytest-cov==2.2.0 mock==1.0.1 pytest-mock==0.4.3 pytest-localserver==0.3.4 -coverage==4.0.1 +codecov diff --git a/tox.ini b/tox.ini index 839aa24..001d11f 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,9 @@ envlist = py26, py27, py33, py34, py35, pypy, flake8, manifest, docs setenv = LC_ALL=en_US.utf-8 LANG=en_US.utf-8 -deps = -rtox-requirements.txt +deps = + -rrequirements.txt + -rtox-requirements.txt commands = python setup.py test -a "-v --cov ramlfications --cov-report xml" @@ -14,7 +16,9 @@ basepython = python2.6 setenv = LC_ALL=en_US.utf-8 LANG=en_US.utf-8 -deps = -rtox-requirements.txt +deps = + -rrequirements.txt + -rtox-requirements.txt argparse commands = python setup.py test -a "-v --cov ramlfications --cov-report xml" @@ -25,7 +29,9 @@ basepython = pypy setenv = LC_ALL=en_US.utf-8 LANG=en_US.utf-8 -deps = -rtox-requirements.txt +deps = + -rrequirements.txt + -rtox-requirements.txt commands = python setup.py test