Merge pull request #21062 from mrclary/cmd-window

PR: Fix issue where cmd.exe window flashes on Spyder startup on Windows (installer)
spyder-ide · Jun 23, 2023 · 2507709 · 2507709
2 parents a2f45eb + 22e1af9
commit 2507709
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/installers-conda/build-environment.yml b/installers-conda/build-environment.yml
@@ -7,5 +7,6 @@ dependencies:
   - conda-standalone
   - constructor
   - gitpython
+  - menuinst
   - ruamel.yaml.jinja2
   - setuptools_scm
diff --git a/installers-conda/build_installers.py b/installers-conda/build_installers.py
@@ -132,8 +132,6 @@
 specs = {
     "python": "=" + PY_VER,
     "spyder": "=" + SPYVER,
-    "paramiko": "",
-    "pyxdg": "",
 }
 specs.update(scientific_packages)
 

diff --git a/installers-conda/resources/spyder-menu.json b/installers-conda/resources/spyder-menu.json
@@ -7,21 +7,19 @@
             "name": "Spyder",
             "description": "Scientific PYthon Development EnviRonment",
             "icon": "{{ MENU_DIR }}/spyder.{{ ICON_EXT }}",
-            "activate": true,
+            "activate": false,
             "terminal": false,
             "platforms": {
                 "win": {
                     "desktop": true,
-                    "precommand": "set SPY_BRANCH=__SPY_BRANCH__\nset SPY_COMMIT=__SPY_COMMIT__",
-                    "command": ["spyder", "%*"]
+                    "command": ["{{ PREFIX }}/pythonw.exe", "{{ PREFIX }}/Scripts/spyder-script.py"]
                 },
                 "linux": {
                     "Categories": [
                         "Graphics",
                         "Science"
                     ],
-                    "precommand": "export SPY_BRANCH=__SPY_BRANCH__ && export SPY_COMMIT=__SPY_COMMIT__",
-                    "command": ["spyder", "$@"],
+                    "command": ["{{ PREFIX }}/bin/spyder", "$@"],
                     "StartupWMClass": "Spyder"
                 },
                 "osx": {
@@ -37,11 +35,7 @@
                     "CFBundleName": "Spyder",
                     "CFBundleDisplayName": "Spyder",
                     "CFBundleIdentifier": "org.spyder-ide.Spyder",
-                    "CFBundleVersion": "__PKG_VERSION__",
-                    "LSEnvironment": {
-                        "SPY_BRANCH": "__SPY_BRANCH__",
-                        "SPY_COMMIT": "__SPY_COMMIT__"
-                    }
+                    "CFBundleVersion": "__PKG_VERSION__"
                 }
             }
         }

diff --git a/setup.py b/setup.py
@@ -97,8 +97,7 @@ def get_data_files():
                       ('share/metainfo',
                        ['scripts/org.spyder_ide.spyder.appdata.xml'])]
     elif os.name == 'nt':
-        data_files = [('scripts', ['img_src/spyder.ico',
-                                   'img_src/spyder_reset.ico'])]
+        data_files = [('scripts', ['img_src/spyder.ico'])]
     else:
         data_files = []