Merge pull request #106 from google/2015.07.post1-release

2015.7.post1 Release with fixes for pypi
google · Jul 23, 2015 · 3624f37 · 3624f37
2 parents ea38d15 + 5f713f2
commit 3624f37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 recursive-include timesketch/ui/static *
-recursive-include timesketch/ui/templates *
+recursive-include timesketch/ui/templates *
+include timesketch.conf
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@
 
 setup(
     name=u'timesketch',
-    version=u'2015.7',
+    version=u'2015.7.post1',
     description=u'Collaborative forensic timeline analysis',
     long_description=timesketch_description,
     license=u'Apache License, Version 2.0',
@@ -57,7 +57,7 @@
         u'Flask-Bcrypt',
         u'Flask-RESTful',
         u'Flask-WTF',
-        u'SQLAlchemy ==0.9.8',
+        u'SQLAlchemy',
         u'celery',
         u'redis',
         u'blinker',