Skip to content

Commit 88ce84f

Browse files
MarkusHMarkusH
committed
Apply black, flake8, and isort checks
1 parent 8d9cd45 commit 88ce84f

File tree

22 files changed

+685
-390
lines changed

22 files changed

+685
-390
lines changed

‎docs/source/conf.py‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
#!/usr/bin/env python
2-
import sys
32
import os
3+
import sys
44
from os.path import abspath, dirname, join
5+
56
from pkg_resources import get_distribution
67

7-
os.environ['DJANGO_SETTINGS_MODULE'] = 'example.settings'
8+
os.environ["DJANGO_SETTINGS_MODULE"] = "example.settings"
89

9-
sys.path.insert(0, abspath(join(dirname(__file__), '..', '..', 'example')))
10-
sys.path.insert(0, abspath(join(dirname(__file__), '..', '..')))
10+
sys.path.insert(0, abspath(join(dirname(__file__), "..", "..", "example")))
11+
sys.path.insert(0, abspath(join(dirname(__file__), "..", "..")))
1112

1213
# -- General configuration -----------------------------------------------------
1314

14-
project = u'django-osm-field'
15-
copyright = u'2014, Markus Holtermann, et al'
15+
project = "django-osm-field"
16+
copyright = "2014, Markus Holtermann, et al"
1617
version = release = get_distribution("django-osm-field").version
1718

18-
extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx']
19-
exclude_patterns = ['build']
19+
extensions = ["sphinx.ext.autodoc", "sphinx.ext.intersphinx"]
20+
exclude_patterns = ["build"]
2021

21-
master_doc = 'index'
22-
source_suffix = '.rst'
22+
master_doc = "index"
23+
source_suffix = ".rst"
2324

24-
pygments_style = 'sphinx'
25-
templates_path = ['_templates']
25+
pygments_style = "sphinx"
26+
templates_path = ["_templates"]
2627

2728
intersphinx_mapping = {
28-
'django': ('https://docs.djangoproject.com/en/dev/',
29-
'https://docs.djangoproject.com/en/dev/_objects/'),
29+
"django": (
30+
"https://docs.djangoproject.com/en/dev/",
31+
"https://docs.djangoproject.com/en/dev/_objects/",
32+
),
3033
}
3134

3235
# -- Options for HTML output ---------------------------------------------------
33-
html_static_path = ['_static']
34-
htmlhelp_basename = 'django-osm-fielddoc'
35-
modindex_common_prefix = ['osm_field.']
36+
html_static_path = ["_static"]
37+
htmlhelp_basename = "django-osm-fielddoc"
38+
modindex_common_prefix = ["osm_field."]

‎example/example/migrations/0001_initial.py‎

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,67 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
33

4-
from django.db import models, migrations
4+
from django.db import migrations, models
5+
56
import osm_field.fields
67
import osm_field.validators
78

89

910
class Migration(migrations.Migration):
1011

11-
dependencies = [
12-
]
12+
dependencies = []
1313

