ominfra 0.0.0.dev419__py3-none-any.whl → 0.0.0.dev420__py3-none-any.whl

ominfra/scripts/manage.py

@@ -4833,7 +4833,7 @@ def get_cache_dir() -> str:
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This file is dual licensed under the terms of the
 # Apache License, Version 2.0, and the BSD License. See the LICENSE file in the root of this repository for complete
 # details.
-# https://github.com/pypa/packaging/blob/2c885fe91a54559e2382902dce28428ad2887be5/src/packaging/specifiers.py
+# https://github.com/pypa/packaging/blob/48125006684bb2d7d28c50af48a03176da45942d/src/packaging/specifiers.py
 
 
 ##
@@ -4981,7 +4981,7 @@ class Specifier(BaseSpecifier):
     ) -> None:
         match = self._regex.search(spec)
         if not match:
-            raise InvalidSpecifier(f"Invalid specifier: '{spec}'")
+            raise InvalidSpecifier(f'Invalid specifier: {spec!r}')
 
         self._spec: ta.Tuple[str, str] = (
             match.group('operator').strip(),
@@ -4996,7 +4996,7 @@ class Specifier(BaseSpecifier):
             return self._prereleases
 
         operator, version = self._spec
-        if operator in ['==', '>=', '<=', '~=', '===']:
+        if operator in ['==', '>=', '<=', '~=', '===', '>', '<']:
             if operator == '==' and version.endswith('.*'):
                 version = version[:-2]
 
@@ -5122,40 +5122,38 @@ class Specifier(BaseSpecifier):
         return self.contains(item)
 
     def contains(self, item: UnparsedVersion, prereleases: ta.Optional[bool] = None) -> bool:
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        normalized_item = _coerce_version(item)
-
-        if normalized_item.is_prerelease and not prereleases:
-            return False
-
-        operator_callable: CallableVersionOperator = self._get_operator(self.operator)
-        return operator_callable(normalized_item, self.version)
+        return bool(list(self.filter([item], prereleases=prereleases)))
 
     def filter(
             self,
             iterable: ta.Iterable[UnparsedVersionVar],
             prereleases: ta.Optional[bool] = None,
     ) -> ta.Iterator[UnparsedVersionVar]:
-        yielded = False
-        found_prereleases = []
+        prereleases_versions = []
+        found_non_prereleases = False
 
-        kw = {'prereleases': prereleases if prereleases is not None else True}
+        include_prereleases = (
+            prereleases if prereleases is not None else self.prereleases
+        )
+
+        operator_callable = self._get_operator(self.operator)
 
         for version in iterable:
             parsed_version = _coerce_version(version)
 
-            if self.contains(parsed_version, **kw):
-                if parsed_version.is_prerelease and not (prereleases or self.prereleases):
-                    found_prereleases.append(version)
-                else:
-                    yielded = True
+            if operator_callable(parsed_version, self.version):
+                if not parsed_version.is_prerelease or include_prereleases:
+                    found_non_prereleases = True
                     yield version
+                elif prereleases is None and self._prereleases is not False:
+                    prereleases_versions.append(version)
 
-        if not yielded and found_prereleases:
-            for version in found_prereleases:
-                yield version
+        if (
+                not found_non_prereleases and
+                prereleases is None and
+                self._prereleases is not False
+        ):
+            yield from prereleases_versions
 
 
 _version_prefix_regex = re.compile(r'^([0-9]+)((?:a|b|c|rc)[0-9]+)$')
@@ -5206,12 +5204,15 @@ def _pad_version(left: ta.List[str], right: ta.List[str]) -> ta.Tuple[ta.List[st
 class SpecifierSet(BaseSpecifier):
     def __init__(
             self,
-            specifiers: str = '',
+            specifiers: ta.Union[str, ta.Iterable['Specifier']] = '',
             prereleases: ta.Optional[bool] = None,
     ) -> None:
-        split_specifiers = [s.strip() for s in specifiers.split(',') if s.strip()]
+        if isinstance(specifiers, str):
+            split_specifiers = [s.strip() for s in specifiers.split(',') if s.strip()]
+            self._specs = frozenset(map(Specifier, split_specifiers))
+        else:
+            self._specs = frozenset(specifiers)
 
-        self._specs = frozenset(map(Specifier, split_specifiers))
         self._prereleases = prereleases
 
     @property
@@ -5222,7 +5223,10 @@ class SpecifierSet(BaseSpecifier):
         if not self._specs:
             return None
 
-        return any(s.prereleases for s in self._specs)
+        if any(s.prereleases for s in self._specs):
+            return True
+
+        return None
 
     @prereleases.setter
     def prereleases(self, value: bool) -> None:
@@ -5289,28 +5293,22 @@ class SpecifierSet(BaseSpecifier):
         if not isinstance(item, Version):
             item = Version(item)
 
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        if not prereleases and item.is_prerelease:
-            return False
-
         if installed and item.is_prerelease:
-            item = Version(item.base_version)
+            prereleases = True
 
-        return all(s.contains(item, prereleases=prereleases) for s in self._specs)
+        return bool(list(self.filter([item], prereleases=prereleases)))
 
     def filter(
             self,
             iterable: ta.Iterable[UnparsedVersionVar],
             prereleases: ta.Optional[bool] = None,
     ) -> ta.Iterator[UnparsedVersionVar]:
-        if prereleases is None:
+        if prereleases is None and self.prereleases is not None:
             prereleases = self.prereleases
 
         if self._specs:
             for spec in self._specs:
-                iterable = spec.filter(iterable, prereleases=bool(prereleases))
+                iterable = spec.filter(iterable, prereleases=prereleases)
             return iter(iterable)
 
         else:

{ominfra-0.0.0.dev419.dist-info → ominfra-0.0.0.dev420.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev419
+Version: 0.0.0.dev420
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev419
-Requires-Dist: omlish==0.0.0.dev419
+Requires-Dist: omdev==0.0.0.dev420
+Requires-Dist: omlish==0.0.0.dev420
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev419.dist-info → ominfra-0.0.0.dev420.dist-info}/RECORD

@@ -113,7 +113,7 @@ ominfra/manage/targets/inject.py,sha256=3M4wBkxtvymq_yhiotHlTN8iydELMjVCndyp9Bq-
 ominfra/manage/targets/targets.py,sha256=WmasYmL6xfAI7F0XvDhScFdBVxkqPkmo_gRgABmmkGA,1891
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=RlrTK5M3XoqzWU7v01J67rl-qZq6_mOWlRay7k0gzWE,174194
-ominfra/scripts/manage.py,sha256=idIB084_Z3DAMMLw_gDVASiDy9worQUaD2lpfiOQzH4,397099
+ominfra/scripts/manage.py,sha256=nqnuKyL7IkH0iu4ycuJjKXwha7UYgpNBeu9OSLQlGS4,397117
 ominfra/scripts/supervisor.py,sha256=YUx_3RmUqkWFQ8PswnZukIESfZKvS6PUSZI43siErjc,306712
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=XASv9C_CWI-u-yX5jVzhJrkJhlwQRkYQWQQG1uJwAd8,1375
 ominfra/tailscale/cli.py,sha256=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=ePmo7cUAiBZARkM_3K4GKYZXxV73An_aioS1m-AAJis,6181
-ominfra-0.0.0.dev419.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev419.dist-info/METADATA,sha256=_MF-bcjeroJZV__3nW9PWxMtdLRWur9gKw29toOTmyo,2377
-ominfra-0.0.0.dev419.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev419.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev419.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev419.dist-info/RECORD,,
+ominfra-0.0.0.dev420.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev420.dist-info/METADATA,sha256=F4gLi2KyGacO3BZcq0ZbBAWLu1Lg8FgByCVcg545GBY,2377
+ominfra-0.0.0.dev420.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev420.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev420.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev420.dist-info/RECORD,,