Improve typing to mypy mostly-strict

edg/BoardTop.py

@@ -3,7 +3,7 @@
 
 class BaseBoardTop(DesignTop):
   """Design top with refinements for intermediate-level (0603+ SMD), hand-solderable components."""
-  def __init__(self):
+  def __init__(self) -> None:
     super().__init__()
     self.refdes_prefix = self.Parameter(StringExpr())
     self.assign(self.refdes_prefix, "")  # override with refinements
@@ -52,7 +52,7 @@ class BoardTop(BaseBoardTop):
 
 
 class JlcToolingHole(InternalSubcircuit, FootprintBlock):
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
     self.footprint(
       'H', 'edg:JlcToolingHole_1.152mm',
@@ -62,7 +62,7 @@ def contents(self):
 
 
 class JlcToolingHoles(InternalSubcircuit, Block):
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
     self.th1 = self.Block(JlcToolingHole())
     self.th2 = self.Block(JlcToolingHole())
@@ -111,7 +111,7 @@ def refinements(self) -> Refinements:
 
 class JlcBoardTop(JlcTopRefinements):
   """Design top with refinements to use parts from JLC's assembly service and including the tooling holes"""
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
     self.jlc_th = self.Block(JlcToolingHoles())
 

edg/abstract_parts/AbstractAnalogSwitch.py

@@ -43,7 +43,7 @@ def __init__(self, switch_size: IntLike = 0):
     self.switch_size = self.ArgParameter(switch_size)
     self.generator_param(self.switch_size, self.inputs.requested(), self.control_gnd.is_connected())
 
-  def generate(self):
+  def generate(self) -> None:
     import math
     super().generate()
 
@@ -132,7 +132,7 @@ def __init__(self) -> None:
 
     self.generator_param(self.inputs.requested(), self.control_gnd.is_connected())
 
-  def generate(self):
+  def generate(self) -> None:
     super().generate()
     self.inputs.defined()
     for elt in self.get(self.inputs.requested()):
@@ -175,7 +175,7 @@ def __init__(self) -> None:
 
     self.generator_param(self.outputs.requested())
 
-  def generate(self):
+  def generate(self) -> None:
     super().generate()
     self.outputs.defined()
     for elt in self.get(self.outputs.requested()):

edg/abstract_parts/AbstractAntenna.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from ..electronics_model import *
 from .Categories import *
 from .PartsTable import PartsTableColumn, PartsTableRow
@@ -30,7 +32,7 @@ class TableAntenna(Antenna, PartsTableSelector, GeneratorBlock):
   IMPEDANCE = PartsTableColumn(Range)
   POWER_RATING = PartsTableColumn(Range)
 
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.generator_param(self.frequency, self.power, self.impedance)
 

edg/abstract_parts/AbstractBjt.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, Any
 
 from ..electronics_model import *
 from .Categories import *
@@ -41,11 +41,11 @@ def symbol_pinning(self, symbol_name: str) -> Dict[str, BasePort]:
     return {'B': self.base, 'C': self.collector, 'E': self.emitter}
 
   @staticmethod
-  def Npn(*args, **kwargs) -> 'Bjt':
+  def Npn(*args: Any, **kwargs: Any) -> 'Bjt':
     return Bjt(*args, **kwargs, channel='NPN')
 
   @staticmethod
-  def Pnp(*args, **kwargs) -> 'Bjt':
+  def Pnp(*args: Any, **kwargs: Any) -> 'Bjt':
     return Bjt(*args, **kwargs, channel='PNP')
 
   def __init__(self, collector_voltage: RangeLike, collector_current: RangeLike, *,
@@ -68,7 +68,7 @@ def __init__(self, collector_voltage: RangeLike, collector_current: RangeLike, *
     self.actual_power_rating = self.Parameter(RangeExpr())
     self.actual_gain = self.Parameter(RangeExpr())
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.description = DescriptionString(
@@ -90,7 +90,7 @@ class TableBjt(PartsTableSelector, Bjt):
   POWER_RATING = PartsTableColumn(Range)
   CHANNEL = PartsTableColumn(str)  # either 'PNP' or 'NPN'
 
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.generator_param(self.collector_voltage, self.collector_current, self.gain, self.power, self.channel)
 

edg/abstract_parts/AbstractCapacitor.py

@@ -106,7 +106,7 @@ def __init__(self, capacitance: RangeLike, voltage: RangeLike, *,
     self.actual_capacitance = self.Parameter(RangeExpr())
     self.actual_voltage_rating = self.Parameter(RangeExpr())
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.description = DescriptionString(
@@ -149,7 +149,7 @@ def parse_capacitor(cls, value: str) -> Tuple[Range, Range]:
   def block_from_symbol(cls, symbol_name: str, properties: Mapping[str, str]) -> 'Capacitor':
     return Capacitor(*cls.parse_capacitor(properties['Value']))
 
-  def __init__(self, *args, **kwargs) -> None:
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
 
     self.pos = self.Port(Passive.empty())
@@ -176,7 +176,7 @@ class TableCapacitor(PartsTableSelector, Capacitor):
   NOMINAL_CAPACITANCE = PartsTableColumn(float)  # nominal capacitance, even with asymmetrical tolerances
   VOLTAGE_RATING = PartsTableColumn(Range)
 
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.generator_param(self.capacitance, self.voltage, self.voltage_rating_derating, self.exact_capacitance)
 
@@ -217,7 +217,7 @@ class TableDeratingCapacitor(TableCapacitor):
   DERATE_LOWEST = 0.2  # floor for maximum derating factor
   # LOOSELY approximated from https://www.maximintegrated.com/en/design/technical-documents/tutorials/5/5527.html
 
-  def __init__(self, *args, single_nominal_capacitance: RangeLike = (0, 22)*uFarad, **kwargs):
+  def __init__(self, *args: Any, single_nominal_capacitance: RangeLike = (0, 22)*uFarad, **kwargs: Any):
     super().__init__(*args, **kwargs)
     self.single_nominal_capacitance = self.ArgParameter(single_nominal_capacitance)
     self.generator_param(self.single_nominal_capacitance)
@@ -290,7 +290,7 @@ class DummyCapacitorFootprint(DummyDevice, Capacitor, FootprintBlock):
   """
   def __init__(self, footprint: StringLike = "", manufacturer: StringLike = "", part_number: StringLike = "",
                value: StringLike = "",
-               *args, **kwargs):
+               *args: Any, **kwargs: Any):
     super().__init__(*args, **kwargs)
 
     self.footprint(
@@ -363,7 +363,7 @@ def connected(self, gnd: Optional[Port[GroundLink]] = None, io: Optional[Port[An
 
 
 class CombinedCapacitorElement(Capacitor):  # to avoid an abstract part error
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
     self.assign(self.actual_capacitance, self.capacitance)  # fake it, since a combined capacitance is handwavey
 
@@ -391,7 +391,7 @@ def __init__(self, *, extend_upper: BoolLike = False) -> None:
     self.generator_param(self.pos.requested(), self.neg.requested(), self.extend_upper)
 
 
-  def generate(self):
+  def generate(self) -> None:
     super().generate()
     capacitance = self.capacitances.sum()
     if self.get(self.extend_upper):

edg/abstract_parts/AbstractComparator.py

@@ -55,7 +55,7 @@ def __init__(self, trip_voltage: RangeLike, *, invert: BoolLike = False,
 
         self.actual_trip_voltage = self.Parameter(RangeExpr())
 
-    def generate(self):
+    def generate(self) -> None:
         super().generate()
 
         if self.get(self.ref.is_connected()):

edg/abstract_parts/AbstractConnector.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from ..electronics_model import *
 from .Categories import Connector
 from .AbstractAntenna import Antenna
@@ -35,7 +37,7 @@ def __init__(self, name: StringLike):
 
 class RfConnectorAntenna(Antenna):
   """RF connector used as an antenna"""
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.conn = self.Block(RfConnector())
     self.connect(self.conn.sig, self.a)

edg/abstract_parts/AbstractCrystal.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from ..electronics_model import *
 from . import PartsTableSelector, PartsTableColumn, Capacitor, PartsTableRow
 from .Categories import *
@@ -44,7 +46,7 @@ def __init__(self, frequency: RangeLike) -> None:
     self.crystal = self.Port(CrystalPort(self.actual_frequency), [InOut])  # set by subclass
     self.gnd = self.Port(Ground(), [Common])
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.description = DescriptionString(
@@ -59,7 +61,7 @@ class TableCrystal(PartsTableSelector, Crystal):
   FREQUENCY = PartsTableColumn(Range)
   CAPACITANCE = PartsTableColumn(float)
 
-  def __init__(self, *args, **kwargs) -> None:
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     """Discrete crystal component."""
     super().__init__(*args, **kwargs)
     self.generator_param(self.frequency)

edg/abstract_parts/AbstractDebugHeaders.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from .Categories import ProgrammingConnector
 from ..electronics_model import *
 
@@ -15,20 +17,20 @@ def __init__(self) -> None:
 
 class SwdCortexTargetConnectorReset(BlockInterfaceMixin[SwdCortexTargetConnector]):
   """Mixin for SWD connectors with adding the optional reset pin"""
-  def __init__(self, *args, **kwargs) -> None:
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.reset = self.Port(DigitalSource.empty(), optional=True)  # as open-drain
 
 
 class SwdCortexTargetConnectorSwo(BlockInterfaceMixin[SwdCortexTargetConnector]):
   """Mixin for SWD connectors with adding the optional SWO pin"""
-  def __init__(self, *args, **kwargs) -> None:
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.swo = self.Port(DigitalBidir.empty(), optional=True)
 
 
 class SwdCortexTargetConnectorTdi(BlockInterfaceMixin[SwdCortexTargetConnector]):
   """Mixin for SWD connectors with adding the NONSTANDARD TDI pin (where pins are shared with JTAG)"""
-  def __init__(self, *args, **kwargs) -> None:
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.tdi = self.Port(DigitalBidir.empty(), optional=True)

edg/abstract_parts/AbstractDiodes.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, Any
 from deprecated import deprecated
 
 from ..electronics_model import *
@@ -73,7 +73,7 @@ def __init__(self, reverse_voltage: RangeLike, current: RangeLike, *,
     self.actual_voltage_drop = self.Parameter(RangeExpr())
     self.actual_reverse_recovery_time = self.Parameter(RangeExpr())
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.description = DescriptionString(
@@ -93,7 +93,7 @@ class TableDiode(PartsTableSelector, Diode):
   FORWARD_VOLTAGE = PartsTableColumn(Range)  # possible forward voltage range
   REVERSE_RECOVERY = PartsTableColumn(Range)  # possible reverse recovery time
 
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.generator_param(self.reverse_voltage, self.current, self.voltage_drop, self.reverse_recovery_time)
 
@@ -130,7 +130,7 @@ def __init__(self, zener_voltage: RangeLike) -> None:
     self.actual_zener_voltage = self.Parameter(RangeExpr())
     self.actual_power_rating = self.Parameter(RangeExpr())
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.description = DescriptionString(
@@ -145,7 +145,7 @@ class TableZenerDiode(PartsTableSelector, ZenerDiode):
   ZENER_VOLTAGE = PartsTableColumn(Range)
   POWER_RATING = PartsTableColumn(Range)  # tolerable power
 
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.generator_param(self.zener_voltage)
 
@@ -170,7 +170,7 @@ def __init__(self, voltage: RangeLike):
 
     self.voltage = self.ArgParameter(voltage)
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
     self.diode = self.Block(ZenerDiode(zener_voltage=self.voltage))
     self.connect(self.diode.cathode.adapt_to(VoltageSink(
@@ -191,7 +191,7 @@ def __init__(self, voltage: RangeLike):
 
     self.voltage = self.ArgParameter(voltage)
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.diode = self.Block(ZenerDiode(zener_voltage=self.voltage))

edg/abstract_parts/AbstractFerriteBead.py

@@ -1,4 +1,4 @@
-from typing import Optional, cast, Dict
+from typing import Optional, cast, Dict, Any
 
 from ..electronics_model import *
 from .PartsTable import PartsTableColumn, PartsTableRow
@@ -51,7 +51,7 @@ def __init__(self, *, current: RangeLike = RangeExpr.ZERO,
     self.actual_hf_impedance = self.Parameter(RangeExpr())
     self.actual_dc_resistance = self.Parameter(RangeExpr())
 
-  def contents(self):
+  def contents(self) -> None:
     super().contents()
 
     self.description = DescriptionString(
@@ -72,7 +72,7 @@ class TableFerriteBead(PartsTableSelector, FerriteBead):
   HF_IMPEDANCE = PartsTableColumn(Range)
   DC_RESISTANCE = PartsTableColumn(Range)
 
-  def __init__(self, *args, **kwargs):
+  def __init__(self, *args: Any, **kwargs: Any) -> None:
     super().__init__(*args, **kwargs)
     self.generator_param(self.current, self.hf_impedance, self.dc_resistance)