Update to 0.15.41

This commit is contained in:
Miro Hrončok 2018-06-29 13:30:52 +02:00
parent 0ccf054add
commit 6ed77069a2
4 changed files with 46 additions and 4 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/ruamel-yaml-0.12.14.tar.gz
/ruamel-yaml-0.13.13.tar.gz
/ruamel-yaml-0.13.14.tar.gz
/ruamel-yaml-0.15.41.tar.gz

View File

@ -0,0 +1,32 @@
diff --git a/_doc/conf.py b/_doc/conf.py
index 19a19a3..a2b852d 100644
--- a/_doc/conf.py
+++ b/_doc/conf.py
@@ -68,7 +68,10 @@ print('ruamel.yaml version', version)
try:
from ryd.__main__ import RYDCmd
- from ruamel.std.pathlib import Path
+ try:
+ from pathlib import Path
+ except ImportError:
+ from pathlib2 import Path
oldargv = sys.argv
for fn in Path('.').glob('*.ryd'):
sys.argv = ['ryd', 'convert', '--no-pdf', str(fn)]
diff --git a/_test/test_api_change.py b/_test/test_api_change.py
index c0f492c..0b3f2d7 100644
--- a/_test/test_api_change.py
+++ b/_test/test_api_change.py
@@ -11,7 +11,10 @@ import textwrap
import pytest
from ruamel.yaml import YAML
from ruamel.yaml.constructor import DuplicateKeyError
-from ruamel.std.pathlib import Path
+try:
+ from pathlib import Path
+except ImportError:
+ from pathlib2 import Path
class TestNewAPI:

View File

@ -1,12 +1,12 @@
%global pypi_name ruamel.yaml
%global pname ruamel-yaml
%global commit f29921d2048e
%global commit 75b1b39341d9
%global with_python3 1
Name: python-%{pname}
Version: 0.13.14
Release: 4%{?dist}
Version: 0.15.41
Release: 1%{?dist}
Summary: YAML 1.2 loader/dumper package for Python
License: MIT
@ -16,6 +16,9 @@ URL: https://bitbucket.org/ruamel/yaml
Source0: https://bitbucket.org/ruamel/yaml/get/%{version}.tar.gz#/%{pname}-%{version}.tar.gz
# Works with pytest 2.7
Patch0: python-ruamel-yaml-pytest27.patch
# Don't require ruamel.std.pathlib, but use stdlib's pathlib on py3, pathlib2 on py2
Patch1: python-ruamel-yaml-pathlib.patch
BuildRequires: libyaml-devel
@ -28,11 +31,13 @@ Summary: YAML 1.2 loader/dumper package for Python
BuildRequires: python2-devel
BuildRequires: python2-setuptools
# For tests
BuildRequires: python2-pathlib2
BuildRequires: python2-pytest
BuildRequires: python2-ruamel-ordereddict
BuildRequires: python2-typing >= 3.5.2.2-2
%{?python_provide:%python_provide python2-%{pypi_name}}
Requires: python2-pathlib2
Requires: python2-ruamel-ordereddict
Requires: python2-typing >= 3.5.2.2-2
Requires: python2-setuptools
@ -106,6 +111,10 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes
%endif
%changelog
* Fri Jun 29 2018 Miro Hrončok <mhroncok@redhat.com> - 0.15.41-1
- Update to 0.15.41
- Add patch not to require ruamel.std.pathlib
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.13.14-4
- Rebuilt for Python 3.7

View File

@ -1 +1 @@
SHA512 (ruamel-yaml-0.13.14.tar.gz) = 3701cb76a8297bc42070b55a204d41d37c813ab0685c67ae55959b4fd763d5608d79b10532af24168e53b1d5de79beeb4c57530275973fb1950ee8f61f7f4abc
SHA512 (ruamel-yaml-0.15.41.tar.gz) = 5dcc6430a6e13a419132b9dd54bc27dedeb8037d079717817a23bde5700469fa58f634eecc6f9ca6ce67c0146ec42df0a8f9f41eca0b1e35bf6dcce1a13860d6