Remove explicit Python 2 support (#32)

goodmami · web-flow · commit 9bf4b0e79015 · 2020-05-30T20:52:37.000-07:00
* Remove explicit Python 2 support The code no longer checks the Python version and no longer uses optparse for older versions. In addition some `__future__` imports are removed. In `smatch-table.py`, timing uses `time.perf_counter()`. Otherwise nothing is really done to update to Python 3 code. Neither smatch.py nor smatch-table.py work with Python2 after this commit, but smatch.py can run if the print() functions are resolved somehow (e.g., by using a logger instead of print()). That said, I deliberately do not put in such accommodations because Python 2 support is a non-goal. Resolves #31 * Add py38 to .appveyor.yml, fix CHANGELOG link
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -3,6 +3,7 @@ environment:
   - TOXENV: py35
   - TOXENV: py36
   - TOXENV: py37
+  - TOXENV: py38
 
 build: off
 
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ python:
 - '3.5'
 - '3.6'
 - '3.7'
+- '3.8'
 install: pip install tox-travis
 script: tox
 deploy:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 ## Unreleased
 
+* Python 2 support is removed ([#31])
+* Python 3.8 support is added
 * Smatch version is taken from git tag (see [#22][])
 * Add CI/CD configuration (see PR [#23][])
 * Better handle deinversion of special roles ([#10][])
@@ -171,4 +173,5 @@ The following are taken from an old `update_log` file:
 [#23]: https://github.com/snowblink14/smatch/pull/23
 [#25]: https://github.com/snowblink14/smatch/pull/25
 [#27]: https://github.com/snowblink14/smatch/pull/27
+[#31]: https://github.com/snowblink14/smatch/issues/31
 
diff --git a/setup.py b/setup.py
@@ -31,6 +31,7 @@
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
           'Topic :: Scientific/Engineering :: Information Analysis',
           'Topic :: Software Development :: Libraries :: Python Modules',
           'Topic :: Text Processing :: Linguistic',
diff --git a/smatch-table.py b/smatch-table.py
@@ -1,15 +1,12 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-
 import sys
 import os
 import time
 
 import amr
 import smatch
 
-
 ERROR_LOG = sys.stderr
 
 DEBUG_LOG = sys.stderr
@@ -151,21 +148,6 @@ def pprint_table(table):
         print("\n")
 
 
-def build_arg_parser():
-    """
-    Build an argument parser using argparse. Use it when python version is 2.7 or later.
-
-    """
-    parser = argparse.ArgumentParser(description="Smatch table calculator -- arguments")
-    parser.add_argument("--fl", type=argparse.FileType('r'), help='AMR ID list file')
-    parser.add_argument('-f', nargs='+', help='AMR IDs (at least one)')
-    parser.add_argument("-p", nargs='*', help="User list (can be none)")
-    parser.add_argument("--fd", default=isi_dir_pre, help="AMR File directory. Default=location on isi machine")
-    parser.add_argument('-r', type=int, default=4, help='Restart number (Default:4)')
-    parser.add_argument('-v', action='store_true', help='Verbose output (Default:False)')
-    return parser
-
-
 def cb(option, value, parser):
     """
     Callback function to handle variable number of arguments in optparse
@@ -262,9 +244,9 @@ def main(arguments):
         table[i+1].append(names[i])
         for j in range(0, len_name):
             if i != j:
-                start = time.time()
+                start = time.perf_counter()
                 table[i+1].append(compute_files(names[i], names[j], ids, args.fd, args.r))
-                end = time.time()
+                end = time.perf_counter()
                 if table[i+1][-1] != -1.0:
                     acc_time += end-start
             else:
@@ -283,22 +265,50 @@ def main(arguments):
 
 
 if __name__ == "__main__":
-    whole_start = time.time()
-    parser = None
-    args = None
+    whole_start = time.perf_counter()
+
     import argparse
-    parser = build_arg_parser()
+
+    parser = argparse.ArgumentParser(description="Smatch table calculator")
+    parser.add_argument(
+        "--fl",
+        type=argparse.FileType('r'),
+        help='AMR ID list file')
+    parser.add_argument(
+        '-f',
+        nargs='+',
+        help='AMR IDs (at least one)')
+    parser.add_argument(
+        "-p",
+        nargs='*',
+        help="User list (can be none)")
+    parser.add_argument(
+        "--fd",
+        default=isi_dir_pre,
+        help="AMR File directory. Default=location on isi machine")
+    parser.add_argument(
+        '-r',
+        type=int,
+        default=4,
+        help='Restart number (Default:4)')
+    parser.add_argument(
+        '-v',
+        action='store_true',
+        help='Verbose output (Default:False)')
+
     args = parser.parse_args()
+
     # Regularize fd, add "/" at the end if needed
     if args.fd[-1] != "/":
         args.fd += "/"
+
     # acc_time is the smatch calculation time
     acc_time = main(args)
-    whole_end = time.time()
+    whole_end = time.perf_counter()
     # time of the whole running process
     whole_time = whole_end - whole_start
+
     # print if needed
     # print("Accumulated computation time", acc_time, file=ERROR_LOG)
     # print("Total time", whole_time, file=ERROR_LOG)
     # print("Percentage", float(acc_time)/float(whole_time), file=ERROR_LOG)
-
diff --git a/smatch.py b/smatch.py
@@ -8,12 +8,9 @@
 
 """
 
-from __future__ import print_function
-from __future__ import division
+import random
 
 import amr
-import os
-import random
 import sys
 
 # total number of iteration in smatch computation
@@ -44,64 +41,6 @@
 match_triple_dict = {}
 
 
-def build_arg_parser():
-    """
-    Build an argument parser using argparse. Use it when python version is 2.7 or later.
-
-    """
-    parser = argparse.ArgumentParser(description="Smatch calculator -- arguments")
-    parser.add_argument('-f', nargs=2, required=True, type=argparse.FileType('r'),
-                        help='Two files containing AMR pairs. AMRs in each file are separated by a single blank line')
-    parser.add_argument('-r', type=int, default=4, help='Restart number (Default:4)')
-    parser.add_argument('--significant', type=int, default=2, help='significant digits to output (default: 2)')
-    parser.add_argument('-v', action='store_true', help='Verbose output (Default:false)')
-    parser.add_argument('--vv', action='store_true', help='Very Verbose output (Default:false)')
-    parser.add_argument('--ms', action='store_true', default=False,
-                        help='Output multiple scores (one AMR pair a score)'
-                             'instead of a single document-level smatch score (Default: false)')
-    parser.add_argument('--pr', action='store_true', default=False,
-                        help="Output precision and recall as well as the f-score. Default: false")
-    parser.add_argument('--justinstance', action='store_true', default=False,
-                        help="just pay attention to matching instances")
-    parser.add_argument('--justattribute', action='store_true', default=False,
-                        help="just pay attention to matching attributes")
-    parser.add_argument('--justrelation', action='store_true', default=False,
-                        help="just pay attention to matching relations")
-
-    return parser
-
-
-def build_arg_parser2():
-    """
-    Build an argument parser using optparse. Use it when python version is 2.5 or 2.6.
-
-    """
-    usage_str = "Smatch calculator -- arguments"
-    parser = optparse.OptionParser(usage=usage_str)
-    parser.add_option("-f", "--files", nargs=2, dest="f", type="string",
-                      help='Two files containing AMR pairs. AMRs in each file are ' \
-                           'separated by a single blank line. This option is required.')
-    parser.add_option("-r", "--restart", dest="r", type="int", help='Restart number (Default: 4)')
-    parser.add_option('--significant', dest="significant", type="int", default=2,
-                      help='significant digits to output (default: 2)')
-    parser.add_option("-v", "--verbose", action='store_true', dest="v", help='Verbose output (Default:False)')
-    parser.add_option("--vv", "--veryverbose", action='store_true', dest="vv",
-                      help='Very Verbose output (Default:False)')
-    parser.add_option("--ms", "--multiple_score", action='store_true', dest="ms",
-                      help='Output multiple scores (one AMR pair a score) instead of ' \
-                           'a single document-level smatch score (Default: False)')
-    parser.add_option('--pr', "--precision_recall", action='store_true', dest="pr",
-                      help="Output precision and recall as well as the f-score. Default: false")
-    parser.add_option('--justinstance', action='store_true', default=False,
-                      help="just pay attention to matching instances")
-    parser.add_option('--justattribute', action='store_true', default=False,
-                      help="just pay attention to matching attributes")
-    parser.add_option('--justrelation', action='store_true', default=False,
-                      help="just pay attention to matching relations")
-    parser.set_defaults(r=4, v=False, ms=False, pr=False)
-    return parser
-
-
 def get_best_match(instance1, attribute1, relation1,
                    instance2, attribute2, relation2,
                    prefix1, prefix2, doinstance=True, doattribute=True, dorelation=True):
@@ -854,36 +793,62 @@ def main(arguments):
 
 
 if __name__ == "__main__":
-    parser = None
-    args = None
-    # use optparse if python version is 2.5 or 2.6
-    if sys.version_info[0] == 2 and sys.version_info[1] < 7:
-        import optparse
-
-        if len(sys.argv) == 1:
-            print("No argument given. Please run smatch.py -h to see the argument description.", file=ERROR_LOG)
-            exit(1)
-        parser = build_arg_parser2()
-        (args, opts) = parser.parse_args()
-        file_handle = []
-        if args.f is None:
-            print("smatch.py requires -f option to indicate two files \
-                                             containing AMR as input. Please run smatch.py -h to  \
-                                             see the argument description.", file=ERROR_LOG)
-            exit(1)
-        # assert there are 2 file names following -f.
-        assert (len(args.f) == 2)
-        for file_path in args.f:
-            if not os.path.exists(file_path):
-                print("Given file", args.f[0], "does not exist", file=ERROR_LOG)
-                exit(1)
-            file_handle.append(open(file_path, encoding='utf8'))
-        # use opened files
-        args.f = tuple(file_handle)
-    #  use argparse if python version is 2.7 or later
-    else:
-        import argparse
-
-        parser = build_arg_parser()
-        args = parser.parse_args()
+    import argparse
+
+    parser = argparse.ArgumentParser(description="Smatch calculator")
+    parser.add_argument(
+        '-f',
+        nargs=2,
+        required=True,
+        type=argparse.FileType('r'),
+        help=('Two files containing AMR pairs. '
+              'AMRs in each file are separated by a single blank line'))
+    parser.add_argument(
+        '-r',
+        type=int,
+        default=4,
+        help='Restart number (Default:4)')
+    parser.add_argument(
+        '--significant',
+        type=int,
+        default=2,
+        help='significant digits to output (default: 2)')
+    parser.add_argument(
+        '-v',
+        action='store_true',
+        help='Verbose output (Default:false)')
+    parser.add_argument(
+        '--vv',
+        action='store_true',
+        help='Very Verbose output (Default:false)')
+    parser.add_argument(
+        '--ms',
+        action='store_true',
+        default=False,
+        help=('Output multiple scores (one AMR pair a score) '
+              'instead of a single document-level smatch score '
+              '(Default: false)'))
+    parser.add_argument(
+        '--pr',
+        action='store_true',
+        default=False,
+        help=('Output precision and recall as well as the f-score. '
+              'Default: false'))
+    parser.add_argument(
+        '--justinstance',
+        action='store_true',
+        default=False,
+        help="just pay attention to matching instances")
+    parser.add_argument(
+        '--justattribute',
+        action='store_true',
+        default=False,
+        help="just pay attention to matching attributes")
+    parser.add_argument(
+        '--justrelation',
+        action='store_true',
+        default=False,
+        help="just pay attention to matching relations")
+
+    args = parser.parse_args()
     main(args)
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37}
+envlist = py{35,36,37,38}
 
 [testenv]
 commands = python smatch.py -f test_input1.txt test_input2.txt
