From 3d96fe1e41acbffa615bd64c5b3676172e7c9ff3 Mon Sep 17 00:00:00 2001 From: Vasilis Tsiligiannis Date: Wed, 13 Jan 2021 20:21:49 +0200 Subject: [PATCH] Fix YAPF dict formatting Signed-off-by: Vasilis Tsiligiannis --- .yapfignore | 1 - db/api/serializers.py | 33 +++++++++++++++------------------ db/settings.py | 21 ++++++++++----------- setup.cfg | 1 + 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.yapfignore b/.yapfignore index 43b9bbc..da81543 100644 --- a/.yapfignore +++ b/.yapfignore @@ -6,4 +6,3 @@ satnogs-db-api-client build docs versioneer.py -db/settings.py diff --git a/db/api/serializers.py b/db/api/serializers.py index 24be20b..407218e 100644 --- a/db/api/serializers.py +++ b/db/api/serializers.py @@ -257,14 +257,13 @@ class LatestTleSetSerializer(serializers.ModelSerializer): 'app_source': 'network', 'schema': None, 'decoded': 'influxdb', - 'frame': - '968870A6A0A66086A240404040E103F0ABCD0000004203F500B475E215EA5FA0040C000B00090001\ - 0025008E55EE7B64650100000000AE4D07005D660F007673340000C522370067076507FD0C6000270\ - 0FE0CC50E0D00AD0E0B069007BD0E0E00650D21001400FE0C910054007007690D8700FC0CBA00E407\ - 43001C0F140077077807D7078E00120F240068076D07DA0A74003D0F2500830780077A0AC401490F9\ - 60070077207FDFC9F079507950700C03B0015009AFF6900C8FFE0FFA700EBFF3A00F200F3FF02016D\ - 0A590A0D0AE3099B0C830CB50DA70D9D06CC0043009401B8338B334C20001000000000009F0200000\ - 3000000FF723D00BEFFFFFFFF2E89B0151C00', + 'frame': '968870A6A0A66086A240404040E103F0ABCD0000004203F500B475E215EA5FA0040C000B' + '000900010025008E55EE7B64650100000000AE4D07005D660F007673340000C522370067076507FD0' + 'C60002700FE0CC50E0D00AD0E0B069007BD0E0E00650D21001400FE0C910054007007690D8700FC0C' + 'BA00E40743001C0F140077077807D7078E00120F240068076D07DA0A74003D0F2500830780077A0AC' + '401490F960070077207FDFC9F079507950700C03B0015009AFF6900C8FFE0FFA700EBFF3A00F200F3' + 'FF02016D0A590A0D0AE3099B0C830CB50DA70D9D06CC0043009401B8338B334C20001000000000009' + 'F02000003000000FF723D00BEFFFFFFFF2E89B0151C00', 'observer': 'KB9JHU-EM69uf', 'timestamp': '2021-01-05T22:28:09Z' }, @@ -335,15 +334,13 @@ class SidsSerializer(serializers.ModelSerializer): OpenApiExample( 'View Artifact Example 1', summary='Example: retrieving a specific artifact', - description='This is an example response when requesting a specific artifact \ - previously uploaded to DB', + description='This is an example response when requesting a specific artifact ' + 'previously uploaded to DB', value={ - 'id': - 1337, - 'network_obs_id': - 3376466, - 'artifact_file': - 'http://db-dev.satnogs.org/media/artifacts/bba35b2d-76cc-4a8f-9b8a-4a2ecb09c6df.h5' + 'id': 1337, + 'network_obs_id': 3376466, + 'artifact_file': 'http://db-dev.satnogs.org/media/artifacts/bba35b2d-76cc-4a8f-' + '9b8a-4a2ecb09c6df.h5' }, status_codes=['200'], response_only=True, # signal that example only applies to responses @@ -362,8 +359,8 @@ class ArtifactSerializer(serializers.ModelSerializer): OpenApiExample( 'New Artifact Example 1', summary='Example: uploading artifact', - description='This is an example response after successfully uploading an artifact \ - file. The ID of the artifact is returned', + description='This is an example response after successfully uploading an artifact ' + 'file. The ID of the artifact is returned', value={ 'id': 1337, }, diff --git a/db/settings.py b/db/settings.py index 68e7631..85c0e33 100644 --- a/db/settings.py +++ b/db/settings.py @@ -55,8 +55,8 @@ LOCAL_APPS = ( if DEBUG: DJANGO_APPS += ('debug_toolbar', ) DEBUG_TOOLBAR_CONFIG = { - 'SHOW_TOOLBAR_CALLBACK': - lambda request: request.environ.get('SERVER_NAME', None) != 'testserver', + 'SHOW_TOOLBAR_CALLBACK': lambda request: request.environ.get('SERVER_NAME', None) != + 'testserver', } if AUTH0: @@ -98,8 +98,9 @@ SERVER_EMAIL = DEFAULT_FROM_EMAIL # Cache CACHES = { 'default': { - 'BACKEND': - config('CACHE_BACKEND', default='django.core.cache.backends.locmem.LocMemCache'), + 'BACKEND': config( + 'CACHE_BACKEND', default='django.core.cache.backends.locmem.LocMemCache' + ), 'LOCATION': config('CACHE_LOCATION', default='unique-location'), 'OPTIONS': { 'MAX_ENTRIES': 5000, @@ -273,8 +274,9 @@ REDIS_CONNECT_RETRY = True # API REST_FRAMEWORK = { - 'DEFAULT_PERMISSION_CLASSES': - ('rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly', ), + 'DEFAULT_PERMISSION_CLASSES': ( + 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly', + ), 'DEFAULT_AUTHENTICATION_CLASSES': [ 'rest_framework.authentication.TokenAuthentication', 'rest_framework.authentication.SessionAuthentication' @@ -334,8 +336,7 @@ SPECTACULAR_SETTINGS = { { 'url': 'https://db-dev.satnogs.org', 'description': 'Development server' - }, - { + }, { 'url': 'https://db.satnogs.org', 'description': 'Production server' } @@ -343,9 +344,7 @@ SPECTACULAR_SETTINGS = { # Postprocessing functions that run at the end of schema generation. # must satisfy interface result = hook(generator, request, public, result) - 'POSTPROCESSING_HOOKS': [ - 'drf_spectacular.hooks.postprocess_schema_enums' - ], + 'POSTPROCESSING_HOOKS': ['drf_spectacular.hooks.postprocess_schema_enums'], # Function that returns a mocked request for view processing. For CLI usage # original_request will be None. diff --git a/setup.cfg b/setup.cfg index 3b7be11..abe270c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -105,6 +105,7 @@ exclude = db/_version.py,versioneer.py,*/migrations,docs,build,.tox,node_modules column_limit = 99 split_before_first_argument = True dedent_closing_brackets = True +allow_split_before_dict_value = False [tool:isort] use_parentheses = True