Release v6.1.0. [skip ci]

PyInstaller/__init__.py

@@ -18,7 +18,7 @@
 from PyInstaller.utils.git import get_repo_revision
 
 # Note: Keep this variable as plain string so it could be updated automatically when doing a release.
-__version__ = '6.0.0'
+__version__ = '6.1.0'
 
 # Absolute path of this package's directory. Save this early so all submodules can use the absolute path. This is
 # required for example if the current directory changes prior to loading the hooks.

README.rst

@@ -134,7 +134,7 @@ either ``gcc`` or ``clang``) and zlib's development headers already installed.
 Support
 -------
 
-- Official debugging guide: https://pyinstaller.org/en/v6.0.0/when-things-go-wrong.html
+- Official debugging guide: https://pyinstaller.org/en/v6.1.0/when-things-go-wrong.html
 - Assorted user contributed help topics: https://github.com/pyinstaller/pyinstaller/wiki
 - Web based Q&A forums: https://github.com/pyinstaller/pyinstaller/discussions
 - Email based Q&A forums: https://groups.google.com/g/pyinstaller
@@ -146,5 +146,5 @@ Changes in this Release
 You can find a detailed list of changes in this release
 in the `Changelog`_ section of the manual.
 
-.. _`manual`: https://pyinstaller.org/en/v6.0.0/
-.. _`Changelog`: https://pyinstaller.org/en/v6.0.0/CHANGES.html
+.. _`manual`: https://pyinstaller.org/en/v6.1.0/
+.. _`Changelog`: https://pyinstaller.org/en/v6.1.0/CHANGES.html

doc/CHANGES.rst

@@ -15,6 +15,71 @@ Changelog for PyInstaller
 
 .. towncrier release notes start
 
+6.1.0 (2023-10-13)
+------------------
+
+Features
+~~~~~~~~
+
+* Allow users to re-enable the old onedir layout (without contents directory) by
+  settings the :option:`--contents-directory` option (or the equivalent
+  ``contents_directory`` argument to ``EXE`` in the .spec file) to ``'.'``.
+  (:issue:`7968`)
+
+
+Bugfix
+~~~~~~
+
+* (macOS) Prevent bootloader from clearing ``DYLD_*`` environment variables
+  when running in ``onefile`` mode, in order to make behavior consistent
+  with ``onedir`` mode. (:issue:`7973`)
+* (Windows) Fix unintentional randomization of library search path order
+  in the binary dependency analysis step. The incorrect order of search
+  paths would result in defunct builds when using both ``pywin32``
+  and ``PyQt5``, ``PyQt6``, ``PySide2``, or ``PySide6``, as it would prevent
+  the python's copy of ``VCRUNTIME140_1.dll`` from being collected into
+  the top-level application directory due to it being shadowed by the
+  Qt-provided copy. Consequently, the application would fail with
+  ``ImportError: DLL load failed while importing pywintypes: The specified
+  module could not be found.`` (:issue:`7978`)
+* Ensure that ``__main__`` is always in the list of modules to exclude,
+  to prevent a program or a library that attempts to import ``__main__``
+  from pulling PyInstaller itself into frozen application bundle.
+  (:issue:`7956`)
+* Fix :func:`PyInstaller.utils.hooks.collect_entry_point` so that it returns
+  module names (without class names). This matches the behavior of previous
+  PyInstaller versions that regressed in PyInstaller ``v6.0.0`` during
+  transition from ``pkg_resources`` to ``importlib.metadata``. (:issue:`7958`)
+* Fix ``TypeError: process_collected_binary() got an unexpected keyword
+  argument 'strip'`` error when UPX compression is enabled. (:issue:`7998`)
+* Validate binaries returned by analysis of ``ctypes`` calls in collected
+  modules; the analysis might return files that are in ``PATH`` but are
+  not binaries, which then cause errors during binary dependency analysis.
+  An example of such problematic case is the ``gmsh`` package on Windows,
+  where ``ctypes.util.find_library('gmsh')`` ends up resolving the python
+  script called ``gmsh`` in the environment's Scripts directory.
+  (:issue:`7984`)
+
+
+Hooks
+~~~~~
+
+* Update ``PySide6.QtHttpServer`` hook for compatibility with ``PySide6``
+  6.5.3 on Windows. (:issue:`7994`)
+
+
+PyInstaller Core
+~~~~~~~~~~~~~~~~
+
+* (macOS) Lower the severity of a missing ``Info.plist`` file in a
+  collected macOS .framework bundle from an error to a warning (unless
+  strict collection mode is enabled). While missing ``Info.plist`` in a
+  collected .framework bundle will cause ``codesign`` to refuse to sign
+  the generated .app bundle, the user might be interested in building
+  just the POSIX application or may not plan to sign their .app bundle.
+  Fixes building with old ``PyQt5`` PyPI wheels (< 5.14.1). (:issue:`7959`)
+
+
 6.0.0 (2023-09-22)
 ------------------
 

