From 9ec0c54f39008b24ca70c5e4c90464408b594696 Mon Sep 17 00:00:00 2001
From: unknown <jasprose@protonmail.com>
Date: Fri, 29 Apr 2022 00:29:44 +0200
Subject: [PATCH] setuptools v61, excludes, v2.2.3

---
 CHANGELOG.md   |  6 ++++++
 pyinstaller.py | 17 +++++++++++++----
 setup.py       | 20 ++++++++++++++++----
 version.py     |  4 ++--
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 564f64b..5e27191 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 (This document uses YYYY-MM-DD)
 
+## [v2.2.3] - 2022-04-11
+
+### Changed
+ - Excluded some more modules in build files, hopefully shouldn't cause any issues.
+ - Added empty 'package' option to 'setup' in setup.py, setuptools v61.0.0 doesn't seem to like our project layout.
+
 ## [v2.2.2] - 2022-04-11
 
 ### Changed
diff --git a/pyinstaller.py b/pyinstaller.py
index 6dd9a36..903a356 100644
--- a/pyinstaller.py
+++ b/pyinstaller.py
@@ -62,7 +62,8 @@ Some of the include files are specific to my instalation, so you might have to e
 except KeyboardInterrupt:
     sys.exit("KeyboardInterrupt")
 
-exclude_modules = ['collections.sys',
+exclude_modules = ['tkinter',
+        'collections.sys',
         'collections._sre',
         'collections._json',
         'collections._locale',
@@ -78,12 +79,20 @@ exclude_modules = ['collections.sys',
         'PyQt5.QtSvg',
         'PyQt5.QtTest',
         'PyQt5.QtWebKit',
-#        'PyQt5.QtXml',
-#        'PyQt5.QtXmlPatterns',
+        'PyQt5.QtXml',
+        'PyQt5.QtXmlPatterns',
         'PyQt5.phonon',
         'PyQt5.QtAssistant',
         'PyQt5.QtDesigner',
-        'PyQt5.QAxContainer',]
+        'PyQt5.QAxContainer',
+        'asyncio', # for now . . .
+        'email', # ?? :?
+        'xml',
+        'pygame.docs' # Hopefully we can just not have pygame at all at some point =3
+                      # (when QtMultimedia stops relying on local codecs </3)
+        'pygame.examples',
+        'pygame.tests',
+        'pydoc_data'],
 
 add_data = ['quirks;quirks',
         'smilies;smilies',
diff --git a/setup.py b/setup.py
index a4792ed..e5bbef8 100644
--- a/setup.py
+++ b/setup.py
@@ -2,6 +2,7 @@
 import sys
 
 from cx_Freeze import setup, Executable
+import pygame
 
 from version import buildVersion
 
@@ -35,7 +36,9 @@ includefiles = ["quirks",
                 "Pesterchum.png",
                 "logging.ini.example"]
 build_exe_options = {
-##    "includes": [],
+    "includes": ['PyQt5.QtCore',
+        'PyQt5.QtGui',
+        'PyQt5.QtWidgets'],
     "excludes": ['tkinter',
         'collections.sys',
         'collections._sre',
@@ -53,12 +56,20 @@ build_exe_options = {
         'PyQt5.QtSvg',
         'PyQt5.QtTest',
         'PyQt5.QtWebKit',
-#        'PyQt5.QtXml',
-#        'PyQt5.QtXmlPatterns',
+        'PyQt5.QtXml',
+        'PyQt5.QtXmlPatterns',
         'PyQt5.phonon',
         'PyQt5.QtAssistant',
         'PyQt5.QtDesigner',
-        'PyQt5.QAxContainer',],
+        'PyQt5.QAxContainer',
+        'asyncio', # for now . . .
+        'email', # ?? :?
+        'xml',
+        'pygame.docs' # Hopefully we can just not have pygame at all at some point =3
+                      # (when QtMultimedia stops relying on local codecs </3)
+        'pygame.examples',
+        'pygame.tests',
+        'pydoc_data'],
     "include_files": includefiles,
     "include_msvcr": True,  # cx_freeze copies 64-bit binaries always?
     "path": path            # Improved in 6.6, path to be safe
@@ -121,6 +132,7 @@ setup(
             options = {"build_exe": build_exe_options,
                        "bdist_msi": bdist_msi_options,
                        "bdist_mac": bdist_mac_options},
+            packages="",
             executables = [Executable("pesterchum.py",
                                       base=base,
                                       icon=icon
diff --git a/version.py b/version.py
index 5860351..0022b05 100644
--- a/version.py
+++ b/version.py
@@ -1,2 +1,2 @@
-_pcVersion = "Alt. v2.2.2"
-buildVersion = "v2.2.2"
+_pcVersion = "Alt. v2.2.3"
+buildVersion = "v2.2.3"