From c072678936998da0374595116fd6eca06c8a4902 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Tue, 30 Mar 2021 15:53:19 -0700
Subject: [PATCH] Add support for ruamel.yaml 0.17.x YAML parsing library
 (#404).

---
 NEWS                  | 3 ++-
 setup.cfg             | 2 +-
 setup.py              | 4 ++--
 test_requirements.txt | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 6f0030af5..36aabe8e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
-1.5.13.dev0
+1.5.13
  * #373: Document that passphrase is used for Borg keyfile encryption, not just repokey encryption.
+ * #404: Add support for ruamel.yaml 0.17.x YAML parsing library.
  * Update systemd service example to return a permission error when a system call isn't permitted
    (instead of terminating borgmatic outright).
  * Drop support for Python 3.5, which has been end-of-lifed.
diff --git a/setup.cfg b/setup.cfg
index d0d0b1603..fe6236b6a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-description-file=README.md
+description_file=README.md
 
 [tool:pytest]
 testpaths = tests
diff --git a/setup.py b/setup.py
index 56fa523e4..ad7f93744 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-VERSION = '1.5.13.dev0'
+VERSION = '1.5.13'
 
 
 setup(
@@ -32,7 +32,7 @@ setup(
     install_requires=(
         'pykwalify>=1.6.0,<14.06',
         'requests',
-        'ruamel.yaml>0.15.0,<0.17.0',
+        'ruamel.yaml>0.15.0,<0.18.0',
         'setuptools',
         'colorama>=0.4.1,<0.5',
     ),
diff --git a/test_requirements.txt b/test_requirements.txt
index 3d748a3c6..b595f5bb6 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -23,6 +23,6 @@ python-dateutil==2.8.1
 PyYAML==5.3.1
 regex; python_version >= '3.8'
 requests==2.25.0
-ruamel.yaml>0.15.0,<0.17.0
+ruamel.yaml>0.15.0,<0.18.0
 toml==0.10.2; python_version >= '3.8'
 typed-ast==1.4.2; python_version >= '3.8'