Skip to content

Commit

Permalink
Merge pull request #18 from rm-hull/py36
Browse files Browse the repository at this point in the history
Document Python 3.6 is supported
  • Loading branch information
thijstriemstra committed Jan 22, 2017
2 parents dccde7d + 6874a47 commit a8657cb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ matrix:
env: TOXENV=py34
- python: 3.5
env: TOXENV=py35
- python: 3.6-dev
- python: 3.6
env: TOXENV=py36
- python: 3.7-dev
env: TOXENV=py37
- python: 2.7
env: TOXENV=qa
allow_failures:
- python: 3.6-dev
- python: 3.7-dev
addons:
apt:
packages:
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
download_url="https://github.com/rm-hull/luma.lcd/tarball/" + version,
namespace_packages=["luma"],
packages=["luma.lcd"],
zip_safe=False,
install_requires=["luma.core"],
setup_requires=["pytest-runner"],
tests_require=["mock", "pytest", "pytest-cov", "python-coveralls"],
Expand All @@ -36,6 +37,7 @@
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5"
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6"
]
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See LICENSE.rst for details.

[tox]
envlist = py{27,34,35,36},qa
envlist = py{27,34,35,36,37},qa
skip_missing_interpreters = True

[testenv]
Expand Down

0 comments on commit a8657cb

Please sign in to comment.