first cleanup

.coveragerc

@@ -1,27 +1,18 @@
 [run]
 branch = True
-source = djangocms_link
+source = djangocms_picture
+omit =
+    migrations/*
+    tests/*
 
 [report]
-omit = ../*migrations*,../*tests*,../*south_migrations*
-# Regexes for lines to exclude from consideration
 exclude_lines =
-    # Have to re-enable the standard pragma
     pragma: no cover
-
-    # Don't complain about missing debug-only code:
     def __repr__
-    if self\.debug
-
-    # Don't complain if tests don't hit defensive assertion code:
+    if self.debug:
+    if settings.DEBUG
     raise AssertionError
     raise NotImplementedError
-
-    # Don't complain if non-runnable code isn't run:
     if 0:
     if __name__ == .__main__.:
-
 ignore_errors = True
-
-[html]
-directory = coverage_html

.editorconfig

@@ -9,12 +9,23 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 80
+
+[*.py]
+max_line_length = 120
+quote_type = single
 
 [*.{scss,js,html}]
+max_line_length = 120
 indent_style = space
+quote_type = double
 
 [*.js]
 max_line_length = 120
+quote_type = single
 
 [*.rst]
 max_line_length = 80
+
+[*.yml]
+indent_size = 2

.gitignore

@@ -1,14 +1,8 @@
-*.log
-*.pot
 *.pyc
-.project
-.pydevproject
-.settings
-djangocms_link.egg-info
-dist
-build
-env*
-.tox
-.coverage
-.eggs
-.idea
+*.egg-info
+.DS_Store
+.idea/
+.tox/
+.eggs/
+dist/
+build/

.travis.yml

@@ -1,39 +1,27 @@
-# Config file for automatic testing at travis-ci.org
-
 language: python
 
-python: 3.5
-
 sudo: false
 
 env:
-  matrix:
-    - TOXENV=flake8
-    - TOXENV=isort
-    - TOXENV=py35-dj19-cms33
-    - TOXENV=py35-dj19-cms32
-    - TOXENV=py34-dj19-cms33
-    - TOXENV=py34-dj19-cms32
-    - TOXENV=py27-dj19-cms33
-    - TOXENV=py27-dj19-cms32
-    - TOXENV=py35-dj18-cms33
-    - TOXENV=py35-dj18-cms32
-    - TOXENV=py35-dj18-cms31
-    - TOXENV=py34-dj18-cms33
-    - TOXENV=py34-dj18-cms32
-    - TOXENV=py34-dj18-cms31
-    - TOXENV=py33-dj18-cms33
-    - TOXENV=py33-dj18-cms32
-    - TOXENV=py33-dj18-cms31
-    - TOXENV=py27-dj18-cms33
-    - TOXENV=py27-dj18-cms32
-    - TOXENV=py27-dj18-cms31
+  - TOX_ENV=flake8
+  - TOX_ENV=py27-latest
+  - TOX_ENV=py34-latest
+  # Django 1.8
+  - TOX_ENV=py34-dj18-cms33
+  - TOX_ENV=py34-dj18-cms32
+  - TOX_ENV=py27-dj18-cms33
+  - TOX_ENV=py27-dj18-cms32
+  # Django 1.9
+  - TOX_ENV=py34-dj19-cms33
+  - TOX_ENV=py34-dj19-cms32
+  - TOX_ENV=py27-dj19-cms33
+  - TOX_ENV=py27-dj19-cms32
 
-# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
-  - pip install -U tox>=1.8 coveralls
+  - pip install tox coverage
 
-# command to run tests, e.g. python setup.py test
-script: COMMAND='coverage run' tox -e$TOXENV
+script:
+  - tox -e $TOX_ENV
 
-after_success: coveralls
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

CHANGELOG.rst

@@ -1,86 +1,68 @@
-----------
-unreleased
-----------
+=========
+Changelog
+=========
 
-Version 1.8.3
 
-* Added native Aldryn support
+1.8.3 (unreleased)
+==================
 
+* Added native Aldryn support
 
-----------
-2016-07-18
-----------
 
-Version 1.8.2
+1.8.2 (2016-07-18)
+==================
 
 * Fixed styling issues with attributes field
 * Pinned djangocms_attributes_field to v0.1.1+
 * Fixed a regression where unnecessary whitespace was added to rendered html
 
 
-----------
-2016-07-05
-----------
-
-Version 1.8.1
+1.8.1 (2016-07-05)
+==================
 
 * Pinned to djangocms-attributes-field v0.1.0
 * Let attributes field be optional
 
 
-----------
-2016-06-20
-----------
-
-Version 1.8.0
+1.8.0 (2016-06-20)
+==================
 
 * Adds support for arbitrary HTML attributes on link tag
 
 
-----------
-2015-03-04
-----------
-
-Version 1.7.2
+1.7.2 (2015-03-04)
+==================
 
 * fix field name clashes with in Django 1.9
 
 
-----------
-2015-10-14
-----------
-
-Version 1.7.1
+1.7.1 (2015-10-14)
+==================
 
 * Pin Django Select2 to >=4.3,<5.0 to preserve Django 1.6 compatibility
 
-----------
-2015-10-12
-----------
 
-Version 1.7
+1.7.0 (2015-10-12)
+==================
 
 * Move migrations to standard location
 * Move to djangocms-helper for tests
 * PEP-8 / isort code style
 * Fix tel field
 * Change mailto field length
 
-----------
-2015-06-09
-----------
 
-Version 1.6.2
-Changes since 1.6.1
+1.6.2 (2015-06-09)
+==================
 
 * Use RST for Readme
 * Add repo badges for Travis, PyPI, etc.
 * Add support for internal/intranet links using NetBios, NetBEUI or other hostnames
 * Allow anchor-only links
 * Added clarity to the helptext for the anchor field
 
-----------
-2014-05-07
-----------
+
+1.6.1 (2014-05-07)
+==================
 
 * Fix a bug in forms Fix a we refer field.widget.queryset instead field.queryset.

LICENSE.txt

@@ -8,17 +8,17 @@ modification, are permitted provided that the following conditions are met:
     * Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
-    * Neither the name of Djeese Factory GmbH nor the
+    * Neither the name of Divio AG nor the
       names of its contributors may be used to endorse or promote products
       derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL DJEESE FACTORY GMBH BE LIABLE FOR ANY
+DISCLAIMED. IN NO EVENT SHALL DIVIO AG BE LIABLE FOR ANY
 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -1,5 +1,5 @@
 include LICENSE.txt
-include README.md
+include README.rst
 recursive-include djangocms_link/locale *
 recursive-include djangocms_link/templates *
 recursive-exclude * *.py[co]