Merge pull request #275 from PyThaiNLP/revise-dependency-files

Include only direct dependency in setup.py

Author: bact

.travis.yml

@@ -20,4 +20,4 @@ deploy:
   password:
     secure: Tj3VA05qopp0mkzWu6EFTlvijAoisd0BN/gD2c/vaaDCUy6fTXBkYk+dTkjbmYkEBl/WrsrW1T/QxCt2uc6bv7QTz+qL243Edv4FFQbBKvMSNlUO+hh1jI9zv3/QzwOaNHXOsI4JGeUaN5cULfxBjsBEFN+v6E0mkgBwJ0Qdb0/yuMybLWZ9dJI8iUKiaWNIr+NQoa9a+Sxw6Ltl/mdCKPppgOYPpVMCsDDdLqZdjkgXmzsjH9+Nfe6R+mYbdmeigy3ePNsIKbPkzZrY+E/I0lPZOVUgrs6gvZwlD3gESJgTROrUH6E2lBP9yYvFUE3KB0O+rdT5GyFq3MH1uD2ocrPCTQku6577wK31FzGoex6vtT4y2b39fLbhRmZDOJW8IFO7MLybazuRsNhaXn9hQU4HBRM2GQZc41bLkiEhsUX9/b2ujcn4PJKDZy91LnBw/93bgZJ7KweDzKywmcZSNeuBsGWgXdPqYiizzcf8DdvJAYytydhf8RxqdemTiS7GE7XBoXhj1/9Vfrt3lZXZbfYpTjNZeyxu7FrUJpm/I23wCw46qaRWzKXv2sRRUleNqQ1jIKEVupIa9sruHvG7DZecErhO9rMkGdsf4CIjolZ0A2BE+eAPEEY6/H1WFUWHxzxuELbUJwxnl1By677hBkLJaVs1YMGc2enGWzOnUYI=
   on:
-    tags: true
+    tags: true

CONTRIBUTING.md

