Drop support for Python 3.5

Author: amykyta3

.github/workflows/build.yml

@@ -16,20 +16,18 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - 3.5
           - 3.6
           - 3.7
           - 3.8
           - 3.9
           - "3.10"
           - "3.11"
           - "3.12"
+          - "3.13"
         include:
           - os: ubuntu-latest
 
           # older versions need older OS
-          - python-version: 3.5
-            os: ubuntu-20.04
           - python-version: 3.6
             os: ubuntu-20.04
 

docs/conf.py

@@ -18,9 +18,9 @@
 
 # -- Project information -----------------------------------------------------
 
-project = 'SystemRDL Compiler'
-copyright = '%d, Alex Mykyta' % datetime.datetime.now().year
-author = 'Alex Mykyta'
+project = "SystemRDL Compiler"
+copyright = f"{datetime.datetime.now().year}, Alex Mykyta"
+author = "Alex Mykyta"
 
 
 # -- General configuration ---------------------------------------------------

examples/print_hierarchy.py

@@ -15,8 +15,8 @@ def enter_Component(self, node):
 
     def enter_Field(self, node):
         # Print some stuff about the field
-        bit_range_str = "[%d:%d]" % (node.high, node.low)
-        sw_access_str = "sw=%s" % node.get_property('sw').name
+        bit_range_str = f"[{node.high}:{node.low}]"
+        sw_access_str = f"sw={node.get_property('sw').name}"
         print("\t"*self.indent, bit_range_str, node.get_path_segment(), sw_access_str)
 
     def exit_Component(self, node):

setup.py

@@ -65,7 +65,7 @@ def run_setup(with_binary):
         include_package_data=True,
         ext_modules=ext_modules,
         cmdclass={"build_ext": ve_build_ext},
