From f710ab4afd6943755dead54c4d13eb8df749258f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:32:38 +0000 Subject: [PATCH 01/11] Initial plan From 55013e58ded1e945cf2b95a8eb5086738f4badaf Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:33:54 +0000 Subject: [PATCH 02/11] Use Python 3.12.13 in macOS workflow matrix Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/dff384cb-8ac0-49e6-8ee2-5924375ebd81 Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- .github/workflows/macos-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 25836bd..071e877 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python: [3.12] + python: [3.12.13] steps: - uses: actions/checkout@v4 - name: Set up Python From 3faafeef087eca871bdfc8e08d80dd6a0363b62a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:38:09 +0000 Subject: [PATCH 03/11] Use available macOS Python 3.13.13 in workflow matrix Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/e050c7c4-cb39-4acf-8fda-6aa53198517c Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- .github/workflows/macos-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index 071e877..d94b73b 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -13,7 +13,7 @@ jobs: runs-on: macos-latest strategy: matrix: - python: [3.12.13] + python: [3.13.13] steps: - uses: actions/checkout@v4 - name: Set up Python From 224c4c47a50cd8d9b0defe69f702c34de5b79ff8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:42:28 +0000 Subject: [PATCH 04/11] Pin py2app to 0.28.8 for macOS build Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/5ae4897a-6bcb-4ba9-8560-e0ae927cafc7 Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index f4b8913..36659fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ rumps~=0.4.0 pyobjc-core~=12.1 pyobjc-framework-cocoa~=12.1 -py2app~=0.28.10 -libxmmanager \ No newline at end of file +py2app>=0.28.8,<0.28.9 +libxmmanager From ed464207666e6d2db86f3fe8315ff05340fe62e0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:50:51 +0000 Subject: [PATCH 05/11] Pin setuptools for py2app builds Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/5771ece2-7d18-4c28-bc4d-fad6f9f61f2f Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 36659fb..84ad1a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,5 @@ rumps~=0.4.0 pyobjc-core~=12.1 pyobjc-framework-cocoa~=12.1 py2app>=0.28.8,<0.28.9 +setuptools==81.0.0 libxmmanager From 3863afcb33e347458b05034246b6260e39ae4297 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:51:17 +0000 Subject: [PATCH 06/11] Relax setuptools pin for py2app Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/5771ece2-7d18-4c28-bc4d-fad6f9f61f2f Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 84ad1a2..c5c510b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ rumps~=0.4.0 pyobjc-core~=12.1 pyobjc-framework-cocoa~=12.1 py2app>=0.28.8,<0.28.9 -setuptools==81.0.0 +setuptools>=81.0.0,<82.0.0 libxmmanager From 16f25a0783bc832bf50427a6b48ae7810d5653c1 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:57:15 +0000 Subject: [PATCH 07/11] Revert setuptools pin in requirements Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/d312aa3b-01ca-4bb9-ab03-38f80925dca8 Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5c510b..36659fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,4 @@ rumps~=0.4.0 pyobjc-core~=12.1 pyobjc-framework-cocoa~=12.1 py2app>=0.28.8,<0.28.9 -setuptools>=81.0.0,<82.0.0 libxmmanager From ad6bde49bfc43815e7d75b4278abe2e0d7172c74 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 16 May 2026 23:59:26 +0000 Subject: [PATCH 08/11] Revert py2app requirement change Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/c62fb133-e18a-4a17-b1d9-30e7f90f510a Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 36659fb..f4b8913 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ rumps~=0.4.0 pyobjc-core~=12.1 pyobjc-framework-cocoa~=12.1 -py2app>=0.28.8,<0.28.9 -libxmmanager +py2app~=0.28.10 +libxmmanager \ No newline at end of file From 1545546d80feb54275f319eb76505474f9edbc83 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 17 May 2026 00:07:20 +0000 Subject: [PATCH 09/11] Clear install_requires for py2app build Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/0f85a4e7-12ab-43e9-b706-d8a8c057e85a Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- setup.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ada9131..1876565 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup +from setuptools import Distribution, setup APP = ['main.py'] DATA_FILES = [''] @@ -11,8 +11,15 @@ 'includes': ['Cocoa'], } +class Py2AppDistribution(Distribution): + def finalize_options(self): + super().finalize_options() + self.install_requires = [] + + setup( app=APP, options={'py2app': OPTIONS}, + distclass=Py2AppDistribution, setup_requires=['py2app'], -) \ No newline at end of file +) From ba3f4b9d42d9c40870fc17eb107de569611d5b23 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 17 May 2026 00:08:11 +0000 Subject: [PATCH 10/11] Document py2app build workaround Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/0f85a4e7-12ab-43e9-b706-d8a8c057e85a Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 1876565..647fef9 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,7 @@ } class Py2AppDistribution(Distribution): + """Clear install_requires for py2app builds to avoid distutils errors.""" def finalize_options(self): super().finalize_options() self.install_requires = [] From e731a93c48ded5557c574233edb79620082b7332 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 17 May 2026 00:08:47 +0000 Subject: [PATCH 11/11] Limit install_requires workaround to py2app Agent-Logs-Url: https://github.com/numycode/xmmanager/sessions/0f85a4e7-12ab-43e9-b706-d8a8c057e85a Co-authored-by: numycode <179340695+numycode@users.noreply.github.com> --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 647fef9..fdf8df7 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +import sys + from setuptools import Distribution, setup APP = ['main.py'] @@ -12,10 +14,11 @@ } class Py2AppDistribution(Distribution): - """Clear install_requires for py2app builds to avoid distutils errors.""" + """Clear install_requires for py2app to avoid DistutilsOptionError.""" def finalize_options(self): super().finalize_options() - self.install_requires = [] + if "py2app" in sys.argv: + self.install_requires = [] setup(