diff --git a/VERSION b/VERSION index 6d7de6e6a..524cb5524 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2 +1.1.1 diff --git a/matroid/version.py b/matroid/version.py index 6732d5aae..0ad4a5807 100644 --- a/matroid/version.py +++ b/matroid/version.py @@ -1 +1 @@ -VERSION = '1.0.2' +VERSION = '1.1.1' diff --git a/setup.py b/setup.py index fe6c8abc4..b1946554c 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,10 @@ -from version import VERSION import os import sys -try: - from setuptools import setup -except ImportError: - from distutils.core import setup - sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'matroid')) +from version import VERSION + +from setuptools import setup, find_packages setup( name='matroid', @@ -17,6 +14,6 @@ author_email='support@matroid.com', url='https://github.com/matroid/matroid-python', install_requires=['requests'], - packages=['matroid'], + packages=find_packages(), use_2to3=True )