omdev 0.0.0.dev32__tar.gz → 0.0.0.dev34__tar.gz

{omdev-0.0.0.dev32/omdev.egg-info → omdev-0.0.0.dev34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev32
+Version: 0.0.0.dev34
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev32
+Requires-Dist: omlish==0.0.0.dev34
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/.manifests.json

@@ -1,121 +1,121 @@
 [
   {
-    "module": ".classdot",
+    "module": ".amalg.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/classdot.py",
-    "line": 62,
+    "file": "omdev/amalg/__main__.py",
+    "line": 4,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "classdot",
-        "mod_name": "omdev.classdot"
+        "cmd_name": "amalg",
+        "mod_name": "omdev.amalg.__main__"
       }
     }
   },
   {
-    "module": ".tools.piptools",
+    "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/piptools.py",
-    "line": 51,
+    "file": "omdev/cexts/cmake.py",
+    "line": 323,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "pip",
-        "mod_name": "omdev.tools.piptools"
+        "cmd_name": "cmake",
+        "mod_name": "omdev.cexts.cmake"
       }
     }
   },
   {
-    "module": ".tools.gittools",
+    "module": ".classdot",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/gittools.py",
-    "line": 22,
+    "file": "omdev/classdot.py",
+    "line": 62,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "git",
-        "mod_name": "omdev.tools.gittools"
+        "cmd_name": "classdot",
+        "mod_name": "omdev.classdot"
       }
     }
   },
   {
-    "module": ".tools.dockertools",
+    "module": ".interp.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/dockertools.py",
-    "line": 183,
+    "file": "omdev/interp/__main__.py",
+    "line": 4,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "docker",
-        "mod_name": "omdev.tools.dockertools"
+        "cmd_name": "interp",
+        "mod_name": "omdev.interp.__main__"
       }
     }
   },
   {
-    "module": ".tools.sqlrepl",
+    "module": ".precheck.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/sqlrepl.py",
-    "line": 193,
+    "file": "omdev/precheck/__main__.py",
+    "line": 4,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "sqlrepl",
-        "mod_name": "omdev.tools.sqlrepl"
+        "cmd_name": "precheck",
+        "mod_name": "omdev.precheck.__main__"
       }
     }
   },
   {
-    "module": ".interp.__main__",
+    "module": ".pyproject.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/interp/__main__.py",
+    "file": "omdev/pyproject/__main__.py",
     "line": 4,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "interp",
-        "mod_name": "omdev.interp.__main__"
+        "cmd_name": "pyproject",
+        "mod_name": "omdev.pyproject.__main__"
       }
     }
   },
   {
-    "module": ".pyproject.__main__",
+    "module": ".tools.dockertools",
     "attr": "_CLI_MODULE",
-    "file": "omdev/pyproject/__main__.py",
-    "line": 4,
+    "file": "omdev/tools/dockertools.py",
+    "line": 183,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "pyproject",
-        "mod_name": "omdev.pyproject.__main__"
+        "cmd_name": "docker",
+        "mod_name": "omdev.tools.dockertools"
       }
     }
   },
   {
-    "module": ".cexts.cmake",
+    "module": ".tools.gittools",
     "attr": "_CLI_MODULE",
-    "file": "omdev/cexts/cmake.py",
-    "line": 323,
+    "file": "omdev/tools/gittools.py",
+    "line": 22,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "cmake",
-        "mod_name": "omdev.cexts.cmake"
+        "cmd_name": "git",
+        "mod_name": "omdev.tools.gittools"
       }
     }
   },
   {
-    "module": ".precheck.precheck",
+    "module": ".tools.piptools",
     "attr": "_CLI_MODULE",
-    "file": "omdev/precheck/precheck.py",
-    "line": 90,
+    "file": "omdev/tools/piptools.py",
+    "line": 51,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "precheck",
-        "mod_name": "omdev.precheck.precheck"
+        "cmd_name": "pip",
+        "mod_name": "omdev.tools.piptools"
       }
     }
   },
   {
-    "module": ".amalg.__main__",
+    "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",
-    "file": "omdev/amalg/__main__.py",
-    "line": 4,
+    "file": "omdev/tools/sqlrepl.py",
+    "line": 193,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "amalg",
-        "mod_name": "omdev.amalg.__main__"
+        "cmd_name": "sqlrepl",
+        "mod_name": "omdev.tools.sqlrepl"
       }
     }
   }

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/__about__.py

