From 99370767a8997098b10580014d963de0aaaa5a30 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 2 May 2024 18:33:30 -0700 Subject: [PATCH 01/13] Fix sed once and for all. Array options for script and cat-ing to script are incompatible: ("-i" "''" "-e") works for cat-ing but not for script; ("-i" '' "-e") works for script but not cat-ing. For situations that require both script and cat-ing that must work for both GNU and BSD, the only solution is to use "-i.bak -e" and "rm *.bak" --- recipe/post-link.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/post-link.sh b/recipe/post-link.sh index 0278caa..c52fdeb 100644 --- a/recipe/post-link.sh +++ b/recipe/post-link.sh @@ -1,13 +1,13 @@ #!/bin/bash set -e -[[ $(sed --version 2>/dev/null) ]] && opts=("-i" "-E") || opts=("-i" "''" "-E") +[[ $(sed --version 2>/dev/null) ]] && opts=("-i" "-E") || opts=("-i" "" "-E") menu="${PREFIX}/Menu/spyder-menu.json" if [[ -f "${PREFIX}/Menu/conda-based-app" ]]; then # Installed in installer environment, abridge shortcut name - sed ${opts[@]} "s/ \(\{\{ ENV_NAME \}\}\)//g" $menu + sed "${opts[@]}" "s/ \(\{\{ ENV_NAME \}\}\)//g" $menu elif [[ -d "${PREFIX}/condabin" && -d "${PREFIX}/envs" ]]; then # Installed in a base environment, use distribution name - sed ${opts[@]} "s/ENV_NAME/DISTRIBUTION_NAME/g" $menu + sed "${opts[@]}" "s/ENV_NAME/DISTRIBUTION_NAME/g" $menu fi From eb7a43cad9061edca39da7fa391337bc6ef9c342 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:40:13 -0800 Subject: [PATCH 02/13] Add file type association for macOS. Note: this results in a non-functioning application bundle, with nested application and broken executable stubs (https://github.com/conda/menuinst/issues/179) --- recipe/spyder-menu.json | 109 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 20cf852..1a4fcb2 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -32,7 +32,114 @@ }, "CFBundleName": "Spyder __PKG_MAJOR_VER__", "CFBundleIdentifier": "org.spyder-ide.Spyder", - "CFBundleVersion": "__PKG_VERSION__" + "CFBundleVersion": "__PKG_VERSION__", + "CFBundleDocumentTypes": [ + { + "CFBundleTypeName": "text document", + "CFBundleTypeRole": "Editor", + "LSHandlerRank": "Default", + "CFBundleTypeIconFile": "spyder.icns", + "LSItemContentTypes": [ + "com.apple.applescript.text", + "com.apple.ascii-property-list", + "com.apple.audio-unit-preset", + "com.apple.binary-property-list", + "com.apple.configprofile", + "com.apple.crashreport", + "com.apple.dashcode.css", + "com.apple.dashcode.javascript", + "com.apple.dashcode.json", + "com.apple.dashcode.manifest", + "com.apple.dt.document.ascii-property-list", + "com.apple.dt.document.script-suite-property-list", + "com.apple.dt.document.script-terminology-property-list", + "com.apple.property-list", + "com.apple.rez-source", + "com.apple.scripting-definition", + "com.apple.structured-text", + "com.apple.traditional-mac-plain-text", + "com.apple.xcode.ada-source", + "com.apple.xcode.apinotes", + "com.apple.xcode.bash-script", + "com.apple.xcode.configsettings", + "com.apple.xcode.csh-script", + "com.apple.xcode.entitlements-property-list", + "com.apple.xcode.fortran-source", + "com.apple.xcode.glsl-source", + "com.apple.xcode.ksh-script", + "com.apple.xcode.lex-source", + "com.apple.xcode.make-script", + "com.apple.xcode.mig-source", + "com.apple.xcode.pascal-source", + "com.apple.xcode.strings-text", + "com.apple.xcode.tcsh-script", + "com.apple.xcode.yacc-source", + "com.apple.xcode.zsh-script", + "com.apple.xml-property-list", + "com.netscape.javascript-source", + "com.scenarist.closed-caption", + "com.sun.java-source", + "com.sun.java-web-start", + "net.daringfireball.markdown", + "org.khronos.glsl-source", + "org.oasis-open.xliff", + "public.ada-source", + "public.assembly-source", + "public.bash-script", + "public.c-header", + "public.c-plus-plus-header", + "public.c-plus-plus-source", + "public.c-source", + "public.case-insensitive-text", + "public.comma-separated-values-text", + "public.csh-script", + "public.css", + "public.delimited-values-text", + "public.dylan-source", + "public.filename-extension", + "public.fortran-77-source", + "public.fortran-90-source", + "public.fortran-95-source", + "public.fortran-source", + "public.html", + "public.json", + "public.ksh-script", + "public.lex-source", + "public.log", + "public.m3u-playlist", + "public.make-source", + "public.mig-source", + "public.mime-type", + "public.module-map", + "public.nasm-assembly-source", + "public.objective-c-plus-plus-source", + "public.objective-c-source", + "public.opencl-source", + "public.pascal-source", + "public.patch-file", + "public.perl-script", + "public.php-script", + "public.plain-text", + "public.python-script", + "public.rss", + "public.ruby-script", + "public.script", + "public.shell-script", + "public.source-code", + "public.tcsh-script", + "public.text", + "public.utf16-external-plain-text", + "public.utf16-plain-text", + "public.utf8-plain-text", + "public.utf8-tab-separated-values-text", + "public.xhtml", + "public.xml", + "public.yacc-source", + "public.yaml", + "public.zsh-script" + ] + } + ] } } } From ead68687142c8620c869566abb89e1a4924f2283 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:25:58 -0800 Subject: [PATCH 03/13] Add file type association for Windows. Note: this does not appear to establish file type association (https://github.com/conda/menuinst/issues/185) --- recipe/spyder-menu.json | 61 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 1a4fcb2..7a5cdcf 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -14,7 +14,66 @@ "win": { "desktop": true, "app_user_model_id": "spyder.Spyder", - "command": ["{{ PREFIX }}/pythonw.exe", "{{ PREFIX }}/Scripts/spyder-script.py"] + "command": ["{{ PREFIX }}/pythonw.exe", "{{ PREFIX }}/Scripts/spyder-script.py", "%*"], + "file_extensions": [ + "bat", + "c", + "cc", + "cfg", + "cl", + "cmd", + "cpp", + "css", + "cxx", + "desktop", + "diff", + "enaml", + "f", + "f03", + "f08", + "f2k", + "f77", + "f90", + "f95", + "for", + "h", + "h", + "hh", + "hpp", + "htm", + "html", + "hxx", + "inf", + "ini", + "ipy", + "ipynb", + "jl", + "js", + "json", + "m", + "md", + "nsh", + "nsi", + "patch", + "po", + "pot", + "pro", + "properties", + "pxd", + "pxi", + "py", + "pyw", + "pyx", + "reg", + "rej", + "rst", + "scss", + "session", + "txt", + "xml", + "yaml", + "yml" + ] }, "linux": { "Categories": [ From 4cc1cb78e02a109daed8543bd58d4a4da5ed2b5d Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:26:18 -0800 Subject: [PATCH 04/13] Add file type association for Linux. Note: I don't think this is a comprehensive list --- recipe/spyder-menu.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 7a5cdcf..515ebf2 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -81,7 +81,15 @@ "Science" ], "command": ["{{ PREFIX }}/bin/spyder", "$@"], - "StartupWMClass": "Spyder" + "StartupWMClass": "Spyder", + "MimeType": [ + "text/x-script.python", + "text/plain", + "text/html", + "text/xml", + "text/x-c", + "text/x-perl" + ] }, "osx": { "precommand": "pushd \"$(dirname \"$0\")\" &>/dev/null", From f42394491b411129eeb102336157b070e831cc20 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Wed, 6 Mar 2024 10:04:14 -0800 Subject: [PATCH 05/13] Try "." in extensions --- recipe/spyder-menu.json | 113 ++++++++++++++++++++-------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 515ebf2..9f5f7ce 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -16,63 +16,62 @@ "app_user_model_id": "spyder.Spyder", "command": ["{{ PREFIX }}/pythonw.exe", "{{ PREFIX }}/Scripts/spyder-script.py", "%*"], "file_extensions": [ - "bat", - "c", - "cc", - "cfg", - "cl", - "cmd", - "cpp", - "css", - "cxx", - "desktop", - "diff", - "enaml", - "f", - "f03", - "f08", - "f2k", - "f77", - "f90", - "f95", - "for", - "h", - "h", - "hh", - "hpp", - "htm", - "html", - "hxx", - "inf", - "ini", - "ipy", - "ipynb", - "jl", - "js", - "json", - "m", - "md", - "nsh", - "nsi", - "patch", - "po", - "pot", - "pro", - "properties", - "pxd", - "pxi", - "py", - "pyw", - "pyx", - "reg", - "rej", - "rst", - "scss", - "session", - "txt", - "xml", - "yaml", - "yml" + ".bat", + ".c", + ".cc", + ".cfg", + ".cl", + ".cmd", + ".cpp", + ".css", + ".cxx", + ".desktop", + ".diff", + ".enaml", + ".f", + ".f03", + ".f08", + ".f2k", + ".f77", + ".f90", + ".f95", + ".for", + ".h", + ".hh", + ".hpp", + ".htm", + ".html", + ".hxx", + ".inf", + ".ini", + ".ipy", + ".ipynb", + ".jl", + ".js", + ".json", + ".m", + ".md", + ".nsh", + ".nsi", + ".patch", + ".po", + ".pot", + ".pro", + ".properties", + ".pxd", + ".pxi", + ".py", + ".pyw", + ".pyx", + ".reg", + ".rej", + ".rst", + ".scss", + ".session", + ".txt", + ".xml", + ".yaml", + ".yml" ] }, "linux": { From 5ed11183538f7fb629bc642b0c50678f7fb5a225 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Mon, 13 May 2024 11:27:10 -0700 Subject: [PATCH 06/13] Requires menuinst >=2.1 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3fb5967..7025c74 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -81,7 +81,7 @@ requirements: - watchdog >=0.10.3 - yarl >=1.9.4 run_constrained: - - menuinst >=2.0.2 + - menuinst >=2.1 test: requires: From 92ea0b85b277df1f6da685a0d51deb949d2cf38a Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:26:25 -0700 Subject: [PATCH 07/13] Menuinst >2.1 includes option for base/non-base environment names --- recipe/post-link.bat | 9 +-------- recipe/post-link.sh | 3 --- recipe/spyder-menu.json | 5 ++++- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/recipe/post-link.bat b/recipe/post-link.bat index c6716d3..a03ac4b 100644 --- a/recipe/post-link.bat +++ b/recipe/post-link.bat @@ -18,7 +18,7 @@ rem Check for CONDA_PYTHON_EXE if not exist "%conda_python_exe%" ( rem CONDA_PYTHON_EXE environment variable does not exist. rem v1 type shortcuts will not work - goto :base_env + goto :exit ) rem Check menuinst version @@ -28,13 +28,6 @@ for /F "tokens=*" %%i in ( if "%%~i"=="True" call :use_menu_v1 ) -:base_env - if exist "%PREFIX%\condabin\" if exist "%PREFIX%\envs\" ( - rem Installed in a base environment, use distribution name - call :patch "ENV_NAME=DISTRIBUTION_NAME" - ) - goto :exit - :exit exit /b %errorlevel% diff --git a/recipe/post-link.sh b/recipe/post-link.sh index c52fdeb..e33e503 100644 --- a/recipe/post-link.sh +++ b/recipe/post-link.sh @@ -7,7 +7,4 @@ menu="${PREFIX}/Menu/spyder-menu.json" if [[ -f "${PREFIX}/Menu/conda-based-app" ]]; then # Installed in installer environment, abridge shortcut name sed "${opts[@]}" "s/ \(\{\{ ENV_NAME \}\}\)//g" $menu -elif [[ -d "${PREFIX}/condabin" && -d "${PREFIX}/envs" ]]; then - # Installed in a base environment, use distribution name - sed "${opts[@]}" "s/ENV_NAME/DISTRIBUTION_NAME/g" $menu fi diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 9f5f7ce..03c2259 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -4,7 +4,10 @@ "menu_name": "{{ DISTRIBUTION_NAME }} spyder", "menu_items": [ { - "name": "Spyder __PKG_MAJOR_VER__ ({{ ENV_NAME }})", + "name": { + "target_environment_is_base": "Spyder __PKG_MAJOR_VER__ ({{ DISTRIBUTION_NAME }})", + "target_environment_is_not_base": "Spyder __PKG_MAJOR_VER__ ({{ ENV_NAME }})" + }, "description": "Scientific PYthon Development EnviRonment", "icon": "{{ MENU_DIR }}/spyder.{{ ICON_EXT }}", "activate": false, From af6d6a0c9f230bef89881438958b32da18b725e4 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:50:04 -0700 Subject: [PATCH 08/13] Create subroutine for replacing variables in menu file --- recipe/bld.bat | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index ab18788..72b08b1 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -6,22 +6,21 @@ if errorlevel 1 exit 1 set MENU_DIR=%PREFIX%\Menu IF NOT EXIST (%MENU_DIR%) mkdir %MENU_DIR% +rem Copy Spyder's icon copy %RECIPE_DIR%\spyder.ico %MENU_DIR%\spyder.ico +rem Replace variables in menu files for /F "delims=. tokens=1" %%i in ("%PKG_VERSION%") do set PKG_MAJOR_VER=%%i +call :replace spyder-menu.json spyder-menu.json +call :replace spyder-menu-v1.json spyder-menu-v1.json.bak -for /f "delims=" %%i in (%RECIPE_DIR%\spyder-menu.json) do ( - set s=%%i - set s=!s:__PKG_VERSION__=%PKG_VERSION%! - echo !s:__PKG_MAJOR_VER__=%PKG_MAJOR_VER%!>> %MENU_DIR%\spyder-menu.json -) +:exit + exit /b %errorlevel% -for /f "delims=" %%i in (%RECIPE_DIR%\spyder-menu-v1.json) do ( - set s=%%i - set s=!s:__PKG_VERSION__=%PKG_VERSION%! - echo !s:__PKG_MAJOR_VER__=%PKG_MAJOR_VER%!>> %MENU_DIR%\spyder-menu-v1.json.bak -) - -del %SCRIPTS%\spyder_win_post_install.py -del %SCRIPTS%\spyder.bat -del %SCRIPTS%\spyder +:replace + for /f "delims=" %%i in (%RECIPE_DIR%\%1) do ( + set s=%%i + set s=!s:__PKG_VERSION__=%PKG_VERSION%! + echo !s:__PKG_MAJOR_VER__=%PKG_MAJOR_VER%!>> %MENU_DIR%\%2 + ) + goto :eof From b3eac2c69794faff677467b9829f8150cfef47e5 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:59:57 -0700 Subject: [PATCH 09/13] Use gui-64.exe. conda-build copies cli-64.exe and spyder-script.py to the Scripts directory after bld.bat is run, so we must copy gui-64.exe such that it does not get clobbered, then use the post-link script to clean things up. This work-around may be removed in the future if/when conda-build adds a feature to specify which executable stub to use. Hopefully, the resulting spyder.exe will also get the Spyder icon. --- recipe/bld.bat | 11 +++++++++++ recipe/post-link.bat | 5 +++++ recipe/spyder-menu-v1.json | 2 +- recipe/spyder-menu.json | 2 +- recipe/spyder-script.pyw | 10 ++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 recipe/spyder-script.pyw diff --git a/recipe/bld.bat b/recipe/bld.bat index 72b08b1..5cfd6b9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -14,6 +14,17 @@ for /F "delims=. tokens=1" %%i in ("%PKG_VERSION%") do set PKG_MAJOR_VER=%%i call :replace spyder-menu.json spyder-menu.json call :replace spyder-menu-v1.json spyder-menu-v1.json.bak +rem Copy GUI executable stub +for /F "tokens=*" %%i in ( + '%CONDA_PYTHON_EXE% -c "import conda_build, pathlib; print(pathlib.Path(conda_build.__file__).parent / 'gui-64.exe')"' +) do ( + set exe_path=%%i +) +copy /y /b %exe_path% %SCRIPTS% + +rem Copy launch script +copy /y %RECIPE_DIR%\spyder-script.pyw %SCRIPTS% + :exit exit /b %errorlevel% diff --git a/recipe/post-link.bat b/recipe/post-link.bat index a03ac4b..5d5170a 100644 --- a/recipe/post-link.bat +++ b/recipe/post-link.bat @@ -4,6 +4,11 @@ setlocal ENABLEDELAYEDEXPANSION set menudir=%PREFIX%\Menu set menu=%menudir%\spyder-menu.json set logfile=%PREFIX%\.messages.txt +set scriptsdir=%PREFIX%\Scripts + +rem Cleanup GUI files +move /y %scriptsdir%\gui-64.exe %scriptsdir%\spyder.exe +del %scriptsdir%\spyder-script.py rem Check for conda-based install if exist "%menudir%\conda-based-app" ( diff --git a/recipe/spyder-menu-v1.json b/recipe/spyder-menu-v1.json index 8fe64a6..ce3804a 100644 --- a/recipe/spyder-menu-v1.json +++ b/recipe/spyder-menu-v1.json @@ -4,7 +4,7 @@ [ { "name": "Spyder __PKG_MAJOR_VER__", - "pywscript": "${PYTHON_SCRIPTS}/spyder-script.py", + "pywscript": "${PYTHON_SCRIPTS}/spyder-script.pyw", "workdir": "${PERSONALDIR}/Python Scripts", "icon": "${MENU_DIR}/spyder.ico" } diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 03c2259..7fbced1 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -17,7 +17,7 @@ "win": { "desktop": true, "app_user_model_id": "spyder.Spyder", - "command": ["{{ PREFIX }}/pythonw.exe", "{{ PREFIX }}/Scripts/spyder-script.py", "%*"], + "command": ["{{ PREFIX }}/Scripts/spyder.exe", "%*"], "file_extensions": [ ".bat", ".c", diff --git a/recipe/spyder-script.pyw b/recipe/spyder-script.pyw new file mode 100644 index 0000000..3726cca --- /dev/null +++ b/recipe/spyder-script.pyw @@ -0,0 +1,10 @@ + +# -*- coding: utf-8 -*- +import re +import sys + +from spyder.app.start import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) From 2b7de7551d5c59ee7f6269d7898224d00456b6c7 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Tue, 16 Jul 2024 10:20:12 -0700 Subject: [PATCH 10/13] Linux shortcut command requires "%F" rather than "$@". --- recipe/spyder-menu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/spyder-menu.json b/recipe/spyder-menu.json index 7fbced1..773dd03 100644 --- a/recipe/spyder-menu.json +++ b/recipe/spyder-menu.json @@ -82,10 +82,10 @@ "Development", "Science" ], - "command": ["{{ PREFIX }}/bin/spyder", "$@"], + "command": ["{{ PREFIX }}/bin/spyder", "%F"], "StartupWMClass": "Spyder", "MimeType": [ - "text/x-script.python", + "text/x-python", "text/plain", "text/html", "text/xml", From 1daf0b548edd276cd9058c3ca6809704e8f906cd Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:09:38 -0700 Subject: [PATCH 11/13] Do not rename v1 json file during find/replace text, just start with .bak extension --- recipe/bld.bat | 6 +++--- recipe/{spyder-menu-v1.json => spyder-menu-v1.json.bak} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename recipe/{spyder-menu-v1.json => spyder-menu-v1.json.bak} (100%) diff --git a/recipe/bld.bat b/recipe/bld.bat index 5cfd6b9..5df21b3 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -11,8 +11,8 @@ copy %RECIPE_DIR%\spyder.ico %MENU_DIR%\spyder.ico rem Replace variables in menu files for /F "delims=. tokens=1" %%i in ("%PKG_VERSION%") do set PKG_MAJOR_VER=%%i -call :replace spyder-menu.json spyder-menu.json -call :replace spyder-menu-v1.json spyder-menu-v1.json.bak +call :replace spyder-menu.json +call :replace spyder-menu-v1.json.bak rem Copy GUI executable stub for /F "tokens=*" %%i in ( @@ -32,6 +32,6 @@ copy /y %RECIPE_DIR%\spyder-script.pyw %SCRIPTS% for /f "delims=" %%i in (%RECIPE_DIR%\%1) do ( set s=%%i set s=!s:__PKG_VERSION__=%PKG_VERSION%! - echo !s:__PKG_MAJOR_VER__=%PKG_MAJOR_VER%!>> %MENU_DIR%\%2 + echo !s:__PKG_MAJOR_VER__=%PKG_MAJOR_VER%!>> %MENU_DIR%\%1 ) goto :eof diff --git a/recipe/spyder-menu-v1.json b/recipe/spyder-menu-v1.json.bak similarity index 100% rename from recipe/spyder-menu-v1.json rename to recipe/spyder-menu-v1.json.bak From a0952b827489150a1fc03eca84ac74b5481f0ae4 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:43:58 -0700 Subject: [PATCH 12/13] Update menuinst to 2.1.2 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7025c74..d157108 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -81,7 +81,7 @@ requirements: - watchdog >=0.10.3 - yarl >=1.9.4 run_constrained: - - menuinst >=2.1 + - menuinst >=2.1.2 test: requires: From 0dd68825721c4c96a3de8f27a7457f059c183056 Mon Sep 17 00:00:00 2001 From: Ryan Clary <9618975+mrclary@users.noreply.github.com> Date: Mon, 19 Aug 2024 21:23:42 -0700 Subject: [PATCH 13/13] Apply suggestions from code review Co-authored-by: Carlos Cordoba --- recipe/spyder-script.pyw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/spyder-script.pyw b/recipe/spyder-script.pyw index 3726cca..9280ae7 100644 --- a/recipe/spyder-script.pyw +++ b/recipe/spyder-script.pyw @@ -1,5 +1,5 @@ - # -*- coding: utf-8 -*- + import re import sys