omdev 0.0.0.dev316__py3-none-any.whl → 0.0.0.dev318__py3-none-any.whl

omdev/.manifests.json

@@ -63,7 +63,7 @@
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
     "file": "omdev/imgur.py",
-    "line": 133,
+    "line": 136,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "imgur",

omdev/home/secrets.py

@@ -39,3 +39,52 @@ def load_secrets() -> sec.Secrets:
     except FileNotFoundError:
         pass
     return sec.MappingSecrets(dct)
+
+
+##
+
+
+def install_env_secrets(
+        *keys: str | tuple[str, str],
+        secrets: sec.Secrets | None = None,
+        environ: ta.MutableMapping[str, str] | None = None,
+        non_strict: bool = False,
+) -> None:
+    """This should not be used outside of being forced to interact with external code."""
+
+    if not keys:
+        raise ValueError('Must specify keys')
+
+    sk_ek_tups: list[tuple[str, str]] = []
+    for k in keys:
+        if isinstance(k, tuple):
+            sk, ek = k
+
+        elif isinstance(k, str):
+            if k.lower() == k:
+                sk, ek = k, k.upper()
+            elif k.upper() == k:
+                sk, ek = k.lower(), k
+            else:
+                raise ValueError(k)
+
+        else:
+            raise TypeError(k)
+
+        sk_ek_tups.append((sk, ek))
+
+    if secrets is None:
+        secrets = load_secrets()
+
+    if environ is None:
+        environ = os.environ
+
+    for sk, ek in sk_ek_tups:
+        try:
+            sv = secrets.get(sk)
+        except KeyError:
+            if non_strict:
+                continue
+            raise
+
+        environ[ek] = sv.reveal()

omdev/imgur.py

@@ -66,11 +66,14 @@ class ImageUploadData:
 
 
 @dc.dataclass(frozen=True)
+@msh.update_object_metadata(unknown_field='x')
 class ImageUploadResponse:
     status: int
     success: bool
     data: ImageUploadData
 
+    x: ta.Mapping[str, ta.Any] | None = None
+
 
 DEFAULT_UPLOAD_IMAGE_URL = 'https://api.imgur.com/3/upload'
 

omdev/scripts/ci.py

@@ -1303,9 +1303,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

omdev/scripts/interp.py

@@ -1245,9 +1245,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

omdev/scripts/pyproject.py

@@ -2661,9 +2661,11 @@ class _JustMaybe(_Maybe[T]):
     def __repr__(self) -> str:
         return f'just({self._v!r})'
 
+    _hash: int
+
     def __hash__(self) -> int:
         try:
-            return self._hash  # type: ignore[has-type]
+            return self._hash
         except AttributeError:
             pass
         h = self._hash = hash((_JustMaybe, self._v))

{omdev-0.0.0.dev316.dist-info → omdev-0.0.0.dev318.dist-info}/METADATA

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

{omdev-0.0.0.dev316.dist-info → omdev-0.0.0.dev318.dist-info}/RECORD

@@ -1,8 +1,8 @@
-omdev/.manifests.json,sha256=pEXT6FCnyLgdPT99HXjkC_wBlUTe-KbJHFmAiNUwiBo,11257
+omdev/.manifests.json,sha256=7rHwJQCTz0jmkxij_rlIAw0D1A38Rb3QqcmJNiRIhOM,11257
 omdev/__about__.py,sha256=16xa_1BdZanTpZbkjAOQ11_x5kJcb1m1tKdvb06J7VI,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
-omdev/imgur.py,sha256=TkjK_M4nDarEmbP-FhVkt_VzSY2jHkZnKGnhnZ1zJAs,3010
+omdev/imgur.py,sha256=4XolajBnAJ1U2zvT6Y0fiUyBi_a8G9arXffvPxf3w-M,3103
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=zIP7nzcsZf5te0lphu6k36ND_cOvNFRg00neoTcoCs8,5484
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -129,7 +129,7 @@ omdev/git/shallow.py,sha256=pu2Dro9P7oUa-cpFkcscbay1bM6jLFfV5mevICzbjcE,2530
 omdev/git/status.py,sha256=Yh3q9NGwLYwOQDQkR20B2g_Y0iJj5gCoiVoxo9cT7FA,8445
 omdev/home/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/home/paths.py,sha256=zFplXTmdTs1PLe_tvZhDkkApHEpSRg-JKxZ0WVgb6P8,1325
-omdev/home/secrets.py,sha256=AOua0JKRA55_xThah2IG1e4Soo8FCXK85eH2-_kzNV0,870
+omdev/home/secrets.py,sha256=XarB-uhwjRc3dpT5ZF-9yoRPDr7kpyr4Hgs0I4kKL4I,1992
 omdev/home/shadow.py,sha256=6mGDJV70IExa-nzd7mOUW4R3OZIXO0fBwmOUU9T9f4M,295
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -250,9 +250,9 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=HCkgcJND22CGrB7Tw4c3EZI5RsZlHAeQQtW7rG1Fiuo,357053
-omdev/scripts/interp.py,sha256=zNOZAz7DbD7vMdNhNRMt5XtkF-gjCApU5stKX0j_AOM,155600
-omdev/scripts/pyproject.py,sha256=E5Xx_EhvGspwjqGecd1KCLk1I1bOkKPgjtxbT1zjYJQ,265081
+omdev/scripts/ci.py,sha256=1IeNGWCyHtonK1PHaKETW7IqCyXMkIkMafXUVlFCtQo,357043
+omdev/scripts/interp.py,sha256=ByjO0DdnYF8VDYu04v6oIops4CknA8bUTOmcbjmlXGk,155590
+omdev/scripts/pyproject.py,sha256=psPWxTp0FAPrRTMEoLTvHOsbv15fkIf_Lh8LBl3pYZE,265071
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -294,9 +294,9 @@ omdev/tools/json/rendering.py,sha256=3HhdlKSetS6iK1tjF2aILzsl8Mb3D8wW92vYwGpRdVA
 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.dev316.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev316.dist-info/METADATA,sha256=2aNPDE5Nt1HuXUTI29IIM3PZYcTNS6UQvV9QOqyc1tw,1674
-omdev-0.0.0.dev316.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-omdev-0.0.0.dev316.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev316.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev316.dist-info/RECORD,,
+omdev-0.0.0.dev318.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev318.dist-info/METADATA,sha256=awBTNUcW9bms_VEuJZKZdFQziCsMQ1UB9dU4zSfh9jQ,1674
+omdev-0.0.0.dev318.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+omdev-0.0.0.dev318.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev318.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev318.dist-info/RECORD,,

{omdev-0.0.0.dev316.dist-info → omdev-0.0.0.dev318.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any