Merge branch 'master' into openwrt-firewall

Author: jonathanunderwood

.gitignore

@@ -37,7 +37,6 @@ htmlcov/
 .tox/
 .coverage
 .cache
-nosetests.xml
 coverage.xml
 
 # Translations
@@ -55,6 +54,7 @@ target/
 
 # editors
 *.komodoproject
+.vscode
 
 # other
 *.DS_Store*

.landscape.yml

@@ -3,9 +3,8 @@ sudo: false
 cache: pip
 
 python:
-  - "3.5"
-  - "3.4"
-  - "2.7"
+  - "3.6"
+  - "3.7"
 
 branches:
   only:
@@ -14,26 +13,15 @@ branches:
 before_install:
   - pip install -U pip setuptools wheel
   - pip install -r requirements-test.txt
-  - flake8
-  - isort --check-only --recursive .
 
 install:
   - python setup.py -q develop
 
 before_script:
-  - mkdir docs/source/_static
-  - sphinx-build -W -b html docs/source docs/_build
+  - ./run-qa-checks
 
 script:
-  - nosetests --with-coverage --cover-package=netjsonconfig
-  - |
-    if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-      # gets commit message of last commit before pull request merge
-      COMMIT_MESSAGE=$(git log $TRAVIS_PULL_REQUEST_SHA --format=%B -n 1)
-      printf "Checking commit message:\n\n"
-      printf "$COMMIT_MESSAGE\n\n"
-      checkcommit --message "$COMMIT_MESSAGE"
-    fi
+  - coverage run -a --source=netjsonconfig runtests.py
 
 after_success:
   coveralls

.travis.yml

@@ -1,10 +1,37 @@
 Change log
 ==========
 
-Version 0.6.4 [unreleased]
+Version 0.8.1 [2020-05-28]
 --------------------------
 
-WIP
+- Fixed bug that prevented overriding the contents of a file present
+  in a template and caused the file to be duplicated instead of overwritten
+- Fixed bug affecting backward conversion of switch VLAN on OpenWRT
+
+Version 0.8.0 [2020-04-03]
+--------------------------
+
+- Changed default file mode for certificate files generated with
+  from ``0644`` to ``0600``
+
+Version 0.7.0 [2020-01-14]
+--------------------------
+
+- Dropped support for python 2.7
+- Updated github buttons in documentation which were causing an unintended redirect
+- Updated the jsonschema library to version 3.x
+
+Version 0.6.4 [2019-12-09]
+--------------------------
+
+- `#113 <https://github.com/openwisp/netjsonconfig/issues/113>`_:
+  [bugfix] Made "encryption none" explicit in OpenWRT
+- `5ddc201 <https://github.com/openwisp/netjsonconfig/commit/5ddc201>`_:
+  [bugfix] Fixed invalid UCI name bug in default OpenWRT renderer
+- `#118 <https://github.com/openwisp/netjsonconfig/issues/118>`_:
+  [bugfix] Fixed ``TypeError: can only concatenate list (not "str") to list``
+- `#137 <https://github.com/openwisp/netjsonconfig/issues/137>`_:
+  [tests] Migrated tests to nose2
 
 Version 0.6.3 [2018-07-09]
 --------------------------

CHANGES.rst

@@ -2,3 +2,4 @@ include LICENSE README.rst requirements.txt
 recursive-include netjsonconfig *
 recursive-exclude * *.pyc *.swp
 recursive-exclude * __pycache__
+recursive-exclude tests *

MANIFEST.in

@@ -11,15 +11,23 @@ netjsonconfig
    :target: https://requires.io/github/openwisp/netjsonconfig/requirements/?branch=master
    :alt: Requirements Status
 
+.. image:: https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square
+   :target: https://gitter.im/openwisp/general
+
 .. image:: https://badge.fury.io/py/netjsonconfig.svg
    :target: http://badge.fury.io/py/netjsonconfig
 
-.. image:: https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=flat-square
-   :target: https://gitter.im/openwisp/general
+.. image:: https://pepy.tech/badge/netjsonconfig
+   :target: https://pepy.tech/project/netjsonconfig
+   :alt: downloads
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+   :target: https://pypi.org/project/black/
+   :alt: code style: black
 
 ------------
 
-Netjsonconfig is part of the `OpenWISP project <http://openwisp.org>`_ and it's the official
+Netjsonconfig is a part of the `OpenWISP project <http://openwisp.org>`_ and it's the official
 configuration engine of `OpenWISP 2 <https://github.com/openwisp/ansible-openwisp2>`_.
 
 .. image:: http://netjsonconfig.openwisp.org/en/latest/_images/openwisp.org.svg
@@ -30,7 +38,7 @@ configuration engine of `OpenWISP 2 <https://github.com/openwisp/ansible-openwis
 on systems like `OpenWRT <http://openwrt.org>`_, `LEDE <https://www.lede-project.org/>`_
 or `OpenWisp Firmware <https://github.com/openwisp/OpenWISP-Firmware>`_.
 
-Its main features are:
+Its main features are listed below for your reference:
 
 * `OpenWRT <http://openwrt.org>`_ / `LEDE <https://www.lede-project.org/>`_ support
 * `OpenWisp Firmware <https://github.com/openwisp/OpenWISP-Firmware>`_ support

README.rst

@@ -5,8 +5,6 @@ import os
 import sys
 import traceback
 
-import six
-
 import netjsonconfig
 
 description = """
@@ -146,12 +144,8 @@ def print_output(output):
     # if file object, get bytes
     if hasattr(output, 'getvalue'):
         output = output.getvalue()
-    # python2: always print
-    # python3: if string, just print
-    if isinstance(output, six.string_types):
+    if isinstance(output, str):
         print(output)
-    # python2: never enters this block
-    # python3: writes binary data to standard output
     else:
         sys.stdout.buffer.write(output)
 

bin/netjsonconfig

@@ -1,6 +1,6 @@
 .. raw:: html
 
     <p>
-        <iframe src="https://nodeshot.org/github-btn.html?user=openwisp&amp;repo=netjsonconfig&amp;type=watch&amp;count=true&amp;size=large" frameborder="0" scrolling="0" width="130" height="33"></iframe>
-        <iframe src="https://nodeshot.org/github-btn.html?user=openwisp&amp;repo=netjsonconfig&amp;type=fork&amp;count=true&amp;size=large" frameborder="0" scrolling="0" width="130" height="33"></iframe>
+        <iframe src="http://openwisp.io/github-btn.html?user=openwisp&amp;repo=netjsonconfig&amp;type=watch&amp;count=true&amp;size=large" frameborder="0" scrolling="0" width="130" height="33"></iframe>
+        <iframe src="http://openwisp.io/github-btn.html?user=openwisp&amp;repo=netjsonconfig&amp;type=fork&amp;count=true&amp;size=large" frameborder="0" scrolling="0" width="130" height="33"></iframe>
     </p>