Skip to content

Commit

Permalink
Move line-align code to its own repository
Browse files Browse the repository at this point in the history
  • Loading branch information
rafelafrance committed Apr 3, 2024
1 parent 3dd4537 commit f90679b
Show file tree
Hide file tree
Showing 36 changed files with 424 additions and 1,390 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
run: |
python -m pip install --upgrade pip setuptools wheel
pip install git+https://github.com/rafelafrance/common_utils.git@main#egg=common_utils
pip install git+https://github.com/rafelafrance/traiter.git@master#egg=traiter
pip install git+https://github.com/rafelafrance/line-align.git@main#egg=line-align
pip install .
- name: Test with unittest
run: |
Expand Down
23 changes: 21 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*journal
.$*
.lsp_symlink
*.swp

# Linters
.mypy_cache/
Expand All @@ -21,12 +22,30 @@
.pytest_cache/

# Python
__pycache__/
*.pyc
*.swp
__pycache__
*.pyo
*.pyd
.ipynb_checkpoints/

# Packaging
*.egg-info/
dist/
.Python
develop-eggs/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
.installed.cfg
*.egg
MANIFEST

# Environment
.venv/
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,24 @@ VENV=.venv
PY_VER=python3.11
PYTHON=./$(VENV)/bin/$(PY_VER)
PIP_INSTALL=$(PYTHON) -m pip install
BASE=pip setuptools wheel

test:
$(PYTHON) -m unittest discover

install: venv
$(PIP_INSTALL) -U pip setuptools wheel
$(PIP_INSTALL) -U $(BASE)
$(PIP_INSTALL) git+https://github.com/rafelafrance/common_utils.git@main#egg=common_utils
$(PIP_INSTALL) git+https://github.com/rafelafrance/traiter.git@master#egg=traiter
$(PIP_INSTALL) git+https://github.com/rafelafrance/line-align.git@main#egg=line-align
$(PIP_INSTALL) git+https://github.com/rafelafrance/spell-well.git@main#egg=spell-well
$(PIP_INSTALL) .

dev: venv
source $(VENV)/bin/activate
$(PIP_INSTALL) -U pip setuptools wheel
$(PIP_INSTALL) -U $(BASE)
$(PIP_INSTALL) -e ../../misc/common_utils
$(PIP_INSTALL) -e ../../traiter/traiter
$(PIP_INSTALL) -e ../../misc/line-align
$(PIP_INSTALL) -e ../../misc/spell-well
$(PIP_INSTALL) -e .[dev]
pre-commit install

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ E MOJAVE DESERT PROVTDENCE MTS. # canyon above
Be ‘MOJAVE DESERT, PROVIDENCE canyon “above
```

The alignment may look like the following, depending on the MSA parameters. is the gap character.
The alignment may look like the following, depending on the MSA parameters. "⋄" is the gap character.

```
⋄⋄⋄⋄MOJAVE DESERT⋄, PROVIDENCE MTS⋄.⋄: canyon ⋄above
Expand All @@ -91,7 +91,7 @@ You can install the requirements into your python environment like so:

```bash
git clone https://github.com/rafelafrance/ocr_ensemble.git
cd /path/to/ocr_ensemble
cd ocr_ensemble
make install
```

Expand Down
4 changes: 2 additions & 2 deletions ensemble/__is_correction_needed_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import textwrap
from pathlib import Path

from traiter.pylib import log
from util.pylib import log

from ensemble.pylib.ocr.is_correction_needed import build_expedition
from ensemble.pylib.is_correction_needed import build_expedition


def main():
Expand Down
63 changes: 0 additions & 63 deletions ensemble/char_sub_matrix.py

This file was deleted.

2 changes: 1 addition & 1 deletion ensemble/ocr_labels.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from util.pylib import log

from ensemble.pylib.ocr import ocr_labels
from ensemble.pylib import ocr_labels


def main():
Expand Down
Empty file.
152 changes: 0 additions & 152 deletions ensemble/pylib/builder/line_align/char_sub_matrix.py

This file was deleted.

Binary file not shown.
Loading

0 comments on commit f90679b

Please sign in to comment.