From af8bfa667230898c560c280257b9c2cfa669d4be Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 3 Mar 2024 15:13:59 +0100 Subject: [PATCH] Changes for building fakeredis, Flor, pyparsing and xattr rpm --- data/dpkg_templates/pytest-runner-control | 15 ------ .../python3-pytest-runner.install | 2 - data/licenses/LICENSE.pytest-runner | 21 -------- data/presets.ini | 2 +- data/projects.ini | 21 +------- data/rpm_templates/pytest-runner.spec | 54 ------------------- 6 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 data/dpkg_templates/pytest-runner-control delete mode 100644 data/dpkg_templates/python3-pytest-runner.install delete mode 100644 data/licenses/LICENSE.pytest-runner delete mode 100644 data/rpm_templates/pytest-runner.spec diff --git a/data/dpkg_templates/pytest-runner-control b/data/dpkg_templates/pytest-runner-control deleted file mode 100644 index 0c949fd6..00000000 --- a/data/dpkg_templates/pytest-runner-control +++ /dev/null @@ -1,15 +0,0 @@ -Source: pytest-runner -Section: python -Priority: extra -Maintainer: Jason R. Coombs -Build-Depends: debhelper (>= 9), dh-python, python3-all (>= 3.6~), python3-setuptools (>= 27.3), python3-setuptools-scm (>= 1.15.0) -Standards-Version: 3.9.5 -X-Python3-Version: >= 3.6 -Homepage: https://github.com/pytest-dev/pytest-runner - -Package: python3-pytest-runner -Architecture: all -Depends: python3-pytest, ${{python3:Depends}}, ${{misc:Depends}} -Description: Python 3 module of pytest-runner - Setup scripts can use pytest-runner to add setup.py test - support for pytest runner. diff --git a/data/dpkg_templates/python3-pytest-runner.install b/data/dpkg_templates/python3-pytest-runner.install deleted file mode 100644 index 6195064c..00000000 --- a/data/dpkg_templates/python3-pytest-runner.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/python3*/dist-packages/*.py -usr/lib/python3*/dist-packages/pytest_runner*.egg-info/* diff --git a/data/licenses/LICENSE.pytest-runner b/data/licenses/LICENSE.pytest-runner deleted file mode 100644 index 49c95bfa..00000000 --- a/data/licenses/LICENSE.pytest-runner +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2011-2016 Jason R. Coombs - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/data/presets.ini b/data/presets.ini index d408571b..4bd0fa32 100644 --- a/data/presets.ini +++ b/data/presets.ini @@ -29,7 +29,7 @@ projects: libbde,libcaes,libcdata,libcdatetime,libcdirectory,libcerror,libcfile, [plaso] presets: dfimagetools,redis-py -projects: acstore,bencode,certifi,cffi,chardet,dateutil,defusedxml,fakeredis,Flor,future,libcaes,libesedb,libevt,libevtx,libexe,libfwps,libfwsi,liblnk,libmsiecf,libolecf,libscca,mock,opensearch-py,pbr,pefile,plaso,psutil,pyparsing,python-lz4,python-zstd,pytest-runner,pytz,pyzmq,requests,urllib3,XlsxWriter,yara-python +projects: acstore,bencode,certifi,cffi,chardet,dateutil,defusedxml,fakeredis,Flor,future,libcaes,libesedb,libevt,libevtx,libexe,libfwps,libfwsi,liblnk,libmsiecf,libolecf,libscca,mock,opensearch-py,pbr,pefile,plaso,psutil,pyparsing,python-lz4,python-zstd,pytz,pyzmq,requests,urllib3,XlsxWriter,yara-python [redis-py] projects: deprecated,importlib-metadata,redis-py diff --git a/data/projects.ini b/data/projects.ini index 0685126b..dfd37f3a 100644 --- a/data/projects.ini +++ b/data/projects.ini @@ -1764,25 +1764,6 @@ git_url: https://github.com/tobgu/pyrsistent.git description_short: Persistent/Functional/Immutable data structures description_long: Persistent/Functional/Immutable data structures -[pytest-runner] -version: >=1.0.1 -dpkg_name: python-pytest-runner -dpkg_build_dependencies: python3-setuptools-scm -dpkg_dependencies: python3-pytest -dpkg_template_control: pytest-runner-control -dpkg_template_install_python3: python3-pytest-runner.install -rpm_build_dependencies: python3-setuptools_scm -rpm_template_spec: pytest-runner.spec -wheel_name: pytest_runner -maintainer: Jason R. Coombs -homepage_url: https://github.com/pytest-dev/pytest-runner -download_url: https://pypi.org/project/pytest-runner -git_url: https://github.com/pytest-dev/pytest-runner.git -description_short: Invoke py.test as distutils command with dependency - resolution -description_long: Setup scripts can use pytest-runner to add setup.py test - support for pytest runner. - [python-editor] version: >=1.0.1 maintainer: Peter Ruibal @@ -2173,7 +2154,7 @@ architecture_dependent: true build_system: setuptools disabled: windows version: >=0.9.7 -dpkg_build_dependencies: python3-cffi,python3-toml,python3-wheel +dpkg_build_dependencies: python3-cffi,python3-setuptools,python3-toml,python3-wheel dpkg_name: python-xattr rpm_build_dependencies: python3-cffi,python3-pip,python3-setuptools,python3-tox-current-env,python3-wheel rpm_name: python-xattr diff --git a/data/rpm_templates/pytest-runner.spec b/data/rpm_templates/pytest-runner.spec deleted file mode 100644 index 2848c18b..00000000 --- a/data/rpm_templates/pytest-runner.spec +++ /dev/null @@ -1,54 +0,0 @@ -%define name pytest-runner -%define version {version} -%define unmangled_name pytest-runner -%define unmangled_version {version} -%define release 1 - -Summary: Invoke py.test as distutils command with dependency resolution -Name: %{{name}} -Version: %{{version}} -Release: %{{release}} -Source0: %{{unmangled_name}}-%{{unmangled_version}}.tar.gz -License: UNKNOWN -Group: Development/Libraries -BuildRoot: %{{_tmppath}}/%{{unmangled_name}}-release-%{{version}}-%{{release}}-buildroot -Prefix: %{{_prefix}} -BuildArch: noarch -Vendor: Jason R. Coombs -Url: https://github.com/pytest-dev/pytest-runner -BuildRequires: python3-setuptools >= 30.3, python3-devel, python3-setuptools_scm - -%description -Setup scripts can use pytest-runner to add setup.py test -support for pytest runner. - -%package -n python3-%{{name}} -Summary: Invoke py.test as distutils command with dependency resolution - -%description -n python3-%{{name}} -Setup scripts can use pytest-runner to add setup.py test -support for pytest runner. - -%prep -%autosetup -n %{{unmangled_name}}-%{{unmangled_version}} - -%build -%py3_build - -%install -%py3_install -rm -rf %{{buildroot}}/usr/lib/python*/site-packages/*.egg-info/requires.txt -rm -rf %{{buildroot}}/usr/share/doc/%{{name}}/ - -%clean -rm -rf %{{buildroot}} - -%files -n python3-%{{name}} -%license LICENSE -%{{python3_sitelib}}/*.py -%{{python3_sitelib}}/__pycache__/*.pyc -%{{python3_sitelib}}/pytest_runner*.egg-info - -%changelog -* {date_time} log2timeline development team {version}-1 -- Auto-generated