snap: use a newer PyYAML and drop patches (#2274)

LP: #1792592

Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>

requirements.txt

@@ -4,9 +4,8 @@ docopt==0.6.2
 jsonschema==2.5.1
 paramiko==2.4.1
 progressbar33==2.4
-PyYAML==3.11; sys_platform == 'linux'
 http://pyyaml.org/download/pyyaml/PyYAML-3.13-cp35-cp35m-win_amd64.whl; sys_platform == 'win32'
-PyYAML==3.13; sys_platform == 'darwin'
+PyYAML==3.13; sys_platform != 'win32'
 pyxdg==0.25
 requests==2.9.1
 requests_unixsocket==0.1.5

snap/snapcraft.yaml

@@ -67,21 +67,12 @@ parts:
         PYTHON_PACKAGE_PATH="$SNAPCRAFT_PART_INSTALL/usr/lib/python3.5/"
         [ -f "patched/ctypes/__init__.py.orig" ] && mv "patched/ctypes/__init__.py.orig" "$PYTHON_PACKAGE_PATH/ctypes/__init__.py"
 
-        SITE_PACKAGES_PATH="$SNAPCRAFT_PART_INSTALL/lib/python3.5/site-packages"
-        [ -f "patched/yaml/emitter.py.orig" ] && mv "patched/yaml/emitter.py.orig" "$SITE_PACKAGES_PATH/yaml/emitter.py"
-        [ -f "patched/yaml/reader.py.orig" ] && mv "patched/yaml/reader.py.orig" "$SITE_PACKAGES_PATH/yaml/reader.py"
-
         # Apply patches
         patch -b "$PYTHON_PACKAGE_PATH/ctypes/__init__.py" patches/ctypes_init.diff
-        patch -b -d "$SITE_PACKAGES_PATH/" -p1 < patches/pyyaml-support-high-codepoints.diff
 
         # Save patches to allow rebuilding
         mkdir -p patched/ctypes
         [ -f "$PYTHON_PACKAGE_PATH/ctypes/__init__.py.orig" ] && mv "$PYTHON_PACKAGE_PATH/ctypes/__init__.py.orig" patched/ctypes
-
-        mkdir -p patched/yaml
-        [ -f "$SITE_PACKAGES_PATH/yaml/emitter.py.orig" ] && mv "$SITE_PACKAGES_PATH/yaml/emitter.py.orig" patched/yaml
-        [ -f "$SITE_PACKAGES_PATH/yaml/reader.py.orig" ] && mv "$SITE_PACKAGES_PATH/yaml/reader.py.orig" patched/yaml
     override-prime: |
         snapcraftctl prime
         # Now that everything is built, let's disable user site-packages