Converted util imports/scripts to modules to support rel imports

Author: adamlui

computer-languages/noxfile.py

@@ -5,11 +5,8 @@
 import nox
 
 py_cmd = 'py' if sys.platform.startswith('win') else 'python3'
-
 pkg = sn(dir=Path(__file__).parent.name)
 pkg.name = pkg.dir.replace('-', '_')
-paths = sn(
-    utils=sn(bump='utils/bump.py', clean='utils/clean.py', publish='utils/publish.sh', update='utils/update_langs.py'))
 
 def session(func) : return nox.session(venv_backend='none', name=func.__name__.replace('_', '-'))(func)
 
@@ -26,9 +23,9 @@ def lint_all(session): # all project files
     session.run('pre-commit', 'run', '--files', *files, *session.posargs)
 
 @session
-def update(session, *args) : session.run(py_cmd, paths.utils.update, *args)
+def update(session, *args) : session.run(py_cmd, '-m', 'utils.update_langs', *args)
 
-bump_cmd_args = (py_cmd, paths.utils.bump)
+bump_cmd_args = (py_cmd, '-m', 'utils.bump')
 @session
 def bump_patch(session, no_push=True):
     cmd_args = bump_cmd_args + ('--patch',)
@@ -51,7 +48,7 @@ def bump_major(session, no_push=True):
 @session
 def build(session) : clean(session) ; session.run(py_cmd, '-m', 'build') ; print('Build complete!')
 @session
-def publish(session) : session.run('bash', paths.utils.publish, *session.posargs)
+def publish(session) : session.run('bash', 'utils/publish.sh', *session.posargs)
 
 @session
 def deploy_patch(session) : bump_patch(session, no_push=False) ; build(session) ; publish(session)
@@ -63,4 +60,4 @@ def deploy_feat(session) : deploy_minor(session)
 def deploy_major(session) : bump_major(session, no_push=False) ; build(session) ; publish(session)
 
 @session
-def clean(session, *args) : session.run(py_cmd, paths.utils.clean, *args)
+def clean(session, *args) : session.run(py_cmd, '-m', 'utils.clean', *args)

computer-languages/utils/bump.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from types import SimpleNamespace as sn
 
-from lib import data, log, toml
+from .lib import data, log, toml
 
 paths = sn(root=Path(__file__).parent.parent)
 paths.pyproject = paths.root / 'pyproject.toml'
@@ -76,7 +76,7 @@ def main():
     if args.no_commit:
         print(f'\n{msgs.log_SKIPPING_GIT_COMMIT}...')
     else:
