clean up the requirements

somair · Feb 25, 2017 · a235323 · a235323
1 parent 82e04d8
commit a235323
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 69 deletions.
diff --git a/examples/requirements/common_python2.txt → examples/requirements/common.txt b/examples/requirements/common_python2.txt → examples/requirements/common.txt
@@ -1,14 +1,11 @@
--r common_test_requirements.txt
--r style_checkers.txt
+#-r test.txt
+#-r style_checkers.txt
 
 alabaster==0.7.6
 Babel==2.1.1
 decorator==4.0.4
 docopt==0.4.0
 docutils==0.12
-ipdb==0.8.1
-ipython==4.0.0
-ipython-genutils==0.1.0
 Jinja2==2.8
 mailchimp==2.0.9
 MarkupSafe==0.23

diff --git a/examples/requirements/common_python3.txt b/examples/requirements/common_python3.txt
diff --git a/examples/requirements/debug.txt b/examples/requirements/debug.txt
@@ -0,0 +1,3 @@
+ipdb==0.8.1
+ipython==4.0.0
+ipython-genutils==0.1.0
diff --git a/examples/requirements/django_1_10.txt b/examples/requirements/django_1_10.txt
@@ -1,13 +1,9 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
 Django>=1.10,<1.11
 django-admin-tools>=0.8.0
-#django-autoslug==1.9.3
 django-debug-toolbar==1.5
-#django-formtools==1.0
-#django-nine>=0.1.10
-#django-nonefield==0.1
 django-registration-redux>=1.4
-#easy-thumbnails==2.3
-#vishap>=0.1.5
 sqlparse==0.2.2
diff --git a/examples/requirements/django_1_11.txt b/examples/requirements/django_1_11.txt
@@ -1,6 +1,8 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
-Django==1.11a1
+Django==1.11b1
 django-admin-tools>=0.8.0
 django-debug-toolbar==1.5
 django-registration-redux>=1.4

diff --git a/examples/requirements/django_1_5.txt b/examples/requirements/django_1_5.txt
@@ -1,14 +1,11 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
 Django>=1.5,<1.6
 South>=0.8.2
 django-admin-tools==0.5.2
-#django-autoslug>=1.7.1
 django-debug-toolbar>=0.11.0
-django-localeurl>=2.0.2
-#django-nine>=0.1.10
-#django-nonefield>=0.1
+#django-localeurl>=2.0.2
 django-registration-redux==1.2
-#easy-thumbnails==2.3
-#vishap>=0.1.5
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_6.txt b/examples/requirements/django_1_6.txt
@@ -1,14 +1,11 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
 Django>=1.6,<1.7
 South>=0.8.2
 django-admin-tools==0.5.2
-#django-autoslug>=1.7.1
 django-debug-toolbar>=0.11.0
-django-localeurl>=2.0.2
-#django-nine>=0.1.10
-#django-nonefield>=0.1
+#django-localeurl>=2.0.2
 django-registration-redux==1.2
-#easy-thumbnails==2.3
-#vishap>=0.1.5
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_7.txt b/examples/requirements/django_1_7.txt
@@ -1,13 +1,10 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
 Django>=1.7,<1.8
 django-admin-tools>=0.6.0
-#django-autoslug==1.7.1
 django-debug-toolbar==0.11.0
-django-localeurl>=2.0.2
-#django-nine>=0.1.10
-#django-nonefield>=0.1
+#django-localeurl>=2.0.2
 django-registration-redux==1.3
-#easy-thumbnails==2.3
-#vishap>=0.1.5
 sqlparse==0.1.9
diff --git a/examples/requirements/django_1_8.txt b/examples/requirements/django_1_8.txt
@@ -1,14 +1,10 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
 Django>=1.8,<1.9
 django-admin-tools>=0.6.0
-#django-autoslug==1.7.1
 django-debug-toolbar==0.11.0
 django-formtools
-#django-localeurl>=2.0.2
-#django-nine>=0.1.10
-#django-nonefield>=0.1
 django-registration-redux>=1.4
-#easy-thumbnails==2.3
-#vishap>=0.1.5
-sqlparse==0.1.9
+sqlparse==0.1.9
diff --git a/examples/requirements/django_1_9.txt b/examples/requirements/django_1_9.txt
@@ -1,4 +1,6 @@
--r common_python2.txt
+-r common.txt
+-r test.txt
+-r style_checkers.txt
 
 Django>=1.9,<1.10
 django-admin-tools>=0.7.1

diff --git a/examples/requirements/docs.txt b/examples/requirements/docs.txt
@@ -1,21 +1,6 @@
--r common_python2.txt
+-r common.txt
+-r django_1_10.txt
 
-Django==1.10.1
 django-fobi
-#Jinja2
-#MarkupSafe
-#MySQL-python
-#mailchimp
-#Sphinx
-django-admin-tools>=0.8.0
-django-debug-toolbar>=1.5
-django-registration-redux>=1.4
-#docutils
-#ipdb
-#ipython
-#ordereddict>=1.1
-# Selenium shall always be upgraded
-#selenium
-#tox
 rst2pdf
 reportlab==3.3.0
diff --git a/examples/requirements/latest.txt b/examples/requirements/latest.txt
@@ -1,4 +1,4 @@
--r common_python2.txt
+-r common.txt
 
 Django
 django-admin-tools>=0.7.1

diff --git a/examples/requirements/python_3.txt b/examples/requirements/python_3.txt
diff --git a/...requirements/common_test_requirements.txt → examples/requirements/test.txt b/...requirements/common_test_requirements.txt → examples/requirements/test.txt
diff --git a/examples/requirements/testing.txt b/examples/requirements/testing.txt
@@ -0,0 +1,3 @@
+-r django_1_10.txt
+-r test.txt
+-r style_checkers.txt
diff --git a/setup.py b/setup.py
@@ -77,7 +77,6 @@
 
 try:
     readme = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
-    readme = readme.replace('.. code-block:: none', '.. code-block::')
     screenshots = open(
         os.path.join(os.path.dirname(__file__), 'SCREENSHOTS.rst')
     ).read()
@@ -86,10 +85,6 @@
         '.. figure:: https://github.com/barseghyanartur/django-fobi/raw/'
         'master/docs/_static'
     )
-    screenshots = screenshots.replace(
-        '.. code-block:: none',
-        '.. code-block::'
-    )
 except:
     readme = ''
     screenshots = ''
@@ -346,8 +341,8 @@
 setup(
     name='django-fobi',
     version=version,
-    description=("Form generator/builder application for Django done right: "
-                 "customisable, modular, user- and developer- friendly."),
+    description="Form generator/builder application for Django done right: "
+                "customisable, modular, user- and developer- friendly.",
     long_description="{0}{1}".format(readme, screenshots),
     classifiers=[
         # "Programming Language :: Python :: 2.6",