Skip to content

Commit c42ea20

Browse files
Remove pyopenssl (#589)
* Remove pyopenssl Not sure why we added this in the first place; given that if pyopenssl is importable, urllib3 will use insecure cryptography * Fix PYDEPS
1 parent a2ef44b commit c42ea20

File tree

3 files changed

+67
-75
lines changed

3 files changed

+67
-75
lines changed

lib/charms/mysql/v0/architecture.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
LIBAPI = 0
4242
LIBPATCH = 1
4343

44-
PYDEPS = ["ops>=2.0.0", "pyyaml>=5.0"]
45-
4644

4745
logger = logging.getLogger(__name__)
4846

poetry.lock

Lines changed: 61 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ python = "^3.10"
1010
ops = "^2.8.0"
1111
tenacity = "^8.2.2"
1212
boto3 = "^1.28.23"
13-
# TODO: Remove insecure dependency https://github.com/canonical/mysql-operator/issues/246
14-
pyopenssl = "^24.0.0"
1513
typing_extensions = "^4.7.1"
1614
jinja2 = "^3.1.2"
1715
python_hosts = "^1.0.6"
16+
pyyaml = "^6.0.2"
1817

1918
[tool.poetry.group.charm-libs.dependencies]
2019
# data_platform_libs/v0/data_interfaces.py
2120
ops = ">=2.0.0"
2221
# data_platform_libs/v0/upgrade.py
2322
poetry-core = "*"
2423
# data_platform_libs/v0/upgrade.py requires pydantic ^1.10
25-
# grafana_agent/v0/cos_agent.py requires pydantic <2
26-
pydantic = "^1.10, <2"
24+
# data_platform_libs/v0/data_models.py requires pydantic ^1.10
25+
# grafana_agent/v0/cos_agent.py requires pydantic
26+
pydantic = "^1.10"
2727
# grafana_agent/v0/cos_agent.py
28-
cosl = ">=0.0.7"
29-
# tls_certificates_interface/v1/tls_certificates.py
28+
cosl = "*"
29+
# tls_certificates_interface/v2/tls_certificates.py
3030
cryptography = ">=42.0.5"
3131
jsonschema = "*"
3232
# tempo_coordinator_k8s/v0/charm_tracing.py

0 commit comments

Comments
 (0)