Merge branch 'release/v1.0.1'

Fantomas42 · Feb 13, 2014 · ad5b6e8 · ad5b6e8
2 parents f619b75 + f206901
commit ad5b6e8
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,23 @@
 language: python
 python:
-    - "2.6"
-    - "2.7"
-    - "3.2"
-    - "3.3"
+    - 2.6
+    - 2.7
+    - 3.2
+    - 3.3
+env:
+    - DJANGO=1.4
+    - DJANGO=1.5
+    - DJANGO=1.6
+matrix:
+    exclude:
+        - python: 3.2
+          env: DJANGO=1.4
+        - python: 3.3
+          env: DJANGO=1.4
 install:
     - pip install -U setuptools
     - python bootstrap.py
-    - ./bin/buildout
+    - ./bin/buildout versions:django=$DJANGO
 before_script:
     - ./bin/flake8 emoticons
 script:

diff --git a/buildout.cfg b/buildout.cfg
@@ -20,7 +20,6 @@ eggs                    = ${buildout:eggs}
 [test]
 recipe                  = pbp.recipe.noserunner
 eggs                    = nose
-                          pdbpp
                           nose-sfd
                           nose-progressive
                           ${buildout:eggs}

diff --git a/emoticons/__init__.py b/emoticons/__init__.py
@@ -1,5 +1,5 @@
 """django-emoticons"""
-__version__ = '1.0'
+__version__ = '1.0.1'
 __license__ = 'BSD License'
 
 __author__ = 'Fantomas42'

diff --git a/emoticons/settings.py b/emoticons/settings.py
@@ -22,12 +22,11 @@
     ((';(', ';-(', ';=(', '(cry)'), 'crying.gif'),
     ((':*', ':-*', ':=*', '(kiss)'), 'kiss.gif'),
     ((':|', ':-|', ':=|', '(speechless)'), 'speechless.gif'),
-    ((':&', ':-&', ':=&', '(puke)'), 'puke.gif'),
     ((':-?', ':?', ':=?', '(think)'), 'thinking.gif'),
     (('|(', '|-(', '|=(', '(dull)'), 'dull.gif'),
     (('|-)', 'I-)', 'I=)', '(snooze)'), 'sleepy.gif'),
-    (('])', '>)', ']=)', '>=)', '(grin)'), 'evilgrin.gif'),
-    ((':$', ':-$', ':=$', ':">', '(blush)'), 'blush.gif'),
+    (('])', ']=)', '(grin)'), 'evilgrin.gif'),
+    ((':$', ':-$', ':=$', '(blush)'), 'blush.gif'),
     ((':D', ':-D', ':=D', ':d', ':-d', ':=d', '(laugh)'), 'bigsmile.gif'),
     ((':O', ':-O', ':=O', ':o', ':-o', ':=o', '(surprised)'), 'surprised.gif'),
     (('8)', '8-)', '8=)', 'B)', 'B-)', 'B=)', '(cool)'), 'cool.gif'),
@@ -48,6 +47,7 @@
     ('(envy)', 'envy.gif'),
     ('(wait)', 'wait.gif'),
     ('(yawn)', 'yawn.gif'),
+    ('(puke)', 'puke.gif'),
     ('(sweat)', 'sweating.gif'),
     ('(doh)', 'doh.gif'),
     ('(talk)', 'talking.gif'),

diff --git a/setup.py b/setup.py
@@ -22,6 +22,7 @@
     license=emoticons.__license__,
 
     zip_safe=False,
+    include_package_data=True,
     packages=find_packages(exclude=['emoticons.demo']),
     classifiers=[
         'Framework :: Django',

diff --git a/versions.cfg b/versions.cfg
@@ -1,9 +1,9 @@
 [versions]
-django                          = 1.5.5
-djangorecipe                    = 1.6
+django                          = 1.6.2
+djangorecipe                    = 1.7
 blessings                       = 1.5.1
-buildout-versions-checker       = 1.1
-flake8                          = 2.0
+buildout-versions-checker       = 1.3.1
+flake8                          = 2.1.0
 mccabe                          = 0.2.1
 nose-progressive                = 1.5
 nose-sfd                        = 0.1
@@ -12,17 +12,12 @@ pep8                            = 1.4.6
 pyflakes                        = 0.7.3
 zc.buildout                     = 2.2.1
 zc.recipe.egg                   = 2.0.1
-futures                         = 2.1.4
+futures                         = 2.1.6
 nose                            = 1.3.0
-six                             = 1.4.1
-Pygments                        = 1.6
-fancycompleter                  = 0.4
-pdbpp                           = 0.7.2
-pyrepl                          = 0.8.4
-python-coveralls                = 2.4.0
+six                             = 1.5.2
+python-coveralls                = 2.4.2
 PyYAML                          = 3.10
 argparse                        = 1.2.1
-coverage                        = 3.7
-requests                        = 2.0.1
+coverage                        = 3.7.1
+requests                        = 2.2.1
 sh                              = 1.09
-wmctrl                          = 0.1