From 231db4a633557661e39f0e2d779bb5618f8a9cfa Mon Sep 17 00:00:00 2001
From: Ken Cochrane <KenCochrane@gmail.com>
Date: Tue, 3 Mar 2015 09:44:07 -0500
Subject: [PATCH] fixed issue with templates not getting added to pypi package

---
 CHANGES     | 13 +++++++++++++
 MANIFEST.in |  5 +++++
 README.md   |  1 +
 setup.py    | 44 +++++++++++++++++++++++++++++++++++---------
 4 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 MANIFEST.in

diff --git a/CHANGES b/CHANGES
index ae4638f..4ae31cb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,16 @@
+
+0.2.2
+=====
+Another bug fix release for more missing files in distribution
+
+0.2.1
+=====
+Bug fixes for packing missing files
+
+0.2
+===
+Added fixes to include possible security issue
+
 0.1
 ===
 Initial Version
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..036216d
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,5 @@
+include CHANGES
+include README.md
+include LICENSE
+recursive-include defender/templates *.html
+recursive-exclude * *.py[co]
diff --git a/README.md b/README.md
index 2633c91..67b5610 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ Sites using Defender:
 
 Versions
 ========
+- 0.2.2 - bug fix add missing files to pypi package
 - 0.2.1 - bug fix
 - 0.2 - security fix for XFF headers
 - 0.1.1 - setup.py fix
diff --git a/setup.py b/setup.py
index 5a42823..0c0dfc5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
 
 try:
     from setuptools import setup
@@ -6,7 +9,33 @@ except ImportError:
     from distutils.core import setup
 
 
-version = '0.2.1'
+version = '0.2.2'
+
+
+def get_packages(package):
+    """
+    Return root package and all sub-packages.
+    """
+    return [dirpath
+            for dirpath, dirnames, filenames in os.walk(package)
+            if os.path.exists(os.path.join(dirpath, '__init__.py'))]
+
+
+def get_package_data(package):
+    """
+    Return all files under the root package, that are not in a
+    package themselves.
+    """
+    walk = [(dirpath.replace(package + os.sep, '', 1), filenames)
+            for dirpath, dirnames, filenames in os.walk(package)
+            if not os.path.exists(os.path.join(dirpath, '__init__.py'))]
+
+    filepaths = []
+    for base, filenames in walk:
+        filepaths.extend([os.path.join(base, filename)
+                          for filename in filenames])
+    return {package: filepaths}
+
 
 setup(name='django-defender',
       version=version,
@@ -36,13 +65,10 @@ setup(name='django-defender',
       url='https://github.com/kencochrane/django-defender',
       author_email='kencochrane@gmail.com',
       license='Apache 2',
-      packages=['defender'],
-      package_data={
-          "defender": ["templates/*.html",
-                       "migrations/*.py",
-                       "south_migrations/*.py",
-                       "exampleapp/*.*"],
-      },
-      install_requires=['Django>=1.6,<1.8', 'redis==2.10.3', 'hiredis==0.1.4', 'mockredispy==2.9.0.10'],
+      include_package_data=True,
+      packages=get_packages('defender'),
+      package_data=get_package_data('defender'),
+      install_requires=['Django>=1.6,<1.8', 'redis==2.10.3',
+                        'hiredis==0.1.4', 'mockredispy==2.9.0.10'],
       tests_require=['mock', 'mockredispy', 'coverage', 'celery'],
       )