Merge pull request #248 from cisagov/improvement/sslyze3

Add support for sslyze 3  (superset of PR #214)

Author: felddy

.github/workflows/build.yml

@@ -23,9 +23,7 @@ jobs:
       - id: setup-python
         uses: actions/setup-python@v4
         with:
-          # A lower version is used because of a dependency issue in Python
-          # versions 3.8-3.11
-          python-version: "3.7"
+          python-version: "3.10"
       # We need the Go version and Go cache location for the actions/cache step,
       # so the Go installation must happen before that.
       - id: setup-go
@@ -115,24 +113,12 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        # The versions of nassl pinned by our sslyze version constraint only
-        # have bdists available for Python 3.6 and 3.7, so we can only support
-        # those versions of Python. The error seen when trying to install on
-        # Python 3.8+ is:
-        # ERROR: Cannot install pshtt because these package versions have
-        # conflicting dependencies.
-        # The conflict is caused by:
-        #   sslyze 2.1.4 depends on nassl<2.3.0 and >=2.2.0
-        #   sslyze 2.1.3 depends on nassl<2.3.0 and >=2.2.0
         python-version:
           - "3.7"
-          # - "3.8"
-          # - "3.9"
-          # - "3.10"
+          - "3.8"
+          - "3.9"
+          - "3.10"
           # - "3.11"
-        include:
-          - os: ubuntu-20.04
-            python-version: "3.6"
     steps:
       - uses: actions/checkout@v3
       - id: setup-python
@@ -182,9 +168,7 @@ jobs:
       - id: setup-python
         uses: actions/setup-python@v4
         with:
-          # A lower version is used because of a dependency issue in Python
-          # versions 3.8-3.11
-          python-version: "3.7"
+          python-version: "3.10"
       - uses: actions/cache@v3
         env:
           BASE_CACHE_KEY: "${{ github.job }}-${{ runner.os }}-\
@@ -224,20 +208,10 @@ jobs:
           - ubuntu-latest
         python-version:
           - "3.7"
-          # Disabled due to an unresolvable dependency issue between sslyze and
-          # nassl:
-          # ERROR: Cannot install pshtt because these package versions have
-          # conflicting dependencies.
-          # The conflict is caused by:
-          #   sslyze 2.1.4 depends on nassl<2.3.0 and >=2.2.0
-          #   sslyze 2.1.3 depends on nassl<2.3.0 and >=2.2.0
-          # - "3.8"
-          # - "3.9"
-          # - "3.10"
+          - "3.8"
+          - "3.9"
+          - "3.10"
           # - "3.11"
-        include:
-          - os: ubuntu-20.04
-            python-version: "3.6"
     steps:
       - uses: actions/checkout@v3
       - id: setup-python
@@ -284,20 +258,10 @@ jobs:
           - ubuntu-latest
         python-version:
           - "3.7"
-          # Disabled due to an unresolvable dependency issue between sslyze and
-          # nassl:
-          # ERROR: Cannot install pshtt because these package versions have
-          # conflicting dependencies.
-          # The conflict is caused by:
-          #   sslyze 2.1.4 depends on nassl<2.3.0 and >=2.2.0
-          #   sslyze 2.1.3 depends on nassl<2.3.0 and >=2.2.0
-          # - "3.8"
-          # - "3.9"
-          # - "3.10"
+          - "3.8"
+          - "3.9"
+          - "3.10"
           # - "3.11"
-        include:
-          - os: ubuntu-20.04
-            python-version: "3.6"
     steps:
       - uses: actions/checkout@v3
       - id: setup-python

README.md

@@ -30,8 +30,6 @@ organizations](https://github.com/cisagov/pshtt/graphs/contributors).
 
 ## Getting started ##
 
-`pshtt` requires **Python 3.6 or 3.7**. Python 2 is not supported.
-
 `pshtt` can be installed as a module, or run directly from the
 repository.
 

setup.py

@@ -75,18 +75,14 @@ def get_version(version_file):
         # that you indicate whether you support Python 2, Python 3 or both.
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "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",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         # "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: CPython",
     ],
-    # The versions of nassl pinned by our sslyze version constraint only have
-    # bdists available for cp36 and cp37 on PyPI so we can only support Python
-    # 3.6 and 3.7 at this time.
-    python_requires=">=3.6, <3.8",
+    python_requires=">=3.7",
     # What does your project relate to?
     keywords="https best practices",
     packages=find_packages(where="src"),
@@ -103,7 +99,7 @@ def get_version(version_file):
         "requests>=2.18.4",
         # This is necessary to support the python_requires kwarg
         "setuptools >= 24.2.0",
-        "sslyze>=2.1.3,<3.0.0",
+        "sslyze>=3.0.0,<5.0.0",
         "wget>=3.2",
     ],
     extras_require={

src/pshtt/_version.py

@@ -1,2 +1,2 @@
 """This file defines the version of this module."""
-__version__ = "0.6.10"
+__version__ = "0.7.0"