@@ -25,8 +25,8 @@ We use the famous [gitflow](http://nvie.com/posts/a-successful-git-branching-mod
   code](http://www.codinghorror.com/blog/2008/07/coding-without-comments.html);
 - Name identifiers (variables, classes, functions, module names) with meaningful
   and pronounceable names (`x` is always wrong);
-- When manipulating strings, use [f-String](https://www.python.org/dev/peps/pep-0498/)
-  (use `"{a} = {b}"`, instead of `"{} = {}".format(a, b)` and `"%s = %s' % (a, b)"`);
+- When appropriate, use [f-String](https://www.python.org/dev/peps/pep-0498/)
+  (use `f"{a} = {b}"`, instead of `"{} = {}".format(a, b)` and `"%s = %s' % (a, b)"`);
 - All `#TODO` comments should be turned into issues (use our
   [GitHub issue system](https://github.com/PyThaiNLP/pythainlp/));
 - Run all tests before pushing (just execute `tox`) so you will know if your
@@ -36,8 +36,8 @@ We use the famous [gitflow](http://nvie.com/posts/a-successful-git-branching-mod
 
 # Discussion
 
-- Facebook group (for Thai NLP Discussion only): https://www.facebook.com/groups/thainlp 
-- GitHub issues (Problems and suggestions): https://github.com/PyThaiNLP/pythainlp/issues
+- GitHub issues (PyThaiNLP problems and suggestions): https://github.com/PyThaiNLP/pythainlp/issues
+- Facebook group (Thai NLP discussion in general, not specific to PyThaiNLP): https://www.facebook.com/groups/thainlp 
 
 Happy hacking! (;
 

README-pypi.md

@@ -3,5 +3,5 @@ marisa-trie==0.7.*
 nltk==3.4.*
 pytz==2019.2
 requests==2.22.*
-tinydb==3.13.*
-tqdm==4.35.*
+tinydb==3.14.*
+tqdm==4.36.*

conda.recipe/bld.bat

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.5
+current_version = 2.1
 commit = True
 tag = True
 

conda.recipe/build.shno

@@ -2,39 +2,65 @@
 
 from setuptools import find_packages, setup
 
-with open("README-pypi.md", "r", encoding="utf-8") as readme_file:
-    readme = readme_file.read()
+readme = """
+![PyThaiNLP Logo](https://avatars0.githubusercontent.com/u/32934255?s=200&v=4)
 
-with open("requirements.txt", "r", encoding="utf-8") as f:
-    requirements = f.read().splitlines()
+PyThaiNLP is a Python library for Thai natural language processing.
+The library provides functions like word tokenization, part-of-speech tagging,
+transliteration, soundex generation, and spell checking.
+
+## Install
+
+For stable version:
+
+```sh
+pip install pythainlp
+```
+
+Some functionalities, like word vector, required extra packages.
+See https://github.com/PyThaiNLP/pythainlp for installation options.
+
+**Note for Windows**: `marisa-trie` wheels can be obtained from
+https://www.lfd.uci.edu/~gohlke/pythonlibs/#marisa-trie
+Install it with pip, for example: `pip install marisa_trie‑xxx.whl`
+"""
+
+requirements = [
+    "dill>=0.3.0,<1",
+    "marisa-trie>=0.7.5,<1",
+    "nltk>=3.4.5,<4",
+    "requests>=2.22.0,<3",
+    "tinydb>=3.13.0,<4",
+    "tqdm>=4.35.0,<5",
+]
 
 extras = {
-    "artagger": ["artagger"],
-    "attacut": ["attacut"],
-    "deepcut": ["deepcut", "keras", "tensorflow"],
-    "icu": ["pyicu"],
-    "ipa": ["epitran"],
-    "ssg": ["ssg"],
-    "ml": ["keras", "numpy", "torch"],
-    "ner": ["sklearn-crfsuite"],
-    "thai2fit": ["emoji", "gensim", "numpy"],
-    "thai2rom": ["torch", "numpy"],
-    "benchmarks": ["numpy", "pandas"],
+    "artagger": ["artagger>=0.1.0.3"],
+    "attacut": ["attacut>=1.0.2"],
+    "benchmarks": ["numpy>=1.17.2", "pandas>=0.25.1"],
+    "deepcut": ["deepcut>=0.6.1.0", "keras>=2.3.0", "tensorflow>=1.14.0"],
+    "icu": ["pyicu>=2.3.1"],
+    "ipa": ["epitran>=1.1"],
+    "ml": ["keras>=2.3.0", "numpy>=1.17.2", "torch>=1.2.0"],
+    "ner": ["sklearn-crfsuite>=0.3.6"],
+    "ssg": ["ssg>=0.0.4"],
+    "thai2fit": ["emoji>0.5.4", "gensim>=3.8.0", "numpy>=1.17.2"],
+    "thai2rom": ["torch>=1.2.0", "numpy>=1.17.2"],
     "full": [
-        "artagger",
-        "attacut",
-        "deepcut",
-        "epitran",
-        "gensim",
-        "keras",
-        "numpy",
-        "pyicu",
-        "sklearn-crfsuite",
-        "tensorflow",
-        "torch",
-        "ssg",
-        "emoji",
-        "pandas",
+        "artagger>=0.1.0.3",
+        "attacut>=1.0.2",
+        "deepcut>=0.6.1.0",
+        "epitran>=1.1",
+        "gensim>=3.8.0",
+        "keras>=2.3.0",
+        "numpy>=1.17.2",
+        "pyicu>=2.3.1",
+        "sklearn-crfsuite>=0.3.6",
+        "tensorflow>=1.14.0",
+        "torch>=1.2.0",
+        "ssg>=0.0.4",
+        "emoji>=0.5.4",
+        "pandas>=0.25.1",
     ],
 }