From 572b6f5872121a8e34656b157fbef55f6ed33b95 Mon Sep 17 00:00:00 2001 From: Mats Julian Olsen Date: Sat, 25 Feb 2017 17:04:45 +0100 Subject: [PATCH] Update travis to new python version --- .travis.yml | 1 + setup.py | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2635ae1..f127240 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: python python: - "2.7" - "3.5" + - "3.6" before_script: pip install coveralls script: - "py.test" diff --git a/setup.py b/setup.py index e582b8f..7abdc5b 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,8 @@ -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - +from setuptools import setup import addict SHORT='Addict is a dictionary whose items can be set using both attribute and item syntax.' -LONG=('Addict is a module that exposes a Dictionary subclass that allows items to be set like attributes. ' +LONG=('Addict is a module that exposes a dictionary subclass that allows items to be set like attributes. ' 'Values are gettable and settable using both attribute and item syntax. ' 'For more info check out the README at \'github.com/mewwts/addict\'.')