Merge pull request #35 from Yoctol/modified_setup

Modified setup
Yoctol · Nov 1, 2018 · 1949cbc · 1949cbc
2 parents 2ca6e95 + a3f3322
commit 1949cbc
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,22 @@ language: python
 python:
   - "3.5"
   - "3.6"
-# command to install dependencies
-install: "make install"
-before_script: "make lint"
-# command to run tests
-script: "make test"
+
+install:
+  - make install
+
+script:
+  - make lint
+  - make test
+
+deploy:
+  provider: pypi
+  user: solumilken
+  password:
+    secure: dFRASkM+gXpPqqbWL8PS2XAbyutbJnU8z5rk88+J2XJhn5IyXkn6wBycXtkhgkuqT34HfIZrcTFBYgrsGu44hTXHwvQwFFHtHkU8tqLaa2gnvODlWPkG6AjmgzyrR/yAvpHpYEea13xC3biD3TGa1Do9aFbDsdfnni1Cpjd4dbcY6c2IoHp0V047tAIaq9agqeCvONVxbPbfuzvc24QbSzfyr2brJdruFR02baqZXnAmdMomLvsY1jzoUhp4k/qU449lfT1p0ITVdLyrCFxqK1A1DyvKcHRv3Shm+MeNbn3Y/AIVjfN71KQaGdsknUFmPjFbBfJPQuzSwRldGm1DaLm8a5A4WLmRmG2ZkMZWrlNWXsc/GbIFxuwA1llJruHgSf6zzwpWMECiDPh3LGo0K21f2nWSgmaJBMPIeLhxHmQ2uEUUkc7EKukdiF1X4ib024FoLvBkBfII/d1qRi6pPse7lKQRC5nILSynBAMaOwTESZnd9BGShpyH7/VPIzEI58ic/q9c/JgDQVXWp55KetSTXv9xdx4ACZ0KIalQlDJKX7dtuNIZKK9mQ8CM4hgdRxGd4Sb1wX3PTSlQEyeBXRjqu4+hjgfqgBWxNCb+9s99/3UQE1O0us6NBencIxd44exR7T8kkHdiI3Q17dxu43mn/8XDnwkiGQUz0K9GYko=
+    distributions: sdist
+  skip_upload_docs: true
+  skip_cleanup: true
+  on:
+    tags: true
+  python: 3.5
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include text_normalizer/data/*
 include text_normalizer/data/*/*
+include README.md
diff --git a/Makefile b/Makefile
@@ -41,7 +41,7 @@ clean:
 .PHONY: dev-test
 dev-test:
 	rm -rf build
-	python setup_utils/remove_so_files.py
+	python utils/setup_utils/remove_so_files.py
 	python setup.py build_ext
 	pip install -e .
 	make lint
@@ -51,3 +51,8 @@ dev-test:
 docs:
 	make installself
 	make -C docs
+
+.PHONY: distribute
+distribute:
+	make clean
+	python setup.py sdist
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from pathlib import Path
 
 from setuptools import setup, find_packages
-from setup_utils.get_ext import get_ext_modules_n_cmdclass
+from utils.setup_utils.get_ext import get_ext_modules_n_cmdclass
 
 
 ROOT_DIR = Path(__file__).parent
@@ -22,28 +22,24 @@
     long_description = '-'
 
 
-# get version
-version = ROOT_DIR.joinpath("text_normalizer", "__version__.py")
-about = {}
-with version.open() as f:
-    exec(f.read(), about)
-
-
 # get cython extension
 ext_modules, cmdclass = get_ext_modules_n_cmdclass()
 
 
 setup(
     name="text-normalizer",
-    version=about['__version__'],
+    version="0.1.3",
     description="Yoctol Natural Language Text Normalizer",
     license="MIT",
     author="Solumilken",
+    author_email="yien.tsai@yoctol.com",
+    url="https://github.com/Yoctol/text-normalizer",
     packages=find_packages(),
     install_requires=[
         'pandas;python_version>="3.5"',
         'pandas<0.21;python_version<"3.5"',
     ],
+    python_requires=">=3.5",
     long_description=long_description,
     classifiers=[
         "Programming Language :: Python",

diff --git a/text_normalizer/__init__.py b/text_normalizer/__init__.py
@@ -1,4 +1,3 @@
 from os.path import abspath, dirname
-from .__version__ import __version__ # noqa
 
 ROOT_DIR = dirname(abspath(__file__))
diff --git a/text_normalizer/__version__.py b/text_normalizer/__version__.py
diff --git a/utils/setup_utils/__init__.py b/utils/setup_utils/__init__.py
diff --git a/setup_utils/get_ext.py → utils/setup_utils/get_ext.py b/setup_utils/get_ext.py → utils/setup_utils/get_ext.py
diff --git a/setup_utils/remove_so_files.py → utils/setup_utils/remove_so_files.py b/setup_utils/remove_so_files.py → utils/setup_utils/remove_so_files.py