diff --git a/0.7.tar.gz b/0.7.tar.gz deleted file mode 100644 index fc05b2e..0000000 --- a/0.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61de63427f34df15ede284536b31d8b102a92257e8139edc207036728f49975e -size 11291 diff --git a/1.2.2.tar.gz b/1.2.2.tar.gz new file mode 100644 index 0000000..6b4eab3 --- /dev/null +++ b/1.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faa0a493d93f6023d1e27978151e72f495af4775b4a1bc57f08bae3fb3786b07 +size 57993 diff --git a/fix-astroid-import.patch b/fix-astroid-import.patch new file mode 100644 index 0000000..e4e3c24 --- /dev/null +++ b/fix-astroid-import.patch @@ -0,0 +1,22 @@ +Index: requirements-detector-1.2.2/requirements_detector/handle_setup.py +=================================================================== +--- requirements-detector-1.2.2.orig/requirements_detector/handle_setup.py ++++ requirements-detector-1.2.2/requirements_detector/handle_setup.py +@@ -1,7 +1,7 @@ + from pathlib import Path + from typing import Union + +-from astroid import MANAGER, AstroidBuildingException, AstroidSyntaxError ++from astroid import MANAGER, AstroidBuildingError, AstroidSyntaxError + from astroid.builder import AstroidBuilder + from astroid.nodes import Assign, AssignName, Call, Const, Keyword, List, Name, Tuple + +@@ -92,7 +92,7 @@ def from_setup_py(setup_file: Union[str, + + try: + ast = AstroidBuilder(MANAGER).string_build(setup_file.open().read()) +- except (SyntaxError, AstroidBuildingException, AstroidSyntaxError): ++ except (SyntaxError, AstroidBuildingError, AstroidSyntaxError): + # if the setup file is broken, we can't do much about that... + raise CouldNotParseRequirements + diff --git a/python-requirements-detector.changes b/python-requirements-detector.changes index 424f9ee..a5efd36 100644 --- a/python-requirements-detector.changes +++ b/python-requirements-detector.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Wed Mar 27 03:30:23 UTC 2024 - Steve Kowalik + +- Update to 1.2.2: + * Stop polluting site-packages (see python-poetry/poetry#2015) + * Added semver as a dependency as it is needed by the (transplanted) + former poetry-semver code + * remove poetry-semver from the list of deps + * Updating packaging requirement in poetry lock file + * Consolidating new version and poetry dependencies after merging some PRs + * Output the dependency name without a version for poetry git, path and + url dependencies + * Tidying up some type hinting and heeding mypy warnings + * Fixing all public API methods to handle str or Path arguments + * Fixing from_setup_py to handle string and Path arguments + * Fixing handling of >=X style version ranges + * Added note about pyproject / poetry parsing + * Re-adding 3.6; prospector still supports it for now + * Handling parsing a requirements.txt generated by "poetry export" + * More refactoring, adding some type hints, moving towards astroid 2+ + only compatibility + * Refactoring setup.py handling to separate module to make testing easier + * Cleaning up unused setup.py ; fixing pre-commit +- Add patch fix-astroid-import.patch: + * Use correct exception name from Astroid. +- Switch to autosetup and pyproject macros. +- No more greedy globs in %files. + ------------------------------------------------------------------- Wed Feb 10 16:28:05 UTC 2021 - Markéta Machová diff --git a/python-requirements-detector.spec b/python-requirements-detector.spec index 0c9d0a7..2c4ce23 100644 --- a/python-requirements-detector.spec +++ b/python-requirements-detector.spec @@ -1,7 +1,7 @@ # # spec file for package python-requirements-detector # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,27 +16,33 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python Name: python-requirements-detector -Version: 0.7 +Version: 1.2.2 Release: 0 Summary: Python tool to find and list requirements of a Python project License: MIT -Group: Development/Languages/Python URL: https://github.com/landscapeio/requirements-detector -# https://github.com/landscapeio/requirements-detector/issues/25 Source: https://github.com/landscapeio/requirements-detector/archive/%{version}.tar.gz -BuildRequires: %{python_module setuptools} +Patch0: fix-astroid-import.patch +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module pip} +BuildRequires: %{python_module poetry} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-astroid >= 1.4 +Requires: python-astroid >= 2.0 +Requires: python-packaging >= 21.3 +Requires: python-semver >= 3 +Requires: python-toml >= 0.10 Requires(post): update-alternatives Requires(postun): update-alternatives BuildArch: noarch # SECTION test requirements -BuildRequires: %{python_module astroid >= 1.4} +BuildRequires: %{python_module astroid >= 2.0} +BuildRequires: %{python_module packaging >= 21.3} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module semver >= 3} +BuildRequires: %{python_module toml >= 0.10} # /SECTION %python_subpackages @@ -49,13 +55,13 @@ which libraries and the versions of those libraries that the project depends on. %prep -%setup -q -n requirements-detector-%{version} +%autosetup -p1 -n requirements-detector-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/detect-requirements %python_expand %fdupes %{buildroot}%{$python_sitelib} @@ -71,7 +77,8 @@ depends on. %files %{python_files} %doc README.md %license LICENSE -%{python_sitelib}/* +%{python_sitelib}/requirements_detector +%{python_sitelib}/requirements_detector-%{version}.dist-info %python_alternative %{_bindir}/detect-requirements %changelog