Merge pull request #11 from katie7r/version-and-deploy

Version and deploy
cuttlesoft · Sep 13, 2016 · 4bc9acc · 4bc9acc
2 parents 294220e + bcf8c14
commit 4bc9acc
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,3 +21,10 @@ notifications:
   slack:
     rooms:
       secure: Tok8grsXdoAXuWhig0fO66CLW4SvQsSaRZJ0ZZ/2bkt276LrggcgdNYwSJs4qDuMYz1/eMFASLe0obfgd0EKtliHIZFQLW05aoLKABj6N0k0XhIrqkWWhwhYdL+P8rnsr2VPNEFcX+iXY9V93KBnCBnrixH+J6VaMBr/gvHEZuZbM+gWWDeN/C1P+4T/NtmsvQmSt1jv3pskn7MKpbikIwDNyTvvH1jVPu1mZuaZ0DP2WMO8Pqr1fXsQ3IWlNVULx/JK9wwYRDcCK41qKIjYxUXMYUTkPdxn4aBtJ/oiSNasLwB06x9PYTkbgVoXouj6yxRqJduSR/qCZ/jfaYGAWOhtPVbK3dbUv/qi6gy0Fa62Qd6uFVykUinNPTWz+uNfpmwyO8ZNSKAuyVRMQGJgY9jSXpWaVFQjZVrjyPjfGwo51sqvUYgL3rA8Zq70T4m/Nwb/f7hxHCWZkW0dNopuT3sviBuRBsvdyKvqh51CqKGWI9qV3nxltXjZ9v8GClXXs5PL/spvbmUwa91vgqUSLrK+RttETGxAjoak11A9/SLpXmJcBNBUVMG2xCGUlFR01njyUnPkgSWJI+8oKG1jWER0CvBMDHC8ydToE4sh6I8VPeX1s+G7wpHB9UBmWzOU05SMxrtlzWnDD+NzJTag8/HXN5FIs7DpNoSxTei/lVs=
+deploy:
+  provider: pypi
+  user: cuttlesoft
+  password:
+    secure: QJaZtOuhW3iRcZrwBUXJeT+TNedpbQ+p0/5Hjle+EWEqy8zXj2Qc6Ux34+qcL59WQxqp7QZZSb3xQxzV6CGdghkxTT3QZvSqc0erRawCyyHARTPa8hWcVZTgev+uTwzzbhwV3olslVzTtGmcm8T0AhT6fk77Ae/5rfMso1cZTZJXN5+08OePL5Dq1d2qTpTqaLeRNVKf2Mdybn2TJw4CuhlbaDxf3AIGbHMJNFFN1Vuo68niIWohNVEBuYytTTHRfaNCLNeGRbkGV9mEWyl2IS/j8MXj0fg5zsqllMysaXoFboNVwpHH1ESu0suyXIPzHcg95Fs3ES5djkg/4DqKxL2sSY6OC7TgpB468IFd21XWK6lfldh+6PPsJ1gPLIWcnXlzoSr4XitvpRp2tPX6mfjws4Lg4Hidphf3wBzu/xM780BZDRZipi6ozE3GXy/XX55/ecTp3Ic+fKhLfDqgcLEvoQYJ8RKHMxw09guoGRbYDKtB5AUCVlr1kO5UFvlmk/YQP3BsIqxLrMVKHDE7rFd2/sRAb8RcB4XMZdhhowRoAV5cYPb+2maNVAHgPfMT2iyl4Ze2XbeDClCswAWX+IXwfu27xy4Jwo00drYZfq+9PftoDNRXA0V054KMcXkthNMcdcuYKGlSKRrQMiM20z9zBsmpQtus3QIZbWSZEtM=
+on:
+  tags: true
diff --git a/docs/conf.py b/docs/conf.py
@@ -18,8 +18,13 @@
 
 import os
 import sys
+
+from setup import get_version
+
 sys.path.insert(0, os.path.abspath('../'))
 
+_version = get_version()
+
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -59,9 +64,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'0.1.0'
+version = _version
 # The full version, including alpha/beta/rc tags.
-release = u'0.1.0'
+release = _version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/flask_bitmapist/__init__.py b/flask_bitmapist/__init__.py
@@ -22,7 +22,7 @@
                        BitOpAnd, BitOpOr, get_event_names)
 
 
-__version__ = '0.1.0'
+__version__ = '0.1.2'
 __versionfull__ = __version__
 
 __all__ = ['FlaskBitmapist', 'mark', 'mark_event', 'unmark_event',

diff --git a/flask_bitmapist/views.py b/flask_bitmapist/views.py
@@ -42,7 +42,6 @@ def index():
     week_events = len(list(get_event_data('user:logged_in', 'weeks', now)))
     month_events = len(list(get_event_data('user:logged_in', 'months', now)))
     year_events = len(list(get_event_data('user:logged_in', 'years', now)))
-    # return render_template('bitmapist/data.html', ...
     return render_template('bitmapist/index.html', events=get_event_names(),
                            day_events=day_events, week_events=week_events,
                            month_events=month_events, year_events=year_events)

diff --git a/scripts/release.py b/scripts/release.py
@@ -186,4 +186,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()
diff --git a/setup.py b/setup.py
@@ -8,6 +8,8 @@
     :license: MIT, see LICENSE for more details.
 """
 
+import ast
+import re
 import sys
 
 from setuptools import setup, find_packages
@@ -20,6 +22,16 @@ def get_requirements(suffix=''):
     return rv
 
 
+def get_version():
+    _version_re = re.compile(r'__version__\s+=\s+(.*)')
+
+    with open('flask_bitmapist/__init__.py', 'rb') as f:
+        version = str(ast.literal_eval(_version_re.search(
+            f.read().decode('utf-8')).group(1)))
+
+    return version
+
+
 class PyTest(TestCommand):
 
     def finalize_options(self):
@@ -39,12 +51,14 @@ def run_tests(self):
         errno = pytest.main(self.test_args)
         sys.exit(errno)
 
+_version = get_version()
+
 
 setup(
     name='Flask-Bitmapist',
-    version='0.1.1',
+    version=_version,
     url='http://github.com/cuttlesoft/flask-bitmapist',
-    download_url='https://github.com/cuttlesoft/flask-bitmapist/tarball/0.1.1',
+    download_url='https://github.com/cuttlesoft/flask-bitmapist/tarball/' + _version,
     license='MIT',
     author='Cuttlesoft, LLC',
     author_email='engineering@cuttlesoft.com',