Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/docs/_build
/docs/_build/
tmp.py
*.py[cod]

Expand Down Expand Up @@ -37,7 +37,10 @@ nosetests.xml
/.coverage
/.coverage.*
/htmlcov/
/.mypy_cache
/.mypy_cache/

# Documentation
/htmldocs/

# Translations
*.mo
Expand Down
12 changes: 6 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

envlist =
flake8, mypy
test-py{26,27,34,35,36,37,38,py,py3}
test-py{26,27,34,35,36,37,38,py2,py3}
coverage_report
packaging
docs
packaging

skip_missing_interpreters = {tty:True:False}

Expand Down Expand Up @@ -182,12 +182,12 @@ description = generate coverage report

depends = test-py{26,27,34,35,36,37,38,py,py3}

basepython = python
basepython = {[default]basepython}

skip_install = True

deps =
coverage==4.5.4 # rq.filter: <5
coverage==4.5.4 # rq.filter: <5 # coverage 5.0 drops Python 3.4 support

setenv =
{[default]setenv}
Expand Down Expand Up @@ -265,7 +265,7 @@ commands =
sphinx-build \
-b html -d "{envtmpdir}/doctrees" \
"{toxinidir}/docs" \
"{toxworkdir}/docs/html"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to match other projects, and similar to /htmlcov/.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, other hyper projects, or which other projects?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Klein in particular; I'm trying to keep the configs relatively similar for sanity.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/me whispers "we need a tool to keep them in sync"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I KNOW

"{toxworkdir}/htmldocs"


[testenv:docs-auto]
Expand All @@ -283,7 +283,7 @@ commands =
-b html -d "{envtmpdir}/doctrees" \
--host=localhost \
"{toxinidir}/docs" \
"{toxworkdir}/docs/html"
"{toxworkdir}/htmldocs"


##
Expand Down