update tasks.py

Author: sarahmish

tasks.py

@@ -1,77 +1,65 @@
 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
 
 
-COMPARISONS = {
-    '>=': operator.ge,
-    '>': operator.gt,
-    '<': operator.lt,
-    '<=': operator.le
-}
+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
 
+        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
 
-@task
-def check_dependencies(c):
-    c.run('python -m pip check')
+        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 unit(c):
-    c.run('python -m pytest --cov=sigllm --cov-report=xml')
+def install_minimum(c):
+    with open('pyproject.toml', 'rb') as pyproject_file:
+        pyproject_data = tomli.load(pyproject_file)
 
+    dependencies = pyproject_data.get('project', {}).get('dependencies', [])
+    python_version = '.'.join(map(str, sys.version_info[:2]))
+    minimum_versions = _get_minimum_versions(dependencies, python_version)
 
-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),
-        )
+    if minimum_versions:
+        c.run(f'python -m pip install {" ".join(minimum_versions)}')
 
-    return is_valid
+
+@task
+def check_dependencies(c):
+    c.run('python -m pip check')
 
 
 @task
-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)}')
+def unit(c):
+    c.run('python -m pytest --cov=sigllm --cov-report=xml')
 
 
 @task
@@ -110,8 +98,15 @@ def tutorials(c):
 @task
 def lint(c):
     check_dependencies(c)
-    c.run('flake8 sigllm tests')
-    c.run('isort -c --recursive sigllm tests')
+    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 .')
 
 
 def remove_readonly(func, path, _):