diff --git a/MANIFEST.in b/MANIFEST.in index 2548cde6..f5643d9b 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ +include requirements.txt recursive-include sklearn_porter *.txt *.py \ No newline at end of file diff --git a/setup.py b/setup.py index b07c9325..b7ee51af 100644 --- a/setup.py +++ b/setup.py @@ -1,29 +1,33 @@ # -*- coding: utf-8 -*- import os -from setuptools import setup, find_packages +from setuptools import setup +from setuptools import find_packages -path = os.path.abspath(os.path.dirname(__file__)) +def read_version(): + src_dir = os.path.abspath(os.path.dirname(__file__)) + ver_file = os.path.join(src_dir, 'sklearn_porter', '__version__.txt') + version = open(ver_file, 'r').readlines().pop() + if isinstance(version, bytes): + version = version.decode('utf-8') + version = str(version).strip() + return version -# Version: -version_path = str(os.path.join(path, 'sklearn_porter', '__version__.txt')) -version = open(version_path).readlines().pop() -if isinstance(version, bytes): - version = version.decode('utf-8') -version = str(version).strip() -# Requirements: -requirements_path = os.path.join(path, 'requirements.txt') -with open(requirements_path) as f: - all_reqs = f.read().split('\n') -requirements = [x.strip() for x in all_reqs if 'git+' not in x] +def parse_requirements(): + src_dir = os.path.abspath(os.path.dirname(__file__)) + req_file = os.path.join(src_dir, 'requirements.txt') + reqs = open(req_file, 'r').read().strip().split('\n') + reqs = [req.strip() for req in reqs if 'git+' not in req] + return reqs + setup( name='sklearn-porter', packages=find_packages(exclude=["tests.*", "tests"]), include_package_data=True, - version=version, + version=read_version(), description='Transpile trained scikit-learn models to C, Java, JavaScript and others.', author='Darius Morawiec', author_email='ping@nok.onl', @@ -38,7 +42,7 @@ 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', ], - install_requires=requirements, + install_requires=parse_requirements(), keywords=['sklearn', 'scikit-learn'], license='MIT', ) diff --git a/sklearn_porter/__version__.txt b/sklearn_porter/__version__.txt index 79a2734b..5d4294b9 100644 --- a/sklearn_porter/__version__.txt +++ b/sklearn_porter/__version__.txt @@ -1 +1 @@ -0.5.0 \ No newline at end of file +0.5.1 \ No newline at end of file