From 7e36f6f513fc9d3b3ee25a951aedc8f2b12edd39 Mon Sep 17 00:00:00 2001 From: Wannaphong Phatthiyaphaibun Date: Fri, 16 Aug 2019 11:33:35 +0700 Subject: [PATCH 1/5] Fix bug #244 --- README.md | 4 ++-- pythainlp/__init__.py | 2 +- pythainlp/util/normalize.py | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bb5511ca5..3c39a3858 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,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.5](https://github.com/PyThaiNLP/pythainlp/tree/master) +- The latest stable release is [2.0.7](https://github.com/PyThaiNLP/pythainlp/tree/master) - PyThaiNLP 2 supports Python 3.6+. Some functions may work with older version of Python 3, but it is not well-tested and will not be supported. See [change log](https://github.com/PyThaiNLP/pythainlp/issues/118). - [Upgrading from 1.7](https://thainlp.org/pythainlp/docs/2.0/notes/pythainlp-1_7-2_0.html) - [Upgrade ThaiNER from 1.7](https://github.com/PyThaiNLP/pythainlp/wiki/Upgrade-ThaiNER-from-PyThaiNLP-1.7-to-PyThaiNLP-2.0) @@ -106,7 +106,7 @@ PyThaiNLP เป็นไลบารีภาษาไพทอนเพื่ **เอกสารนี้สำหรับรุ่นพัฒนา อาจมีการเปลี่ยนแปลงได้ตลอด** -- รุ่นเสถียรล่าสุดคือรุ่น [2.0.5](https://github.com/PyThaiNLP/pythainlp/tree/master) +- รุ่นเสถียรล่าสุดคือรุ่น [2.0.7](https://github.com/PyThaiNLP/pythainlp/tree/master) - PyThaiNLP 2 รองรับ Python 3.6 ขึ้นไป - ผู้ใช้ Python 2.7+ ยังสามารถใช้ PyThaiNLP 1.6 ได้ diff --git a/pythainlp/__init__.py b/pythainlp/__init__.py index ae442c206..68250ee6f 100644 --- a/pythainlp/__init__.py +++ b/pythainlp/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -__version__ = "2.0.6" +__version__ = "2.0.7" thai_consonants = "กขฃคฅฆงจฉชซฌญฎฏฐฑฒณดตถทธนบปผฝพฟภมยรลวศษสหฬอฮ" # 44 chars thai_vowels = "ฤฦะ\u0e31าำ\u0e34\u0e35\u0e36\u0e37\u0e38\u0e39เแโใไ\u0e45\u0e47" # 19 diff --git a/pythainlp/util/normalize.py b/pythainlp/util/normalize.py index 3e05a2c69..dfcba5ffc 100644 --- a/pythainlp/util/normalize.py +++ b/pythainlp/util/normalize.py @@ -40,7 +40,7 @@ ("([่-๋])([ัิ-ื])", "\\2\\1"), ("([่-๋])([ูุ])", "\\2\\1"), ("ำ([่-๋])", "\\1ำ"), - ("(์)([ัิ-ื])", "\\2\\1"), + ("(์)([ัิ-ู])", "\\2\\1"), ] # เก็บพวก พิมพ์ลำดับผิดหรือผิดแป้นแต่กลับแสดงผลถูกต้อง ให้ไปเป็นแป้นที่ถูกต้อง เช่น เ + เ ไปเป็น แ diff --git a/setup.py b/setup.py index d4e5e0cbc..97f911290 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( name="pythainlp", - version="2.0.6", + version="2.0.7", description="Thai Natural Language Processing library", long_description=readme, long_description_content_type="text/markdown", From c6432843bf774d39b9bec81c30537c09e1b1946b Mon Sep 17 00:00:00 2001 From: bact Date: Sun, 1 Sep 2019 23:12:45 +0700 Subject: [PATCH 2/5] Update requirements.txt --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7fd66ad78..06525e404 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -dill -marisa-trie -nltk>=3.2.2 -pytz -requests -tinydb -tqdm +dill==0.3.* +marisa-trie==0.7.* +nltk==3.4.* +pytz==2019.2 +requests==2.22.* +tinydb==3.13.* +tqdm==4.35.* From 0f23cab2b8cf729034624b19f6efff2def639c53 Mon Sep 17 00:00:00 2001 From: Wannaphong Phatthiyaphaibun Date: Sat, 21 Sep 2019 12:25:05 +0700 Subject: [PATCH 3/5] Update .travis.yml --- .travis.yml | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a0179a59..b6ca50483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,22 @@ -# Config file for automatic testing at travis-ci.org -# This file will be regenerated if you run travis_pypi_setup.py - language: python python: - - "3.6" - -# workaround to make boto work on travis -# from https://github.com/travis-ci/travis-ci/issues/7940 +- '3.6' before_install: - - sudo rm -f /etc/boto.cfg - -# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors +- sudo rm -f /etc/boto.cfg install: - - pip install -U numpy - - pip install -r requirements.txt - - pip install .[artagger,icu,ipa,ner,thai2fit,deepcut] - - pip install coveralls - +- pip install -U numpy +- pip install -r requirements.txt +- pip install .[artagger,icu,ipa,ner,thai2fit,deepcut] +- pip install coveralls os: - - linux - -# command to run tests, e.g. python setup.py test -script: - coverage run --source=pythainlp setup.py test - -after_success: - coveralls - -# After you create the Github repo and add it to Travis, run the -# travis_pypi_setup.py script to finish PyPI deployment setup +- linux +script: coverage run --source=pythainlp setup.py test +after_success: coveralls deploy: provider: pypi distributions: sdist bdist_wheel user: wannaphong password: - secure: PLEASE_REPLACE_ME + 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 - repo: wannaphongcom/pythainlp - #condition: $TOXENV == py35 + tags: true \ No newline at end of file From f6318b6070747554a6b7851c24b69591eb7a2163 Mon Sep 17 00:00:00 2001 From: Wannaphong Phatthiyaphaibun Date: Sat, 21 Sep 2019 12:25:51 +0700 Subject: [PATCH 4/5] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6ca50483..623c3e835 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ script: coverage run --source=pythainlp setup.py test after_success: coveralls deploy: provider: pypi - distributions: sdist bdist_wheel + distributions: bdist_wheel user: wannaphong 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= From e850f0c0aada0a3d948a17db86b2dac2c5634019 Mon Sep 17 00:00:00 2001 From: Wannaphong Phatthiyaphaibun Date: Tue, 10 Dec 2019 15:50:55 +0700 Subject: [PATCH 5/5] Update README.md [skip ci] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7d87b2da6..2cbb338c0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,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 stable release is [2.1](https://github.com/PyThaiNLP/pythainlp/releases) - The latest development release is [2.1.dev8](https://github.com/PyThaiNLP/pythainlp/releases). See the ongoing [2.1 change log](https://github.com/PyThaiNLP/pythainlp/issues/181). - 📫 follow our [PyThaiNLP](https://www.facebook.com/pythainlp/) Facebook page @@ -131,7 +131,7 @@ PyThaiNLP เป็นไลบารีภาษาไพทอนเพื่ **เอกสารนี้สำหรับรุ่นพัฒนา อาจมีการเปลี่ยนแปลงได้ตลอด** -- รุ่นเสถียรล่าสุดคือรุ่น [2.0.7](https://github.com/PyThaiNLP/pythainlp/releases) +- รุ่นเสถียรล่าสุดคือรุ่น [2.1](https://github.com/PyThaiNLP/pythainlp/releases) - PyThaiNLP 2 รองรับ Python 3.6 ขึ้นไป - ผู้ใช้ Python 2.7+ ยังสามารถใช้ PyThaiNLP 1.6 ได้