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

Remove Qt-specific code being split into glue-qt #2431

Merged
merged 28 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ead416e
Removed qt/ sub-packages and other Qt-specific files
astrofrog Aug 10, 2023
69d4b30
Removed any qt-specific items from setup.cfg
astrofrog Aug 10, 2023
e10cf22
Remove Qt-specific items from tox.ini
astrofrog Aug 10, 2023
6e9b055
Remove desktop application icons
astrofrog Aug 10, 2023
4cde577
More updates to setup.cfg
astrofrog Aug 10, 2023
c9a9122
Remove most of the docs which are being moved to glue-qt
astrofrog Aug 10, 2023
1cfd070
Remove unused file
astrofrog Aug 10, 2023
3a2f877
Updated CI workflows
astrofrog Aug 10, 2023
b546c46
Removed qglue.py
astrofrog Aug 10, 2023
1ffbf73
More cleanup
astrofrog Aug 10, 2023
b915d44
Remove more qt-specific code/tests
astrofrog Aug 10, 2023
4d00161
Fix sphinx warnings
astrofrog Aug 10, 2023
46435ed
Fix and speed up installation of developer version of dependencies
astrofrog Aug 10, 2023
b165342
Update README
astrofrog Aug 10, 2023
2413bd7
Fix developer builds
astrofrog Aug 10, 2023
d328ee1
Remove more Qt-dependent code, and also remove glue._deps which is no…
astrofrog Aug 10, 2023
4595f01
Remove unused imports
astrofrog Aug 11, 2023
88c3f33
Remove unused cache_axes function
astrofrog Aug 11, 2023
3185e60
Remove unused renderless_figure function
astrofrog Aug 11, 2023
822a430
Remove unused import
astrofrog Aug 11, 2023
bded2d3
Fixes for latest changes in glue-qt
astrofrog Aug 11, 2023
dc39af5
Add back imports with deprecation warnings for removed files
astrofrog Aug 15, 2023
2187686
Added back qglue function with deprecation warning, and switched depr…
astrofrog Aug 15, 2023
c281ac0
Add back compatibility imports for items removed from glue.config
astrofrog Aug 15, 2023
614a6de
Removed D3PO exporter since project is no longer maintained
astrofrog Aug 15, 2023
dc30657
Remove tests that have been moved over to glue_qt
astrofrog Aug 15, 2023
cb691a1
Make sure that get_timer works if Qt is not installed
astrofrog Aug 15, 2023
01edb43
Fixed code style warnings
astrofrog Aug 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
94 changes: 18 additions & 76 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,98 +23,40 @@ jobs:
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
with:
coverage: codecov
display: true
# Linux PyQt 5.15 and 6.x installations require apt-getting xcb and EGL deps
# and headless X11 display; as of Python 3.11 Scipy and h5py also need their own deps.
libraries: |
apt:
- '^libxcb.*-dev'
- libxkbcommon-x11-dev
- libegl1-mesa
- libopenblas-dev
- libhdf5-dev
brew:
- enchant

envs: |
# Standard tests
# Linux builds - test on all supported PyQt5/6 and PySide2/6 versions,
# and include all dependencies in some builds
- linux: py38-test-pyqt514-all
- linux: py39-test-pyqt515
- linux: py310-test-pyqt63-all
- linux: py310-test-pyqt64-all
- linux: py311-test-pyqt514
- linux: py311-test-pyqt515-lts-all
# Linux builds
- linux: py38-test-lts-all
- linux: py39-test
- linux: py310-test-all
- linux: py311-test
- linux: py311-test-all

# Documentation build
- linux: py38-docs-pyqt514
- linux: py38-docs
coverage: false
- macos: py311-docs-pyqt64
- macos: py311-docs
coverage: false

# Test a few configurations on macOS
- macos: py38-test-pyqt514-all
- macos: py310-test-pyqt515
- macos: py310-test-pyqt64
- macos: py311-test-pyqt515
- macos: py38-test-all
- macos: py39-test
- macos: py310-test-all
- macos: py311-test

# Test some configurations on Windows
- windows: py38-test-pyqt514
- windows: py310-test-pyqt63
- windows: py38-test
- windows: py310-test

# Test against latest developer versions of some packages
- linux: py310-test-pyqt515-dev-all
- linux: py311-test-pyqt64-dev

allowed_failures:
needs: initial_checks
uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
with:
coverage: codecov
display: true
libraries: |
apt:
- '^libxcb.*-dev'
- libxkbcommon-x11-dev
- libegl1-mesa
- libopenblas-dev
- libhdf5-dev
brew:
- enchant
- hdf5
envs: |

# Non-deterministic QThread exceptions
- linux: py38-test-pyside514
- linux: py39-test-pyside515
- linux: py310-test-pyside63

# PySide6 6.4 failures due to https://github.com/spyder-ide/qtpy/issues/373
# and https://github.com/matplotlib/matplotlib/issues/24155
# Python 3.11.0 failing on Windows in test_image.py on
# > assert df.find_factory(fname) is df.img_data
- linux: py310-test-pyside64
- linux: py311-test-pyside64
- macos: py310-test-pyside63
- macos: py311-test-pyside64
- windows: py310-test-pyside64
- windows: py311-test-pyqt515

# Windows docs build
- windows: py310-docs-pyqt515
coverage: false

# Failure in test_close_tab
- windows: py310-test-pyqt515-all
- linux: py310-test-dev-all
- linux: py311-test-dev

publish:
needs: tests
uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
with:
# Setup PyQt5 deps and headless X server as per pyvista/setup-headless-display-action@v1
libraries: '^libxcb.*-dev libxkbcommon-x11-dev libgl1-mesa-glx libopenblas-dev libhdf5-dev xvfb'
test_extras: 'test,qt'
test_command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & sleep 3; DISPLAY=:99.0 pytest --pyargs glue
test_extras: 'test'
test_command: pytest --pyargs glue
secrets:
pypi_token: ${{ secrets.pypi_token }}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ glue/_githash.py
# Other
.pylintrc
*.ropeproject
glue/qt/glue_qt_resources.py
*.__junk*
*.orig
*~
Expand Down
1 change: 0 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ python:
path: .
extra_requirements:
- docs
- qt
- all

formats: []
25 changes: 0 additions & 25 deletions .test-docs.sh

This file was deleted.

12 changes: 11 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,20 @@ Glue
====

Glue is a python project to link visualizations of scientific datasets
across many files. Click on the image for a quick demo:
across many files.

|Glue demo|

This repository contains the **glue-core** package which includes much of the core
functionality of glue that is used for the different front-ends, including the Qt-based
application and the Jupyter-based application. Other key repositories include:

* `glue-qt <https://github.com/astrofrog/glue-qt/>`_: the original Qt/desktop application for glue
* `glue-jupyter <https://github.com/astrofrog/glue-jupyter/>`_: a Jupyter front-end for glue

In addition to these, there are a number of plugin packages available. For a full list of repositories,
see https://github.com/glue-viz/.

Features
--------

Expand Down
Loading