Merge branch 'main' into dpe-3451-expose

canonical · Feb 5, 2024 · dc5660a · dc5660a
2 parents cbb6b81 + f3fa622
commit dc5660a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 75 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -31,6 +31,13 @@ parts:
       - cargo
       - pkg-config
     charm-strict-dependencies: true
-    charm-binary-python-packages:
-      - psycopg2-binary
-      - psycopg-binary
+  libpq:
+    build-packages:
+      - libpq-dev
+    plugin: dump
+    source: /usr/lib/
+    source-type: local
+    prime:
+      - lib/
+    organize:
+      "*-linux-gnu/libpq.so*": lib/
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -21,8 +21,8 @@ pydantic = "^1.10.14"
 poetry-core = "^1.8.1"
 cryptography = "^42.0.2"
 jsonschema = "^4.21.1"
-psycopg2-binary = "^2.9.9"
-psycopg = {extras = ["binary"], version = "^3.1.17"}
+psycopg2 = "^2.9.9"
+psycopg = {extras = ["c"], version = "^3.1.17"}
 
 [tool.poetry.group.charm-libs.dependencies]
 # data_platform_libs/v0/data_interfaces.py
@@ -59,7 +59,6 @@ optional = true
 coverage = {extras = ["toml"], version = "^7.4.1"}
 pytest = "^8.0.0"
 pytest-asyncio = "*"
-psycopg2-binary = "^2.9.9"
 jinja2 = "^3.1.3"
 
 [tool.poetry.group.integration]

diff --git a/src/charm.py b/src/charm.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env -S LD_LIBRARY_PATH=lib python3
 # Copyright 2022 Canonical Ltd.
 # See LICENSE file for licensing details.