Eliminated parse_args() + useless raise, moved bump_type init to top, merged new ver inits

Author: adamlui

remove-json-keys/utils/bump.py

@@ -3,17 +3,25 @@
 from types import SimpleNamespace as sns
 import tomli, tomli_w
 
-def parse_args():
-    argp = argparse.ArgumentParser(description='Bump versions in pyproject.toml + README.md')
-    argp.add_argument('-M', '--major', action='store_true', help='Bump the major (\033[1mx\033[0m.y.z) version')
-    argp.add_argument('-m', '--minor', action='store_true', help='Bump the minor (x.\033[1my\033[0m.z) version')
-    argp.add_argument('-p', '--patch', action='store_true', help='Bump the patch (x.y.\033[1mz\033[0m) version')
-    return argp.parse_args()
-
-# Init logger
 sys.path.insert(0, path.join(path.dirname(__file__), '../src'))
 from remove_json_keys.lib import log # type: ignore
-msgs = sns(err_invalid_arg='You must pass --<major|minor|patch> as an argument.')
+
+# Parse args
+argp = argparse.ArgumentParser(
+    description='Bump versions in pyproject.toml + README.md',
+    add_help=False # disable default --help arg to re-create last
+)
+argp.add_argument('-M', '--major', action='store_true', help='Bump the major (\033[1mx\033[0m.y.z) version')
+argp.add_argument('-m', '--minor', action='store_true', help='Bump the minor (x.\033[1my\033[0m.z) version')
+argp.add_argument('-p', '--patch', action='store_true', help='Bump the patch (x.y.\033[1mz\033[0m) version')
+argp.add_argument('-h', '--help',  action='help',       help='Show help screen')
+args = argp.parse_args()
+
+# Init bump_type
+bump_type = 'major' if args.major else 'minor' if args.minor else 'patch' if args.patch else None
+if not bump_type:
+    log.error('You must pass --<major|minor|patch> as an argument.')
+    sys.exit(1)
 
 # Init project data
 pyproject_path = path.join(path.dirname(__file__), '../pyproject.toml')
@@ -29,13 +37,11 @@ def bump_pyproject_versions(bump_type): # project.version + .urls['Changelog']
     if   bump_type == 'major' : patch =  0 ; minor =  0 ; major += 1
     elif bump_type == 'minor' : patch =  0 ; minor += 1 ; 
     elif bump_type == 'patch' : patch += 1
-    else : raise ValueError(msgs.err_invalid_arg)
-    new_ver = f'{major}.{minor}.{patch}'
-    pyproject['project']['version'] = new_ver
+    pyproject['project']['version'] = new_ver = f'{major}.{minor}.{patch}'
     with open(pyproject_path, 'wb') as file : tomli_w.dump(pyproject, file)
     log.success(f'Bumped project.version in pyproject.toml from [{current_ver}] to [{new_ver}]')
 
-    # Bump version tag in Changelog URL
+    # Bump version tag in project.urls['Changelog']
     new_ver_tag = f'{project.name}-{new_ver}'
     new_changelog_url = f"{project.urls['Releases']}/tag/{new_ver_tag}"
     log.data(f'Generated Changelog URL: {new_changelog_url}')
@@ -46,16 +52,12 @@ def bump_pyproject_versions(bump_type): # project.version + .urls['Changelog']
 
     return new_ver
 
-def update_readme_versions(new_ver): # in shield URLs
+def update_readme_versions(new_ver): # in URLs
     readme_path = path.join(path.dirname(__file__), '../README.md')
     log.info('Updating versions in README.md...')
     with open(readme_path, 'r', encoding='utf-8') as file : readme_content = file.read()
     updated_readme_content = re.sub(r'\d+\.\d+\.\d+', new_ver, readme_content)
     with open(readme_path, 'w', encoding='utf-8') as file : file.write(updated_readme_content)
     log.success(f'Updated versions in README URLs to [{new_ver}]!')
 
-# Run MAIN routine
-args = parse_args()
-bump_type = 'major' if args.major else 'minor' if args.minor else 'patch' if args.patch else None
-if not bump_type : raise ValueError(msgs.err_invalid_arg)
 update_readme_versions(bump_pyproject_versions(bump_type))

