From 1c0ec33841dd9c05203c3de7757c37f7a96f5e93 Mon Sep 17 00:00:00 2001 From: th3r00t Date: Fri, 8 Aug 2025 19:39:29 +0000 Subject: [PATCH] Bumped pydf2 --- install.sh | 18 ++++++++++++------ pyproject.toml | 2 +- src/backend/lib/library.py | 4 ++-- uv.lock | 12 ++++++------ 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/install.sh b/install.sh index 85dd838..b44d504 100755 --- a/install.sh +++ b/install.sh @@ -9,12 +9,18 @@ cd /tmp/pyShelf/ git fetch origin git checkout 0.8.0--dev-zipapp -# Install dependencies in the correct branch context -uv sync -#export project dependencies to requirements.txt -uv export --requirements > requirements.txt -# Install Python dependencies -pipx install -r requirements.txt +# if on arch linux, install python3-uv +if [ -f /etc/arch-release ]; then + sudo pacman -S --needed python-uv python python-pip python-pipx nodejs npm\ + libxml2 libxslt zlib libjpeg-turbo gcc base-devel python-loguru\ + python-rapidfuzz + pipx install . --include-deps + pipx ensurepath +else + sudo apt-get update + sudo apt-get install -y python3-uv python3 python3-pip nodejs npm libxml2 libxslt1-dev zlib1g-dev libjpeg-turbo8-dev build-essential + sudo pip install -r requirements.txt +fi # Build the release ./build.sh diff --git a/pyproject.toml b/pyproject.toml index c3b4fb0..489c733 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: PyPy", ] dependencies = [ - "websockets", "loguru", "pypdf2", "bs4", "requests", "psycopg2-binary", + "websockets", "loguru", "pypdf", "bs4", "requests", "psycopg2-binary", "mobi-python", "lxml", "sqlalchemy", "sqlalchemy.orm", "fastapi[all]", "jinja2", "libsass", "nodejs-bin", "npm", "brotlipy", "debugpy", "pudb", "ptipython", "chardet", "pre-commit", "coverage[toml]>=6.5","pytest", diff --git a/src/backend/lib/library.py b/src/backend/lib/library.py index 5df7a32..21bbe31 100644 --- a/src/backend/lib/library.py +++ b/src/backend/lib/library.py @@ -3,7 +3,7 @@ import os import re import zipfile -import PyPDF2 +import pypdf from bs4 import BeautifulSoup from mobi import Mobi @@ -178,7 +178,7 @@ class Catalogue: """ ddg = DuckDuckGo() try: - pdf = PyPDF2.PdfFileReader(book) + pdf = pypdf.PdfFileReader(book) except Exception: return None try: diff --git a/uv.lock b/uv.lock index 8a05303..25ff053 100644 --- a/uv.lock +++ b/uv.lock @@ -1201,12 +1201,12 @@ wheels = [ ] [[package]] -name = "pypdf2" -version = "3.0.1" +name = "pypdf" +version = "5.9.0" source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/9f/bb/18dc3062d37db6c491392007dfd1a7f524bb95886eb956569ac38a23a784/PyPDF2-3.0.1.tar.gz", hash = "sha256:a74408f69ba6271f71b9352ef4ed03dc53a31aa404d29b5d31f53bfecfee1440", size = 227419, upload-time = "2022-12-31T10:36:13.13Z" } +sdist = { url = "https://files.pythonhosted.org/packages/89/3a/584b97a228950ed85aec97c811c68473d9b8d149e6a8c155668287cf1a28/pypdf-5.9.0.tar.gz", hash = "sha256:30f67a614d558e495e1fbb157ba58c1de91ffc1718f5e0dfeb82a029233890a1", size = 5035118, upload-time = "2025-07-27T14:04:52.364Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/8e/5e/c86a5643653825d3c913719e788e41386bee415c2b87b4f955432f2de6b2/pypdf2-3.0.1-py3-none-any.whl", hash = "sha256:d16e4205cfee272fbdc0568b68d82be796540b1537508cef59388f839c191928", size = 232572, upload-time = "2022-12-31T10:36:10.327Z" }, + { url = "https://files.pythonhosted.org/packages/48/d9/6cff57c80a6963e7dd183bf09e9f21604a77716644b1e580e97b259f7612/pypdf-5.9.0-py3-none-any.whl", hash = "sha256:be10a4c54202f46d9daceaa8788be07aa8cd5ea8c25c529c50dd509206382c35", size = 313193, upload-time = "2025-07-27T14:04:50.53Z" }, ] [[package]] @@ -1233,7 +1233,7 @@ dependencies = [ { name = "psycopg2-binary" }, { name = "ptipython" }, { name = "pudb" }, - { name = "pypdf2" }, + { name = "pypdf" }, { name = "pytest" }, { name = "rapidfuzz" }, { name = "requests" }, @@ -1264,7 +1264,7 @@ requires-dist = [ { name = "psycopg2-binary" }, { name = "ptipython" }, { name = "pudb" }, - { name = "pypdf2" }, + { name = "pypdf" }, { name = "pytest" }, { name = "rapidfuzz" }, { name = "requests" },