@@ -39,10 +39,9 @@ class Project(ProjectBase):
         'omlish.manifests': {name: name},
     }
 
-    # FIXME: omdev-cli ?
-    # scripts = {
-    #     'om': f'{name}.cli.main:_main [cli]',
-    # }
+    cli_scripts = {
+        'om': f'{name}.cli.main:_main',
+    }
 
 
 class Setuptools(SetuptoolsBase):

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/cache/data/actions.py

@@ -38,11 +38,8 @@ class ExtractAction(Action, lang.Final):
 ##
 
 
-@lang.cached_function
+@lang.static_init
 def _install_standard_marshalling() -> None:
     actions_poly = msh.polymorphism_from_subclasses(Action, naming=msh.Naming.SNAKE, strip_suffix=True)
     msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(actions_poly)]
     msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(actions_poly)]
-
-
-_install_standard_marshalling()

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/cache/data/specs.py

@@ -86,11 +86,8 @@ class GithubContentSpec(Spec):
 ##
 
 
-@lang.cached_function
+@lang.static_init
 def _install_standard_marshalling() -> None:
     specs_poly = msh.polymorphism_from_subclasses(Spec, naming=msh.Naming.SNAKE, strip_suffix=True)
     msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(specs_poly)]
     msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(specs_poly)]
-
-
-_install_standard_marshalling()

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/manifests/build.py

