Merge branch 'master' into contributors-image

coala · Feb 4, 2019 · 7da2509 · 7da2509
2 parents 97fdf02 + 569c3cc
commit 7da2509
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/.coafile b/.coafile
@@ -67,3 +67,8 @@ keywords = coala
 bears = PyPluralNamingBear
 files = **.py
 ignore_list = LOGGING, MIDDLEWARE
+
+[all.jinja]
+files = templates/**.html
+bears = Jinja2Bear
+check_end_labels = False
diff --git a/.moban.yaml b/.moban.yaml
@@ -23,7 +23,7 @@ dependencies:
   - django-eventtools
   - git+https://gitlab.com/gitmate/open-source/IGitt.git@1fa5a0a21ea4fb8739d467c06972f748717adbdc
   - requests
-  - git+https://github.com/andrewda/trav.git
+  - git+https://github.com/andrewda/trav.git@ce805d12d3d1db0a51b1aa26bba9cd9ecc0d96b8
   - python-dateutil
   - pillow
   - ruamel.yaml

diff --git a/community/views.py b/community/views.py
@@ -17,7 +17,7 @@ class HomePageView(TemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['isTravis'] = Travis.TRAVIS
-        context['travisLink'] = Travis.BUILD_WEB_URL
+        context['travisLink'] = Travis.TRAVIS_BUILD_WEB_URL
 
         print('Running on Travis: {}, build link: {}'.format(
             context['isTravis'],

diff --git a/gamification/process/activity_points.py b/gamification/process/activity_points.py
@@ -12,7 +12,7 @@ def get_activity_with_points(activity_type, labels):
                           activity. e.g. issue or merge_request.
     :param labels:        a QuerySet dict containing the 'name'
                           as key and 'name of the label' as value.
-    :return:              a touple of points and activity string.
+    :return:              a tuple of points and activity string.
     """
     labels = get_sorted_labels(labels)
     points = get_total_points(activity_type, labels)

diff --git a/manage.py b/manage.py
@@ -4,6 +4,8 @@
 
 
 if __name__ == '__main__':
+    if (sys.version_info[0], sys.version_info[1]) < (3, 6):
+        raise Exception('Minimum python version 3.6 is required.')
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'community.settings')
     try:
         from django.core.management import execute_from_command_line

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ django-distill
 django-eventtools
 git+https://gitlab.com/gitmate/open-source/IGitt.git@1fa5a0a21ea4fb8739d467c06972f748717adbdc
 requests
-git+https://github.com/andrewda/trav.git
+git+https://github.com/andrewda/trav.git@ce805d12d3d1db0a51b1aa26bba9cd9ecc0d96b8
 python-dateutil
 pillow
 ruamel.yaml

diff --git a/templates/contributors.html b/templates/contributors.html
@@ -34,7 +34,7 @@ <h1>Details of all the contributors</h1>
                 <p>teams:
                 {% for team in contributor.teams.all %}
                     {{ team.name }}
-                {% endfor %}
+                {% endfor %}{# for team in contributor.teams.all #}
                 </p>
               </div>
             </div>

diff --git a/templates/gamification.html b/templates/gamification.html
@@ -32,19 +32,19 @@ <h1>The gamification leaderboard</h1>
                   <p>{{ forloop.counter }}. {{ activity.name }}, performed_at:
                     {{ activity.performed_at }} updated_at: {{ activity.updated_at }}
                   </p>
-                {% endfor %}
+                  {% endfor %}{# for activity in participant.activities.all #}
                 <p>Badges Earned:
                 {% for badge in participant.badges.all %}
                   <p>{{ forloop.counter }}.{{ badge.name }}</p>
-                {% endfor %}
+                  {% endfor %}{# for badge in participant.badges.all #}
                 </p>
               </div>
             </div>
           </div>
         </div>
       </div>
       <hr>
-      {% endfor %}{# for contributor in contributors #}
+      {% endfor %}{# for participant in participants #}
     </ul>
   </body>
 </html>
diff --git a/templates/index.html b/templates/index.html
@@ -24,6 +24,6 @@
     </ul>
     {% if isTravis %}
     <small>This website was built automatically using Travis CI. A link to the build can be found <a href="{{ travisLink }}">here</a>.</small>
-    {% endif %}
+    {% endif %}{# if isTravis #}
   </body>
 </html>
diff --git a/templates/openhub.html b/templates/openhub.html
@@ -10,9 +10,9 @@
   </head>
   <body>
     <h1>All of our Portfolio Projects</h1>
-    {%  for error in errors %}
+    {% for error in errors %}
     <p>{{ error | safe }}</p>
-    {%  endfor  %}
+    {% endfor %}{# for error in errors #}
 
     {% for project in projects %}
     <div class="container">
@@ -38,6 +38,5 @@ <h1>All of our Portfolio Projects</h1>
       </div>
     </div>
     <hr>
-    {% endfor %}{# for project in projects #}
-  </body>
+    {% endfor %}{# for project in projects #} {# for project in projects #}  </body>
 </html>