Merge pull request #595 from qutech/issues/592_remove_external_parame…

…ters Remove external_parameters
qutech · May 19, 2021 · 450b910 · 450b910
2 parents fc44b0e + 3771952
commit 450b910
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 25 deletions.
diff --git a/changes.d/592.removal b/changes.d/592.removal
@@ -0,0 +1 @@
+Remove deprecated `external_parameters` keyword argument from SequencePT and AtomicMultiChannelPT
diff --git a/doc/source/examples/_LegacySerialization.ipynb b/doc/source/examples/_LegacySerialization.ipynb
@@ -903,7 +903,6 @@
     "    'tend': '5'\n",
     "}\n",
     "sequence1 = SequencePT((anonymous_table, mapping),\n",
-    "                                  external_parameters=set(),\n",
     "                                  identifier='sequence_embedded')\n",
     "serializer.serialize(sequence1, overwrite=True)\n",
     "\n",

diff --git a/qupulse/pulses/multi_channel_pulse_template.py b/qupulse/pulses/multi_channel_pulse_template.py
@@ -32,7 +32,6 @@ class AtomicMultiChannelPulseTemplate(AtomicPulseTemplate, ParameterConstrainer)
     """Combines multiple PulseTemplates that are defined on different channels into an AtomicPulseTemplate."""
     def __init__(self,
                  *subtemplates: Union[AtomicPulseTemplate, MappingTuple, MappingPulseTemplate],
-                 external_parameters: Optional[Set[str]]=None,
                  identifier: Optional[str]=None,
                  parameter_constraints: Optional[List]=None,
                  measurements: Optional[List[MeasurementDeclaration]]=None,
@@ -50,7 +49,6 @@ def __init__(self,
             measurements: Forwarded to AtomicPulseTemplate.__init__
             duration: Enforced duration of the pulse template on instantiation. build_waveform checks all sub-waveforms
             have this duration. If True the equality of durations is only checked durtin instantiation not construction.
-            external_parameters: No functionality. (Deprecated)
         """
         AtomicPulseTemplate.__init__(self, identifier=identifier, measurements=measurements)
         ParameterConstrainer.__init__(self, parameter_constraints=parameter_constraints)
@@ -82,10 +80,6 @@ def __init__(self,
                                                   'subtemplate {}'.format(i + 2 + j),
                                                   (channels_i & channels_j).pop())
 
-        if external_parameters is not None:
-            warnings.warn("external_parameters is an obsolete argument and will be removed in the future.",
-                          category=DeprecationWarning)
-
         if not duration:
             duration = self._subtemplates[0].duration
             for subtemplate in self._subtemplates[1:]:

diff --git a/qupulse/pulses/sequence_pulse_template.py b/qupulse/pulses/sequence_pulse_template.py
@@ -38,7 +38,6 @@ class SequencePulseTemplate(PulseTemplate, ParameterConstrainer, MeasurementDefi
 
     def __init__(self,
                  *subtemplates: Union[PulseTemplate, MappingTuple],
-                 external_parameters: Optional[Union[Iterable[str], Set[str]]]=None,
                  identifier: Optional[str]=None,
                  parameter_constraints: Optional[List[Union[str, Expression]]]=None,
                  measurements: Optional[List[MeasurementDeclaration]]=None,
@@ -60,8 +59,6 @@ def __init__(self,
         Args:
             subtemplates (List(Subtemplate)): The list of subtemplates of this
                 SequencePulseTemplate as tuples of the form (PulseTemplate, Dict(str -> str)).
-            external_parameters (List(str)): A set of names for external parameters of this
-                SequencePulseTemplate. Deprecated.
             identifier (str): A unique identifier for use in serialization. (optional)
         """
         PulseTemplate.__init__(self, identifier=identifier)
@@ -78,10 +75,6 @@ def __init__(self,
                 raise ValueError('The subtemplates are defined for different channels:'
                                  + f' defined {defined_channels} vs. subtemplate {subtemplate.defined_channels}')
 
-        if external_parameters:
-            warnings.warn("external_parameters is an obsolete argument and will be removed in the future.",
-                          category=DeprecationWarning)
-
         self._register(registry=registry)
 
     @classmethod

diff --git a/tests/pulses/multi_channel_pulse_template_tests.py b/tests/pulses/multi_channel_pulse_template_tests.py
@@ -111,11 +111,6 @@ def test_instantiation_duration_check(self):
         amcpt.build_waveform(parameters=dict(t_1=3+1e-11, t_2=3, t_3=3, t_0=3),
                              channel_mapping={ch: ch for ch in 'c1 c2 c3'.split()})
 
-    def test_external_parameters_warning(self):
-        with self.assertWarnsRegex(DeprecationWarning, "external_parameters",
-                                   msg="AtomicMultiChannelPulseTemplate did not issue a warning for argument external_parameters"):
-            AtomicMultiChannelPulseTemplate(DummyPulseTemplate(), external_parameters={'a'})
-
     def test_duration(self):
         sts = [DummyPulseTemplate(duration='t1', defined_channels={'A'}),
                DummyPulseTemplate(duration='t1', defined_channels={'B'}),

diff --git a/tests/pulses/sequence_pulse_template_tests.py b/tests/pulses/sequence_pulse_template_tests.py
@@ -48,12 +48,6 @@ def __init__(self, *args, **kwargs) -> None:
                                                                    parameter_mapping=self.mapping1,
                                                                    measurement_mapping=self.window_name_mapping))
 
-    def test_external_parameters_warning(self):
-        dummy = DummyPulseTemplate()
-        with self.assertWarnsRegex(DeprecationWarning, "external_parameters",
-                                   msg="SequencePT did not issue a warning for argument external_parameters"):
-            SequencePulseTemplate(dummy, external_parameters={'a'})
-
     def test_duration(self):
         pt = SequencePulseTemplate(DummyPulseTemplate(duration='a'),
                                    DummyPulseTemplate(duration='a'),