Skip to content

Commit

Permalink
DNM: troubleshoot more mpl 3.6/3.5 settings
Browse files Browse the repository at this point in the history
  • Loading branch information
dhomeier committed Oct 11, 2022
1 parent 51eab12 commit 30c94a4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 50 deletions.
58 changes: 9 additions & 49 deletions .github/workflows/ci_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,34 +36,12 @@ jobs:
# Standard tests
# Linux builds - test on all supported PyQt5 and PySide2 versions,
# and include all dependencies in some builds
- linux: py37-test-pyqt510
- linux: py37-test-pyqt511-all
- linux: py37-test-pyqt512
- linux: py37-test-pyqt513-all
- linux: py37-test-pyside513-all
- linux: py38-test-pyside514
- linux: py39-test-pyqt515
- linux: py310-test-pyqt513
# Try out documentation build on Linux and macOS
- linux: py37-docs-pyqt513
coverage: false
# Test a few configurations on MacOS X (Big Sur/Monterey on arm64 for py310)
- macos: py37-test-pyqt513
- macos: py38-test-pyqt514
PLAT: arm64
# Try out documentation build on macOS
- macos: py37-docs-pyqt513
coverage: false
# Test some configurations on Windows
- windows: py37-test-pyqt510
- windows: py310-test-pyqt515
# Try out documentation build on Windows
- windows: py38-docs-pyqt513
coverage: false
allowed_failures:
needs: initial_checks
Expand All @@ -86,39 +64,21 @@ jobs:
- name: Python 3.11 rc with basic dependencies (Linux)
linux: py311-test-pyqt514
python-version: '3.11.0-rc.2'
- name: Python 3.11 rc with (dev versions of) all optional dependencies (Linux)
linux: py311-test-pyqt515-dev-all
python-version: '3.11.0-rc.2'
# Some (PySide2 in particular) envs are failing with runtime errors;
# PyQt6 and PySide6 support in progress
- linux: py38-test-pyside514
- linux: py310-test-pyqt63-all
- linux: py310-test-pyside63
- linux: py310-test-pyside515-all
- linux: py310-test-pyqt513-lts
- linux: py310-test-pyqt515-lts
- linux: py311-test-pyqt515-lts
python-version: '3.11.0-rc.2'
- linux: py311-test-pyqt515-dev
python-version: '3.11.0-rc.2'
# Test against latest developer versions of some packages
- linux: py310-test-pyqt515-dev-all
- macos: py38-test-pyside514
- macos: py310-test-pyqt515-all
- macos: py310-test-pyqt63
- macos: py310-test-pyside63
- windows: py38-test-pyqt514-all
- windows: py39-test-pyside515-all
- windows: py310-test-pyqt63
- windows: py310-test-pyside63
- macos: py311-test-pyqt515
python-version: '3.11.0-rc.2'
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 xvfb'
test_extras: 'test,qt'
test_command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & sleep 3; DISPLAY=:99.0 pytest --pyargs glue
secrets:
pypi_token: ${{ secrets.pypi_token }}
- windows: py311-test-pyqt514-all
python-version: '3.11.0-rc.2'
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ v1.6.0 (unreleased)
* Fix an issue where the histogram layer artist would not redraw if
the histogram sum was zero. [#2300]

* Add check for FITS files mistaken as ASCII in Python 3.11 to ``astropy_table_read``. [#2321]

v1.5.0 (2022-06-28)
-------------------

Expand Down
5 changes: 4 additions & 1 deletion glue/core/data_factories/astropy_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ def astropy_table_read(*args, **kwargs):
# also more generally, we should first try the ASCII readers.
if 'format' not in kwargs:
try:
return Table.read(*args, format='ascii', **kwargs)
t = Table.read(*args, format='ascii', **kwargs)
# Double-check for certain FITS files that may be read in as ASCII in Python 3.11
if not (len(t) == 1 and [c.value[0] for c in t.itercols()][:3] == ['SIMPLE', '=', 'T']):
return t
except Exception:
pass

Expand Down

0 comments on commit 30c94a4

Please sign in to comment.