requirements-detector 1.3.2__tar.gz → 1.5.0__tar.gz

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/PKG-INFO

@@ -1,29 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: requirements-detector
-Version: 1.3.2
+Version: 1.5.0
 Summary: Python tool to find and list requirements of a Python project
-Home-page: https://github.com/landscapeio/requirements-detector
 License: MIT
+License-File: LICENSE
 Keywords: python,requirements detector
 Author: Landscape.io
 Author-email: code@landscape.io
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Quality Assurance
-Requires-Dist: astroid (>=3.0,<4.0)
+Requires-Dist: astroid (>=4.0,<5.0)
 Requires-Dist: packaging (>=21.3)
 Requires-Dist: semver (>=3.0.0,<4.0.0)
-Requires-Dist: toml (>=0.10.2,<0.11.0) ; python_version < "3.11"
+Requires-Dist: tomli (>=2.2.1,<3.0.0) ; python_version < "3.11"
+Project-URL: Homepage, https://github.com/landscapeio/requirements-detector
 Description-Content-Type: text/markdown
 
 # Requirements Detector
@@ -45,7 +46,7 @@ When run from the root of a Python project, it will try to ascertain which libra
 It uses the following methods in order, in the root of the project:
 
 1. Parse `setup.py` (if this is successful, the remaining steps are skipped)
-2. Parse `pyproject.yoml` (if a `tool.poetry.dependencies` section is found, the remaining steps are skipped)
+2. Parse `pyproject.toml` (if a `tool.poetry.dependencies` section is found, the remaining steps are skipped)
 3. Parse `requirements.txt` or `requirements.pip`
 4. Parse all `*.txt` and `*.pip` files inside a folder called `requirements`
 5. Parse all files in the root folder matching `*requirements*.txt` or `reqs.txt` (so for example, `pip_requirements.txt` would match, as would `requirements_common.txt`)

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/README.md

@@ -17,7 +17,7 @@ When run from the root of a Python project, it will try to ascertain which libra
 It uses the following methods in order, in the root of the project:
 
 1. Parse `setup.py` (if this is successful, the remaining steps are skipped)
-2. Parse `pyproject.yoml` (if a `tool.poetry.dependencies` section is found, the remaining steps are skipped)
+2. Parse `pyproject.toml` (if a `tool.poetry.dependencies` section is found, the remaining steps are skipped)
 3. Parse `requirements.txt` or `requirements.pip`
 4. Parse all `*.txt` and `*.pip` files inside a folder called `requirements`
 5. Parse all files in the root folder matching `*requirements*.txt` or `reqs.txt` (so for example, `pip_requirements.txt` would match, as would `requirements_common.txt`)

requirements_detector-1.5.0/pyproject.toml

@@ -0,0 +1,49 @@
+[build-system]
+build-backend = "poetry.core.masonry.api"
+requires = [ "poetry-core>=1" ]
+
+[tool.poetry]
+name = "requirements-detector"
+version = "1.5.0"
+authors = [ "Landscape.io <code@landscape.io>" ]
+classifiers = [
+  'Development Status :: 5 - Production/Stable',
+  'Environment :: Console',
+  'Intended Audience :: Developers',
+  'Operating System :: Unix',
+  'Topic :: Software Development :: Quality Assurance',
+  'Programming Language :: Python :: 3.10',
+  'Programming Language :: Python :: 3.11',
+  'Programming Language :: Python :: 3.12',
+  'Programming Language :: Python :: 3.13',
+  'License :: OSI Approved :: MIT License',
+]
+license = "MIT"
+keywords = [ "python", "requirements detector" ]
+description = "Python tool to find and list requirements of a Python project"
+readme = "README.md"
+homepage = "https://github.com/landscapeio/requirements-detector"
+packages = [
+  { include = "requirements_detector/" },
+]
+include = [
+  "c2cgeoform/py.typed",
+]
+
+[tool.poetry.dependencies]
+python = ">=3.10,<4.0"
+astroid = "^4.0"
+packaging = ">=21.3"
+tomli = { version = "^2.2.1", python = "<3.11" }
+semver = "^3.0.0"
+
+[tool.poetry.dev-dependencies]
+tox = "^3.24.5"
+pre-commit = "^4.2.0"
+pytest = "^6.2.4"
+twine = "^6.1.0"
+coverage = "^5.5"
+pytest-benchmark = "^3.4.1"
+pytest-cov = "^2.12.1"
+[tool.poetry.scripts]
+detect-requirements = 'requirements_detector.run:run'

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/__init__.py

