# HG changeset patch
# User Peter Sanchez <peter@netlandish.com>
# Date 1505521029 25200
#      Fri Sep 15 17:17:09 2017 -0700
# Node ID e4b294a400dbc3cf2d7be83e159a5e4f9a1ca1b0
# Parent  b6a8be49762d15f9bb37d1c20dffaf5d06aa5341
Updated for new force validation setting.

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,1 @@
+recursive-include form_guard/templates *
diff --git a/form_guard/forms.py b/form_guard/forms.py
--- a/form_guard/forms.py
+++ b/form_guard/forms.py
@@ -3,12 +3,12 @@
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 
-from .settings import FORM_GUARD_MIN_VALUE
+from .settings import FORM_GUARD_MIN_VALUE, FORM_GUARD_FORCE_VALIDATION
 
 
 def clean_func(self):
     antispam = self.cleaned_data.get(self.FORM_GUARD_FIELD_NAME)
-    if settings.DEBUG:
+    if settings.DEBUG and not FORM_GUARD_FORCE_VALIDATION:
         return antispam
     try:
         antispam = int(antispam)
diff --git a/form_guard/settings.py b/form_guard/settings.py
--- a/form_guard/settings.py
+++ b/form_guard/settings.py
@@ -3,3 +3,8 @@
 
 
 FORM_GUARD_MIN_VALUE = getattr(settings, 'FORM_GUARD_MIN_VALUE', 5)
+FORM_GUARD_FORCE_VALIDATION = getattr(
+    settings,
+    'FORM_GUARD_FORCE_VALIDATION',
+    False,
+)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1,53 +1,24 @@
 import os
-from distutils.core import setup
-
-project_name = 'form_guard'
-
-# Idea from django-registration setup.py
-packages, data_files = [], []
-root_dir = os.path.dirname(__file__)
-if root_dir:
-    os.chdir(root_dir)
+from setuptools import setup, find_packages
 
-for dirpath, dirnames, filenames in os.walk(project_name):
-    # Ignore dirnames that start with '.'
-    for i, dirname in enumerate(dirnames):
-        if dirname.startswith('.') or dirname == '__pycache__':
-            del dirnames[i]
-    if '__init__.py' in filenames:
-        pkg = dirpath.replace(os.path.sep, '.')
-        if os.path.altsep:
-            pkg = pkg.replace(os.path.altsep, '.')
-        packages.append(pkg)
-    elif filenames:
-        prefix = dirpath[(len(project_name) + 1):]
-        for f in filenames:
-            data_files.append(os.path.join(prefix, f))
 
 setup(
     name='django-form-guard',
-    version=__import__(project_name).get_version(),
-    package_dir={project_name: project_name},
-    packages=packages,
-    package_data={project_name: data_files},
-    description='Django Form Guard',
+    version=__import__('form_guard').get_version(),
+    packages=find_packages(),
+    description='Django App To Protect Your Forms From Spam Bots',
     author='Netlandish Inc.',
-    author_email='geeks@netlandish.com',
-    license='BSD License',
-    url='http://bitbucket.org/netlandish/django-form-guard/',
-    long_description='Django Form Guard',
-    install_requires=['Django >= 1.7.0'],
+    author_email='hello@netlandish.com',
+    url='https://bitbucket.org/netlandish/django-form-guard/',
     platforms=['any'],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Environment :: Web Environment',
     ],
+    include_package_data=True,
 )