Skip to content

Commit

Permalink
chore(deps): bump the dependencies group across 1 directory with 7 up…
Browse files Browse the repository at this point in the history
…dates (#169)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: fulder <misad90@gmail.com>
  • Loading branch information
dependabot[bot] and fulder authored Aug 13, 2024
1 parent 14c8f94 commit e82a97a
Show file tree
Hide file tree
Showing 8 changed files with 235 additions and 237 deletions.
2 changes: 1 addition & 1 deletion docs/examples/src/ocsp/response/load_file.out
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Issuer Key Hash: |-
D9C3E4CD74C0AF517F3D2D331A0EC837DEB655A26721DA83F52E01CC60AA317A94C110B7CDEF06FC
A308A541ECC7BAFDDEFC52D8620903B6E2B1CFE3759F8B27
Response Status: SUCCESSFUL
Revocation Time: 2024-03-20 23:51:38
Revocation Time: 2024-03-20 23:51:38+00:00

2 changes: 1 addition & 1 deletion docs/examples/src/ocsp/response/load_pem.out
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Issuer Key Hash: |-
D9C3E4CD74C0AF517F3D2D331A0EC837DEB655A26721DA83F52E01CC60AA317A94C110B7CDEF06FC
A308A541ECC7BAFDDEFC52D8620903B6E2B1CFE3759F8B27
Response Status: SUCCESSFUL
Revocation Time: 2024-03-20 23:51:38
Revocation Time: 2024-03-20 23:51:38+00:00

2 changes: 1 addition & 1 deletion pki_tools/ocsp.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def _check_ocsp_status(

if ocsp_res.is_revoked:
log.bind(
date=str(ocsp_res._x509_obj.revocation_time),
date=str(ocsp_res._x509_obj.revocation_time_utc),
).debug("Certificate revoked")
return True
else:
Expand Down
24 changes: 12 additions & 12 deletions pki_tools/types/extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,9 @@ def _string_dict(self):
authority_cert_issuer.append(general_name._string_dict())
ret["Authority Cert Issuer"] = authority_cert_issuer
if self.authority_cert_serial_number is not None:
ret[
"Authority Cert Serial Number"
] = self.authority_cert_serial_number
ret["Authority Cert Serial Number"] = (
self.authority_cert_serial_number
)

if ret:
return {self.name: ret}
Expand Down Expand Up @@ -945,13 +945,13 @@ def _string_dict(self):
ret = {self.name: {}}

if self.require_explicit_policy is not None:
ret[self.name][
"Require Explicit Policy"
] = self.require_explicit_policy
ret[self.name]["Require Explicit Policy"] = (
self.require_explicit_policy
)
if self.inhibit_policy_mapping is not None:
ret[self.name][
"Inhibit Policy Mapping"
] = self.inhibit_policy_mapping
ret[self.name]["Inhibit Policy Mapping"] = (
self.inhibit_policy_mapping
)

return ret

Expand Down Expand Up @@ -1210,9 +1210,9 @@ def _string_dict(self):
for full_name in self.full_name:
ret["Full Name"].append(full_name._string_dict())
if self.name_relative_to_crl_issuer is not None:
ret[
"Name Relative To CRL Issuer"
] = self.name_relative_to_crl_issuer._string_dict()
ret["Name Relative To CRL Issuer"] = (
self.name_relative_to_crl_issuer._string_dict()
)
if self.reasons is not None:
ret["Reasons"] = []
for reason in self.reasons:
Expand Down
4 changes: 2 additions & 2 deletions pki_tools/types/ocsp.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ def from_cryptography(
).error("Couldn't convert issuer key hash to hex")
raise

if crypto_ocsp_response.revocation_time is not None:
revocation_time = crypto_ocsp_response.revocation_time
if crypto_ocsp_response.revocation_time_utc is not None:
revocation_time = crypto_ocsp_response.revocation_time_utc

ret = cls(
response_status=getattr(OcspResponseStatus, response_status.name),
Expand Down
6 changes: 3 additions & 3 deletions pki_tools/types/signature_algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,9 @@ class SignatureAlgorithm(BaseModel):
model_config = ConfigDict(arbitrary_types_allowed=True)

algorithm: HashAlgorithm
parameters: Optional[
Union[PSSPadding, PKCS1v15Padding, ECDSAPadding]
] = None
parameters: Optional[Union[PSSPadding, PKCS1v15Padding, ECDSAPadding]] = (
None
)

@classmethod
def from_cryptography(
Expand Down
418 changes: 208 additions & 210 deletions poetry.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ repository = "https://github.com/fulder/pki-tools"

[tool.poetry.dependencies]
python = "^3.8"
cryptography = ">=42.0.0,<43.0.0"
cryptography = ">=42.0.0,<44.0.0"
loguru = "^0.7.2"
pydantic = "^2.8.0"
pydantic = "^2.8.2"
httpx = "^0.27.0"
pyyaml = "^6.0.1"
pyyaml = "^6.0.2"
pytz = "^2024.1"

[tool.poetry.group.test]
optional = true

[tool.poetry.group.test.dependencies]
pytest = "^8.2.2"
pytest = "^8.3.2"
pytest-mock = "^3.14.0"
pytest-xdist = "^3.6.1"
pytest-cov = "^5.0.0"
Expand All @@ -41,11 +41,11 @@ smokeshow = "^0.4.0"
optional = true

[tool.poetry.group.lint.dependencies]
ruff = ">=0.5.0,<0.5.1"
ruff = ">=0.5.0,<0.5.8"

[tool.poetry.group.dev.dependencies]
mkdocstrings = {extras = ["python"], version = "^0.25.1"}
pymdown-extensions = "^10.8"
mkdocstrings = {extras = ["python"], version = "^0.25.2"}
pymdown-extensions = "^10.9"

[tool.poetry.group.apitest.dependencies]
httpx = "^0.27.0"
Expand Down

0 comments on commit e82a97a

Please sign in to comment.