Fix dependency on my sqlcipher4 package
This commit is contained in:
parent
ffc52bdf08
commit
6d199dbca2
13 changed files with 38 additions and 11 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
# 0.7.5
|
||||||
|
|
||||||
|
* Fix import of sqlcipher4
|
||||||
|
|
||||||
# 0.7.4
|
# 0.7.4
|
||||||
|
|
||||||
* Depend on my own bouquin-sqlcipher4 package (upgraded to latest SQLCipher 4.12.0)
|
* Depend on my own bouquin-sqlcipher4 package (upgraded to latest SQLCipher 4.12.0)
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,8 @@ RUN set -eux; \
|
||||||
python3-pyside6.qtprintsupport \
|
python3-pyside6.qtprintsupport \
|
||||||
python3-requests \
|
python3-requests \
|
||||||
python3-markdown \
|
python3-markdown \
|
||||||
|
libxcb-cursor0 \
|
||||||
|
fonts-noto-core \
|
||||||
; \
|
; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
|
||||||
11
README.md
11
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).
|
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
|
### From PyPi/pip
|
||||||
|
|
||||||
* `pip install bouquin`
|
* `pip install bouquin`
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ from pathlib import Path
|
||||||
from typing import Dict, List, Sequence, Tuple
|
from typing import Dict, List, Sequence, Tuple
|
||||||
|
|
||||||
import markdown
|
import markdown
|
||||||
from sqlcipher3 import Binary
|
from sqlcipher4 import Binary
|
||||||
from sqlcipher3 import dbapi2 as sqlite
|
from sqlcipher4 import dbapi2 as sqlite
|
||||||
|
|
||||||
from . import strings
|
from . import strings
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ from PySide6.QtWidgets import (
|
||||||
QVBoxLayout,
|
QVBoxLayout,
|
||||||
QWidget,
|
QWidget,
|
||||||
)
|
)
|
||||||
from sqlcipher3 import dbapi2 as sqlite3
|
from sqlcipher4 import dbapi2 as sqlite3
|
||||||
|
|
||||||
from . import strings
|
from . import strings
|
||||||
from .db import DBManager, TimeLogRow
|
from .db import DBManager, TimeLogRow
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ from PySide6.QtWidgets import (
|
||||||
QTreeWidgetItem,
|
QTreeWidgetItem,
|
||||||
QVBoxLayout,
|
QVBoxLayout,
|
||||||
)
|
)
|
||||||
from sqlcipher3.dbapi2 import IntegrityError
|
from sqlcipher4.dbapi2 import IntegrityError
|
||||||
|
|
||||||
from . import strings
|
from . import strings
|
||||||
from .db import DBManager
|
from .db import DBManager
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ from PySide6.QtWidgets import (
|
||||||
QVBoxLayout,
|
QVBoxLayout,
|
||||||
QWidget,
|
QWidget,
|
||||||
)
|
)
|
||||||
from sqlcipher3.dbapi2 import IntegrityError
|
from sqlcipher4.dbapi2 import IntegrityError
|
||||||
|
|
||||||
from . import strings
|
from . import strings
|
||||||
from .db import DBManager
|
from .db import DBManager
|
||||||
|
|
|
||||||
6
debian/changelog
vendored
6
debian/changelog
vendored
|
|
@ -1,3 +1,9 @@
|
||||||
|
bouquin (0.7.5) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Add libxcb-cursor0 dependency
|
||||||
|
|
||||||
|
-- Miguel Jacq <mig@mig5.net> Sun, 21 Dec 2025 15:30:00 +1100
|
||||||
|
|
||||||
bouquin (0.7.4) unstable; urgency=medium
|
bouquin (0.7.4) unstable; urgency=medium
|
||||||
|
|
||||||
* Initial build for Debian
|
* Initial build for Debian
|
||||||
|
|
|
||||||
8
debian/control
vendored
8
debian/control
vendored
|
|
@ -16,7 +16,9 @@ Build-Depends:
|
||||||
python3-pyside6.qtsvg,
|
python3-pyside6.qtsvg,
|
||||||
python3-pyside6.qtprintsupport,
|
python3-pyside6.qtprintsupport,
|
||||||
python3-requests,
|
python3-requests,
|
||||||
python3-markdown
|
python3-markdown,
|
||||||
|
libxcb-cursor0,
|
||||||
|
fonts-noto-core
|
||||||
Standards-Version: 4.6.2
|
Standards-Version: 4.6.2
|
||||||
Homepage: https://git.mig5.net/mig5/bouquin
|
Homepage: https://git.mig5.net/mig5/bouquin
|
||||||
|
|
||||||
|
|
@ -30,6 +32,8 @@ Depends: ${misc:Depends}, ${python3:Depends},
|
||||||
python3-pyside6.qtprintsupport,
|
python3-pyside6.qtprintsupport,
|
||||||
python3-sqlcipher4,
|
python3-sqlcipher4,
|
||||||
python3-requests,
|
python3-requests,
|
||||||
python3-markdown
|
python3-markdown,
|
||||||
|
libxcb-cursor0,
|
||||||
|
fonts-noto-core
|
||||||
Description: A simple, opinionated notebook application written in Python, PyQt and SQLCipher.
|
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.
|
Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher.
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "bouquin"
|
name = "bouquin"
|
||||||
version = "0.7.4"
|
version = "0.7.5"
|
||||||
description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher."
|
description = "Bouquin is a simple, opinionated notebook application written in Python, PyQt and SQLCipher."
|
||||||
authors = ["Miguel Jacq <mig@mig5.net>"]
|
authors = ["Miguel Jacq <mig@mig5.net>"]
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ from datetime import date, timedelta
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from bouquin.db import DBManager
|
from bouquin.db import DBManager
|
||||||
from sqlcipher3 import dbapi2 as sqlite
|
from sqlcipher4 import dbapi2 as sqlite
|
||||||
|
|
||||||
|
|
||||||
def _today():
|
def _today():
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ from PySide6.QtWidgets import (
|
||||||
QInputDialog,
|
QInputDialog,
|
||||||
QMessageBox,
|
QMessageBox,
|
||||||
)
|
)
|
||||||
from sqlcipher3.dbapi2 import IntegrityError
|
from sqlcipher4.dbapi2 import IntegrityError
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# DB Layer Tag Tests
|
# DB Layer Tag Tests
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ from bouquin.time_log import (
|
||||||
)
|
)
|
||||||
from PySide6.QtCore import QDate, Qt
|
from PySide6.QtCore import QDate, Qt
|
||||||
from PySide6.QtWidgets import QDialog, QFileDialog, QInputDialog, QMessageBox
|
from PySide6.QtWidgets import QDialog, QFileDialog, QInputDialog, QMessageBox
|
||||||
from sqlcipher3.dbapi2 import IntegrityError
|
from sqlcipher4.dbapi2 import IntegrityError
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue