Skip to content

Commit

Permalink
configured import directories
Browse files Browse the repository at this point in the history
  • Loading branch information
thvitt committed Oct 16, 2018
1 parent 90dc7b8 commit 8504d52
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 34 deletions.
31 changes: 31 additions & 0 deletions setup.py
@@ -0,0 +1,31 @@
from setuptools import setup, find_packages

setup(
name='faust-macrogen',
version='0.9',
packages=find_packages('src'),
package_dir={'': 'src'},
url='',
license='',
author='Thorsten Vitt',
author_email='thorsten.vitt@uni-wuerzburg.de',
description='Macrogenesis Tools for the Faustedition',
include_package_data=True,
install_requires=[
'networkx>=2.1',
'python-igraph',
'pygraphviz',
'yaml',
'pandas',
'openpyxl',
'xlrd',
'lxml',
'requests',
'requests-cache',
'more-itertools',
'logging-tree',
'colorlog',
'tqdm',
'dataclasses',
]
)
2 changes: 1 addition & 1 deletion src/macrogen/dates.py
Expand Up @@ -13,7 +13,7 @@

import faust
from attic.graph import AbsoluteDating
from uris import Witness
from .uris import Witness


class TimeSpan(object):
Expand Down
4 changes: 2 additions & 2 deletions src/macrogen/datings.py
Expand Up @@ -10,8 +10,8 @@
from more_itertools import pairwise

import faust
from faust_logging import logging
from uris import Witness, Reference
from .faust_logging import logging
from .uris import Witness, Reference

logger = logging.getLogger(__name__)

Expand Down
8 changes: 4 additions & 4 deletions src/macrogen/graph.py
Expand Up @@ -8,10 +8,10 @@
import networkx as nx
from dataclasses import dataclass

from datings import base_graph, BiblSource, parse_datestr
from faust_logging import logging
from igraph_wrapper import to_igraph, nx_edges
from uris import Reference, Inscription, Witness, AmbiguousRef
from .datings import base_graph, BiblSource, parse_datestr
from .faust_logging import logging
from .igraph_wrapper import to_igraph, nx_edges
from .uris import Reference, Inscription, Witness, AmbiguousRef

logger = logging.getLogger(__name__)

Expand Down
8 changes: 4 additions & 4 deletions src/macrogen/main.py
@@ -1,12 +1,12 @@
#!/usr/bin/env python3

from faust_logging import logging
from .faust_logging import logging

import sys

import graph
import report
from visualize import render_all
from . import graph
from . import report
from .visualize import render_all

logger = logging.getLogger('main')

Expand Down
12 changes: 6 additions & 6 deletions src/macrogen/report.py
Expand Up @@ -9,7 +9,7 @@
from lxml.etree import Comment
from more_itertools import pairwise

from faust_logging import logging
from .faust_logging import logging

import csv
from collections.__init__ import defaultdict, Counter
Expand All @@ -19,11 +19,11 @@

import networkx as nx

import faust
from datings import BiblSource
from graph import MacrogenesisInfo, pathlink, EARLIEST, LATEST, DAY
from uris import Reference, Witness, Inscription, UnknownRef, AmbiguousRef
from visualize import write_dot, simplify_graph
from . import faust
from .datings import BiblSource
from .graph import MacrogenesisInfo, pathlink, EARLIEST, LATEST, DAY
from .uris import Reference, Witness, Inscription, UnknownRef, AmbiguousRef
from .visualize import write_dot, simplify_graph

logger = logging.getLogger(__name__)
target = Path(faust.config.get('macrogenesis', 'output-dir'))
Expand Down
2 changes: 1 addition & 1 deletion src/macrogen/uris.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from pathlib import Path

from faust_logging import logging
from .faust_logging import logging

import codecs
import csv
Expand Down
8 changes: 4 additions & 4 deletions src/macrogen/visualize.py
Expand Up @@ -8,10 +8,10 @@
from pygraphviz import AGraph
from tqdm import tqdm

from datings import BiblSource, add_timeline_edges
from faust_logging import logging
from graph import pathlink
from uris import Reference
from .datings import BiblSource, add_timeline_edges
from .faust_logging import logging
from .graph import pathlink
from .uris import Reference

logger = logging.getLogger(__name__)

Expand Down
24 changes: 12 additions & 12 deletions styles.yaml
Expand Up @@ -10,16 +10,16 @@ node:

# Node styles. Mapping (kind -> (attribute -> value))
edge:
not_before:
color: blue
not_after:
color: blue
from_:
color: green
to_:
color: green
when:
color: cyan
# not_before:
# color: blue
# not_after:
# color: blue
# from_:
# color: green
# to_:
# color: green
# when:
# color: cyan
temp-syn:
dir: none
constraint: false
Expand All @@ -34,8 +34,8 @@ edge:
color: gray
constraint: false
style: dashed
copy:
color: lightblue
# copy:
# color: lightblue

# additional style for conflicting edges
delete:
Expand Down

0 comments on commit 8504d52

Please sign in to comment.