Add host to dmarc records

Code cleanups

.gitlab-ci.yaml

@@ -1,5 +1,5 @@
 ---
-image: python:3.7-bullseye
+image: python:3.7-bookworm
 
 
 .setup:
@@ -42,69 +42,18 @@ mypy:
     - mypy src
 
 
-test_3.7:
+test:
   stage: test
-  image: python:3.7-bullseye
-  before_script:
-    - !reference [.setup, before_script]
-    - !reference [.depends, before_script]
-    - pip install -e ".[test]"
-    - chmod a+x test.py
-  script:
-    - ./test.py
-  rules:
-    - exists:
-        - test.py
-
-
-test_3.8:
-  stage: test
-  image: python:3.8-bullseye
-  before_script:
-    - !reference [.setup, before_script]
-    - !reference [.depends, before_script]
-    - pip install -e ".[test]"
-    - chmod a+x test.py
-  script:
-    - ./test.py
-  rules:
-    - exists:
-        - test.py
-
-
-test_3.9:
-  stage: test
-  image: python:3.9-bullseye
-  before_script:
-    - !reference [.setup, before_script]
-    - !reference [.depends, before_script]
-    - pip install -e ".[test]"
-    - chmod a+x test.py
-  script:
-    - ./test.py
-  rules:
-    - exists:
-        - test.py
-
-
-test_3.10:
-  stage: test
-  image: python:3.10-bullseye
-  before_script:
-    - !reference [.setup, before_script]
-    - !reference [.depends, before_script]
-    - pip install -e ".[test]"
-    - chmod a+x test.py
-  script:
-    - ./test.py
-  rules:
-    - exists:
-        - test.py
-
-
-test_3.11:
-  stage: test
-  image: python:3.11-bullseye
+  image: python:${TEST_PYTHON_VERSION}-bookworm
+  parallel:
+    matrix:
+      - TEST_PYTHON_VERSION:
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
+        - '3.11'
+        - '3.12'
   before_script:
     - !reference [.setup, before_script]
     - !reference [.depends, before_script]

README.md

@@ -434,7 +434,7 @@ Becomes:
 
 DMARC (TXT) records are specified as follows:
 
-    {{dmarc:policy:rua:ruf:subdomain_policy:options:dkim_alignment:spf_alignment:report_format:interval:percent:ttl}}
+    {{dmarc:policy:rua:ruf:subdomain_policy:options:dkim_alignment:spf_alignment:report_format:interval:percent:host:ttl}}
 
 All arguments are optional.
 
@@ -456,6 +456,10 @@ The default value is `afrf`.
 The default values is `86400` (1 day).
 * `percent` is a numeric value from 0 to 100.
 The default value is `100`.
+* `host` is the host name for the DKIM key.
+The default value is `@`
+* `ttl` is the TTL value for the TXT record.
+The default value is empty.
 
 Example:
 
@@ -575,7 +579,3 @@ Will result in the output of:
 
     ; ACME
 
-
-
-
-

pyproject.toml

@@ -7,12 +7,12 @@ build-backend = 'setuptools.build_meta'
 name = 'bindtool'
 description = 'Preprocessor for Bind9 zone files'
 readme = 'README.md'
-requires-python = '>=3.7'
+requires-python = '>= 3.7'
 dependencies = [
-	'py3dns>=3.1.0',
-	'python-ldap>=3.2.0',
-	'pyasn1>=0.4.5',
-	'setuptools; python_version<"3.9"',
+	'py3dns >= 3.1.0, < 4.0.0',
+	'python-ldap >= 3.2.0, < 4.0.0',
+	'pyasn1 >= 0.4.5, < 1.0.0',
+	'setuptools; python_version < "3.9"',
 ]
 dynamic = ['version']
 
@@ -45,6 +45,7 @@ dev = [
 	'flake8-datetimez',
 	'flake8-docstrings',
 	'flake8-import-order',
+	'flake8-keyword-params',
 	'flake8-literal',
 	'flake8-modern-annotations',
 	'flake8-noqa',
@@ -60,7 +61,7 @@ dev = [
 
 
 [tool.flake8]
-ignore = ['D102', 'D105', 'D107', 'D401', 'W503', 'ANN002', 'ANN003', 'ANN101', 'ANN102', 'ANN401', 'FS003', 'S110', 'S303', 'S324', 'S404', 'S603', 'S607']
+ignore = ['D102', 'D105', 'D107', 'D401', 'W503', 'ANN002', 'ANN003', 'ANN101', 'ANN102', 'ANN401', 'FS003', 'S110', 'S303', 'S324']
 max-line-length = 160