Update to changes from dev branch

README.md

@@ -11,6 +11,7 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/9g3mfcwchi8em40x?svg=true)](https://ci.appveyor.com/project/wannaphongcom/pythainlp-9y1ch)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/cb946260c87a4cc5905ca608704406f7)](https://www.codacy.com/app/pythainlp/pythainlp_2?utm_source=github.com&utm_medium=referral&utm_content=PyThaiNLP/pythainlp&utm_campaign=Badge_Grade)
 [![Coverage Status](https://coveralls.io/repos/github/PyThaiNLP/pythainlp/badge.svg?branch=dev)](https://coveralls.io/github/PyThaiNLP/pythainlp?branch=dev) [![Google Colab Badge](https://badgen.net/badge/Launch%20Quick%20Start%20Guide/on%20Google%20Colab/blue?icon=terminal)](https://colab.research.google.com/github/PyThaiNLP/tutorials/blob/master/source/notebooks/pythainlp-get-started.ipynb)
+[![DOI](https://zenodo.org/badge/61813823.svg)](https://zenodo.org/badge/latestdoi/61813823)
 
 Thai Natural Language Processing in Python.
 
@@ -23,7 +24,7 @@ PyThaiNLP is a Python package for text processing and linguistic analysis, simil
 **This is a document for development branch (post 2.0). Things will break.**
 
 - The latest stable release is [2.0.7](https://github.com/PyThaiNLP/pythainlp/releases)
-- The latest development release is [2.1.dev6](https://github.com/PyThaiNLP/pythainlp/releases). See [2.1 change log](https://github.com/PyThaiNLP/pythainlp/issues/181).
+- The latest development release is [2.1.dev7](https://github.com/PyThaiNLP/pythainlp/releases). See [2.1 change log](https://github.com/PyThaiNLP/pythainlp/issues/181).
 - 📫 follow our [PyThaiNLP](https://www.facebook.com/pythainlp/) Facebook page
 
 
@@ -39,7 +40,7 @@ PyThaiNLP is a Python package for text processing and linguistic analysis, simil
 - Thai spelling suggestion and correction (`spell` and `correct`)
 - Thai soundex (`soundex`) with three engines (`lk82`, `udom83`, `metasound`)
 - Thai WordNet wrapper
-- and much more - see examples in [PyThaiNLP Get Started notebook](https://github.com/PyThaiNLP/pythainlp/blob/dev/notebooks/pythainlp-get-started.ipynb).
+- and much more - see examples in [tutorials](https://www.thainlp.org/pythainlp/tutorials/).
 
 
 ## Installation
@@ -150,7 +151,7 @@ PyThaiNLP เป็นไลบารีภาษาไพทอนเพื่
 - ตรวจคำสะกดผิดในภาษาไทย (`spell`, `correct`)
 - soundex ภาษาไทย (`soundex`) 3 วิธีการ (`lk82`, `udom83`, `metasound`)
 - Thai WordNet wrapper
-- และอื่น ๆ ดูตัวอย่างได้ใน [PyThaiNLP Get Started notebook](https://github.com/PyThaiNLP/pythainlp/blob/dev/notebooks/pythainlp-get-started.ipynb)
+- และอื่น ๆ ดูตัวอย่างได้ใน [tutorials สอนวิธีใช้งาน](https://www.thainlp.org/pythainlp/tutorials/)
 
 
 ## ติดตั้ง

appveyor.docs.yml

@@ -33,16 +33,18 @@ cache:
 #  - '~/pythainlp-data'
 
 install:
-  - sudo apt-get install -y pandoc libicu-dev
+  - sudo apt-get update
+  - sudo apt-get install -y pandoc libicu-dev python3-pip
   - python -V
   - python3 -V
   - pip -V
+  - pip3 -V
   - export LD_LIBRARY_PATH=/usr/local/lib
-  - sudo pip install -r requirements.txt
-  - sudo pip install torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
-  - sudo pip install --upgrade artagger emoji epitran gensim numpy pandas pyicu sklearn-crfsuite ssg
-  - sudo pip install --upgrade "tensorflow>=1.14,<2" deepcut
-  - sudo pip install --upgrade boto smart_open sphinx sphinx-rtd-theme
+  - sudo pip3 install -r requirements.txt
+  - sudo pip3 install torch==1.2.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
+  - sudo pip3 install --upgrade artagger emoji epitran gensim numpy pandas pyicu sklearn-crfsuite ssg
+  - sudo pip3 install --upgrade "tensorflow==1.14,<2"deepcut
+  - sudo pip3 install --upgrade boto smart_open sphinx sphinx-rtd-theme
 
 #---------------------------------#
 #       build configuration       #
@@ -55,15 +57,15 @@ build_script:
   - export RELEASE=$(echo $RELEASE | cut -d'-' -f1)
   - export TODAY=$(date +'%Y-%m-%d')
   - make html
-  - echo "Done building HTML files for the branch: $APPVEYOR_REPO_BRANCH"
-  - echo "Start cleaning the directory: /docs/$APPVEYOR_REPO_BRANCH"
-  - sudo bash ./clean_directory.sh $FTP_USER $FTP_PASSWORD $FTP_HOST $APPVEYOR_REPO_BRANCH
-  - echo "Start uploading files from: ./build/html"
-  - echo "to: thainlp.org/pythainlp/docs/$APPVEYOR_REPO_BRANCH"
+  - echo "Done building HTML files for the branch '$CURRENT_BRANCH'"
+  - echo "Start cleaning the directory '/docs/$CURRENT_BRANCH'"
+  - sudo bash ./clean_directory.sh $FTP_USER $FTP_PASSWORD $FTP_HOST $CURRENT_BRANCH
+  - echo "Start uploading files from './build/html'"
+  - echo "to 'thainlp.org/pythainlp/docs/$CURRENT_BRANCH'"
   - cd ./_build/html
-  - find . -type f -name "*" -print -exec curl --ftp-create-dir --ipv4 -T {} ftp://${FTP_USER}:${FTP_PASSWORD}@${FTP_HOST}/public_html/pythainlp/docs/$APPVEYOR_REPO_BRANCH/{} \;
+  - find . -type f -name "*" -print -exec curl --ftp-create-dir --ipv4 -T {} ftp://${FTP_USER}:${FTP_PASSWORD}@${FTP_HOST}/public_html/pythainlp/docs/$CURRENT_BRANCH/{} \;
   - echo "Done uploading."
-  - echo "Files uploaded to: thainlp.org/pythainlp/docs/$APPVEYOR_REPO_BRANCH"
+  - echo "Files uploaded to 'thainlp.org/pythainlp/docs/$CURRENT_BRANCH'"
 
 artifacts:
   - path: ./docs/_build/html

docs/api/util.rst

@@ -23,10 +23,10 @@ Modules
 .. autofunction:: num_to_thaiword
 .. autofunction:: rank
 .. autofunction:: reign_year_to_ad
+.. autofunction:: thai_time
 .. autofunction:: text_to_arabic_digit
 .. autofunction:: text_to_thai_digit
 .. autofunction:: thai_strftime
 .. autofunction:: thai_to_eng
 .. autofunction:: thai_digit_to_arabic_digit
 .. autofunction:: thaiword_to_num
-.. autofunction:: thai_time

setup.py

@@ -63,7 +63,7 @@
 
 setup(
     name="pythainlp",
-    version="2.1.dev6",
+    version="2.1.dev7",
     description="Thai Natural Language Processing library",
     long_description=readme,
     long_description_content_type="text/markdown",