From b8d17260872afbd350bc8a4761101dcd2341305b Mon Sep 17 00:00:00 2001
From: Dima Gerasimov <karlicoss@gmail.com>
Date: Sun, 9 Feb 2025 23:18:05 +0000
Subject: [PATCH] some ci fixes after BS4 and ruff updates

---
 .ci/github-ci-compat | 17 ++++-------------
 ruff.toml            |  2 ++
 tox.ini              |  2 ++
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.ci/github-ci-compat b/.ci/github-ci-compat
index 8adf33ef..4d6879e4 100755
--- a/.ci/github-ci-compat
+++ b/.ci/github-ci-compat
@@ -7,21 +7,12 @@ if ! which sudo; then
     apt -y install sudo
 fi
 
-# compensate for differences between ubuntu:focal and github action image...
-
-sudo apt -y install python3.10 python3.10-dev
-sudo python3.10 -m pip install -U setuptools pip # ugh. otherwise find_namespace_packages is missing
-
-# just in case? not sure if need anymore
-sudo ln -sfT "$(which python3.10)" /usr/bin/python3
+# make up for differences between ubuntu:focal and github action image...
+sudo apt -y install python3.12 python3.12-dev
+sudo apt -y install python3-pip python3-setuptools
 
 # otherwise setuptools don't work..
 sudo apt -y install git
 
 # jq wants it??
-sudo apt -y install dh-autoreconf
-
-sudo apt -y install python3-pip
-
-# this is only necessary on gitlab CI apparently???
-sudo apt -y install python3-setuptools
+sudo apt -y install dh-autoreconf
\ No newline at end of file
diff --git a/ruff.toml b/ruff.toml
index 431e0292..fbe58744 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -144,4 +144,6 @@ lint.ignore = [
 
     "ARG001",  # ugh, kinda annoying when using pytest fixtures
     "RUF001", "RUF002", "RUF003",  # spams about non-latin characters that we do use for testing
+
+    "A005",  #  we're using promnesia.logging module
 ]
diff --git a/tox.ini b/tox.ini
index 1c7f680b..ff4e8505 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,6 +54,7 @@ commands =
 [testenv:tests-all]
 deps =
     -e .[testing,all,HPI,org]
+    beautifulsoup4<4.13.0  # FIXME temporary hack until https://github.com/purarue/google_takeout_parser/pull/81 is merged
     uv  # for hpi module install
 commands =
     # used in some tests
@@ -99,6 +100,7 @@ commands =
 [testenv:mypy-misc]
 deps =
     -e .[testing,HPI,org]  # todo install from HPI[all] or something?
+    beautifulsoup4<4.13.0  # FIXME temporary hack until https://github.com/purarue/google_takeout_parser/pull/81 is merged
     uv  # for hpi module install
 commands =
     {envpython} -m my.core module install \