diff --git a/.travis.yml b/.travis.yml index 653a94a..f0eb020 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,19 @@ language: python python: - "2.6" - "2.7" + - "3.2" + - "3.3" env: - - DJANGO_VERSION=1.3 - - DJANGO_VERSION=1.4.10 - - DJANGO_VERSION=1.5.5 - - DJANGO_VERSION=1.6.1 + - DJANGO=1.4.10 + - DJANGO=1.5.5 + - DJANGO=1.6.1 install: - - pip install -q Django==$DJANGO_VERSION --use-mirrors + - pip install -q Django==$DJANGO --use-mirrors - pip install -q -r requirements.txt --use-mirrors +matrix: + exclude: + - python: "3.2" + env: DJANGO=1.4.10 + - python: "3.3" + env: DJANGO=1.4.10 script: python manage.py test diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e20c82..99189a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 1.0.1 + +Enhancement: + + - Support Django 1.6.1 + - Support for Python 3.x + +Misc: + - Dropped support for Django<1.4.10 + ## 1.0.0 Enhancement: diff --git a/requirements.txt b/requirements.txt index eb0a3a6..a6adb81 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -Django>=1.5.1 +Django==1.4.10 python-slugify>=0.0.4 - diff --git a/setup.py b/setup.py index bef3d45..e817894 100755 --- a/setup.py +++ b/setup.py @@ -61,9 +61,9 @@ def get_package_data(package): if sys.argv[-1] == 'publish': os.system("python setup.py sdist upload") args = {'version': get_version(package)} - print "You probably want to also tag the version now:" - print " git tag -a %(version)s -m 'version %(version)s'" % args - print " git push --tags" + print("You probably want to also tag the version now:") + print(" git tag -a %(version)s -m 'version %(version)s'" % args) + print(" git push --tags") sys.exit() diff --git a/uuslug/__init__.py b/uuslug/__init__.py index d8ccc24..3a1613a 100644 --- a/uuslug/__init__.py +++ b/uuslug/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = '1.0.0' +__version__ = '1.0.1' from django.utils.encoding import smart_unicode from slugify import slugify as pyslugify @@ -9,7 +9,7 @@ __all__ = ['slugify', 'uuslug'] def slugify(text, entities=True, decimal=True, hexadecimal=True, max_length=0, word_boundary=False, separator='-'): """ Make a slug from a given text """ - + return smart_unicode(pyslugify(text, entities, decimal, hexadecimal, max_length, word_boundary, separator))