From dcda934bd6260f16d3794c0a79d2031d6e7578a9 Mon Sep 17 00:00:00 2001 From: Jung Date: Sun, 9 Sep 2018 21:50:10 +0900 Subject: [PATCH] Revert "update experimental streaming interface from koshort" This reverts commit 82368b6f59daaede482368b15d1331e3c1cd9ea5. --- .gitignore | 7 ++++++ konlpy/__init__.py | 17 ++++++++++++++ konlpy/about.py | 4 ++++ konlpy/data.py | 8 +++++++ setup.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 93 insertions(+) diff --git a/.gitignore b/.gitignore index b31d47c..9176f2b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,12 @@ .cache build/ dist/ +<<<<<<< HEAD docs/_build/ +<<<<<<< master data/ +======= +======= +docs/_build/ +>>>>>>> parent of 82368b6... update experimental streaming interface from koshort +>>>>>>> Revert "update experimental streaming interface from koshort" diff --git a/konlpy/__init__.py b/konlpy/__init__.py index a54a65c..239ee2c 100644 --- a/konlpy/__init__.py +++ b/konlpy/__init__.py @@ -6,12 +6,29 @@ from konlpy.downloader import download except IOError: pass +<<<<<<< master +======= +<<<<<<< HEAD +from .jvm import init_jvm +from . import corpus +from . import data +from . import internals +from . import tag +======= +>>>>>>> Revert "update experimental streaming interface from koshort" from konlpy.jvm import init_jvm from konlpy import ( corpus, data, +<<<<<<< master stream, internals, tag ) +======= + internals, + tag +) +>>>>>>> parent of 82368b6... update experimental streaming interface from koshort +>>>>>>> Revert "update experimental streaming interface from koshort" diff --git a/konlpy/about.py b/konlpy/about.py index e077530..7f799c2 100644 --- a/konlpy/about.py +++ b/konlpy/about.py @@ -15,7 +15,11 @@ ] __title__ = 'KoNLPy' +<<<<<<< master __version__ = '0.5.2' +======= +__version__ = '0.5.1' +>>>>>>> Revert "update experimental streaming interface from koshort" __author__ = 'Team KoNLPy' __email__ = 'konlpy@googlegroups.com' diff --git a/konlpy/data.py b/konlpy/data.py index 32a517b..dfb597d 100644 --- a/konlpy/data.py +++ b/konlpy/data.py @@ -11,8 +11,16 @@ else: import cPickle as pickle +<<<<<<< master from konlpy import utils from konlpy.constants import DATA_DIR, make_dir +======= +<<<<<<< HEAD +from . import utils +======= +from konlpy import utils +>>>>>>> parent of 82368b6... update experimental streaming interface from koshort +>>>>>>> Revert "update experimental streaming interface from koshort" #: A dictionary describing the formats that are supported by diff --git a/setup.py b/setup.py index d9bc4ce..a34d924 100644 --- a/setup.py +++ b/setup.py @@ -29,9 +29,61 @@ def _openreq(reqfile): else: return _openreq('requirements.txt') +<<<<<<< master about = get_about() setup(name='konlpy', +======= +setup(name='konlpy', +<<<<<<< HEAD + version=__version__, + description='Python package for Korean natural language processing.', + long_description="""\ +Korean, the 13th most widely spoken language in the world, is a beautiful, yet complex language. Myriad Korean NLP engines were built by numerous researchers, to computationally extract meaningful features from the labyrinthine text. + +KoNLPy is not just to create another, but to unify and build upon their shoulders, and see one step further. It is built particularly in the Python (programming) language, not only because of its its simplicity and elegance, but its powerful string processing modules and applicability to various tasks - including crawling, Web programming, and data analysis.""", + url='http://konlpy.org', + author='Lucy Park', + author_email='me@lucypark.kr', + keywords=['Korean', 'CJK', + 'NLP', 'natural language processing', + 'CL', 'computational linguistics', + 'tagging', 'tokenizing', 'linguistics', 'text analytics'], + classifiers=[ + 'Intended Audience :: Developers', + 'Intended Audience :: Education', + 'Intended Audience :: Information Technology', + 'Intended Audience :: Science/Research', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Topic :: Scientific/Engineering', + 'Topic :: Scientific/Engineering :: Artificial Intelligence', + 'Topic :: Scientific/Engineering :: Human Machine Interfaces', + 'Topic :: Scientific/Engineering :: Information Analysis', + 'Topic :: Text Processing', + 'Topic :: Text Processing :: Filters', + 'Topic :: Text Processing :: General', + 'Topic :: Text Processing :: Indexing', + 'Topic :: Text Processing :: Linguistic', + 'Development Status :: 4 - Beta', + 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', + ], + license='GPL v3+', + packages=find_packages(), + package_data={'konlpy': [ + 'data/corpus/*/*.txt', + 'data/tagset/*.json', + 'java/conf/plugin/*/*/*.json', + 'java/data/*/*', + 'java/*.jar', + 'java/bin/kr/lucypark/*/*.class', + 'java/bin/kr/lucypark/*/*/*.class', + ]}, + install_requires=requirements()) +======= +>>>>>>> Revert "update experimental streaming interface from koshort" version=about['__version__'], description=about['__summary__'], long_description=about['__description__'], @@ -70,6 +122,7 @@ def _openreq(reqfile): 'java/bin/kr/lucypark/*/*.class', 'java/bin/kr/lucypark/*/*/*.class', ]}, +<<<<<<< master entry_points={'console_scripts': [ 'stream_twitter = konlpy.stream.twitter:main', 'stream_naver = konlpy.stream.naver:main', @@ -78,3 +131,7 @@ def _openreq(reqfile): 'stream_dcinside = konlpy.stream.dcinside:main', ]}, install_requires=requirements()) +======= + install_requires=requirements()) +>>>>>>> parent of 82368b6... update experimental streaming interface from koshort +>>>>>>> Revert "update experimental streaming interface from koshort"