fix

[fnpdjango.git] / setup.py

diff --git a/setup.py b/setup.py
index ccc5a59..1865b06 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 #!/usr/bin/env python

-# -*- coding: utf-8 -*-

 #
 import os.path
 from setuptools import setup, find_packages
 
 #
 import os.path
 from setuptools import setup, find_packages
 

+

 def whole_trees(package_dir, paths):
     def whole_tree(prefix, path):
         files = []
 def whole_trees(package_dir, paths):
     def whole_tree(prefix, path):
         files = []

-        for f in (f for f in os.listdir(os.path.join(prefix, path)) if not f[0]=='.'):
+        for f in (f for f in os.listdir(os.path.join(prefix, path)) if f[0] != '.'):

             new_path = os.path.join(path, f)
             if os.path.isdir(os.path.join(prefix, new_path)):
                 files.extend(whole_tree(prefix, new_path))
             new_path = os.path.join(path, f)
             if os.path.isdir(os.path.join(prefix, new_path)):
                 files.extend(whole_tree(prefix, new_path))


@@ -22,25 +22,28 @@ def whole_trees(package_dir, paths):
 
 setup(
     name='fnpdjango',
 
 setup(
     name='fnpdjango',

-    version='0.1.16',
+    version='0.7',

     author='Radek Czajka',
     author_email='radekczajka@nowoczesnapolska.org.pl',
     author='Radek Czajka',
     author_email='radekczajka@nowoczesnapolska.org.pl',

-    url = '',
-    packages=find_packages(),
+    url='',
+    packages=find_packages(exclude=['tests*']),

     package_data={
     package_data={

-        'fnpdjango': whole_trees('fnpdjango', ['templates', 'locale']),
-        'fnpdjango.deploy': ['templates/*.template'],
+        'fnpdjango': whole_trees('fnpdjango', ['templates', 'locale', 'static']),

         'fnpdjango.management.commands': ['babel.cfg'],
     },
         'fnpdjango.management.commands': ['babel.cfg'],
     },

-    scripts=[
-        'bin/git-archive-all.sh',
-        'bin/fnpdjango_bootstrap.sh',
-    ],

     install_requires=[
     install_requires=[

-        'django>=1.4,<1.7',
-        'textile',
+        'Django>=2.0,<5.0',

     ],
     ],

+    extras_require={
+        'textile': [
+            'textile>=4.0.2',
+        ],
+        'pipeline': [
+            'pipeline',
+        ],
+    },

     license='LICENSE',
     description='.',
     long_description="",
     license='LICENSE',
     description='.',
     long_description="",

+    test_suite="runtests.runtests",

 )
 )