translate-messages/utils/bump.py

@@ -3,17 +3,25 @@
 from types import SimpleNamespace as sns
 import tomli, tomli_w
 
-def parse_args():
-    argp = argparse.ArgumentParser(description='Bump versions in pyproject.toml + README.md')
-    argp.add_argument('-M', '--major', action='store_true', help='Bump the major (\033[1mx\033[0m.y.z) version')
-    argp.add_argument('-m', '--minor', action='store_true', help='Bump the minor (x.\033[1my\033[0m.z) version')
-    argp.add_argument('-p', '--patch', action='store_true', help='Bump the patch (x.y.\033[1mz\033[0m) version')
-    return argp.parse_args()
-
-# Init logger
 sys.path.insert(0, path.join(path.dirname(__file__), '../src'))
 from translate_messages.lib import log # type: ignore
-msgs = sns(err_invalid_arg='You must pass --<major|minor|patch> as an argument.')
+
+# Parse args
+argp = argparse.ArgumentParser(
+    description='Bump versions in pyproject.toml + README.md',
+    add_help=False # disable default --help arg to re-create last
+)
+argp.add_argument('-M', '--major', action='store_true', help='Bump the major (\033[1mx\033[0m.y.z) version')
+argp.add_argument('-m', '--minor', action='store_true', help='Bump the minor (x.\033[1my\033[0m.z) version')
+argp.add_argument('-p', '--patch', action='store_true', help='Bump the patch (x.y.\033[1mz\033[0m) version')
+argp.add_argument('-h', '--help',  action='help',       help='Show help screen')
+args = argp.parse_args()
+
+# Init bump_type
+bump_type = 'major' if args.major else 'minor' if args.minor else 'patch' if args.patch else None
+if not bump_type:
+    log.error('You must pass --<major|minor|patch> as an argument.')
+    sys.exit(1)
 
 # Init project data
 pyproject_path = path.join(path.dirname(__file__), '../pyproject.toml')
@@ -29,13 +37,11 @@ def bump_pyproject_versions(bump_type): # project.version + .urls['Changelog']
     if   bump_type == 'major' : patch =  0 ; minor =  0 ; major += 1
     elif bump_type == 'minor' : patch =  0 ; minor += 1 ; 
     elif bump_type == 'patch' : patch += 1
-    else : raise ValueError(msgs.err_invalid_arg)
-    new_ver = f'{major}.{minor}.{patch}'
-    pyproject['project']['version'] = new_ver
+    pyproject['project']['version'] = new_ver = f'{major}.{minor}.{patch}'
     with open(pyproject_path, 'wb') as file : tomli_w.dump(pyproject, file)
     log.success(f'Bumped project.version in pyproject.toml from [{current_ver}] to [{new_ver}]')
 
-    # Bump version tag in Changelog URL
+    # Bump version tag in project.urls['Changelog']
     new_ver_tag = f'{project.name}-{new_ver}'
     new_changelog_url = f"{project.urls['Releases']}/tag/{new_ver_tag}"
     log.data(f'Generated Changelog URL: {new_changelog_url}')
@@ -46,16 +52,12 @@ def bump_pyproject_versions(bump_type): # project.version + .urls['Changelog']
 
     return new_ver
 
-def update_readme_versions(new_ver): # in shield + supported_locales URLs
+def update_readme_versions(new_ver): # in URLs
     readme_path = path.join(path.dirname(__file__), '../README.md')
     log.info('Updating versions in README.md...')
     with open(readme_path, 'r', encoding='utf-8') as file : readme_content = file.read()
     updated_readme_content = re.sub(r'\d+\.\d+\.\d+', new_ver, readme_content)
     with open(readme_path, 'w', encoding='utf-8') as file : file.write(updated_readme_content)
     log.success(f'Updated versions in README URLs to [{new_ver}]!')
 
-# Run MAIN routine
-args = parse_args()
-bump_type = 'major' if args.major else 'minor' if args.minor else 'patch' if args.patch else None
-if not bump_type : raise ValueError(msgs.err_invalid_arg)
 update_readme_versions(bump_pyproject_versions(bump_type))