Addon code alignments (#58)

* added cleaned up files

* added isort

* added missing import

Author: FinalAngel

.gitignore

@@ -1,8 +1,26 @@
-*.pyc
+*.py[cod]
+*$py.class
 *.egg-info
+*.log
+*.pot
 .DS_Store
+.coverage/
+.eggs/
 .idea/
+.project/
+.pydevproject/
+.settings/
 .tox/
-.eggs/
-dist/
+__pycache__/
 build/
+dist/
+env/
+
+/~
+/node_modules
+.sass-cache
+*.css.map
+npm-debug.log
+package-lock.json
+
+local.sqlite

.travis.yml

@@ -6,24 +6,28 @@ matrix:
   include:
     - python: 3.5
       env: TOX_ENV='flake8'
-    # Django 1.11
+    - python: 3.5
+      env: TOX_ENV='isort'
+      # Django 1.11
     - python: 2.7
       env: DJANGO='dj111' CMS='cms34'
-    - python: 3.5
+    - python: 3.4
       env: DJANGO='dj111' CMS='cms35'
     - python: 3.5
       env: DJANGO='dj111' CMS='cms36'
     # Django 2.0
     - python: 3.5
       env: DJANGO='dj20' CMS='cms36'
     # Django 2.1
-    - python: 3.5
+    - python: 3.6
       env: DJANGO='dj21' CMS='cms36'
 
 install:
-  - pip install tox coverage
+  - pip install coverage isort tox
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO-$CMS; fi"
 
 script:

CHANGELOG.rst

@@ -2,10 +2,13 @@
 Changelog
 =========
 
+
 2.1.1 (unreleased)
 ==================
 
-* Fixed test matrix
+* Extended test matrix
+* Added isort and adapted imports
+* Adapted code base to align with other supported addons
 * Exclude ``tests`` folder from release build
 
 

MANIFEST.in

@@ -2,4 +2,4 @@ include LICENSE.txt
 include README.rst
 recursive-include djangocms_snippet/locale *
 recursive-include djangocms_snippet/templates *
-recursive-exclude * *.pyc
+recursive-exclude * *.py[co]

README.rst

@@ -2,7 +2,6 @@
 django CMS Snippet
 ==================
 
-
 |pypi| |build| |coverage|
 
 
@@ -33,6 +32,10 @@ feedback in the form of issues and pull requests. Before submitting your
 pull request, please review our `contribution guidelines
 <http://docs.django-cms.org/en/latest/contributing/index.html>`_.
 
+We're grateful to all contributors who have helped create and maintain this package.
+Contributors are listed at the `contributors <https://github.com/divio/djangocms-snippet/graphs/contributors>`_
+section.
+
 One of the easiest contributions you can make is helping to translate this addon on
 `Transifex <https://www.transifex.com/projects/p/djangocms-snippet/>`_.
 
@@ -43,8 +46,7 @@ Documentation
 See ``REQUIREMENTS`` in the `setup.py <https://github.com/divio/djangocms-snippet/blob/master/setup.py>`_
 file for additional dependencies:
 
-* Python 2.7, 3.4 or higher
-* Django 1.11 or higher
+|python| |django| |djangocms|
 
 
 Installation
@@ -112,3 +114,10 @@ You can run tests by executing::
     :target: https://travis-ci.org/divio/djangocms-snippet
 .. |coverage| image:: https://codecov.io/gh/divio/djangocms-snippet/branch/master/graph/badge.svg
     :target: https://codecov.io/gh/divio/djangocms-snippet
+
+.. |python| image:: https://img.shields.io/badge/python-2.7%20%7C%203.4+-blue.svg
+    :target: https://pypi.org/project/djangocms-snippet/
+.. |django| image:: https://img.shields.io/badge/django-1.11%20%7C%202.0%20%7C%202.1-blue.svg
+    :target: https://www.djangoproject.com/
+.. |djangocms| image:: https://img.shields.io/badge/django%20CMS-3.4%2B-blue.svg
+    :target: https://www.django-cms.org/

djangocms_snippet/admin.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from django.contrib import admin
 from django.conf import settings
+from django.contrib import admin
 from django.db import models
 from django.forms import Textarea
 

djangocms_snippet/migrations/0001_initial.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 import django.db.models.deletion
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

djangocms_snippet/migrations/0002_snippet_slug.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

djangocms_snippet/migrations/0003_auto_data_fill_slug.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 from collections import Counter
 
-from django.db import models, migrations
+from django.db import migrations, models
 from django.utils.text import slugify
 
 

djangocms_snippet/migrations/0004_auto_alter_slug_unique.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):