From 8692ea99e3c61be80d139030ecf21568cf69ffc9 Mon Sep 17 00:00:00 2001 From: Alvaro Bartolome Date: Thu, 21 May 2020 09:29:48 +0200 Subject: [PATCH] some minor changes/fixes - improved requirements parse function so as to receive filename as param - generated and included requirements.txt for both tests/ and docs/ - included all requirements.txt files into MANIFEST.in #7 - updated release version from 0.6 to 0.7 - updated docs/ (make clean & make html) --- MANIFEST.in | 3 +++ README.md | 2 +- docs/conf.py | 2 +- docs/installation.rst | 2 +- docs/requirements.txt | 3 +++ docs/usage.rst | 2 +- setup.py | 21 ++++++++++++++------- tests/requirements.txt | 4 ++++ trendet/__init__.py | 2 +- 9 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 docs/requirements.txt create mode 100644 tests/requirements.txt diff --git a/MANIFEST.in b/MANIFEST.in index bb3ec5f..2ce2c6e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,4 @@ include README.md +include requirements.txt +include docs/requirements.txt +include tests/requirements.txt \ No newline at end of file diff --git a/README.md b/README.md index a13ab46..946de0a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ In order to get this package working you will need to install it using pip by ty Or just install the current release or a specific release version such as: -``$ python -m pip install trendet==0.6`` +``$ python -m pip install trendet==0.7`` ## Usage diff --git a/docs/conf.py b/docs/conf.py index 2fcc309..d127891 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -27,7 +27,7 @@ author = 'Alvaro Bartolome del Canto' # The full version, including alpha/beta/rc tags -release = '0.6' +release = '0.7' # -- General configuration --------------------------------------------------- diff --git a/docs/installation.rst b/docs/installation.rst index 99db977..eb76b71 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -7,4 +7,4 @@ In order to get this package working you will need to install it using pip by ty Or just install the current release or a specific release version such as:: - $ python -m pip install trendet==0.6 + $ python -m pip install trendet==0.7 diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..52243b6 --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,3 @@ +sphinx==2.4.4 +sphinx_rtd_theme==0.4.3 +recommonmark==0.6.0 \ No newline at end of file diff --git a/docs/usage.rst b/docs/usage.rst index 3ab7e1c..cf5d4a9 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -70,7 +70,7 @@ Identify All Trends of investpy DataFrame ----------------------------------------- Additionally **trendet** allows the user to identify/detect all the up and down trends on the market -via the function ``identify_all_trends`` which has been included in 0.6 release. So on, the sample code for +via the function ``identify_all_trends`` which has been included in 0.7 release. So on, the sample code for its usage is as follows: .. code-block:: python diff --git a/setup.py b/setup.py index 66eeaec..c80be0a 100644 --- a/setup.py +++ b/setup.py @@ -9,9 +9,9 @@ def readme(): with io.open('README.md', encoding='utf-8') as f: return f.read() -def requirements(): +def requirements(filename): reqs = list() - with io.open('requirements.txt', encoding='utf-8') as f: + with io.open(filename, encoding='utf-8') as f: for line in f.readlines(): reqs.append(line.strip()) return reqs @@ -19,17 +19,17 @@ def requirements(): setup( name='trendet', - version='0.6', + version='0.7', packages=find_packages(), url='https://github.com/alvarobartt/trendet', - download_url='https://github.com/alvarobartt/trendet/archive/0.6.tar.gz', + download_url='https://github.com/alvarobartt/trendet/archive/0.7.tar.gz', license='MIT License', author='Alvaro Bartolome', author_email='alvarob96@usal.es', - description='trendet - Trend detection on stock time series data', + description='Trend detection on stock time series data', long_description=readme(), long_description_content_type='text/markdown', - install_requires=requirements(), + install_requires=requirements(filename="requirements.txt"), include_package_data=True, classifiers=[ "Development Status :: 4 - Beta", @@ -44,8 +44,15 @@ def requirements(): "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Software Development :: Libraries", ], - keywords='trend detection, stock analysis, stock, trend analysis', + keywords=', '.join([ + "trend detection", "stock analysis", "stock", "trend analysis", + "stock trends", "financial trends" + ]), python_requires='>=3', + extras_require={ + "tests": requirements(filename='tests/requirements.txt'), + "docs": requirements(filename='docs/requirements.txt') + }, project_urls={ 'Bug Reports': 'https://github.com/alvarobartt/trendet/issues', 'Source': 'https://github.com/alvarobartt/trendet', diff --git a/tests/requirements.txt b/tests/requirements.txt new file mode 100644 index 0000000..35bf8e7 --- /dev/null +++ b/tests/requirements.txt @@ -0,0 +1,4 @@ +pytest +codecov +pytest-codecov +investpy>=0.9.14 \ No newline at end of file diff --git a/trendet/__init__.py b/trendet/__init__.py index 10220a9..bd2ab8e 100644 --- a/trendet/__init__.py +++ b/trendet/__init__.py @@ -2,6 +2,6 @@ # See LICENSE for details. __author__ = 'Alvaro Bartolome @ alvarobartt on GitHub' -__version__ = '0.6' +__version__ = '0.7' from .identification import identify_trends, identify_all_trends, identify_df_trends