!11 [sync] PR-10: 修复python3-ansible-runner与python3-augeas的安装冲突

From: @openeuler-sync-bot 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-03-27 09:35:34 +00:00 committed by Gitee
commit e5bf3fc065
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 27 additions and 2 deletions

View File

@ -0,0 +1,22 @@
From f74c4a8206c5a7f28836cbe3cd043bc481c5e518 Mon Sep 17 00:00:00 2001
From: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Sun, 23 May 2021 09:54:53 -0400
Subject: [PATCH] Ensure exclude is a tuple (#53)
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 6c4265e..13b1a38 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
author="Harald Hoyer",
author_email="augeas-devel@redhat.com",
description="""Python bindings for Augeas""",
- packages=find_packages(exclude=('test')),
+ packages=find_packages(exclude=('test',)),
setup_requires=["cffi>=1.0.0"],
cffi_modules=["augeas/ffi.py:ffi"],
install_requires=["cffi>=1.0.0"],

View File

@ -1,10 +1,11 @@
Name: python-augeas
Version: 1.1.0
Release: 1
Release: 2
Summary: Python bindings for augeas
License: LGPLv2+
URL: http://augeas.net/
Source0: https://github.com/hercules-team/python-augeas/archive/refs/tags/v1.1.0.tar.gz
Patch0: python-augeas-test-package-installation.patch
BuildArch: noarch
BuildRequires: python3-setuptools python3-devel python3-cffi augeas
@ -34,11 +35,13 @@ Python 3 bindings for augeas
%license COPYING
%{python3_sitelib}/augeas.py
%{python3_sitelib}/augeas/
%{python3_sitelib}/test/
%{python3_sitelib}/python_augeas-*.egg-info
%{python3_sitelib}/__pycache__/augeas.cpython*
%changelog
* Sat Feb 25 2023 yaoxin <yaoxin30@h-partners.com> - 1.1.0-2
- Fix installation conflicts between python3-ansible-runner and python3-augeas
* Tue Jun 14 2022 houyingchao <houyingchao@h-partners.com> - 1.1.0-1
- Upgrade to 1.1.0