omdev 0.0.0.dev68__tar.gz → 0.0.0.dev69__tar.gz

{omdev-0.0.0.dev68/omdev.egg-info → omdev-0.0.0.dev69}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev68
+Version: 0.0.0.dev69
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev68
+Requires-Dist: omlish==0.0.0.dev69
 Provides-Extra: all
+Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -21,6 +22,8 @@ Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: mypy~=1.11; extra == "all"
 Requires-Dist: tokenize_rt~=6.0; extra == "all"
 Requires-Dist: wheel~=0.44; extra == "all"
+Provides-Extra: black
+Requires-Dist: black~=24.10; extra == "black"
 Provides-Extra: c
 Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: cffi~=1.17; extra == "c"

{omdev-0.0.0.dev68 → omdev-0.0.0.dev69}/omdev/.manifests.json

@@ -171,7 +171,7 @@
     "module": ".tools.nbtools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/nbtools.py",
-    "line": 44,
+    "line": 115,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": [

{omdev-0.0.0.dev68 → omdev-0.0.0.dev69}/omdev/__about__.py

@@ -12,6 +12,10 @@ class Project(ProjectBase):
     ]
 
     optional_dependencies = {
+        'black': [
+            'black ~= 24.10',
+        ],
+
         'c': [
             'pycparser ~= 2.22',
             'cffi ~= 1.17',

omdev-0.0.0.dev69/omdev/tools/nbtools.py

@@ -0,0 +1,120 @@
+import io
+import json
+import os.path
+import subprocess
+import sys
+import urllib.parse
+import urllib.request
+
+from omlish import argparse as ap
+from omlish import check
+
+from ..cli import CliModule
+
+
+class Cli(ap.Cli):
+    @ap.command(
+        ap.arg('file'),
+        ap.arg('-w', '--write', action='store_true'),
+        ap.arg('-o', '--overwrite', action='store_true'),
+        ap.arg('--no-header', action='store_true'),
+        ap.arg('--keep-bangs', action='store_true'),
+        ap.arg('--black', action='store_true'),
+    )
+    def strip_code(self) -> None:
+        out_file: str | None = None
+        out_header: list[str] = []
+
+        if ':' in self.args.file:
+            url = self.args.file
+            pu = urllib.parse.urlparse(url)
+            check.equal(pu.scheme, 'https')
+
+            out_header.append(f'# Origin: {url}')
+
+            if pu.hostname == 'github.com':
+                _, user, repo, blob, *rest = pu.path.split('/')
+                check.equal(blob, 'blob')
+                url = f'https://raw.githubusercontent.com/{user}/{repo}/refs/heads/{"/".join(rest)}'
+
+            elif pu.hostname == 'raw.githubusercontent.com':
+                pass
+
+            else:
+                raise ValueError(pu.hostname)
+
+            file = pu.path.split('/')[-1]
+            check.state(file.endswith('.ipynb'))
+
+            if self.args.write:
+                out_file = file.rpartition('.')[0] + '.py'
+
+            with urllib.request.urlopen(url) as resp:  # noqa
+                buf = resp.read()
+
+            dct = json.loads(buf.decode('utf-8'))
+
+        elif self.args.file == '-':
+            if self.args.write:
+                raise Exception('Write not supported with stdin')
+
+            dct = json.load(sys.stdin)
+
+        else:
+            with open(self.args.file) as f:
+                dct = json.load(f)
+
+            if self.args.write:
+                out_file = self.args.file.rpartition('.')[0] + '.py'
+
+        if out_file is not None and os.path.isfile(out_file) and not self.args.overwrite:
+            raise OSError(f'File exists: {out_file}')
+
+        delim = '\n##\n\n'
+
+        out = io.StringIO()
+        if not self.args.no_header and out_header:
+            out.write('\n'.join(out_header))
+            out.write(delim)
+
+        code_cells = [c for c in dct['cells'] if c['cell_type'] == 'code']
+        for i, c in enumerate(code_cells):
+            if i:
+                out.write(delim)
+
+            src = ''.join(c['source'])
+            if not self.args.keep_bangs:
+                src = ''.join(
+                    ('# ' + l) if l.startswith('!') else l
+                    for l in src.splitlines(keepends=True)
+                )
+
+            out.write(src)
+            out.write('\n')
+
+        out_src = out.getvalue()
+
+        if self.args.black:
+            proc = subprocess.run(
+                [sys.executable, '-m', 'black', '-'],
+                input=out_src.encode('utf-8'),
+                stdout=subprocess.PIPE,
+                check=True,
+            )
+            out_src = proc.stdout.decode('utf-8')
+
+        if out_file is not None:
+            with open(out_file, 'w') as f:
+                f.write(out_src)
+            print(f'Wrote {out_file}')
+
+        else:
+            sys.stdout.write(out_src)
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule(['notebook', 'nb'], __name__)
+
+
+if __name__ == '__main__':
+    Cli()()

{omdev-0.0.0.dev68 → omdev-0.0.0.dev69/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev68
+Version: 0.0.0.dev69
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,9 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev68
+Requires-Dist: omlish==0.0.0.dev69
 Provides-Extra: all
+Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -21,6 +22,8 @@ Requires-Dist: docutils~=0.21; extra == "all"
 Requires-Dist: mypy~=1.11; extra == "all"
 Requires-Dist: tokenize_rt~=6.0; extra == "all"
 Requires-Dist: wheel~=0.44; extra == "all"
+Provides-Extra: black
+Requires-Dist: black~=24.10; extra == "black"
 Provides-Extra: c
 Requires-Dist: pycparser~=2.22; extra == "c"
 Requires-Dist: cffi~=1.17; extra == "c"

{omdev-0.0.0.dev68 → omdev-0.0.0.dev69}/omdev.egg-info/requires.txt

@@ -1,6 +1,7 @@
-omlish==0.0.0.dev68
+omlish==0.0.0.dev69
 
 [all]
+black~=24.10
 pycparser~=2.22
 cffi~=1.17
 pcpp~=1.30
@@ -9,6 +10,9 @@ mypy~=1.11
 tokenize_rt~=6.0
 wheel~=0.44
 
+[black]
+black~=24.10
+
 [c]
 pycparser~=2.22
 cffi~=1.17

{omdev-0.0.0.dev68 → omdev-0.0.0.dev69}/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.dev68'
+version = '0.0.0.dev69'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,11 +22,12 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev68',
+    'omlish == 0.0.0.dev69',
 ]
 
 [project.optional-dependencies]
 all = [
+    'black ~= 24.10',
     'pycparser ~= 2.22',
     'cffi ~= 1.17',
     'pcpp ~= 1.30',
@@ -35,6 +36,9 @@ all = [
     'tokenize_rt ~= 6.0',
     'wheel ~= 0.44',
 ]
+black = [
+    'black ~= 24.10',
+]
 c = [
     'pycparser ~= 2.22',
     'cffi ~= 1.17',

omdev-0.0.0.dev68/omdev/tools/nbtools.py

@@ -1,49 +0,0 @@
-import io
-import json
-import os.path
-import sys
-
-from omlish import argparse as ap
-
-from ..cli import CliModule
-
-
-class Cli(ap.Cli):
-    @ap.command(
-        ap.arg('file'),
-        ap.arg('-w', '--write', action='store_true'),
-        ap.arg('-o', '--overwrite', action='store_true'),
-    )
-    def code(self) -> None:
-        if self.args.write:
-            out_file = self.args.file.rpartition('.')[0] + '.py'
-            if os.path.isfile(out_file) and not self.args.overwrite:
-                raise OSError(f'File exists: {out_file}')
-        else:
-            out_file = None
-
-        with open(self.args.file) as f:
-            dct = json.load(f)
-
-        out = io.StringIO()
-        code_cells = [c for c in dct['cells'] if c['cell_type'] == 'code']
-        for i, c in enumerate(code_cells):
-            if i:
-                out.write('\n##\n\n')
-            out.write(''.join(c['source']))
-            out.write('\n')
-
-        if out_file is not None:
-            with open(out_file, 'w') as f:
-                f.write(out.getvalue())
-            print(f'Wrote {out_file}')
-        else:
-            sys.stdout.write(out.getvalue())
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule(['notebook', 'nb'], __name__)
-
-
-if __name__ == '__main__':
-    Cli()()