Update argparse config to use built-in versioning

diff --git a/extract.py b/extract.py
index 26fe9a8001f2cf4a9db62ce263f9c456dc53e537..4a0a6b00cb3b44a01e3b02e54506dcd6197379b7 100755 (executable)
--- a/extract.py
+++ b/extract.py
@@ -15,8 +15,8 @@ def parse_args():
                         default="phrases.db",
                         help="set custom output file location")
     parser.add_argument("-v", "--version",
-                        action="store_true",
-                        help="print script version")
+                        action="version",
+                        version="phrases-extract 1.0.3")
     return parser.parse_args()
 
 
@@ -64,15 +64,11 @@ def get_tables():
 
 
 def main():
-    if args.version:
-        print(version)
-    else:
-        prep_database()
-        fill_database(get_tables())
+    prep_database()
+    fill_database(get_tables())
 
 
 if __name__ == "__main__":
-    version = "phrases extract.py 1.0.2"
     args = parse_args()
     conn = sqlite3.connect(args.output)
     c = conn.cursor()

diff --git a/man/phrases-extract.1 b/man/phrases-extract.1
index ad2b3d070c64f2a80491dc18cff8d37336dd610f..921e1e18249d31b7ace781e16076a32b01dd2ece 100644 (file)
--- a/man/phrases-extract.1
+++ b/man/phrases-extract.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 2.11.3
 .\"
-.TH "phrases-extract" "1" "January 2021" "1.0.2" ""
+.TH "phrases-extract" "1" "January 2021" "1.0.3" ""
 .hy
 .SH NAME
 .PP

diff --git a/man/phrases-extract.1.md b/man/phrases-extract.1.md
index af554b933245053c747d3390b67cdfa0b296e219..464641fc8da6299cab05ed73032f6e2a4cb3cb02 100644 (file)
--- a/man/phrases-extract.1.md
+++ b/man/phrases-extract.1.md
@@ -1,4 +1,4 @@
-% phrases-extract(1) 1.0.2
+% phrases-extract(1) 1.0.3
 % Armaan Bhojwani
 % January 2021
 

diff --git a/man/phrases.1 b/man/phrases.1
index 3afe2e118214f8d85a57bbd66b81e19fdc813e10..8fcfae9a137b58144635a04c45979c6b5b73e4e5 100644 (file)
--- a/man/phrases.1
+++ b/man/phrases.1
@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 2.11.3
 .\"
-.TH "phrases" "1" "January 2021" "1.0.2" ""
+.TH "phrases" "1" "January 2021" "1.0.3" ""
 .hy
 .SH NAME
 .PP

diff --git a/man/phrases.1.md b/man/phrases.1.md
index 3709d42c8898ad894a0b068ee207ce79a86deff1..59b3ee0086ff12ab63a6029c32afe600626f9fb9 100644 (file)
--- a/man/phrases.1.md
+++ b/man/phrases.1.md
@@ -1,4 +1,4 @@
-% phrases(1) 1.0.2
+% phrases(1) 1.0.3
 % Armaan Bhojwani
 % January 2021
 

diff --git a/phrases.py b/phrases.py
index 8f11be18429a32b4e027282740f2abc1da5b693d..b1a3a90dc1f14d353c8cd40a798ca9e7a40a2d64 100755 (executable)
--- a/phrases.py
+++ b/phrases.py
@@ -25,8 +25,8 @@ def parse_args():
                         action='store_true',
                         help="print any notes on phrase")
     parser.add_argument("-v", "--version",
-                        action='store_true',
-                        help="print version")
+                        action='version',
+                        version="phrases 1.0.3")
     parser.add_argument("-m", "--min",
                         default=0,
                         type=int,
@@ -51,13 +51,10 @@ def output():
             or args.latin
             or args.english
             or args.notes
-            or args.num
-            or args.version):
+            or args.num):
         print(row[1])
         exit(0)
     else:
-        if args.version:
-            print(version)
         if args.id:
             print(row[0])
         if args.latin:
@@ -93,7 +90,6 @@ def main():
 
 
 if __name__ == "__main__":
-    version = "phrases 1.0.2"
     args = parse_args()
     c = sqlite3.connect(find_file()).cursor()
     main()