devopsdriver 0.1.51__tar.gz → 0.1.52__tar.gz

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devopsdriver
-Version: 0.1.51
+Version: 0.1.52
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -51,7 +51,7 @@ Requires-Dist: keyring==25.6.0
 Requires-Dist: setuptools==80.9.0
 Requires-Dist: azure-devops==7.1.0b4
 Requires-Dist: Mako==1.3.10
-Requires-Dist: PyGithub==2.5.0
+Requires-Dist: PyGithub==2.8.1
 Provides-Extra: dev
 Requires-Dist: black>=24.3.0; extra == "dev"
 Requires-Dist: pylint>=3.1.0; extra == "dev"
@@ -64,7 +64,7 @@ Dynamic: license-file
 # devops-driver
 
 ![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.51&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.51/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.52&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.52/)
 [![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.51 → devopsdriver-0.1.52}/README.md

@@ -1,7 +1,7 @@
 # devops-driver
 
 ![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.51&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.51/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.52&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.52/)
 [![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.51 → devopsdriver-0.1.52}/devopsdriver/__init__.py

@@ -7,6 +7,6 @@ from .azdo.clients import Azure
 from .github.client import Github
 
 
-__version__ = "0.1.51"
+__version__ = "0.1.52"
 __author__ = "Marc Page"
 __credits__ = ""

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/devopsdriver/azdo/azureobject.py

@@ -17,13 +17,13 @@ class AzureObject(DataObject):  # pylint: disable=too-few-public-methods
         self.raw = azure_object
         super().__init__(self.raw.as_dict())
 
-    def _parse_value(self, data: any) -> any:
+    def _parse_value(self, data):
         if isinstance(data, str) and Timestamp.is_timestamp(data):
             return Timestamp(data)
 
         return super()._parse_value(data)
 
-    def _get_field(self, name: str, data: dict) -> any:
+    def _get_field(self, name: str, data: dict):
         value = super()._get_field(name, data)
 
         if value is None and "fields" in data:

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/devopsdriver/azdo/workitem/client.py

@@ -21,9 +21,9 @@ class Client:
     def query(
         self,
         wiql: Wiql | str,
-        team_context: TeamContext = None,
-        time_precision: bool = None,
-        top: int = None,
+        team_context: TeamContext | None = None,
+        time_precision: bool | None = None,
+        top: int | None = None,
     ) -> WorkItemQueryResult:
         """Perform a wiql query
 
@@ -46,15 +46,15 @@ class Client:
     def get_history(  # pylint: disable=too-many-positional-arguments,too-many-arguments
         self,
         wi_id: int,
-        project: str = None,
-        top: int = None,
-        skip: int = None,
-        expand: str = None,
+        project: str | None = None,
+        top: int | None = None,
+        skip: int | None = None,
+        expand: str | None = None,
     ) -> list[AzureWorkItem]:
         """Simple wrapper around get_revisions"""
         return self.client.get_revisions(wi_id, project, top, skip, expand)
 
-    def find_ids(self, wiql: Wiql | str, top: int = None) -> list[int]:
+    def find_ids(self, wiql: Wiql | str, top: int | None = None) -> list[int]:
         """Given a query, find the work item ids
 
         Args:
@@ -73,9 +73,9 @@ class Client:
         # query_results_type: workItem
         # query_type: flat
         # columns: list of name, reference_name, url
-        return [i.id for i in found.work_items]
+        return [i.id for i in found.work_items] if found.work_items else []
 
-    def find(self, wiql: Wiql | str, top: int = None) -> list[list[AzureObject]]:
+    def find(self, wiql: Wiql | str, top: int | None = None) -> list[list[AzureObject]]:
         """Gets the full history of items found in a WIQL search
 
         Args:

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/devopsdriver/azdo/workitem/wiql.py

@@ -151,7 +151,7 @@ class In(Compare):  # pylint: disable=too-few-public-methods
     def __init__(
         self,
         field: Field | str,
-        *values: list[Value | str | date | datetime | int | float],
+        *values: Value | str | date | datetime | int | float,
     ):
         super().__init__(
             field,
@@ -167,7 +167,7 @@ class NotIn(Compare):  # pylint: disable=too-few-public-methods
     def __init__(
         self,
         field: Field | str,
-        *values: list[Value | str | date | datetime | int | float],
+        *values: Value | str | date | datetime | int | float,
     ):
         super().__init__(
             field,
@@ -234,7 +234,7 @@ class GreaterThanOrEqual(Compare):  # pylint: disable=too-few-public-methods
 class Expression:  # pylint: disable=too-few-public-methods
     """Join several compares"""
 
-    def __init__(self, operator: str, *compares: list[Compare]):
+    def __init__(self, operator: str, *compares):
         self.operator = operator
         self.expressions = compares
 
@@ -245,14 +245,14 @@ class Expression:  # pylint: disable=too-few-public-methods
 class And(Expression):  # pylint: disable=too-few-public-methods
     """Join compares via AND"""
 
-    def __init__(self, *compares: list[Compare | Expression]):
+    def __init__(self, *compares: Compare | Expression):
         super().__init__("AND", *compares)
 
 
 class Or(Expression):  # pylint: disable=too-few-public-methods
     """join compares via OR"""
 
-    def __init__(self, *compares: list[Compare | Expression]):
+    def __init__(self, *compares: Compare | Expression):
         super().__init__("OR", *compares)
 
 
@@ -264,8 +264,10 @@ class Wiql:
         self.search = None
         self.order = []
         self.snapshot = None
+        self.source = "WorkItems"
+        self.mode_type = None
 
-    def select(self, *fields: list[Field | str]):
+    def select(self, *fields: Field | str):
         """The fields to select
 
         Returns:
@@ -286,6 +288,16 @@ class Wiql:
         self.search = expression
         return self
 
+    def from_source(self, source: str):
+        """Sets the FROM field"""
+        self.source = source
+        return self
+
+    def mode(self, results_mode: str):
+        """Sets the mode for link queries"""
+        self.mode_type = results_mode
+        return self
+
     def order_by(self, *orders):
         """Set the fields to order the results by
 
@@ -315,4 +327,5 @@ class Wiql:
             f" ORDER BY {', '.join(str(o) for o in self.order)}" if self.order else ""
         )
         asof = f" ASOF {str(self.snapshot)}" if self.snapshot else ""
-        return f"SELECT {select} FROM workitems{where}{order}{asof}"
+        mode = f" MODE({self.mode_type})" if self.mode_type else ""
+        return f"SELECT {select} FROM {self.source}{where}{order}{asof}{mode}"

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/devopsdriver/sendmail.py

@@ -41,11 +41,11 @@ def image_extension(data: bytes) -> str:
     raise AttributeError("Image not a known format: " + ",".join(IMAGE_HEADERS))
 
 
-def send_email(
+def send_email(  # pylint: disable=too-many-locals
     recipients: str | list[str],
     subject: str,
     html_body: str,
-    settings: Settings = None,
+    settings: Settings | None = None,
     **image_data,
 ):
     """Sends an email with embedded images
@@ -65,7 +65,9 @@ def send_email(
         ", ".join(missing) + " not found in:\n" + "\n".join(settings.search_files)
     )
     sender = settings["smtp.sender"]
+    assert isinstance(sender, str), sender
     username = settings.get("smtp.username", sender)
+    assert isinstance(username, str), username
     message = MIMEMULTIPART()
     message["Subject"] = subject
     message["From"] = sender
@@ -85,8 +87,14 @@ def send_email(
         )
         message.attach(image)
 
-    with connection_type(settings["smtp.server"], settings["smtp.port"]) as smtp:
+    server = settings["smtp.server"]
+    assert isinstance(server, str), server
+    port = settings["smtp.port"]
+    assert isinstance(port, int), port
+    password = settings["smtp.password"]
+    assert isinstance(password, str), password
+    with connection_type(server, port) as smtp:
         smtp.set_debuglevel(False)
-        smtp.login(username, settings["smtp.password"])
+        smtp.login(username, password)
         smtp.sendmail(sender, recipients, message.as_string())
         smtp.quit()

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/devopsdriver/settings.py

@@ -147,7 +147,9 @@ class Settings:
     }
     ENV_VAR_PATTERN = regex(r"\${(\S+)}")
 
-    def __init__(self, file: str, *directories, shared_name: str = None, **settings):
+    def __init__(
+        self, file: str, *directories, shared_name: str | None = None, **settings
+    ):
         """Create a settings object using a file, directories to search, and settings overrides
 
         Args:
@@ -172,7 +174,7 @@ class Settings:
         self.environ = {}
         self.secrets = {}
 
-    def __bypass(self, key: str, name: str, store: dict):
+    def __bypass(self, key: str, name: str | None, store: dict):
         if name is None:
             for setting_key, store_name in self.settings.get(key, {}).items():
                 store[setting_key] = store_name
@@ -181,7 +183,7 @@ class Settings:
         store[key] = name
         return self
 
-    def key(self, key: str, name: str = None):
+    def key(self, key: str, name: str | None = None):
         """Sets a keychain name to map to a settings value.
 
         Args:
@@ -195,7 +197,7 @@ class Settings:
         """
         return self.__bypass(key, name, self.secrets)
 
-    def cli(self, key: str, name: str = None):
+    def cli(self, key: str, name: str | None = None):
         """Sets a command line switch to map to a settings value.
 
         Args:
@@ -209,7 +211,7 @@ class Settings:
         """
         return self.__bypass(key, name, self.opts)
 
-    def env(self, key: str, name: str = None):
+    def env(self, key: str, name: str | None = None):
         """Sets an environment variable to map to a settings value.
 
         Args:
@@ -232,7 +234,7 @@ class Settings:
         return "${" + key + "}"
 
     @staticmethod
-    def __patch(value: any) -> any:
+    def __patch(value):
         if isinstance(value, str):
             return Settings.ENV_VAR_PATTERN.sub(
                 lambda m: Settings.__patch_instance(m.group(1)), value
@@ -257,7 +259,7 @@ class Settings:
         secret_name = parts[1] if len(parts) == 2 else parts[0]
         return (service, secret_name)
 
-    def __lookup(self, key: str, check: bool, default: any = None) -> any:
+    def __lookup(self, key: str, check: bool, default=None):
         # Settings passed in override everything
         if key in self.overrides:
             return True if check else self.overrides[key]
@@ -293,7 +295,7 @@ class Settings:
 
         return Settings.__patch(level.get(keys[-1], default))
 
-    def get(self, key: str, default: any = None) -> any:
+    def get(self, key: str, default=None):
         """Dictionary-like get
 
         Args:
@@ -314,12 +316,12 @@ class Settings:
         Returns:
             bool: True if the key exists
         """
-        return self.__lookup(key, check=True)
+        return bool(self.__lookup(key, check=True))
 
     def __contains__(self, key: str) -> bool:
         return self.has(key)
 
-    def __getitem__(self, key: str) -> any:
+    def __getitem__(self, key: str):
         if not self.has(key):
             raise KeyError(key)
 
@@ -371,6 +373,6 @@ class Settings:
 
         for extension, name, directory, loader in search_info:
             contents = loader(join(directory, name + extension))
-            Settings.__merge(settings, contents)
+            Settings.__merge(settings, contents if contents else {})
 
         return settings

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/devopsdriver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devopsdriver
-Version: 0.1.51
+Version: 0.1.52
 Summary: DevOps tools
 Author-email: Marc Page <marcallenpage@gmail.com>
 License: This is free and unencumbered software released into the public domain.
@@ -51,7 +51,7 @@ Requires-Dist: keyring==25.6.0
 Requires-Dist: setuptools==80.9.0
 Requires-Dist: azure-devops==7.1.0b4
 Requires-Dist: Mako==1.3.10
-Requires-Dist: PyGithub==2.5.0
+Requires-Dist: PyGithub==2.8.1
 Provides-Extra: dev
 Requires-Dist: black>=24.3.0; extra == "dev"
 Requires-Dist: pylint>=3.1.0; extra == "dev"
@@ -64,7 +64,7 @@ Dynamic: license-file
 # devops-driver
 
 ![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.51&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.51/)
+[![status sheild](https://img.shields.io/static/v1?label=released&message=v0.1.52&color=active&style=plastic)](https://pypi.org/project/devopsdriver/0.1.52/)
 [![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.51 → devopsdriver-0.1.52}/devopsdriver.egg-info/requires.txt

@@ -3,7 +3,7 @@ keyring==25.6.0
 setuptools==80.9.0
 azure-devops==7.1.0b4
 Mako==1.3.10
-PyGithub==2.5.0
+PyGithub==2.8.1
 
 [dev]
 black>=24.3.0

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
   "setuptools==80.9.0",    # neded for azure-devops to use 7.1 API
   "azure-devops==7.1.0b4",
   "Mako==1.3.10",
-  "PyGithub==2.5.0",
+  "PyGithub==2.8.1",
 ]
 keywords = [
   "azure",

{devopsdriver-0.1.51 → devopsdriver-0.1.52}/tests/test_azure_workitem_wiql.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-""" Test work item query language """
+"""Test work item query language"""
 
 from datetime import date, datetime
 
@@ -13,7 +13,7 @@ from devopsdriver.azdo import GreaterThanOrEqual, LessThanOrEqual
 
 def test_no_params() -> None:
     """Test empty, default wiql"""
-    assert str(Wiql()) == "SELECT [System.Id] FROM workitems", str(Wiql())
+    assert str(Wiql()) == "SELECT [System.Id] FROM WorkItems", str(Wiql())
 
 
 def test_expressions() -> None:
@@ -43,7 +43,7 @@ def test_expressions() -> None:
         .asof(start)
     )
     expected = (
-        """SELECT [System.State], [System.Id] FROM workitems """
+        """SELECT [System.State], [System.Id] FROM WorkItems """
         + """WHERE [System.State] = "New" AND [System.Title] IS EMPTY """
         + """AND [Microsoft.VSTS.Common.Priority] IS NOT EMPTY """
         + """AND [System.CreatedDate] > "06/30/2024" """
@@ -71,7 +71,7 @@ def test_in_and_not_in() -> None:
         And(In("State", "New", "Ready for Development"), NotIn("Priority", 1, 2))
     )
     expected = (
-        """SELECT [System.Id] FROM workitems WHERE [System.State] """
+        """SELECT [System.Id] FROM WorkItems WHERE [System.State] """
         + """IN ("New", "Ready for Development") AND [Microsoft.VSTS.Common.Priority] """
         + """NOT IN (1, 2)"""
     )