Update and include more apps to yapf

Author: mbeacom

.pre-commit-config.yaml

@@ -1,13 +1,4 @@
 repos:
-- repo: git://github.com/pre-commit/mirrors-isort
-  sha: 'v4.3.3'
-  hooks:
-  - id: isort
-    args:
-      - --recursive
-      - --settings-path
-      - ./setup.cfg
-      - .
 - repo: local
   hooks:
   - id: eslint
@@ -29,4 +20,13 @@ repos:
     language: python
     entry: yapf
     files: \.py$
-    args: [-r, -e, "app/**/migrations/", app/dataviz/, app/app/, app/enssubdomain/]
+    args: ["-i", "-r", "-e", "app/**/migrations/", "-p", "app/app/", "app/avatar/", "app/credits/", "app/dataviz/", "app/enssubdomain/", "app/ethos/", "app/github/"]
+- repo: git://github.com/pre-commit/mirrors-isort
+  sha: 'v4.3.4'
+  hooks:
+  - id: isort
+    args:
+      - --recursive
+      - --settings-path
+      - ./setup.cfg
+      - .

.stickler.yml

@@ -17,6 +17,6 @@ files:
     - 'docs'
     - 'node_modules/*'
     - 'requirements'
-    - '**/migrations/*.py'
+    - 'app/**/migrations/*.py'
 fixers:
   enable: false

Makefile

@@ -26,7 +26,7 @@ fix-stylelint: ## Run stylelint --fix against the project directory. Requires no
 	@npm run stylelint:fix
 
 fix-yapf: ## Run yapf against any included or newly introduced Python code.
-	@docker-compose exec web yapf -i -r -e "app/**/migrations/*.py" -p app/dataviz/ app/app/ app/enssubdomain/ app/avatar/
+	@docker-compose exec web yapf -i -r -e "app/**/migrations/*.py" -p app/app/ app/avatar/ app/credits/ app/dataviz/ app/enssubdomain/ app/ethos/ app/github/
 
 fix: fix-eslint fix-stylelint fix-isort fix-yapf ## Attempt to run all fixes against the project directory.
 

app/app/settings.py

@@ -53,60 +53,22 @@
 
 # Application definition
 INSTALLED_APPS = [
-    'corsheaders',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'whitenoise.runserver_nostatic',
-    'django.contrib.staticfiles',
-    'storages',
-    'social_django',
-    'cookielaw',
-    'django.contrib.humanize',
-    'django.contrib.sitemaps',
-    'django.contrib.sites',
-    'django_extensions',
-    'easy_thumbnails',
-    'app',
-    'avatar',
-    'retail',
-    'rest_framework',
-    'bootstrap3',
-    'marketing',
-    'economy',
-    'dashboard',
-    'enssubdomain',
-    'faucet',
-    'tdi',
-    'gas',
-    'github',
-    'legacy',
-    'chartit',
-    'email_obfuscator',
-    'linkshortener',
-    'credits',
-    'gitcoinbot',
-    'external_bounties',
-    'dataviz',
-    'ethos',
+    'corsheaders', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes',
+    'django.contrib.sessions', 'django.contrib.messages', 'whitenoise.runserver_nostatic', 'django.contrib.staticfiles',
+    'storages', 'social_django', 'cookielaw', 'django.contrib.humanize', 'django.contrib.sitemaps',
+    'django.contrib.sites', 'django_extensions', 'easy_thumbnails', 'app', 'avatar', 'retail', 'rest_framework',
+    'bootstrap3', 'marketing', 'economy', 'dashboard', 'enssubdomain', 'faucet', 'tdi', 'gas', 'github', 'legacy',
+    'chartit', 'email_obfuscator', 'linkshortener', 'credits', 'gitcoinbot', 'external_bounties', 'dataviz', 'ethos',
     'impersonate',
 ]
 
 MIDDLEWARE = [
-    'corsheaders.middleware.CorsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-    'whitenoise.middleware.WhiteNoiseMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'ratelimit.middleware.RatelimitMiddleware',
-    'social_django.middleware.SocialAuthExceptionMiddleware',
+    'corsheaders.middleware.CorsMiddleware', 'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'ratelimit.middleware.RatelimitMiddleware', 'social_django.middleware.SocialAuthExceptionMiddleware',
     'impersonate.middleware.ImpersonateMiddleware',
 ]
 
@@ -119,28 +81,19 @@
     'django.contrib.auth.backends.ModelBackend',
 )
 
-TEMPLATES = [
-    {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            'retail/templates/',
-            'external_bounties/templates/',
-            'dataviz/templates',
+TEMPLATES = [{
+    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    'DIRS': ['retail/templates/', 'external_bounties/templates/', 'dataviz/templates', ],
+    'APP_DIRS': True,
+    'OPTIONS': {
+        'context_processors': [
+            'django.template.context_processors.debug', 'django.template.context_processors.request',
+            'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages',
+            'app.context.insert_settings', 'social_django.context_processors.backends',
+            'social_django.context_processors.login_redirect',
         ],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-                'app.context.insert_settings',
-                'social_django.context_processors.backends',
-                'social_django.context_processors.login_redirect',
-            ],
-        },
     },
-]
+}, ]
 
 SITE_ID = env.int('SITE_ID', default=1)
 WSGI_APPLICATION = env('WSGI_APPLICATION', default='app.wsgi.application')
@@ -151,20 +104,15 @@
 
 # Password validation
 # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
