Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft:Windows specific prefix check (magick), add support for windows in github actions #555

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Test

on: [push, pull_request]
on:
push:
branches:
- testing
pull_request:
branches:
- testing

jobs:
test:
Expand All @@ -9,22 +14,36 @@ jobs:
strategy:
matrix:
python-version: [3.8, 3.9, 3.10.x, 3.11, 3.12]
os: [ubuntu-latest]
os: [ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}

- name: Install system dependencies (Linux)
if: runner.os == 'Linux'
run: |
sudo apt update
sudo apt install tesseract-ocr poppler-utils imagemagick ghostscript
pip install -U ocrmypdf

- name: Install system dependencies (Windows)
if: runner.os == 'Windows'
run: |
choco install tesseract poppler imagemagick ghostscript
pip install -U ocrmypdf

- name: Install testing dependencies
run: |
pip install -U wheel pip
pip install --editable ".[test]"

- name: Lint with flake8
run: flake8

- name: Test with pytest
run: pytest
run: pytest
12 changes: 8 additions & 4 deletions src/invoice2data/input/tesseract.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-

import platform
import shutil
import tempfile
import mimetypes
Expand Down Expand Up @@ -32,17 +32,21 @@ def to_text(path: str, area_details: dict = None):
"""

# Check for dependencies. Needs Tesseract and Imagemagick installed.
current_platform = platform.platform()
if current_platform.startswith("win32"):
convert_command_prefix = "magick"
else:
convert_command_prefix = "convert"
if not shutil.which("tesseract"):
raise EnvironmentError("tesseract not installed.")
if not shutil.which("convert"):
if not shutil.which(convert_command_prefix):
raise EnvironmentError("imagemagick not installed.")

language = get_languages()
logger.debug("tesseract language arg is, %s", language)
timeout = 180

# convert the (multi-page) pdf file to a 300dpi png
convert = [
convert = [convert_command_prefix] + [
"convert",
"-units",
"PixelsPerInch",
Expand Down