restore original tests

Author: sarahmish

MANIFEST.in

@@ -67,14 +67,7 @@ In this example we use `gpt_detector` pipeline and set some hyperparameters. In
 In addtion, the `SigLLM` object takes in a `decimal` argument to determine how many digits from the float value include. Here, we don't want to keep any decimal values, so we set it to zero.
 
 ```python3
-import os
 from sigllm import SigLLM
-from mlblocks.discovery import get_pipelines_paths
-
-for path in get_pipelines_paths():
-    print(path)
-    if os.path.isdir(path):
-        print(os.listdir(path))
 
 hyperparameters = {
     "orion.primitives.timeseries_anomalies.find_anomalies#1": {

README.md

@@ -102,7 +102,21 @@ include = ['sigllm', 'sigllm.*']
 namespaces = false
 
 [tool.setuptools.package-data]
-"*" = ["*.*"]
+'*' = [
+    'CONTRIBUTING.rst',
+    'HISTORY.md',
+    'README.md',
+    '*.md',
+    '*.rst',
+    '*.json',
+    'conf.py',
+    'Makefile',
+    'make.bat',
+    '*.jpg',
+    '*.png',
+    '*.gif',
+]
+
 
 [tool.setuptools.exclude-package-data]
 '*' = [

pyproject.toml

@@ -1,66 +1,77 @@
 import glob
+import operator
 import os
+import pkg_resources
+import platform
+import re
 import shutil
 import stat
-import sys
 from pathlib import Path
 
-import tomli
 from invoke import task
-from packaging.requirements import Requirement
-from packaging.version import Version
 
-from mlblocks.discovery import add_primitives_path, add_pipelines_path
 
-def _get_minimum_versions(dependencies, python_version):
-    min_versions = {}
-    for dependency in dependencies:
-        if '@' in dependency:
-            name, url = dependency.split(' @ ')
-            min_versions[name] = f'{url}#egg={name}'
-            continue
+COMPARISONS = {
+    '>=': operator.ge,
+    '>': operator.gt,
+    '<': operator.lt,
+    '<=': operator.le
+}
 
-        req = Requirement(dependency)
-        if ';' in dependency:
-            marker = req.marker
-            if marker and not marker.evaluate({'python_version': python_version}):
-                continue # python version does not match
 
-        if req.name not in min_versions:
-            min_version = next((spec.version for spec in req.specifier if spec.operator in ('>=', '==')), None)
-            if min_version:
-                min_versions[req.name] = f'{req.name}=={min_version}'
-
-        elif '@' not in min_versions[req.name]:
-            existing_version = Version(min_versions[req.name].split('==')[1])
-            new_version = next((spec.version for spec in req.specifier if spec.operator in ('>=', '==')), existing_version)
-            if new_version > existing_version:
-                min_versions[req.name] = f'{req.name}=={new_version}'
-
-    return list(min_versions.values())
+@task
+def check_dependencies(c):
+    c.run('python -m pip check')
 
 
 @task
-def install_minimum(c):
-    with open('pyproject.toml', 'rb') as pyproject_file:
-        pyproject_data = tomli.load(pyproject_file)
+def unit(c):
+    c.run('python -m pytest --cov=sigllm --cov-report=xml')
 
-    dependencies = pyproject_data.get('project', {}).get('dependencies', [])
-    python_version = '.'.join(map(str, sys.version_info[:2]))
-    minimum_versions = _get_minimum_versions(dependencies, python_version)
 
-    if minimum_versions:
-        c.run(f'python -m pip install {" ".join(minimum_versions)}')
+def _validate_python_version(line):
+    is_valid = True
+    for python_version_match in re.finditer(r"python_version(<=?|>=?|==)\'(\d\.?)+\'", line):
+        python_version = python_version_match.group(0)
+        comparison = re.search(r'(>=?|<=?|==)', python_version).group(0)
+        version_number = python_version.split(comparison)[-1].replace("'", "")
+        comparison_function = COMPARISONS[comparison]
+        is_valid = is_valid and comparison_function(
+            pkg_resources.parse_version(platform.python_version()),
+            pkg_resources.parse_version(version_number),
+        )
 
-
-@task
-def check_dependencies(c):
-    c.run('python -m pip check')
+    return is_valid
 
 
 @task
-def unit(c):
-    c.run('python -m pytest --cov=sigllm --cov-report=xml')
+def install_minimum(c):
+    with open('setup.py', 'r') as setup_py:
+        lines = setup_py.read().splitlines()
+
+    versions = []
+    started = False
+    for line in lines:
+        if started:
+            if line == ']':
+                started = False
+                continue
+
+            line = line.strip()
+            if _validate_python_version(line):
+                requirement = re.match(r'[^>]*', line).group(0)
+                requirement = re.sub(r"""['",]""", '', requirement)
+                version = re.search(r'>=?(\d\.?)+\w*', line).group(0)
+                if version:
+                    version = re.sub(r'>=?', '==', version)
+                    version = re.sub(r"""['",]""", '', version)
+                    requirement += version
+                versions.append(requirement)
+
+        elif (line.startswith('install_requires = [')):
+            started = True
+
+    c.run(f'python -m pip install {" ".join(versions)}')
 
 
 @task
@@ -72,17 +83,14 @@ def minimum(c):
 
 @task
 def readme(c):
-    pipeline_path = 'sigllm/pipelines/detector/gpt_detector.json'
     test_path = Path('tests/readme_test')
     if test_path.exists() and test_path.is_dir():
         shutil.rmtree(test_path)
 
     cwd = os.getcwd()
     os.makedirs(test_path, exist_ok=True)
-    os.makedirs(test_path / 'mlpipelines', exist_ok=True)
     shutil.copy('README.md', test_path / 'README.md')
     shutil.copy('tutorials/data.csv', test_path / 'data.csv')
-    shutil.copy(pipeline_path, test_path / 'mlpipelines' / 'gpt_detector.json')
     os.chdir(test_path)
     c.run('rundoc run --single-session python3 -t python3 README.md')
     os.chdir(cwd)
@@ -102,15 +110,8 @@ def tutorials(c):
 @task
 def lint(c):
     check_dependencies(c)
-    c.run('ruff check .')
-    c.run('ruff format --check --diff .')
-
-
-@task
-def fix_lint(c):
-    check_dependencies(c)
-    c.run('ruff check --fix .')
-    c.run('ruff format .')
+    c.run('flake8 sigllm tests')
+    c.run('isort -c --recursive sigllm tests')
 
 
 def remove_readonly(func, path, _):