python-msilib 0.4.0__tar.gz → 0.4.2__tar.gz

python_msilib-0.4.2/MANIFEST.in

@@ -0,0 +1,4 @@
+include Makefile
+recursive-include src *.c
+recursive-include src *.h
+recursive-include tests *.py

{python_msilib-0.4.0 → python_msilib-0.4.2}/Makefile

@@ -70,6 +70,7 @@ release:
 	@echo "--or--"
 	@echo "  bump-my-version bump patch --new-version=X.XX.X"
 	@echo "--then--"
+	@echo "  git push origin `git branch --show-current`"
 	@echo "  git push origin `git branch --show-current` --tags"
 
 .PHONY: release-dev

{python_msilib-0.4.0/src/python_msilib.egg-info → python_msilib-0.4.2}/PKG-INFO

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: python-msilib
-Version: 0.4.0
+Version: 0.4.2
 Summary: Read and write Microsoft Installer files
+Author:  Martin v. Löwis
 Author-email: Marcelo Duarte <marcelotduarte@users.noreply.github.com>
 License-Expression: PSF-2.0
 Project-URL: Source, https://github.com/marcelotduarte/python-msilib
+Project-URL: Changelog, https://github.com/marcelotduarte/python-msilib/releases
+Project-URL: Documentation, https://docs.python.org/3.12/library/msilib.html
 Keywords: msilib
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -26,11 +29,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
 Requires-Dist: bump-my-version==1.2.3; extra == "dev"
-Requires-Dist: cibuildwheel==3.2.0; extra == "dev"
-Requires-Dist: pre-commit==4.3.0; extra == "dev"
+Requires-Dist: cibuildwheel==3.2.1; extra == "dev"
+Requires-Dist: pre-commit==4.4.0; extra == "dev"
 Provides-Extra: tests
-Requires-Dist: coverage==7.10.7; extra == "tests"
-Requires-Dist: pytest==8.4.2; extra == "tests"
+Requires-Dist: coverage==7.11.3; extra == "tests"
+Requires-Dist: pytest==9.0.0; extra == "tests"
 Dynamic: license-file
 
 # python-msilib
@@ -38,7 +41,7 @@ Dynamic: license-file
 Read and write Microsoft Installer files.
 
 This library is legacy code borrowed from Python 3.12, intended to allow
