Prepare for version 0.5 with support to Django 1.8

angvp · Jul 6, 2015 · 0336e10 · 0336e10
1 parent 62a88e2
commit 0336e10
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ env:
   - DJANGO=1.5
   - DJANGO=1.6.4
   - DJANGO=1.7.1
+  - DJANGO=1.8.2
 install:
   - pip install -q Django==$DJANGO
   - pip install -r requirements-test.txt

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -13,7 +13,7 @@ Types of Contributions
 Report Bugs
 ~~~~~~~~~~~
 
-Report bugs at https://github.com/RouteAtlas/django-klingon/issues.
+Report bugs at https://github.com/angvp/django-klingon/issues.
 
 If you are reporting a bug, please include:
 
@@ -43,7 +43,7 @@ articles, and such.
 Submit Feedback
 ~~~~~~~~~~~~~~~
 
-The best way to send feedback is to file an issue at https://github.com/RouteAtlas/django-klingon/issues.
+The best way to send feedback is to file an issue at https://github.com/angvp/django-klingon/issues.
 
 If you are proposing a feature:
 
@@ -100,8 +100,8 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, and 3.3, and for PyPy. Check 
-   https://travis-ci.org/RouteAtlas/django-klingon/pull_requests
+3. The pull request should work for Python 2.7, and 3.4, and for PyPy. Check 
+   https://travis-ci.org/angvp/django-klingon/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
 Tips

diff --git a/README.rst b/README.rst
@@ -151,7 +151,7 @@ or::
     python runtests.py
 
 
-.. image:: https://d2weczhvl823v0.cloudfront.net/RouteAtlas/django-klingon/trend.png
+.. image:: https://d2weczhvl823v0.cloudfront.net/angvp/django-klingon/trend.png
    :alt: Bitdeli badge
    :target: https://bitdeli.com/free
 
diff --git a/docs/conf.py b/docs/conf.py
@@ -47,7 +47,7 @@
 
 # General information about the project.
 project = u'django-klingon'
-copyright = u'2015, RouteAtlas'
+copyright = u'2015, Ángel Velásquez'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

diff --git a/klingon/__init__.py b/klingon/__init__.py
@@ -3,4 +3,4 @@
 no integrations pain in your app!
 """
 
-__version__ = '0.0.4'
+__version__ = '0.0.5'
diff --git a/klingon/admin.py b/klingon/admin.py
@@ -29,6 +29,7 @@ class TranslationInlineForm(ModelForm):
 
     class Meta:
         model = Translation
+        exclude = []
 
     def __init__(self, *args, **kwargs):
        res = super(TranslationInlineForm, self).__init__(*args, **kwargs)

diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@ def read_file(filename):
     author_email='[email protected]',
     packages=find_packages(),
     include_package_data=True,
-    url='http://github.com/RouteAtlas/django-klingon',
+    url='http://github.com/angvp/django-klingon',
     license='GPL',
     description="""django-klingon is an attempt to make django model translation
     suck but with no integrations pain in your app!""",

diff --git a/tox.ini b/tox.ini
@@ -1,36 +1,48 @@
 [tox]
 downloadcache = {toxworkdir}/_download/
-envlist = py34-1.7.X,py27-1.7.X,py27-1.6.X,py27-1.5.X,py27-1.4.X
+envlist = py34-1.8.X,py27-1.8.X,py34-1.7.X,py27-1.7.X,py27-1.6.X,py27-1.5.X,py27-1.4.X
 
 [testenv]
 commands = {envpython} runtests.py
 
+[testenv:py34-1.8.X]
+basepython = python3.4
+deps = 
+    -r{toxinidir}/requirements-test.txt
+    django==1.8
+
+[testenv:py27-1.8.X]
+basepython = python2.7
+deps = 
+    -r{toxinidir}/requirements-test.txt
+    django==1.8
+
 [testenv:py34-1.7.X]
 basepython = python3.4
 deps = 
-    django17: https://www.djangoproject.com/download/1.7.1/tarball/
     -r{toxinidir}/requirements-test.txt
+    django==1.7
 
 [testenv:py27-1.7.X]
 basepython = python2.7
 deps = 
-    django17: https://www.djangoproject.com/download/1.7.1/tarball/
     -r{toxinidir}/requirements-test.txt
+    django==1.7
 
 [testenv:py27-1.6.X]
 basepython = python2.7
 deps = 
-    django16: django>=1.6,<1.7
     -r{toxinidir}/requirements-test.txt
+    django==1.6
 
 [testenv:py27-1.5.X]
 basepython = python2.7
 deps = 
-    django15: django>=1.5,<1.6
     -r{toxinidir}/requirements-test.txt
+    django==1.5
 
 [testenv:py27-1.4.X]
 basepython = python2.7
 deps = 
-    django14: django>=1.4,<1.5
     -r{toxinidir}/requirements-test.txt
+    django==1.4