Skip to content

Commit

Permalink
Python and PyPy version updates (#130)
Browse files Browse the repository at this point in the history
* Python and PyPy version updates

- Drop Python 3.3
- Add Python 3.6
- Bump PyPy version to 5.7.0 for travis

* Revert pypy bump, ask travis for trusty

* Bump pypy to 5.7.0

* you can't use the presentation name "pypy" for travis

* Add enum and struct to spelling list

* rm -rf ~/.pyenv

* Pin sphinx to the last nown goos version

* responder as a thing
  • Loading branch information
ashfall authored and markrwilliams committed Jun 9, 2017
1 parent 6106a21 commit 9927161
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
15 changes: 8 additions & 7 deletions .travis.yml
@@ -1,18 +1,18 @@
language: python
sudo: false
dist: trusty

matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 3.3
env: TOXENV=py33
- python: 3.4
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: pypy
env: TOXENV=pypy
- python: 3.6
env: TOXENV=py36
- env: TOXENV=pypy
- python: 2.7
env: TOXENV=docs
addons:
Expand All @@ -21,20 +21,21 @@ matrix:
- libenchant-dev
- python: 2.7
env: TOXENV=pep8
- python: 3.4
- python: 3.6
env: TOXENV=py3pep8

install:
- pip install coveralls tox
- |
if [ "${TOXENV}" == "pypy" ]
then
rm -rf ~/.pyenv
git clone --depth 1 https://github.com/yyuu/pyenv.git ~/.pyenv
PYENV_ROOT="$HOME/.pyenv"
PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
pyenv install pypy-4.0.1
pyenv global pypy-4.0.1
pyenv install pypy-5.7.0
pyenv global pypy-5.7.0
fi
script:
Expand Down
3 changes: 3 additions & 0 deletions docs/spelling_wordlist.txt
Expand Up @@ -7,9 +7,11 @@ plaintext
keyless
SNI
dh
enum
enums
params
lookup
struct
structs
Submodules
Subpackages
Expand All @@ -22,3 +24,4 @@ prf
py
hmac
UBInt
responder
13 changes: 6 additions & 7 deletions tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py33,py34,py35,pypy,docs,pep8,py3pep8,gendoc,coverage-report
envlist = py27,py34,py35,py36,pypy,docs,pep8,py3pep8,gendoc,coverage-report

[testenv]
coverage_pytest_cmd = coverage run --parallel -m pytest --capture=no --strict
Expand All @@ -8,8 +8,7 @@ deps =
coverage
pytest
commands =
{py27,py34,py35,pypy}: {[testenv]coverage_pytest_cmd} {[testenv]hypothesis_args}
{py33}: {[testenv]coverage_pytest_cmd}
{py27,py34,py35,py36,pypy}: {[testenv]coverage_pytest_cmd} {[testenv]hypothesis_args}

[testenv:pep8]
deps =
Expand All @@ -20,7 +19,7 @@ commands =
flake8 .

[testenv:py3pep8]
basepython = python3.3
basepython = python3
deps =
flake8
flake8-import-order
Expand All @@ -33,7 +32,7 @@ deps =
pytest
doc8
pyenchant
sphinx
sphinx<1.6.1
sphinx_rtd_theme
sphinxcontrib-spelling
basepython = python2.7
Expand All @@ -46,14 +45,14 @@ commands =

[testenv:docs-linkcheck]
deps =
sphinx
sphinx<1.6.1
basepython = python2.7
commands =
sphinx-build -W -b linkcheck docs docs/_build/html

[testenv:gendoc]
deps =
sphinx
sphinx<1.6.1
commands =
sphinx-apidoc -f -o docs/_autodoc tls/ --private

Expand Down

0 comments on commit 9927161

Please sign in to comment.