ominfra 0.0.0.dev180__py3-none-any.whl → 0.0.0.dev181__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
ominfra/scripts/manage.py CHANGED
@@ -8850,9 +8850,15 @@ class InterpInspection:
8850
8850
 
8851
8851
 
8852
8852
  class InterpInspector:
8853
- def __init__(self) -> None:
8853
+ def __init__(
8854
+ self,
8855
+ *,
8856
+ log: ta.Optional[logging.Logger] = None,
8857
+ ) -> None:
8854
8858
  super().__init__()
8855
8859
 
8860
+ self._log = log
8861
+
8856
8862
  self._cache: ta.Dict[str, ta.Optional[InterpInspection]] = {}
8857
8863
 
8858
8864
  _RAW_INSPECTION_CODE = """
@@ -8901,8 +8907,8 @@ class InterpInspector:
8901
8907
  try:
8902
8908
  ret = await self._inspect(exe)
8903
8909
  except Exception as e: # noqa
8904
- if log.isEnabledFor(logging.DEBUG):
8905
- log.exception('Failed to inspect interp: %s', exe)
8910
+ if self._log is not None and self._log.isEnabledFor(logging.DEBUG):
8911
+ self._log.exception('Failed to inspect interp: %s', exe)
8906
8912
  ret = None
8907
8913
  self._cache[exe] = ret
8908
8914
  return ret
@@ -9692,12 +9698,14 @@ class SystemInterpProvider(InterpProvider):
9692
9698
  options: Options = Options(),
9693
9699
  *,
9694
9700
  inspector: ta.Optional[InterpInspector] = None,
9701
+ log: ta.Optional[logging.Logger] = None,
9695
9702
  ) -> None:
9696
9703
  super().__init__()
9697
9704
 
9698
9705
  self._options = options
9699
9706
 
9700
9707
  self._inspector = inspector
9708
+ self._log = log
9701
9709
 
9702
9710
  #
9703
9711
 
@@ -9771,7 +9779,8 @@ class SystemInterpProvider(InterpProvider):
9771
9779
  lst = []
9772
9780
  for e in self.exes():
9773
9781
  if (ev := await self.get_exe_version(e)) is None:
9774
- log.debug('Invalid system version: %s', e)
9782
+ if self._log is not None:
9783
+ self._log.debug('Invalid system version: %s', e)
9775
9784
  continue
9776
9785
  lst.append((e, ev))
9777
9786
  return lst
@@ -10128,6 +10137,7 @@ class PyenvInterpProvider(InterpProvider):
10128
10137
  *,
10129
10138
  pyenv: Pyenv,
10130
10139
  inspector: InterpInspector,
10140
+ log: ta.Optional[logging.Logger] = None,
10131
10141
  ) -> None:
10132
10142
  super().__init__()
10133
10143
 
@@ -10135,6 +10145,7 @@ class PyenvInterpProvider(InterpProvider):
10135
10145
 
10136
10146
  self._pyenv = pyenv
10137
10147
  self._inspector = inspector
10148
+ self._log = log
10138
10149
 
10139
10150
  #
10140
10151
 
@@ -10179,7 +10190,8 @@ class PyenvInterpProvider(InterpProvider):
10179
10190
  ret: ta.List[PyenvInterpProvider.Installed] = []
10180
10191
  for vn, ep in await self._pyenv.version_exes():
10181
10192
  if (i := await self._make_installed(vn, ep)) is None:
10182
- log.debug('Invalid pyenv version: %s', vn)
10193
+ if self._log is not None:
10194
+ self._log.debug('Invalid pyenv version: %s', vn)
10183
10195
  continue
10184
10196
  ret.append(i)
10185
10197
  return ret
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: ominfra
3
- Version: 0.0.0.dev180
3
+ Version: 0.0.0.dev181
4
4
  Summary: ominfra
5
5
  Author: wrmsr
6
6
  License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
12
12
  Classifier: Operating System :: POSIX
13
13
  Requires-Python: >=3.12
14
14
  License-File: LICENSE
15
- Requires-Dist: omdev==0.0.0.dev180
16
- Requires-Dist: omlish==0.0.0.dev180
15
+ Requires-Dist: omdev==0.0.0.dev181
16
+ Requires-Dist: omlish==0.0.0.dev181
17
17
  Provides-Extra: all
18
18
  Requires-Dist: paramiko~=3.5; extra == "all"
19
19
  Requires-Dist: asyncssh~=2.18; extra == "all"
@@ -88,7 +88,7 @@ ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhh
88
88
  ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
89
89
  ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
90
90
  ominfra/scripts/journald2aws.py,sha256=yEnBAd0Q_3lBkVoTvlJ_uCcUxz7Ckn2qoSWZVhMihvQ,157696
91
- ominfra/scripts/manage.py,sha256=r0lrDUnP_YCf-L9dg06kpAzNXURBNSty_uaqnvl8Z2o,327238
91
+ ominfra/scripts/manage.py,sha256=08HgDZP0pTo_3Ms0SZR4Yfh5vQKyyJ092pnwUrlrLnA,327646
92
92
  ominfra/scripts/supervisor.py,sha256=aEngsVXbK7DNEtILJ_eMMlUu113kfT2uFJ-bdbcPTro,281984
93
93
  ominfra/supervisor/LICENSE.txt,sha256=yvqaMNsDhWxziHa9ien6qCW1SkZv-DQlAg96XjfSee8,1746
94
94
  ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -131,9 +131,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
131
131
  ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
132
132
  ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
133
133
  ominfra/tools/listresources.py,sha256=4qVg5txsb10EHhvqXXeM6gJ2jx9LbroEnPydDv1uXs0,6176
134
- ominfra-0.0.0.dev180.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
135
- ominfra-0.0.0.dev180.dist-info/METADATA,sha256=734lpaoe3ooojHKovGR1Rf6CjQl69ZlvZvCaYr9wLog,731
136
- ominfra-0.0.0.dev180.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
137
- ominfra-0.0.0.dev180.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
138
- ominfra-0.0.0.dev180.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
139
- ominfra-0.0.0.dev180.dist-info/RECORD,,
134
+ ominfra-0.0.0.dev181.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
135
+ ominfra-0.0.0.dev181.dist-info/METADATA,sha256=JqSra-VNBdQN15a56pBzYgMmXZ3VoycCS4wHIERO7u4,731
136
+ ominfra-0.0.0.dev181.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
137
+ ominfra-0.0.0.dev181.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
138
+ ominfra-0.0.0.dev181.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
139
+ ominfra-0.0.0.dev181.dist-info/RECORD,,