Get flake8 running OK
This commit is contained in:
@ -13,6 +13,7 @@ https://docs.djangoproject.com/en/1.11/ref/settings/
|
||||
import os
|
||||
import raven
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.contrib.messages import constants as messages
|
||||
|
||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
@ -257,14 +258,22 @@ LEAFLET_CONFIG = {
|
||||
"https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png",
|
||||
{
|
||||
"maxZoom": 17,
|
||||
"attribution": 'Map data: © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>, <a href="http://viewfinderpanoramas.org">SRTM</a> | Map style: © <a href="https://opentopomap.org">OpenTopoMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)',
|
||||
"attribution": (
|
||||
'Map data: © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>,'
|
||||
' <a href="http://viewfinderpanoramas.org">SRTM</a> |'
|
||||
' Map style: © <a href="https://opentopomap.org">OpenTopoMap</a>'
|
||||
' (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)'
|
||||
),
|
||||
},
|
||||
),
|
||||
(
|
||||
"English",
|
||||
"https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
|
||||
{
|
||||
"attribution": '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> © <a href="https://carto.com/attributions">CARTO</a>',
|
||||
"attribution": (
|
||||
'© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
|
||||
' © <a href="https://carto.com/attributions">CARTO</a>'
|
||||
),
|
||||
"subdomains": "abcd",
|
||||
"maxZoom": 19,
|
||||
},
|
||||
@ -329,8 +338,6 @@ AVATAR_GRAVATAR_DEFAULT = "mm"
|
||||
AVATAR_CLEANUP_DELETED = True
|
||||
|
||||
# Messages
|
||||
from django.contrib.messages import constants as messages
|
||||
|
||||
MESSAGE_TAGS = {messages.ERROR: "danger"}
|
||||
|
||||
# Feature flags
|
||||
|
||||
@ -5,7 +5,6 @@ from django.contrib.auth.models import User
|
||||
from django.test import LiveServerTestCase
|
||||
|
||||
from selenium import webdriver
|
||||
from selenium.common import exceptions
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support.expected_conditions import (
|
||||
staleness_of,
|
||||
@ -23,9 +22,10 @@ TIMEOUT = 8
|
||||
class SeleniumTest(LiveServerTestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
### To test with firefox, uncomment these lines and comment those pertaining
|
||||
### to Chrome. However, it will not work with GitLab CI because the docker
|
||||
### container does not have the geckodriver installed.
|
||||
# To test with firefox, uncomment these lines and comment those pertaining
|
||||
# to Chrome. However, it will not work with GitLab CI because the docker
|
||||
# container does not have the geckodriver installed.
|
||||
#
|
||||
# profile = webdriver.FirefoxProfile()
|
||||
# profile.set_preference("dom.forms.number", False)
|
||||
# cls.sl = webdriver.Firefox(profile)
|
||||
|
||||
@ -1,13 +1,7 @@
|
||||
from django.conf.urls import include, url
|
||||
from django.urls import reverse
|
||||
from django.conf.urls.i18n import i18n_patterns
|
||||
from django.contrib import admin
|
||||
from django.contrib.auth.models import User
|
||||
from rest_framework import routers, serializers, viewsets
|
||||
from rest_framework_gis import serializers as gis_serializers
|
||||
|
||||
from apps.files.models import File
|
||||
from apps.map.models import CaseStudy, PointOfInterest
|
||||
from .views import LanguageDropdownView
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user