fix return code for asn_from_list and skycell_asn, remove unused scripts, cleanup skycell_asn

changes/1538.associations.rst

@@ -0,0 +1 @@
+Switch association scripts from using ``Main`` class to ``_cli`` function to fix return code.

changes/1538.scripts.rst

@@ -0,0 +1 @@
+Remove install of missing scripts "schema_editor" and "schemadoc".

docs/roman/associations/asn_from_list.rst

@@ -4,8 +4,7 @@ asn_from_list
 =============
 
 Create an association using either the command line tool
-``asn_from_list`` or through the Python API using either
-:class:`romancal.associations.asn_from_list.Main` or
+``asn_from_list`` or through the Python API using
 :func:`romancal.associations.asn_from_list.asn_from_list`
 
 

docs/roman/associations/skycell_asn.rst

@@ -4,8 +4,7 @@ skycell_asn
 ===========
 
 Create an association using either the command line tool
-``skycell_asn`` or through the Python API using either
-:class:`romancal.associations.skycell_asn.Main` or
+``skycell_asn`` or through the Python API using
 :func:`romancal.associations.skycellasn.skycell_asn`
 
 

pyproject.toml

@@ -88,11 +88,9 @@ webbpsf = "pytest_plugin.webbpsf_plugin"
 
 [project.scripts]
 roman_static_preview = "romancal.scripts.static_preview:command"
-schema_editor = "romancal.scripts.schema_editor:main"
-schemadoc = "romancal.scripts.schemadoc:main"
 verify_install_requires = "romancal.scripts.verify_install_requires:main"
-asn_from_list = "romancal.associations.asn_from_list:Main"
-skycell_asn = "romancal.associations.skycell_asn:Main"
+asn_from_list = "romancal.associations.asn_from_list:_cli"
+skycell_asn = "romancal.associations.skycell_asn:_cli"
 
 [build-system]
 requires = [

romancal/associations/asn_from_list.py

@@ -43,7 +43,7 @@
     return asn
 
 
-class Main:
+def _cli(args=None):
     """Command-line interface for list_to_asn
 
     Parameters
@@ -55,93 +55,90 @@
               with the similar structure as `sys.argv`
     """
 
-    def __init__(self, args=None):
-        if args is None:
-            args = sys.argv[1:]
-        if isinstance(args, str):
-            args = args.split(" ")
-
-        parser = argparse.ArgumentParser(
-            description="Create an association from a list of files",
-            usage="asn_from_list -o mosaic_asn.json\n--product-name my_mosaic *.fits",
-        )
-
-        parser.add_argument(
-            "-o",
-            "--output-file",
-            type=str,
-            required=True,
-            help="File to write association to",
-        )
-
-        parser.add_argument(
-            "-f",
-            "--format",
-            type=str,
-            default="json",
-            help='Format of the association files. Default: "%(default)s"',
-        )
-
-        parser.add_argument(
-            "--product-name",
-            type=str,
-            help="The product name when creating a Level 3 association",
+    if args is None:
+        args = sys.argv[1:]
+    if isinstance(args, str):
+        args = args.split(" ")
+
+    parser = argparse.ArgumentParser(
+        description="Create an association from a list of files",
+        usage="asn_from_list -o mosaic_asn.json\n--product-name my_mosaic *.asdf",
+    )
+
+    parser.add_argument(
+        "-o",
+        "--output-file",
+        type=str,
+        required=True,
+        help="File to write association to",
+    )
+
+    parser.add_argument(
+        "-f",
+        "--format",
+        type=str,
+        default="json",
+        help='Format of the association files. Default: "%(default)s"',
+    )
+
+    parser.add_argument(
+        "--product-name",
+        type=str,
+        help="The product name when creating a Level 3 association",
+    )
+
+    parser.add_argument(
+        "-r",
+        "--rule",
+        type=str,
+        default="DMS_ELPP_Base",
+        help=('The rule to base the association structure on. Default: "%(default)s"'),
+    )
+    parser.add_argument(
+        "--ruledefs",
+        action="append",
+        help=(
+            "Association rules definition file(s) If not specified, the default"
+            " rules will be searched."
+        ),
+    )
+    parser.add_argument(
+        "-i",
+        "--id",
+        type=str,
+        default="o999",
+        help='The association candidate id to use. Default: "%(default)s"',
+        dest="acid",
+    )
+    parser.add_argument(
+        "-t",
+        "--target",
+        type=str,
+        default="None",
+        help='The target name for the association. Default: "%(default)s"',
+        dest="target",
+    )
+
+    parser.add_argument(
+        "filelist",
+        type=str,
+        nargs="+",
+        help="File list to include in the association",
+    )
+
+    parsed = parser.parse_args(args=args)
+    print("Parsed args:", parsed)
+
+    # Get the rule
+    rule = AssociationRegistry(parsed.ruledefs, include_bases=True)[parsed.rule]
+
+    with open(parsed.output_file, "w") as outfile:
+        asn = asn_from_list(
+            parsed.filelist,
+            rule=rule,
+            product_name=parsed.product_name,
+            acid=parsed.acid,
+            target=parsed.target,
         )
-
-        parser.add_argument(
-            "-r",
-            "--rule",
-            type=str,
-            default="DMS_ELPP_Base",
-            help=(
-                'The rule to base the association structure on. Default: "%(default)s"'
-            ),
-        )
-        parser.add_argument(
-            "--ruledefs",
-            action="append",
-            help=(
-                "Association rules definition file(s) If not specified, the default"
-                " rules will be searched."
-            ),
-        )
-        parser.add_argument(
-            "-i",
-            "--id",
-            type=str,
-            default="o999",
-            help='The association candidate id to use. Default: "%(default)s"',
-            dest="acid",
-        )
-        parser.add_argument(
-            "-t",
-            "--target",
-            type=str,
-            default="None",
-            help='The target name for the association. Default: "%(default)s"',
-            dest="target",
-        )
-
-        parser.add_argument(
-            "filelist",
-            type=str,
-            nargs="+",
-            help="File list to include in the association",
-        )
-
-        parsed = parser.parse_args(args=args)
-        print("Parsed args:", parsed)
-
-        # Get the rule
-        rule = AssociationRegistry(parsed.ruledefs, include_bases=True)[parsed.rule]
-
-        with open(parsed.output_file, "w") as outfile:
-            asn = asn_from_list(
-                parsed.filelist,
-                rule=rule,
-                product_name=parsed.product_name,
-                acid=parsed.acid,
-                target=parsed.target,
-            )
-            _, serialized = asn.dump(format=parsed.format)
-            outfile.write(serialized)
+        _, serialized = asn.dump(format=parsed.format)
+        outfile.write(serialized)