From e07eaa47b85610ba8472b2b0fb6e51ff11d149b3 Mon Sep 17 00:00:00 2001
From: Edwin Onuonga <edwinonuonga@gmail.com>
Date: Fri, 21 Jan 2022 17:16:43 +0000
Subject: [PATCH] Remove requirements.py

---
 requirements.py | 61 -------------------------------------------------
 setup.py        | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 62 deletions(-)
 delete mode 100644 requirements.py

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..61e57189 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,72 @@
 # -*- encoding: utf-8 -*-
 
 from setuptools import setup, find_packages
-from requirements import *
+
+import platform
+from pkg_resources import packaging
 
 VERSION = '0.12.0'
 
 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,