From 5ddc029b323a929f2a76fa22c21c89d8aa724924 Mon Sep 17 00:00:00 2001 From: mreficent Date: Tue, 23 Mar 2021 18:06:43 +0100 Subject: [PATCH] [FIX] openupgrade_records: _inherits was not being compared --- upgrade_analysis/compare.py | 8 ++++---- upgrade_analysis/models/upgrade_record.py | 2 +- upgrade_analysis/upgrade_log.py | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/upgrade_analysis/compare.py b/upgrade_analysis/compare.py index bc505bd6f..0b3496d93 100644 --- a/upgrade_analysis/compare.py +++ b/upgrade_analysis/compare.py @@ -228,7 +228,7 @@ def compare_sets(old_records, new_records): "relation", "type", "selection_keys", - "inherits", + "_inherits", "stored", "isfunction", "isrelated", @@ -244,7 +244,7 @@ def compare_sets(old_records, new_records): "module", "relation", "selection_keys", - "inherits", + "_inherits", "stored", "isfunction", "isrelated", @@ -260,7 +260,7 @@ def compare_sets(old_records, new_records): "relation", "type", "selection_keys", - "inherits", + "_inherits", "stored", "isfunction", "isrelated", @@ -274,7 +274,7 @@ def compare_sets(old_records, new_records): "required", "selection_keys", "req_default", - "inherits", + "_inherits", "mode", "attachment", ] diff --git a/upgrade_analysis/models/upgrade_record.py b/upgrade_analysis/models/upgrade_record.py index 6aa07cab6..2e93cf030 100644 --- a/upgrade_analysis/models/upgrade_record.py +++ b/upgrade_analysis/models/upgrade_record.py @@ -102,7 +102,7 @@ class UpgradeRecord(models.Model): "req_default", "hasdefault", "table", - "inherits", + "_inherits", ] template = {x: False for x in keys} diff --git a/upgrade_analysis/upgrade_log.py b/upgrade_analysis/upgrade_log.py index 345b1d772..84547402f 100644 --- a/upgrade_analysis/upgrade_log.py +++ b/upgrade_analysis/upgrade_log.py @@ -137,7 +137,6 @@ def log_model(model, local_registry): "selection_keys": "", "req_default": "", "hasdefault": model._fields[k].default and "hasdefault" or "", - "inherits": "", } if v.type == "selection": if isinstance(v.selection, (tuple, list)):