Skip to content

Commit

Permalink
Merge pull request #290 from andriisoldatenko/add-python-36
Browse files Browse the repository at this point in the history
Added python 3.6 to tox file
  • Loading branch information
thinkingserious authored Mar 23, 2017
2 parents bc789a8 + f7279d7 commit 20f53cf
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
install:
- python setup.py install
- pip install pyyaml
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ We welcome direct contributions to the sendgrid-python code base. Thank you!

##### Prerequisites #####

- Python 2.6 through 3.5
- Python 2.6 through 3.6
- [python_http_client](https://github.com/sendgrid/python-http-client)

##### Initial setup: #####
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ We appreciate your continued support, thank you!

## Prerequisites

- Python version 2.6, 2.7, 3.4 or 3.5
- Python version 2.6, 2.7, 3.4, 3.5 or 3.6
- The SendGrid service, starting at the [free level](https://sendgrid.com/free?source=sendgrid-python)

## Setup Environment Variables
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def getRequires():
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5'
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6'
]
)
13 changes: 9 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# and then run "tox" from this directory.

[tox]
envlist = py26, py27, py32, py33, py34, py35
envlist = py26, py27, py32, py33, py34, py35, py36

[testenv]
commands = {envbindir}/python -m unittest discover -v []
deps =
{py26,py27,py32,py33,py34,py35}-full: python_http_client
{py26,py27,py32,py33,py34,py35,py36}-full: python_http_client

[testenv:py26]
commands = {envbindir}/unit2 discover -v []
Expand Down Expand Up @@ -38,5 +38,10 @@ basepython = python3.4

[testenv:py35]
commands = {envbindir}/python -m unittest discover -v []
deps =
basepython = python3.5
deps = -rrequirements.txt
basepython = python3.5

[testenv:py36]
commands = {envbindir}/python -m unittest discover -v []
deps = -rrequirements.txt
basepython = python3.6

0 comments on commit 20f53cf

Please sign in to comment.