Merge 04f0aee into 6359495

.gitignore

@@ -213,3 +213,6 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+#PyCharm
+.idea/

.travis.yml

@@ -2,15 +2,17 @@ language: python
 python:
 - '2.7'
 - '3.3'
+- '3.4'
 install:
 - pip install -e .
-- pip install coverage coveralls
+- pip install coverage coveralls wheel
 script:
 - coverage run setup.py test
 - coveralls
 - coverage report --fail-under=100
 deploy:
   provider: pypi
+  distributions: "sdist bdist_wheel"
   on:
     python: 2.7
     tags: true

CHANGES.rst

@@ -3,6 +3,11 @@
 Changes
 =======
 
+v1.1.0, 2014-08-02
+------------------
+
+Upgrade to PyEmbed v1.1.0.
+
 v1.0.0, 2014-02-05
 ------------------
 

README.rst

@@ -1,5 +1,5 @@
 PyEmbed-Jinja2
-===============
+==============
 
 .. image:: https://secure.travis-ci.org/pyembed/pyembed-jinja2.png?branch=master
     :target: http://travis-ci.org/pyembed/pyembed-jinja2
@@ -42,7 +42,7 @@ For more information, see the `PyEmbed`_ website.
 Compatibility
 -------------
 
-PyEmbed-Jinja2 has been tested with Python 2.7 and 3.3.
+PyEmbed-Jinja2 has been tested with Python 2.7, 3.3 and 3.4.
 
 Installation
 ------------

pyembed/jinja2/__init__.py

@@ -50,7 +50,8 @@ def render(self, content_url, response):
 
         return template.render(params)
 
-    def __create_loader(self, template_dir):
+    @staticmethod
+    def __create_loader(template_dir):
         return ChoiceLoader([
             FileSystemLoader(template_dir),
             PackageLoader('pyembed.jinja2')

pyembed/jinja2/test/integration_test.py

@@ -28,7 +28,7 @@
 
 def test_should_embed_with_jinja2_template():
     renderer = Jinja2Renderer('pyembed/jinja2/test/fixtures')
-    embedding = PyEmbed(renderer).embed(
+    embedding = PyEmbed(renderer=renderer).embed(
         'http://www.youtube.com/watch?v=qrO4YZeyl0I')
     assert_that(embedding, equal_to(
         'Lady Gaga - Bad Romance by LadyGagaVEVO from ' +

pyembed/jinja2/test/jinja2_test.py

@@ -20,12 +20,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from pyembed.jinja2 import Jinja2Renderer
 from pyembed.core import response
-
 from hamcrest import assert_that, equal_to
-from mock import Mock
-import pytest
+
+from pyembed.jinja2 import Jinja2Renderer
 
 
 def test_default_embed_photo():

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1

setup.py

@@ -40,7 +40,7 @@ def run_tests(self):
 
 setup(
     name='pyembed-jinja2',
-    version='1.0.0',
+    version='1.1.0',
     author='Matt Thomson',
     author_email='mattjohnthomson@gmail.com',
     url='http://pyembed.github.io',
@@ -82,6 +82,7 @@ def run_tests(self):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Text Processing'
     ]
 )