From 39b0a1d7cc8fe67baec616ec48ffba75c1949d01 Mon Sep 17 00:00:00 2001 From: pictuga Date: Tue, 14 Apr 2020 17:36:42 +0200 Subject: [PATCH] setup.py: fix deps & files --- README.md | 2 +- requirements.txt | 5 ----- setup.py | 31 ++++++++++++++++++++----------- 3 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 requirements.txt diff --git a/README.md b/README.md index 8fde243..9bf2e07 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ You do need: Simplest way to get these: ```shell -pip install -r requirements.txt +pip install git+https://git.pictuga.com/pictuga/morss.git@master ``` You may also need: diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 24a03c2..0000000 --- a/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -lxml -bs4 -python-dateutil <= 1.5 -chardet -pymysql diff --git a/setup.py b/setup.py index 239c2de..157fed1 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,23 @@ -from setuptools import setup, find_packages +from setuptools import setup +from glob import glob package_name = 'morss' + setup( - name=package_name, - description='Get full-text RSS feeds', - author='pictuga, Samuel Marks', - author_email='contact at pictuga dot com', - url='http://morss.it/', - license='AGPL v3', - package_dir={package_name: package_name}, - packages=find_packages(), - package_data={package_name: ['feedify.ini', 'reader.html.template']}, - test_suite=package_name + '.tests') + name = package_name, + description = 'Get full-text RSS feeds', + author = 'pictuga, Samuel Marks', + author_email = 'contact at pictuga dot com', + url = 'http://morss.it/', + download_url = 'https://git.pictuga.com/pictuga/morss', + license = 'AGPL v3', + packages = [package_name], + install_requires = ['lxml', 'bs4', 'python-dateutil', 'chardet', 'pymysql'], + package_data = {package_name: ['feedify.ini', 'reader.html.template']}, + data_files = [ + ('share/' + package_name, glob('www/*.*')), + ('share/' + package_name + '/cgi', []) + ], + entry_points = { + 'console_scripts': [package_name + '=' + package_name + ':main'] + })