-    },
-]
+AUTH_PASSWORD_VALIDATORS = [{
+    'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+}, {
+    'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+}, {
+    'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+}, {
+    'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+}, ]
 
 REST_FRAMEWORK = {
     # Use Django's standard `django.contrib.auth` permissions,
@@ -323,22 +271,13 @@
 SOCIAL_AUTH_GITHUB_SECRET = GITHUB_CLIENT_SECRET
 SOCIAL_AUTH_POSTGRES_JSONFIELD = True
 SOCIAL_AUTH_ADMIN_USER_SEARCH_FIELDS = ['username', 'first_name', 'last_name', 'email']
-SOCIAL_AUTH_GITHUB_SCOPE = [
-    'read:public_repo',
-    'read:user',
-    'user:email',
-]
+SOCIAL_AUTH_GITHUB_SCOPE = ['read:public_repo', 'read:user', 'user:email', ]
 
 SOCIAL_AUTH_PIPELINE = (
-    'social_core.pipeline.social_auth.social_details',
-    'social_core.pipeline.social_auth.social_uid',
-    'social_core.pipeline.social_auth.auth_allowed',
-    'social_core.pipeline.social_auth.social_user',
-    'social_core.pipeline.user.get_username',
-    'social_core.pipeline.user.create_user',
-    'app.pipeline.save_profile',
-    'social_core.pipeline.social_auth.associate_user',
-    'social_core.pipeline.social_auth.load_extra_data',
+    'social_core.pipeline.social_auth.social_details', 'social_core.pipeline.social_auth.social_uid',
+    'social_core.pipeline.social_auth.auth_allowed', 'social_core.pipeline.social_auth.social_user',
+    'social_core.pipeline.user.get_username', 'social_core.pipeline.user.create_user', 'app.pipeline.save_profile',
+    'social_core.pipeline.social_auth.associate_user', 'social_core.pipeline.social_auth.load_extra_data',
     'social_core.pipeline.user.user_details',
 )
 
@@ -391,10 +330,7 @@
         env('GA_AUTH_PROVIDER_X509_CERT_URL', default='https://www.googleapis.com/oauth2/v1/certs'),
     'client_x509_cert_url': env('GA_CLIENT_X509_CERT_URL', default='')
 }
-HOTJAR_CONFIG = {
-    'hjid': env.int('HOTJAR_ID', default=0),
-    'hjsv': env.int('HOTJAR_SV', default=0),
-}
+HOTJAR_CONFIG = {'hjid': env.int('HOTJAR_ID', default=0), 'hjsv': env.int('HOTJAR_SV', default=0), }
 
 # Rollbar - https://rollbar.com/docs/notifier/pyrollbar/#django
 ROLLBAR_CLIENT_TOKEN = env('ROLLBAR_CLIENT_TOKEN', default='')  # post_client_item
@@ -411,28 +347,10 @@
         'capture_ip': 'anonymize',
         'capture_username': True,
         'scrub_fields': [
-            'pw',
-            'passwd',
-            'password',
-            'secret',
-            'confirm_password',
-            'confirmPassword',
-            'password_confirmation',
-            'passwordConfirmation',
-            'access_token',
-            'accessToken',
-            'auth',
-            'authentication',
-            'github_access_token',
-            'github_client_secret',
-            'secret_key',
-            'twitter_access_token',
-            'twitter_access_secret',
-            'twitter_consumer_secret',
-            'mixpanel_token',
-            'slack_verification_token',
-            'redirect_state',
-            'slack_token',
+            'pw', 'passwd', 'password', 'secret', 'confirm_password', 'confirmPassword', 'password_confirmation',
+            'passwordConfirmation', 'access_token', 'accessToken', 'auth', 'authentication', 'github_access_token',
+            'github_client_secret', 'secret_key', 'twitter_access_token', 'twitter_access_secret',
+            'twitter_consumer_secret', 'mixpanel_token', 'slack_verification_token', 'redirect_state', 'slack_token',
             'priv_key',
         ],
     }
@@ -448,9 +366,7 @@
     rollbar.init(**ROLLBAR)
 
 # List of github usernames to not count as comments on an issue
-IGNORE_COMMENTS_FROM = [
-    'gitcoinbot',
-]
+IGNORE_COMMENTS_FROM = ['gitcoinbot', ]
 
 # optional: only needed if you run the activity-report management command
 AWS_ACCESS_KEY_ID = env('AWS_ACCESS_KEY_ID', default='')

app/app/sitemaps.py

@@ -13,29 +13,9 @@ class StaticViewSitemap(sitemaps.Sitemap):
 
     def items(self):
         return [
-            'dashboard',
-            'new_funding',
-            'fulfill_bounty',
-            'process_funding',
-            'funding_details',
-            'tip',
-            'terms',
-            'privacy',
-            'cookie',
-            'prirp',
-            'apitos',
-            'about',
-            'index',
-            'help',
-            'whitepaper',
-            'whitepaper_access',
-            '_leaderboard',
-            'ios',
-            'faucet',
-            'mission',
-            'slack',
-            'universe_index',
-            'results',
+            'dashboard', 'new_funding', 'fulfill_bounty', 'process_funding', 'funding_details', 'tip', 'terms',
+            'privacy', 'cookie', 'prirp', 'apitos', 'about', 'index', 'help', 'whitepaper', 'whitepaper_access',
+            '_leaderboard', 'ios', 'faucet', 'mission', 'slack', 'universe_index', 'results',
         ]
 
     def location(self, item):

app/app/utils.py

@@ -122,11 +122,7 @@ def sync_profile(handle, user=None, hide_profile=True):
         rollbar.report_message('Failed to fetch github username', 'warning', extra_data=data)
         return None
 
-    defaults = {
-        'last_sync_date': timezone.now(),
-        'data': data,
-        'hide_profile': hide_profile,
-    }
+    defaults = {'last_sync_date': timezone.now(), 'data': data, 'hide_profile': hide_profile, }
 
     if user and isinstance(user, User):
         defaults['user'] = user

app/avatar/admin.py

@@ -45,9 +45,7 @@ class AvatarAdmin(GeneralAdmin):
     ordering = ['-id']
     fields = ['config', 'use_github_avatar', 'svg_asset', 'png_asset', 'created_on', 'modified_on']
     readonly_fields = ['svg_asset', 'png_asset', 'created_on', 'modified_on']
-    inlines = [
-        ProfileInline,
-    ]
+    inlines = [ProfileInline, ]
 
     def svg_asset(self, instance):
         """Define the avatar SVG tag to be displayed in the admin."""

app/avatar/urls.py

@@ -23,7 +23,4 @@
 from .views import avatar, save_avatar
 
 app_name = 'avatar'
-urlpatterns = [
-    re_path(r'^view', avatar, name='view_avatar'),
-    re_path(r'^save', save_avatar, name='save_avatar'),
-]
+urlpatterns = [re_path(r'^view', avatar, name='view_avatar'), re_path(r'^save', save_avatar, name='save_avatar'), ]

app/avatar/utils.py

@@ -217,8 +217,7 @@ def build_avatar_svg(svg_path='avatar.svg', line_color='#781623', icon_size=None
 
     # Build the list of avatar components
     components = [
-        icon_width,
-        icon_height,
+        icon_width, icon_height,
         Line([(0, icon_height / 2), (icon_width, icon_height / 2)],
              width=f'{icon_height}px',
              color=payload.get('background_color')),
@@ -270,10 +269,7 @@ def handle_avatar_payload(request):
     for k, v in body.items():
         if v and k in valid_component_keys:
             component_type, svg_asset = v.lstrip('v2/images/avatar/').split('/')
-            avatar_dict[k] = {
-                'component_type': component_type,
-                'svg_asset': svg_asset,
-            }
+            avatar_dict[k] = {'component_type': component_type, 'svg_asset': svg_asset, }
         elif v and k in valid_color_keys:
             avatar_dict[k] = v
     return avatar_dict

app/dataviz/d3_views.py

@@ -123,13 +123,7 @@ def viz_spiral(request, key='email_open'):
     stats = Stat.objects.filter(created_on__hour=1)
     type_options = stats.distinct('key').values_list('key', flat=True)
     stats = stats.filter(key=key).order_by('created_on')
-    params = {
-        'stats': stats,
-        'key': key,
-        'page_route': 'spiral',
-        'type_options': type_options,
-        'viz_type': key,
-    }
+    params = {'stats': stats, 'key': key, 'page_route': 'spiral', 'type_options': type_options, 'viz_type': key, }
     return TemplateResponse(request, 'dataviz/spiral.html', params)
 
 
@@ -169,12 +163,7 @@ def viz_chord(request, key='bounties_paid'):
         output = "\n".join(output_rows)
         return HttpResponse(output)
 
-    params = {
-        'key': key,
-        'page_route': 'spiral',
-        'type_options': type_options,
-        'viz_type': key,
-    }
+    params = {'key': key, 'page_route': 'spiral', 'type_options': type_options, 'viz_type': key, }
     return TemplateResponse(request, 'dataviz/chord.html', params)
 
 
@@ -225,12 +214,7 @@ def viz_steamgraph(request, key='open'):
         output = "\n".join(output_rows)
         return HttpResponse(output)
 
-    params = {
-        'key': key,
-        'page_route': 'steamgraph',
-        'type_options': type_options,
-        'viz_type': key,
-    }
+    params = {'key': key, 'page_route': 'steamgraph', 'type_options': type_options, 'viz_type': key, }
     return TemplateResponse(request, 'dataviz/steamgraph.html', params)
 
 
@@ -287,13 +271,7 @@ def viz_heatmap(request, key='email_open', template='heatmap'):
 
         output = "\n".join(output_rows)
         return HttpResponse(output)
-    params = {
-        'stats': stats,
-        'key': key,
-        'page_route': template,
-        'type_options': type_options,
-        'viz_type': key,
-    }
+    params = {'stats': stats, 'key': key, 'page_route': template, 'type_options': type_options, 'viz_type': key, }
     return TemplateResponse(request, f'dataviz/{template}.html', params)
 
 
@@ -333,9 +311,7 @@ def data_viz_helper_merge_json_trees(output):
         dict: The merged data dictionary.
 
     """
-    new_output = {
-        'name': output['name'],
-    }
+    new_output = {'name': output['name'], }
     if not output.get('children'):
         new_output['size'] = output['size']
         return new_output
@@ -401,12 +377,7 @@ def viz_sunburst(request, visual_type, template='sunburst'):
         TemplateResponse: If data param not provided, return the populated data visualization template.
 
     """
-    visual_type_options = [
-        'status_progression',
-        'repos',
-        'fulfillers',
-        'funders',
-    ]
+    visual_type_options = ['status_progression', 'repos', 'fulfillers', 'funders', ]
     if visual_type not in visual_type_options:
         visual_type = visual_type_options[0]
 
@@ -733,12 +704,7 @@ def viz_scatterplot_helper(request, key='hourly_rate', template='dataviz/scatter
                 username = bf.bounty.org_name
                 if hide_usernames:
                     username = "repo: " + helper_hide_pii(username.lower(), 1)
-                row = [
-                    str(bf.bounty.hourly_rate),
-                    str((timezone.now() - bf.accepted_on).days),
-                    username,
-                    str(weight),
-                ]
+                row = [str(bf.bounty.hourly_rate), str((timezone.now() - bf.accepted_on).days), username, str(weight), ]
                 if bf.bounty.hourly_rate:
                     rows.append(row)
             except Exception:

app/dataviz/views.py

@@ -58,25 +58,16 @@ def stats(request):
         _filters = ['slack', 'email', 'whitepaper', 'twitter']
         types = filter_types(types, _filters)
     if _filter == 'user_skills':
-        _filters = [
-            'subscribers_with_skill_',
-        ]
+        _filters = ['subscribers_with_skill_', ]
         types = filter_types(types, _filters)
     if _filter == 'bounty_skills':
-        _filters = [
-            'bounties_with_skill_',
-        ]
+        _filters = ['bounties_with_skill_', ]
         types = filter_types(types, _filters)
     if _filter == 'KPI':
         _filters = []
         types = [
-            'email_subscribers_active',
-            'joe_dominance_index_30_value',
-            'bounties_value',
-            'bounties_done_value',
-            'bounties_hourly_rate_inusd_last_24_hours',
-            'bounties_open_total',
-            'slack_users_active',
+            'email_subscribers_active', 'joe_dominance_index_30_value', 'bounties_value', 'bounties_done_value',
+            'bounties_hourly_rate_inusd_last_24_hours', 'bounties_open_total', 'slack_users_active',
             'twitter_followers',
         ]
 
@@ -165,9 +156,7 @@ def cohort_helper_num(inner_start_time, inner_end_time, data_source, users):
     if 'profile' in data_source:
         if data_source == 'profile-githubinteraction':
             num = GithubEvent.objects.filter(
-                profile__in=users,
-                created_on__gte=inner_start_time,
-                created_on__lt=inner_end_time,
+                profile__in=users, created_on__gte=inner_start_time, created_on__lt=inner_end_time,
             ).distinct('profile').count()
         else:
             event = 'start_work'
@@ -176,17 +165,11 @@ def cohort_helper_num(inner_start_time, inner_end_time, data_source, users):
             if data_source == 'profile-new_bounty':
                 event = 'new_bounty'
             num = UserAction.objects.filter(
-                profile__in=users,
-                created_on__gte=inner_start_time,
-                created_on__lt=inner_end_time,
-                action=event,
+                profile__in=users, created_on__gte=inner_start_time, created_on__lt=inner_end_time, action=event,
             ).distinct('profile').count()
     elif data_source == 'slack-online':
         num = SlackPresence.objects.filter(
-            slackuser__in=users,
-            created_on__gte=inner_start_time,
-            created_on__lt=inner_end_time,
-            status='active',
+            slackuser__in=users, created_on__gte=inner_start_time, created_on__lt=inner_end_time, status='active',
         ).distinct('slackuser').count()
     else:
         event = data_source.split('-')[1]
@@ -227,11 +210,7 @@ def cohort(request):
             inner_end_time = timezone.now() - timezone.timedelta(**cohort_helper_timedelta(k - 1, period_size))
             num = cohort_helper_num(inner_start_time, inner_end_time, data_source, users)
             pct = round(num / num_entries, 2) if num_entries else 0
-            usage_by_time_period[k] = {
-                'num': num,
-                'pct_float': pct,
-                'pct_int': int(pct * 100),
-            }
+            usage_by_time_period[k] = {'num': num, 'pct_float': pct, 'pct_int': int(pct * 100), }
         cohorts[i] = {
             'num': num_entries,
             'start_time': start_time,
@@ -287,63 +266,34 @@ def funnel(request):
 
     weekly_source = Stat.objects.filter(created_on__hour=1, created_on__week_day=1).order_by('-created_on')
     daily_source = Stat.objects.filter(created_on__hour=1).order_by('-created_on')
-    funnels = [
-        {
-            'title': 'web => bounties_posted => bounties_fulfilled',
-            'keys': [
-                'sessions',
-                'bounties_alltime',
-                'bounties_fulfilled',
-            ],
-            'data': []
-        },
-        {
-            'title': 'web => bounties_posted => bounties_fulfilled (detail)',
-            'keys': [
-                'sessions',
-                'bounties_alltime',
-                'bounties_started_total',
-                'bounties_submitted_total',
-                'bounties_done_total',
-                'bounties_expired_total',
-                'bounties_cancelled_total',
-            ],
-            'data': []
-        },
-        {
-            'title': 'web session => email_subscribers',
-            'keys': [
-                'sessions',
-                'email_subscribers',
-            ],
-            'data': []
-        },
-        {
-            'title': 'web session => slack',
-            'keys': [
-                'sessions',
-                'slack_users',
-            ],
-            'data': []
-        },
-        {
-            'title': 'web session => create dev grant',
-            'keys': [
-                'sessions',
-                'dev_grant',
-            ],
-            'data': []
-        },
-        {
-            'title': 'email funnel',
-            'keys': [
-                'email_processed',
-                'email_open',
-                'email_click',
-            ],
-            'data': []
-        },
-    ]
+    funnels = [{
+        'title': 'web => bounties_posted => bounties_fulfilled',
+        'keys': ['sessions', 'bounties_alltime', 'bounties_fulfilled', ],
+        'data': []
+    }, {
+        'title': 'web => bounties_posted => bounties_fulfilled (detail)',
+        'keys': [
+            'sessions', 'bounties_alltime', 'bounties_started_total', 'bounties_submitted_total', 'bounties_done_total',
+            'bounties_expired_total', 'bounties_cancelled_total',
+        ],
+        'data': []
+    }, {
+        'title': 'web session => email_subscribers',
+        'keys': ['sessions', 'email_subscribers', ],
+        'data': []
+    }, {
+        'title': 'web session => slack',
+        'keys': ['sessions', 'slack_users', ],
+        'data': []
+    }, {
+        'title': 'web session => create dev grant',
+        'keys': ['sessions', 'dev_grant', ],
+        'data': []
+    }, {
+        'title': 'email funnel',
+        'keys': ['email_processed', 'email_open', 'email_click', ],
+        'data': []
+    }, ]
 
     for funnel in range(0, len(funnels)):
         keys = funnels[funnel]['keys']
@@ -380,8 +330,5 @@ def funnel(request):
             except Exception as e:
                 print(key, k, e)
 
-    params = {
-        'title': "Funnel Analysis",
-        'funnels': funnels,
-    }
+    params = {'title': "Funnel Analysis", 'funnels': funnels, }
     return TemplateResponse(request, 'funnel.html', params)

app/enssubdomain/views.py

@@ -57,10 +57,7 @@ def get_gas_price(gas_multiplier=1.101):
 
 
 def handle_default_response(request, github_handle):
-    params = {
-        'github_handle': github_handle,
-        'ens_domain': settings.ENS_TLD,
-    }
+    params = {'github_handle': github_handle, 'ens_domain': settings.ENS_TLD, }
     return TemplateResponse(request, 'ens/ens_register.html', params)
 
 
@@ -119,14 +116,8 @@ def set_resolver(signer, github_handle, nonce, gas_multiplier=1.101):
         'gasPrice': Web3.toHex(int(float(gas_price))),
     }
 
-    ens_contract = w3.eth.contract(
-        address=ENS_MAINNET_ADDR,
-        abi=ens_abi,
-    )
-    txn = ens_contract.functions.setResolver(
-        dot_eth_namehash(subdomain),
-        resolver_addr,
-    ).buildTransaction(transaction)
+    ens_contract = w3.eth.contract(address=ENS_MAINNET_ADDR, abi=ens_abi, )
+    txn = ens_contract.functions.setResolver(dot_eth_namehash(subdomain), resolver_addr, ).buildTransaction(transaction)
     signed_txn = w3.eth.account.signTransaction(txn, private_key=settings.ENS_PRIVATE_KEY)
     try:
         txn_hash = convert_txn(w3.eth.sendRawTransaction(signed_txn.rawTransaction))
@@ -152,15 +143,10 @@ def set_owner(signer, github_handle, nonce, gas_multiplier=1.101):
         'gasPrice': Web3.toHex(int(float(gas_price))),
     }
 
-    ens_contract = w3.eth.contract(
-        address=ENS_MAINNET_ADDR,
-        abi=ens_abi,
-    )
+    ens_contract = w3.eth.contract(address=ENS_MAINNET_ADDR, abi=ens_abi, )
 
     txn = ens_contract.functions.setSubnodeOwner(
-        dot_eth_namehash(owned),
-        label_to_hash(label),
-        Web3.toChecksumAddress(settings.ENS_OWNER_ACCOUNT),
+        dot_eth_namehash(owned), label_to_hash(label), Web3.toChecksumAddress(settings.ENS_OWNER_ACCOUNT),
     ).buildTransaction(transaction)
     signed_txn = w3.eth.account.signTransaction(txn, private_key=settings.ENS_PRIVATE_KEY)
     try:
@@ -188,14 +174,8 @@ def set_address_at_resolver(signer, github_handle, nonce, gas_multiplier=1.101):
         'gasPrice': Web3.toHex(int(float(gas_price))),
     }
 
-    resolver_contract = w3.eth.contract(
-        address=resolver_addr,
-        abi=resolver_abi,
-    )
-    txn = resolver_contract.functions.setAddr(
-        dot_eth_namehash(subdomain),
-        signer,
-    ).buildTransaction(transaction)
+    resolver_contract = w3.eth.contract(address=resolver_addr, abi=resolver_abi, )
+    txn = resolver_contract.functions.setAddr(dot_eth_namehash(subdomain), signer, ).buildTransaction(transaction)
     signed_txn = w3.eth.account.signTransaction(txn, private_key=settings.ENS_PRIVATE_KEY)
     try:
         txn_hash = convert_txn(w3.eth.sendRawTransaction(signed_txn.rawTransaction))

app/ethos/management/commands/generate_ethos_hop.py

@@ -30,120 +30,25 @@
 logging.getLogger("requests").setLevel(logging.WARNING)
 logging.getLogger("urllib3").setLevel(logging.WARNING)
 
-
 twitter_usernames = [
-    'eswara_sai',
-    'owocki',
-    'mbeacom',
-    'mitch_kosowski',
-    'vishesh04',
-    'abhiram383',
-    'EthOS_ERC20',
-    'thelostone_mc',
-    'rajat100493',
-    'vsinghdothings'
-    'MiccomServices5',
-    'bdosari',
-    'knowerlittle',
-    'JPasintSHC',
-    'savils',
-    'elmerm',
-    'ILovePythonMore',
-    'icoexplorer',
-    'HanimMYusof',
-    'GWierzowiecki',
-    'bohendo',
-    'bigc1745',
-    'stojce',
-    'jeffesquivels',
-    'QuikNode',
-    'e3amn2l',
-    'asinghchrony',
-    'hiimmox',
-    'c_t_ogden',
-    'theycallmeken',
-    'Danteintheloop',
-    'AugurProject',
-    'misterpikul',
-    'sincibx',
-    'gats8y',
-    'scryptomagna',
-    'iMichaelTen',
-    '_hydeenoble',
-    'jhselvik',
-    'SUCCULENTS__',
-    'SamyakJ04711116',
-    'MarkTomsu',
-    'freezing_point',
-    'dangguillen',
-    'rickmanelius',
-    'LElkan',
-    'cattron313',
-    'Beezel_Bug',
-    'kevinwucodes',
-    'X11Spain',
-    'occhiphaura',
-    '2GatherUs',
-    'jakrabbit',
-    'RVNCoin',
-    'BertBoeiend',
-    'illbeanywhere',
-    'adeloveh1',
-    'EdgarTwit1',
-    'ResetDavid',
-    'allkindzzz',
-    'planetary_dev',
-    'Tom_Wolters',
-    'Petru_Catana',
-    'i_instances',
-    'azeemansar',
-    'tomazy',
-    'brendanboyle87',
-    'jaronrayhinds',
-    'matthewholey',
-    'kuriyamaPG',
-    'evandroguedes',
-    'matmeth_',
-    'TuanAnh1011',
-    'irpansy09096981',
-    'MohammedAziz90',
-    'live_s_s',
-    'gregsantos',
-    'CodeManDeluxe',
-    'pro_webhosting',
-    'randal_olson',
-    'lvl_jesse',
-    'kristofer_done',
-    'breadboardkill',
-    'Teo_Blockerz',
-    'palash2504',
-    'hedgehogy',
-    'dredense',
-    'kokossmoss',
-    'sogasg',
-    'artesesan',
-    'scsab',
-    'jenmacchiarelli',
-    'yarrumretep',
-    'keithtmccartney',
-    'Cryptoscillator',
-    'MillerApps',
-    '5kyn0d3',
-    'Mitch_Kosowski',
-    'LamsonScribner',
-    'mbeacom',
-    'moneyfordogfood',
-    'michelgotta',
-    'vietlq',
-    'Ruski93',
-    'Skip_Carlson',
-    'jakerockland',
-    'NukeManDan',
-    'MatthewLilley',
-    'tylertommy21',
-    'kelvin60429',
-    'GetGitcoin',
-    'owocki']
+    'eswara_sai', 'owocki', 'mbeacom', 'mitch_kosowski', 'vishesh04', 'abhiram383', 'EthOS_ERC20', 'thelostone_mc',
+    'rajat100493', 'vsinghdothings'
+    'MiccomServices5', 'bdosari', 'knowerlittle', 'JPasintSHC', 'savils', 'elmerm', 'ILovePythonMore', 'icoexplorer',
+    'HanimMYusof', 'GWierzowiecki', 'bohendo', 'bigc1745', 'stojce', 'jeffesquivels', 'QuikNode', 'e3amn2l',
+    'asinghchrony', 'hiimmox', 'c_t_ogden', 'theycallmeken', 'Danteintheloop', 'AugurProject', 'misterpikul', 'sincibx',
+    'gats8y', 'scryptomagna', 'iMichaelTen', '_hydeenoble', 'jhselvik', 'SUCCULENTS__', 'SamyakJ04711116', 'MarkTomsu',
+    'freezing_point', 'dangguillen', 'rickmanelius', 'LElkan', 'cattron313', 'Beezel_Bug', 'kevinwucodes', 'X11Spain',
+    'occhiphaura', '2GatherUs', 'jakrabbit', 'RVNCoin', 'BertBoeiend', 'illbeanywhere', 'adeloveh1', 'EdgarTwit1',
+    'ResetDavid', 'allkindzzz', 'planetary_dev', 'Tom_Wolters', 'Petru_Catana', 'i_instances', 'azeemansar', 'tomazy',
+    'brendanboyle87', 'jaronrayhinds', 'matthewholey', 'kuriyamaPG', 'evandroguedes', 'matmeth_', 'TuanAnh1011',
+    'irpansy09096981', 'MohammedAziz90', 'live_s_s', 'gregsantos', 'CodeManDeluxe', 'pro_webhosting', 'randal_olson',
+    'lvl_jesse', 'kristofer_done', 'breadboardkill', 'Teo_Blockerz', 'palash2504', 'hedgehogy', 'dredense',
+    'kokossmoss', 'sogasg', 'artesesan', 'scsab', 'jenmacchiarelli', 'yarrumretep', 'keithtmccartney',
+    'Cryptoscillator', 'MillerApps', '5kyn0d3', 'Mitch_Kosowski', 'LamsonScribner', 'mbeacom', 'moneyfordogfood',
+    'michelgotta', 'vietlq', 'Ruski93', 'Skip_Carlson', 'jakerockland', 'NukeManDan', 'MatthewLilley', 'tylertommy21',
+    'kelvin60429', 'GetGitcoin', 'owocki'
+]
+
 # create more with
 # followers = api.GetFollowers(count=200)
 # [follower.screen_name for follower in followers]
@@ -178,10 +83,7 @@ def handle(self, *args, **options):
                 previous_hop = None
 
             Hop.objects.create(
-                twitter_profile=twitter_profile,
-                shortcode=shortcode,
-                previous_hop=previous_hop,
-                ip='127.0.0.1'
+                twitter_profile=twitter_profile, shortcode=shortcode, previous_hop=previous_hop, ip='127.0.0.1'
             )
             # TODO: Build the graph for each hop.
             # hop.build_graph(latest=False)

app/ethos/management/commands/reminder_users.py

@@ -25,9 +25,16 @@
 from ethos.models import Hop, ShortCode, TwitterProfile
 from ethos.utils import get_twitter_api
 
-already_sent = ['132','Munair','134','kauri_io','138','Jbschweitzer','139','Kavitagupta19','133','matrick','135','heyomarks','135','Consensys','134','craastad','132','owocki','140','ferrarijetpack','138','Somemikesena','135','leahfeuer','137','saintkamini','134','simondlr','138','elise_ransom','132','namdar','131','Gnsps','132','ThessyMehrain','Ezelby','Owocki','Kamescg', 'bsmokes_', 'Untra', 'tokenfoundry', 'everett_muzzy', 'Vladzamfir']
+already_sent = [
+    '132', 'Munair', '134', 'kauri_io', '138', 'Jbschweitzer', '139', 'Kavitagupta19', '133', 'matrick', '135',
+    'heyomarks', '135', 'Consensys', '134', 'craastad', '132', 'owocki', '140', 'ferrarijetpack', '138', 'Somemikesena',
+    '135', 'leahfeuer', '137', 'saintkamini', '134', 'simondlr', '138', 'elise_ransom', '132', 'namdar', '131', 'Gnsps',
+    '132', 'ThessyMehrain', 'Ezelby', 'Owocki', 'Kamescg', 'bsmokes_', 'Untra', 'tokenfoundry', 'everett_muzzy',
+    'Vladzamfir'
+]
 already_sent = [ele.lower() for ele in already_sent]
 
+
 class Command(BaseCommand):
     """Define the management command to generate Ethos reminder tweets."""
 
@@ -49,7 +56,9 @@ def handle(self, *args, **options):
             if options['live']:
                 twitter_api = get_twitter_api()
                 try:
-                    twitter_api.PostUpdate(tweet, media='https://cdn-images-1.medium.com/max/1440/1*gAG6JvDK-Al_c1xEn1VHpA.jpeg')
+                    twitter_api.PostUpdate(
+                        tweet, media='https://cdn-images-1.medium.com/max/1440/1*gAG6JvDK-Al_c1xEn1VHpA.jpeg'
+                    )
                 except Exception as e:
                     print(e)
                 time.sleep(10)

app/ethos/models.py

@@ -86,13 +86,14 @@ class Meta:
     black = (0, 0, 0, 0)
     grey = (122, 122, 122, 0)
     size = (1000, 1000)
-    center = (int(size[0]/2), int(size[1]/2))
+    center = (int(size[0] / 2), int(size[1] / 2))
     font = 'assets/v2/fonts/futura/FuturaStd-Medium.otf'
 
     # Model variables
     ip = models.GenericIPAddressField(protocol='IPv4', blank=True, null=True)
     twitter_profile = models.ForeignKey(
-        'ethos.TwitterProfile', on_delete=models.SET_NULL, null=True, related_name='hops')
+        'ethos.TwitterProfile', on_delete=models.SET_NULL, null=True, related_name='hops'
+    )
     txid = models.CharField(max_length=255, default='', blank=True)
     web3_address = models.CharField(max_length=255, blank=True)
     previous_hop = models.ForeignKey("self", on_delete=models.SET_NULL, blank=True, null=True)
