From c7614c67c6849dae09f4769b7800a02f17ca198b Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Thu, 3 Aug 2023 17:42:19 +0200
Subject: [PATCH] Use python3-requests and deps from flatpak-common

---
 container.yaml |  5 -----
 dialect.yaml   | 31 ++-----------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/container.yaml b/container.yaml
index b58714e..15e7541 100644
--- a/container.yaml
+++ b/container.yaml
@@ -12,8 +12,3 @@ flatpak:
         --socket=fallback-x11
         --socket=wayland
         --socket=pulseaudio
-    cleanup-commands: |
-        ln -sfn /usr/lib/python3.*/site-packages/six.py \
-          /app/lib/python3.*/site-packages/urllib3/packages/six.py
-        ln -sfn /usr/lib/python3.*/site-packages/__pycache__/six.* \
-          /app/lib/python3.*/site-packages/urllib3/packages/__pycache__/
diff --git a/dialect.yaml b/dialect.yaml
index b8a4702..4cca43e 100644
--- a/dialect.yaml
+++ b/dialect.yaml
@@ -13,15 +13,13 @@ data:
     - MIT
   buildopts:
     arches: [aarch64, x86_64]
-    rpms:
-      macros: |
-        %_py3_shebang_s %nil
-        %_without_tests 1
   dependencies:
   - buildrequires:
+      flatpak-common: [f38]
       flatpak-runtime: [f38]
       platform: [f38]
     requires:
+      flatpak-common: [f38]
       flatpak-runtime: [f38]
       platform: [f38]
   profiles:
@@ -33,15 +31,10 @@ data:
       - python3-gtts
       # indirect deps
       - python3-beautifulsoup4
-      - python3-charset-normalizer
       - python3-click
       - python3-gtts-token
-      - python3-idna
       - python3-lxml
-      - python3-pysocks
-      - python3-requests
       - python3-soupsieve
-      - python3-urllib3
   components:
     rpms:
       dbus-python:
@@ -65,36 +58,16 @@ data:
         rationale: Runtime dependency
         ref: f38
         arches: [aarch64, x86_64]
-      python-charset-normalizer:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
       python-click:
         rationale: Runtime dependency
         ref: f38
         arches: [aarch64, x86_64]
-      python-idna:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
       python-lxml:
         rationale: Runtime dependency
         ref: f38
         arches: [aarch64, x86_64]
-      python-pysocks:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-      python-requests:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
       python-soupsieve:
         rationale: Runtime dependency
         ref: f38
         arches: [aarch64, x86_64]
-      python-urllib3:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
 ...