From 6df2442914088653108bd74ee82e132f1da0a9b3 Mon Sep 17 00:00:00 2001 From: Juda Kaleta Date: Thu, 22 Aug 2013 12:03:42 +0200 Subject: [PATCH] Ready for Python 3 --- .travis.yml | 1 + CHANGES.rst | 3 --- embed_video/tests/tests.py | 6 +++--- setup.py | 9 ++++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index e3a5a0c..a77fc2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: python python: - "2.7" + - "3.3" env: - DJANGO_VERSION=1.4.5 - DJANGO_VERSION=1.5.1 diff --git a/CHANGES.rst b/CHANGES.rst index d1a2af2..95d2a8c 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,3 @@ -Changes -******* - Release 0.3 (Aug. 20, 2013) ---------------------------- diff --git a/embed_video/tests/tests.py b/embed_video/tests/tests.py index 05d1112..feea829 100644 --- a/embed_video/tests/tests.py +++ b/embed_video/tests/tests.py @@ -2,6 +2,6 @@ import os os.environ['DJANGO_SETTINGS_MODULE'] = 'embed_video.tests.django_settings' -from tests_fields import EmbedVideoFieldTestCase, EmbedVideoFormFieldTestCase -from tests_backend import EmbedVideoTestCase -from tests_tags import EmbedVideoNodeTestCase +from .tests_fields import EmbedVideoFieldTestCase, EmbedVideoFormFieldTestCase +from .tests_backend import EmbedVideoTestCase +from .tests_tags import EmbedVideoNodeTestCase diff --git a/setup.py b/setup.py index b98f947..015896e 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,7 @@ from setuptools import setup, find_packages import os +import sys def read(fname): @@ -9,6 +10,11 @@ def read(fname): README = read('README.rst') CHANGES = read('CHANGES.rst') +extra_kwargs = {} + +if sys.version_info >= (3,): + extra_kwargs = {'use_2to3': True} + setup( name='django-embed-video', packages=find_packages(), @@ -26,5 +32,6 @@ setup( ], keywords=['youtube', 'vimeo', 'video'], test_suite='embed_video.tests.tests', - install_requires=['requests >= 1.2.3', ], + install_requires=['requests >= 1.2.3',], + **extra_kwargs )