doc/CREDITS.rst

@@ -5,6 +5,12 @@ Thanks goes to all the kind PyInstaller contributors who have contributed
 new code, bug reports, fixes, comments and ideas. A brief list follows,
 please let us know if your name is omitted by accident:
 
+Contributions to PyInstaller 6.1.0
+----------------------------------
+
+* Rok Mandeljc
+* Sebastian Thomschke
+
 Contributions to PyInstaller 6.0.0
 ----------------------------------
 

doc/pyi-makespec.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PYI-MAKESPEC" "1" "2023-09-22" "6.0.0" "PyInstaller"
+.TH "PYI-MAKESPEC" "1" "2023-10-13" "6.1.0" "PyInstaller"
 .SH NAME
 pyi-makespec \- Create a spec file for your PyInstaller project
 .
@@ -94,7 +94,8 @@ basename)
 .BI \-\-contents\-directory \ CONTENTS_DIRECTORY
 For onedir builds only, specify the name of the directory in which all
 supporting files (i.e. everything except the executable itself) will be
-placed in.
+placed in. Use "." to re\-enable old onedir layout without contents
+directory.
 .UNINDENT
 .SS What To Bundle, Where To Search
 .sp
@@ -197,8 +198,9 @@ directory.
 .TP
 .BI \-\-python\-option \ PYTHON_OPTION
 Specify a command\-line option to pass to the Python interpreter at runtime.
-Currently supports "v" (equivalent to "\-\-debug imports"), "u", and "W
-<warning control>".
+Currently supports "v" (equivalent to "\-\-debug imports"), "u", "W <warning
+control>", "X <xoption>", and "hash_seed=<value>". For details, see the
+section "Specifying Python Interpreter Options" in PyInstaller manual.
 .TP
 .B \-s\fP,\fB  \-\-strip
 Apply a symbol\-table strip to the executable and shared libs (not
@@ -228,7 +230,7 @@ option is automatically set if the first script is a \(aq.pyw\(aq file. This
 option is ignored on *NIX systems.
 .UNINDENT
 .sp
-\-\-hide\-console {hide\-early,minimize\-early,hide\-late,minimize\-late}
+\-\-hide\-console {hide\-late,minimize\-early,hide\-early,minimize\-late}
 .INDENT 0.0
 .INDENT 3.5
 Windows only: in console\-enabled executable, have bootloader automatically

doc/pyinstaller.1

@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "PYINSTALLER" "1" "2023-09-22" "6.0.0" "PyInstaller"
+.TH "PYINSTALLER" "1" "2023-10-13" "6.1.0" "PyInstaller"
 .SH NAME
 pyinstaller \- Configure and build a PyInstaller project in one run
 .
@@ -114,7 +114,8 @@ basename)
 .BI \-\-contents\-directory \ CONTENTS_DIRECTORY
 For onedir builds only, specify the name of the directory in which all
 supporting files (i.e. everything except the executable itself) will be
-placed in.
+placed in. Use "." to re\-enable old onedir layout without contents
+directory.
 .UNINDENT
 .SS What To Bundle, Where To Search
 .sp
@@ -217,8 +218,9 @@ resulting   output directory.
 .TP
 .BI \-\-python\-option \ PYTHON_OPTION
 Specify a command\-line option to pass to the Python interpreter at runtime.
-Currently supports "v" (equivalent to "\-\-debug imports"), "u", and "W
-<warning control>".
+Currently supports "v" (equivalent to "\-\-debug imports"), "u", "W <warning
+control>", "X <xoption>", and "hash_seed=<value>". For details, see the
+section "Specifying Python Interpreter Options" in PyInstaller manual.
 .TP
 .B \-s\fP,\fB  \-\-strip
 Apply a symbol\-table strip to the executable and shared libs (not
@@ -248,7 +250,7 @@ option is automatically set if the first script is a \(aq.pyw\(aq file. This
 option is ignored on *NIX systems.
 .UNINDENT
 .sp
-\-\-hide\-console {hide\-early,minimize\-early,hide\-late,minimize\-late}
+\-\-hide\-console {hide\-late,minimize\-early,hide\-early,minimize\-late}
 .INDENT 0.0
 .INDENT 3.5
 Windows only: in console\-enabled executable, have bootloader automatically