Merge pull request #5 from EnTeQuAk/master

Post 0.3.3 release

Author: graingert

.travis.yml

@@ -1,21 +1,22 @@
 language: python
-python: 2.7
+python:
+  - "2.6"
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "pypy"
 env:
-  - TOX_ENV=py33-master
-  - TOX_ENV=py33-1.7.x
-  - TOX_ENV=py33-1.6.x
-  - TOX_ENV=py33-1.5.x
-  - TOX_ENV=pypy-master
-  - TOX_ENV=pypy-1.7.x
-  - TOX_ENV=pypy-1.6.x
-  - TOX_ENV=pypy-1.5.x
-  - TOX_ENV=py27-master
-  - TOX_ENV=py27-1.7.x
-  - TOX_ENV=py27-1.6.x
-  - TOX_ENV=py27-1.5.x
-  - TOX_ENV=py26-1.5.x
+  - DJANGO_VERSION=master
+  - DJANGO_VERSION=1.7.x
+  - DJANGO_VERSION=1.6.x
+  - DJANGO_VERSION=1.5.x
 install:
   - pip install tox
 script:
-  - tox -e $TOX_ENV
-
+  - tox -e "$TRAVIS_PYTHON_VERSION-$DJANGO_VERSION"
+matrix:
+  exclude:
+   - python: "2.6"
+     env: DJANGO_VERSION=master
+   - python: "2.6"
+     env: DJANGO_VERSION=1.7.x

CHANGELOG.rst

@@ -6,9 +6,20 @@ Changelog
 
 .. note:: This version is not yet released and is under active development.
 
+
+0.3.3 - 2014-04-22
+------------------
+
+* Fixed release builds
+
+
+0.3.2 - 2014-04-22
+------------------
+
 * Initial testing infrastructure
 * Add management command `babel` with `makemessages` and `compilemessages`
   labels. Mimics django's `makemessages` and `compilemessages` commands.
+* Various unicode fixes
 
 
 0.3.1 - 2013-12-11

MANIFEST.in

@@ -2,5 +2,5 @@ include CHANGELOG.rst README.rst COPYING
 recursive-include tests *
 recursive-include docs *
 global-exclude *.pyc
-global-exclode *.pyo
+global-exclude *.pyo
 prune docs/_build

docs/conf.py

@@ -47,16 +47,16 @@
 
 # General information about the project.
 project = 'django-babel'
-copyright = '2014, Christopher Lenz'
+copyright = '2014, Christopher Grebs'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '0.4-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -200,7 +200,7 @@
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'django-babel.tex', 'django-babel Documentation',
-   'Christopher Lenz', 'manual'),
+   'Christopher Grebs', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -230,7 +230,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'django-babel', 'django-babel Documentation',
-     ['Christopher Lenz'], 1)
+     ['Christopher Grebs'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -244,7 +244,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'django-babel', 'django-babel Documentation',
-   'Christopher Lenz', 'django-babel', 'One line description of project.',
+   'Christopher Grebs', 'django-babel', 'One line description of project.',
    'Miscellaneous'),
 ]
 

setup.py

@@ -54,7 +54,7 @@ def run_tests(self):
     name='django-babel',
     description='Utilities for using Babel in Django',
     long_description=read('README.rst') + u'\n\n' + read('CHANGELOG.rst'),
-    version='0.3.2',
+    version='0.4-dev',
     license='BSD',
     author='Christopher Grebs',
     author_email='[email protected]',

tasks.py

@@ -10,6 +10,4 @@ def release(version):
     invoke.run('python setup.py sdist')
     invoke.run('python setup.py bdist_wheel')
 
-    invoke.run(
-        'twine upload -s dist/django_babel-{0]* '.format(version)
-    )
+    invoke.run('twine upload -s dist/django*babel{0}* '.format(version))

tox.ini

@@ -14,46 +14,62 @@ deps17 =
 master =
         https://github.com/django/django/archive/stable/1.7.x.zip#egg=django
 
-[testenv:py26-1.5.x]
+[testenv:2.6-1.5.x]
 basepython = python2.6
 deps = {[testenv]deps15}
 
-[testenv:py26-1.6.x]
+[testenv:2.6-1.6.x]
 basepython = python2.6
 deps = {[testenv]deps16}
 
-[testenv:py27-1.5.x]
+[testenv:2.7-1.5.x]
 basepython = python2.7
 deps = {[testenv]deps15}
 
-[testenv:py27-1.6.x]
+[testenv:2.7-1.6.x]
 basepython = python2.7
 deps = {[testenv]deps16}
 
-[testenv:py27-1.7.x]
+[testenv:2.7-1.7.x]
 basepython = python2.7
 deps = {[testenv]deps17}
 
-[testenv:py27-master]
+[testenv:2.7-master]
 basepython = python2.7
 deps = {[testenv]master}
 
-[testenv:py33-1.5.x]
+[testenv:3.3-1.5.x]
 basepython = python3.3
 deps = {[testenv]deps15}
 
-[testenv:py33-1.6.x]
+[testenv:3.3-1.6.x]
 basepython = python3.3
 deps = {[testenv]deps16}
 
-[testenv:py33-1.7.x]
+[testenv:3.3-1.7.x]
 basepython = python3.3
 deps = {[testenv]deps17}
 
-[testenv:py33-master]
+[testenv:3.3-master]
 basepython = python3.3
 deps = {[testenv]master}
 
+[testenv:3.4-1.5.x]
+basepython = python3.4
+deps = {[testenv]deps15}
+
+[testenv:3.4-1.6.x]
+basepython = python3.4
+deps = {[testenv]deps16}
+
+[testenv:3.4-1.7.x]
+basepython = python3.4
+deps = {[testenv]deps17}
+
+[testenv:3.4-master]
+basepython = python3.4
+deps = {[testenv]master}
+
 [testenv:pypy-1.5.x]
 basepython = pypy
 deps = {[testenv]deps17}