Flake8 fixes

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+ignore = E501
+exclude = geotrek/settings

.travis.yml

@@ -59,8 +59,8 @@ install:
   - if [[ $ACTION == test ]]; then ./install.sh --tests || cat ./install.log; fi
   - if [[ $ACTION == deploy || $ACTION == integration ]]; then ./install.sh --noinput || cat ./install.log; fi
 script:
-  - if [[ $ACTION == codestyle ]]; then flake8 --ignore=E501,F403,F405 geotrek/settings; fi
-  - if [[ $ACTION == codestyle ]]; then flake8 --exclude geotrek/settings --ignore=E501 geotrek; fi
+  - if [[ $ACTION == codestyle ]]; then flake8 --exclude "" --ignore=E501,F403,F405 geotrek/settings; fi
+  - if [[ $ACTION == codestyle ]]; then flake8 geotrek; fi
   - if [[ $ACTION == codestyle ]]; then find geotrek/*/migrations/*.py | xargs grep -l srid | xargs grep -L SRID; fi
   - if [[ $ACTION == deploy || $ACTION == integration ]]; then make load_demo; fi
   - if [[ $ACTION == deploy ]]; then make test_nav host=localhost port=80; fi

geotrek/authent/models.py

@@ -98,6 +98,7 @@ class Meta:
     def __unicode__(self):
         return _("Profile for %s") % self.user
 
+
 User.profile = reify(lambda u: UserProfile.objects.get_or_create(user=u)[0])
 
 

geotrek/common/admin.py

@@ -62,6 +62,7 @@ class TargetPortalAdmin(admin.ModelAdmin):
     list_display = ('name', 'website')
     search_fields = ('name', 'website')
 
+
 admin.site.register(common_models.Organism, OrganismAdmin)
 admin.site.register(Attachment, AttachmentAdmin)
 admin.site.register(common_models.FileType, FileTypeAdmin)

geotrek/common/mixins.py

@@ -391,6 +391,8 @@ def get_pictogram_url(self):
 class OptionalPictogramMixin(PictogramMixin):
     class Meta:
         abstract = True
+
+
 OptionalPictogramMixin._meta.get_field('pictogram').blank = True
 
 

geotrek/common/translation.py

@@ -6,4 +6,5 @@
 class ThemeTO(TranslationOptions):
     fields = ('label', )
 
+
 translator.register(Theme, ThemeTO)

geotrek/core/views.py

@@ -45,6 +45,7 @@ def last_list(request):
             return redirect(entity.url_list)
     return redirect('trekking:trek_list')
 
+
 home = last_list
 
 

geotrek/feedback/translation.py

@@ -6,4 +6,5 @@
 class ReportCategoryTO(TranslationOptions):
     fields = ('category',)
 
+
 translator.register(feedback_models.ReportCategory, ReportCategoryTO)

geotrek/flatpages/translation.py

@@ -10,4 +10,5 @@ class FlatPageTO(TranslationOptions):
         ('published',) if settings.PUBLISHED_BY_LANG else tuple()
     )
 
+
 translator.register(flatpages_models.FlatPage, FlatPageTO)

geotrek/infrastructure/models.py

@@ -140,6 +140,7 @@ def path_infrastructures(cls, path):
     def topology_infrastructures(cls, topology):
         return cls.overlapping(topology)
 
+
 Path.add_property('infrastructures', lambda self: Infrastructure.path_infrastructures(self), _(u"Infrastructures"))
 Topology.add_property('infrastructures', lambda self: Infrastructure.topology_infrastructures(self), _(u"Infrastructures"))
 
@@ -174,5 +175,6 @@ def path_signages(cls, path):
     def topology_signages(cls, topology):
         return cls.overlapping(topology)
 
+
 Path.add_property('signages', lambda self: Signage.path_signages(self), _(u"Signages"))
 Topology.add_property('signages', lambda self: Signage.topology_signages(self), _(u"Signages"))

geotrek/land/models.py

@@ -67,6 +67,7 @@ def path_physicals(cls, path):
     def topology_physicals(cls, topology):
         return cls.overlapping(topology).select_related('physical_type')
 
+
 Path.add_property('physical_edges', PhysicalEdge.path_physicals, _(u"Physical edges"))
 Topology.add_property('physical_edges', PhysicalEdge.topology_physicals, _(u"Physical edges"))
 Intervention.add_property('physical_edges', lambda self: self.topology.physical_edges if self.topology else [], _(u"Physical edges"))
@@ -131,6 +132,7 @@ def path_lands(cls, path):
     def topology_lands(cls, topology):
         return cls.overlapping(topology).select_related('land_type')
 
+
 Path.add_property('land_edges', LandEdge.path_lands, _(u"Land edges"))
 Topology.add_property('land_edges', LandEdge.topology_lands, _(u"Land edges"))
 Intervention.add_property('land_edges', lambda self: self.topology.land_edges if self.topology else [], _(u"Land edges"))
@@ -181,6 +183,7 @@ def path_competences(cls, path):
     def topology_competences(cls, topology):
         return cls.overlapping(Topology.objects.get(pk=topology.pk)).select_related('organization')
 
+
 Path.add_property('competence_edges', CompetenceEdge.path_competences, _(u"Competence edges"))
 Topology.add_property('competence_edges', CompetenceEdge.topology_competences, _(u"Competence edges"))
 Intervention.add_property('competence_edges', lambda self: self.topology.competence_edges if self.topology else [], _(u"Competence edges"))
@@ -231,6 +234,7 @@ def path_works(cls, path):
     def topology_works(cls, topology):
         return cls.overlapping(topology).select_related('organization')
 
+
 Path.add_property('work_edges', WorkManagementEdge.path_works, _(u"Work management edges"))
 Topology.add_property('work_edges', WorkManagementEdge.topology_works, _(u"Work management edges"))
 Intervention.add_property('work_edges', lambda self: self.topology.work_edges if self.topology else [], _(u"Work management edges"))
@@ -281,6 +285,7 @@ def path_signages(cls, path):
     def topology_signages(cls, topology):
         return cls.overlapping(topology).select_related('organization')
 
+
 Path.add_property('signage_edges', SignageManagementEdge.path_signages, _(u"Signage management edges"))
 Topology.add_property('signage_edges', SignageManagementEdge.topology_signages, _(u"Signage management edges"))
 Intervention.add_property('signage_edges', lambda self: self.topology.signage_edges if self.topology else [], _(u"Signage management edges"))

geotrek/maintenance/models.py

@@ -273,6 +273,7 @@ def topology_interventions(cls, topology):
         topos = Topology.overlapping(topology).values_list('pk', flat=True)
         return cls.objects.existing().filter(topology__in=topos).distinct('pk')
 
+
 Path.add_property('interventions', lambda self: Intervention.path_interventions(self), _(u"Interventions"))
 Topology.add_property('interventions', lambda self: Intervention.topology_interventions(self), _(u"Interventions"))
 
@@ -524,6 +525,7 @@ def edges_by_attr(self, interventionattr):
     def get_create_label(cls):
         return _(u"Add a new project")
 
+
 Path.add_property('projects', lambda self: Project.path_projects(self), _(u"Projects"))
 Topology.add_property('projects', lambda self: Project.topology_projects(self), _(u"Projects"))
 

geotrek/tourism/admin.py

@@ -13,13 +13,15 @@ class DataSourceAdmin(TranslationAdmin):
     list_display = ('title', 'pictogram_img')
     search_fields = ('title',)
 
+
 admin.site.register(tourism_models.DataSource, DataSourceAdmin)
 
 
 class InformationDeskTypeAdmin(TranslationAdmin):
     list_display = ('label', 'pictogram_img')
     search_fields = ('label', )
 
+
 admin.site.register(tourism_models.InformationDeskType, InformationDeskTypeAdmin)
 
 
@@ -31,6 +33,7 @@ class InformationDeskAdmin(LeafletGeoAdmin, TranslationAdmin):
         models.TextField: {'widget': TinyMCE},
     }
 
+
 admin.site.register(tourism_models.InformationDesk, InformationDeskAdmin)
 
 
@@ -54,6 +57,7 @@ class TouristicContentCategoryAdmin(TranslationAdmin):
         TouristicContentType2Inline,
     ]
 
+
 if settings.TOURISM_ENABLED:
     admin.site.register(tourism_models.TouristicContentCategory, TouristicContentCategoryAdmin)
 
@@ -62,6 +66,7 @@ class TouristicEventTypeAdmin(TranslationAdmin):
     list_display = ('type', 'pictogram_img')
     search_fields = ('type',)
 
+
 if settings.TOURISM_ENABLED:
     admin.site.register(tourism_models.TouristicEventType, TouristicEventTypeAdmin)
 
@@ -70,5 +75,6 @@ class ReservationSystemAdmin(admin.ModelAdmin):
     list_display = ('name',)
     search_fields = ('name',)
 
+
 if settings.TOURISM_ENABLED:
     admin.site.register(tourism_models.ReservationSystem, ReservationSystemAdmin)

geotrek/tourism/translation.py

@@ -8,18 +8,21 @@
 class DataSourceTO(TranslationOptions):
     fields = ('title',)
 
+
 translator.register(tourism_models.DataSource, DataSourceTO)
 
 
 class InformationDeskTO(TranslationOptions):
     fields = ('name', 'description')
 
+
 translator.register(tourism_models.InformationDesk, InformationDeskTO)
 
 
 class InformationDeskTypeTO(TranslationOptions):
     fields = ('label',)
 
+
 translator.register(tourism_models.InformationDeskType, InformationDeskTypeTO)
 
 
@@ -28,19 +31,22 @@ class TouristicContentTO(TranslationOptions):
               ) + (('published',) if settings.PUBLISHED_BY_LANG else tuple())
     fallback_undefined = {'published': None}
 
+
 translator.register(tourism_models.TouristicContent, TouristicContentTO)
 
 
 class TouristicContentCategoryTO(TranslationOptions):
     fields = ('label', 'type1_label', 'type2_label')
 
+
 translator.register(tourism_models.TouristicContentCategory,
                     TouristicContentCategoryTO)
 
 
 class TouristicContentTypeTO(TranslationOptions):
     fields = ('label',)
 
+
 translator.register(tourism_models.TouristicContentType,
                     TouristicContentTypeTO)
 translator.register(tourism_models.TouristicContentType1,
@@ -52,6 +58,7 @@ class TouristicContentTypeTO(TranslationOptions):
 class TouristicEventTypeTO(TranslationOptions):
     fields = ('type',)
 
+
 translator.register(tourism_models.TouristicEventType, TouristicEventTypeTO)
 
 
@@ -61,4 +68,5 @@ class TouristicEventTO(TranslationOptions):
               ) + (('published',) if settings.PUBLISHED_BY_LANG else tuple())
     fallback_undefined = {'published': None}
 
+
 translator.register(tourism_models.TouristicEvent, TouristicEventTO)

geotrek/tourism/urls.py

@@ -32,6 +32,7 @@ def get_serializer(self):
     def get_queryset(self):
         return self.model.objects.existing()
 
+
 if settings.TOURISM_ENABLED:
     urlpatterns += registry.register(models.TouristicContent, TouristicContentEntityOptions)
 
@@ -45,5 +46,6 @@ def get_serializer(self):
     def get_queryset(self):
         return self.model.objects.existing()
 
+
 if settings.TOURISM_ENABLED:
     urlpatterns += registry.register(models.TouristicEvent, TouristicEventEntityOptions)

geotrek/trekking/forms.py

@@ -34,6 +34,7 @@ def __init__(self, *args, **kwargs):
                                     'is_circuit_step',
                                     'DELETE')
 
+
 TrekRelationshipFormSet = inlineformset_factory(Trek, Trek.related_treks.through,
                                                 form=TrekRelationshipForm, fk_name='trek_a',
                                                 extra=1)
@@ -236,6 +237,7 @@ class Meta(BaseTrekForm.Meta):
              'accessibilities', 'web_links', 'information_desks', 'source', 'portal',
              'children_trek', 'eid', 'eid2', 'hidden_ordered_children', 'structure']
 
+
 if settings.TREKKING_TOPOLOGY_ENABLED:
 
     class BasePOIForm(TopologyForm):

geotrek/trekking/models.py

@@ -653,6 +653,7 @@ def published_topology_pois(cls, topology):
     def distance(self, to_cls):
         return settings.TOURISM_INTERSECTION_MARGIN
 
+
 Path.add_property('pois', POI.path_pois, _(u"POIs"))
 Topology.add_property('pois', POI.topology_pois, _(u"POIs"))
 Topology.add_property('published_pois', POI.published_topology_pois, _(u"Published POIs"))
@@ -769,6 +770,7 @@ def published_topology_services(cls, topology):
     def distance(self, to_cls):
         return settings.TOURISM_INTERSECTION_MARGIN
 
+
 Path.add_property('services', Service.path_services, _(u"Services"))
 Topology.add_property('services', Service.topology_services, _(u"Services"))
 Topology.add_property('published_services', Service.published_topology_services, _(u"Published Services"))

geotrek/trekking/translation.py

@@ -57,6 +57,7 @@ class WebLinkCategoryTO(TranslationOptions):
 class ServiceTypeTO(TranslationOptions):
     fields = ('name', )
 
+
 # Register previously defined translation options
 trek_translation_to_register = [
     (trekking_models.Trek, TrekTO),