Merge pull request #124 from nephila/feature/config_update

Config update

.travis.yml

@@ -1,46 +1,46 @@
-# Config file for automatic testing at travis-ci.org
+  # Config file for automatic testing at travis-ci.org
 
-language: python
+  language: python
 
-python:
+  python:
-  - 3.3
+    - 3.3
-  - 3.4
+    - 3.4
-  - 2.7
+    - 2.7
-  - 2.6
+    - 2.6
+
+  env:
+    matrix:
+    - DJANGO='django16'
+    - DJANGO='django17'
+
+  # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+  install:
+    - pip install -U tox>=1.8 coveralls
+    - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
+    - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
+    - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
+    - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
+
+  # command to run tests, e.g. python setup.py test
+  script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO"
+
+  after_success: coveralls
 
-env:
   matrix:
-  - DJANGO='django16'
+    exclude:
-  - DJANGO='django17'
+      - python: 2.6
+        env: DJANGO='django17'
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+    allow_failures:
-install:
+      - python: 3.3
-  - pip install -U tox>=1.8 coveralls
+        env: DJANGO='django15'
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then export PYVER=py26; fi"
+      - python: 3.3
-  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
+        env: DJANGO='django16'
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
+      - python: 3.3
-  - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
+        env: DJANGO='django17'
-
+      - python: 3.4
-# command to run tests, e.g. python setup.py test
+        env: DJANGO='django15'
-script: COMMAND='coverage run' tox -e"$PYVER-$DJANGO"
+      - python: 3.4
-
+        env: DJANGO='django16'
-after_success: coveralls
+      - python: 3.4
-
+        env: DJANGO='django17'
-matrix:
-  exclude:
-    - python: 2.6
-      env: DJANGO='django17'
-
-  allow_failures:
-    - python: 3.3
-      env: DJANGO='django15'
-    - python: 3.3
-      env: DJANGO='django16'
-    - python: 3.3
-      env: DJANGO='django17'
-    - python: 3.4
-      env: DJANGO='django15'
-    - python: 3.4
-      env: DJANGO='django16'
-    - python: 3.4
-      env: DJANGO='django17'

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+0.5.0 (XXXX-XX-XX)
+++++++++++++++++++
+
+* Drop dependency on Django select2
+* Code cleanups
+
 0.4.0 (2015-03-22)
 ++++++++++++++++++
 

cms_helper.py

@@ -20,7 +20,6 @@ HELPER_SETTINGS = {
         'easy_thumbnails',
         'djangocms_text_ckeditor',
         'cmsplugin_filer_image',
-        'django_select2',
         'taggit_autosuggest',
     ],
     'LANGUAGE_CODE': 'en',

djangocms_blog/forms.py

@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 from django import forms
 from django.conf import settings
-import django_select2
 from parler.forms import TranslatableModelForm
+from taggit_autosuggest.widgets import TagAutoSuggest
 
 from .models import Post
 
 
 class LatestEntriesForm(forms.ModelForm):
 
-    class Meta:
+    def __init__(self, *args, **kwargs):
-        widgets = {
+        super(LatestEntriesForm, self).__init__(*args, **kwargs)
-            'tags': django_select2.Select2MultipleWidget
+        self.fields['tags'].widget = TagAutoSuggest('taggit.Tag')
-        }
 
     class Media:
         css = {

requirements-test.txt

@@ -6,4 +6,4 @@ nose>=1.3.0
 django-nose>=1.2
 flake8
 djangocms-helper>=0.7
-tox>=1.8
+tox>=2.0

setup.py

@@ -49,7 +49,6 @@ setup(
         'cmsplugin-filer',
         'django-meta>=0.2',
         'django-meta-mixin>=0.1.1',
-        'django-select2>4.3',
     ],
     license="BSD",
     zip_safe=False,
@@ -61,6 +60,9 @@ setup(
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
+        'Framework :: Django',
+        'Framework :: Django :: 1.6',
+        'Framework :: Django :: 1.7',
         "Programming Language :: Python :: 2",
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',

tox.ini

@@ -1,17 +1,15 @@
 [tox]
-envlist = py{26}-django{16}-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31}
+envlist = py{26}-django{16}-cms{30,31},py{27,33,34}-django{16,17,18}-cms{30,31}
 
 [testenv]
 deps =
     html5lib < 0.9999
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
+    django18: Django>=1.7,<1.9
     cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip
-    cms31: https://github.com/divio/django-cms/archive/develop.zip
+    cms31: https://github.com/divio/django-cms/archive/support/3.1.x.zip
+    cms32: https://github.com/divio/django-cms/archive/develop.zip
     py26: unittest2
-    py26: django-select2
-    py27: django-select2
-    py33: django-select2-py3
-    py34: django-select2-py3
     -r{toxinidir}/requirements-test.txt
 commands = {env:COMMAND:python} setup.py test