diff options
| author | Zach Smith <subsetpark@gmail.com> | 2017-05-24 16:28:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 16:28:39 -0400 |
| commit | fce7f146a3c70e637af86e9fa9856515d3165b8f (patch) | |
| tree | 37ac5d8b4371b0392bd777826d1df4f30e582e49 | |
| parent | 9ac94290ef5dc2d1f03fd5001f595ac60938660b (diff) | |
| parent | 8d274807a2478817bc3f40f1ee3d73660461d7a9 (diff) | |
| download | pycco-fce7f146a3c70e637af86e9fa9856515d3165b8f.tar.gz | |
Merge pull request #100 from medecau/travis-is-toxic
Adds tox tests to travis
| -rw-r--r-- | .travis.yml | 13 | ||||
| -rw-r--r-- | pycco/main.py | 2 | ||||
| -rw-r--r-- | tox.ini | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 62e7c6b..a4d0789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: python python: - '2.7' @@ -10,3 +11,15 @@ script: - 'python -m pycco.main pycco/main.py' after_success: - coveralls +matrix: + include: + - python: 3.5 + env: CODESTYLE=true + - python: 2.7 + env: TOXENV=py27 + install: pip install tox + script: tox + - python: 3.6 + env: TOXENV=py36 + install: pip install tox + script: tox diff --git a/pycco/main.py b/pycco/main.py index 55ab0ff..f0d4fcf 100644 --- a/pycco/main.py +++ b/pycco/main.py @@ -535,6 +535,7 @@ def process(sources, preserve_paths=True, outdir=None, language=None, with open(path.join(outdir, "index.html"), "wb") as f: f.write(generate_index.generate_index(generated_files, outdir)) + __all__ = ("process", "generate_documentation") @@ -630,6 +631,7 @@ def main(): monitor(sources, opts) + # Run the script. if __name__ == "__main__": main() @@ -1,11 +1,11 @@ [tox] -envlist = py2,py3,codestyle +envlist = py27,py36,codestyle [testenv] deps = -rrequirements.test.txt -commands = py.test +commands = pytest [testenv:codestyle] deps = pycodestyle # E501 - line too long -commands = pycodestyle --ignore=E501 +commands = pycodestyle --ignore=E501 pycco |