omdev 0.0.0.dev9__py3-none-any.whl → 0.0.0.dev10__py3-none-any.whl

omdev/pyproject/cli.py

@@ -294,7 +294,10 @@ def _pkg_cmd(args) -> None:
     run = Run()
 
     cmd = args.cmd
-    if cmd == 'gen':
+    if not cmd:
+        raise Exception('must specify command')
+
+    elif cmd == 'gen':
         build_root = os.path.join('.pkg')
 
         if os.path.exists(build_root):

omdev/pyproject/pkg.py

@@ -115,6 +115,8 @@ class PyprojectPackageGenerator:
     def file_contents(self) -> FileContents:
         pyp_dct = {}
 
+        #
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
@@ -122,14 +124,29 @@ class PyprojectPackageGenerator:
 
         prj = self._build_cls_dct(self.project_cls())
         pyp_dct['project'] = prj
-        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, 'project.optional-dependencies')
+
+        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
+        if (extras := pyp_dct.get(extrask)):
+            pyp_dct[extrask] = {
+                'all': [
+                    e
+                    for lst in extras.values()
+                    for e in lst
+                ],
+                **extras,
+            }
+
+        #
 
         st = self._build_cls_dct(self.setuptools_cls())
         pyp_dct['tool.setuptools'] = st
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
 
+        #
+
         return self.FileContents(
             pyp_dct,
             mani_in,

omdev/scripts/pyproject.py

@@ -2813,6 +2813,8 @@ class PyprojectPackageGenerator:
     def file_contents(self) -> FileContents:
         pyp_dct = {}
 
+        #
+
         pyp_dct['build-system'] = {
             'requires': ['setuptools'],
             'build-backend': 'setuptools.build_meta',
@@ -2820,14 +2822,29 @@ class PyprojectPackageGenerator:
 
         prj = self._build_cls_dct(self.project_cls())
         pyp_dct['project'] = prj
-        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, 'project.optional-dependencies')
+
+        self._move_dict_key(prj, 'optional_dependencies', pyp_dct, extrask := 'project.optional-dependencies')
+        if (extras := pyp_dct.get(extrask)):
+            pyp_dct[extrask] = {
+                'all': [
+                    e
+                    for lst in extras.values()
+                    for e in lst
+                ],
+                **extras,
+            }
+
+        #
 
         st = self._build_cls_dct(self.setuptools_cls())
         pyp_dct['tool.setuptools'] = st
+
         self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
 
         mani_in = st.pop('manifest_in', None)
 
+        #
+
         return self.FileContents(
             pyp_dct,
             mani_in,
@@ -3925,7 +3942,10 @@ def _pkg_cmd(args) -> None:
     run = Run()
 
     cmd = args.cmd
-    if cmd == 'gen':
+    if not cmd:
+        raise Exception('must specify command')
+
+    elif cmd == 'gen':
         build_root = os.path.join('.pkg')
 
         if os.path.exists(build_root):

{omdev-0.0.0.dev9.dist-info → omdev-0.0.0.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev9
+Version: 0.0.0.dev10
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,13 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev9
+Requires-Dist: omlish ==0.0.0.dev10
+Provides-Extra: all
+Requires-Dist: pycparser >=2.22 ; extra == 'all'
+Requires-Dist: cffi >=1.17 ; extra == 'all'
+Requires-Dist: pcpp >=1.30 ; extra == 'all'
+Requires-Dist: mypy >=1.11 ; extra == 'all'
+Requires-Dist: tokenize-rt >=6 ; extra == 'all'
 Provides-Extra: c
 Requires-Dist: pycparser >=2.22 ; extra == 'c'
 Requires-Dist: cffi >=1.17 ; extra == 'c'

{omdev-0.0.0.dev9.dist-info → omdev-0.0.0.dev10.dist-info}/RECORD

@@ -40,16 +40,16 @@ omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gFhR9DikwDZk0LqgdR3qq_aXQHThUOPllDmHDOfnFAU,67
-omdev/pyproject/cli.py,sha256=0GM0YuA9k-Bdq2A2EKAToqoxnkGclZwpjXQAkzWLRgU,9556
+omdev/pyproject/cli.py,sha256=1l_TYe1iUW4L9HKX3R7_9iroOmAWBJK4LDz19-U-Oio,9623
 omdev/pyproject/configs.py,sha256=MFHnmpMjlwxw74-SyX1Q1qNQ4ptwTXEzDGkeUcGY0mA,2822
 omdev/pyproject/ext.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/pkg.py,sha256=cJppGN1nWC1LJKOoI3FjyhhB40Ig6H1LQBkiKTLpBYA,5380
+omdev/pyproject/pkg.py,sha256=HgRFK9euQ8gmWHpnPgZkGHjOrIus_NSjAznn8yEQvBA,5690
 omdev/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/scripts/execrss.py,sha256=wBpdhWuQj_4EnEmvK_aLQHxaE-J52G9F6g0210fTNe8,307
 omdev/scripts/findimports.py,sha256=d8Xf2TcE7hHh_lXUx2V1APF4Jggu2uO2K0ex6bfmqyQ,2030
 omdev/scripts/findmagic.py,sha256=W7W07YR3zsA0hNej6-BPgQj2hWX1UydrbWnNMRdMA88,1893
 omdev/scripts/interp.py,sha256=YdWMx34UTlT0QeSW0ya52cXAaqmuJZLtzyPnAe4pN3A,62828
-omdev/scripts/pyproject.py,sha256=x2I4xX7fyo4BzvDdxVZf6dyFkrBCQsFqp2X_E0-ssiY,118628
+omdev/scripts/pyproject.py,sha256=eFyhisJEsyGn42Goy8SMvJR33t5y3k_I0roE-XPVcvM,119005
 omdev/scripts/traceimport.py,sha256=JmUgLEQLY7r3QNQ14Agarqh5qtMyRNenCb_OF5EIikY,13392
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
@@ -60,8 +60,8 @@ omdev/tools/sqlrepl.py,sha256=v9uVQ4nvquSXcQVYIFq34ikumSILvKqzD6lUKLcncCE,5646
 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.dev9.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev9.dist-info/METADATA,sha256=LiR56stWGf5_3tCthvIV95RtXAZdhw4g7a41DGSFltY,757
-omdev-0.0.0.dev9.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-omdev-0.0.0.dev9.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev9.dist-info/RECORD,,
+omdev-0.0.0.dev10.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev10.dist-info/METADATA,sha256=SZdDMv8HGUMY9zf68gN9-WZqD-ZdraNJs1BgsCq2ByY,1008
+omdev-0.0.0.dev10.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+omdev-0.0.0.dev10.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev10.dist-info/RECORD,,