From a6c545932ec89a9f14f21ec79ccf587288b34c45 Mon Sep 17 00:00:00 2001
From: Dean Gardiner <gardiner91@gmail.com>
Date: Tue, 4 Nov 2014 12:47:33 +1300
Subject: [PATCH] Fixed issues with [setup.py]

---
 .gitignore                               | 14 +++++++++-----
 .travis.yml                              |  2 +-
 src/requirements.txt => requirements.txt |  0
 src/setup.py => setup.py                 | 15 +++++++++++----
 src/caper/__init__.py                    |  6 +++++-
 5 files changed, 26 insertions(+), 11 deletions(-)
 rename src/requirements.txt => requirements.txt (100%)
 rename src/setup.py => setup.py (87%)

diff --git a/.gitignore b/.gitignore
index 209c47a..2b5454e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
-*.pyc
-tools/*.csv
-tools/*.mysql
 /.idea
-*.iml
 /.coverage
-/out
+/build
+/dist
+/src/caper.egg-info
 /tools/test_data
+/tools/*.csv
+/tools/*.mysql
+/out
+
+*.iml
 *.lprof
+*.pyc
diff --git a/.travis.yml b/.travis.yml
index 0ec25ef..acaa885 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
   - "3.3"
 
 install:
-  - "pip install -r src/requirements.txt --use-mirrors"
+  - "pip install -r requirements.txt --use-mirrors"
   - "pip install -r tests/requirements.txt --use-mirrors"
   - "pip install -r tests/requirements_travis.txt --use-mirrors"
 
diff --git a/src/requirements.txt b/requirements.txt
similarity index 100%
rename from src/requirements.txt
rename to requirements.txt
diff --git a/src/setup.py b/setup.py
similarity index 87%
rename from src/setup.py
rename to setup.py
index ecb7da5..c138a4b 100644
--- a/src/setup.py
+++ b/setup.py
@@ -12,19 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from setuptools import setup, find_packages
+
+import sys
+sys.path.insert(0, 'src')
+
 from caper import __version__
-from distutils.core import setup
 
 
 setup(
     name='caper',
     version=__version__,
-    packages=['caper', 'caper.parsers'],
-    package_dir={'': 'src'},
-    url='https://github.com/fuzeman/caper',
     license='Apache License, Version 2.0',
+    url='https://github.com/fuzeman/caper',
+
     author='Dean Gardiner',
     author_email='gardiner91@gmail.com',
+
     description='Extensible filename parsing library for Python',
+    packages=find_packages('src', exclude=['tests']),
+    package_dir={'': 'src'},
+
     requires=['Logr']
 )
diff --git a/src/caper/__init__.py b/src/caper/__init__.py
index 45771c2..931b1a9 100644
--- a/src/caper/__init__.py
+++ b/src/caper/__init__.py
@@ -12,13 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from logr import Logr
 from caper.matcher import Matcher
 from caper.objects import CaperFragment, CaperClosure
 from caper.parsers.anime import AnimeParser
 from caper.parsers.scene import SceneParser
 from caper.parsers.usenet import UsenetParser
 
+try:
+    from logr import Logr
+except ImportError:
+    pass
+
 
 __version_info__ = ('0', '3', '2')
 __version_branch__ = 'master'