From 6d199dbca2f24fcd59a7657312a53a0c0ffbfd8b Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 21 Dec 2025 15:43:17 +1100 Subject: [PATCH] Fix dependency on my sqlcipher4 package --- CHANGELOG.md | 4 ++++ Dockerfile.debbuild | 2 ++ README.md | 11 +++++++++++ bouquin/db.py | 4 ++-- bouquin/invoices.py | 2 +- bouquin/tag_browser.py | 2 +- bouquin/time_log.py | 2 +- debian/changelog | 6 ++++++ debian/control | 8 ++++++-- pyproject.toml | 2 +- tests/test_db.py | 2 +- tests/test_tags.py | 2 +- tests/test_time_log.py | 2 +- 13 files changed, 38 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76cb0af..e236649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.7.5 + + * Fix import of sqlcipher4 + # 0.7.4 * Depend on my own bouquin-sqlcipher4 package (upgraded to latest SQLCipher 4.12.0) diff --git a/Dockerfile.debbuild b/Dockerfile.debbuild index 6f7817d..4c22e05 100644 --- a/Dockerfile.debbuild +++ b/Dockerfile.debbuild @@ -33,6 +33,8 @@ RUN set -eux; \ python3-pyside6.qtprintsupport \ python3-requests \ python3-markdown \ + libxcb-cursor0 \ + fonts-noto-core \ ; \ rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index 2f34b42..a7b5ec0 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,17 @@ Make sure you have `libxcb-cursor0` installed (on Debian-based distributions) or If downloading from my Forgejo's Releases page, you may wish to verify the GPG signatures with my [GPG key](https://mig5.net/static/mig5.asc). +### Debian 13 ('Trixie') + +```bash +sudo mkdir -p /usr/share/keyrings +curl -fsSL https://mig5.net/static/mig5.asc | sudo gpg --dearmor -o /usr/share/keyrings/mig5.gpg +echo "deb [arch=amd64 signed-by=/usr/share/keyrings/mig5.gpg] https://apt.mig5.net $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/mig5.list +sudo apt update +sudo apt install bouquin +``` + + ### From PyPi/pip * `pip install bouquin` diff --git a/bouquin/db.py b/bouquin/db.py index f0d5b5f..d1c6a69 100644 --- a/bouquin/db.py +++ b/bouquin/db.py @@ -12,8 +12,8 @@ from pathlib import Path from typing import Dict, List, Sequence, Tuple import markdown -from sqlcipher3 import Binary -from sqlcipher3 import dbapi2 as sqlite +from sqlcipher4 import Binary +from sqlcipher4 import dbapi2 as sqlite from . import strings diff --git a/bouquin/invoices.py b/bouquin/invoices.py index 18071d6..a0b50cb 100644 --- a/bouquin/invoices.py +++ b/bouquin/invoices.py @@ -29,7 +29,7 @@ from PySide6.QtWidgets import ( QVBoxLayout, QWidget, ) -from sqlcipher3 import dbapi2 as sqlite3 +from sqlcipher4 import dbapi2 as sqlite3 from . import strings from .db import DBManager, TimeLogRow diff --git a/bouquin/tag_browser.py b/bouquin/tag_browser.py index 210f7d3..3d81c3a 100644 --- a/bouquin/tag_browser.py +++ b/bouquin/tag_browser.py @@ -12,7 +12,7 @@ from PySide6.QtWidgets import ( QTreeWidgetItem, QVBoxLayout, ) -from sqlcipher3.dbapi2 import IntegrityError +from sqlcipher4.dbapi2 import IntegrityError from . import strings from .db import DBManager diff --git a/bouquin/time_log.py b/bouquin/time_log.py index 05d7e98..b93e286 100644 --- a/bouquin/time_log.py +++ b/bouquin/time_log.py @@ -39,7 +39,7 @@ from PySide6.QtWidgets import ( QVBoxLayout, QWidget, ) -from sqlcipher3.dbapi2 import IntegrityError +from sqlcipher4.dbapi2 import IntegrityError from . import strings from .db import DBManager diff --git a/debian/changelog b/debian/changelog index 4fcb39b..146e349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bouquin (0.7.5) unstable; urgency=medium + + * Add libxcb-cursor0 dependency + + -- Miguel Jacq Sun, 21 Dec 2025 15:30:00 +1100 + bouquin (0.7.4) unstable; urgency=medium * Initial build for Debian diff --git a/debian/control b/debian/control index a771056..e787e41 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,9 @@ Build-Depends: python3-pyside6.qtsvg, python3-pyside6.qtprintsupport, python3-requests, - python3-markdown + python3-markdown, + libxcb-cursor0, + fonts-noto-core Standards-Version: 4.6.2 Homepage: https://git.mig5.net/mig5/bouquin @@ -30,6 +32,8 @@ Depends: ${misc:Depends}, ${python3:Depends}, python3-pyside6.qtprintsupport, python3-sqlcipher4, python3-requests, - python3-markdown + python3-markdown, + libxcb-cursor0, + fonts-noto-core Description: A simple, opinionated notebook application written in Python, PyQt and SQLCipher. Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher. diff --git a/pyproject.toml b/pyproject.toml index cb54944..deeaa8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "bouquin" -version = "0.7.4" +version = "0.7.5" description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher." authors = ["Miguel Jacq "] readme = "README.md" diff --git a/tests/test_db.py b/tests/test_db.py index f4f8bc4..48eff24 100644 --- a/tests/test_db.py +++ b/tests/test_db.py @@ -5,7 +5,7 @@ from datetime import date, timedelta import pytest from bouquin.db import DBManager -from sqlcipher3 import dbapi2 as sqlite +from sqlcipher4 import dbapi2 as sqlite def _today(): diff --git a/tests/test_tags.py b/tests/test_tags.py index 89e5fbd..cb1f1d1 100644 --- a/tests/test_tags.py +++ b/tests/test_tags.py @@ -14,7 +14,7 @@ from PySide6.QtWidgets import ( QInputDialog, QMessageBox, ) -from sqlcipher3.dbapi2 import IntegrityError +from sqlcipher4.dbapi2 import IntegrityError # ============================================================================ # DB Layer Tag Tests diff --git a/tests/test_time_log.py b/tests/test_time_log.py index ff1d159..45db626 100644 --- a/tests/test_time_log.py +++ b/tests/test_time_log.py @@ -12,7 +12,7 @@ from bouquin.time_log import ( ) from PySide6.QtCore import QDate, Qt from PySide6.QtWidgets import QDialog, QFileDialog, QInputDialog, QMessageBox -from sqlcipher3.dbapi2 import IntegrityError +from sqlcipher4.dbapi2 import IntegrityError @pytest.fixture