Merge branch 'feature/continuous-integration' into develop

Author: Fantomas42

.travis.yml

@@ -0,0 +1,39 @@
+language: python
+python:
+    - 2.6
+    - 2.7
+    - 3.2
+    - 3.3
+    - 3.4
+env:
+    - DJANGO=1.4
+    - DJANGO=1.5
+    - DJANGO=1.6
+    - DJANGO=1.7
+    - DJANGO=1.8
+matrix:
+    exclude:
+        - python: 2.6
+          env: DJANGO=1.8
+        - python: 2.6
+          env: DJANGO=1.7
+        - python: 3.2
+          env: DJANGO=1.4
+        - python: 3.3
+          env: DJANGO=1.4
+        - python: 3.4
+          env: DJANGO=1.4
+    fast_finish: true
+install:
+    - pip install -U setuptools
+    - python bootstrap.py
+    - ./bin/buildout versions:django=$DJANGO
+before_script:
+    - ./bin/flake8 tagging
+script:
+    - ./bin/test-and-cover
+after_success:
+    - ./bin/coveralls
+notifications:
+    irc:
+        - "irc.freenode.org#django-tagging"

LICENSE.txt

@@ -1,7 +1,7 @@
 Django Tagging
 --------------
 
-Copyright (c) 2007, Jonathan Buchanan
+Copyright (c) 2007-2015, Jonathan Buchanan, Julien Fache
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

MANIFEST

@@ -3,7 +3,7 @@ CHANGELOG.txt
 INSTALL.txt
 LICENSE.txt
 MANIFEST.in
-README.txt
+README.rst
 setup.py
 docs/overview.txt
 tagging/__init__.py

MANIFEST.in

@@ -2,6 +2,6 @@ include CHANGELOG.txt
 include INSTALL.txt
 include LICENSE.txt
 include MANIFEST.in
-include README.txt
+include README.rst
 recursive-include docs *.txt
 recursive-include tagging/tests *.txt

README.rst

@@ -0,0 +1,19 @@
+==============
+Django Tagging
+==============
+
+|travis-develop| |coverage-develop|
+
+This is a generic tagging application for Django projects
+
+For installation instructions, see the file "INSTALL.txt" in this
+directory; for instructions on how to use this application, and on
+what it provides, see the file "overview.txt" in the "docs/"
+directory.
+
+.. |travis-develop| image:: https://travis-ci.org/Fantomas42/django-tagging.png?branch=develop
+   :alt: Build Status - develop branch
+   :target: http://travis-ci.org/Fantomas42/django-tagging
+.. |coverage-develop| image:: https://coveralls.io/repos/Fantomas42/django-tagging/badge.png?branch=develop
+   :alt: Coverage of the code
+   :target: https://coveralls.io/r/Fantomas42/django-tagging

README.txt

@@ -355,12 +355,12 @@ def test_update_tags_exotic_characters(self):
         self.assertEqual(tags[0].name, '你好')
 
     def test_unicode_tagged_object(self):
-        self.dead_parrot.state = u"dëad"
+        self.dead_parrot.state = "dëad"
         self.dead_parrot.save()
-        Tag.objects.update_tags(self.dead_parrot, u'föo')
+        Tag.objects.update_tags(self.dead_parrot, 'föo')
         items = TaggedItem.objects.all()
         self.assertEqual(len(items), 1)
-        self.assertEqual(six.text_type(items[0]), u"dëad [föo]")
+        self.assertEqual(six.text_type(items[0]), "dëad [föo]")
 
     def test_update_tags_with_none(self):
         # start off in a known, mildly interesting state