Skip to content

Commit

Permalink
Merge pull request #45 from dhellmann/travis-updates
Browse files Browse the repository at this point in the history
update test settings
  • Loading branch information
dhellmann authored Jun 5, 2020
2 parents 3494c17 + 43adb39 commit 4888baf
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 41 deletions.
33 changes: 28 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: python

python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"
- "nightly"

# Test the nightly build of cpython, but ignore any failures.
Expand All @@ -12,7 +12,9 @@ matrix:
- python: "nightly"
include:
- env: BUILD=docs
python: 3.8
- env: BUILD=linter
python: 3.8

# travis pre-installs some packages that may conflict with our test
# dependencies, so remove them before we set ourselves up. Also
Expand All @@ -22,9 +24,30 @@ before_install:
- sudo apt-get -qq update
- sudo apt-get install -y enchant
- pip uninstall -y nose mock
- pip install pbr
- pip install pbr tox tox-travis

install: pip install .[test] .[linter]
install:
- pip install .[test] .[linter]

script:
- ./tools/travis.sh
# Conditional builds (related to env passed)
- |
case ${BUILD} in
docs|pep8|cover)
tox -e ${BUILD}
;;
*)
tox
;;
esac
deploy:
on:
tags: true
distributions: "sdist bdist_wheel"
skip_existing: true
provider: pypi
user: __token__
password:
secure: "LcKMGh8rF8R4/yVYXPUpsyHseUxlYg3jF/Y76nfqhiKkS/5Vw2g6qgav2gHpjKEW4kJVzfCEfJ3FyCJgV50P9UcWvG6a8p+ld7rmEel7nXcfym6xFvxDJa+MGQmdU0NlelKAsPF+RRIG96WLoU/B53AqiypaSMZ1sjr1nFeisRvif7FwAJlgeimgWBxWuJx7UmJ5NblDaWKvA4YGb3fJWnuGxk8DKmLvrEnfzaVRE5HCkebk9dOfPWGUG4D7apUFPX1rgF2MC49aHYWXEG4lfzg4ldd6EtCNC1eY36MYK5rHjjmw1JTxHwwmpMXZ1QCwwuk7UFW+trkiuc43qtqxtlha7MSwCO6Q/8V9g/CvrUf+iOpy7yKsooD/VrWAIJql8Z3BfAXR23IJwtdEU8bwt0rCMu64+UAPXxlSITXEZAqOZnsKlLpF437VfG7clEGcguajPKMyvDKD/GMEx6vWhY3uEOvjVx+2rJ6sAq+joyX6qkwE0eYqgCcDJQhHYP3orJmednKeKnkGtSUC9g+amlPfDyoDrTyFwsCKbuCDgnSFm8G9o10CXii6IUQ0peVdbBCPdmZXjUNqQAcKgD9rL2qC3/Tp+QZZlIpLq1JVtmb9L0Svu3XSjwCVdhYuNm2mgeiFy3Hr/RSB+GFHEsOI/Eh9zV0qMy+ZjQ7yQ0A7Dow="
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
PyEnchant>=1.6.5
Sphinx>=2.0.0
PyEnchant>=3.1.1
Sphinx>=3.0.0
six
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ test =
testtools>=1.4.0
coverage!=4.4,>=4.0
linter =
flake8==3.5.0
flake8==3.8.2

[egg_info]
#tag_build = dev
Expand Down
29 changes: 0 additions & 29 deletions tools/travis.sh

This file was deleted.

20 changes: 16 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist=py36,linter,docs
envlist=py38,linter,docs

[testenv]
# Use a local copy of my "fix-py3-install" branch from the fork of
Expand All @@ -8,20 +8,32 @@ envlist=py36,linter,docs
deps=
.[test]
commands=
{toxinidir}/tools/travis.sh '{posargs}'
python setup.py test \
--coverage \
--coverage-package-name=sphinxcontrib.spelling \
--slowest \
--testr-args="{posargs}"
coverage report --show-missing

[testenv:linter]
basepython=python3.8
deps=
.[linter]
setenv =
BUILD=linter
basepython=python3
commands =
flake8 sphinxcontrib setup.py

[flake8]
show-source = True
exclude = .tox,dist,doc,*.egg,build
ignore = W504

[testenv:docs]
basepython=python3.8
setenv =
BUILD=docs
basepython=python3
ENABLE_SPELLING=1
commands =
sphinx-build -W -b html docs/source docs/build
sphinx-build -b spelling docs/source docs/build

0 comments on commit 4888baf

Please sign in to comment.