almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 10:12:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

FIXUP: At this point, I'm just rambling

Browse source
This commit is contained in:
Alex Pyrgiotis 2024-09-18 18:33:26 +03:00
parent f6f9ff16e1
commit 8539c97421
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View file

@ -123,6 +123,7 @@ jobs:
macOS: macOS:
name: "macOS (${{ matrix.arch }})" name: "macOS (${{ matrix.arch }})"
runs-on: ${{ matrix.runner }} runs-on: ${{ matrix.runner }}
needs: download-tessdata
strategy: strategy:
matrix: matrix:
include: include:

8
dangerzone/isolation_provider/base.py
View file

@ -340,8 +340,8 @@ class IsolationProvider(ABC):
assert p.stderr assert p.stderr
debug_log = read_debug_text(p.stderr, MAX_CONVERSION_LOG_CHARS) debug_log = read_debug_text(p.stderr, MAX_CONVERSION_LOG_CHARS)
log.info( log.info(
"Conversion output (doc to pixels)\n" "Conversion output (doc to pixels)\n"
f"{DOC_TO_PIXELS_LOG_START}\n" f"{DOC_TO_PIXELS_LOG_START}\n"
f"{debug_log}" # no need for an extra newline here f"{debug_log}" # no need for an extra newline here
f"{DOC_TO_PIXELS_LOG_END}" f"{DOC_TO_PIXELS_LOG_END}"
) )

10
install/linux/build-rpm.py
View file

@ -69,9 +69,10 @@ def build(build_dir, qubes=False):
container_tar_gz = root / "share" / "container.tar.gz" container_tar_gz = root / "share" / "container.tar.gz"
container_tar_gz_bak = root / "container.tar.gz.bak" container_tar_gz_bak = root / "container.tar.gz.bak"
tessdata.rename(tessdata_bak) if tessdata.exists():
tessdata.rename(tessdata_bak)
stash_container = qubes and container_tar_gz.exists() stash_container = qubes and container_tar_gz.exists()
if stash_container: if stash_container and container_tar_gz.exists():
container_tar_gz.rename(container_tar_gz_bak) container_tar_gz.rename(container_tar_gz_bak)
try: try:
subprocess.run(["poetry", "build", "-f", "sdist"], cwd=root, check=True) subprocess.run(["poetry", "build", "-f", "sdist"], cwd=root, check=True)
@ -81,8 +82,9 @@ def build(build_dir, qubes=False):
shutil.copy2(sdist_path, build_dir / "SOURCES" / sdist_name) shutil.copy2(sdist_path, build_dir / "SOURCES" / sdist_name)
sdist_path.unlink() sdist_path.unlink()
finally: finally:
tessdata_bak.rename(tessdata) if tessdata_bak.exists():
if stash_container: tessdata_bak.rename(tessdata)
if stash_container and container_tar_gz_bak.exists():
container_tar_gz_bak.rename(container_tar_gz) container_tar_gz_bak.rename(container_tar_gz)
print("* Building RPM package") print("* Building RPM package")

1
install/linux/vendor-pymupdf.py
View file

@ -5,7 +5,6 @@ import subprocess
import sys import sys
from pathlib import Path from pathlib import Path
DZ_VENDOR_DIR = Path("./dangerzone/vendor") DZ_VENDOR_DIR = Path("./dangerzone/vendor")

1
poetry.lock generated
View file

@ -1046,3 +1046,4 @@ type = ["pytest-mypy"]
[metadata] [metadata]
lock-version = "2.0" lock-version = "2.0"
python-versions = ">=3.9,<3.13" python-versions = ">=3.9,<3.13"
content-hash = "93097a7d09c23ca12dbedd440965381fdd12dca2a8b1a0defe0f75b0e4e2092a"