From eef0ba41e8004a99e56d7185950290919f19bced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Tue, 4 Feb 2025 02:06:29 +0000
Subject: [PATCH] Extract entry point scripts to pyproject.toml

---
 pyproject.toml | 15 ++++++++++++++-
 setup-wxsvg.py |  1 -
 setup.py       | 25 -------------------------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2e11223f..803e691f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,10 +43,23 @@ dynamic = [
     "dependencies",
     "license",
     "readme",
-    "scripts",
     "version",
 ]
 
+[project.scripts]
+helpviewer = "wx.tools.helpviewer:main"
+img2png = "wx.tools.img2png:main"
+img2py = "wx.tools.img2py:main"
+img2xpm = "wx.tools.img2xpm:main"
+pycrust = "wx.py.PyCrust:main"
+pyshell = "wx.py.PyShell:main"
+pyslices = "wx.py.PySlices:main"
+pyslicesshell = "wx.py.PySlicesShell:main"
+pywxrc = "wx.tools.pywxrc:main"
+wxdemo = "wx.tools.wxget_docs_demo:demo_main" # Get/Launch Demo
+wxdocs = "wx.tools.wxget_docs_demo:docs_main" # Get/Launch Docs
+wxget = "wx.tools.wxget:main"                 # New wx wget
+
 [project.urls]
 Documentation = "https://docs.wxpython.org/"
 Download = "https://pypi.org/project/wxPython"
diff --git a/setup-wxsvg.py b/setup-wxsvg.py
index aeec6998..9358937b 100644
--- a/setup-wxsvg.py
+++ b/setup-wxsvg.py
@@ -64,5 +64,4 @@ setup(name             = 'wx.svg',
       #packages         = [PACKAGE],
       ext_modules      = modules,
       options          = { 'build' : BUILD_OPTIONS,  },
-      scripts          = [],
 )
diff --git a/setup.py b/setup.py
index e23e1017..5d9c1c3c 100644
--- a/setup.py
+++ b/setup.py
@@ -294,28 +294,6 @@ setuptools.command.build_py.make_writable = wx_make_writable
 
 WX_PKGLIST = [cfg.PKGDIR] + [cfg.PKGDIR + '.' + pkg for pkg in find_packages('wx')]
 
-ENTRY_POINTS = {
-    'console_scripts' : [
-        "img2png = wx.tools.img2png:main",
-        "img2py = wx.tools.img2py:main",
-        "img2xpm = wx.tools.img2xpm:main",
-        "pywxrc = wx.tools.pywxrc:main",
-#        ],
-#    'gui_scripts' : [  # TODO: Why was this commented out?
-        "wxget = wx.tools.wxget:main",  # New wx wget
-        "wxdocs = wx.tools.wxget_docs_demo:docs_main",  # Get/Launch Docs
-        "wxdemo = wx.tools.wxget_docs_demo:demo_main",  # Get/Launch Demo
-        "helpviewer = wx.tools.helpviewer:main",
-        "pycrust = wx.py.PyCrust:main",
-        "pyshell = wx.py.PyShell:main",
-        "pyslices = wx.py.PySlices:main",
-        "pyslicesshell = wx.py.PySlicesShell:main",
-        ],
-    }
-
-SCRIPTS = []
-DATA_FILES = []
-
 HEADERS = None
 BUILD_OPTIONS = { } #'build_base' : cfg.BUILD_BASE }
 #if cfg.WXPORT == 'msw':
@@ -340,9 +318,6 @@ if __name__ == '__main__':
 
           options          = { 'build'     : BUILD_OPTIONS },
 
-          scripts          = SCRIPTS,
-          data_files       = DATA_FILES,
           headers          = HEADERS,
           cmdclass         = CMDCLASS,
-          entry_points     = ENTRY_POINTS,
         )