-        python_requires='>=3.5.2',
+        python_requires='>=3.6',
         install_requires=[
             "antlr4-python3-runtime >= 4.11, < 4.14",
             "colorama",
@@ -75,7 +75,6 @@ def run_setup(with_binary):
             "Development Status :: 5 - Production/Stable",
             "Programming Language :: Python",
             "Programming Language :: Python :: 3",
-            "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
             "Programming Language :: Python :: 3.8",

systemrdl/compiler.py

@@ -101,7 +101,7 @@ def __init__(self, **kwargs: Any):
 
         # Check for stray kwargs
         if kwargs:
-            raise TypeError("got an unexpected keyword argument '%s'" % list(kwargs.keys())[0])
+            raise TypeError(f"got an unexpected keyword argument '{list(kwargs.keys())[0]}'")
 
         #: Reference to the compiler's :class:`~systemrdl.messages.MessageHandler` object
         #:
@@ -127,9 +127,9 @@ def define_udp(
         )
 
         if name in self.env.property_rules.rdl_properties:
-            raise ValueError("UDP definition's name '%s' conflicts with existing built-in RDL property")
+            raise ValueError(f"UDP definition's name '{name}' conflicts with existing built-in RDL property")
         if name in self.env.property_rules.user_properties:
-            raise ValueError("UDP '%s' has already been defined")
+            raise ValueError(f"UDP '{name}' has already been defined")
 
         udp = LegacyExternalUserProperty(
             self.env,
@@ -156,9 +156,9 @@ def register_udp(self, definition_cls: 'Type[UDPDefinition]', soft: bool=True) -
         .. versionadded:: 1.25
         """
         if definition_cls.name in self.env.property_rules.rdl_properties:
-            raise ValueError("UDP definition's name '%s' conflicts with existing built-in RDL property")
+            raise ValueError(f"UDP definition's name '{definition_cls.name}' conflicts with existing built-in RDL property")
         if definition_cls.name in self.env.property_rules.user_properties:
-            raise ValueError("UDP '%s' has already been defined")
+            raise ValueError(f"UDP '{definition_cls.name}' has already been defined")
 
         # Wrap definition with internal UDP object & register it
         udp = ExternalUserProperty(self.env, definition_cls, soft)
@@ -341,11 +341,11 @@ def elaborate(self, top_def_name: Optional[str]=None, inst_name: Optional[str]=N
         if top_def_name is not None:
             # Lookup top_def_name
             if top_def_name not in self.root.comp_defs:
-                self.msg.fatal("Elaboration target '%s' not found" % top_def_name)
+                self.msg.fatal(f"Elaboration target '{top_def_name}' not found")
             top_def = self.root.comp_defs[top_def_name]
 
             if not isinstance(top_def, comp.Addrmap):
-                self.msg.fatal("Elaboration target '%s' is not an 'addrmap' component" % top_def_name)
+                self.msg.fatal(f"Elaboration target '{top_def_name}' is not an 'addrmap' component")
         else:
             # Not specified. Find the last addrmap defined
             for comp_def in reversed(self.root.comp_defs.values()):
@@ -382,13 +382,13 @@ def elaborate(self, top_def_name: Optional[str]=None, inst_name: Optional[str]=N
                     parameter = p
                     break
             else:
-                self.msg.fatal("Elaboration top does not have a parameter '%s' that is available for override" % param_name)
+                self.msg.fatal(f"Elaboration top does not have a parameter '{param_name}' that is available for override")
 
             literal_expr = ast.ExternalLiteral(self.env, value)
             assign_expr = ast.AssignmentCast(self.env, None, literal_expr, parameter.param_type)
             assign_type = assign_expr.predict_type()
             if assign_type is None:
-                self.msg.fatal("Incorrect type for top-level parameter override of '%s'" % param_name)
+                self.msg.fatal(f"Incorrect type for top-level parameter override of '{param_name}'")
 
             parameter.expr = assign_expr
 

systemrdl/component.py

@@ -145,15 +145,11 @@ def __deepcopy__(self: 'ComponentClass', memo: Dict[int, Any]) -> 'ComponentClas
 
     def __repr__(self) -> str:
         if self.is_instance:
-            name_str = "%s (%s)" % (self.inst_name, self.type_name)
+            name_str = f"{self.inst_name} ({self.type_name})"
         else:
             name_str = self.type_name
 
-        return "<%s %s at 0x%x>" % (
-            self.__class__.__qualname__,
-            name_str,
-            id(self)
-        )
+        return f"<{self.__class__.__qualname__} {name_str} at {id(self):#x}>"
 
 
     def get_child_by_name(self, inst_name: str) -> Optional['Component']:

systemrdl/core/namespace.py

@@ -1,4 +1,3 @@
-import sys
 from typing import TYPE_CHECKING, Dict, List, Union, Type, Tuple
 
 from .parameter import Parameter
@@ -11,12 +10,7 @@
     from .. import rdltypes
     from ..ast import ASTNode
 
-if sys.version_info >= (3,5,4):
-    TypeNSRef = Union[comp.Component, Type['rdltypes.UserEnum'], Type['rdltypes.UserStruct']]
-else:
-    # Stub on 3.5.3 or older due to: https://github.com/python/typing/issues/266
-    from typing import Any
-    TypeNSRef = Any # type: ignore
+TypeNSRef = Union[comp.Component, Type['rdltypes.UserEnum'], Type['rdltypes.UserStruct']]
 TypeNSEntry = TypeNSRef
 TypeNSScope = Dict[str, TypeNSEntry]
 

systemrdl/core/rdlformatcode.py

@@ -55,11 +55,11 @@ def rdlfc_to_html(text: str, node: Optional[Node]=None, md: Optional['Markdown']
     ]
 
     if is_desc:
-        tok_regex = '|'.join('(?P<%s>%s)' % pair for pair in token_spec)
+        tok_regex = '|'.join(f"(?P<{pair[0]}>{pair[1]})" for pair in token_spec)
     else:
         # filter out tags that are not to be interpreted in 'name' properties
         skipset = {'img', 'list', 'bullet', 'xlist', 'br', 'p', 'xp', 'index', 'index_parent', 'name'}
-        tok_regex = '|'.join('(?P<%s>%s)' % pair for pair in token_spec if pair[0] not in skipset)
+        tok_regex = '|'.join(f"(?P<{pair[0]}>{pair[1]})" for pair in token_spec if pair[0] not in skipset)
 
     pos = 0
     text_segs = []

systemrdl/core/value_normalization.py

@@ -51,7 +51,7 @@ def normalize_scalar(value: int) -> str:
     5.1.1.4 - c.1:
         Scalar values shall be rendered using their hexadecimal representation.
     """
-    return "%x" % value
+    return f"{value:x}"
 
 
 def normalize_boolean(value: bool) -> str:
@@ -122,7 +122,7 @@ def normalize_struct(value: rdltypes.UserStruct, owner_node: Optional[node.Node]
     """
     norm_elements = []
     for member_name, member_value in value._values.items():
-        norm_elements.append("%s_%s" % (member_name, normalize(member_value, owner_node)))
+        norm_elements.append(f"{member_name}_{normalize(member_value, owner_node)}")
 
     norm_str = "_".join(norm_elements)
     md5 = hashlib.md5(norm_str.encode('utf-8')).hexdigest()
@@ -143,7 +143,7 @@ def normalize_property_ref(value: rdltypes.PropertyReference, owner_node: node.N
     Hash of relative path from owner of the property to the target component's
     property
     """
-    path = "%s->%s" % (value.node.get_rel_path(owner_node), value.name)
+    path = f"{value.node.get_rel_path(owner_node)}->{value.name}"
     md5 = hashlib.md5(path.encode('utf-8')).hexdigest()
     return md5[:8]
 

systemrdl/importer.py

@@ -54,7 +54,7 @@ def import_file(self, path: str) -> None:
     # ------------------------ create_xxx_definition() -------------------------
     def _create_definition(self, cls: "Type[ComponentClass]", type_name: Optional[str] = None, src_ref: Optional[SourceRefBase] = None) -> "ComponentClass":
         if (type_name is not None) and not re.fullmatch(r"[a-zA-Z_]\w*", type_name):
-            raise ValueError("Type name has invalid characters: '%s'" % type_name)
+            raise ValueError(f"Type name has invalid characters: '{type_name}'")
         C = cls()
         C.type_name = type_name
         C.def_src_ref = src_ref or self.default_src_ref
@@ -138,7 +138,7 @@ def _instantiate(self, comp_def: "ComponentClass", inst_name: str, src_ref: Opti
         if comp_def.is_instance:
             raise ValueError("Component is already instantiated")
         if not re.fullmatch(r"[a-zA-Z_]\w*", inst_name):
-            raise ValueError("Instance name has invalid characters: '%s'" % inst_name)
+            raise ValueError(f"Instance name has invalid characters: '{inst_name}'")
 
         if comp_def.type_name is None:
             # anonymous definition. No need to copy since it can only be used once
@@ -284,7 +284,7 @@ def add_child(self, parent: comp.Component, child: comp.Component) -> None:
             if isinstance(child, comp.Field):
                 bad = False
         if bad:
-            raise TypeError("Parent %s cannot be assigned child %s" % (repr(parent), repr(child)))
+            raise TypeError(f"Parent {repr(parent)} cannot be assigned child {repr(child)}")
 
         if not child.is_instance:
             raise ValueError("Child must be an instance if adding to a parent")
@@ -308,7 +308,7 @@ def assign_property(self, component: comp.Component, prop_name: str, value: Any,
 
         rule = self.compiler.env.property_rules.lookup_property(prop_name)
         if rule is None:
-            raise ValueError("Unrecognized property '%s'" % prop_name)
+            raise ValueError(f"Unrecognized property '{prop_name}'")
         if isinstance(value, comp.Component):
             # Warn user that this is not how references work
             raise TypeError("Invalid assignment type")

systemrdl/messages.py

@@ -89,7 +89,7 @@ def format_message(self, severity: Severity, text: str, src_ref: Optional[Source
             # Detailed message selection context is available
             lines.append(
                 Style.BRIGHT
-                + "%s:%d:%d: " % (src_ref.path, src_ref.line, src_ref.line_selection[0]+1)
+                + f"{src_ref.path}:{src_ref.line}:{src_ref.line_selection[0]+1}: "
                 + color + severity.name.lower() + ": "
                 + Style.RESET_ALL
                 + text
@@ -99,7 +99,7 @@ def format_message(self, severity: Severity, text: str, src_ref: Optional[Source
             # Only the file path is known
             lines.append(
                 Style.BRIGHT
-                + "%s: " % src_ref.path
+                + f"{src_ref.path}: "
                 + color + severity.name.lower() + ": "
                 + Style.RESET_ALL
                 + text

systemrdl/node.py

@@ -34,11 +34,7 @@ def __init__(self, inst: comp.Component, env: 'RDLEnvironment', parent: Optional
         self.parent = parent
 
     def __repr__(self) -> str:
-        return "<%s %s at 0x%x>" % (
-            self.__class__.__qualname__,
-            self.get_path(),
-            id(self)
-        )
+        return f"<{self.__class__.__qualname__} {self.get_path()} at {id(self):#x}>"
 
 
     def __deepcopy__(self, memo: Dict[int, Any]) -> 'Node':
@@ -381,7 +377,7 @@ def get_property(self, prop_name: str, **kwargs: Any)-> Any:
 
         # Check for stray kwargs
         if kwargs:
-            raise TypeError("got an unexpected keyword argument '%s'" % list(kwargs.keys())[0])
+            raise TypeError(f"got an unexpected keyword argument '{list(kwargs.keys())[0]}'")
 
         if prop_name not in self.inst.properties:
             # Was not assigned by the user
@@ -394,9 +390,9 @@ def get_property(self, prop_name: str, **kwargs: Any)-> Any:
 
             # Is it even a valid property or allowed for this component type?
             if rule is None:
-                raise LookupError("Unknown property '%s'" % prop_name)
+                raise LookupError(f"Unknown property '{prop_name}'")
             if type(self.inst) not in rule.bindable_to:
-                raise LookupError("Unknown property '%s'" % prop_name)
+                raise LookupError(f"Unknown property '{prop_name}'")
 
             # Return the default value as specified by the rulebook
             return rule.get_default(self)
@@ -1064,7 +1060,7 @@ def get_global_type_name(self, separator: str = "__") -> Optional[str]:
             # field width is the default. Skip suffix
             suffix =  ""
         else:
-            suffix = "_w%d" % self.width
+            suffix = f"_w{self.width}"
 
         return name + suffix
 

systemrdl/rdltypes/builtin_enums.py

@@ -9,7 +9,7 @@ def __new__(cls) -> 'AutoNoValueEnum':
         return obj
 
     def __repr__(self) -> str:
-        return '<%s.%s>' % (self.__class__.__name__, self.name)
+        return f"<{self.__class__.__name__}.{self.name}>"
 
 class BuiltinEnum(AutoNoValueEnum):
     pass
@@ -45,7 +45,7 @@ def __add__(self, other: Any) -> 'AccessType':
         .. versionadded:: 1.23
         """
         if not isinstance(other, AccessType):
-            raise TypeError("unsupported addend types: %s + %s" % (repr(self), repr(other)))
+            raise TypeError(f"unsupported addend types: {repr(self)} + {repr(other)}")
 
         pair = {other, self}
 

systemrdl/rdltypes/references.py

@@ -115,12 +115,7 @@ def __init__(self, src_ref: 'SourceRefBase', env: 'RDLEnvironment', comp_ref: Co
         self.node = None # type: Node
 
     def __repr__(self) -> str:
-        return "<%s %s->%s at 0x%x>" % (
-            self.__class__.__qualname__,
-            self.node.get_path(),
-            self.name,
-            id(self)
-        )
+        return f"<{self.__class__.__qualname__} {self.node.get_path()}->{self.name} at {id(self):#x}>"
 
     def __eq__(self, other: object) -> bool:
         """

systemrdl/rdltypes/typing.py

@@ -1,5 +1,4 @@
-from typing import Type, Union, Any, TYPE_CHECKING
-import sys
+from typing import Type, Union, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from .builtin_enums import BuiltinEnum
@@ -10,16 +9,12 @@
     from ..node import Node
     from .. import component as comp
 
-if sys.version_info >= (3,5,4):
-    # RDL Types the user will encounter via the public API
-    RDLValue = Union[
-        int, bool, str, list,
-        'BuiltinEnum', 'UserEnum', 'UserStruct', Type['UserEnum'],
-        'Node', 'PropertyReference'
-    ]
-else:
-    # Stub on 3.5.3 or older due to: https://github.com/python/typing/issues/266
-    RDLValue = Any # type: ignore
+# RDL Types the user will encounter via the public API
+RDLValue = Union[
+    int, bool, str, list,
+    'BuiltinEnum', 'UserEnum', 'UserStruct', Type['UserEnum'],
+    'Node', 'PropertyReference'
+]
 
 # RDL Types used internally prior to elaboration
 PreElabRDLValue = Union[
@@ -28,8 +23,4 @@
     'PropertyReference', 'comp.Component', 'RefType'
 ]
 
-if sys.version_info >= (3,5,4):
-    PreElabRDLType = Union[Type[PreElabRDLValue], 'ArrayedType']
-else:
-    # Stub on 3.5.3 or older due to: https://github.com/python/typing/issues/266
-    PreElabRDLType = Any # type: ignore
+PreElabRDLType = Union[Type[PreElabRDLValue], 'ArrayedType']

systemrdl/rdltypes/user_enum.py

@@ -42,10 +42,7 @@ def __bool__(cls) -> bool:
     def __contains__(cls, obj: Any) -> bool:
         if not isinstance(obj, UserEnum):
             raise TypeError(
-                "unsupported operand type(s) for 'in': '%s' and '%s'"
-                % (
-                    type(obj).__qualname__, cls.__class__.__qualname__
-                )
+                f"unsupported operand type(s) for 'in': '{type(obj).__qualname__}' and '{cls.__class__.__qualname__}'"
             )
         return isinstance(obj, cls) and obj._name in cls._member_map
 
@@ -59,7 +56,7 @@ def __len__(cls) -> int:
         return len(cls._member_map)
 
     def __repr__(cls) -> str:
-        return "<UserEnum %r>" % cls.__name__
+        return f"<UserEnum {cls.__name__}>"
 
     def __reversed__(cls) -> 'Generator[UserEnum, None, None]':
         """