-cx_Freeze's bdist_msi command to continue working in Python 3.13 and 3.14.
+cx_Freeze's `bdist_msi` command to continue working in Python 3.13 and 3.14.
 
 [![PyPI version](https://img.shields.io/pypi/v/python-msilib)](https://pypi.org/project/python-msilib/)
 [![PyPi Downloads](https://img.shields.io/pypi/dm/python-msilib)](https://pypistats.org/packages/python-msilib)

{python_msilib-0.4.0 → python_msilib-0.4.2}/README.md

@@ -3,7 +3,7 @@
 Read and write Microsoft Installer files.
 
 This library is legacy code borrowed from Python 3.12, intended to allow
-cx_Freeze's bdist_msi command to continue working in Python 3.13 and 3.14.
+cx_Freeze's `bdist_msi` command to continue working in Python 3.13 and 3.14.
 
 [![PyPI version](https://img.shields.io/pypi/v/python-msilib)](https://pypi.org/project/python-msilib/)
 [![PyPi Downloads](https://img.shields.io/pypi/dm/python-msilib)](https://pypistats.org/packages/python-msilib)

{python_msilib-0.4.0 → python_msilib-0.4.2}/pyproject.toml

@@ -37,22 +37,24 @@ requires-python = ">=3.13"
 name = "Marcelo Duarte"
 email = "marcelotduarte@users.noreply.github.com"
 
+[[project.authors]]
+name = " Martin v. Löwis"
+
 [project.optional-dependencies]
 dev = [
     "bump-my-version==1.2.3",
-    "cibuildwheel==3.2.0",
-    "pre-commit==4.3.0",           # python_version >= 3.9
+    "cibuildwheel==3.2.1",
+    "pre-commit==4.4.0",
 ]
 tests = [
-    "coverage==7.10.7",
-    "pytest==8.4.2",
+    "coverage==7.11.3",
+    "pytest==9.0.0",
 ]
 
 [project.urls]
-#Home = "https://marcelotduarte.github.io/cx_Freeze"
-#Changelog = "https://github.com/marcelotduarte/python-msilib/CHANGELOG.md"
-#Documentation = "https://cx-freeze.readthedocs.io"
 Source = "https://github.com/marcelotduarte/python-msilib"
+Changelog = "https://github.com/marcelotduarte/python-msilib/releases"
+Documentation = "https://docs.python.org/3.12/library/msilib.html"
 
 [tool.setuptools]
 include-package-data = true
@@ -65,7 +67,10 @@ version = {attr = "msilib.__version__"}
 [[tool.setuptools.ext-modules]]
 name = "msilib._msi"
 sources = ["src/msilib/_msi.c"]
-depends = ["src/msilib/include/_msi.h"]
+depends = [
+    "src/msilib/include/_msi.h",
+    "src/msilib/include/pythoncapi_compat.h"
+]
 libraries = ["msi","rpcrt4", "cabinet"]
 
 [tool.setuptools.packages.find]
@@ -74,7 +79,7 @@ where = ["src"]
 
 [tool.bumpversion]
 commit = true
-current_version = "0.4.0"
+current_version = "0.4.2"
 message = "Bump version: {current_version} → {new_version} [ci skip]"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.

{python_msilib-0.4.0 → python_msilib-0.4.2}/src/msilib/__init__.py

@@ -56,7 +56,7 @@ from msilib._msi import (
     UuidCreate,
 )
 
-__version__ = "0.4.0"
+__version__ = "0.4.2"
 
 __all__ = [
     "CAB",
@@ -135,6 +135,9 @@ __all__ = [
 AMD64 = platform.machine() in ("x64", "x86_64", "AMD64")
 ARM64 = platform.machine() in ("aarch64", "arm64", "ARM64")
 
+# Keep msilib.Win64 around to preserve backwards compatibility.
+Win64 = AMD64
+
 # Partially taken from Wine
 datasizemask = 0x00FF
 type_valid = 0x0100
@@ -292,10 +295,15 @@ def init_database(
     else:
         si.SetProperty(PID_TEMPLATE, "Intel;1033")
     si.SetProperty(PID_REVNUMBER, gen_uuid())
-    si.SetProperty(
-        PID_WORDCOUNT, 2
-    )  # long file names, compressed, original media
-    si.SetProperty(PID_PAGECOUNT, 200)
+    # https://learn.microsoft.com/en-us/windows/win32/msi/word-count-summary
+    # 2 = long file names, compressed, original media
+    si.SetProperty(PID_WORDCOUNT, 2)
+    # https://learn.microsoft.com/en-us/windows/win32/msi/page-count-summary
+    # https://learn.microsoft.com/en-us/windows/win32/msi/using-64-bit-windows-installer-packages
+    if ARM64:
+        si.SetProperty(PID_PAGECOUNT, 500)  # minimum of Windows Installer 5.0
+    else:
+        si.SetProperty(PID_PAGECOUNT, 200)  # minimum of Windows Installer 2.0
     si.SetProperty(PID_APPNAME, "Python MSI Library")
     # XXX more properties
     si.Persist()
@@ -433,7 +441,7 @@ class Directory:
         if component is None:
             component = self.logical
         self.component = component
-        # https://learn.microsoft.com/pt-br/windows/win32/msi/component-table
+        # https://learn.microsoft.com/en-us/windows/win32/msi/component-table
         if AMD64 or ARM64:
             flags |= 256  # msidbComponentAttributes64bit
         if keyfile:

{python_msilib-0.4.0 → python_msilib-0.4.2}/src/msilib/include/pythoncapi_compat.h

@@ -25,9 +25,6 @@ extern "C" {
 #if PY_VERSION_HEX < 0x030b00B4 && !defined(PYPY_VERSION)
 #  include "frameobject.h"        // PyFrameObject, PyFrame_GetBack()
 #endif
-#if PY_VERSION_HEX < 0x030C00A3
-#  include <structmember.h>       // T_SHORT, READONLY
-#endif
 
 
 #ifndef _Py_CAST
@@ -1919,33 +1916,33 @@ PyLongWriter_Finish(PyLongWriter *writer)
 
 
 #if PY_VERSION_HEX < 0x030C00A3
-#  define Py_T_SHORT      T_SHORT
-#  define Py_T_INT        T_INT
-#  define Py_T_LONG       T_LONG
-#  define Py_T_FLOAT      T_FLOAT
-#  define Py_T_DOUBLE     T_DOUBLE
-#  define Py_T_STRING     T_STRING
-#  define _Py_T_OBJECT    T_OBJECT
-#  define Py_T_CHAR       T_CHAR
-#  define Py_T_BYTE       T_BYTE
-#  define Py_T_UBYTE      T_UBYTE
-#  define Py_T_USHORT     T_USHORT
-#  define Py_T_UINT       T_UINT
-#  define Py_T_ULONG      T_ULONG
-#  define Py_T_STRING_INPLACE  T_STRING_INPLACE
-#  define Py_T_BOOL       T_BOOL
-#  define Py_T_OBJECT_EX  T_OBJECT_EX
-#  define Py_T_LONGLONG   T_LONGLONG
-#  define Py_T_ULONGLONG  T_ULONGLONG
-#  define Py_T_PYSSIZET   T_PYSSIZET
+#  define Py_T_SHORT      0
+#  define Py_T_INT        1
+#  define Py_T_LONG       2
+#  define Py_T_FLOAT      3
+#  define Py_T_DOUBLE     4
+#  define Py_T_STRING     5
+#  define _Py_T_OBJECT    6
+#  define Py_T_CHAR       7
+#  define Py_T_BYTE       8
+#  define Py_T_UBYTE      9
+#  define Py_T_USHORT     10
+#  define Py_T_UINT       11
+#  define Py_T_ULONG      12
+#  define Py_T_STRING_INPLACE  13
+#  define Py_T_BOOL       14
+#  define Py_T_OBJECT_EX  16
+#  define Py_T_LONGLONG   17
+#  define Py_T_ULONGLONG  18
+#  define Py_T_PYSSIZET   19
 
 #  if PY_VERSION_HEX >= 0x03000000 && !defined(PYPY_VERSION)
-#    define _Py_T_NONE      T_NONE
+#    define _Py_T_NONE      20
 #  endif
 
-#  define Py_READONLY            READONLY
-#  define Py_AUDIT_READ          READ_RESTRICTED
-#  define _Py_WRITE_RESTRICTED   PY_WRITE_RESTRICTED
+#  define Py_READONLY            1
+#  define Py_AUDIT_READ          2
+#  define _Py_WRITE_RESTRICTED   4
 #endif
 
 
@@ -1992,6 +1989,8 @@ static inline int Py_fclose(FILE *file)
 
 
 #if 0x03080000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x030E0000 && !defined(PYPY_VERSION)
+PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void);
+
 static inline PyObject*
 PyConfig_Get(const char *name)
 {
@@ -2127,8 +2126,6 @@ PyConfig_Get(const char *name)
             return Py_NewRef(value);
         }
 
-        PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void);
-
         const PyConfig *config = _Py_GetConfig();
         void *member = (char *)config + spec->offset;
         switch (spec->type) {
@@ -2231,6 +2228,81 @@ static inline int PyUnstable_Object_IsUniquelyReferenced(PyObject *obj)
 }
 #endif
 
+// gh-128926 added PyUnstable_TryIncRef() and PyUnstable_EnableTryIncRef() to
+// Python 3.14.0a5. Adapted from _Py_TryIncref() and _PyObject_SetMaybeWeakref().
+#if PY_VERSION_HEX < 0x030E00A5
+static inline int PyUnstable_TryIncRef(PyObject *op)
+{
+#ifndef Py_GIL_DISABLED
+    if (Py_REFCNT(op) > 0) {
+        Py_INCREF(op);
+        return 1;
+    }
+    return 0;
+#else
+    // _Py_TryIncrefFast()
+    uint32_t local = _Py_atomic_load_uint32_relaxed(&op->ob_ref_local);
+    local += 1;
+    if (local == 0) {
+        // immortal
+        return 1;
+    }
+    if (_Py_IsOwnedByCurrentThread(op)) {
+        _Py_INCREF_STAT_INC();
+        _Py_atomic_store_uint32_relaxed(&op->ob_ref_local, local);
+#ifdef Py_REF_DEBUG
+        _Py_INCREF_IncRefTotal();
+#endif
+        return 1;
+    }
+
+    // _Py_TryIncRefShared()
+    Py_ssize_t shared = _Py_atomic_load_ssize_relaxed(&op->ob_ref_shared);
+    for (;;) {
+        // If the shared refcount is zero and the object is either merged
+        // or may not have weak references, then we cannot incref it.
+        if (shared == 0 || shared == _Py_REF_MERGED) {
+            return 0;
+        }
+
+        if (_Py_atomic_compare_exchange_ssize(
+                &op->ob_ref_shared,
+                &shared,
+                shared + (1 << _Py_REF_SHARED_SHIFT))) {
+#ifdef Py_REF_DEBUG
+            _Py_INCREF_IncRefTotal();
+#endif
+            _Py_INCREF_STAT_INC();
+            return 1;
+        }
+    }
+#endif
+}
+
+static inline void PyUnstable_EnableTryIncRef(PyObject *op)
+{
+#ifdef Py_GIL_DISABLED
+    // _PyObject_SetMaybeWeakref()
+    if (_Py_IsImmortal(op)) {
+        return;
+    }
+    for (;;) {
+        Py_ssize_t shared = _Py_atomic_load_ssize_relaxed(&op->ob_ref_shared);
+        if ((shared & _Py_REF_SHARED_FLAG_MASK) != 0) {
+            // Nothing to do if it's in WEAKREFS, QUEUED, or MERGED states.
+            return;
+        }
+        if (_Py_atomic_compare_exchange_ssize(
+                &op->ob_ref_shared, &shared, shared | _Py_REF_MAYBE_WEAKREF)) {
+            return;
+        }
+    }
+#else
+    (void)op;  // unused argument
+#endif
+}
+#endif
+
 
 #if PY_VERSION_HEX < 0x030F0000
 static inline PyObject*

{python_msilib-0.4.0 → python_msilib-0.4.2/src/python_msilib.egg-info}/PKG-INFO

@@ -1,10 +1,13 @@
 Metadata-Version: 2.4
 Name: python-msilib
-Version: 0.4.0
+Version: 0.4.2
 Summary: Read and write Microsoft Installer files
+Author:  Martin v. Löwis
 Author-email: Marcelo Duarte <marcelotduarte@users.noreply.github.com>
 License-Expression: PSF-2.0
 Project-URL: Source, https://github.com/marcelotduarte/python-msilib
+Project-URL: Changelog, https://github.com/marcelotduarte/python-msilib/releases
+Project-URL: Documentation, https://docs.python.org/3.12/library/msilib.html
 Keywords: msilib
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -26,11 +29,11 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Provides-Extra: dev
 Requires-Dist: bump-my-version==1.2.3; extra == "dev"
-Requires-Dist: cibuildwheel==3.2.0; extra == "dev"
-Requires-Dist: pre-commit==4.3.0; extra == "dev"
+Requires-Dist: cibuildwheel==3.2.1; extra == "dev"
+Requires-Dist: pre-commit==4.4.0; extra == "dev"
 Provides-Extra: tests
-Requires-Dist: coverage==7.10.7; extra == "tests"
-Requires-Dist: pytest==8.4.2; extra == "tests"
+Requires-Dist: coverage==7.11.3; extra == "tests"
+Requires-Dist: pytest==9.0.0; extra == "tests"
 Dynamic: license-file
 
 # python-msilib
@@ -38,7 +41,7 @@ Dynamic: license-file
 Read and write Microsoft Installer files.
 
 This library is legacy code borrowed from Python 3.12, intended to allow
-cx_Freeze's bdist_msi command to continue working in Python 3.13 and 3.14.
+cx_Freeze's `bdist_msi` command to continue working in Python 3.13 and 3.14.
 
 [![PyPI version](https://img.shields.io/pypi/v/python-msilib)](https://pypi.org/project/python-msilib/)
 [![PyPi Downloads](https://img.shields.io/pypi/dm/python-msilib)](https://pypistats.org/packages/python-msilib)

{python_msilib-0.4.0 → python_msilib-0.4.2}/src/python_msilib.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ README.md
 pyproject.toml
 src/msilib/_msi.c
 src/msilib/include/_msi.h
+src/msilib/include/pythoncapi_compat.h
 src/msilib/__init__.py
 src/msilib/_msi.c
 src/msilib/schema.py

python_msilib-0.4.2/src/python_msilib.egg-info/requires.txt

@@ -0,0 +1,9 @@
+
+[dev]
+bump-my-version==1.2.3
+cibuildwheel==3.2.1
+pre-commit==4.4.0
+
+[tests]
+coverage==7.11.3
+pytest==9.0.0

python_msilib-0.4.0/MANIFEST.in

@@ -1,4 +0,0 @@
-include Makefile
-include requirements-dev.txt
-recursive-include src *.c *.h
-recursive-include tests *.md *.py *.txt

python_msilib-0.4.0/src/python_msilib.egg-info/requires.txt

@@ -1,9 +0,0 @@
-
-[dev]
-bump-my-version==1.2.3
-cibuildwheel==3.2.0
-pre-commit==4.3.0
-
-[tests]
-coverage==7.10.7
-pytest==8.4.2