From 70c7c0963b0baad511ea38649642fcce4d65e17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Pluta?= Date: Fri, 11 Oct 2019 16:37:43 +0200 Subject: [PATCH] Fix lack of description and version meta files --- setup.py | 11 +++++++---- smnp/cli/parser.py | 6 ++++-- __description__.txt => smnp/meta/__description__.txt | 0 smnp/meta/__init__.py | 0 __version__.txt => smnp/meta/__version__.txt | 0 5 files changed, 11 insertions(+), 6 deletions(-) rename __description__.txt => smnp/meta/__description__.txt (100%) create mode 100644 smnp/meta/__init__.py rename __version__.txt => smnp/meta/__version__.txt (100%) diff --git a/setup.py b/setup.py index f96cfea..29a30b0 100644 --- a/setup.py +++ b/setup.py @@ -8,9 +8,9 @@ def file(file): setup( name='SMNP', - version=file('__version__.txt'), - packages=find_packages(include=['smnp']), - description=file('__description__.txt'), + version=file('smnp/meta/__version__.txt'), + packages=find_packages(), + description=file('smnp/meta/__description__.txt'), author='Bartlomiej P. Pluta', url='https://gitlab.com/bartlomiej.pluta/smnp', install_requires=[ @@ -29,5 +29,8 @@ setup( entry_points={ 'console_scripts': ['smnp=smnp.main:main'] }, - package_data={'smnp.library.code': ['main.mus']} + package_data={ + 'smnp.library.code': ['main.mus'], + 'smnp.meta': ['__version__.txt', '__description__.txt'] + } ) \ No newline at end of file diff --git a/smnp/cli/parser.py b/smnp/cli/parser.py index 050df76..4414483 100644 --- a/smnp/cli/parser.py +++ b/smnp/cli/parser.py @@ -1,9 +1,11 @@ import argparse -import os + +from pkg_resources import resource_string def file(file): - return open(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, file)).read() + return resource_string('smnp.meta', file).decode("utf-8") + class CliParser(object): diff --git a/__description__.txt b/smnp/meta/__description__.txt similarity index 100% rename from __description__.txt rename to smnp/meta/__description__.txt diff --git a/smnp/meta/__init__.py b/smnp/meta/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/__version__.txt b/smnp/meta/__version__.txt similarity index 100% rename from __version__.txt rename to smnp/meta/__version__.txt