Merge remote-tracking branch 'origin/release-candidate' into release

mitodl · Oct 25, 2017 · 33150f3 · 33150f3
2 parents bb044cc + dce0be8
commit 33150f3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 
 python:
  - 2.7
+ - 3.4
  - 3.5
  - 3.6
 install:

diff --git a/RELEASE.rst b/RELEASE.rst
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+Version 0.5.1
+-------------
+
+- Add setup.cfg to allow universal wheel building (py2 + py3)
+- Changed the version variable in __init__
+
 Version 0.5.0
 -------------
 

diff --git a/pylti/__init__.py b/pylti/__init__.py
@@ -3,4 +3,4 @@
 PyLTI is module that implements IMS LTI in python
 The API uses decorators to wrap function with LTI functionality.
 """
-VERSION = "0.4.1" # pragma: no cover
+__version__ = '0.5.1' # pragma: no cover
diff --git a/pylti/tests/test_common.py b/pylti/tests/test_common.py
@@ -56,7 +56,7 @@ def test_version():
  """
  Will raise ValueError if not a semantic version
  """
- semantic_version.Version(pylti.VERSION)
+ semantic_version.Version(pylti.__version__)
 
  def test_lti_oauth_server(self):
  """

diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
@@ -116,7 +116,7 @@ def find_packages(where='.', exclude=()):
 
  extra = dict()
 
-VERSION = __import__('pylti').VERSION
+VERSION = __import__('pylti').__version__
 
 README = open('README.rst').read()