Skip to content

Commit 3f86b69

Browse files
adamluiadamlui
committed
Revert "Moved utils/lib/toml.py to src lib/data, created pkg.py"
This reverts commit 8db884d.
1 parent 8db884d commit 3f86b69

12 files changed

Lines changed: 40 additions & 46 deletions

File tree

‎remove-json-keys/noxfile.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
import nox
66

77
paths = sn(root=Path(__file__).parent)
8-
sys.path.insert(0, str(paths.root / 'src'))
8+
sys.path.insert(0, str(paths.root / 'utils'))
99

10-
from remove_json_keys.lib import pkg # type: ignore
10+
from lib import toml # type: ignore
1111

1212
def session(func) : return nox.session(venv_backend='none')(func)
1313

14-
project = sn(dir=paths.root.name)
15-
project.name = project.dir.replace('-', '_')
14+
pkg = sn(dir=paths.root.name)
15+
pkg.name = pkg.dir.replace('-', '_')
1616

1717
# SESSIONS
1818

1919
@session
20-
def test(session) : session.run('py', '-m', project.name, *session.posargs, env={ 'PYTHONPATH': 'src' })
20+
def test(session) : session.run('py', '-m', pkg.name, *session.posargs, env={ 'PYTHONPATH': 'src' })
2121
@session
22-
def test_help(session) : session.run('py', '-m', project.name, '--help', *session.posargs, env={ 'PYTHONPATH': 'src' })
22+
def test_help(session) : session.run('py', '-m', pkg.name, '--help', *session.posargs, env={ 'PYTHONPATH': 'src' })
2323
@session
24-
def test_build(session) : session.run('pip', 'install', '-e', '.') ; session.run(project.dir, *session.posargs)
24+
def test_build(session) : session.run('pip', 'install', '-e', '.') ; session.run(pkg.dir, *session.posargs)
2525

2626
@session
27-
def debug(session) : session.run('py', '-m', project.name, '--debug', *session.posargs, env={ 'PYTHONPATH': 'src' })
27+
def debug(session) : session.run('py', '-m', pkg.name, '--debug', *session.posargs, env={ 'PYTHONPATH': 'src' })
2828

2929
@session
3030
def bump_patch(session) : session.run('py', 'utils/bump.py', '--patch', *session.posargs)
@@ -51,8 +51,8 @@ def clean(session) : session.run('py', 'utils/clean.py')
5151
# HELPERS
5252

5353
def push_bump(session):
54-
new_ver = pkg.get_ver()
54+
new_ver = toml.read('pyproject.toml')['project']['version']
5555
session.run('git', 'pull')
5656
session.run('git', 'add', '.')
57-
session.run('git', 'commit', '-m', f'Bumped {project.dir} versions to {new_ver}')
57+
session.run('git', 'commit', '-m', f'Bumped {pkg.dir} versions to {new_ver}')
5858
session.run('git', 'push')

