Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
2d01b30383
!22 【轻量级 PR】:rebuild for next release
From: @zhuofeng6 
Reviewed-by: @lvying6, @lyn1001, @cherry530 
Signed-off-by: @cherry530, @lvying6, @lyn1001
2022-10-31 01:24:12 +00:00
zhuofeng
3452da934d
update for mass rebuild and upgrade verification
Signed-off-by: zhuofeng <zhuofeng2@huawei.com>
2022-10-26 03:34:54 +00:00
openeuler-ci-bot
35718969d9 !18 [sync] PR-17: Upgrade to 6.0
Merge pull request !18 from openeuler-sync-bot/sync-pr17-master-to-openEuler-22.03-LTS-Next
2021-12-29 11:09:52 +00:00
weiwei_tiantian
0806e424d6 Upgrade to 6.0
(cherry picked from commit d3af8f3ed512f27d0c20bdead94d9019c8746a11)
2021-12-29 10:21:03 +08:00
openeuler-ci-bot
4361b60255 !15 Upgrade to 5.4.1 to support OpenStack-W
From: @huangtianhua
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-07-13 09:24:32 +00:00
huangtianhua
13511bfce9 Upgrade to 5.4.1 to support OpenStack-W
This upgrades to 5.4.1 and drop the CVE patch
which has been upstreamed.
2021-07-13 08:54:29 +00:00
openeuler-ci-bot
acdc262478 !10 Fix CVE-2020-14343
From: @yun-chengzhang
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-06-11 08:29:31 +00:00
yun-chengzhang
d290d7aa64 Fix CVE-2020-14343 2021-06-11 16:03:47 +08:00
openeuler-ci-bot
bd4c6d5a57 !8 delete python2.
From: @weiwei_150212
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-10-31 09:59:27 +08:00
jinzhimin369
a34c48fb01 delete python2 2020-10-29 16:39:04 +08:00
3 changed files with 19 additions and 47 deletions

Binary file not shown.

BIN
PyYAML-6.0.tar.gz Normal file

Binary file not shown.

View File

@ -2,18 +2,15 @@
%bcond_without python3 %bcond_without python3
Name: pyyaml Name: pyyaml
Version: 5.3.1 Version: 6.0
Release: 2 Release: 2
Summary: YAML parser and emitter for Python Summary: YAML parser and emitter for Python
License: MIT License: MIT
URL: https://github.com/yaml/pyyaml URL: https://github.com/yaml/pyyaml
Source0: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz Source0: https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-%{version}.tar.gz
BuildRequires: gcc libyaml-devel BuildRequires: gcc libyaml-devel
%if %{with python2}
BuildRequires: python2-devel python2-setuptools python2-Cython
%endif
%if %{with python3} %if %{with python3}
BuildRequires: python3-devel python3-setuptools python3-Cython BuildRequires: python3-devel python3-setuptools python3-Cython
@ -32,31 +29,6 @@ arbitrary Python object.
PyYAML is applicable for a broad range of tasks from complex configuration PyYAML is applicable for a broad range of tasks from complex configuration
files to object serialization and persistence. files to object serialization and persistence.
%if %{with python2}
%package -n python2-pyyaml
Summary: %summary
Provides: python-yaml = %{version}-%{release}
Provides: python-yaml%{?_isa} = %{version}-%{release}
Provides: python2-yaml = %{version}-%{release}
Provides: python2-yaml%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python2-pyyaml}
Provides: PyYAML = %{version}-%{release}
Provides: PyYAML%{?_isa} = %{version}-%{release}
Obsoletes: PyYAML < %{version}-%{release}
%description -n python2-pyyaml
YAML is a data serialization format designed for human readability and
interaction with scripting languages. PyYAML is a YAML parser and emitter for
Python.
PyYAML features a complete YAML 1.1 parser, Unicode support, pickle support,
capable extension API, and sensible error messages. PyYAML supports standard
YAML tags and provides Python-specific tags that allow to represent an
arbitrary Python object.
PyYAML is applicable for a broad range of tasks from complex configuration
files to object serialization and persistence.
%endif
%if %{with python3} %if %{with python3}
%package -n python3-pyyaml %package -n python3-pyyaml
@ -83,47 +55,47 @@ files to object serialization and persistence.
%endif %endif
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n PyYAML-%{version}
%build %build
%if %{with python2}
%py2_build
%endif
%if %{with python3} %if %{with python3}
%py3_build %py3_build
%endif %endif
%install %install
%if %{with python2}
%py2_install
%endif
%if %{with python3} %if %{with python3}
%py3_install %py3_install
%endif %endif
%check %check
%if %{with python2}
%{__python2} setup.py test
%endif
%if %{with python3} %if %{with python3}
%{__python3} setup.py test %{__python3} setup.py test
%endif %endif
%if %{with python2}
%files -n python2-pyyaml
%license LICENSE
%doc CHANGES README examples
%{python2_sitearch}/*
%endif
%if %{with python3} %if %{with python3}
%files -n python3-pyyaml %files -n python3-pyyaml
%license LICENSE %license LICENSE
%doc CHANGES README examples %doc CHANGES examples
%{python3_sitearch}/* %{python3_sitearch}/*
%endif %endif
%changelog %changelog
* Wed Oct 26 2022 zhuofeng <zhuofeng2@huawei.com> - 6.0-2
- rebuild for next release
* Fri Dec 24 2021 tianwei <tianwei12@huawei.com> - 6.0-1
- Upgrade to 6.0
* Tue Jul 13 2021 huangtianhua <huangtianhua@huawei.com> - 5.4.1-1
- Upgrade to 5.4.1
* Fri Jun 11 2021 zhaomengchao <zhaomengchao3@huawei.com> - 5.3.1-4
* Fix CVE-2020-14343
* Thu Oct 29 2020 tianwei <tianwei12@huawei.com> - 5.3.1-3
* delete python2
* Fri Sep 11 2020 liuweibo <liuweibo10@huawei.com> - 5.3.1-2 * Fri Sep 11 2020 liuweibo <liuweibo10@huawei.com> - 5.3.1-2
* Fix Source0 * Fix Source0