@@ -125,16 +126,15 @@ def add_edge(self, img, loc, width=3):
         draw.line(loc, fill=self.grey, width=width)
         return img
 
-    def add_node_helper(self, img, name, loc, node_image=None, size=30, font='',
-                        font_size=12):
+    def add_node_helper(self, img, name, loc, node_image=None, size=30, font='', font_size=12):
         font = font or self.font
         x, y = loc
         font = ImageFont.truetype(font, font_size, encoding="unic")
         draw = ImageDraw.Draw(img)
-        x0 = x - int((size/2))
-        x1 = x + int((size/2))
-        y0 = y - int((size/2))
-        y1 = y + int((size/2))
+        x0 = x - int((size / 2))
+        x1 = x + int((size / 2))
+        y0 = y - int((size / 2))
+        y1 = y + int((size / 2))
         loc = [x0, y0, x1, y1]
 
         if not node_image:
@@ -161,7 +161,7 @@ def edge_size(self):
         if previous_hop:
             edge_size += previous_hop.edge_size()
 
-        time_lapsed = round((self.created_on - previous_hop.created_on).total_seconds()/60) if previous_hop else 100
+        time_lapsed = round((self.created_on - previous_hop.created_on).total_seconds() / 60) if previous_hop else 100
         this_edge_size = 0
         if 0 < time_lapsed < 30:
             this_edge_size = time_lapsed * 10
