Merge pull request #259 from cisagov/EM-improve-dnstwist

Dnstwist Improvements

.github/workflows/build.yml

@@ -112,7 +112,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"
@@ -199,7 +198,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - "3.6"
           - "3.7"
           - "3.8"
           - "3.9"

.pre-commit-config.yaml

@@ -94,7 +94,7 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-  - repo: https://gitlab.com/pycqa/flake8
+  - repo: https://github.com/PyCQA/flake8
     rev: 3.9.2
     hooks:
       - id: flake8

setup.py

@@ -73,14 +73,18 @@ def get_version(version_file):
         "License :: CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
+        # Temporarily remove support for Python 3.6 due to build failures; will be reinstated
+        # after https://github.com/cisagov/skeleton-python-library/pull/110 is merged
+        # See issue #374 "Re-implement 3.6 compatibility"
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
+        # "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
     ],
-    python_requires=">=3.6",
+    # Revert to 3.6 when issue is resolved, see issue Re-implement 3.6 compatibility #374
+    python_requires=">=3.7",
     # What does your project relate to?
     keywords="posture and exposure report",
     packages=find_packages(where="src"),
@@ -98,7 +102,9 @@ def get_version(version_file):
         "chevron == 0.14.0",
         "celery",
         "click",
+        "dnstwist",
         "docopt",
+        "DShield",
         "glob2 == 0.7",
         "flask",
         "flask",

src/pe_reports/helpers/__init__.py

@@ -0,0 +1 @@
+"""Init file for module implementation."""

src/pe_reports/helpers/bulletin/__init__.py

@@ -0,0 +1 @@
+"""Init file for module implementation."""