Commit f8f15341 authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Merge branch 'new_flake8' into 'master'

Use newer version of flake8

See merge request !433
parents 71fb5340 2c2e108c
...@@ -32,7 +32,7 @@ whitelist_externals= ...@@ -32,7 +32,7 @@ whitelist_externals=
exclude = */migrations/*, */urls.py, .ropeproject exclude = */migrations/*, */urls.py, .ropeproject
[testenv:flake8] [testenv:flake8]
deps= flake8==3.0.2 deps= flake8
skip_install=True skip_install=True
commands= commands=
flake8 . flake8 .
...@@ -146,6 +146,7 @@ class UserAdmin(BaseUserAdmin): ...@@ -146,6 +146,7 @@ class UserAdmin(BaseUserAdmin):
student_number_csv_export.short_description = _('Download student number ' student_number_csv_export.short_description = _('Download student number '
'label for selected users') 'label for selected users')
admin.site.register(models.BecomeAMemberDocument) admin.site.register(models.BecomeAMemberDocument)
# re-register User admin # re-register User admin
......
...@@ -11,6 +11,7 @@ class StaticViewSitemap(sitemaps.Sitemap): ...@@ -11,6 +11,7 @@ class StaticViewSitemap(sitemaps.Sitemap):
def location(self, item): def location(self, item):
return reverse(item) return reverse(item)
sitemap = { sitemap = {
'merchandise-static': StaticViewSitemap, 'merchandise-static': StaticViewSitemap,
} }
...@@ -115,5 +115,6 @@ class PhotoAdmin(admin.ModelAdmin): ...@@ -115,5 +115,6 @@ class PhotoAdmin(admin.ModelAdmin):
_("Full-sized photos will not be saved " _("Full-sized photos will not be saved "
"on the Thalia-website.")) "on the Thalia-website."))
admin.site.register(Album, AlbumAdmin) admin.site.register(Album, AlbumAdmin)
admin.site.register(Photo, PhotoAdmin) admin.site.register(Photo, PhotoAdmin)
...@@ -6,4 +6,5 @@ from .models import Thabloid ...@@ -6,4 +6,5 @@ from .models import Thabloid
class ThabloidAdmin(admin.ModelAdmin): class ThabloidAdmin(admin.ModelAdmin):
list_filter = ('year', ) list_filter = ('year', )
admin.site.register(Thabloid, ThabloidAdmin) admin.site.register(Thabloid, ThabloidAdmin)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment