Minor fixes

Signed-off-by: Andrea Zoppi <texzk@email.it>

Author: TexZK

CHANGELOG.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+0.4.4 (2025-07-04)
+------------------
+
+* Removed support for Python 3.7.
+* Removed support for Python 3.8.
+* Using ``BASED_INT`` for CLI command ``align`` argument ``--modulo``.
+* Minor fixes.
+
+
 0.4.3 (2025-06-10)
 ------------------
 

docs/conf.py

@@ -81,3 +81,7 @@ def read_version():
 napoleon_custom_sections = [('Method Groups', 'params_style')]
 
 typehints_document_rtype = False
+
+linkcheck_ignore = [
+    r'https://developerhelp.microchip.com/xwiki/bin/view/software-tools/ipe/sqtp-file-format-specification/',
+]

pyproject.toml

@@ -13,8 +13,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",  # adds: typing.Literal
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",  # adds: typing.TypeAlias
     "Programming Language :: Python :: 3.11",  # adds: typing.Self
@@ -38,7 +36,7 @@ dynamic = ["version"]
 license = "BSD-2-Clause"
 name = "hexrec"
 readme = "README.rst"
-requires-python = ">= 3.7"
+requires-python = ">= 3.9"
 
 [project.optional-dependencies]
 testing = ["coverage", "pyelftools", "pytest"]

src/hexrec/__init__.py

@@ -23,7 +23,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = '0.4.3'
+__version__ = '0.4.4'
 
 from .base import convert
 from .base import file_types

src/hexrec/formats/asciihex.py

@@ -799,7 +799,7 @@ def validate_records(
         last_data_endex = 0
         file_checksum = 0
 
-        for index, record in enumerate(records):
+        for record in records:
             record = _cast(AsciiHexRecord, record)
             record.validate()
             tag = record.tag

src/hexrec/formats/srec.py

@@ -220,10 +220,9 @@ def get_address_max(self) -> Optional[int]:
         r"""Calculates the maximum address.
 
         It calculates the maximum *address* field for the calling tag.
-        If the *address* field is not supported, it returns ``None``.
 
         Returns:
-            int: Maximum *address* value, or ``None``.
+            int: Maximum *address* value.
 
         Examples:
             >>> from hexrec import SrecFile
@@ -247,10 +246,9 @@ def get_address_size(self) -> Optional[int]:
         r"""Calculates the maximum address size.
 
         It calculates the maximum *address* field size for the calling tag.
-        If the *address* field is not supported, it returns zero.
 
         Returns:
-            int: Maximum *address* size, or ``None``.
+            int: Maximum *address* size.
 
         Examples:
             >>> from hexrec import SrecFile
@@ -273,10 +271,9 @@ def get_data_max(self) -> Optional[int]:
         r"""Calculates the maximum data size.
 
         It calculates the maximum *data* field size for the calling tag.
-        If the *data* field is not supported, it returns ``None``.
 
         Returns:
-            int: Maximum *data* size, or ``None``.
+            int: Maximum *data* size.
 
         Examples:
             >>> from hexrec import SrecFile
@@ -301,7 +298,7 @@ def get_tag_match(self) -> Optional['SrecTag']:
         Given *data* or *start address* records, it returns the matching tag.
 
         Returns:
-            :class:`SrecTag`: Matching tag for *self*, or ``None``
+            :class:`SrecTag`: Matching tag for *self*, or ``None``.
 
         Examples:
             >>> from hexrec import SrecFile

src/hexrec/formats/xtek.py

@@ -496,7 +496,7 @@ def validate(
 class XtekFile(BaseFile):
     r"""Tektronix Extended file object."""
 
-    FILE_EXT: Sequence[int] = ['.tek', '.xtek']
+    FILE_EXT: Sequence[str] = ['.tek', '.xtek']
 
     META_KEYS: Sequence[str] = [
         'maxdatalen',

src/hexrec/utils.py

@@ -338,7 +338,7 @@ def read(
         start = self._position
         if start >= memory.endex:
             return b''
-        endex = None if size < 0 else start + size
+        endex = None if size is None or size < 0 else start + size
         buffer = b''
         try:
             buffer = memory.view(start=start, endex=endex)

src/hexrec/xxd.py

@@ -132,13 +132,13 @@ def _unhexlify(line: AnyBytes) -> Union[AnyBytes, ImmutableMemory]:
 
     line = line.translate(None, b' \t.:\r\n')
 
-    if 0x3C in line:
+    if 0x3C in line:  # ord('<')
         line = line.replace(b'<', b'-')
 
-    if 0x3E in line:
+    if 0x3E in line:  # ord('>')
         line = line.replace(b'>', b'-')
 
-    if 0x2D in line:
+    if 0x2D in line:  # ord('-')
         zeroed = line.replace(b'-', b'0')
         chunk = binascii.unhexlify(zeroed)
         even = line[::2]
@@ -278,7 +278,7 @@ def xxd_core(
             positions found in hexdump.
 
         iseek (int or str):
-            Starts at ``iseej`` bytes absolute (or relative) input offset.
+            Starts at ``iseek`` bytes absolute (or relative) input offset.
             Without ``iseek`` option, it starts at the current file position.
             The prefix is used to compute the offset.
             ``+`` indicates that the seek is relative to the current input
@@ -398,7 +398,9 @@ def xxd_core(
                     if match:
                         # Interpret line contents
                         groups = match.groupdict()
-                        address = (oseek or 0) + (iseek or 0) + int(groups['address'], 16)
+                        address = oseek or 0
+                        address += iseek or 0
+                        address += int(groups['address'], 16)
                         data = _unhexlify(groups['data'])
                         data = data[:cols]
 

tox.ini

@@ -5,21 +5,19 @@ envlist =
     clean,
     docs,
     check,
-    {py37,py38,py39,py310,py311,py312,py313,py314,pypy3},
+    {py39,py310,py311,py312,py313,py314,pypy3},
     report
 
 requires =
     tox >= 4
-    setuptools >= 61
+    setuptools >= 77.0.3
 
 skip_missing_interpreters = true
 
 
 ; This is the environment matrix.
 [testenv]
 basepython =
-    py37: {env:TOXPYTHON:python3.7}
-    py38: {env:TOXPYTHON:python3.8}
     py39: {env:TOXPYTHON:python3.9}
     py310: {env:TOXPYTHON:python3.10}
     py311: {env:TOXPYTHON:python3.11}