From 79f5d3e9ddf39dd6edada7de1967b5d53d8c5508 Mon Sep 17 00:00:00 2001 From: jhdark Date: Mon, 13 Jan 2025 13:31:11 -0500 Subject: [PATCH] remove deprecated materials property and related tests --- festim/materials/materials.py | 22 ------------------- test/unit/test_materials.py | 40 ----------------------------------- 2 files changed, 62 deletions(-) diff --git a/festim/materials/materials.py b/festim/materials/materials.py index 642f6dde4..c88c7beba 100644 --- a/festim/materials/materials.py +++ b/festim/materials/materials.py @@ -5,7 +5,6 @@ import festim import fenics as f from typing import Union -import warnings class Materials(list): @@ -29,27 +28,6 @@ def __init__(self, *args): self.density = None self.Q = None - @property - def materials(self): - warnings.warn( - "The materials attribute will be deprecated in a future release, please use festim.Materials as a list instead", - DeprecationWarning, - ) - return self - - @materials.setter - def materials(self, value): - warnings.warn( - "The materials attribute will be deprecated in a future release, please use festim.Materials as a list instead", - DeprecationWarning, - ) - if isinstance(value, list): - if not all(isinstance(t, festim.Material) for t in value): - raise TypeError("materials must be a list of festim.Material") - super().__init__(value) - else: - raise TypeError("materials must be a list") - def __setitem__(self, index, item): super().__setitem__(index, self._validate_material(item)) diff --git a/test/unit/test_materials.py b/test/unit/test_materials.py index 803a8f44c..a2046773f 100644 --- a/test/unit/test_materials.py +++ b/test/unit/test_materials.py @@ -402,46 +402,6 @@ def test_assign_materials_wrong_type(): my_materials.insert(0, mat_combination) -class TestMaterialsPropertyDeprWarn: - """ - A temporary test to check DeprecationWarnings in F.Materials.materials - """ - - my_mat = F.Material(id=1, E_D=1, D_0=1) - my_mats = F.Materials([]) - - def test_property_depr_warns(self): - with pytest.deprecated_call(): - self.my_mats.materials - - def test_property_setter_depr_warns(self): - with pytest.deprecated_call(): - self.my_mats.materials = [self.my_mat] - - -class TestMaterialsPropertyRaiseError: - """ - A temporary test to check TypeErrors in F.Materials.materials - """ - - my_mat = F.Material(id=1, E_D=1, D_0=1) - my_mats = F.Materials([]) - - def test_set_materials_wrong_type(self): - with pytest.raises( - TypeError, - match="materials must be a list", - ): - self.my_mats.materials = self.my_mat - - def test_set_materials_list_wrong_type(self): - with pytest.raises( - TypeError, - match="materials must be a list of festim.Material", - ): - self.my_mats.materials = [self.my_mat, 1] - - def test_instanciate_with_no_elements(): """ Test to catch bug described in issue #724