omdev 0.0.0.dev32__py3-none-any.whl → 0.0.0.dev33__py3-none-any.whl

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.precheck",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/sqlrepl.py",
-    "line": 193,
+    "file": "omdev/precheck/precheck.py",
+    "line": 90,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "sqlrepl",
-        "mod_name": "omdev.tools.sqlrepl"
+        "cmd_name": "precheck",
+        "mod_name": "omdev.precheck.precheck"
       }
     }
   },
   {
-    "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/__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/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/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/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.dist-info → omdev-0.0.0.dev33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev32
+Version: 0.0.0.dev33
 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.dev33
 Provides-Extra: all
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
 Requires-Dist: cffi ~=1.17 ; extra == 'all'

{omdev-0.0.0.dev32.dist-info → omdev-0.0.0.dev33.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omdev/.manifests.json,sha256=uWqRwRlD4qALke0LvCnuVOYpDsiXEiiK3gWiMyTUjG8,2596
-omdev/__about__.py,sha256=aopfqA_z5OUJ5yDq9cZ89zt7_8Jrsys3mTi1Bgkjpl4,1038
+omdev/.manifests.json,sha256=wj37gX22lyU9HrbsBNcHY7eY7PIMBsKRq7SC2tae97k,2596
+omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
 omdev/classdot.py,sha256=K0YMTngaC6uuEKhDb95tFzW33Re_YEdgIWBBeze4PTI,1628
@@ -68,7 +68,7 @@ omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,77
 omdev/interp/system.py,sha256=UFHfMR0CHCEnNx5fhrze8esAwigpRrJUA33ftq6nA0I,3514
 omdev/interp/types.py,sha256=2nM3MJaOU8O1XA8DrvwyOjBWSboBn16kgFIy5JVkDck,2440
 omdev/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omdev/manifests/build.py,sha256=Jmp3hQqezisxBSuj5761tNrYEw8XvAhjhaAgHJ8qzEQ,9071
+omdev/manifests/build.py,sha256=m5PleX03pDxG4Pl2PtNKWsuZVxrNPBxPZ3Gkh6qlrEQ,9047
 omdev/manifests/load.py,sha256=1QznPL4zNlu1eIFkoGrO78coIQCk9LlMC8FJ6PcvhNM,4373
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -85,13 +85,13 @@ omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,1
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
 omdev/pyproject/cli.py,sha256=hE2bjfXmJy1xnadSyIcFjF3kYYTqNK4Y5dqTjnMtjVs,10909
 omdev/pyproject/configs.py,sha256=K9H5cGwVLgHi8wKwtYvlXHZ9ThtmnI4jo8JAb-t1-70,2859
-omdev/pyproject/pkg.py,sha256=G6S6iIYBXc640qLgSPdIxYg75wC3Pr2vVnVdnCrOxx4,12949
+omdev/pyproject/pkg.py,sha256=-8meXIJSVkXrDJDsqEcdJ05bssAnTlLp2Y7bElcxI-g,14753
 omdev/pyproject/reqs.py,sha256=jgDH_nmOkcgxKshbeFt-byPAuGfwoxHuyzaolGu-lms,2299
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
 omdev/scripts/execrss.py,sha256=HzDNmwXOO8fMwIRXw9q8CUnVfLFCQASyU2tfY_y2Vf8,324
 omdev/scripts/interp.py,sha256=nSXgULEj1gXCT0zM4cfgK0LV_CcazWSN6xH3pX9uYGY,70845
-omdev/scripts/pyproject.py,sha256=CLf0NciY_R5N5iKbgt-JGpFiSSBEVYrZgXSDmwWTyJ0,155172
+omdev/scripts/pyproject.py,sha256=h8qbqvHywoZtpcIcm549XiRoxMm9j8qrWOK8fUb-Djs,156976
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
@@ -106,9 +106,9 @@ omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/versioning/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/versioning/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/versioning/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
-omdev-0.0.0.dev32.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev32.dist-info/METADATA,sha256=kc1thCr-dn6QQKdpT28XJPd1t6kvW2PIvNxRd36gSiU,1252
-omdev-0.0.0.dev32.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev32.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev32.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev32.dist-info/RECORD,,
+omdev-0.0.0.dev33.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev33.dist-info/METADATA,sha256=AstTXi__Uh-euxlhHRQCTcQdsMrmqRQ1C9EPWgSQT6g,1252
+omdev-0.0.0.dev33.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev33.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev33.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev33.dist-info/RECORD,,