From 57b513cccab61b38c28774d7659fff39c892bc1a Mon Sep 17 00:00:00 2001 From: chedi toueiti Date: Wed, 28 Aug 2019 14:34:00 +0000 Subject: [PATCH] update to 0.16.5 --- python-ruamel-yaml-pathlib.patch | 76 ++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 23 deletions(-) diff --git a/python-ruamel-yaml-pathlib.patch b/python-ruamel-yaml-pathlib.patch index 6cf8156..65dd159 100644 --- a/python-ruamel-yaml-pathlib.patch +++ b/python-ruamel-yaml-pathlib.patch @@ -1,32 +1,62 @@ 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 +@@ -75,7 +75,10 @@ + if False: + 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'): +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 +--- a/_test/test_api_change.py ++++ b/_test/test_api_change.py +@@ -9,7 +9,10 @@ + import sys + import textwrap + import pytest +-from ruamel.std.pathlib import Path ++try: ++ from pathlib import Path ++except ImportError: ++ from pathlib2 import Path + + 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 \ No newline at end of file