Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-cx_Freeze for
openSUSE:Factory checked in at 2023-12-28 23:01:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cx_Freeze (Old)
and /work/SRC/openSUSE:Factory/.python-cx_Freeze.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cx_Freeze"
Thu Dec 28 23:01:08 2023 rev:12 rq:1135260 version:6.15.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cx_Freeze/python-cx_Freeze.changes
2023-12-03 20:49:08.734508371 +0100
+++
/work/SRC/openSUSE:Factory/.python-cx_Freeze.new.28375/python-cx_Freeze.changes
2023-12-28 23:02:48.941407820 +0100
@@ -1,0 +2,7 @@
+Wed Dec 27 10:04:06 UTC 2023 - Dirk Müller <[email protected]>
+
+- update to 6.15.12:
+ * **Full Changelog**: https://github.com/marcelotduarte/cx_Free
+ ze/compare/6.15.11...6.15.12
+
+-------------------------------------------------------------------
Old:
----
6.15.11.tar.gz
New:
----
6.15.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cx_Freeze.spec ++++++
--- /var/tmp/diff_new_pack.8bjM2y/_old 2023-12-28 23:02:49.521429018 +0100
+++ /var/tmp/diff_new_pack.8bjM2y/_new 2023-12-28 23:02:49.521429018 +0100
@@ -18,7 +18,7 @@
%define oldpython python
Name: python-cx_Freeze
-Version: 6.15.11
+Version: 6.15.12
Release: 0
Summary: Scripts to create standalone executables from Python scripts
License: Python-2.0
++++++ 6.15.11.tar.gz -> 6.15.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/.github/workflows/build-wheel.yml
new/cx_Freeze-6.15.12/.github/workflows/build-wheel.yml
--- old/cx_Freeze-6.15.11/.github/workflows/build-wheel.yml 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/.github/workflows/build-wheel.yml 2023-12-18
07:33:24.000000000 +0100
@@ -30,7 +30,7 @@
ref: ${{ inputs.branch }}
repository: marcelotduarte/cx_Freeze
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
with:
cache: 'pip'
python-version: ${{ matrix.python-version }}
@@ -52,15 +52,15 @@
python -m cibuildwheel --output-dir wheelhouse --prerelease-pythons
- name: Add sdist
- if: runner.os == 'Linux' && '${{ matrix.python-version }}' == '3.11'
+ if: runner.os == 'Linux' && matrix.python-version == '3.11'
run: |
python -m pip install --upgrade pip build
python -m build . --sdist -o wheelhouse
- name: Upload the artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: cx-freeze-wheelhouse
+ name: cx-freeze-pip-${{ matrix.os }}-${{ matrix.python-version }}
path: wheelhouse
publish:
@@ -82,16 +82,20 @@
repository: marcelotduarte/cx_Freeze
- name: Setup Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
cache: 'pip'
python-version: "3.11"
- - name: Download the artifact
- uses: actions/download-artifact@v3
+ - name: Download all artifacts
+ uses: actions/download-artifact@v4
with:
- name: cx-freeze-wheelhouse
- path: wheelhouse
+ path: artifacts
+
+ - name: Join files to upload
+ run: |
+ mkdir -p wheelhouse
+ mv artifacts/cx-freeze-pip-*/* wheelhouse/
- name: Publish package to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
@@ -115,11 +119,10 @@
repository: marcelotduarte/cx_Freeze
token: ${{ secrets.PUSH }}
- - name: Download the artifact
- uses: actions/download-artifact@v3
+ - name: Download all artifacts
+ uses: actions/download-artifact@v4
with:
- name: cx-freeze-wheelhouse
- path: wheelhouse
+ path: artifacts
- name: If changed, extract and update the base executables and util
module
run: |
@@ -132,7 +135,7 @@
# Remove any file that match - remove previous versions too
git rm --ignore-unmatch 'cx_Freeze/bases/*-win*.exe'
'cx_Freeze/util.*-win*.pyd'
# Extract base executables and util module
- for file in wheelhouse/*-win*.whl; do
+ for file in artifacts/cx-freeze-pip-windows-*/*-win*.whl; do
unzip -o $file 'cx_Freeze/bases/*-win*.exe'
'cx_Freeze/util.*-win*.pyd'
done
git add cx_Freeze/bases/*-win*.exe cx_Freeze/util.*-win*.pyd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/.github/workflows/ci.yml
new/cx_Freeze-6.15.12/.github/workflows/ci.yml
--- old/cx_Freeze-6.15.11/.github/workflows/ci.yml 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/.github/workflows/ci.yml 2023-12-18
07:33:24.000000000 +0100
@@ -14,7 +14,7 @@
- uses: actions/checkout@v4
- name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
cache: 'pip'
python-version: "3.11"
@@ -40,7 +40,7 @@
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
cache: 'pip'
python-version: ${{ matrix.python-version }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/.github/workflows/codeql.yml
new/cx_Freeze-6.15.12/.github/workflows/codeql.yml
--- old/cx_Freeze-6.15.11/.github/workflows/codeql.yml 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/.github/workflows/codeql.yml 2023-12-18
07:33:24.000000000 +0100
@@ -44,7 +44,7 @@
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a
config file.
@@ -58,7 +58,7 @@
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or
Java).
# If this step fails, then you should remove it and run the build manually
(see below)
- name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
# â¹ï¸ Command-line programs to run using the OS shell.
# ð See
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,6 +71,6 @@
# ./location_of_script_within_repo/buildscript.sh
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/.pre-commit-config.yaml
new/cx_Freeze-6.15.12/.pre-commit-config.yaml
--- old/cx_Freeze-6.15.11/.pre-commit-config.yaml 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/.pre-commit-config.yaml 2023-12-18
07:33:24.000000000 +0100
@@ -36,7 +36,7 @@
- id: validate-pyproject
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.1.6
+ rev: v0.1.7
hooks:
- id: ruff
args: ["--fix"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/cx_Freeze/__init__.py
new/cx_Freeze-6.15.12/cx_Freeze/__init__.py
--- old/cx_Freeze-6.15.11/cx_Freeze/__init__.py 2023-11-29 02:10:40.000000000
+0100
+++ new/cx_Freeze-6.15.12/cx_Freeze/__init__.py 2023-12-18 07:33:24.000000000
+0100
@@ -42,7 +42,7 @@
__all__.append(bdist_rpm.__name__)
-__version__ = "6.15.11"
+__version__ = "6.15.12"
def setup(**attrs): # noqa: D103
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/cx_Freeze/command/bdist_mac.py
new/cx_Freeze-6.15.12/cx_Freeze/command/bdist_mac.py
--- old/cx_Freeze-6.15.11/cx_Freeze/command/bdist_mac.py 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/cx_Freeze/command/bdist_mac.py 2023-12-18
07:33:24.000000000 +0100
@@ -429,28 +429,19 @@
target = os.path.join(self.bin_dir, executable.target_name)
self.move_file(source, target)
- # Make symlink between Resources/lib and Contents/MacOS so we can use
- # none-relative reference paths in order to pass codesign...
- resources_lib_dir = os.path.join(self.resources_dir, "lib")
- origin = os.path.join(self.bin_dir, "lib")
- relative_reference = os.path.relpath(resources_lib_dir, self.bin_dir)
- self.execute(
- os.symlink,
- (relative_reference, origin, True),
- msg=f"linking {origin} -> {relative_reference}",
- )
- # Make symlink between Resources/share and Contents/MacOS too.
- resource_share_dir = os.path.join(self.resources_dir, "share")
- if os.path.exists(resource_share_dir):
- origin = os.path.join(self.bin_dir, "share")
- relative_reference = os.path.relpath(
- resource_share_dir, self.bin_dir
- )
- self.execute(
- os.symlink,
- (relative_reference, origin, True),
- msg=f"linking {origin} -> {relative_reference}",
- )
+ # Make symlink between folders under Resources such as lib and others
+ # specified by the user in include_files and Contents/MacOS so we can
+ # use non-relative reference paths to pass codesign...
+ for filename in os.listdir(self.resources_dir):
+ target = os.path.join(self.resources_dir, filename)
+ if os.path.isdir(target):
+ origin = os.path.join(self.bin_dir, filename)
+ relative_reference = os.path.relpath(target, self.bin_dir)
+ self.execute(
+ os.symlink,
+ (relative_reference, origin, True),
+ msg=f"linking {origin} -> {relative_reference}",
+ )
# Copy the icon
if self.iconfile:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/cx_Freeze/darwintools.py
new/cx_Freeze-6.15.12/cx_Freeze/darwintools.py
--- old/cx_Freeze-6.15.11/cx_Freeze/darwintools.py 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/cx_Freeze/darwintools.py 2023-12-18
07:33:24.000000000 +0100
@@ -479,15 +479,17 @@
def change_load_reference(
filename: str, old_reference: str, new_reference: str, verbose: bool = True
):
- """Utility function that uses intall_name_tool to change old_reference to
+ """Utility function that uses install_name_tool to change old_reference to
new_reference in the machO file specified by filename.
"""
if verbose:
print("Redirecting load reference for ", end="")
print(f"<{filename}> {old_reference} -> {new_reference}")
original = os.stat(filename).st_mode
- os.chmod(filename, original | stat.S_IWUSR)
- exitcode, output = subprocess.getstatusoutput(
+ new_mode = original | stat.S_IWUSR
+ if new_mode != original:
+ os.chmod(filename, new_mode)
+ subprocess.call(
(
"install_name_tool",
"-change",
@@ -496,9 +498,8 @@
filename,
)
)
- os.chmod(filename, original)
- if verbose and exitcode > 0:
- print("\tError:", exitcode, " ->", output)
+ if new_mode != original:
+ os.chmod(filename, original)
def apply_adhoc_signature(filename: str):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/cx_Freeze/hooks/_libs.py
new/cx_Freeze-6.15.12/cx_Freeze/hooks/_libs.py
--- old/cx_Freeze-6.15.11/cx_Freeze/hooks/_libs.py 2023-11-29
02:10:40.000000000 +0100
+++ new/cx_Freeze-6.15.12/cx_Freeze/hooks/_libs.py 2023-12-18
07:33:24.000000000 +0100
@@ -7,7 +7,9 @@
from cx_Freeze.module import Module
-def replace_delvewheel_patch(module: Module) -> None:
+def replace_delvewheel_patch(
+ module: Module, libs_name: str | None = None
+) -> None:
"""Replace delvewheel injections of code to not find for module.libs
directory.
"""
@@ -15,6 +17,8 @@
if code is None:
return
+ if libs_name is None:
+ libs_name = f"{module.name}.libs"
delvewheel_func_names = "_delvewheel_init_patch_", "_delvewheel_patch_"
consts = list(code.co_consts)
for constant in consts:
@@ -26,7 +30,7 @@
import os, sys
libs_path = os.path.join(
- sys.frozen_dir, "lib", "{module.name}.libs"
+ sys.frozen_dir, "lib", "{libs_name}"
)
try:
os.add_dll_directory(libs_path)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/cx_Freeze/hooks/av.py
new/cx_Freeze-6.15.12/cx_Freeze/hooks/av.py
--- old/cx_Freeze-6.15.11/cx_Freeze/hooks/av.py 1970-01-01 01:00:00.000000000
+0100
+++ new/cx_Freeze-6.15.12/cx_Freeze/hooks/av.py 2023-12-18 07:33:24.000000000
+0100
@@ -0,0 +1,23 @@
+"""A collection of functions which are triggered automatically by finder when
+AV/PyAV package is included.
+"""
+from __future__ import annotations
+
+from cx_Freeze._compat import IS_WINDOWS
+from cx_Freeze.finder import ModuleFinder
+from cx_Freeze.hooks._libs import replace_delvewheel_patch
+from cx_Freeze.module import Module
+
+
+def load_av(finder: ModuleFinder, module: Module) -> None:
+ """The AV or PyAV package."""
+ if IS_WINDOWS:
+ libs_name = "av.libs"
+ source_dir = module.file.parent.parent / libs_name
+ if not source_dir.exists():
+ libs_name = "pyav.libs"
+ source_dir = module.file.parent.parent / libs_name
+ if source_dir.exists():
+ finder.include_files(source_dir, f"lib/{libs_name}")
+ replace_delvewheel_patch(module, libs_name)
+ finder.include_module("av.deprecation")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/doc/src/conf.py
new/cx_Freeze-6.15.12/doc/src/conf.py
--- old/cx_Freeze-6.15.11/doc/src/conf.py 2023-11-29 02:10:40.000000000
+0100
+++ new/cx_Freeze-6.15.12/doc/src/conf.py 2023-12-18 07:33:24.000000000
+0100
@@ -42,7 +42,7 @@
# General information about the project.
project = "cx_Freeze"
copyright = "2023, Marcelo Duarte" # noqa: A001
-__version__ = "6.15.11"
+__version__ = "6.15.12"
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/pyproject.toml
new/cx_Freeze-6.15.12/pyproject.toml
--- old/cx_Freeze-6.15.11/pyproject.toml 2023-11-29 02:10:40.000000000
+0100
+++ new/cx_Freeze-6.15.12/pyproject.toml 2023-12-18 07:33:24.000000000
+0100
@@ -116,7 +116,7 @@
[tool.bumpversion]
commit = true
-current_version = "6.15.11"
+current_version = "6.15.12"
message = "Bump version: {current_version} â {new_version} [ci skip]"
parse =
"(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(\\-(?P<release>[a-z]+)(?P<build>\\d+))?"
serialize = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cx_Freeze-6.15.11/source/bases/common.c
new/cx_Freeze-6.15.12/source/bases/common.c
--- old/cx_Freeze-6.15.11/source/bases/common.c 2023-11-29 02:10:40.000000000
+0100
+++ new/cx_Freeze-6.15.12/source/bases/common.c 2023-12-18 07:33:24.000000000
+0100
@@ -10,6 +10,7 @@
// this consists of <dir>/lib/library.zip and <dir>/lib
// where <dir> refers to the directory in which the executable is found
#if defined(MS_WINDOWS)
+ #include <libloaderapi.h>
#define CX_PATH_FORMAT L"%ls\\lib\\library.zip;%ls\\lib"
#define CX_LIB L"lib"
#define PY3_DLLNAME L"python3.dll"
@@ -55,7 +56,7 @@
wcscpy(g_LibDirName, g_ExecutableDirName);
wcscat(g_LibDirName, L"\\");
wcscat(g_LibDirName, CX_LIB);
- if (!SetDllDirectoryW(g_LibDirName))
+ if (AddDllDirectory(g_LibDirName) == 0)
return FatalError("Unable to change DLL search path!");
#else
