Skip to content

Commit ba92d0a

Browse files
committed
added packaging
1 parent 7f006b7 commit ba92d0a

File tree

6 files changed

+19
-31
lines changed

6 files changed

+19
-31
lines changed

dataherb/.dataherb/metadata.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

dataherb/command.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import logging
12
import os
3+
24
import click
3-
from dataherb import Flora
4-
import logging
5-
from parse.model import MetaData
5+
6+
from dataherb.flora import Flora
7+
from dataherb.parse.model import MetaData
68

79
__CWD__ = os.getcwd()
810

@@ -39,3 +41,7 @@ def create():
3941
"The .dataherb folder and metadata.yml file has been created inside \n"
4042
f"{__CWD__}"
4143
)
44+
45+
if __name__ == "__main__":
46+
fl = Flora()
47+
pass

dataherb/core/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import io
33
import json
44
from fuzzywuzzy import fuzz, process
5-
from utils.data import flatten_dict as _flatten_dict
6-
from fetch.remote import get_data_from_url as _get_data_from_url
5+
from dataherb.utils.data import flatten_dict as _flatten_dict
6+
from dataherb.fetch.remote import get_data_from_url as _get_data_from_url
77
import yaml
88
import pandas as pd
99

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import logging
2-
from fetch.remote import get_data_from_url as _get_data_from_url
3-
from core.base import Herb
4-
from core.search import search_by_keywords_in_flora as _search_by_keywords_in_flora
5-
from core.search import search_by_ids_in_flora as _search_by_ids_in_flora
2+
from dataherb.fetch.remote import get_data_from_url as _get_data_from_url
3+
from dataherb.core.base import Herb
4+
from dataherb.core.search import search_by_keywords_in_flora as _search_by_keywords_in_flora
5+
from dataherb.core.search import search_by_ids_in_flora as _search_by_ids_in_flora
66

77
logging.basicConfig()
88
logger = logging.getLogger("dataherb.dataherb")

dataherb/parse/csv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import logging
2-
from model import MetaData
2+
from dataherb.parse.model import MetaData
33

44
logging.basicConfig()
55
logger = logging.getLogger("dataherb.parse.csv")

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ def setup():
2525
author_email='[email protected]',
2626
license='MIT',
2727
packages=_find_packages(exclude=('tests',)),
28+
install_requires=_requirements(),
2829
include_package_data=True,
2930
extras_require={
3031
"docs": ["sphinx>=2.4.1", "sphinx-rtd-theme>=0.4.3"]
3132
},
3233
entry_points={
33-
"consolde_scripts": [
34-
"dataherb=command.dataherb"
34+
"console_scripts": [
35+
"dataherb=dataherb.command:dataherb"
3536
]
3637
},
3738
test_suite='nose.collector',

0 commit comments

Comments
 (0)