Merge pull request #39 from mattip/django-3

Update speed.pypy.org for django3

Author: mattip

codespeed/models.py

@@ -9,18 +9,12 @@
 from django.urls import reverse
 from django.conf import settings
 from django.db import models
-try:
-    from django.utils.encoding import python_2_unicode_compatible
-except ImportError:
-    def python_2_unicode_compatible(arg):
-        return arg
 
 from .commits.github import GITHUB_URL_RE
 
 logger = logging.getLogger(__name__)
 
 
-@python_2_unicode_compatible
 class Project(models.Model):
     NO_LOGS = 'N'
     GIT = 'G'
@@ -106,7 +100,6 @@ def is_less_important_than(self, val, color):
             return False
 
 
-@python_2_unicode_compatible
 class Branch(models.Model):
     name = models.CharField(max_length=32)
     project = models.ForeignKey(
@@ -123,7 +116,6 @@ class Meta:
         verbose_name_plural = "branches"
 
 
-@python_2_unicode_compatible
 class Revision(models.Model):
     # git and mercurial's SHA-1 length is 40
     commitid = models.CharField(max_length=42)
@@ -166,7 +158,6 @@ def clean(self):
                 raise ValidationError("Invalid SVN commit id %s" % self.commitid)
 
 
-@python_2_unicode_compatible
 class Executable(models.Model):
     name = models.CharField(max_length=30)
     description = models.CharField(max_length=200, blank=True)
@@ -180,7 +171,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class Benchmark(models.Model):
     B_TYPES = (
         ('C', 'Cross-project'),
@@ -215,7 +205,6 @@ def clean(self):
                                   "'default_on_comparison' first.")
 
 
-@python_2_unicode_compatible
 class Environment(models.Model):
     name = models.CharField(unique=True, max_length=100)
     cpu = models.CharField(max_length=100, blank=True)
@@ -227,7 +216,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
 class Result(models.Model):
     value = models.FloatField()
     std_dev = models.FloatField(blank=True, null=True)
@@ -252,7 +240,6 @@ class Meta:
         unique_together = ("revision", "executable", "benchmark", "environment")
 
 
-@python_2_unicode_compatible
 class Report(models.Model):
     revision = models.ForeignKey(
         Revision, on_delete=models.CASCADE, related_name="reports")

codespeed/templates/codespeed/changes_data.html

@@ -17,13 +17,13 @@
     <td>{% if rev.get_browsing_url %}<a href="{{ rev.get_browsing_url }}">{{ rev.commitid }}</a>{% else %}{{ rev.commitid }}{% endif %}</td>
   </tr>
   <tr class="date"><th class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
-  {% ifnotequal rev.branch.project.repo_type "N" %}
+  {% if rev.branch.project.repo_type  != "N" %}
     <tr class="repo-path"><th class="infofirst">Repo</th><td>{{ rev.branch.project.repo_path }}</td></tr>
-  {% endifnotequal %}
+  {% endif %}
 </tbody>
 </table>
 
-{% ifnotequal exe.project.repo_type 'N' %}
+{% if exe.project.repo_type != 'N' %}
   <table class="revision">
       <col/>
       <col/>
@@ -40,5 +40,5 @@
       el.load("logs/", "revisionid=" + el.data("commitid"));
     </script>
 </table>
-{% endifnotequal %}
+{% endif %}
 </div>

codespeed/templates/codespeed/changes_table.html

@@ -26,7 +26,7 @@
     {% endif%}{% if units.has_stddev %}<td>{{ units.totals.min }}</td>
     {% endif%}{% if units.hasmax %}<td>{{ units.totals.max }}</td>
     {% endif%}<td>{{ units.totals.change|percentage }}</td>
-    <td>{% ifnotequal units.totals.trend "-" %}{{ units.totals.trend|floatformat:2 }}%{% else %}{{ units.totals.trend }}{% endifnotequal %}</td>
+    <td>{% if units.totals.trend  != "-" %}{{ units.totals.trend|floatformat:2 }}%{% else %}{{ units.totals.trend }}{% endif %}</td>
   </tr>
 </tfoot>
 <tbody>
@@ -38,7 +38,7 @@
     {% endif%}{% if units.hasmin %}<td>{{ row.val_min|floatformat:units.precission }}</td>
     {% endif%}{% if units.hasmax %}<td>{{ row.val_max|floatformat:units.precission }}</td>
     {% endif%}<td>{{ row.change|percentage }}</td>
-    <td>{% ifequal row.trend "-" %}-{% else %}{{ row.trend|floatformat:2 }}%{% endifequal %}</td>
+    <td>{% if row.trend == "-" %}-{% else %}{{ row.trend|floatformat:2 }}%{% endif %}</td>
   </tr>{% endfor %}
 </tbody>
 </table>{% endfor %}

codespeed/templates/codespeed/timeline.html

@@ -54,7 +54,7 @@
 </div>
 <div id="benchmark" class="sidebox">
   <div class="boxhead"><h2>Benchmark</h2></div>
-  <div class="boxbody">{% ifnotequal benchmarks|length 1 %}
+  <div class="boxbody">{% if benchmarks|length != 1 %}
   <ul>
     <li>
       <input id="benchmarkgrid" type="radio" name="benchmark" value="grid" />
@@ -64,7 +64,7 @@
       <input id="b_show_none" type="radio" name="benchmark" value="show_none" />
       <label for="b_show_none">Display none</label>
     </li>
-  </ul>{% endifnotequal %}
+  </ul>{% endif %}
   <ul>{% for bench in benchmarks|dictsort:"name" %}
     <li title="{{ bench.description }}">
       <input id="benchmark_{{ bench.id }}" type="radio" name="benchmark" value="{{ bench.name }}" />

codespeed/urls.py

@@ -1,35 +1,35 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls import url
+from django.urls import re_path
 from django.views.generic import TemplateView
 
 from codespeed import views
 from codespeed.feeds import LatestEntries, LatestSignificantEntries
 
 urlpatterns = [
-    url(r'^$', views.HomeView.as_view(), name='home'),
-    url(r'^about/$',
+    re_path(r'^$', views.HomeView.as_view(), name='home'),
+    re_path(r'^about/$',
         TemplateView.as_view(template_name='about.html'), name='about'),
     # RSS for reports
-    url(r'^feeds/latest/$', LatestEntries(), name='latest-results'),
-    url(r'^feeds/latest_significant/$', LatestSignificantEntries(),
+    re_path(r'^feeds/latest/$', LatestEntries(), name='latest-results'),
+    re_path(r'^feeds/latest_significant/$', LatestSignificantEntries(),
         name='latest-significant-results'),
 ]
 
 urlpatterns += [
-    url(r'^historical/json/$', views.gethistoricaldata, name='gethistoricaldata'),
-    url(r'^reports/$', views.reports, name='reports'),
-    url(r'^changes/$', views.changes, name='changes'),
-    url(r'^changes/table/$', views.getchangestable, name='getchangestable'),
-    url(r'^changes/logs/$', views.displaylogs, name='displaylogs'),
-    url(r'^timeline/$', views.timeline, name='timeline'),
-    url(r'^timeline/json/$', views.gettimelinedata, name='gettimelinedata'),
-    url(r'^comparison/$', views.comparison, name='comparison'),
-    url(r'^comparison/json/$', views.getcomparisondata, name='getcomparisondata'),
-    url(r'^makeimage/$', views.makeimage, name='makeimage'),
+    re_path(r'^historical/json/$', views.gethistoricaldata, name='gethistoricaldata'),
+    re_path(r'^reports/$', views.reports, name='reports'),
+    re_path(r'^changes/$', views.changes, name='changes'),
+    re_path(r'^changes/table/$', views.getchangestable, name='getchangestable'),
+    re_path(r'^changes/logs/$', views.displaylogs, name='displaylogs'),
+    re_path(r'^timeline/$', views.timeline, name='timeline'),
+    re_path(r'^timeline/json/$', views.gettimelinedata, name='gettimelinedata'),
+    re_path(r'^comparison/$', views.comparison, name='comparison'),
+    re_path(r'^comparison/json/$', views.getcomparisondata, name='getcomparisondata'),
+    re_path(r'^makeimage/$', views.makeimage, name='makeimage'),
 ]
 
 urlpatterns += [
     # URLs for adding results
-    url(r'^result/add/json/$', views.add_json_results, name='add-json-results'),
-    url(r'^result/add/$', views.add_result, name='add-result'),
+    re_path(r'^result/add/json/$', views.add_json_results, name='add-json-results'),
+    re_path(r'^result/add/$', views.add_result, name='add-result'),
 ]

codespeed/views.py

@@ -11,7 +11,7 @@
 from django.http import HttpResponse, Http404, HttpResponseBadRequest, \
     HttpResponseNotFound, StreamingHttpResponse
 from django.db.models import F
-from django.shortcuts import get_object_or_404, render_to_response
+from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_GET, require_POST
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import TemplateView
@@ -33,7 +33,7 @@
 
 def no_environment_error(request):
     admin_url = reverse('admin:codespeed_environment_changelist')
-    return render_to_response('codespeed/nodata.html', {
+    return render(request, 'codespeed/nodata.html', {
         'message': ('You need to configure at least one Environment. '
                     'Please go to the '
                     '<a href="%s">admin interface</a>' % admin_url)
@@ -42,7 +42,7 @@ def no_environment_error(request):
 
 def no_default_project_error(request):
     admin_url = reverse('admin:codespeed_project_changelist')
-    return render_to_response('codespeed/nodata.html', {
+    return render(request, 'codespeed/nodata.html', {
         'message': ('You need to configure at least one one Project as '
                     'default (checked "Track changes" field).<br />'
                     'Please go to the '
@@ -51,13 +51,13 @@ def no_default_project_error(request):
 
 
 def no_executables_error(request):
-    return render_to_response('codespeed/nodata.html', {
+    return render(request, 'codespeed/nodata.html', {
         'message': 'There needs to be at least one executable'
     })
 
 
 def no_data_found(request):
-    return render_to_response('codespeed/nodata.html', {
+    return render(request, 'codespeed/nodata.html', {
         'message': 'No data found'
     })
 
@@ -319,7 +319,7 @@ def comparison(request):
             settings.CHART_ORIENTATION == 'horizontal'):
         selecteddirection = True
 
-    return render_to_response('codespeed/comparison.html', {
+    return render(request, 'codespeed/comparison.html', {
         'checkedexecutables': checkedexecutables,
         'checkedbenchmarks': checkedbenchmarks,
         'checkedenviros': checkedenviros,
@@ -633,7 +633,7 @@ def timeline(request):
     for proj in Project.objects.filter(track=True):
         executables[proj] = Executable.objects.filter(project=proj)
     use_median_bands = hasattr(settings, 'USE_MEDIAN_BANDS') and settings.USE_MEDIAN_BANDS
-    return render_to_response('codespeed/timeline.html', {
+    return render(request, 'codespeed/timeline.html', {
         'pagedesc': pagedesc,
         'checkedexecutables': checkedexecutables,
         'defaultbaseline': defaultbaseline,
@@ -717,7 +717,7 @@ def getchangestable(request):
                             '<p class="errormessage">No results for this '
                             'parameters</p>')
 
-    return render_to_response('codespeed/changes_data.html', {
+    return render(request, 'codespeed/changes_data.html', {
         'tablelist': tablelist,
         'trendconfig': trendconfig,
         'rev': selectedrev,
@@ -823,7 +823,7 @@ def changes(request):
 
     pagedesc = "Report of %s performance changes for commit %s on branch %s" % \
         (defaultexecutable, selectedrevision.commitid, selectedrevision.branch)
-    return render_to_response('codespeed/changes.html', {
+    return render(request, 'codespeed/changes.html', {
         'pagedesc': pagedesc,
         'defaultenvironment': defaultenv,
         'defaultexecutable': defaultexecutable,
@@ -850,7 +850,7 @@ def reports(request):
         colorcode__in=('red', 'green')
     ).order_by('-revision__date')[:10]
 
-    return render_to_response('codespeed/reports.html', context)
+    return render(request, 'codespeed/reports.html', context)
 
 
 @require_GET
@@ -895,7 +895,8 @@ def displaylogs(request):
     for log in logs:
         log['commit_browse_url'] = project.commit_browsing_url.format(**log)
 
-    return render_to_response(
+    return render(
+        request, 
         'codespeed/changes_logs.html',
         {
             'error': error, 'logs': logs,

deploy-requirements.txt

@@ -1,3 +1,3 @@
 -r requirements.txt
-psycopg2==2.9.3
-gunicorn==20.1.0
+psycopg-binary==3.1.17
+gunicorn==21.2.0

requirements.txt

@@ -1,3 +1,3 @@
-Django>=1.11,<2.2
+django<4
 isodate==0.6.1
 matplotlib<3.8

speed_pypy/settings.py

@@ -25,6 +25,8 @@
     }
 }
 
+DEFAULT_AUTO_FIELD='django.db.models.AutoField'
+
 TIME_ZONE = 'America/Chicago'
 
 LANGUAGE_CODE = 'en-us'

speed_pypy/templates/feeds/latest_description.html

@@ -1,8 +1,8 @@
-{% ifequal obj.colorcode "red" %}Performance regressed: {% else %}
-    {% ifequal obj.colorcode "green" %}Performance improved: {% else %}
-        {% ifequal obj.colorcode "yellow" %}Trend regressed: {% else %}
+{% if obj.colorcode == "red" %}Performance regressed: {% else %}
+    {% if obj.colorcode == "green" %}Performance improved: {% else %}
+        {% if obj.colorcode == "yellow" %}Trend regressed: {% else %}
             No significant changes.
-        {% endifequal %}
-    {% endifequal %}
-{% endifequal %}
+        {% endif %}
+    {% endif %}
+{% endif %}
 {{ obj.summary }}