Skip to content

Commit

Permalink
Pull in pygobject as a Debian package dependency
Browse files Browse the repository at this point in the history
Necessary for GTK print dialog
  • Loading branch information
deeplow committed Jan 13, 2025
1 parent c070eaa commit bdf52bc
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 6 deletions.
6 changes: 3 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-pyqt5, python3-pyq
Description: securedrop client for qubes workstation

Package: securedrop-export
Architecture: all
Architecture: amd64
Depends: ${misc:Depends}, python3, udisks2, cups, cups-ipp-utils, printer-driver-brlaser, printer-driver-hpcups,
avahi-daemon, system-config-printer, xpp, libcups2, gnome-disk-utility, libreoffice,
desktop-file-utils, shared-mime-info, libfile-mimeinfo-perl
avahi-daemon, system-config-printer, libcups2, gnome-disk-utility, libreoffice,
desktop-file-utils, shared-mime-info, libfile-mimeinfo-perl, gir1.2-gtk-4.0
Description: Submission export scripts for SecureDrop Workstation
This package provides scripts used by the SecureDrop Qubes Workstation to
export submissions from the client to external storage, via the sd-export
Expand Down
2 changes: 1 addition & 1 deletion debian/setup-venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euxo pipefail

NAME=$1
if [[ $NAME == "client" ]]; then
if [[ $NAME == "client" || $NAME == "export" ]]; then
VENV_ARGS="--system-site-packages"
else
VENV_ARGS=""
Expand Down
37 changes: 35 additions & 2 deletions export/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions export/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ python = "^3.11"
pexpect = "^4.9.0"

[tool.poetry.group.dev.dependencies]
# In production these two are installed using a system package
# so match those versions exactly
pygobject = [
{version = "=3.42.2", python = ">=3.11"}, # bookworm
]
pycairo = [
{version = "=1.20.1", python = ">=3.11"}, # bookworm
]

mypy = "^1.13.0"
types-setuptools = "^75.2.0"
pytest = "^8.3.3"
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ license = "AGPLv3+"

[tool.poetry.dependencies]
python = "^3.11"
pygobject = "^3.50.0"

[tool.poetry.group.dev.dependencies]
ruff = "^0.6.4"
Expand Down

0 comments on commit bdf52bc

Please sign in to comment.