Standalone build and workflow fixes (#4264)

* removing imviz in run jdaviz cmd for standalone automation

* removing second imviz in run jdaviz cmd for standalone automation

* updates to hooks for building standalone app

* update hook-scipy due to scipy update to 1.18

* increasing solara startup time to 5mins

* increasing solara startup time to 15mins

* adding delay for solara to get online

* adding logging to see the issue with loading jdaviz

* added pyvo png and xml so jdaviz loads correctly

* updates to changes

* uncomment where standalone is run

---------

Co-authored-by: Sarah Betti <sbetti@stsci.edu>

Author: sbetti22

.github/workflows/standalone.yml

@@ -45,7 +45,7 @@ jobs:
       uses: pyvista/setup-headless-display-action@v4
 
     - name: Install jdaviz
-      run: pip install .[test,qt]
+      run: pip install -U ".[test,qt]"
 
     - name: Install pyinstaller
       # see https://github.com/erocarrera/pefile/issues/420 for performance issues on
@@ -60,8 +60,12 @@ jobs:
       run: (cd standalone; pyinstaller ./jdaviz.spec)
 
     - name: Run jdaviz cmd in background
-      run: ./standalone/dist/jdaviz/jdaviz-cli imviz --port 8765 &
-
+      env:
+        ASTROPY_ALLOW_INTERNET: "False"
+      run: |
+        # Start the app in the background so it immediately returns
+        ./standalone/dist/jdaviz/jdaviz-cli --port 8765 &
+        
     - name: Install playwright
       run: (pip install playwright; playwright install chromium)
 
@@ -72,6 +76,7 @@ jobs:
       uses: ifaxity/wait-on-action@a7d13170ec542bdca4ef8ac4b15e9c6aa00a6866  # v1.2.1
       with:
         resource: tcp:8765
+        delay: 20000
         timeout: 60000
 
     - name: Test standalone
@@ -117,7 +122,7 @@ jobs:
         python-version: "3.12"
 
     - name: Install jdaviz
-      run: pip install .[test,qt]
+      run: pip install U ".[test,qt]"
 
     - name: Install pyinstaller
       run: pip install "pyinstaller"
@@ -166,7 +171,9 @@ jobs:
 
     - name: Run jdaviz cmd in background
       if: ${{ matrix.os == 'macos-14' }}
-      run: ./standalone/dist/jdaviz.app/Contents/MacOS/jdaviz-cli imviz --port=8765 &
+      env:
+        ASTROPY_ALLOW_INTERNET: "False"
+      run: ./standalone/dist/jdaviz.app/Contents/MacOS/jdaviz-cli --port=8765 &
 
     - name: Install playwright
       run: (pip install playwright; playwright install chromium)
@@ -195,4 +202,4 @@ jobs:
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
       with:
         name: jdaviz-standlone-${{ matrix.os }}
-        path: standalone/dist/jdaviz.dmg
+        path: standalone/dist/jdaviz.dmg

CHANGES.rst

@@ -93,6 +93,8 @@ Bug Fixes
 
 - Fixed a bug with the astroquery/VO loaders where the loader would get stuck on a failed query. [#4257]
 
+- Updates to standalone app hooks, spec, and workflow due to updates in astropy8.0 [#4264] 
+
 
 Mosviz
 ------

standalone/hooks/hook-glue.py

@@ -1,4 +1,8 @@
-from PyInstaller.utils.hooks import collect_data_files, copy_metadata
+from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_all
 
-datas = collect_data_files('glue')
+
+datas, binaries, hiddenimports = collect_all('glue')
+
+# datas = collect_data_files('glue')
 datas += copy_metadata('glue-core')
+# hiddenimports += [

standalone/hooks/hook-ipyvuetify.py

@@ -1,5 +1,10 @@
-from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+from PyInstaller.utils.hooks import collect_all, collect_data_files, copy_metadata, collect_submodules
 
 hiddenimports = collect_submodules("ipyvuetify")
 datas = collect_data_files('ipyvuetify')
 datas += copy_metadata('ipyvuetify')
+
+vue_datas, binaries, vue_hidden = collect_all('ipyvue')
+
+datas += vue_datas
+hiddenimports += vue_hidden

standalone/hooks/hook-ipywidgets.py

@@ -0,0 +1,3 @@
+from PyInstaller.utils.hooks import collect_all
+
+datas, binaries, hiddenimports = collect_all('ipywidgets')

standalone/hooks/hook-photutils.py

@@ -1,5 +1,6 @@
-from PyInstaller.utils.hooks import collect_submodules, collect_data_files
+from PyInstaller.utils.hooks import collect_submodules, collect_data_files, copy_metadata
 
 hiddenimports = collect_submodules("photutils")
 # for CITATION.rst
 datas = collect_data_files('photutils')
+datas += copy_metadata('photutils')

standalone/hooks/hook-pythreejs.py

@@ -0,0 +1,10 @@
+"""PyInstaller hook for pythreejs.
+
+pythreejs requires JSON data files at runtime for shader definitions.
+This hook ensures those files are bundled with the application.
+"""
+
+from PyInstaller.utils.hooks import collect_data_files
+
+# Collect all JSON files from pythreejs package
+datas = collect_data_files('pythreejs', includes=['**/*.json'])

standalone/hooks/hook-pyvo.py

@@ -0,0 +1,4 @@
+from PyInstaller.utils.hooks import collect_data_files
+
+# Collect all JSON files from pythreejs package
+datas = collect_data_files('pyvo', includes=['**/*.png', '**/*.xml'])

standalone/hooks/hook-scipy.py

@@ -1,5 +1,10 @@
-from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+from PyInstaller.utils.hooks import check_requirement, collect_data_files, copy_metadata, collect_submodules
 
 hiddenimports = collect_submodules("scipy")
 datas = collect_data_files('scipy')
 datas += copy_metadata('scipy')
+
+if check_requirement("scipy >= 1.14.0") and check_requirement("scipy < 1.18.0"): 
+    hiddenimports += ['scipy._lib.array_api_compat.numpy.fft'] 
+elif check_requirement("scipy >= 1.18.0"): 
+    hiddenimports += ['scipy._external.array_api_compat.numpy.fft'] 

standalone/hooks/hook-solara.py

@@ -1,5 +1,8 @@
-from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules
+from PyInstaller.utils.hooks import collect_data_files, copy_metadata, collect_submodules, collect_all
 
-hiddenimports = collect_submodules("solara")
-datas = collect_data_files('solara')
+# hiddenimports = collect_submodules("solara")
+
+datas, binaries, hiddenimports = collect_all('solara')
+
+# datas = collect_data_files('solara')
 datas += collect_data_files('solara-ui')