diff --git a/CHANGELOG.md b/CHANGELOG.md index 67587fe..af64e3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.13.3] - Unreleased +## [0.13.4] - Unreleased +## [0.13.3] - 2020-06-23 + +### Fixed + +- Adding psutil to depency ## [0.13.2] - 2020-06-18 diff --git a/requirements-dev.txt b/requirements-dev.txt index 5781ba6..0f16998 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -13,7 +13,7 @@ psutil m2r autopep8 recommonmark -sphinx==2.2.1 # due to rtd bug on 20200418 +sphinx sphinx-rtd-theme numpydoc ipykernel diff --git a/requirements.txt b/requirements.txt index 1243712..10b4ec1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ # dependencies for end-user # Does not include GDAL, so you need to install it before - numpy>=1.10 scipy>=1.0 scikit-learn>=0.16 diff --git a/setup.py b/setup.py index f68ce80..be5db8f 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,17 @@ with open("README.md", "r") as fh: long_description = fh.read() +install_requires = [] + +with open('./requirements.txt') as requirements_txt: + requirements = requirements_txt.read().strip().splitlines() + for requirement in requirements: + if requirement.startswith('#') or requirement == (''): + continue + else: + install_requires.append(requirement) + + setuptools.setup( name='museotoolbox', @@ -34,7 +45,7 @@ author='Nicolas Karasiak', author_email='karasiak.nicolas@gmail.com', license='GPLv3', - install_requires=["numpy","scipy","matplotlib","scikit-learn",'joblib'], + install_requires=install_requires, packages=setuptools.find_packages(), classifiers=[ "Topic :: Scientific/Engineering :: Artificial Intelligence",