@@ -173,7 +173,6 @@ def edge_size(self):
         edge_size += this_edge_size
         return edge_size
 
-
     def draw_hop(self, img):
         node_image = None
         increment = self.increment()
@@ -198,8 +197,7 @@ def draw_hop(self, img):
 
         return img
 
-    def build_graph(self, save=True, root_node='Genesis', size=None,
-                    background_color=None, latest=True):
+    def build_graph(self, save=True, root_node='Genesis', size=None, background_color=None, latest=True):
         """Build the Hop graph."""
 
         file_system_cache_file = f"assets/tmp/{self.pk}.gif"
@@ -246,13 +244,8 @@ def build_gif(self):
 class TwitterProfile(SuperModel):
     """Define the Twitter Profile."""
 
-    profile_picture = ThumbnailerImageField(
-        upload_to='ethos/twitter_profiles/',
-        blank=True,
-        null=True,
-        max_length=255)
-    node_image = models.ImageField(
-        upload_to='ethos/node_images/', blank=True, null=True, max_length=255)
+    profile_picture = ThumbnailerImageField(upload_to='ethos/twitter_profiles/', blank=True, null=True, max_length=255)
+    node_image = models.ImageField(upload_to='ethos/node_images/', blank=True, null=True, max_length=255)
     username = models.CharField(max_length=255)
 
     class Meta:

