!19 [sync] PR-18: Adaptation to setup.py and modify the patching mode to resolve installation conflicts

From: @openeuler-sync-bot 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot 2023-02-28 06:09:38 +00:00 committed by Gitee
commit c019e6b3e1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 25 additions and 20 deletions

View File

@ -1,25 +1,31 @@
From 442decd2a4c9b754e8c674044b85016d4fa99a7d Mon Sep 17 00:00:00 2001 From bfed6fe2faa3df27b50c0b8efe9a3274207c82ad Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn> From: starlet-dx <15929766099@163.com>
Date: Sat, 24 Sep 2022 19:45:06 +0800 Date: Tue, 28 Feb 2023 10:54:01 +0800
Subject: [PATCH] add setup.py Subject: [PATCH 1/1] add setup file
--- ---
setup.py | 6 ++++++ setup.py | 12 ++++++++++++
1 file changed, 6 insertions(+) 1 file changed, 12 insertions(+)
create mode 100644 setup.py create mode 100644 setup.py
diff --git a/setup.py b/setup.py diff --git a/setup.py b/setup.py
new file mode 100644 new file mode 100644
index 0000000..bac24a4 index 0000000..f2daeed
--- /dev/null --- /dev/null
+++ b/setup.py +++ b/setup.py
@@ -0,0 +1,6 @@ @@ -0,0 +1,12 @@
+#!/usr/bin/env python +#!/usr/bin/env python
+ +
+import setuptools +from setuptools import setup
+ +
+if __name__ == "__main__": +entry_points = \
+ setuptools.setup() + {'console_scripts': ['jaraco.classes = jaraco.classes:main']}
+
+setup(
+ name='jaraco.classes',
+ version='3.2.3',
+ py_modules=['jaraco.classes'],
+)
-- --
2.25.1 2.30.0

View File

@ -1,7 +1,7 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: python-jaraco-classes Name: python-jaraco-classes
Version: 3.2.3 Version: 3.2.3
Release: 2 Release: 3
Summary: Utility functions for Python class constructs Summary: Utility functions for Python class constructs
License: MIT License: MIT
URL: https://github.com/jaraco/jaraco.classes URL: https://github.com/jaraco/jaraco.classes
@ -43,8 +43,7 @@ Provides: python3-jaraco-classes-doc
Documentation for jaraco-classes Documentation for jaraco-classes
%prep %prep
%autosetup -n jaraco.classes-%{version} %autosetup -n jaraco.classes-%{version} -p1
%patch0
%build %build
%py3_build %py3_build
@ -77,16 +76,16 @@ popd
mv %{buildroot}/filelist.lst . mv %{buildroot}/filelist.lst .
mv %{buildroot}/doclist.lst . mv %{buildroot}/doclist.lst .
%files -n python3-jaraco-classes %files -n python3-jaraco-classes -f filelist.lst
%{python3_sitelib}/b* %dir %{python3_sitelib}/*
%exclude %{python3_sitelib}/b/__pycache__/
%{python3_sitelib}/jaraco/classes
%{python3_sitelib}/jaraco.classes-*-py%{python3_version}.egg-info/
%files help -f doclist.lst %files help -f doclist.lst
%{_docdir}/* %{_docdir}/*
%changelog %changelog
* Mon Feb 27 2023 yaoxin <yaoxin30@h-partners.com> - 3.2.3-3
- Adaptation to setup.py and modify the patching mode to resolve installation conflicts
* Fri Feb 24 2023 yaoxin <yaoxin30@h-partners.com> - 3.2.3-2 * Fri Feb 24 2023 yaoxin <yaoxin30@h-partners.com> - 3.2.3-2
- Fix installation conflicts between python3-jaraco-classes and python-jaraco-collections - Fix installation conflicts between python3-jaraco-classes and python-jaraco-collections