From 3ba42802d171d56e1aaa6dcb3347713694adef6a Mon Sep 17 00:00:00 2001 From: akierig <31905184+akierig@users.noreply.github.com> Date: Sun, 7 Apr 2024 07:33:57 +0000 Subject: [PATCH 1/2] added Macports install information (#1286) --- README.md | 1 + docs/installation.rst | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c28ffaf..9078926c 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ Linux, Windows, macOS and FreeBSD are supported. Docker images are also availabl | Windows Subsystem for Linux | ``apt install ocrmypdf`` | | Fedora | ``dnf install ocrmypdf`` | | macOS (Homebrew) | ``brew install ocrmypdf`` | +| macOS (MacPorts) | ``port install ocrmypdf`` | | macOS (nix) | ``nix-env -i ocrmypdf`` | | LinuxBrew | ``brew install ocrmypdf`` | | FreeBSD | ``pkg install py-ocrmypdf`` | diff --git a/docs/installation.rst b/docs/installation.rst index 0a508c96..cb6101fa 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -23,7 +23,9 @@ These platforms have one-liner installs: +-------------------------------+-----------------------------------------+ | Fedora | ``dnf install ocrmypdf tesseract-osd`` | +-------------------------------+-----------------------------------------+ -| macOS | ``brew install ocrmypdf`` | +| macOS (Homebrew) | ``brew install ocrmypdf`` | ++-------------------------------+-----------------------------------------+ +| macOS (MacPorts) | ``port install ocrmypdf`` | +-------------------------------+-----------------------------------------+ | LinuxBrew | ``brew install ocrmypdf`` | +-------------------------------+-----------------------------------------+ @@ -325,6 +327,22 @@ languages you can optionally install them all: brew install tesseract-lang # Optional: Install all language packs +MacPorts +-------- + +.. image:: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fports.macports.org%2Fapi%2Fv1%2Fports%2Focrmypdf%2F%3Fformat%3Djson&query=version&label=MacPorts + :alt: Macports Version Information + :target: https://ports.macports.org/port/ocrmypdf + +OCRmyPDF is includes in MacPorts: + +.. code-block:: bash + + sudo port install ocrmypdf + +Note that while this will install tesseract you will need to install +the appropriate tesseract `language ports `__. + Manual installation on macOS ---------------------------- From df3451e779422729a55e74359854d36c7d4c2ab4 Mon Sep 17 00:00:00 2001 From: Ben Beasley Date: Sun, 7 Apr 2024 03:34:34 -0400 Subject: [PATCH 2/2] Update the typer[all] dependency to typer-slim[standard] (#1287) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In 0.12.1, Typer was significantly reorganized. - `typer-slim` is the library (for `import typer`) - `typer-slim[standard]` adds optional dependencies (currently `rich` and `shellingham`, basically equivalent to the old `typer[all]`) - `typer-cli` is the `typer` command-line tool - `typer` is now basically a metapackage that brings in *all of the above*, and it no longer has an `all` extra Pip will warn about this and proceed, ``` WARNING: typer 0.12.1 does not provide the extra 'all' ``` but there are other tools that will fail hard when asked to resolve a (now) nonexistent extra. Since this project doesn’t need the `typer` command-line tool, it looks like changing the dependency to `typer-slim[standard]` is the best way forward. See https://typer.tiangolo.com/release-notes/#0121 and tiangolo/typer#785 for further discussion and details. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4d228361..d0e2bf1c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ test = [ "types-Pillow", "types-humanfriendly", ] -watcher = ["watchdog>=1.0.2", "typer[all]", "python-dotenv"] +watcher = ["watchdog>=1.0.2", "typer-slim[standard]", "python-dotenv"] webservice = ["Flask>=2.0.1"] [project.scripts]