1414
operations = [
1515
migrations.CreateModel(
16-
name='ExampleModel',
16+
name="ExampleModel",
1717
fields=[
18-
('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
19-
('location', osm_field.fields.OSMField(lat_field='location_lat', lon_field='location_lon')),
20-
('location_lat', osm_field.fields.LatitudeField(validators=[osm_field.validators.validate_latitude])),
21-
('location_lon', osm_field.fields.LongitudeField(validators=[osm_field.validators.validate_longitude])),
22-
('another', osm_field.fields.OSMField(lat_field='some_lat_field', lon_field='other_lon_field')),
23-
('some_lat_field', osm_field.fields.LatitudeField(validators=[osm_field.validators.validate_latitude])),
24-
('other_lon_field', osm_field.fields.LongitudeField(validators=[osm_field.validators.validate_longitude])),
18+
(
19+
"id",
20+
models.AutoField(
21+
verbose_name="ID",
22+
auto_created=True,
23+
primary_key=True,
24+
serialize=False,
25+
),
26+
),
27+
(
28+
"location",
29+
osm_field.fields.OSMField(
30+
lat_field="location_lat", lon_field="location_lon"
31+
),
32+
),
33+
(
34+
"location_lat",
35+
osm_field.fields.LatitudeField(
36+
validators=[osm_field.validators.validate_latitude]
37+
),
38+
),
39+
(
40+
"location_lon",
41+
osm_field.fields.LongitudeField(
42+
validators=[osm_field.validators.validate_longitude]
43+
),
44+
),
45+
(
46+
"another",
47+
osm_field.fields.OSMField(
48+
lat_field="some_lat_field", lon_field="other_lon_field"
49+
),
50+
),
51+
(
52+
"some_lat_field",
53+
osm_field.fields.LatitudeField(
54+
validators=[osm_field.validators.validate_latitude]
55+
),
56+
),
57+
(
58+
"other_lon_field",
59+
osm_field.fields.LongitudeField(
60+
validators=[osm_field.validators.validate_longitude]
61+
),
62+
),
2563
],
26-
options={
27-
},
64+
options={},
2865
bases=(models.Model,),
2966
),
3067
]

‎example/example/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ class ExampleModel(models.Model):
88
location = OSMField()
99
location_lat = LatitudeField()
1010
location_lon = LongitudeField()
11-
another = OSMField(lat_field='some_lat_field', lon_field='other_lon_field')
11+
another = OSMField(lat_field="some_lat_field", lon_field="other_lon_field")
1212
some_lat_field = LatitudeField()
1313
other_lon_field = LongitudeField()
1414

1515
def __str__(self):
1616
return str(self.get_location_info())
1717

1818
def get_absolute_url(self):
19-
return reverse('detail', kwargs={'pk': self.pk})
19+
return reverse("detail", kwargs={"pk": self.pk})

‎example/example/settings.py‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010

1111
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
1212
import os
13+
1314
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
1415

1516

1617
# Quick-start development settings - unsuitable for production
1718
# See https://docs.djangoproject.com/en/dev/howto/deployment/checklist/
1819

1920
# SECURITY WARNING: keep the secret key used in production secret!
20-
SECRET_KEY = 'tkyw7bl$)5p*77#0$54ahp7lurux^c2=#j7h1l(o@gm9l@ts&6'
21+
SECRET_KEY = "tkyw7bl$)5p*77#0$54ahp7lurux^c2=#j7h1l(o@gm9l@ts&6"
2122

2223
# SECURITY WARNING: don't run with debug turned on in production!
2324
DEBUG = True
@@ -30,38 +31,38 @@
3031
# Application definition
3132

3233
INSTALLED_APPS = (
33-
'django.contrib.staticfiles',
34-
'osm_field',
35-
'example',
34+
"django.contrib.staticfiles",
35+
"osm_field",
36+
"example",
3637
)
3738

3839
MIDDLEWARE_CLASSES = (
39-
'django.middleware.common.CommonMiddleware',
40-
'django.middleware.csrf.CsrfViewMiddleware',
41-
'django.middleware.clickjacking.XFrameOptionsMiddleware',
40+
"django.middleware.common.CommonMiddleware",
41+
"django.middleware.csrf.CsrfViewMiddleware",
42+
"django.middleware.clickjacking.XFrameOptionsMiddleware",
4243
)
4344

44-
ROOT_URLCONF = 'example.urls'
45+
ROOT_URLCONF = "example.urls"
4546

46-
WSGI_APPLICATION = 'example.wsgi.application'
47+
WSGI_APPLICATION = "example.wsgi.application"
4748

4849

4950
# Database
5051
# https://docs.djangoproject.com/en/dev/ref/settings/#databases
5152

5253
DATABASES = {
53-
'default': {
54-
'ENGINE': 'django.db.backends.sqlite3',
55-
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
54+
"default": {
55+
"ENGINE": "django.db.backends.sqlite3",
56+
"NAME": os.path.join(BASE_DIR, "db.sqlite3"),
5657
}
5758
}
5859

5960
# Internationalization
6061
# https://docs.djangoproject.com/en/dev/topics/i18n/
6162

62-
LANGUAGE_CODE = 'en-us'
63+
LANGUAGE_CODE = "en-us"
6364

64-
TIME_ZONE = 'UTC'
65+
TIME_ZONE = "UTC"
6566

6667
USE_I18N = True
6768

@@ -73,16 +74,16 @@
7374
# Static files (CSS, JavaScript, Images)
7475
# https://docs.djangoproject.com/en/dev/howto/static-files/
7576

76-
STATIC_URL = '/static/'
77+
STATIC_URL = "/static/"
7778

7879
TEMPLATES = [
7980
{
80-
'BACKEND': 'django.template.backends.django.DjangoTemplates',
81-
'APP_DIRS': True,
82-
'OPTIONS': {
83-
'context_processors': [
84-
'django.template.context_processors.debug',
85-
'django.template.context_processors.request',
81+
"BACKEND": "django.template.backends.django.DjangoTemplates",
82+
"APP_DIRS": True,
83+
"OPTIONS": {
84+
"context_processors": [
85+
"django.template.context_processors.debug",
86+
"django.template.context_processors.request",
8687
],
8788
},
8889
},

‎example/example/urls.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
from django.conf.urls import url
22
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
33

4-
from .views import list_view, create_view, detail_view, delete_view, update_view
4+
from .views import create_view, delete_view, detail_view, list_view, update_view
55

66
urlpatterns = [
77
# url(r'^admin/', admin.site.urls),
8-
url(r'^$', list_view, name='list'),
9-
url(r'^create/$', create_view, name='create'),
10-
url(r'^(?P<pk>\d+)/$', detail_view, name='detail'),
11-
url(r'^(?P<pk>\d+)/delete/$', delete_view, name='delete'),
12-
url(r'^(?P<pk>\d+)/update/$', update_view, name='update'),
8+
url(r"^$", list_view, name="list"),
9+
url(r"^create/$", create_view, name="create"),
10+
url(r"^(?P<pk>\d+)/$", detail_view, name="detail"),
11+
url(r"^(?P<pk>\d+)/delete/$", delete_view, name="delete"),
12+
url(r"^(?P<pk>\d+)/update/$", update_view, name="update"),
1313
]
1414

1515
urlpatterns += staticfiles_urlpatterns()

‎example/example/views.py‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
from django.urls import reverse
2-
from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView
2+
from django.views.generic import (
3+
CreateView,
4+
DeleteView,
5+
DetailView,
6+
ListView,
7+
UpdateView,
8+
)
39

410
from .models import ExampleModel
511

612

713
class ExampleCreateView(CreateView):
814
fields = [
9-
'location', 'location_lat', 'location_lon',
10-
'another', 'some_lat_field', 'other_lon_field',
15+
"location",
16+
"location_lat",
17+
"location_lon",
18+
"another",
19+
"some_lat_field",
20+
"other_lon_field",
1121
]
1222
model = ExampleModel
1323

1424
def get_success_url(self):
15-
return reverse('detail', kwargs={'pk': self.object.pk})
25+
return reverse("detail", kwargs={"pk": self.object.pk})
1626

1727

1828
create_view = ExampleCreateView.as_view()
@@ -22,7 +32,7 @@ class ExampleDeleteView(DeleteView):
2232
model = ExampleModel
2333

2434
def get_success_url(self):
25-
return reverse('list')
35+
return reverse("list")
2636

2737

2838
delete_view = ExampleDeleteView.as_view()
@@ -44,13 +54,17 @@ class ExampleListView(ListView):
4454

4555
class ExampleUpdateView(UpdateView):
4656
fields = [
47-
'location', 'location_lat', 'location_lon',
48-
'another', 'some_lat_field', 'other_lon_field',
57+
"location",
58+
"location_lat",
59+
"location_lon",
60+
"another",
61+
"some_lat_field",
62+
"other_lon_field",
4963
]
5064
model = ExampleModel
5165

5266
def get_success_url(self):
53-
return reverse('detail', kwargs={'pk': self.object.pk})
67+
return reverse("detail", kwargs={"pk": self.object.pk})
5468

5569

5670
update_view = ExampleUpdateView.as_view()

‎example/example/wsgi.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
"""
99

1010
import os
11-
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
1211

1312
from django.core.wsgi import get_wsgi_application
13+
14+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
15+
16+
1417
application = get_wsgi_application()

‎osm_field/__init__.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
__author__ = 'Markus Holtermann, et al'
4-
__email__ = '[email protected]'
3+
__author__ = "Markus Holtermann, et al"
4+
__email__ = "[email protected]"
55

6-
default_app_config = 'osm_field.apps.OSMFieldConfig'
6+
default_app_config = "osm_field.apps.OSMFieldConfig"

‎osm_field/apps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33

44
class OSMFieldConfig(AppConfig):
5-
name = 'osm_field'
6-
verbose_name = 'OSM Field'
5+
name = "osm_field"
6+
verbose_name = "OSM Field"

0 commit comments

Comments
 (0)