From 21d2711dfb52a195b225bbc1798a8bd95127a4d3 Mon Sep 17 00:00:00 2001 From: Kyle Westfall Date: Mon, 5 Aug 2024 15:15:37 -0700 Subject: [PATCH 1/3] change pyqt6 dependency; limit attempts to start ginga --- pypeit/display/display.py | 7 ++++--- setup.cfg | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pypeit/display/display.py b/pypeit/display/display.py index 2b53dc466f..ab8b29155e 100644 --- a/pypeit/display/display.py +++ b/pypeit/display/display.py @@ -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) @@ -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: diff --git a/setup.cfg b/setup.cfg index b8e9ded954..9d3691e1fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 From 73d062e4df642402b655f5db84b57e3a74aea0da Mon Sep 17 00:00:00 2001 From: Kyle Westfall Date: Mon, 5 Aug 2024 15:25:57 -0700 Subject: [PATCH 2/3] numpy version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 9d3691e1fe..f29285fd16 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ python_requires = >=3.10,<3.13 setup_requires = setuptools_scm include_package_data = True install_requires = - numpy>=1.23 + numpy<2.0.0 astropy>=6.0 extension-helpers>=0.1 packaging>=0.19 From ef373e46d438892747c894f98683972f4b482adf Mon Sep 17 00:00:00 2001 From: Kyle Westfall Date: Mon, 12 Aug 2024 15:28:40 -0700 Subject: [PATCH 3/3] numpy version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index f29285fd16..1c0ac31359 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ python_requires = >=3.10,<3.13 setup_requires = setuptools_scm include_package_data = True install_requires = - numpy<2.0.0 + numpy>=1.23,<2.0.0 astropy>=6.0 extension-helpers>=0.1 packaging>=0.19