diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b714976..86a8835a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [0.12.1](https://github.com/eonu/sequentia/releases/tag/v0.12.1) + +#### Major changes + +- Remove `requirements.py` due to import error. ([#182](https://github.com/eonu/sequentia/pull/182)) + ## [0.12.0](https://github.com/eonu/sequentia/releases/tag/v0.12.0) #### Major changes diff --git a/lib/sequentia/__init__.py b/lib/sequentia/__init__.py index d08350c1..e6abda90 100644 --- a/lib/sequentia/__init__.py +++ b/lib/sequentia/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.12.0' +__version__ = '0.12.1' from .classifiers import * from .preprocessing import * \ No newline at end of file diff --git a/requirements.py b/requirements.py deleted file mode 100644 index 951c84e4..00000000 --- a/requirements.py +++ /dev/null @@ -1,61 +0,0 @@ -import platform -from pkg_resources import packaging - -__all__ = ['python_requires', 'setup_requires', 'install_requires', 'extras_require'] - -pkg_versions = { - 'Cython': '>=0.28.5', - 'numpy': '>=1.17,<2', - 'scipy': '>=1.3,<2', - 'hmmlearn': '==0.2.4', - 'dtaidistance[numpy]': '>=2.2,<2.3', - 'scikit-learn': '>=0.22,<1', - 'tqdm': '>=4.36,<5', - 'joblib': '>=0.14,<1', - # [torch] - 'torch': '>=1.8+cpu', - # [docs] - 'sphinx': '==3.5.4', - 'numpydoc': '', - 'sphinx_rtd_theme': '', - 'm2r2': '', - # [test] - 'pytest': '==5.3.2', - # [notebooks] - 'jupyter': '==1.0.0', - 'requests': '==2.25.1', - 'matplotlib': '==3.3.3', - 'pandas': '==1.1.5', - 'seaborn': '==0.11.1', - 'torchaudio': '==0.8.0', - 'torchvision': '==0.9.0', - 'torchfsdd': '==0.1.2', - 'librosa': '==0.8.0' -} - -extra_pkgs = { - 'torch': ['dev', 'torch', 'test', 'docs', 'notebooks'], - 'pytest': ['dev', 'test'], - **{pkg:['dev', 'docs'] for pkg in ('sphinx', 'numpydoc', 'sphinx_rtd_theme', 'm2r2')}, - **{pkg:['dev', 'notebooks'] for pkg in ( - 'jupyter', 'requests', 'matplotlib', 'pandas', - 'seaborn', 'tqdm', 'torchaudio', 'torchvision', - 'torchfsdd', 'librosa' - )}, -} - -def load_requires(*pkgs): - return [pkg + pkg_versions[pkg] for pkg in pkgs] - -def reverse_extra(extra): - return [pkg + pkg_versions[pkg] for pkg, extras in extra_pkgs.items() if extra in extras] - -python_requires = '>=3.6,<3.10' - -setup_requires = load_requires('Cython', 'numpy', 'scipy') - -install_requires = load_requires('numpy', 'hmmlearn', 'dtaidistance[numpy]', 'scipy', 'scikit-learn', 'tqdm', 'joblib') -if packaging.version.parse(platform.python_version()) < packaging.version.parse('3.8'): - install_requires.append('importlib_metadata') # Backports for importlib.metadata in Python <3.8 - -extras_require = {extra:reverse_extra(extra) for extra in ('torch', 'dev', 'test', 'notebooks', 'docs')} \ No newline at end of file diff --git a/setup.py b/setup.py index fb842283..95b632c9 100644 --- a/setup.py +++ b/setup.py @@ -2,13 +2,72 @@ # -*- encoding: utf-8 -*- from setuptools import setup, find_packages -from requirements import * -VERSION = '0.12.0' +import platform +from pkg_resources import packaging + +VERSION = '0.12.1' with open('README.md', 'r', encoding='utf8') as fh: long_description = fh.read() +pkg_versions = { + 'Cython': '>=0.28.5', + 'numpy': '>=1.17,<2', + 'scipy': '>=1.3,<2', + 'hmmlearn': '==0.2.4', + 'dtaidistance[numpy]': '>=2.2,<2.3', + 'scikit-learn': '>=0.22,<1', + 'tqdm': '>=4.36,<5', + 'joblib': '>=0.14,<1', + # [torch] + 'torch': '>=1.8+cpu', + # [docs] + 'sphinx': '==3.5.4', + 'numpydoc': '', + 'sphinx_rtd_theme': '', + 'm2r2': '', + # [test] + 'pytest': '==5.3.2', + # [notebooks] + 'jupyter': '==1.0.0', + 'requests': '==2.25.1', + 'matplotlib': '==3.3.3', + 'pandas': '==1.1.5', + 'seaborn': '==0.11.1', + 'torchaudio': '==0.8.0', + 'torchvision': '==0.9.0', + 'torchfsdd': '==0.1.2', + 'librosa': '==0.8.0' +} + +extra_pkgs = { + 'torch': ['dev', 'torch', 'test', 'docs', 'notebooks'], + 'pytest': ['dev', 'test'], + **{pkg:['dev', 'docs'] for pkg in ('sphinx', 'numpydoc', 'sphinx_rtd_theme', 'm2r2')}, + **{pkg:['dev', 'notebooks'] for pkg in ( + 'jupyter', 'requests', 'matplotlib', 'pandas', + 'seaborn', 'tqdm', 'torchaudio', 'torchvision', + 'torchfsdd', 'librosa' + )}, +} + +def load_requires(*pkgs): + return [pkg + pkg_versions[pkg] for pkg in pkgs] + +def reverse_extra(extra): + return [pkg + pkg_versions[pkg] for pkg, extras in extra_pkgs.items() if extra in extras] + +python_requires = '>=3.6,<3.10' + +setup_requires = load_requires('Cython', 'numpy', 'scipy') + +install_requires = load_requires('numpy', 'hmmlearn', 'dtaidistance[numpy]', 'scipy', 'scikit-learn', 'tqdm', 'joblib') +if packaging.version.parse(platform.python_version()) < packaging.version.parse('3.8'): + install_requires.append('importlib_metadata') # Backports for importlib.metadata in Python <3.8 + +extras_require = {extra:reverse_extra(extra) for extra in ('torch', 'dev', 'test', 'notebooks', 'docs')} + setup( name = 'sequentia', version = VERSION,