diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b83bfa..057a549 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - name: Check Black uses: psf/black@stable with: - options: "--check --skip-string-normalization" + options: "--check --skip-string-normalization --fast" src: "netbox-lifecycle/netbox_lifecycle" - name: Run tests diff --git a/netbox_lifecycle/migrations/0016_add_virtual_machine_support.py b/netbox_lifecycle/migrations/0016_add_virtual_machine_support.py index 81ea8ed..d4fb7a3 100644 --- a/netbox_lifecycle/migrations/0016_add_virtual_machine_support.py +++ b/netbox_lifecycle/migrations/0016_add_virtual_machine_support.py @@ -61,7 +61,7 @@ class Migration(migrations.Migration): migrations.AddConstraint( model_name='licenseassignment', constraint=models.CheckConstraint( - check=models.Q(device__isnull=True, virtual_machine__isnull=False) + condition=models.Q(device__isnull=True, virtual_machine__isnull=False) | models.Q(device__isnull=False, virtual_machine__isnull=True) | models.Q(device__isnull=True, virtual_machine__isnull=True), name='netbox_lifecycle_licenseassignment_device_vm_exclusive', @@ -72,7 +72,7 @@ class Migration(migrations.Migration): migrations.AddConstraint( model_name='supportcontractassignment', constraint=models.CheckConstraint( - check=models.Q(device__isnull=True, virtual_machine__isnull=False) + condition=models.Q(device__isnull=True, virtual_machine__isnull=False) | models.Q(device__isnull=False, virtual_machine__isnull=True) | models.Q(device__isnull=True, virtual_machine__isnull=True), name='netbox_lifecycle_supportcontractassignment_device_vm_exclusive', diff --git a/netbox_lifecycle/models/contract.py b/netbox_lifecycle/models/contract.py index 4a5d177..1467e87 100644 --- a/netbox_lifecycle/models/contract.py +++ b/netbox_lifecycle/models/contract.py @@ -177,7 +177,7 @@ class Meta: ordering = ['contract', 'device', 'virtual_machine', 'module', 'license'] constraints = ( models.CheckConstraint( - check=( + condition=( models.Q(device__isnull=True, virtual_machine__isnull=False) | models.Q(device__isnull=False, virtual_machine__isnull=True) | models.Q(device__isnull=True, virtual_machine__isnull=True) diff --git a/netbox_lifecycle/models/license.py b/netbox_lifecycle/models/license.py index 538c484..fe96a30 100644 --- a/netbox_lifecycle/models/license.py +++ b/netbox_lifecycle/models/license.py @@ -82,7 +82,7 @@ class Meta: ordering = ['license', 'device', 'virtual_machine'] constraints = ( models.CheckConstraint( - check=( + condition=( models.Q(device__isnull=True, virtual_machine__isnull=False) | models.Q(device__isnull=False, virtual_machine__isnull=True) | models.Q(device__isnull=True, virtual_machine__isnull=True) diff --git a/netbox_lifecycle/search.py b/netbox_lifecycle/search.py index 28a8390..85f926c 100644 --- a/netbox_lifecycle/search.py +++ b/netbox_lifecycle/search.py @@ -58,7 +58,7 @@ class LicenseIndex(SearchIndex): ('description', 4000), ('comments', 5000), ) - display_attrs = ('description', ) + display_attrs = ('description',) @register_search