Skip to content

Commit

Permalink
cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenbreddels committed Sep 5, 2024
1 parent 436a5fb commit 8cccf03
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 18 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,10 @@ jobs:
fail-fast: false
matrix:
os: [macos, windows, ubuntu]
# https://pypi.org/project/PySide6/ seems to have binaries only for python 3.9
python-version: ["3.9"]
# only 1 version, it's heavy
python-version: ["3.10"]
env:
LOCK_FILE_LOCATION: .ci-package-locks/qt/os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}.txt
LOCK_FILE_LOCATION: .ci-package-locks/qt/os${{ matrix.os }}-python${{ matrix.python-version }}.txt
steps:
- uses: ConorMacBride/install-package@v1
with:
Expand Down Expand Up @@ -396,7 +396,10 @@ jobs:
pip install `echo packages/solara-server/dist/*.whl`[all]
pip install `echo packages/solara-meta/dist/*.whl`[dev,documentation]
pip freeze --exclude solara --exclude solara-ui --exclude solara-server > ${{ env.LOCK_FILE_LOCATION }}
git diff --quiet || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT"
git diff --exit-code | tee ${{ env.DIFF_FILE_LOCATION }}
[ -s ${{ env.DIFF_FILE_LOCATION }} ] || echo "HAS_DIFF=true" >> "$GITHUB_OUTPUT"
- name: Install
if: github.event_name != 'schedule' && steps.prepare.outputs.LOCKS_EXIST == 'true'
run: |
Expand All @@ -406,6 +409,7 @@ jobs:
pip install `echo packages/solara-meta/dist/*.whl`[dev,documentation]
- name: test qt app
if: github.event_name != 'schedule' || steps.install_no_lock.outputs.HAS_DIFF == 'true'
# this app should simply exit with an error code of 0 to indicate success
run: |
python tests/qtapp/solara-qt-test.py
Expand All @@ -418,14 +422,14 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: test-results-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}
name: test-results-qt-test-os${{ matrix.os }}-python${{ matrix.python-version }}
path: test-results

- name: Upload CI package locks
if: steps.install_no_lock.outputs.HAS_DIFF == 'true' || steps.prepare.outputs.LOCKS_EXIST == 'false'
uses: actions/upload-artifact@v4
with:
name: ci-package-locks-integration-os${{ matrix.os }}-python${{ matrix.python-version }}-ipywidgets${{ matrix.ipywidgets_major }}
name: ci-package-locks-qt-test-os${{ matrix.os }}-python${{ matrix.python-version }}
path: ./**/${{ env.LOCK_FILE_LOCATION }}

integration-test:
Expand Down
4 changes: 2 additions & 2 deletions pyinstaller/embedded_browser/solara-qt.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ from PyInstaller.building.api import COLLECT, EXE, PYZ
from PyInstaller.building.osx import BUNDLE

import solara
# see https://github.com/spacetelescope/jdaviz/blob/main/.github/workflows/standalone.yml
# for an example of how to sign the app for macOS
codesign_identity = os.environ.get("DEVELOPER_ID_APPLICATION")

# this copies over the nbextensions enabling json and the js assets
Expand Down Expand Up @@ -46,8 +48,6 @@ exe = EXE(
a.scripts,
[],
exclude_binaries=True,
# executable name: dist/solara/solara-cli
# note: cannot be called solara, because there is a directory called solara
name="solara-qt",
debug=False,
bootloader_ignore_signals=False,
Expand Down
5 changes: 0 additions & 5 deletions solara/server/pyinstaller/hook-solara_server.py

This file was deleted.

5 changes: 0 additions & 5 deletions solara/server/pyinstaller/hook-solara_ui.py

This file was deleted.

0 comments on commit 8cccf03

Please sign in to comment.