app/ethos/views.py

@@ -84,7 +84,8 @@
     '"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],'
     '"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from",'
     '"type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value",'
-    '"type":"uint256"}],"name":"Transfer","type":"event"}]')
+    '"type":"uint256"}],"name":"Transfer","type":"event"}]'
+)
 
 # Instantiate EthOS contract
 try:
@@ -155,7 +156,7 @@ def redeem_coin(request, shortcode):
 
             twitter_profile, __ = TwitterProfile.objects.prefetch_related('hops').get_or_create(username=username)
             ethos = ShortCode.objects.get(shortcode=shortcode)
-            previous_hop = None 
+            previous_hop = None
 
             if address:
                 address = Web3.toChecksumAddress(address)
@@ -176,7 +177,7 @@ def redeem_coin(request, shortcode):
 
                 previous_hop = Hop.objects.select_related('shortcode').filter(shortcode=ethos).order_by('-id').first()
                 if previous_hop:
-                    time_lapsed = round((timezone.now() - previous_hop.created_on).total_seconds()/60)
+                    time_lapsed = round((timezone.now() - previous_hop.created_on).total_seconds() / 60)
                     n = 5
 
                     if time_lapsed < 25:
@@ -191,12 +192,7 @@ def redeem_coin(request, shortcode):
                 signed = w3.eth.account.signTransaction(tx, settings.ETHOS_ACCOUNT_PRIVATE_KEY)
                 message = w3.eth.sendRawTransaction(signed.rawTransaction).hex()
 
