tamp 2.2.0__tar.gz → 2.2.2__tar.gz

{tamp-2.2.0 → tamp-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tamp
-Version: 2.2.0
+Version: 2.2.2
 Summary: 
 Home-page: https://github.com/BrianPugh/tamp
 License: Apache-2.0
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: cli
 Requires-Dist: cyclopts (>=1.0.0) ; extra == "cli"
-Requires-Dist: rich (>=13.0.0) ; extra == "cli"
+Requires-Dist: rich (>=15.0.0) ; extra == "cli"
 Project-URL: Repository, https://github.com/BrianPugh/tamp
 Description-Content-Type: text/markdown
 

{tamp-2.2.0 → tamp-2.2.2}/pyproject.toml

@@ -9,7 +9,7 @@ style = "semver"
 
 [tool.poetry]
 name = "tamp"
-version = "2.2.0"  # Do not change, let poetry-dynamic-versioning handle it.
+version = "2.2.2"  # Do not change, let poetry-dynamic-versioning handle it.
 homepage = "https://github.com/BrianPugh/tamp"
 repository = "https://github.com/BrianPugh/tamp"
 license = "Apache-2.0"
@@ -36,7 +36,7 @@ tamp = "tamp.cli.main:run_app"
 # Be as loose as possible if writing a library.
 python = "^3.9"
 cyclopts = {version = ">=1.0.0", optional = true}
-rich = {version = ">=13.0.0", optional = true}
+rich = {version = ">=15.0.0", optional = true}
 
 [tool.poetry.extras]
 cli = ["cyclopts", "rich"]
@@ -44,7 +44,7 @@ cli = ["cyclopts", "rich"]
 [tool.poetry.group.docs.dependencies]
 sphinx = ">=4.5.0"
 sphinx_rtd_theme = ">=3.0.0"
-gitpython = ">=3.1.31"
+gitpython = ">=3.1.49"
 sphinx-copybutton = ">=0.5.2"
 myst-parser = {extras = ["linkify"], version = "^3.0.1"}
 
@@ -59,7 +59,7 @@ belay = ">=0.21.3"
 tqdm = ">=4.65.0"
 matplotlib = ">=3.7.4"
 ipdb = ">=0.13.13"
-packaging = ">=20.0"
+packaging = ">=26.1"
 mpremote = ">=1.20.0"
 cython = ">=0.29.34"
 pytest-subtests = ">=0.10.0"

{tamp-2.2.0 → tamp-2.2.2}/tamp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.2.0"
+__version__ = "2.2.2"
 
 
 class ExcessBitsError(Exception):

{tamp-2.2.0 → tamp-2.2.2}/tamp/_c_src/tamp/common.c

@@ -15,14 +15,14 @@
 /* Per-literal-size seed tables.  All 16 entries must be unique and fit within
  * (1 << literal) - 1.  literal=7,8 share the original table (all < 0x80). */
 // clang-format off
-static const unsigned char common_characters_8[] = {' ', 0, '0', 'e', 'i', '>', 't', 'o',
-                                                    '<', 'a', 'n', 's', '\n', 'r', '/', '.'};
+TAMP_STATIC_CONST unsigned char common_characters_8[] = {' ', 0, '0', 'e', 'i', '>', 't', 'o',
+                                                         '<', 'a', 'n', 's', '\n', 'r', '/', '.'};
 /* Common English characters, downshifted to 6 bits */
-static const unsigned char common_characters_6[] = {' ' & 0x3F, 'e' & 0x3F, 't' & 0x3F, 'a' & 0x3F, 'o' & 0x3F, 'i' & 0x3F, 'n' & 0x3F, 's' & 0x3F,
-                                                    'h' & 0x3F, 'r' & 0x3F, 'd' & 0x3F, 'l' & 0x3F, 'c' & 0x3F, 'u' & 0x3F, 'm' & 0x3F, 'w' & 0x3F};
+TAMP_STATIC_CONST unsigned char common_characters_6[] = {' ' & 0x3F, 'e' & 0x3F, 't' & 0x3F, 'a' & 0x3F, 'o' & 0x3F, 'i' & 0x3F, 'n' & 0x3F, 's' & 0x3F,
+                                                         'h' & 0x3F, 'r' & 0x3F, 'd' & 0x3F, 'l' & 0x3F, 'c' & 0x3F, 'u' & 0x3F, 'm' & 0x3F, 'w' & 0x3F};
 /* Common English characters, downshifted to 5 bits */
-static const unsigned char common_characters_5[] = {' ' & 0x1F, 'e' & 0x1F, 't' & 0x1F, 'a' & 0x1F, 'o' & 0x1F, 'i' & 0x1F, 'n' & 0x1F, 's' & 0x1F,
-                                                    'h' & 0x1F, 'r' & 0x1F, 'd' & 0x1F, 'l' & 0x1F, 'c' & 0x1F, 'u' & 0x1F, 'm' & 0x1F, 'w' & 0x1F};
+TAMP_STATIC_CONST unsigned char common_characters_5[] = {' ' & 0x1F, 'e' & 0x1F, 't' & 0x1F, 'a' & 0x1F, 'o' & 0x1F, 'i' & 0x1F, 'n' & 0x1F, 's' & 0x1F,
+                                                         'h' & 0x1F, 'r' & 0x1F, 'd' & 0x1F, 'l' & 0x1F, 'c' & 0x1F, 'u' & 0x1F, 'm' & 0x1F, 'w' & 0x1F};
 // clang-format on
 
 static inline uint32_t xorshift32(uint32_t *state) {

{tamp-2.2.0 → tamp-2.2.2}/tamp/_c_src/tamp/common.h

@@ -88,6 +88,16 @@ extern "C" {
     } while (0)
 #endif
 
+/* TAMP_STATIC_CONST: declaration prefix for file-local read-only tables.
+ * Normally `static const`, but drops `static` on Xtensa MicroPython native
+ * modules, where `static const` rodata returns incorrect values.
+ * See micropython/micropython#14429. */
+#if defined(__XTENSA__) && defined(MICROPY_ENABLE_DYNRUNTIME)
+#define TAMP_STATIC_CONST const
+#else
+#define TAMP_STATIC_CONST static const
+#endif
+
 /* Include stream API (tamp_compress_stream, tamp_decompress_stream).
  * Enabled by default. Disable with -DTAMP_STREAM=0 to save ~2.8KB.
  */

{tamp-2.2.0 → tamp-2.2.2}/tamp/_c_src/tamp/compressor.c

@@ -30,10 +30,10 @@
 #define TAMP_POLL_CONTINUE ((tamp_res)127)
 
 // encodes [min_pattern_bytes, min_pattern_bytes + 14] pattern lengths (14 = FLUSH pattern, used in secondary reads)
-static const uint8_t huffman_codes[] = {0x0,  0x3,  0x8,  0xb,  0x14, 0x24, 0x26, 0x2b,
-                                        0x4b, 0x54, 0x94, 0x95, 0xaa, 0x27, 0xab};
+TAMP_STATIC_CONST uint8_t huffman_codes[] = {0x0,  0x3,  0x8,  0xb,  0x14, 0x24, 0x26, 0x2b,
+                                             0x4b, 0x54, 0x94, 0x95, 0xaa, 0x27, 0xab};
 // These bit lengths pre-add the 1 bit for the 0-value is_literal flag.
-static const uint8_t huffman_bits[] = {0x2, 0x3, 0x5, 0x5, 0x6, 0x7, 0x7, 0x7, 0x8, 0x8, 0x9, 0x9, 0x9, 0x7, 0x09};
+TAMP_STATIC_CONST uint8_t huffman_bits[] = {0x2, 0x3, 0x5, 0x5, 0x6, 0x7, 0x7, 0x7, 0x8, 0x8, 0x9, 0x9, 0x9, 0x7, 0x09};
 
 #if TAMP_EXTENDED_COMPRESS
 #define RLE_MAX_COUNT ((14 << 4) + 15 + 2)            // 241
@@ -181,8 +181,10 @@ TAMP_OPTIMIZE_SIZE tamp_res tamp_compressor_init(TampCompressor* compressor, con
 #endif
     };
     if (!conf) conf = &conf_default;
-    if (conf->window < 8 || conf->window > 15) return TAMP_INVALID_CONF;
-    if (conf->literal < 5 || conf->literal > 8) return TAMP_INVALID_CONF;
+    uint8_t window_bits = conf->window;
+    uint8_t literal_bits = conf->literal;
+    if (window_bits < 8 || window_bits > 15) return TAMP_INVALID_CONF;
+    if (literal_bits < 5 || literal_bits > 8) return TAMP_INVALID_CONF;
     if (conf->append && (!conf->dictionary_reset || conf->use_custom_dictionary)) return TAMP_INVALID_CONF;
 #if !TAMP_EXTENDED_COMPRESS
     if (conf->extended) return TAMP_INVALID_CONF;  // Extended requested but not compiled in
@@ -368,10 +370,13 @@ static TAMP_NOINLINE tamp_res write_extended_match_token(TampCompressor* compres
     res = partial_flush(compressor, output, output_size, output_written_size);
     if (TAMP_UNLIKELY(res != TAMP_OK)) return res;
 
-    // Write to window (up to end of buffer, no wrap)
-    uint16_t remaining = WINDOW_SIZE - compressor->window_pos;
+    // Write to window (up to end of buffer, no wrap).
+    // Local uint16_t matches tamp_window_copy signature; struct field may be uint32_t (TAMP_ESP32).
+    uint16_t wp = compressor->window_pos;
+    uint16_t remaining = WINDOW_SIZE - wp;
     uint8_t window_write = MIN(count, remaining);
-    tamp_window_copy(compressor->window, &compressor->window_pos, position, window_write, window_mask);
+    tamp_window_copy(compressor->window, &wp, position, window_write, window_mask);
+    compressor->window_pos = wp;
 
     compressor->extended_match_count = 0;  // Position reset not needed - only read when count > 0
 

{tamp-2.2.0 → tamp-2.2.2}/tamp/_c_src/tamp/decompressor.c

@@ -26,7 +26,7 @@
  * Note: A 64-byte table with special-cased symbol 1 was tried but was ~10% slower
  * and only saved 8 bytes in final firmware due to added branch logic.
  */
-static const uint8_t HUFFMAN_TABLE[128] = {
+TAMP_STATIC_CONST uint8_t HUFFMAN_TABLE[128] = {
     50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50,  50,  85,  85,  85, 85, 122, 123, 104, 104, 86, 86,
     86, 86, 93, 93, 93, 93, 68, 68, 68, 68, 68, 68, 68, 68, 105, 105, 124, 126, 87, 87, 87,  87,  51,  51,  51, 51,
     51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 51, 17, 17, 17,  17,  17,  17,  17, 17, 17,  17,  17,  17,  17, 17,