-        from lib import git
+        from .lib import git
         git.init_kudo_sync_bot(msgs)
         log.info(f'{msgs.log_COMMITTING_CHANGES}...')
         git.commit([str(paths.pyproject), str(paths.readme)],

computer-languages/utils/clean.py

@@ -2,7 +2,7 @@
 import shutil, sys
 from types import SimpleNamespace as sn
 
-from lib import data, log
+from .lib import data, log
 
 def main():
     msgs_path = Path(__file__).parent / 'data/messages.json'

computer-languages/utils/update_langs.py

@@ -2,7 +2,7 @@
 from urllib.request import urlopen
 import yaml
 
-from lib import data, log
+from .lib import data, log
 
 gh_lang_yml_filename = 'languages.yml'
 

data-languages/noxfile.py

@@ -5,11 +5,8 @@
 import nox
 
 py_cmd = 'py' if sys.platform.startswith('win') else 'python3'
-
 pkg = sn(dir=Path(__file__).parent.name)
 pkg.name = pkg.dir.replace('-', '_')
-paths = sn(
-    utils=sn(bump='utils/bump.py', clean='utils/clean.py', publish='utils/publish.sh', update='utils/update_langs.py'))
 
 def session(func) : return nox.session(venv_backend='none', name=func.__name__.replace('_', '-'))(func)
 
@@ -26,9 +23,9 @@ def lint_all(session): # all project files
     session.run('pre-commit', 'run', '--files', *files, *session.posargs)
 
 @session
-def update(session, *args) : session.run(py_cmd, paths.utils.update, *args)
+def update(session, *args) : session.run(py_cmd, '-m', 'utils.update_langs', *args)
 
-bump_cmd_args = (py_cmd, paths.utils.bump)
+bump_cmd_args = (py_cmd, '-m', 'utils.bump')
 @session
 def bump_patch(session, no_push=True):
     cmd_args = bump_cmd_args + ('--patch',)
@@ -51,7 +48,7 @@ def bump_major(session, no_push=True):
 @session
 def build(session) : clean(session) ; session.run(py_cmd, '-m', 'build') ; print('Build complete!')
 @session
-def publish(session) : session.run('bash', paths.utils.publish, *session.posargs)
+def publish(session) : session.run('bash', 'utils/publish.sh', *session.posargs)
 
 @session
 def deploy_patch(session) : bump_patch(session, no_push=False) ; build(session) ; publish(session)
@@ -63,4 +60,4 @@ def deploy_feat(session) : deploy_minor(session)
 def deploy_major(session) : bump_major(session, no_push=False) ; build(session) ; publish(session)
 
 @session
-def clean(session, *args) : session.run(py_cmd, paths.utils.clean, *args)
+def clean(session, *args) : session.run(py_cmd, '-m', 'utils.clean', *args)

data-languages/utils/bump.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from types import SimpleNamespace as sn
 
-from lib import data, log, toml
+from .lib import data, log, toml
 
 paths = sn(root=Path(__file__).parent.parent)
 paths.pyproject = paths.root / 'pyproject.toml'
@@ -76,7 +76,7 @@ def main():
     if args.no_commit:
         print(f'\n{msgs.log_SKIPPING_GIT_COMMIT}...')
     else:
-        from lib import git
+        from .lib import git
         git.init_kudo_sync_bot(msgs)
         log.info(f'{msgs.log_COMMITTING_CHANGES}...')
         git.commit([str(paths.pyproject), str(paths.readme)],

data-languages/utils/clean.py

@@ -2,7 +2,7 @@
 import shutil, sys
 from types import SimpleNamespace as sn
 
-from lib import data, log
+from .lib import data, log
 
 def main():
     msgs_path = Path(__file__).parent / 'data/messages.json'

data-languages/utils/update_langs.py

@@ -2,7 +2,7 @@
 from urllib.request import urlopen
 import yaml
 
-from lib import data, log
+from .lib import data, log
 
 gh_lang_yml_filename = 'languages.yml'
 

find-project-root/noxfile.py

@@ -5,10 +5,8 @@
 import nox
 
 py_cmd = 'py' if sys.platform.startswith('win') else 'python3'
-
 pkg = sn(dir=Path(__file__).parent.name)
 pkg.name = pkg.dir.replace('-', '_')
-paths = sn(utils=sn(bump='utils/bump.py', clean='utils/clean.py', publish='utils/publish.sh'))
 
 def session(func) : return nox.session(venv_backend='none', name=func.__name__.replace('_', '-'))(func)
 
@@ -35,7 +33,7 @@ def lint_all(session): # all project files
     files = session.run('git', 'ls-files', '.', silent=True, log=False).splitlines()
     session.run('pre-commit', 'run', '--files', *files, *session.posargs)
 
-bump_cmd_args = (py_cmd, paths.utils.bump)
+bump_cmd_args = (py_cmd, '-m', 'utils.bump')
 @session
 def bump_patch(session, no_push=True):
     cmd_args = bump_cmd_args + ('--patch',)
@@ -58,7 +56,7 @@ def bump_major(session, no_push=True):
 @session
 def build(session) : clean(session) ; session.run(py_cmd, '-m', 'build') ; print('Build complete!')
 @session
-def publish(session) : session.run('bash', paths.utils.publish, *session.posargs)
+def publish(session) : session.run('bash', 'utils/publish.sh', *session.posargs)
 
 @session
 def deploy_patch(session) : bump_patch(session, no_push=False) ; build(session) ; publish(session)
@@ -70,4 +68,4 @@ def deploy_feat(session) : deploy_minor(session)
 def deploy_major(session) : bump_major(session, no_push=False) ; build(session) ; publish(session)
 
 @session
-def clean(session, *args) : session.run(py_cmd, paths.utils.clean, *args)
+def clean(session, *args) : session.run(py_cmd, '-m', 'utils.clean', *args)

find-project-root/utils/bump.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from types import SimpleNamespace as sn
 
-from lib import data, log, toml
+from .lib import data, log, toml
 
 paths = sn(root=Path(__file__).parent.parent)
 paths.pyproject = paths.root / 'pyproject.toml'
@@ -76,7 +76,7 @@ def main():
     if args.no_commit:
         print(f'\n{msgs.log_SKIPPING_GIT_COMMIT}...')
     else:
-        from lib import git
+        from .lib import git
         git.init_kudo_sync_bot(msgs)
         log.info(f'{msgs.log_COMMITTING_CHANGES}...')
         git.commit([str(paths.pyproject), str(paths.readme)],