diff --git a/setup.cfg b/setup.cfg index 44b37ab6..ce17d8a0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,4 +1,4 @@ [flake8] -ignore = F403, F405 +ignore = F403 exclude = .git,docs/*,systers_portal/manage.py,wsgi.py,migrations max-line-length = 100 diff --git a/systers_portal/community/permissions.py b/systers_portal/community/permissions.py index 7ef1538d..587748ef 100644 --- a/systers_portal/community/permissions.py +++ b/systers_portal/community/permissions.py @@ -1,4 +1,5 @@ -from community.constants import * +from community.constants import CONTENT_CONTRIBUTOR, CONTENT_MANAGER, USER_CONTENT_MANAGER +from community.constants import COMMUNITY_ADMIN groups_templates = {"content_contributor": CONTENT_CONTRIBUTOR, diff --git a/systers_portal/meetup/permissions.py b/systers_portal/meetup/permissions.py index 9eb0e8b0..afd45def 100644 --- a/systers_portal/meetup/permissions.py +++ b/systers_portal/meetup/permissions.py @@ -1,4 +1,4 @@ -from meetup.constants import * +from meetup.constants import COMMUNITY_MEMBER, COMMUNITY_MODERATOR, COMMUNITY_LEADER groups_templates = {"community_member": COMMUNITY_MEMBER, "community_moderator": COMMUNITY_MODERATOR, diff --git a/systers_portal/membership/views.py b/systers_portal/membership/views.py index aeb4fc48..5a1a7350 100644 --- a/systers_portal/membership/views.py +++ b/systers_portal/membership/views.py @@ -5,9 +5,15 @@ from django.views.generic import RedirectView, ListView, FormView from django.views.generic.detail import SingleObjectMixin from braces.views import LoginRequiredMixin, PermissionRequiredMixin - from community.models import Community -from membership.constants import * # NOQA +from membership.constants import USER_ALREADY_MEMBER_MSG, USER_MEMBER_SUCCESS_MSG, USER_MEMBER_REJECTED_MSG # noqa +from membership.constants import OK, JOIN_REQUEST_OK_MSG, ALREADY_MEMBER, ALREADY_MEMBER_MSG +from membership.constants import JOIN_REQUEST_EXISTS, JOIN_REQUEST_EXISTS_MSG +from membership.constants import JOIN_REQUEST_CANCELED_MSG, NO_PENDING_JOIN_REQUEST +from membership.constants import ALREADY_MEMBER_CANCEL_MSG, NO_PENDING_JOIN_REQUEST_MSG +from membership.constants import LEAVE_OK_MSG, NOT_MEMBER, NOT_MEMBER_MSG, IS_ADMIN +from membership.constants import LEAVE_IS_ADMIN_MSG, NEW_ADMIN_SUCCESS_MSG, REMOVE_OK_MSG +from membership.constants import REMOVE_IS_ADMIN_MSG, REMOVE_NOT_MEMBER_MSG from membership.forms import TransferOwnershipForm from membership.models import JoinRequest from users.models import SystersUser diff --git a/systers_portal/systers_portal/settings/dev.py b/systers_portal/systers_portal/settings/dev.py index 37788bc2..7fe51100 100644 --- a/systers_portal/systers_portal/settings/dev.py +++ b/systers_portal/systers_portal/settings/dev.py @@ -1,4 +1,5 @@ -from .base import * +import os +from .base import TEMPLATES from decouple import config SCHEDULER_AUTOSTART = True diff --git a/systers_portal/systers_portal/settings/docker.py b/systers_portal/systers_portal/settings/docker.py index e13bf6c5..00e8cc1d 100644 --- a/systers_portal/systers_portal/settings/docker.py +++ b/systers_portal/systers_portal/settings/docker.py @@ -1,4 +1,4 @@ -from .base import * +from .base import TEMPLATES DEBUG = True TEMPLATES[0]['OPTIONS']['debug'] = DEBUG diff --git a/systers_portal/systers_portal/settings/production.py b/systers_portal/systers_portal/settings/production.py index b5599289..dee9fd68 100644 --- a/systers_portal/systers_portal/settings/production.py +++ b/systers_portal/systers_portal/settings/production.py @@ -1,4 +1,4 @@ -from .base import * +from .base import TEMPLATES DEBUG = False TEMPLATES[0]['OPTIONS']['debug'] = DEBUG diff --git a/systers_portal/systers_portal/settings/testing.py b/systers_portal/systers_portal/settings/testing.py index 35ab71d7..410f7ebe 100644 --- a/systers_portal/systers_portal/settings/testing.py +++ b/systers_portal/systers_portal/settings/testing.py @@ -1,5 +1,5 @@ -from .base import * - +from .base import TEMPLATES, INSTALLED_APPS, BASE_DIR +import os SCHEDULER_AUTOSTART = False DEBUG = True TEMPLATES[0]['OPTIONS']['debug'] = DEBUG