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
canonical · Jan 20, 2025 · c42ea20 · c42ea20
1 parent a2ef44b
commit c42ea20
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 75 deletions.
diff --git a/lib/charms/mysql/v0/architecture.py b/lib/charms/mysql/v0/architecture.py
@@ -41,8 +41,6 @@
 LIBAPI = 0
 LIBPATCH = 1
 
-PYDEPS = ["ops>=2.0.0", "pyyaml>=5.0"]
-
 
 logger = logging.getLogger(__name__)
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,23 +10,23 @@ python = "^3.10"
 ops = "^2.8.0"
 tenacity = "^8.2.2"
 boto3 = "^1.28.23"
-# TODO: Remove insecure dependency https://github.com/canonical/mysql-operator/issues/246
-pyopenssl = "^24.0.0"
 typing_extensions = "^4.7.1"
 jinja2 = "^3.1.2"
 python_hosts = "^1.0.6"
+pyyaml = "^6.0.2"
 
 [tool.poetry.group.charm-libs.dependencies]
 # data_platform_libs/v0/data_interfaces.py
 ops = ">=2.0.0"
 # data_platform_libs/v0/upgrade.py
 poetry-core = "*"
 # data_platform_libs/v0/upgrade.py requires pydantic ^1.10
-# grafana_agent/v0/cos_agent.py requires pydantic <2
-pydantic = "^1.10, <2"
+# data_platform_libs/v0/data_models.py requires pydantic ^1.10
+# grafana_agent/v0/cos_agent.py requires pydantic
+pydantic = "^1.10"
 # grafana_agent/v0/cos_agent.py
-cosl = ">=0.0.7"
-# tls_certificates_interface/v1/tls_certificates.py
+cosl = "*"
+# tls_certificates_interface/v2/tls_certificates.py
 cryptography = ">=42.0.5"
 jsonschema = "*"
 # tempo_coordinator_k8s/v0/charm_tracing.py