Skip to content

Commit

Permalink
Moved paradigm to a package
Browse files Browse the repository at this point in the history
  • Loading branch information
fbanados committed Oct 18, 2024
1 parent bf141a1 commit 2b8b86d
Show file tree
Hide file tree
Showing 21 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
The paradigm table.

Parameters:
paradigm_tables: Paradigm (see CreeDictionary.paradigm.panes.Paradigm)
paradigm_tables: Paradigm (see morphodict.paradigm.panes.Paradigm)

Example:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from django.utils.html import escape, format_html
from django.utils.safestring import mark_safe

from CreeDictionary.CreeDictionary.paradigm.crkeng_corpus_frequency import (
from morphodict.paradigm.crkeng_corpus_frequency import (
observed_wordforms,
)
from morphodict.relabelling import read_labels
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.http import HttpRequest
from django.template import Context, RequestContext, Template

from CreeDictionary.CreeDictionary.paradigm.panes import RowLabel
from morphodict.paradigm.panes import RowLabel
from crkeng.app.preferences import DisplayMode


Expand Down
6 changes: 3 additions & 3 deletions src/CreeDictionary/CreeDictionary/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import morphodict.analysis
from morphodict.search import presentation, search_with_affixes
from CreeDictionary.CreeDictionary.forms import WordSearchForm
from CreeDictionary.CreeDictionary.paradigm.generation import default_paradigm_manager
from morphodict.paradigm.generation import default_paradigm_manager
from morphodict.phrase_translate.translate import (
eng_noun_entry_to_inflected_phrase_fst,
eng_phrase_to_crk_features_fst,
Expand All @@ -25,8 +25,8 @@
from crkeng.app.preferences import DisplayMode, AnimateEmoji, ShowEmoji
from morphodict.lexicon.models import Wordform

from .paradigm.manager import ParadigmDoesNotExistError
from .paradigm.panes import Paradigm, WordformCell
from morphodict.paradigm.manager import ParadigmDoesNotExistError
from morphodict.paradigm.panes import Paradigm, WordformCell
from morphodict.utils import url_for_query

# The index template expects to be rendered in the following "modes";
Expand Down
4 changes: 2 additions & 2 deletions src/crkeng/app/integration_tests/test_paradigm_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import pytest
from more_itertools import first, ilen

from CreeDictionary.CreeDictionary.paradigm.generation import default_paradigm_manager
from CreeDictionary.CreeDictionary.paradigm.manager import (
from morphodict.paradigm.generation import default_paradigm_manager
from morphodict.paradigm.manager import (
ParadigmManager,
ParadigmManagerWithExplicitSizes,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from django.template import RequestContext, Template

from CreeDictionary.CreeDictionary.orthography import to_macrons, to_syllabics
from CreeDictionary.CreeDictionary.paradigm.panes import RowLabel
from morphodict.paradigm.panes import RowLabel
from CreeDictionary.morphodict.orthography import ORTHOGRAPHY
from pytest_django.asserts import assertInHTML
from crkeng.app.preferences import DisplayMode
Expand Down
4 changes: 2 additions & 2 deletions src/crkeng/app/integration_tests/test_render_paradigm.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

from more_itertools import first

from CreeDictionary.CreeDictionary.paradigm.generation import default_paradigm_manager
from morphodict.paradigm.generation import default_paradigm_manager

# mîcisow - s/he eats (basic vocabulary)
from CreeDictionary.CreeDictionary.paradigm.panes import CompoundRow, RowLabel
from morphodict.paradigm.panes import CompoundRow, RowLabel

VAI_LEMMA = "mîcisow"

Expand Down
2 changes: 1 addition & 1 deletion src/morphodict/lexicon/importer/testdata/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ arbitrary ways to test what the importer would do if you made arbitrary changes
to the input data.

It would have been better to use sample data not related to a specific language,
with a stubbed or special-purpose FST, as CreeDictionary.paradigm.test_manager
with a stubbed or special-purpose FST, as morphodict.paradigm.test_manager
does.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from django.db.models import Max
from tqdm import tqdm

from CreeDictionary.CreeDictionary.paradigm.generation import default_paradigm_manager
from morphodict.paradigm.generation import default_paradigm_manager
from morphodict.phrase_translate.translate import (
translate_single_definition,
TranslationStats,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from django.conf import settings

import morphodict.analysis
from CreeDictionary.CreeDictionary.paradigm.manager import (
from morphodict.paradigm.manager import (
ParadigmManager,
ParadigmManagerWithExplicitSizes,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from django.conf import settings

from CreeDictionary.CreeDictionary.paradigm.panes import Paradigm, ParadigmLayout
from morphodict.paradigm.panes import Paradigm, ParadigmLayout

# I would *like* a singleton for this, but, currently, it interacts poorly with mypy :/
ONLY_SIZE = "<only-size>"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import pytest
from more_itertools import first

from CreeDictionary.CreeDictionary.paradigm.manager import (
from morphodict.paradigm.manager import (
ONLY_SIZE,
ParadigmDoesNotExistError,
ParadigmManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import pytest
from more_itertools import first, ilen, last, one

from CreeDictionary.CreeDictionary.paradigm.panes import (
from morphodict.paradigm.panes import (
CompoundRow,
EmptyCell,
MissingForm,
Expand Down
2 changes: 1 addition & 1 deletion src/morphodict/tests/test_panes.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from more_itertools import ilen as count
from more_itertools import one

from CreeDictionary.CreeDictionary.paradigm.panes import (
from morphodict.paradigm.panes import (
ColumnLabel,
ContentRow,
EmptyCell,
Expand Down

0 comments on commit 2b8b86d

Please sign in to comment.