Skip to content

Commit 86d6442

Browse files
committed
Updated tox and travis files
1 parent 28ae62e commit 86d6442

2 files changed

Lines changed: 13 additions & 22 deletions

File tree

.travis.yml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,20 @@
44
# Using Python for the project
55
language: python
66
python:
7-
# Python 2.6 is obsolete
8-
#- "2.6"
9-
# Python 2.7 is set to test the docs in the configuration matrix
10-
#- "2.7"
11-
# Python 3.2 is obsolete
12-
#- "3.2"
13-
- "3.3"
7+
- "2.7"
148
- "3.4"
15-
# Python 3.5 is set to test and deploy the docs, and to run the coverage report, in the configuration matrix
16-
#- "3.5"
9+
- "3.5"
10+
# Python 3.6 is set to test and deploy the docs in the configuration matrix
11+
#- "3.6"
1712
- "pypy"
1813
- "pypy3"
14+
env:
15+
- TEST_DOCS=true
1916
matrix:
2017
include:
21-
# Tests docs
22-
- python: "2.7"
23-
env: TEST_DOCS=true
2418
# Tests and deploys docs, also runs coverage report
25-
- python: "3.5"
26-
env: COVERAGE=true TEST_DOCS=true DEPLOY_DOCS=true
19+
- python: "3.6"
20+
env: TEST_DOCS=true DEPLOY_DOCS=true
2721
addons:
2822
apt:
2923
packages:
@@ -36,7 +30,6 @@ before_install:
3630
- chmod -R +x ~/.scripts/*
3731
# Prepares CI environment
3832
- source ~/.scripts/travis/load-travis-environment.sh
39-
- source ~/.scripts/travis/load-travis-environment-python.sh
4033
install:
4134
# tox is required for the tests
4235
- pip install tox
@@ -45,14 +38,8 @@ install:
4538
# Dependencies
4639
- pip install --upgrade -r requirements.txt
4740
script:
48-
# Code is checked
49-
- ~/.scripts/python/run_tests.sh true check
50-
# Tests are run
51-
- ~/.scripts/python/run_tests.sh true $PYTHON_VERSION_TEST
5241
# Documentation tests are run
5342
- ~/.scripts/python/run_tests.sh $DO_TEST_DOCS docs
54-
# Documentation tests are run
55-
- ~/.scripts/python/run_tests.sh $DO_COVERAGE coverage
5643
after_success:
5744
# Documentation deployment
5845
- ~/.scripts/sphinx/build-html.sh $DO_DEPLOY_DOCS docs

tox.ini

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py{27,33,34,35},
3+
py{27,34,35,36},
44
pypy{,3},
55
check,
66
docs,
@@ -9,13 +9,15 @@ skip_missing_interpreters =
99
true
1010

1111
[testenv]
12+
# Default environment
1213
deps =
1314
-r{toxinidir}/requirements.txt
1415
nose
1516
commands =
1617
nosetests
1718

1819
[testenv:coverage]
20+
# Generates coverage report
1921
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
2022
deps =
2123
-r{toxinidir}/requirements.txt
@@ -27,6 +29,7 @@ commands =
2729
coveralls
2830

2931
[testenv:check]
32+
# Checks code rules
3033
deps =
3134
-r{toxinidir}/requirements.txt
3235
docutils
@@ -39,6 +42,7 @@ commands =
3942
flake8 dice_notation
4043

4144
[testenv:docs]
45+
# Validates the project docs
4246
changedir =
4347
docs/source
4448
deps =

0 commit comments

Comments
 (0)