diff --git a/.travis.yml b/.travis.yml index 5a30a2a..2c401b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,10 @@ matrix: env: TOXENV=py34 - python: 3.4 env: TOXENV=py34_cython + - python: 3.5 + env: TOXENV=py35 + - python: 3.5 + env: TOXENV=py35_cython script: travis_scripts/run_tests.sh notifications: diff --git a/setup.py b/setup.py index 9058ec4..2e7f807 100644 --- a/setup.py +++ b/setup.py @@ -99,6 +99,7 @@ setup( 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], keywords='wsgi web api framework rest http cloud', author='Kurt Griffiths', diff --git a/tests/test_cookies.py b/tests/test_cookies.py index 07408c2..5575120 100644 --- a/tests/test_cookies.py +++ b/tests/test_cookies.py @@ -140,7 +140,7 @@ class TestCookies(testing.TestBase): def test_request_cookie_parsing(self): # testing with a github-ish set of cookies headers = [ - ('Cookie', '''Cookie: + ('Cookie', ''' logged_in=no;_gh_sess=eyJzZXXzaW9uX2lkIjoiN2; tz=Europe/Berlin; _ga=GA1.2.332347814.1422308165; _gat=1; diff --git a/tox.ini b/tox.ini index 5bae503..3950cde 100644 --- a/tox.ini +++ b/tox.ini @@ -6,8 +6,10 @@ envlist = py26, ; py33_cython, py34, py34_cython, + ; py35, + ; py35_cython, pypy, - pypy3, + ; pypy3, pep8, pylint, py27_smoke, @@ -19,6 +21,8 @@ envlist = py26, ; py33_bench_cython, ; py34_bench, ; py34_bench_cython, + ; py35_bench, + ; py35_bench_cython, ; pypy_bench ; pypy3_bench @@ -61,24 +65,22 @@ deps = -r{toxinidir}/tools/test-requires cython basepython = python2.7 commands = {toxinidir}/tools/clean.sh {toxinidir}/falcon - nosetests \ - {posargs} + nosetests [testenv:py33_cython] -deps = -r{toxinidir}/tools/test-requires - cython +deps = {[testenv:py27_cython]deps} basepython = python3.3 -commands = {toxinidir}/tools/clean.sh {toxinidir}/falcon - nosetests \ - {posargs} +commands = {[testenv:py27_cython]commands} [testenv:py34_cython] -deps = -r{toxinidir}/tools/test-requires - cython +deps = {[testenv:py27_cython]deps} basepython = python3.4 -commands = {toxinidir}/tools/clean.sh {toxinidir}/falcon - nosetests \ - {posargs} +commands = {[testenv:py27_cython]commands} + +[testenv:py35_cython] +deps = {[testenv:py27_cython]deps} +basepython = python3.5 +commands = {[testenv:py27_cython]commands} [testenv:py3kwarn] deps = py3kwarn @@ -132,15 +134,24 @@ commands = falcon-bench {posargs} [testenv:py34_bench] deps = -r{toxinidir}/tools/bench-requires basepython = python3.4 - -# NOTE(kgriffs): Hard-code test since other frameworks don't work on 3.4 -commands = falcon-bench -b falcon -b falcon-ext -b pecan -b bottle {posargs} +commands = falcon-bench {posargs} [testenv:py34_bench_cython] deps = -r{toxinidir}/tools/bench-requires cython basepython = python3.4 -commands = falcon-bench -b falcon -b falcon-ext -b pecan -b bottle {posargs} +commands = falcon-bench {posargs} + +[testenv:py35_bench] +deps = -r{toxinidir}/tools/bench-requires +basepython = python3.5 +commands = falcon-bench {posargs} + +[testenv:py35_bench_cython] +deps = -r{toxinidir}/tools/bench-requires + cython +basepython = python3.5 +commands = falcon-bench {posargs} [testenv:pypy_bench] deps = -r{toxinidir}/tools/bench-requires @@ -152,7 +163,6 @@ deps = -r{toxinidir}/tools/bench-requires basepython = pypy3 commands = falcon-bench {posargs} - [testenv:py27_smoke] # This test smoke-tests a basic Falcon app deps = -r{toxinidir}/tools/bench-requires diff --git a/travis_scripts/install.sh b/travis_scripts/install.sh index 64230c0..728e0a5 100755 --- a/travis_scripts/install.sh +++ b/travis_scripts/install.sh @@ -2,5 +2,5 @@ if [ "$JYTHON" = "true" ]; then travis_scripts/install_jython2.7.sh $HOME/jython/bin/pip install -r tools/test-requires else - pip install tox coveralls --use-mirrors + pip install tox coveralls fi