From e86ddc670be2b22a873e2ea96b55601b344df1ee Mon Sep 17 00:00:00 2001
From: rwong-matroid <ryan.wong@matroid.com>
Date: Wed, 19 May 2021 00:28:23 +0000
Subject: [PATCH 1/2] increment version; fix setup.py

---
 VERSION            | 2 +-
 matroid/version.py | 2 +-
 setup.py           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 6d7de6e6a..9084fa2f7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.2
+1.1.0
diff --git a/matroid/version.py b/matroid/version.py
index 6732d5aae..9cff1bc29 100644
--- a/matroid/version.py
+++ b/matroid/version.py
@@ -1 +1 @@
-VERSION = '1.0.2'
+VERSION = '1.1.0'
diff --git a/setup.py b/setup.py
index fe6c8abc4..69af1831c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,14 @@
-from version import VERSION
 import os
 import sys
 
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'matroid'))
+from version import VERSION
+
 try:
   from setuptools import setup
 except ImportError:
   from distutils.core import setup
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'matroid'))
-
 setup(
     name='matroid',
     version=VERSION,

From 3362ad32e9d385e7eb09b57b5978a3cef1276ae4 Mon Sep 17 00:00:00 2001
From: jack-matroid <jack.jin@matroid.com>
Date: Mon, 18 Oct 2021 21:20:36 +0000
Subject: [PATCH 2/2] Increase version to 1.1.1 and fix package.

---
 VERSION            | 2 +-
 matroid/version.py | 2 +-
 setup.py           | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index 9084fa2f7..524cb5524 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/matroid/version.py b/matroid/version.py
index 9cff1bc29..0ad4a5807 100644
--- a/matroid/version.py
+++ b/matroid/version.py
@@ -1 +1 @@
-VERSION = '1.1.0'
+VERSION = '1.1.1'
diff --git a/setup.py b/setup.py
index 69af1831c..b1946554c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,7 @@
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'matroid'))
 from version import VERSION
 
-try:
-  from setuptools import setup
-except ImportError:
-  from distutils.core import setup
+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
 )