mjcaley · mjcaley · Oct 28, 2022 · Oct 23, 2022 · Oct 25, 2022 · Oct 28, 2022
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.x'
       - name: Install Poetry
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.x'
       - name: Install Poetry
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.x'
       - name: Install Poetry
         run: |
           python -m pip install --upgrade pip --disable-pip-version-check

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python: ['3.7', '3.8', '3.9', '3.10']
+        python: ['3.7', '3.8', '3.9', '3.10', '3.11']
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python

diff --git a/aiospamc/__init__.py b/aiospamc/__init__.py
@@ -17,7 +17,7 @@
     symbols,
     tell,
 )
-from .options import ActionOption, MessageClassOption
+from .header_values import ActionOption, MessageClassOption
 
 
 __author__ = "Michael Caley"

diff --git a/aiospamc/frontend.py b/aiospamc/frontend.py
@@ -14,8 +14,7 @@
 
 from .client import Client
 from .connections import Timeout
-from .header_values import MessageClassValue
-from .options import ActionOption, MessageClassOption
+from .header_values import ActionOption, MessageClassOption, MessageClassValue
 from .incremental_parser import parse_set_remove_value
 from .responses import Response
 from .requests import Request

diff --git a/aiospamc/header_values.py b/aiospamc/header_values.py
@@ -2,11 +2,10 @@
 
 """Collection of request and response header value objects."""
 
+from enum import Enum
 import getpass
 from dataclasses import dataclass, asdict
-from typing import Any, Dict
-
-from .options import ActionOption, MessageClassOption
+from typing import Any, Dict, Optional
 
 
 class HeaderValue:
@@ -70,6 +69,13 @@ def __bytes__(self) -> bytes:
         return str(self.length).encode("ascii")
 
 
+class MessageClassOption(Enum):
+    """Option to be used for the MessageClass header."""
+
+    spam = "spam"
+    ham = "ham"
+
+
 @dataclass
 class MessageClassValue(HeaderValue):
     """MessageClass header.  Used to specify whether a message is 'spam' or
@@ -87,11 +93,23 @@ def to_dict(self) -> Dict[str, Any]:
         return {"value": self.value.value}
 
 
+@dataclass
+class ActionOption:
+    """Option to be used in the DidRemove, DidSet, Set, and Remove headers.
+
+    :param local: An action will be performed on the SPAMD service's local database.
+    :param remote: An action will be performed on the SPAMD service's remote database.
+    """
+
+    local: Optional[bool]
+    remote: Optional[bool]
+
+
 @dataclass
 class SetOrRemoveValue(HeaderValue):
     """Base class for headers that implement "local" and "remote" rules."""
 
-    action: ActionOption = ActionOption(local=False, remote=False)
+    action: ActionOption
 
     def __bytes__(self) -> bytes:
         if not self.action.local and not self.action.remote:

diff --git a/aiospamc/incremental_parser.py b/aiospamc/incremental_parser.py
@@ -12,17 +12,18 @@
 
 from .exceptions import ParseError, NotEnoughDataError, TooMuchDataError
 from .header_values import (
+    ActionOption,
     BytesHeaderValue,
     CompressValue,
     ContentLengthValue,
     GenericHeaderValue,
     HeaderValue,
+    MessageClassOption,
     MessageClassValue,
     SetOrRemoveValue,
     SpamValue,
     UserValue,
 )
-from .options import ActionOption, MessageClassOption
 
 
 class States(Enum):

diff --git a/aiospamc/options.py b/aiospamc/options.py
diff --git a/docs/aiospamc.rst b/docs/aiospamc.rst
@@ -21,7 +21,7 @@ aiospamc.exceptions module
    :show-inheritance:
 
 aiospamc.frontend module
-----------------------
+------------------------
 
 .. automodule:: aiospamc.frontend
    :members:
@@ -44,14 +44,6 @@ aiospamc.incremental\_parser module
    :undoc-members:
    :show-inheritance:
 
-aiospamc.options module
------------------------
-
-.. automodule:: aiospamc.options
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 aiospamc.requests module
 ------------------------
 

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.0.2
+sphinx==5.3.0
 reno==3.5.0