Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for sslyze>=3.0.0 #214

Closed
wants to merge 11 commits into from
Closed

Adds support for sslyze>=3.0.0 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0ac76d1
Adds support for sslyze>=3.0.0
SaptakS Jan 19, 2021
51bfefd
Adds extra certificate informations for user trusted CA
SaptakS Jan 19, 2021
870d026
Fixes typo in comment
SaptakS Jan 26, 2021
7cc15e6
Add fixes and suggestions from code review
SaptakS Feb 3, 2021
3fbef91
Consider all certificate deployments instead of first one
SaptakS Feb 3, 2021
a0c7f66
Consider all certificate deployments for verified certificate chain
SaptakS Mar 17, 2021
1f91486
Updates sslyze version to <5.0.0, upgrade required python to >=3.7
SaptakS Nov 3, 2022
b995ada
Lints the python code
SaptakS Nov 3, 2022
14987cc
Updates python versions in github workflow build
SaptakS Nov 7, 2022
edb863e
Updates python version in build.yml
SaptakS Nov 7, 2022
3aed808
Removes Python 3.6 from build
SaptakS May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 11 additions & 47 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -112,24 +110,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
Expand Down Expand Up @@ -179,9 +165,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 }}-\
Expand Down Expand Up @@ -221,20 +205,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
Expand Down Expand Up @@ -281,20 +255,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
Expand Down
14 changes: 5 additions & 9 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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={
Expand Down
Loading
Loading