group comparison page by source, update fixtures and tests

  Replace benchmark_type='C' filter with grouping by Benchmark.S_TYPES.
  Sidebar now shows source labels ('Legacy', 'PyPerformance') as group
  headers. Default checked benchmarks no longer require source='legacy'.
  Update fixtures and tests to use the renamed field.

  Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: mattip

codespeed/admin.py

@@ -58,7 +58,7 @@ class ExecutableAdmin(admin.ModelAdmin):
 
 @admin.register(Benchmark)
 class BenchmarkAdmin(admin.ModelAdmin):
-    list_display = ('name', 'benchmark_type', 'data_type', 'description',
+    list_display = ('name', 'source', 'data_type', 'description',
                     'units_title', 'units', 'lessisbetter',
                     'default_on_comparison')
     list_filter = ('data_type', 'lessisbetter')

codespeed/fixtures/jruby.json

@@ -219,7 +219,7 @@
     "fields": {
         "name": "float",
         "parent": null,
-        "benchmark_type": "C",
+        "source": "legacy",
         "data_type": "U",
         "description": "",
         "units_title": "Time",
@@ -234,7 +234,7 @@
     "fields": {
         "name": "int",
         "parent": null,
-        "benchmark_type": "C",
+        "source": "legacy",
         "data_type": "U",
         "description": "",
         "units_title": "Time",

codespeed/fixtures/testdata.json

@@ -210,7 +210,7 @@
         "fields": {
             "parent": null,
             "name": "float",
-            "benchmark_type": "C",
+            "source": "legacy",
             "default_on_comparison": true,
             "units_title": "Time",
             "units": "seconds",
@@ -224,7 +224,7 @@
         "fields": {
             "parent": null,
             "name": "int",
-            "benchmark_type": "C",
+            "source": "legacy",
             "default_on_comparison": true,
             "units_title": "Time",
             "units": "seconds",

codespeed/fixtures/timeline_tests.json

@@ -172,9 +172,9 @@ def __str__(self):
 
 
 class Benchmark(models.Model):
-    B_TYPES = (
-        ('C', 'Cross-project'),
-        ('O', 'Own-project'),
+    S_TYPES = (
+        ('legacy', 'Legacy'),
+        ('pyperformance', 'PyPerformance'),
     )
     D_TYPES = (
         ('U', 'Mean'),
@@ -186,7 +186,7 @@ class Benchmark(models.Model):
         'self', on_delete=models.CASCADE, verbose_name="parent",
         help_text="allows to group benchmarks in hierarchies",
         null=True, blank=True, default=None)
-    benchmark_type = models.CharField(max_length=1, choices=B_TYPES, default='C')
+    source = models.CharField(max_length=14, choices=S_TYPES, default='legacy')
     data_type = models.CharField(max_length=1, choices=D_TYPES, default='U')
     description = models.CharField(max_length=300, blank=True)
     units_title = models.CharField(max_length=30, default='Time')
@@ -198,12 +198,6 @@ class Benchmark(models.Model):
     def __str__(self):
         return self.name
 
-    def clean(self):
-        if self.default_on_comparison and self.benchmark_type != 'C':
-            raise ValidationError("Only cross-project benchmarks are shown "
-                                  "on the comparison page. Deactivate "
-                                  "'default_on_comparison' first.")
-
 
 class Environment(models.Model):
     name = models.CharField(unique=True, max_length=100)
@@ -223,6 +217,7 @@ class Result(models.Model):
     val_max = models.FloatField(blank=True, null=True)
     q1 = models.FloatField(blank=True, null=True)
     q3 = models.FloatField(blank=True, null=True)
+    suite_version = models.CharField(max_length=50, blank=True, default='')
     date = models.DateTimeField(blank=True, null=True)
     revision = models.ForeignKey(
         Revision, on_delete=models.CASCADE, related_name="results")

codespeed/models.py

@@ -42,7 +42,7 @@ def test_add_correct_result(self):
         # Check that the data was correctly saved
         e = Environment.objects.get(name='Dual Core')
         b = Benchmark.objects.get(name='float')
-        self.assertEqual(b.benchmark_type, "C")
+        self.assertEqual(b.source, "legacy")
         self.assertEqual(b.units, "seconds")
         self.assertEqual(b.lessisbetter, True)
         p = Project.objects.get(name='MyProject')
@@ -224,7 +224,7 @@ def test_add_correct_results(self):
         # Check that the data was correctly saved
         e = Environment.objects.get(name='bigdog')
         b = Benchmark.objects.get(name='Richards')
-        self.assertEqual(b.benchmark_type, "C")
+        self.assertEqual(b.source, "legacy")
         self.assertEqual(b.units, "seconds")
         self.assertEqual(b.lessisbetter, True)
         p = Project.objects.get(name='pypy')

codespeed/tests/test_views.py

@@ -317,23 +317,21 @@ def comparison(request):
     if not checkedexecutables:
         checkedexecutables = exekeys
 
-    units_titles = Benchmark.objects.filter(
-        benchmark_type="C"
-    ).values('units_title').distinct()
-    units_titles = [unit['units_title'] for unit in units_titles]
     benchmarks = {}
     bench_units = {}
-    for unit in units_titles:
-        # Only include benchmarks marked as cross-project
-        benchmarks[unit] = Benchmark.objects.filter(
-            benchmark_type="C"
-        ).filter(units_title=unit)
-        units = benchmarks[unit][0].units
-        lessisbetter = (benchmarks[unit][0].lessisbetter and
-                        ' (less is better)' or ' (more is better)')
-        bench_units[unit] = [
-            [b.id for b in benchmarks[unit]], lessisbetter, units
-        ]
+    for source_val, source_label in Benchmark.S_TYPES:
+        qs = Benchmark.objects.filter(source=source_val)
+        if not qs.exists():
+            continue
+        benchmarks[source_label] = qs
+        for unit in qs.values_list('units_title', flat=True).distinct():
+            unit_qs = qs.filter(units_title=unit)
+            units = unit_qs[0].units
+            lessisbetter = (unit_qs[0].lessisbetter and
+                            ' (less is better)' or ' (more is better)')
+            bench_units[unit] = [
+                [b.id for b in unit_qs], lessisbetter, units
+            ]
     checkedbenchmarks = []
     if 'ben' in data:
         checkedbenchmarks = []
@@ -345,9 +343,7 @@ def comparison(request):
             except Benchmark.DoesNotExist:
                 pass
     if not checkedbenchmarks:
-        # Only include benchmarks marked as cross-project
-        checkedbenchmarks = Benchmark.objects.filter(
-            benchmark_type="C", default_on_comparison=True)
+        checkedbenchmarks = Benchmark.objects.filter(default_on_comparison=True)
 
     charts = ['normal bars', 'stacked bars', 'relative bars']
     # Don't show relative charts as an option if there is only one executable