@@ -1,6 +1,6 @@
 """
 TODO:
- - relative keys - if startswith self pkg then `$.foo.bar`
+ - separate build from cli
 
 - See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -205,11 +205,11 @@ def build_package_manifests(
 
     manifests: ta.List[Manifest] = []
 
-    for file in findmagic.find_magic(
+    for file in sorted(findmagic.find_magic(
             [pkg_dir],
             [MANIFEST_MAGIC],
             ['py'],
-    ):
+    )):
         manifests.extend(build_module_manifests(os.path.relpath(file, base), base))
 
     if write:

omdev-0.0.0.dev34/omdev/precheck/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('precheck', __name__)
+
+
+if __name__ == '__main__':
+    from .precheck import _main
+
+    _main()

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/precheck/precheck.py

@@ -27,7 +27,6 @@ import typing as ta
 
 from omlish import logs
 
-from ..cli import CliModule
 from .base import Precheck
 from .base import PrecheckContext
 from .git import GitBlacklistPrecheck
@@ -87,10 +86,6 @@ def _build_parser() -> argparse.ArgumentParser:
     return parser
 
 
-# @omlish-manifest
-_CLI_MODULE = CliModule('precheck', __name__)
-
-
 def _main(argv: ta.Sequence[str] | None = None) -> None:
     logs.configure_standard_logging('INFO')
 

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/pyproject/pkg.py

@@ -301,6 +301,8 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         if (scs := prj.pop('scripts', None)):
             pyp_dct['project.scripts'] = scs
 
+        prj.pop('cli_scripts', None)
+
         ##
 
         st = dict(specs.setuptools)
@@ -385,6 +387,13 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 pkg_suffix='-cext',
             ).gen(opts)
 
+        if self.build_specs().pyproject.get('cli_scripts'):
+            _PyprojectCliPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-cli',
+            ).gen(opts)
+
         return ret
 
 
@@ -430,6 +439,7 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             'optional_dependencies',
             'entry_points',
             'scripts',
+            'cli_scripts',
         ]:
             prj.pop(k, None)
 
@@ -494,3 +504,73 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
         with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
             f.write(fc.setup_py)
+
+
+##
+
+
+class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+
+    @cached_nullary
+    def file_contents(self) -> FileContents:
+        specs = self.build_specs()
+
+        #
+
+        pyp_dct = {}
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        prj = specs.pyproject
+        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
+        prj['name'] += self._pkg_suffix
+        for k in [
+            'optional_dependencies',
+            'entry_points',
+            'scripts',
+        ]:
+            prj.pop(k, None)
+
+        pyp_dct['project'] = prj
+
+        if (scs := prj.pop('cli_scripts', None)):
+            pyp_dct['project.scripts'] = scs
+
+        #
+
+        st = dict(specs.setuptools)
+        pyp_dct['tool.setuptools'] = st
+
+        for k in [
+            'cexts',
+
+            'find_packages',
+            'package_data',
+            'manifest_in',
+        ]:
+            st.pop(k, None)
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+        )
+
+    def _write_file_contents(self) -> None:
+        fc = self.file_contents()
+
+        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+            TomlWriter(f).write_root(fc.pyproject_dct)

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev/scripts/pyproject.py

@@ -3989,6 +3989,8 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         if (scs := prj.pop('scripts', None)):
             pyp_dct['project.scripts'] = scs
 
+        prj.pop('cli_scripts', None)
+
         ##
 
         st = dict(specs.setuptools)
@@ -4073,6 +4075,13 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 pkg_suffix='-cext',
             ).gen(opts)
 
+        if self.build_specs().pyproject.get('cli_scripts'):
+            _PyprojectCliPackageGenerator(
+                self._dir_name,
+                self._pkgs_root,
+                pkg_suffix='-cli',
+            ).gen(opts)
+
         return ret
 
 
@@ -4118,6 +4127,7 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             'optional_dependencies',
             'entry_points',
             'scripts',
+            'cli_scripts',
         ]:
             prj.pop(k, None)
 
@@ -4184,6 +4194,76 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
             f.write(fc.setup_py)
 
 
+##
+
+
+class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class FileContents:
+        pyproject_dct: ta.Mapping[str, ta.Any]
+
+    @cached_nullary
+    def file_contents(self) -> FileContents:
+        specs = self.build_specs()
+
+        #
+
+        pyp_dct = {}
+
+        pyp_dct['build-system'] = {
+            'requires': ['setuptools'],
+            'build-backend': 'setuptools.build_meta',
+        }
+
+        prj = specs.pyproject
+        prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
+        prj['name'] += self._pkg_suffix
+        for k in [
+            'optional_dependencies',
+            'entry_points',
+            'scripts',
+        ]:
+            prj.pop(k, None)
+
+        pyp_dct['project'] = prj
+
+        if (scs := prj.pop('cli_scripts', None)):
+            pyp_dct['project.scripts'] = scs
+
+        #
+
+        st = dict(specs.setuptools)
+        pyp_dct['tool.setuptools'] = st
+
+        for k in [
+            'cexts',
+
+            'find_packages',
+            'package_data',
+            'manifest_in',
+        ]:
+            st.pop(k, None)
+
+        pyp_dct['tool.setuptools.packages.find'] = {
+            'include': [],
+        }
+
+        #
+
+        return self.FileContents(
+            pyp_dct,
+        )
+
+    def _write_file_contents(self) -> None:
+        fc = self.file_contents()
+
+        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+            TomlWriter(f).write_root(fc.pyproject_dct)
+
+
 ########################################
 # ../../interp/providers.py
 """

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev32
+Version: 0.0.0.dev34
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev32
+Requires-Dist: omlish==0.0.0.dev34
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev32
+omlish==0.0.0.dev34
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev32 → omdev-0.0.0.dev34}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev32'
+version = '0.0.0.dev34'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev32',
+    'omlish == 0.0.0.dev34',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev32/omdev/precheck/__main__.py

@@ -1,4 +0,0 @@
-if __name__ == '__main__':
-    from .precheck import _main
-
-    _main()