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.

Sign up for GitHub

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

Jump to bottom

HOTFIX: pyqt6 version and ginga connection timeout #1836

Merged
merged 3 commits into from
Aug 26, 2024
Merged

HOTFIX: pyqt6 version and ginga connection timeout #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21d2711
change pyqt6 dependency; limit attempts to start ginga
kbwestfall Aug 5, 2024
73d062e
numpy version
kbwestfall Aug 5, 2024
ef373e4
numpy version
kbwestfall Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pypeit/display/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def connect_to_ginga(host='localhost', port=9000, raise_err=False, allow_new=Fal
# was just instantiated for a maximum number of iterations.
# If the connection is remains unsuccessful, an error is
# thrown stating that the connection timed out.
maxiter = int(1e6)
maxiter = int(3e4)
for i in range(maxiter):
try:
viewer = grc.RemoteClient(host, port)
Expand All @@ -72,8 +72,9 @@ def connect_to_ginga(host='localhost', port=9000, raise_err=False, allow_new=Fal
break
if i == maxiter-1:
msgs.error('Timeout waiting for ginga to start. If window does not appear, type '
'`ginga --modules=RC,SlitWavelength` on the command line. In either case, wait for '
'the ginga viewer to open and try the pypeit command again.')
'`ginga --modules=RC,SlitWavelength` on the command line. In either '
'case, wait for the ginga viewer to open and try the pypeit command '
'again.')
return viewer

if raise_err:
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ python_requires = >=3.10,<3.13
setup_requires = setuptools_scm
include_package_data = True
install_requires =
numpy>=1.23
numpy>=1.23,<2.0.0
astropy>=6.0
extension-helpers>=0.1
packaging>=0.19
Expand All @@ -50,7 +50,7 @@ install_requires =
qtpy>=2.0.1
pygithub
bottleneck
pyqt6
pyqt6<=6.7.0
scripts =
bin/pypeit_c_enabled
bin/pypeit_chk_plugins
Expand Down
Loading