From 5607ec6012de9b9b63c85190ed3665555571eac3 Mon Sep 17 00:00:00 2001 From: Jens Timmerman Date: Fri, 6 Aug 2021 23:39:05 +0200 Subject: [PATCH] fixed linting --- .drone.yml | 2 +- .pylintrc | 15 +++++++++++++++ nmgfitness/models.py | 5 ++--- nmgfitness/settings.py | 4 ++-- users/forms.py | 1 + users/views.py | 2 -- 6 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 .pylintrc diff --git a/.drone.yml b/.drone.yml index 8ac31ba..55436c1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: - coverage run --source='.' manage.py test --noinput --parallel - name: run flake8 commands: - - flake8 + - flake8 --max-line-length=120 - name: run pylint commands: - pylint --rcfile=.pylintrc -- **/*.py diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..63cf887 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,15 @@ +[MASTER] +load-plugins=pylint_django +django-settings-module=im.settings + +[FORMAT] +max-line-length=120 + +[MESSAGES CONTROL] +disable=missing-docstring,unnecessary-pass + +[DESIGN] +max-parents=13 + +[TYPECHECK] +generated-members=REQUEST,acl_users,aq_parent,"[a-zA-Z]+_set{1,2}",save,delete diff --git a/nmgfitness/models.py b/nmgfitness/models.py index 6b39600..10af8c1 100644 --- a/nmgfitness/models.py +++ b/nmgfitness/models.py @@ -4,10 +4,9 @@ from django.contrib.auth.models import User class Events(models.Model): id = models.AutoField(primary_key=True) - start = models.DateTimeField(null=True,blank=True) - end = models.DateTimeField(null=True,blank=True) + start = models.DateTimeField(null=True, blank=True) + end = models.DateTimeField(null=True, blank=True) user = models.ForeignKey(User, on_delete=models.CASCADE) def __str__(self): return self.name - diff --git a/nmgfitness/settings.py b/nmgfitness/settings.py index 33e78ba..690e7ba 100644 --- a/nmgfitness/settings.py +++ b/nmgfitness/settings.py @@ -115,8 +115,8 @@ USE_I18N = True USE_L10N = True -#USE_TZ = True -#TURNED off for simplicity +# USE_TZ = True +# TURNED off for simplicity USE_TZ = False diff --git a/users/forms.py b/users/forms.py index 5adc3c8..37ef39d 100644 --- a/users/forms.py +++ b/users/forms.py @@ -1,5 +1,6 @@ from django.contrib.auth.forms import UserCreationForm + class CustomUserCreationForm(UserCreationForm): class Meta(UserCreationForm.Meta): fields = UserCreationForm.Meta.fields + ("email",) diff --git a/users/views.py b/users/views.py index a235c97..4c68803 100644 --- a/users/views.py +++ b/users/views.py @@ -1,5 +1,3 @@ -from django.contrib.auth import login - from django.shortcuts import redirect, render from django.urls import reverse