-            hop = Hop(
-                shortcode=ethos,
-                ip=get_ip(request),
-                created_on=timezone.now(),
-                twitter_profile=twitter_profile,
-            )
+            hop = Hop(shortcode=ethos, ip=get_ip(request), created_on=timezone.now(), twitter_profile=twitter_profile, )
             if message and message.startswith('0x'):
                 hop.txid = message
             if address and address.startswith('0x'):
@@ -240,10 +236,7 @@ def redeem_coin(request, shortcode):
             message = str(e)
 
         # API Response
-        response = {
-            'status': status,
-            'message': message,
-        }
+        response = {'status': status, 'message': message, }
 
         if status == 'OK':
             response['num_scans'] = num_scans
@@ -257,10 +250,6 @@ def redeem_coin(request, shortcode):
     except ShortCode.DoesNotExist:
         raise Http404
 
-    params = {
-        'class': 'redeem',
-        'title': _('EthOS Coin'),
-        'hide_send_tip': True
-    }
+    params = {'class': 'redeem', 'title': _('EthOS Coin'), 'hide_send_tip': True}
 
     return TemplateResponse(request, 'redeem_ethos.html', params)

app/github/tests/test_utils.py

@@ -119,10 +119,8 @@ def test_get_github_user_token(self):
         }
         params = urlencode(params, quote_via=quote_plus)
         url = settings.GITHUB_TOKEN_URL + '?' + params
