diff --git a/ram/driver/admin.py b/ram/driver/admin.py index fb55098..1d6caa3 100644 --- a/ram/driver/admin.py +++ b/ram/driver/admin.py @@ -9,11 +9,7 @@ class DriverConfigurationAdmin(SingletonModelAdmin): fieldsets = ( ( "General configuration", - { - "fields": ( - "enabled", - ) - }, + {"fields": ("enabled",)}, ), ( "Remote DCC-EX configuration", diff --git a/ram/metadata/models.py b/ram/metadata/models.py index bbbeb3e..2b986f8 100644 --- a/ram/metadata/models.py +++ b/ram/metadata/models.py @@ -63,7 +63,7 @@ class Decoder(models.Model): manufacturer = models.ForeignKey( Manufacturer, on_delete=models.CASCADE, - limit_choices_to={"category": "model"} + limit_choices_to={"category": "model"}, ) version = models.CharField(max_length=64, blank=True) interface = models.PositiveSmallIntegerField( diff --git a/ram/portal/models.py b/ram/portal/models.py index 7b15cc8..09b306e 100644 --- a/ram/portal/models.py +++ b/ram/portal/models.py @@ -14,14 +14,16 @@ class SiteConfiguration(SingletonModel): items_per_page = models.CharField( max_length=2, choices=[(str(x * 3), str(x * 3)) for x in range(2, 11)], - default="6" + default="6", ) items_ordering = models.CharField( max_length=10, - choices=[("type", "By rolling stock type"), - ("company", "By company name"), - ("identifier", "By rolling stock class")], - default="type" + choices=[ + ("type", "By rolling stock type"), + ("company", "By company name"), + ("identifier", "By rolling stock class"), + ], + default="type", ) footer = models.TextField(blank=True) footer_extended = models.TextField(blank=True) diff --git a/ram/portal/urls.py b/ram/portal/urls.py index e3756e6..d3be28d 100644 --- a/ram/portal/urls.py +++ b/ram/portal/urls.py @@ -24,8 +24,7 @@ urlpatterns = [ ), path("consists", Consists.as_view(), name="consists"), path( - "consists/", - Consists.as_view(), name="consists_pagination" + "consists/", Consists.as_view(), name="consists_pagination" ), path("consist/", GetConsist.as_view(), name="consist"), path( diff --git a/ram/portal/views.py b/ram/portal/views.py index b99f944..f0bc8b9 100644 --- a/ram/portal/views.py +++ b/ram/portal/views.py @@ -170,7 +170,7 @@ class Consists(View): return render( request, "consists.html", - {"consist": consist, "page_range": page_range} + {"consist": consist, "page_range": page_range}, ) @@ -193,6 +193,6 @@ class GetConsist(View): { "consist": consist, "rolling_stock": rolling_stock, - "page_range": page_range + "page_range": page_range, }, ) diff --git a/ram/ram/urls.py b/ram/ram/urls.py index 8a2344c..e05412a 100644 --- a/ram/ram/urls.py +++ b/ram/ram/urls.py @@ -34,13 +34,21 @@ if settings.DEBUG: from rest_framework.schemas import get_schema_view urlpatterns += [ - path('swagger/', TemplateView.as_view( - template_name='swagger.html', - extra_context={'schema_url': 'openapi-schema'} - ), name='swagger'), - path('openapi', get_schema_view( - title="RAM - Railroad Assets Manager", - description="RAM API", - version="1.0.0" - ), name='openapi-schema'), + path( + "swagger/", + TemplateView.as_view( + template_name="swagger.html", + extra_context={"schema_url": "openapi-schema"}, + ), + name="swagger", + ), + path( + "openapi", + get_schema_view( + title="RAM - Railroad Assets Manager", + description="RAM API", + version="1.0.0", + ), + name="openapi-schema", + ), ] diff --git a/ram/roster/models.py b/ram/roster/models.py index c1a7674..52b4e8a 100644 --- a/ram/roster/models.py +++ b/ram/roster/models.py @@ -121,7 +121,8 @@ class RollingStock(models.Model): def pre_save_running_number(sender, instance, *args, **kwargs): try: instance.road_number_int = int( - re.findall(r"\d+", instance.road_number)[0]) + re.findall(r"\d+", instance.road_number)[0] + ) except IndexError: pass diff --git a/ram/roster/views.py b/ram/roster/views.py index 569b6ac..79a306c 100644 --- a/ram/roster/views.py +++ b/ram/roster/views.py @@ -15,17 +15,13 @@ class RosterGet(RetrieveAPIView): serializer_class = RollingStockSerializer lookup_field = "uuid" - schema = AutoSchema( - operation_id_base="retrieveRollingStockByUUID" - ) + schema = AutoSchema(operation_id_base="retrieveRollingStockByUUID") class RosterAddress(ListAPIView): serializer_class = RollingStockSerializer - schema = AutoSchema( - operation_id_base="retrieveRollingStockByAddress" - ) + schema = AutoSchema(operation_id_base="retrieveRollingStockByAddress") def get_queryset(self): address = self.kwargs["address"] @@ -35,9 +31,7 @@ class RosterAddress(ListAPIView): class RosterClass(ListAPIView): serializer_class = RollingStockSerializer - schema = AutoSchema( - operation_id_base="retrieveRollingStockByClass" - ) + schema = AutoSchema(operation_id_base="retrieveRollingStockByClass") def get_queryset(self): _class = self.kwargs["class"]