From 3c1dfb5c5b8bbe8f92af20019d2e84a3c0565d30 Mon Sep 17 00:00:00 2001 From: Austin Noto-Moniz Date: Fri, 31 Jul 2026 15:28:54 -0400 Subject: [PATCH] Drop deprecated functions. --- .../constraints/ingredient_ratio_constraint.py | 2 +- .../predictors/chemical_formula_featurizer.py | 8 -------- tests/conftest.py | 18 ------------------ tests/informatics/test_predictors.py | 4 ---- tests/utils/fakes/fake_workflow_collection.py | 1 - 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/citrine/informatics/constraints/ingredient_ratio_constraint.py b/src/citrine/informatics/constraints/ingredient_ratio_constraint.py index 9d7683699..d0dbaabd0 100644 --- a/src/citrine/informatics/constraints/ingredient_ratio_constraint.py +++ b/src/citrine/informatics/constraints/ingredient_ratio_constraint.py @@ -49,7 +49,7 @@ class IngredientRatioConstraint(Serializable['IngredientRatioConstraint'], Const # The backend provides basis ingredients and basis labels as a dictionary from the key to a # multiplier. However, for ingredient ratio constraints, the multiplier in the denominator # should always be one, so we can't allow users to enter it. We need to use properties for this - # behavior. It also allows us to display deprecation warnings for the coming type change. + # behavior. _basis_ingredients = properties.Mapping( properties.String, properties.Float, 'basis_ingredients', default={}) _basis_labels = properties.Mapping( diff --git a/src/citrine/informatics/predictors/chemical_formula_featurizer.py b/src/citrine/informatics/predictors/chemical_formula_featurizer.py index 40f77d9b1..98f235a37 100644 --- a/src/citrine/informatics/predictors/chemical_formula_featurizer.py +++ b/src/citrine/informatics/predictors/chemical_formula_featurizer.py @@ -1,5 +1,3 @@ -from deprecation import deprecated - from citrine._rest.resource import Resource from citrine._serialization import properties from citrine.informatics.descriptors import ChemicalFormulaDescriptor @@ -152,11 +150,5 @@ def __init__(self, self.excludes = excludes if excludes is not None else [] self.powers = powers if powers is not None else [1.0] - @property - @deprecated(deprecated_in="4.0.0", removed_in="5.0.0", details="Use 'powers' instead.") - def powers_as_float(self) -> list[float]: - """Powers when computing generalized weighted means of element properties.""" - return self.powers - def __str__(self): return ''.format(self.name) diff --git a/tests/conftest.py b/tests/conftest.py index aa9b40448..e9c8a3c57 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -286,24 +286,6 @@ def valid_graph_predictor_data_empty(): return PredictorEntityDataFactory(data=PredictorDataDataFactory(instance=instance)) -@pytest.fixture -def valid_deprecated_expression_predictor_data(): - """Produce valid data used for tests.""" - from citrine.informatics.descriptors import RealDescriptor - shear_modulus = RealDescriptor('Property~Shear modulus', lower_bound=0, upper_bound=100, units='GPa') - return dict( - type='Expression', - name='Expression predictor', - description='Computes shear modulus from Youngs modulus and Poissons ratio', - expression='Y / (2 * (1 + v))', - output=shear_modulus.dump(), - aliases={ - 'Y': "Property~Young's modulus", - 'v': "Property~Poisson's ratio", - } - ) - - @pytest.fixture def valid_expression_predictor_data(): """Produce valid data used for tests.""" diff --git a/tests/informatics/test_predictors.py b/tests/informatics/test_predictors.py index e1f7c1c57..6761cafe4 100644 --- a/tests/informatics/test_predictors.py +++ b/tests/informatics/test_predictors.py @@ -275,8 +275,6 @@ def test_chemical_featurizer(chemical_featurizer): assert chemical_featurizer.features == ["standard"] assert chemical_featurizer.excludes == [] assert chemical_featurizer.powers == [1.0, 2.0] - with pytest.warns(DeprecationWarning): - assert chemical_featurizer.powers_as_float == [1.0, 2.0] assert str(chemical_featurizer) == "" @@ -291,8 +289,6 @@ def test_chemical_featurizer(chemical_featurizer): } chemical_featurizer.powers = [0.5, -1.0] - with pytest.warns(DeprecationWarning): - assert chemical_featurizer.powers_as_float == [0.5, -1.0] assert chemical_featurizer.powers == [0.5, -1.0] diff --git a/tests/utils/fakes/fake_workflow_collection.py b/tests/utils/fakes/fake_workflow_collection.py index 6c1ba2587..6de507cf5 100644 --- a/tests/utils/fakes/fake_workflow_collection.py +++ b/tests/utils/fakes/fake_workflow_collection.py @@ -2,7 +2,6 @@ from uuid import uuid4, UUID from citrine._session import Session -from citrine._utils.functions import migrate_deprecated_argument from citrine.informatics.workflows import DesignWorkflow from citrine.resources.design_workflow import DesignWorkflowCollection