Merge remote-tracking branch 'Kotti/stable'

* Kotti/stable: Bump version. Added E402 to list of ignored PEP8 errors Conflicts: CHANGES.txt requirements.txt setup.py
Kotti · Feb 23, 2015 · df79824 · df79824
2 parents 12950a9 + b9f3f95
commit df79824
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,9 +5,14 @@ Change History
 --------------------
 
 - Initialize pyramid.paster.logging for custom commands defined via
-  ``kotti.util.command``, to allow log message output for kotti sessions 
+  ``kotti.util.command``, to allow log message output for kotti sessions
   started via custom commands.
 
+1.0.0 - 2015-01-20
+------------------
+
+- No changes.
+
 1.0.0-alpha.4 - 2015-01-29
 --------------------------
 

diff --git a/kotti/scaffolds/package/requirements.txt b/kotti/scaffolds/package/requirements.txt
@@ -1,4 +1,4 @@
-Kotti==1.0.0-alpha.4
+Kotti==1.0.0
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-Kotti==1.0.0-alpha.4
-filedepot==0.0.2
+Kotti==1.0.0
+filedepot==0.0.3
 Babel==1.3
 Beaker==1.6.4
 Chameleon==2.20

diff --git a/setup.py b/setup.py
@@ -19,14 +19,12 @@
     'alembic',
     'colander>=0.9.3',
     'deform>=2.0a1',  # >=2.0a1 to support Bootstrap 2
-    # 'deform_bootstrap>=0.1',  # checked_input widget
     'docopt',
     'formencode',
     'html2text',
     'js.angular',
     'js.bootstrap>=2.1.5',
     'js.deform>=2.0a2-2',
-    # 'js.deform_bootstrap>=0.2.4-1',
     'js.fineuploader',
     'js.html5shiv',
     'js.jquery',