‎remove-json-keys/pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ license-files = [
2020
dependencies = [
2121
"colorama>=0.4.6,<1.0.0 ; platform_system == 'Windows'",
2222
"json5>=0.9.0,<1.0.0",
23-
"tomli>=2.0.0,<3.0.0",
24-
"tomli-w>=0.1.0,<2.0.0",
2523
]
2624
requires-python = ">=3.6,<4.0"
2725
keywords = [
@@ -72,4 +70,6 @@ remove-json = "remove_json_keys.__main__:main"
7270
[project.optional-dependencies]
7371
dev = [
7472
"nox>=2026.2.9",
73+
"tomli>=2.0.0,<3.0.0",
74+
"tomli-w>=0.1.0,<2.0.0",
7575
]

‎remove-json-keys/src/remove_json_keys/lib/data/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from . import csv, file, json, sns, toml, url
1+
from . import csv, file, json, sns, url
22

3-
__all__ = ['csv', 'file', 'json', 'sns', 'toml', 'url']
3+
__all__ = ['csv', 'file', 'json', 'sns', 'url']

‎remove-json-keys/src/remove_json_keys/lib/pkg.py‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎remove-json-keys/utils/bump.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
from pathlib import Path
33
from types import SimpleNamespace as sn
44

5+
from lib import toml
6+
57
paths = sn(root=Path(__file__).parent.parent)
68
paths.pyproject = paths.root / 'pyproject.toml'
7-
paths.readme = paths.root / 'docs/README.md'
8-
paths.msgs = paths.root / 'utils/data/messages.json'
9+
paths.readme = paths.root / 'docs' / 'README.md'
10+
paths.msgs = paths.root / 'utils' / 'data' / 'messages.json'
911
sys.path.insert(0, str(paths.root / 'src'))
1012

1113
from remove_json_keys.lib import data, log # type: ignore
@@ -33,7 +35,7 @@ def bump_pyproject_vers(pyproject, project, new_ver):
3335

3436
# Bump project.version
3537
pyproject['project']['version'] = new_ver
36-
data.toml.write(paths.pyproject, pyproject)
38+
toml.write(paths.pyproject, pyproject)
3739
log.success(msgs.log_BUMPED_PROJECT_VER.format(prev_ver=project.version, **locals()))
3840

3941
# Bump project.urls['Releases']
@@ -42,7 +44,7 @@ def bump_pyproject_vers(pyproject, project, new_ver):
4244
log.data(f'{msgs.log_GENERATED_CLOG_URL}: {changelog_url}')
4345
log.info(f'{msgs.log_UPDATING_CLOG_URL_IN} pyproject.toml...')
4446
pyproject['project']['urls']['Changelog'] = changelog_url
45-
data.toml.write(paths.pyproject, pyproject)
47+
toml.write(paths.pyproject, pyproject)
4648
log.success(msgs.log_BUMPED_CLOG_URL_VER_TAG.format(**locals()))
4749

4850
def update_readme_vers(new_ver):
@@ -62,7 +64,7 @@ def main():
6264

6365
# Init project data
6466
log.info(f'{msgs.log_LOADING_PYPROJECT.format(pyproject_path=paths.pyproject)}...')
65-
pyproject = data.toml.read(paths.pyproject)
67+
pyproject = toml.read(paths.pyproject)
6668
project = sn(**pyproject['project'])
6769

6870
# Update files

remove-json-keys/src/remove_json_keys/lib/data/toml.py renamed to remove-json-keys/utils/lib/toml.py

File renamed without changes.

‎translate-messages/noxfile.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
import nox
66

77
paths = sn(root=Path(__file__).parent)
8-
sys.path.insert(0, str(paths.root / 'src'))
8+
sys.path.insert(0, str(paths.root / 'utils'))
99

10-
from translate_messages.lib import pkg # type: ignore
10+
from lib import toml # type: ignore
1111

1212
def session(func) : return nox.session(venv_backend='none')(func)
1313

14-
project = sn(dir=paths.root.name)
15-
project.name = project.dir.replace('-', '_')
14+
pkg = sn(dir=paths.root.name)
15+
pkg.name = pkg.dir.replace('-', '_')
1616

1717
# SESSIONS
1818

1919
@session
20-
def test(session) : session.run('py', '-m', project.name, *session.posargs, env={ 'PYTHONPATH': 'src' })
20+
def test(session) : session.run('py', '-m', pkg.name, *session.posargs, env={ 'PYTHONPATH': 'src' })
2121
@session
22-
def test_help(session) : session.run('py', '-m', project.name, '--help', *session.posargs, env={ 'PYTHONPATH': 'src' })
22+
def test_help(session) : session.run('py', '-m', pkg.name, '--help', *session.posargs, env={ 'PYTHONPATH': 'src' })
2323
@session
24-
def test_build(session) : session.run('pip', 'install', '-e', '.') ; session.run(project.dir, *session.posargs)
24+
def test_build(session) : session.run('pip', 'install', '-e', '.') ; session.run(pkg.dir, *session.posargs)
2525

2626
@session
27-
def debug(session) : session.run('py', '-m', project.name, '--debug', *session.posargs, env={ 'PYTHONPATH': 'src' })
27+
def debug(session) : session.run('py', '-m', pkg.name, '--debug', *session.posargs, env={ 'PYTHONPATH': 'src' })
2828

2929
@session
3030
def bump_patch(session) : session.run('py', 'utils/bump.py', '--patch', *session.posargs)
@@ -51,8 +51,8 @@ def clean(session) : session.run('py', 'utils/clean.py')
5151
# HELPERS
5252

5353
def push_bump(session):
54-
new_ver = pkg.get_ver()
54+
new_ver = toml.read('pyproject.toml')['project']['version']
5555
session.run('git', 'pull')
5656
session.run('git', 'add', '.')
57-
session.run('git', 'commit', '-m', f'Bumped {project.dir} versions to {new_ver}')
57+
session.run('git', 'commit', '-m', f'Bumped {pkg.dir} versions to {new_ver}')
5858
session.run('git', 'push')

‎translate-messages/pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ license-files = [
2020
dependencies = [
2121
"colorama>=0.4.6,<1.0.0 ; platform_system == 'Windows'",
2222
"json5>=0.9.0,<1.0.0",
23-
"tomli>=2.0.0,<3.0.0",
24-
"tomli-w>=0.1.0,<2.0.0",
2523
"translate>=3.8.0,<4.0.0",
2624
]
2725
requires-python = ">=3.6,<4.0"
@@ -84,4 +82,6 @@ translate-messages = "translate_messages.__main__:main"
8482
[project.optional-dependencies]
8583
dev = [
8684
"nox>=2026.2.9",
85+
"tomli>=2.0.0,<3.0.0",
86+
"tomli-w>=0.1.0,<2.0.0",
8787
]

‎translate-messages/src/translate_messages/lib/data/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from . import csv, file, json, sns, toml, url
1+
from . import csv, file, json, sns, url
22

3-
__all__ = ['csv', 'file', 'json', 'sns', 'toml', 'url']
3+
__all__ = ['csv', 'file', 'json', 'sns', 'url']

‎translate-messages/src/translate_messages/lib/pkg.py‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)