Fix setup.py references

Author: lajohn4747

CONTRIBUTING.rst

@@ -218,16 +218,7 @@ This will perform the following actions:
 
 2. Bump the current version to the next release candidate, ``X.Y.Z.dev(N+1)``
 
-After this is done, the new pre-release can be installed by including the ``dev`` section in the
-dependency specification, either in ``setup.py``::
-
-    install_requires = [
-        ...
-        'sdmetrics>=X.Y.Z.dev',
-        ...
-    ]
-
-or in command line::
+After this is done, the new pre-release can be installed in command line::
 
     pip install 'sdmetrics>=X.Y.Z.dev'
 

Makefile

@@ -126,8 +126,7 @@ coverage: ## check code coverage quickly with the default Python
 
 .PHONY: dist
 dist: clean ## builds source and wheel package
-	python setup.py sdist
-	python setup.py bdist_wheel
+	python -m build --wheel --sdist
 	ls -l dist
 
 .PHONY: publish-confirm

setup.cfg

@@ -3,20 +3,20 @@ current_version = 0.13.1.dev0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?
-serialize = 
+serialize =
 	{major}.{minor}.{patch}.{release}{candidate}
 	{major}.{minor}.{patch}
 
 [bumpversion:part:release]
 optional_value = release
 first_value = dev
-values = 
+values =
 	dev
 	release
 
 [bumpversion:part:candidate]
 
-[bumpversion:file:setup.py]
+[bumpversion:file:pyproject.toml]
 search = version='{current_version}'
 replace = version='{new_version}'
 
@@ -57,6 +57,4 @@ use_parentheses = True
 [aliases]
 test = pytest
 
-[tool:pytest]
-collect_ignore = ['setup.py']
 

tasks.py

@@ -2,9 +2,9 @@
 import inspect
 import operator
 import os
-import re
-import pkg_resources
-import platform
+import toml
+from packaging.requirements import Requirement
+from packaging.version import Version
 import shutil
 import stat
 from pathlib import Path
@@ -20,7 +20,7 @@
 
 
 if not hasattr(inspect, 'getargspec'):
-     inspect.getargspec = inspect.getfullargspec
+    inspect.getargspec = inspect.getfullargspec
 
 
 @task
@@ -38,51 +38,48 @@ def integration(c):
     c.run('python -m pytest ./tests/integration --reruns 5 --disable-warnings')
 
 
-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),
-        )
+def _get_minimum_versions(dependencies, python_version):
+    min_versions = {}
+    for dependency in dependencies:
+        if '@' in dependency:
+            name, url = dependency.split(' @ ')
+            min_versions[name] = f'{name} @ {url}'
+            continue
 
-    return is_valid
+        req = Requirement(dependency)
+        if ';' in dependency:
+            marker = req.marker
+            if marker and not marker.evaluate({'python_version': python_version}):
+                continue  # Skip this dependency if the marker does not apply to the current Python version
+
+        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:
+                # Change when a valid newer version is found
+                min_versions[req.name] = f'{req.name}=={new_version}'
+
+    return list(min_versions.values())
 
 
 @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 == ']':
-                break
-
-            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\.?)+', 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 = [') or
-             line.startswith('pomegranate_requires = [') or
-             line.startswith('torch_requires = [')):
-            started = True
-
-    c.run(f'python -m pip install {" ".join(versions)}')
+    with open('pyproject.toml', 'r', encoding='utf-8') as pyproject_file:
+        pyproject_data = toml.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)
+
+    if minimum_versions:
+        c.run(f'python -m pip install {" ".join(minimum_versions)}')
 
 
 @task