-        responses.add(responses.GET, settings.GITHUB_TOKEN_URL,
-                      json=data, headers=JSON_HEADER, status=200)
-        responses.add(responses.GET, settings.GITHUB_TOKEN_URL,
-                      json={}, headers=JSON_HEADER, status=200)
+        responses.add(responses.GET, settings.GITHUB_TOKEN_URL, json=data, headers=JSON_HEADER, status=200)
+        responses.add(responses.GET, settings.GITHUB_TOKEN_URL, json={}, headers=JSON_HEADER, status=200)
         result = get_github_user_token(self.callback_code)
         result_no_token = get_github_user_token(self.callback_code)
 
@@ -136,8 +134,7 @@ def test_get_github_user_data(self):
         """Test the github utility get_github_user_data method."""
         headers = dict({'Authorization': f'token {self.user_oauth_token}'}, **JSON_HEADER)
         data = {'login': 'gitcoin'}
-        responses.add(responses.GET, 'https://api.github.com/user',
-                      json=data, headers=headers, status=200)
+        responses.add(responses.GET, 'https://api.github.com/user', json=data, headers=headers, status=200)
         result = get_github_user_data(self.user_oauth_token)
 
         assert result == data
@@ -147,8 +144,7 @@ def test_get_github_user_data_failure(self):
         """Test the github utility get_github_user_data method."""
         headers = dict({'Authorization': f'token {self.user_oauth_token}'}, **JSON_HEADER)
         data = {'login': 'gitcoin'}
-        responses.add(responses.GET, 'https://api.github.com/user',
-                      json=data, headers=headers, status=404)
+        responses.add(responses.GET, 'https://api.github.com/user', json=data, headers=headers, status=404)
         result = get_github_user_data(self.user_oauth_token)
 
         assert result == {}
@@ -173,10 +169,7 @@ def test_is_github_token_valid(self):
     @responses.activate
     def test_get_github_primary_email(self):
         """Test the github utility get_github_primary_email method."""
-        data = [
-            {'primary': True, 'email': 'test@gitcoin.co'},
-            {'email': 'test2@gitcoin.co'}
-        ]
+        data = [{'primary': True, 'email': 'test@gitcoin.co'}, {'email': 'test2@gitcoin.co'}]
         url = 'https://api.github.com/user/emails'
         responses.add(responses.GET, url, json=data, headers=HEADERS, status=200)
         responses.add(responses.GET, url, json=data, headers=HEADERS, status=404)
@@ -190,11 +183,7 @@ def test_get_github_primary_email(self):
     def test_get_github_emails(self):
         """Test the github utility get_github_emails method."""
         headers = dict({'Authorization': f'token {self.user_oauth_token}'}, **JSON_HEADER)
-        data = [
-            {'email': 'test@gitcoin.co'},
-            {'email': 'test2@gitcoin.co'},
-            {'email': 'testing@noreply.github.com'}
-        ]
+        data = [{'email': 'test@gitcoin.co'}, {'email': 'test2@gitcoin.co'}, {'email': 'testing@noreply.github.com'}]
         url = 'https://api.github.com/user/emails'
         responses.add(responses.GET, url, json=data, headers=headers, status=200)
         responses.add(responses.GET, url, json=data, headers=headers, status=404)
@@ -208,11 +197,7 @@ def test_get_github_emails(self):
     @responses.activate
     def test_get_issue_comments(self):
         """Test the github utility get_issue_comments method."""
-        params = {
-            'sort': 'created',
-            'direction': 'desc',
-            'per_page': 100,
-        }
+        params = {'sort': 'created', 'direction': 'desc', 'per_page': 100, }
         params = urlencode(params, quote_via=quote_plus)
         owner = 'gitcoinco'
         repo = 'web'
@@ -225,11 +210,7 @@ def test_get_issue_comments(self):
     @responses.activate
     def test_get_issue_comments_issue(self):
         """Test the github utility get_issue_comments_issue method."""
-        params = {
-            'sort': 'created',
-            'direction': 'desc',
-            'per_page': 100,
-        }
+        params = {'sort': 'created', 'direction': 'desc', 'per_page': 100, }
         params = urlencode(params, quote_via=quote_plus)
         owner = 'gitcoinco'
         repo = 'web'
@@ -244,12 +225,7 @@ def test_get_issue_comments_issue(self):
     @responses.activate
     def test_get_issue_timeline_events(self):
         """Test the github utility get_issue_timeline_events method."""
-        params = {
-            'sort': 'created',
-            'direction': 'desc',
-            'per_page': 100,
-            'page': 1
-        }
+        params = {'sort': 'created', 'direction': 'desc', 'per_page': 100, 'page': 1}
         params = urlencode(params, quote_via=quote_plus)
         owner = 'gitcoinco'
         repo = 'web'

