From c05534972ae7d7018807d4ef0195ef998d3a21c5 Mon Sep 17 00:00:00 2001
From: James Davies <jdavies@stsci.edu>
Date: Mon, 18 Jan 2021 14:38:28 -0500
Subject: [PATCH] Make okify_regtests script not need enter key

---
 scripts/okify_regtests | 35 +++++++++++++++++++++++------------
 setup.cfg              | 10 +++++++++-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/scripts/okify_regtests b/scripts/okify_regtests
index dac51bef9c..aedb5876b4 100755
--- a/scripts/okify_regtests
+++ b/scripts/okify_regtests
@@ -15,6 +15,8 @@ from glob import glob
 import shutil
 
 import asdf
+from colorama import Fore
+from getch import getch
 
 
 ARTIFACTORY_REPO = "jwst-pipeline-results"
@@ -96,7 +98,7 @@ def main():
 
     # Create and chdir to a temporary directory to store specfiles
     with tempfile.TemporaryDirectory() as tmpdir:
-        print(f"Downloading test okify artifacts to local directory {tmpdir}")
+        print(f"Downloading test logs to {tmpdir}")
         with pushd(tmpdir):
             # Retreive all the okify specfiles for failed tests.
             specfiles, asdffiles = artifactory_get_build_artifacts(build, name)
@@ -123,23 +125,32 @@ def main():
 
                 test_number = i + 1
 
-                print(f" {test_name} ".center(TERMINAL_WIDTH, "—"))
+                print(f"{Fore.RED}" +
+                      (f" {test_name} ".center(TERMINAL_WIDTH, "—")) +
+                      f"{Fore.RESET}")
                 print(traceback)
-                print("—" * TERMINAL_WIDTH)
-                print(f"OK: {remote_results}")
-                print(f"--> {truth_remote}")
-                print(f"[ test {test_number} of {number_failed_tests} ]".center(TERMINAL_WIDTH, "—"))
+                print(f"{Fore.RED}" + ("—" * TERMINAL_WIDTH) + f"{Fore.RESET}")
+                print(f"{Fore.GREEN}OK: {remote_results}")
+                print(f"--> {truth_remote}{Fore.RESET}")
+                print(f"{Fore.RED}" +
+                      (f"[ test {test_number} of {number_failed_tests} ]".center(TERMINAL_WIDTH, "—")) +
+                      f"{Fore.RESET}")
 
                 # Ask if user wants to okify this test
                 while True:
-                    result = input("Enter 'o' to okify, 's' to skip: ")
-                    if result not in ['o', 's']:
-                        print(f"Unrecognized command '{result}', try again")
+                    print(f"{Fore.GREEN}'o' to okify{Fore.RESET}, "
+                          f"{Fore.CYAN}'s' to skip{Fore.RESET}, "
+                          f"{Fore.MAGENTA}'q' to quit{Fore.RESET}: ")
+                    # Get the keyboard character input without pressing return
+                    result = getch()
+                    if result not in ['o', 's', 'q']:
+                        print(f"Unrecognized command, try again")
                     else:
                         break
-
-                if result == 's':
-                    print("Skipping\n")
+                if result == 'q':
+                    break
+                elif result == 's':
+                    pass
                 else:
                     artifactory_copy(os.path.abspath(specfile), dry_run=args.dry_run)
                     print("")
diff --git a/setup.cfg b/setup.cfg
index f5d33614a9..38457269cc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,14 +7,20 @@ author = JWST calibration pipeline developers
 license = BSD-3-Clause
 url = https://github.com/spacetelescope/jwst
 project_urls =
-    Bug Tracker = https://github.com/spacetelescope/jwst/issues
+    Tracker = https://github.com/spacetelescope/jwst/issues
     Documentation = https://jwst-pipeline.readthedocs.io/en/stable/
     Source Code = https://github.com/spacetelescope/jwst
 classifiers =
     Intended Audience :: Science/Research
     Topic :: Scientific/Engineering :: Astronomy
     License :: OSI Approved :: BSD License
+    Operating System :: MacOS :: MacOS X
+    Operating System :: POSIX
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [options]
 zip_safe = False
@@ -51,6 +57,8 @@ docs =
     sphinx-asdf
 test =
     ci-watson>=0.3.0
+    colorama>=0.4.1
+    getch>=1.0.0
     pytest>=4.6.0
     pytest-doctestplus
     requests_mock>=1.0