Generalized pkg_name init, reduced catching/logging, moved pyproject_path init to top level

Author: adamlui

remove-json-keys/utils/bump.py

@@ -1,27 +1,19 @@
 import os, logging
 import tomli, tomli_w
 
-pkg_name = 'remove-json-keys'
+pyproject_path = os.path.join(os.path.dirname(__file__), '../pyproject.toml')
+with open(pyproject_path, 'rb') as file:
+    pkg_name = tomli.load(file)['project']['name']
 
 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
 
 def update_changelog_url():
-    pyproject_path = os.path.join(os.path.dirname(__file__), '../pyproject.toml')
-    logging.debug(f'Reading pyproject.toml from: {pyproject_path}')
-    if not os.path.exists(pyproject_path):
-        return logging.error(f'pyproject.toml file not found at {pyproject_path}')
-
-    try: # load pyproject.toml
-        with open(pyproject_path, 'rb') as file : pyproject = tomli.load(file)
-        logging.debug('Successfully loaded pyproject.toml!')
-    except Exception as err:
-        return logging.exception(f'Error loading pyproject.toml: {err}')
-
-    version = pyproject.get('project', {}).get('version')
-    if not version:
-        return logging.error('Version not found in pyproject.toml.')
-
-    changelog_url = f'https://github.com/adamlui/python-utils/releases/tag/{pkg_name}-{version}'
+
+    logging.debug(f'Loading {pyproject_path}...')
+    with open(pyproject_path, 'rb') as file : pyproject = tomli.load(file)
+
+    ver_tag = f"{pkg_name}-{pyproject['project']['version']}"
+    changelog_url = f'https://github.com/adamlui/python-utils/releases/tag/{ver_tag}'
     logging.debug(f'Generated changelog URL: {changelog_url}')
 
     if 'urls' not in pyproject['project']:
@@ -33,11 +25,8 @@ def update_changelog_url():
     else:
         logging.debug('Adding new Changelog URL...')
     pyproject['project']['urls']['Changelog'] = changelog_url
+    with open(pyproject_path, 'wb') as file : tomli_w.dump(pyproject, file)
 
-    try: # write to pyproject.toml
-        with open(pyproject_path, 'wb') as file : tomli_w.dump(pyproject, file)
-        logging.info('Updated changelog URL successfully in pyproject.toml!')
-    except Exception as err:
-        logging.exception(f'Error writing to pyproject.toml: {err}')
+    logging.info(f"Bumped changelog URL ver tag to '{ver_tag}'!")
 
 update_changelog_url()

translate-messages/utils/bump.py

@@ -1,27 +1,19 @@
 import os, logging
 import tomli, tomli_w
 
-pkg_name = 'translate-messages'
+pyproject_path = os.path.join(os.path.dirname(__file__), '../pyproject.toml')
+with open(pyproject_path, 'rb') as file:
+    pkg_name = tomli.load(file)['project']['name']
 
 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
 
 def update_changelog_url():
-    pyproject_path = os.path.join(os.path.dirname(__file__), '../pyproject.toml')
-    logging.debug(f'Reading pyproject.toml from: {pyproject_path}')
-    if not os.path.exists(pyproject_path):
-        return logging.error(f'pyproject.toml file not found at {pyproject_path}')
-
-    try: # load pyproject.toml
-        with open(pyproject_path, 'rb') as file : pyproject = tomli.load(file)
-        logging.debug('Successfully loaded pyproject.toml!')
-    except Exception as err:
-        return logging.exception(f'Error loading pyproject.toml: {err}')
-
-    version = pyproject.get('project', {}).get('version')
-    if not version:
-        return logging.error('Version not found in pyproject.toml.')
-
-    changelog_url = f'https://github.com/adamlui/python-utils/releases/tag/{pkg_name}-{version}'
+
+    logging.debug(f'Loading {pyproject_path}...')
+    with open(pyproject_path, 'rb') as file : pyproject = tomli.load(file)
+
+    ver_tag = f"{pkg_name}-{pyproject['project']['version']}"
+    changelog_url = f'https://github.com/adamlui/python-utils/releases/tag/{ver_tag}'
     logging.debug(f'Generated changelog URL: {changelog_url}')
 
     if 'urls' not in pyproject['project']:
@@ -33,11 +25,8 @@ def update_changelog_url():
     else:
         logging.debug('Adding new Changelog URL...')
     pyproject['project']['urls']['Changelog'] = changelog_url
+    with open(pyproject_path, 'wb') as file : tomli_w.dump(pyproject, file)
 
-    try: # write to pyproject.toml
-        with open(pyproject_path, 'wb') as file : tomli_w.dump(pyproject, file)
-        logging.info('Updated changelog URL successfully in pyproject.toml!')
-    except Exception as err:
-        logging.exception(f'Error writing to pyproject.toml: {err}')
+    logging.info(f"Bumped changelog URL ver tag to '{ver_tag}'!")
 
 update_changelog_url()