Try to satisfy pylint and tox:py2

This commit is contained in:
2019-10-29 18:50:41 +01:00
parent 1b727c5b77
commit f4fc1307e2
5 changed files with 13 additions and 8 deletions

View File

@@ -18,6 +18,7 @@ good-names=_,
c,
d,
e,
f,
i,
j,
k,

View File

@@ -6,4 +6,4 @@ from .program import Program
def main(*args, **kwargs):
program = Program()
exitval = program(*args, **kwargs)
sys.exit(exitval)
sys.exit(exitval) # pragma: no cover

View File

@@ -71,16 +71,16 @@ class Program(object): # pylint: disable=too-few-public-methods
sys.path.pop(0)
missing_apps = []
for app in add_apps:
if app not in settings.INSTALLED_APPS:
missing_apps.append(app)
for add_app in add_apps:
if add_app not in settings.INSTALLED_APPS:
missing_apps.append(add_app)
if missing_apps:
sys.stdout.write('{app}: adding {apps} to INSTALLED_APPS\n'.format(app=app, apps=missing_apps))
comment = '### {app}: added apps with django-deploy at {timestamp}'
code = 'INSTALLED_APPS += [\n'
for app in missing_apps:
code += ' \'{}\',\n'.format(app)
for add_app in missing_apps:
code += ' \'{}\',\n'.format(add_app)
code += ']\n'
append_text = '\n' + comment + '\n' + code + '\n'

View File

@@ -3,6 +3,10 @@ import os
import sys
import unittest
import pytest
try:
from importlib import reload
except ImportError:
pass
from ..config import DJANGO_SETTINGS_MODULE_NAME
from ..program import Program
@@ -64,6 +68,6 @@ class MainTestCase(unittest.TestCase):
settings_dir = os.path.join(project_dir, DJANGO_SETTINGS_MODULE_NAME)
sys.path.insert(0, settings_dir)
settings = importlib.import_module('settings')
importlib.reload(settings)
reload(settings)
sys.path.pop(0)
self.assertListEqual(expected_installed_apps, settings.INSTALLED_APPS)

View File

@@ -6,5 +6,5 @@ deps = coverage
pylint
pytest
commands = coverage run -m pytest
coverage report --skip-covered
coverage report --skip-covered --fail-under=99
pylint django_deploy