app/github/utils.py

@@ -37,11 +37,7 @@
 BASE_URI = settings.BASE_URL.rstrip('/')
 HEADERS = {'Accept': 'application/vnd.github.squirrel-girl-preview'}
 V3HEADERS = {'Accept': 'application/vnd.github.v3.text-match+json'}
-JSON_HEADER = {
-    'Accept': 'application/json',
-    'User-Agent': settings.GITHUB_APP_NAME,
-    'Origin': settings.BASE_URL
-}
+JSON_HEADER = {'Accept': 'application/json', 'User-Agent': settings.GITHUB_APP_NAME, 'Origin': settings.BASE_URL}
 TIMELINE_HEADERS = {'Accept': 'application/vnd.github.mockingbird-preview'}
 TOKEN_URL = '{api_url}/applications/{client_id}/tokens/{oauth_token}'
 
@@ -85,10 +81,7 @@ def check_github(profile):
 
 def search_github(q):
 
-    params = (
-        ('q', q),
-        ('sort', 'updated'),
-    )
+    params = (('q', q), ('sort', 'updated'), )
     response = requests.get('https://api.github.com/search/users', headers=HEADERS, params=params)
     return response.json()
 
@@ -199,15 +192,10 @@ def get_auth_url(redirect_uri='/'):
 
 def get_github_user_token(code, **kwargs):
     """Get the Github authorization token."""
-    _params = {
-        'code': code,
-        'client_id': settings.GITHUB_CLIENT_ID,
-        'client_secret': settings.GITHUB_CLIENT_SECRET
-    }
+    _params = {'code': code, 'client_id': settings.GITHUB_CLIENT_ID, 'client_secret': settings.GITHUB_CLIENT_SECRET}
     # Add additional parameters to the request paramaters.
     _params.update(kwargs)
-    response = requests.get(
-        settings.GITHUB_TOKEN_URL, headers=JSON_HEADER, params=_params)
+    response = requests.get(settings.GITHUB_TOKEN_URL, headers=JSON_HEADER, params=_params)
     response = response.json()
     scope = response.get('scope', None)
     if scope:
@@ -289,13 +277,9 @@ def search(query):
         request.Response: The github search response.
 
     """
-    params = (
-        ('q', query),
-        ('sort', 'updated'),
-    )
+    params = (('q', query), ('sort', 'updated'), )
 
-    response = requests.get('https://api.github.com/search/users',
-                            auth=_AUTH, headers=V3HEADERS, params=params)
+    response = requests.get('https://api.github.com/search/users', auth=_AUTH, headers=V3HEADERS, params=params)
     return response.json()
 
 
@@ -331,13 +315,7 @@ def get_issue_comments(owner, repo, issue=None, comment_id=None):
 
 def get_issues(owner, repo, page=1, state='open'):
     """Get the open issues on a respository."""
-    params = {
-        'state': state,
-        'sort': 'created',
-        'direction': 'desc',
-        'page': page,
-        'per_page': 100,
-    }
+    params = {'state': state, 'sort': 'created', 'direction': 'desc', 'page': page, 'per_page': 100, }
     url = f'https://api.github.com/repos/{owner}/{repo}/issues'
 
     response = requests.get(url, auth=_AUTH, headers=HEADERS, params=params)
@@ -359,12 +337,7 @@ def get_issue_timeline_events(owner, repo, issue, page=1):
     Returns:
         requests.Response: The GitHub timeline response.
     """
-    params = {
-        'sort': 'created',
-        'direction': 'desc',
-        'per_page': 100,
-        'page': page,
-    }
+    params = {'sort': 'created', 'direction': 'desc', 'per_page': 100, 'page': page, }
     url = f'https://api.github.com/repos/{owner}/{repo}/issues/{issue}/timeline'
     # Set special header to access timeline preview api
     response = requests.get(url, auth=_AUTH, headers=TIMELINE_HEADERS, params=params)
@@ -373,10 +346,7 @@ def get_issue_timeline_events(owner, repo, issue, page=1):
 
 
 def get_interested_actions(github_url, username, email=''):
-    activity_event_types = [
-        'commented', 'cross-referenced', 'merged', 'referenced',
-        'review_requested',
-    ]
+    activity_event_types = ['commented', 'cross-referenced', 'merged', 'referenced', 'review_requested', ]
 
     owner = org_name(github_url)
     repo = repo_name(github_url)
@@ -460,9 +430,14 @@ def patch_issue_comment(comment_id, owner, repo, comment):
     if response.status_code == 200:
         return response.json()
     rollbar.report_message(
-        'Github issue comment patch returned non-200 status code', 'warning',
+        'Github issue comment patch returned non-200 status code',
+        'warning',
         request=response.request,
-        extra_data={'status_code': response.status_code, 'reason': response.reason})
+        extra_data={
+            'status_code': response.status_code,
+            'reason': response.reason
+        }
+    )
     return {}
 
 
@@ -473,16 +448,17 @@ def delete_issue_comment(comment_id, owner, repo):
         response = requests.delete(url, auth=_AUTH)
         return response.json()
     except ValueError:
-        logger.error(f"could not delete issue comment because JSON response could not be decoded: {comment_id}, {owner}, {repo}.  {response.status_code}, {response.text} ")
+        logger.error(
+            f"could not delete issue comment because JSON response could not be decoded: {comment_id}, {owner}, {repo}.  {response.status_code}, {response.text} "
+        )
     except Exception:
         return {}
 
 
 def post_issue_comment_reaction(owner, repo, comment_id, content):
     """React to an issue comment."""
     url = f'https://api.github.com/repos/{owner}/{repo}/issues/comments/{comment_id}/reactions'
-    response = requests.post(
-        url, data=json.dumps({'content': content}), auth=_AUTH, headers=HEADERS)
+    response = requests.post(url, data=json.dumps({'content': content}), auth=_AUTH, headers=HEADERS)
     return response.json()
 
 

requirements/test.txt

@@ -10,4 +10,4 @@ isort
 responses
 requests_mock
 django-test-plus
-yapf
+git+https://github.com/google/yapf.git#egg=yapf

setup.cfg

@@ -83,3 +83,4 @@ ALLOW_MULTILINE_LAMBDAS = true
 BLANK_LINE_BEFORE_NESTED_CLASS_OR_DEF = true
 INDENT_DICTIONARY_VALUE = true
 SPLIT_BEFORE_EXPRESSION_AFTER_OPENING_PAREN = true
+DISABLE_ENDING_COMMA_HEURISTIC = true