Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Qt6 and bump included packages #6

Closed
wants to merge 11 commits into from
16 changes: 5 additions & 11 deletions .github/workflows/build_stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,21 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-10.15, ubuntu-18.04, windows-2019]
os: [macos-11, windows-2019]
steps:

- name: Checkout code
uses: actions/checkout@v2

# Not all dependencies work correctly on Python 3.9 on Windows yet so we use
# Python 3.8 there.
- name: Set up Python 3.8
if: matrix.os == 'windows-2019'
- name: Set up Python 3.11
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Set up Python 3.9
if: matrix.os != 'windows-2019'
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: 3.11

- name: Install Python dependencies
run: pip install -r requirements.txt
- name: Uninstall debugpy
run: pip uninstall -y debugpy
- name: Run pyinstaller
run: pyinstaller glue_app.spec
- name: Uninstall lxml
Expand Down
1 change: 1 addition & 0 deletions glue_app.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ a = Analysis(
"glue_wwt",
"glue_plotly",
"glue_statistics",
"PyQt6.QtTest"
],
hookspath=["hooks"],
hooksconfig={
Expand Down
3 changes: 1 addition & 2 deletions osx/make_dmg.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
#!/bin/bash
#!/bin/bash -xe

mv dist/glue.app dist/"glue $1.app"
rm -rf dist/start_glue
python osx/fix_app_qt_folder_names_for_codesign.py dist/"glue $1.app"
codesign --force --deep --sign - dist/"glue $1.app"
dist/"glue $1.app"/Contents/MacOS/start_glue --test
dist/glue $1.app/Contents/MacOS/start_glue --test
hdiutil create -volname "Glue" -srcfolder dist -ov -format UDZO dist/"glue $1.dmg"
rm -rf dist/"glue $1.app"
16 changes: 7 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
git+https://github.com/pyinstaller/pyinstaller
ipykernel<6 # Install old version of ipykernel to avoid terminal issues
glue-core==1.7.0
pyinstaller
glue-core==1.8.1
glue-vispy-viewers==1.0.7
glue-wwt==0.6.1
glue-plotly==0.4.0
pvextractor
pywwt
pvextractor==0.3
pywwt==0.19.0
notebook
numpy<1.22
astropy<5.0
PyQt5==5.14.2
PyQtWebEngine==5.14.0
PyQt6==6.4.2
PyQt6-WebEngine==6.4.0
git+https://github.com/vispy/vispy
7 changes: 4 additions & 3 deletions start_glue.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@

os.environ['QTWEBENGINE_CHROMIUM_FLAGS'] = '--ignore-gpu-blacklist'

logger.setLevel("INFO")
if __name__ == "__main__":

load_plugins()
if '--debug' in sys.argv or '--test' in sys.argv:
logger.setLevel("INFO")

if __name__ == "__main__":
load_plugins()

if '--debug' in sys.argv:
import faulthandler
Expand Down