devopsdriver 0.1.40__tar.gz → 0.1.41__tar.gz

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devopsdriver
-Version: 0.1.40
+Version: 0.1.41
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -47,8 +47,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML==6.0.1
-Requires-Dist: keyring==25.0.0
-Requires-Dist: setuptools==69.0.2
+Requires-Dist: keyring==25.1.0
+Requires-Dist: setuptools==69.2.0
 Requires-Dist: azure-devops==7.1.0b4
 Requires-Dist: Mako==1.3.2
 Provides-Extra: dev
@@ -60,7 +60,7 @@ Requires-Dist: coverage>=7.4.4; extra == "test"
 Provides-Extra: doc
 
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.40&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.40/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.41&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.41/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/README.md

@@ -1,5 +1,5 @@
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.40&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.40/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.41&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.41/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/devopsdriver/__init__.py

@@ -6,6 +6,6 @@ from .template import Template
 from .azdo.clients import Azure
 
 
-__version__ = "0.1.40"
+__version__ = "0.1.41"
 __author__ = "Marc Page"
 __credits__ = ""

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/devopsdriver/azdo/__init__.py

@@ -6,6 +6,6 @@ from .timestamp import Timestamp
 
 from .workitem.workitem import WorkItem
 from .workitem.wiql import Wiql, Value, Field
-from .workitem.wiql import Ascending, Descending, And, Or
+from .workitem.wiql import Ascending, Descending, And, Or, In, NotIn
 from .workitem.wiql import Equal, NotEqual, LessThanOrEqual, GreaterThanOrEqual
 from .workitem.wiql import IsEmpty, IsNotEmpty, LessThan, GreaterThan

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/devopsdriver/azdo/workitem/wiql.py

@@ -133,15 +133,50 @@ class Compare:  # pylint: disable=too-few-public-methods
         field: Field | str,
         value: Value | str | date | datetime | int | float,
         operator: str,
+        value_is_computed=False,
     ):
         self.left = field if isinstance(field, Field) else Field(field)
-        self.right = value if isinstance(value, Value) else Value(value)
+        self.right = (
+            value if value_is_computed or isinstance(value, Value) else Value(value)
+        )
         self.operator = operator
 
     def __str__(self) -> str:
         return f"{str(self.left)} {self.operator} {str(self.right)}"
 
 
+class In(Compare):  # pylint: disable=too-few-public-methods
+    """checks for field in a list of values"""
+
+    def __init__(
+        self,
+        field: Field | str,
+        *values: list[Value | str | date | datetime | int | float],
+    ):
+        super().__init__(
+            field,
+            f"({', '.join(str(v if isinstance(v, Value) else Value(v)) for v in values)})",
+            "IN",
+            value_is_computed=True,
+        )
+
+
+class NotIn(Compare):  # pylint: disable=too-few-public-methods
+    """checks for field in a list of values"""
+
+    def __init__(
+        self,
+        field: Field | str,
+        *values: list[Value | str | date | datetime | int | float],
+    ):
+        super().__init__(
+            field,
+            f"({', '.join(str(v if isinstance(v, Value) else Value(v)) for v in values)})",
+            "NOT IN",
+            value_is_computed=True,
+        )
+
+
 class Equal(Compare):  # pylint: disable=too-few-public-methods
     """checks for equality"""
 

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/devopsdriver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: devopsdriver
-Version: 0.1.40
+Version: 0.1.41
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -47,8 +47,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: PyYAML==6.0.1
-Requires-Dist: keyring==25.0.0
-Requires-Dist: setuptools==69.0.2
+Requires-Dist: keyring==25.1.0
+Requires-Dist: setuptools==69.2.0
 Requires-Dist: azure-devops==7.1.0b4
 Requires-Dist: Mako==1.3.2
 Provides-Extra: dev
@@ -60,7 +60,7 @@ Requires-Dist: coverage>=7.4.4; extra == "test"
 Provides-Extra: doc
 
 ![status sheild](https://img.shields.io/static/v1?label=status&message=beta&color=blue&style=plastic)
-[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.40&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.40/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.41&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.41/)
 [![GitHub](https://img.shields.io/github/license/marcpage/devops-driver?style=plastic)](https://github.com/marcpage/devops-driver?tab=Unlicense-1-ov-file#readme)
 [![GitHub contributors](https://img.shields.io/github/contributors/marcpage/devops-driver?style=flat)](https://github.com/marcpage/devops-driver/graphs/contributors)
 [![PR's Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com)

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/devopsdriver.egg-info/requires.txt

@@ -1,6 +1,6 @@
 PyYAML==6.0.1
-keyring==25.0.0
-setuptools==69.0.2
+keyring==25.1.0
+setuptools==69.2.0
 azure-devops==7.1.0b4
 Mako==1.3.2
 

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/pyproject.toml

@@ -7,8 +7,8 @@ dynamic = ["version"]
 requires-python = ">= 3.10"
 dependencies = [
   "PyYAML==6.0.1",
-  "keyring==25.0.0",
-  "setuptools==69.0.2",  # neded for azure-devops to use 7.1 API
+  "keyring==25.1.0",
+  "setuptools==69.2.0",  # neded for azure-devops to use 7.1 API
   "azure-devops==7.1.0b4",
   "Mako==1.3.2",
 ]
@@ -34,6 +34,9 @@ settings = "devopsdriver.manage_settings:main"
 [tool.setuptools.package-data]
 "*" = ["*.mako"]
 
+[tool.setuptools.packages.find]
+include = ["devopsdriver*"]
+
 [project.optional-dependencies]
 dev = [
     "black>=24.3.0",

{devopsdriver-0.1.40 → devopsdriver-0.1.41}/tests/test_azure_workitem_wiql.py

@@ -6,7 +6,7 @@ from datetime import date, datetime
 
 from devopsdriver.azdo import Wiql
 from devopsdriver.azdo import Ascending, Descending, Value
-from devopsdriver.azdo import IsEmpty, IsNotEmpty, And, Or
+from devopsdriver.azdo import IsEmpty, IsNotEmpty, And, Or, In, NotIn
 from devopsdriver.azdo import GreaterThan, LessThan, Equal, NotEqual
 from devopsdriver.azdo import GreaterThanOrEqual, LessThanOrEqual
 
@@ -65,7 +65,21 @@ def test_invalid_value_type() -> None:
         pass
 
 
+def test_in_and_not_in() -> None:
+    """Test in and not in operators"""
+    builder = Wiql().where(
+        And(In("State", "New", "Ready for Development"), NotIn("Priority", 1, 2))
+    )
+    expected = (
+        """SELECT [System.Id] FROM workitems WHERE [System.State] """
+        + """IN ("New", "Ready for Development") AND [Microsoft.VSTS.Common.Priority] """
+        + """NOT IN (1, 2)"""
+    )
+    assert str(builder) == expected, str(builder)
+
+
 if __name__ == "__main__":
+    test_in_and_not_in()
     test_invalid_value_type()
     test_expressions()
     test_no_params()