Skip to content
Closed
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
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: python
python:
- '2.6'
- '2.7'
- '3.4'
- '3.5'
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Please note that we use the [Gitflow Workflow](https://www.atlassian.com/git/tut

##### Prerequisites #####

- Python 2.6, 2.7, 3.4 and 3.5
- Python 2.7, 3.4 and 3.5

##### Initial setup: #####

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:xenial
ENV PYTHON_VERSIONS='python2.6 python2.7 python3.4 python3.5 python3.6' \
ENV PYTHON_VERSIONS='python2.7 python3.4 python3.5 python3.6' \
OAI_SPEC_URL="https://raw.githubusercontent.com/sendgrid/sendgrid-oai/master/oai_stoplight.json"

# install testing versions of python, including old versions, from deadsnakes
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Installation
Prerequisites
-------------

- Python version 2.6, 2.7, 3.4 or 3.5
- Python version 2.7, 3.4 or 3.5
- The SendGrid service, starting at the `free level`_

Install Package
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
license='MIT License',
description='Simple wrapper to use SendGrid SMTP API',
long_description=readme,
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
classifiers=[
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
],
Expand Down
6 changes: 1 addition & 5 deletions test/test_lisence.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import sendgrid
from sendgrid.helpers.mail import *
from sendgrid.version import __version__

try:
import unittest2 as unittest
except ImportError:
import unittest
import unittest
import os
import subprocess
import sys
Expand Down
6 changes: 1 addition & 5 deletions test/test_project.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import os

try:
import unittest2 as unittest
except ImportError:
import unittest
import unittest


class ProjectTests(unittest.TestCase):
Expand Down