omdev 0.0.0.dev217__py3-none-any.whl → 0.0.0.dev219__py3-none-any.whl

omdev/amalg/gen.py

@@ -126,7 +126,10 @@ class AmalgGenerator:
             dct[('base64', None, None)] = ['import base64\n']
         for imp in gl_imps:
             dct.setdefault((imp.mod, imp.item, imp.as_), []).append(imp)
-        for _, l in sorted(dct.items()):
+        for _, l in sorted(
+                dct.items(),
+                key=lambda t: (t[0][0], t[0][1] or '', t[0][2] or ''),
+        ):
             il = l[0]
             out.write(il if isinstance(il, str) else tks.join_toks(il.toks))
         if dct:

omdev/imgur.py

@@ -30,7 +30,7 @@ from omlish import check
 from omlish import marshal as msh
 from omlish.formats import json
 from omlish.http import all as hu
-from omlish.secrets import Secret
+from omlish.secrets.secrets import Secret
 
 from .cli import CliModule
 from .secrets import load_secrets

omdev/secrets.py

@@ -2,7 +2,7 @@ import os.path
 import typing as ta
 
 from omlish import lang
-from omlish import secrets as sec
+from omlish.secrets import all as sec
 
 
 if ta.TYPE_CHECKING:

{omdev-0.0.0.dev217.dist-info → omdev-0.0.0.dev219.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev217
+Version: 0.0.0.dev219
 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.dev217
+Requires-Dist: omlish==0.0.0.dev219
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev217.dist-info → omdev-0.0.0.dev219.dist-info}/RECORD

@@ -5,15 +5,15 @@ omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
-omdev/imgur.py,sha256=PNRrA440WP10DGm2bpXhisZdA4ODYCpOj1HqEzNx0Fs,2992
+omdev/imgur.py,sha256=h38w1a1hFYAysfmD4uYXZo1yMj0NKzWgdQmedVSHnTc,3000
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=0feRWC0Uttd6K9cCImAHEXoo6-Nuso3tpaHUuhzBlRQ,4985
-omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
+omdev/secrets.py,sha256=aC1o2vJtdLpa_MJoO2P2wty1pfqgAPytj54CamLLFWw,544
 omdev/tagstrings.py,sha256=hrinoRmYCFMt4WYCZAYrocVYKQvIApNGKbJaGz8whqs,5334
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=1sZH8SLAueWxMxK9ngvndUW3L_rw7f-s_jK3ZP1yAH8,170
-omdev/amalg/gen.py,sha256=auSK_NakPiEW-8pLr0JnE6hg995zOmQZaAJh38v1o5Q,5969
+omdev/amalg/gen.py,sha256=q8JyevSMTdcpRJI_Qj4VFSdMT30wzbZvBKe1cgTrmJo,6067
 omdev/amalg/imports.py,sha256=me-I_FOD5874NVebZGt_wlc9kxEpuZV-XGuifbNkgNk,2073
 omdev/amalg/main.py,sha256=CNkpAMVXlBoaCmgs68rKSUlL8Xh4AuNdZjSFZPeao_4,4313
 omdev/amalg/manifests.py,sha256=CGwh-DiOU4ZKv0p_uUvdpBl2H72g468kvBHtguOHGMA,902
@@ -211,9 +211,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev217.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev217.dist-info/METADATA,sha256=lNWmIe7pfG4nlRGuyYkGYlDR5GbC5JBbwrLMiHFIfNk,1638
-omdev-0.0.0.dev217.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev217.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev217.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev217.dist-info/RECORD,,
+omdev-0.0.0.dev219.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev219.dist-info/METADATA,sha256=w0oUVhcyu8YBtByh1dn5yc-ELWQeR0PkSvNgXiiwupE,1638
+omdev-0.0.0.dev219.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev219.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev219.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev219.dist-info/RECORD,,