update to 0.16.5

This commit is contained in:
chedi toueiti 2019-08-28 14:34:00 +00:00
parent deaa39fed7
commit 80286a6239
4 changed files with 74 additions and 41 deletions

View File

@ -1,9 +1,8 @@
diff --git a/_doc/conf.py b/_doc/conf.py diff --git a/_doc/conf.py b/_doc/conf.py
index 19a19a3..a2b852d 100644
--- a/_doc/conf.py --- a/_doc/conf.py
+++ b/_doc/conf.py +++ b/_doc/conf.py
@@ -68,7 +68,10 @@ print('ruamel.yaml version', version) @@ -75,7 +75,10 @@
if False:
try: try:
from ryd.__main__ import RYDCmd from ryd.__main__ import RYDCmd
- from ruamel.std.pathlib import Path - from ruamel.std.pathlib import Path
@ -11,17 +10,32 @@ index 19a19a3..a2b852d 100644
+ from pathlib import Path + from pathlib import Path
+ except ImportError: + except ImportError:
+ from pathlib2 import Path + from pathlib2 import Path
oldargv = sys.argv oldargv = sys.argv
for fn in Path('.').glob('*.ryd'): for fn in Path('.').glob('*.ryd'):
sys.argv = ['ryd', 'convert', '--no-pdf', str(fn)] diff --git a/_test/roundtrip.py b/_test/roundtrip.py
--- a/_test/roundtrip.py
+++ b/_test/roundtrip.py
@@ -7,7 +7,11 @@
"""
import sys
import textwrap
-from ruamel.std.pathlib import Path
+try:
+ from pathlib import Path
+except ImportError:
+ from pathlib2 import Path
+
enforce = object()
diff --git a/_test/test_api_change.py b/_test/test_api_change.py diff --git a/_test/test_api_change.py b/_test/test_api_change.py
index c0f492c..0b3f2d7 100644
--- a/_test/test_api_change.py --- a/_test/test_api_change.py
+++ b/_test/test_api_change.py +++ b/_test/test_api_change.py
@@ -11,7 +11,10 @@ import textwrap @@ -9,7 +9,10 @@
import sys
import textwrap
import pytest import pytest
from ruamel.yaml import YAML
from ruamel.yaml.constructor import DuplicateKeyError
-from ruamel.std.pathlib import Path -from ruamel.std.pathlib import Path
+try: +try:
+ from pathlib import Path + from pathlib import Path
@ -30,3 +44,20 @@ index c0f492c..0b3f2d7 100644
class TestNewAPI: class TestNewAPI:
diff --git a/_test/test_z_data.py b/_test/test_z_data.py
--- a/_test/test_z_data.py
+++ b/_test/test_z_data.py
@@ -6,7 +6,11 @@
import pytest # NOQA
import warnings # NOQA
-from ruamel.std.pathlib import Path
+try:
+ from pathlib import Path
+except ImportError:
+ from pathlib2 import Path
+
base_path = Path('data') # that is ruamel.yaml.data
PY2 = sys.version_info[0] == 2

View File

@ -1,7 +1,7 @@
diff -up ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 ruamel-yaml-171c3653fc01/_test/test_anchor.py diff -u ruamel-yaml-ff02b83b8f91/_test/test_anchor.py.pytest27 ruamel-yaml-ff02b83b8f91/_test/test_anchor.py
--- ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 2016-09-21 02:09:18.000000000 -0600 --- ruamel-yaml-ff02b83b8f91/_test/test_anchor.py.pytest27 2019-08-27 10:59:01.756747586 +0100
+++ ruamel-yaml-171c3653fc01/_test/test_anchor.py 2017-01-31 15:25:09.245847125 -0700 +++ ruamel-yaml-ff02b83b8f91/_test/test_anchor.py 2019-08-27 11:00:15.929713043 +0100
@@ -5,6 +5,7 @@ testing of anchors and the aliases refer @@ -7,6 +7,7 @@
""" """
import pytest import pytest
@ -9,11 +9,10 @@ diff -up ruamel-yaml-171c3653fc01/_test/test_anchor.py.pytest27 ruamel-yaml-171c
from textwrap import dedent from textwrap import dedent
import platform import platform
@@ -231,6 +232,7 @@ class TestAnchorsAliases: @@ -248,6 +249,7 @@
""") )
# this is an error in PyYAML # this is an error in PyYAML
+ @pytest.mark.skipif(LooseVersion(pytest.__version__) < LooseVersion("2.8"), reason="Need pytest 2.7") + @pytest.mark.skipif(LooseVersion(pytest.__version__) < LooseVersion("2.8"), reason="Need pytest 2.7")
def test_reused_anchor(self): def test_reused_anchor(self):
yaml = ''' from ruamel.yaml.error import ReusedAnchorWarning
- &a

View File

@ -1,11 +1,11 @@
%global pypi_name ruamel.yaml %global pypi_name ruamel.yaml
%global pname ruamel-yaml %global pname ruamel-yaml
%global commit 75b1b39341d9 %global commit ff02b83b8f91
Name: python-%{pname} Name: python-%{pname}
Version: 0.15.41 Version: 0.16.5
Release: 6%{?dist} Release: 1%{?dist}
Summary: YAML 1.2 loader/dumper package for Python Summary: YAML 1.2 loader/dumper package for Python
License: MIT License: MIT
@ -69,6 +69,9 @@ PYTHONPATH=$(echo build/lib.*%{python3_version}) py.test-%{python3_version} _tes
%{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info
%changelog %changelog
* Tue Aug 27 2019 Chedi Toueiti <chedi.toueiti@gmail.com> - 0.16.5-1
- Update to 0.16.5
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.15.41-6 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.15.41-6
- Rebuilt for Python 3.8 - Rebuilt for Python 3.8

View File

@ -1 +1 @@
SHA512 (ruamel-yaml-0.15.41.tar.gz) = 5dcc6430a6e13a419132b9dd54bc27dedeb8037d079717817a23bde5700469fa58f634eecc6f9ca6ce67c0146ec42df0a8f9f41eca0b1e35bf6dcce1a13860d6 SHA512 (ruamel-yaml-0.16.5.tar.gz) = ce08ae50b9084d56c8e0f5a546cb3a23d4cdad643836aa60a44a995459d3d90057d14fa79493c36f415d7bc22936806d0b4f9b34f93192ac536526a314024c45