Merge pull request #184 from dalthviz/600_update

Update recipe files to 6.0.0 version
conda-forge · Sep 3, 2024 · ec286a1 · ec286a1
2 parents d817a9e + 676e4ed
commit ec286a1
Show file tree

Hide file tree

Showing 23 changed files with 314 additions and 172 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml
diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -1,15 +1,37 @@
+setlocal ENABLEDELAYEDEXPANSION
+
 %PYTHON% -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv
 if errorlevel 1 exit 1
 
 set MENU_DIR=%PREFIX%\Menu
 IF NOT EXIST (%MENU_DIR%) mkdir %MENU_DIR%
 
-copy %SRC_DIR%\img_src\spyder.ico %MENU_DIR%\
-copy %SRC_DIR%\img_src\spyder_reset.ico %MENU_DIR%\
-if errorlevel 1 exit 1
-copy %RECIPE_DIR%\menu-windows.json %MENU_DIR%\spyder_shortcut.json
-if errorlevel 1 exit 1
+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
+call :replace 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%
 
-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%\%1
+    )
+    goto :eof
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -5,3 +5,16 @@ $PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv
 rm -rf $PREFIX/man
 rm -f $PREFIX/bin/spyder_win_post_install.py
 rm -rf $SP_DIR/Sphinx-*
+
+# Create the Menu directory
+mkdir -p "${PREFIX}/Menu"
+
+# Copy menu.json template, replacing version
+sed -e "s/__PKG_VERSION__/${PKG_VERSION}/g" -e "s/__PKG_MAJOR_VER__/${PKG_VERSION%%.*}/g" "${RECIPE_DIR}/spyder-menu.json" > "${PREFIX}/Menu/spyder-menu.json"
+
+# Copy application icons
+if [[ $OSTYPE == "darwin"* ]]; then
+    cp "${RECIPE_DIR}/spyder.icns" "${PREFIX}/Menu/spyder.icns"
+else
+    cp "${RECIPE_DIR}/spyder.png" "${PREFIX}/Menu/spyder.png"
+fi
diff --git a/recipe/logo.png b/recipe/logo.png
diff --git a/recipe/menu-windows.json b/recipe/menu-windows.json
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,12 +1,12 @@
-{% set version = "5.5.6" %}
+{% set version = "6.0.0" %}
 
 package:
   name: spyder
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/s/spyder/spyder-{{ version }}.tar.gz
-  sha256: 958b669f4a015c5c391050eb6effa8d84656a8bfc47a5f46adba297849d82bdd
+  sha256: fd452d4a94a4b7584978865f04b7bca303fcda3471d3691417a4dd7c2b2ae826
   patches:
     # See spyder-ide/spyder#8316
     - osx-zmq.patch
@@ -26,14 +26,19 @@ requirements:
     - python
     - pip
     - setuptools
+    - packaging
   run:
     - python
+    - aiohttp >=3.9.3
     - applaunchservices >=0.3.0  # [osx]
+    - asyncssh >=2.14.0,<3.0.0
     - atomicwrites >=1.2.0
     - chardet >=2.0.0
     - cloudpickle >=0.5.0
     - cookiecutter >=1.6.0
     - diff-match-patch >=20181111
+    - fcitx-qt5 >=1.2.7  # [linux64]
+    - fzf >=0.42.0
     - importlib-metadata >=4.6.0
     - intervaltree >=3.0.2
     - ipython >=8.12.2,<9.0.0,!=8.17.1
@@ -43,38 +48,41 @@ requirements:
     - keyring >=17.0.0
     - nbconvert >=4.0
     - numpydoc >=0.6.0
-    - paramiko >=2.4.0  # [win]
     - parso >=0.7.0,<0.9.0
     - pexpect >=4.4.0
     - pickleshare >=0.4
     # This is here to work around a bug in mamba
     - ptyprocess >=0.5  # [win]
     - psutil >=5.3
+    - pygithub >=2.3.0
     - pygments >=2.0
     - pylint >=3.1,<4
     - pylint-venv >=3.0.2
     - pyls-spyder >=0.4.0
-    - pyqt >=5.10,<5.16
-    - pyqtwebengine >=5.10,<5.16
+    - pyqt >=5.15,<5.16
+    - pyqtwebengine >=5.15,<5.16
     - python.app  # [osx]
     - python-lsp-black >=2.0.0,<3.0.0
     - python-lsp-server >=1.12.0,<1.13.0
+    - pyuca >=1.2
     - pyxdg >=0.26  # [linux]
     - pyzmq >=24.0.0
     - qdarkstyle >=3.2.0,<3.3.0
     - qstylizer >=0.2.2
     - qtawesome >=1.3.1,<1.4.0
-    - qtconsole >=5.5.1,<5.6.0
-    - qtpy >=2.1.0
+    - qtconsole >=5.6.0,<5.7.0
+    - qtpy >=2.4.0
     - rtree >=0.9.7
     - setuptools >=49.6.0
     - sphinx >=0.6.6
-    - spyder-kernels >=2.5.2,<2.6.0
+    - spyder-kernels >=3.0.0,<3.1.0
+    - superqt >=0.6.2,<1.0.0
     - textdistance >=4.2.0
     - three-merge >=0.1.1
     - watchdog >=0.10.3
+    - yarl >=1.9.4
   run_constrained:
-    - menuinst >=1.4.17
+    - menuinst >=2.1.2
 
 test:
   requires:
@@ -89,7 +97,7 @@ test:
 
 app:
   entry: spyder
-  icon: logo.png
+  icon: spyder.png
   summary: The Scientific Python Development Environment
   type: desk