Merge pull request #6 from nephila/feature/cleanups

Cleanups

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 # This file is generated by GitLab CI
 ci:
   script:
-    - COMMAND="coverage run" tox -epep8,isort,py26-django16-cms30,py27-django16-cms31,py27-django18-cms31,py34-django18-cms31
+    - COMMAND="coverage run" detox
     - if [[ $? -eq 0 ]]; then coverage report; fi

.travis.yml

@@ -5,6 +5,7 @@ language: python
 sudo: false
 
 python:
+  - 3.5
   - 3.4
   - 3.3
   - 2.7
@@ -18,6 +19,10 @@ env:
   - DJANGO='django17' CMS='cms30'
   - DJANGO='django17' CMS='cms31'
   - DJANGO='django17' CMS='cms32'
+  - DJANGO='django18' CMS='cms30'
+  - DJANGO='django18' CMS='cms31'
+  - DJANGO='django18' CMS='cms32'
+  - DJANGO='django19' CMS='cms32'
   - TOXENV='pep8'
   - TOXENV='isort'
 
@@ -28,6 +33,7 @@ install:
   - "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"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOXENV=$PYVER-$DJANGO-$CMS; fi"
 
 # command to run tests, e.g. python setup.py test
@@ -49,29 +55,57 @@ matrix:
     env: TOXENV='pep8'
   - python: 3.3
     env: TOXENV='isort'
+  - python: 3.4
+    env: TOXENV='pep8'
+  - python: 3.4
+    env: TOXENV='isort'
   - python: 2.6
     env: DJANGO='django17' CMS='cms30'
   - python: 2.6
     env: DJANGO='django17' CMS='cms31'
   - python: 2.6
     env: DJANGO='django17' CMS='cms32'
+  - python: 2.6
+    env: DJANGO='django18' CMS='cms30'
   - python: 2.6
     env: DJANGO='django18' CMS='cms31'
   - python: 2.6
     env: DJANGO='django18' CMS='cms32'
-
-  allow_failures:
   - python: 2.6
-    env: DJANGO='django16' CMS='cms32'
+    env: DJANGO='django19' CMS='cms30'
+  - python: 2.6
+    env: DJANGO='django19' CMS='cms31'
+  - python: 2.6
+    env: DJANGO='django19' CMS='cms32'
   - python: 2.7
-    env: DJANGO='django16' CMS='cms32'
+    env: DJANGO='django18' CMS='cms30'
   - python: 2.7
-    env: DJANGO='django17' CMS='cms32'
+    env: DJANGO='django19' CMS='cms30'
   - python: 3.3
-    env: DJANGO='django16' CMS='cms32'
+    env: DJANGO='django18' CMS='cms30'
   - python: 3.3
-    env: DJANGO='django17' CMS='cms32'
+    env: DJANGO='django19' CMS='cms30'
+  - python: 3.3
+    env: DJANGO='django19' CMS='cms31'
+  - python: 3.3
+    env: DJANGO='django19' CMS='cms32'
   - python: 3.4
-    env: DJANGO='django16' CMS='cms32'
+    env: DJANGO='django18' CMS='cms30'
   - python: 3.4
-    env: DJANGO='django17' CMS='cms32'
+    env: DJANGO='django19' CMS='cms30'
+  - python: 3.5
+    env: DJANGO='django16' CMS='cms30'
+  - python: 3.5
+    env: DJANGO='django16' CMS='cms31'
+  - python: 3.5
+    env: DJANGO='django16' CMS='cms32'
+  - python: 3.5
+    env: DJANGO='django17' CMS='cms30'
+  - python: 3.5
+    env: DJANGO='django17' CMS='cms31'
+  - python: 3.5
+    env: DJANGO='django17' CMS='cms32'
+  - python: 3.5
+    env: DJANGO='django18' CMS='cms30'
+  - python: 3.5
+    env: DJANGO='django19' CMS='cms30'

HISTORY.rst

@@ -3,13 +3,18 @@
 History
 -------
 
+0.5.0 (unreleased)
+++++++++++++++++++
+
+* Add support for Django 1.9
+* Add support for django CMS 3.2
+
 0.4.0 (2015-08-15)
 ++++++++++++++++++
 
 * Drop support for Django 1.4, 1.5
 * Add support for Django 1.8
 
-
 0.3.1 (2014-09-16)
 ++++++++++++++++++
 

cms_helper.py

@@ -2,7 +2,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-gettext = lambda s: s
+
+def gettext(s): return s  # NOQA
+
 
 HELPER_SETTINGS = dict(
     NOSE_ARGS=[

djangocms_highlightjs/templates/djangocms_highlightjs/code.html

@@ -1,4 +1,4 @@
-{% load static sekizai_tags %}
+{% load staticfiles sekizai_tags %}
 {% addtoblock "css" %}
 <link rel="stylesheet" href="{% static theme %}">
 {% endaddtoblock %}

setup.cfg

@@ -1,6 +1,5 @@
 [flake8]
-exclude = .git,*.egg-info,build,dist,.tox,djangocms_highlightjs/migrations/*,djangocms_highlightjs/south_migrations/*,docs
-ignore = E501
+exclude = *.egg-info,.git,.settings,.tox,build,dist,docs,requirements,tmp,*migrations*,*south_migrations*,tests,data
 max-line-length = 99
 
 [metadata]
@@ -11,4 +10,10 @@ universal = 1
 
 [isort]
 line_length = 99
-skip = migrations, south_migrations
+skip = migrations, south_migrations, data
+combine_as_imports = true
+default_section = THIRDPARTY
+include_trailing_comma = true
+known_first_party = djangocms_page_meta
+multi_line_output = 5
+not_skip = __init__.py

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import, print_function, unicode_literals
 
 import djangocms_highlightjs
 
@@ -24,7 +24,7 @@
     author_email='i.spalletti@nephila.it',
     url='https://github.com/nephila/djangocms-highlightjs',
     packages=[
-        'djangocms_highlightjs',
+        str('djangocms_highlightjs'),
     ],
     include_package_data=True,
     install_requires=[

tox.ini

@@ -1,15 +1,19 @@
 [tox]
-envlist = py{26}-django16-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31,32},py{27,33,34}-django{18}-cms{31,32},pep8,isort
+envlist = pep8,isort,py{27,33,34,35}-django{19}-cms{32},py{27,33,34,35}-django{18}-cms{31,32},py{27,33,34}-django{16,17}-cms{30,31,32},py{26}-django16-cms{30,31}
 
 [testenv]
 commands = {env:COMMAND:python} setup.py test
 deps =
     django16: Django>=1.6,<1.7
+    django16: django-treebeard==3.0
+    django16: https://github.com/divio/django-formtools/archive/master.zip
     django17: Django>=1.7,<1.8
     django18: Django>=1.7,<1.9
+    django19: Django>=1.8,<1.10
     cms30: https://github.com/divio/django-cms/archive/support/3.0.x.zip
     cms31: https://github.com/divio/django-cms/archive/support/3.1.x.zip
-    cms32: https://github.com/divio/django-cms/archive/develop.zip
+    cms32: https://github.com/divio/django-cms/archive/release/3.2.x.zip
+    cms33: https://github.com/divio/django-cms/archive/develop.zip
     py26: unittest2
     -r{toxinidir}/requirements-test.txt