@@ -8,3 +8,14 @@ from requirements_detector.detect import (  # from_setup_py,
     from_requirements_txt,
     from_setup_py,
 )
+
+__all__ = [
+    "CouldNotParseRequirements",
+    "RequirementsNotFound",
+    "find_requirements",
+    "from_pyproject_toml",
+    "from_requirements_blob",
+    "from_requirements_dir",
+    "from_requirements_txt",
+    "from_setup_py",
+]

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/detect.py

@@ -1,21 +1,19 @@
 import re
-import sys
 from pathlib import Path
 from typing import List, Optional, Union
 
-import toml
-
 from .exceptions import CouldNotParseRequirements, RequirementsNotFound
 from .handle_setup import from_setup_py
 from .poetry_semver import parse_constraint
 from .poetry_semver.version_constraint import VersionConstraint
 from .requirement import DetectedRequirement
 
-_USE_TOMLLIB = sys.version_info.major > 3 or sys.version_info.minor >= 11
-if _USE_TOMLLIB:
+try:
+    # added in Python 3.11: https://docs.python.org/3/library/tomllib.html
     import tomllib
-else:
-    import toml
+except ImportError:
+    # for Python <= 3.10:
+    import tomli as tomllib
 
 __all__ = [
     "find_requirements",
@@ -89,7 +87,7 @@ def find_requirements(path: P) -> List[DetectedRequirement]:
         if reqfile.exists and reqfile.is_file():
             try:
                 requirements += from_requirements_txt(reqfile)
-            except CouldNotParseRequirements as e:
+            except CouldNotParseRequirements:
                 pass
 
     requirements_dir = path / "requirements"
@@ -135,11 +133,9 @@ def from_pyproject_toml(toml_file: P) -> List[DetectedRequirement]:
     if isinstance(toml_file, str):
         toml_file = Path(toml_file)
 
-    if _USE_TOMLLIB:
-        with open(toml_file, "rb") as toml_file_open:
-            parsed = tomllib.load(toml_file_open)
-    else:
-        parsed = toml.load(toml_file)
+    with open(toml_file, "rb") as toml_file_open:
+        parsed = tomllib.load(toml_file_open)
+
     poetry_section = parsed.get("tool", {}).get("poetry", {})
     dependencies = poetry_section.get("dependencies", {})
     dependencies.update(poetry_section.get("dev-dependencies", {}))
@@ -156,7 +152,12 @@ def from_pyproject_toml(toml_file: P) -> List[DetectedRequirement]:
                 continue
         assert parsed_spec_obj is not None
         parsed_spec = str(parsed_spec_obj)
-        if "," not in parsed_spec and "<" not in parsed_spec and ">" not in parsed_spec and "=" not in parsed_spec:
+        if (
+            "," not in parsed_spec
+            and "<" not in parsed_spec
+            and ">" not in parsed_spec
+            and "=" not in parsed_spec
+        ):
             parsed_spec = f"=={parsed_spec}"
 
         req = DetectedRequirement.parse(f"{name}{parsed_spec}", toml_file)

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/poetry_semver/__init__.py

@@ -1,6 +1,5 @@
 import re
 
-from .empty_constraint import EmptyConstraint
 from .patterns import (
     BASIC_CONSTRAINT,
     CARET_CONSTRAINT,
@@ -23,7 +22,9 @@ def parse_constraint(constraints: str) -> VersionConstraint:
     or_constraints = re.split(r"\s*\|\|?\s*", constraints.strip())
     or_groups = []
     for constraints in or_constraints:
-        and_constraints = re.split("(?<!^)(?<![=>< ,]) *(?<!-)[, ](?!-) *(?!,|$)", constraints)
+        and_constraints = re.split(
+            "(?<!^)(?<![=>< ,]) *(?<!-)[, ](?!-) *(?!,|$)", constraints
+        )
         constraint_objects = []
 
         if len(and_constraints) > 1:
@@ -61,7 +62,9 @@ def parse_single_constraint(constraint: str) -> VersionConstraint:
         if len(m.group(1).split(".")) == 1:
             high = version.stable.next_major
 
-        return VersionRange(version, high, include_min=True, always_include_max_prerelease=True)
+        return VersionRange(
+            version, high, include_min=True, always_include_max_prerelease=True
+        )
 
     # PEP 440 Tilde range (~=)
     m = TILDE_PEP440_CONSTRAINT.match(constraint)
@@ -82,7 +85,9 @@ def parse_single_constraint(constraint: str) -> VersionConstraint:
             low = Version(version.major, version.minor, version.patch)
             high = version.stable.next_minor
 
-        return VersionRange(low, high, include_min=True, always_include_max_prerelease=True)
+        return VersionRange(
+            low, high, include_min=True, always_include_max_prerelease=True
+        )
 
     # Caret range
     m = CARET_CONSTRAINT.match(constraint)
@@ -142,7 +147,9 @@ def parse_single_constraint(constraint: str) -> VersionConstraint:
         try:
             version = Version.parse(version)
         except ValueError:
-            raise ValueError("Could not parse version constraint: {}".format(constraint))
+            raise ValueError(
+                "Could not parse version constraint: {}".format(constraint)
+            )
 
         if op == "<":
             return VersionRange(max=version)

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/poetry_semver/patterns.py

@@ -6,7 +6,9 @@ MODIFIERS = (
     r"([+-]?([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?"
 )
 
-_COMPLETE_VERSION = r"v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?{}(?:\+[^\s]+)?".format(MODIFIERS)
+_COMPLETE_VERSION = (
+    r"v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.(\d+))?{}(?:\+[^\s]+)?".format(MODIFIERS)
+)
 
 COMPLETE_VERSION = re.compile("(?i)" + _COMPLETE_VERSION)
 
@@ -14,4 +16,6 @@ CARET_CONSTRAINT = re.compile(r"(?i)^\^({})$".format(_COMPLETE_VERSION))
 TILDE_CONSTRAINT = re.compile("(?i)^~(?!=)({})$".format(_COMPLETE_VERSION))
 TILDE_PEP440_CONSTRAINT = re.compile("(?i)^~=({})$".format(_COMPLETE_VERSION))
 X_CONSTRAINT = re.compile(r"^(!=|==)?\s*v?(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:\.[xX*])+$")
-BASIC_CONSTRAINT = re.compile(r"(?i)^(<>|!=|>=?|<=?|==?)?\s*({}|dev)".format(_COMPLETE_VERSION))
+BASIC_CONSTRAINT = re.compile(
+    r"(?i)^(<>|!=|>=?|<=?|==?)?\s*({}|dev)".format(_COMPLETE_VERSION)
+)

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/poetry_semver/version.py

@@ -168,7 +168,9 @@ class Version(VersionRange):
 
     @property
     def first_prerelease(self) -> "Version":
-        return Version.parse("{}.{}.{}-alpha.0".format(self.major, self.minor, self.patch))
+        return Version.parse(
+            "{}.{}.{}-alpha.0".format(self.major, self.minor, self.patch)
+        )
 
     @property
     def min(self):
@@ -271,7 +273,11 @@ class Version(VersionRange):
         return self
 
     def equals_without_prerelease(self, other: "Version") -> bool:
-        return self.major == other.major and self.minor == other.minor and self.patch == other.patch
+        return (
+            self.major == other.major
+            and self.minor == other.minor
+            and self.patch == other.patch
+        )
 
     def _increment_major(self) -> "Version":
         return Version(self.major + 1, 0, 0, precision=self._precision)
@@ -280,7 +286,9 @@ class Version(VersionRange):
         return Version(self.major, self.minor + 1, 0, precision=self._precision)
 
     def _increment_patch(self) -> "Version":
-        return Version(self.major, self.minor, self.patch + 1, precision=self._precision)
+        return Version(
+            self.major, self.minor, self.patch + 1, precision=self._precision
+        )
 
     def _normalize_prerelease(self, pre: str) -> str:
         if not pre:

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/poetry_semver/version_range.py

@@ -22,7 +22,11 @@ class VersionRange(VersionConstraint):
             and not include_max
             and not full_max.is_prerelease()
             and not full_max.build
-            and (min is None or not min.is_prerelease() or not min.equals_without_prerelease(full_max))
+            and (
+                min is None
+                or not min.is_prerelease()
+                or not min.equals_without_prerelease(full_max)
+            )
         ):
             full_max = full_max.first_prerelease
 
@@ -105,7 +109,9 @@ class VersionRange(VersionConstraint):
             return any([self.allows_any(constraint) for constraint in other.ranges])
 
         if isinstance(other, VersionRange):
-            return not other.is_strictly_lower(self) and not other.is_strictly_higher(self)
+            return not other.is_strictly_lower(self) and not other.is_strictly_higher(
+                self
+            )
 
         raise ValueError("Unknown VersionConstraint type {}.".format(other))
 
@@ -160,7 +166,9 @@ class VersionRange(VersionConstraint):
             return intersect_min
 
         # If we got here, there is an actual range.
-        return VersionRange(intersect_min, intersect_max, intersect_include_min, intersect_include_max)
+        return VersionRange(
+            intersect_min, intersect_max, intersect_include_min, intersect_include_max
+        )
 
     def union(self, other: VersionConstraint) -> VersionConstraint:
         from .version import Version
@@ -170,19 +178,23 @@ class VersionRange(VersionConstraint):
                 return self
 
             if other == self.min:
-                return VersionRange(self.min, self.max, include_min=True, include_max=self.include_max)
+                return VersionRange(
+                    self.min, self.max, include_min=True, include_max=self.include_max
+                )
 
             if other == self.max:
-                return VersionRange(self.min, self.max, include_min=self.include_min, include_max=True)
+                return VersionRange(
+                    self.min, self.max, include_min=self.include_min, include_max=True
+                )
 
             return VersionUnion.of(self, other)
 
         if isinstance(other, VersionRange):
             # If the two ranges don't overlap, we won't be able to create a single
             # VersionRange for both of them.
-            edges_touch = (self.max == other.min and (self.include_max or other.include_min)) or (
-                self.min == other.max and (self.include_min or other.include_max)
-            )
+            edges_touch = (
+                self.max == other.min and (self.include_max or other.include_min)
+            ) or (self.min == other.max and (self.include_min or other.include_max))
 
             if not edges_touch and not self.allows_any(other):
                 return VersionUnion.of(self, other)
@@ -245,14 +257,18 @@ class VersionRange(VersionConstraint):
             elif self.min == other.min:
                 before = self.min
             else:
-                before = VersionRange(self.min, other.min, self.include_min, not other.include_min)
+                before = VersionRange(
+                    self.min, other.min, self.include_min, not other.include_min
+                )
 
             if not self.allows_higher(other):
                 after = None
             elif self.max == other.max:
                 after = self.max
             else:
-                after = VersionRange(other.max, self.max, not other.include_max, self.include_max)
+                after = VersionRange(
+                    other.max, self.max, not other.include_max, self.include_max
+                )
 
             if before is None and after is None:
                 return EmptyConstraint()
@@ -345,7 +361,12 @@ class VersionRange(VersionConstraint):
         if self.max != other.min:
             return False
 
-        return self.include_max and not other.include_min or not self.include_max and other.include_min
+        return (
+            self.include_max
+            and not other.include_min
+            or not self.include_max
+            and other.include_min
+        )
 
     def __eq__(self, other):
         if not isinstance(other, VersionRange):

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/poetry_semver/version_union.py

@@ -60,7 +60,10 @@ class VersionUnion(VersionConstraint):
         merged = []
         for constraint in flattened:
             # Merge this constraint with the previous one, but only if they touch.
-            if not merged or (not merged[-1].allows_any(constraint) and not merged[-1].is_adjacent_to(constraint)):
+            if not merged or (
+                not merged[-1].allows_any(constraint)
+                and not merged[-1].is_adjacent_to(constraint)
+            ):
                 merged.append(constraint)
             else:
                 merged[-1] = merged[-1].union(constraint)

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/requirement.py

@@ -8,6 +8,7 @@ we don't expect relative file paths to exist, for example. Note that the parsing
 is also intentionally more lenient - it is not our job to validate the requirements
 list.
 """
+
 import os
 import re
 from pathlib import Path
@@ -51,12 +52,18 @@ def _strip_fragment(urlparts):
 
 class DetectedRequirement:
     def __init__(
-        self, name: str = None, url: str = None, requirement: Requirement = None, location_defined: Path = None
+        self,
+        name: str = None,
+        url: str = None,
+        requirement: Requirement = None,
+        location_defined: Path = None,
     ):
         if requirement is not None:
             self.name = requirement.name
             self.requirement = requirement
-            self.version_specs = [(s.operator, s.version) for s in requirement.specifier]
+            self.version_specs = [
+                (s.operator, s.version) for s in requirement.specifier
+            ]
             self.url = None
         else:
             self.name = name
@@ -66,7 +73,9 @@ class DetectedRequirement:
         self.location_defined = location_defined
 
     def _format_specs(self) -> str:
-        return ",".join(["%s%s" % (comp, version) for comp, version in self.version_specs])
+        return ",".join(
+            ["%s%s" % (comp, version) for comp, version in self.version_specs]
+        )
 
     def pip_format(self) -> str:
         if self.url:
@@ -95,7 +104,11 @@ class DetectedRequirement:
         return "<DetectedRequirement:%s>" % str(self)
 
     def __eq__(self, other):
-        return self.name == other.name and self.url == other.url and self.version_specs == other.version_specs
+        return (
+            self.name == other.name
+            and self.url == other.url
+            and self.version_specs == other.version_specs
+        )
 
     def __gt__(self, other):
         return (self.name or "") > (other.name or "")
@@ -149,7 +162,9 @@ class DetectedRequirement:
                 # this happens if the line is invalid
                 return None
             else:
-                return DetectedRequirement(requirement=req, location_defined=location_defined)
+                return DetectedRequirement(
+                    requirement=req, location_defined=location_defined
+                )
 
         # otherwise, this is some kind of URL
         name = _parse_egg_name(url.fragment)
@@ -158,4 +173,6 @@ class DetectedRequirement:
         if vcs_scheme:
             url = "%s://%s" % (vcs_scheme, url)
 
-        return DetectedRequirement(name=name, url=url, location_defined=location_defined)
+        return DetectedRequirement(
+            name=name, url=url, location_defined=location_defined
+        )

{requirements_detector-1.3.2 → requirements_detector-1.5.0}/requirements_detector/run.py

@@ -1,4 +1,3 @@
-import os
 import sys
 from pathlib import Path
 from typing import NoReturn

requirements_detector-1.3.2/pyproject.toml

@@ -1,52 +0,0 @@
-[tool.poetry]
-name = "requirements-detector"
-version = "1.3.2"
-authors = ["Landscape.io <code@landscape.io>"]
-classifiers = [
-    'Development Status :: 5 - Production/Stable',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'Operating System :: Unix',
-    'Topic :: Software Development :: Quality Assurance',
-    'Programming Language :: Python :: 3.8',
-    'Programming Language :: Python :: 3.9',
-    'Programming Language :: Python :: 3.10',
-    'Programming Language :: Python :: 3.11',
-    'Programming Language :: Python :: 3.12',
-    'License :: OSI Approved :: MIT License',
-]
-license = "MIT"
-keywords = ["python","requirements detector"]
-description = "Python tool to find and list requirements of a Python project"
-readme = "README.md"
-homepage = "https://github.com/landscapeio/requirements-detector"
-packages = [
-  { include = "requirements_detector/"}
-]
-include = [
-  "c2cgeoform/py.typed",
-]
-
-[tool.poetry.scripts]
-detect-requirements = 'requirements_detector.run:run'
-
-[tool.poetry.dependencies]
-python = ">=3.8,<4.0"
-astroid = "^3.0"
-packaging = ">=21.3"
-toml = {version = "^0.10.2", python = "<3.11"}
-semver = "^3.0.0"
-
-[tool.poetry.dev-dependencies]
-tox = "^3.24.5"
-pre-commit = "^2.17.0"
-pytest = "^6.2.4"
-coverage = "^5.5"
-twine = "^3.8.0"
-pytest-benchmark = "^3.4.1"
-pytest-cov = "^2.12.1"
-types-toml = "^0.10.4"
-
-[build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"