diff --git a/.gitignore b/.gitignore index 768a62635..340aeed56 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.swp .cache .coverage +.pytest_cache .tox build dist diff --git a/NEWS b/NEWS index b29c11b04..7b07fe5f4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 1.2.1.dev0 * Skip before/after backup hooks when only doing --prune, --check, --list, and/or --info. + * #38, #76: Upgrade ruamel.yaml compatibility version range and fix support for Python 3.7. 1.2.0 * #61: Support for Borg --list option via borgmatic command-line to list all archives. diff --git a/setup.py b/setup.py index 620b8e4dc..a451f513f 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( ], install_requires=( 'pykwalify>=1.6.0', - 'ruamel.yaml<=0.15', + 'ruamel.yaml>0.15.0,<0.16.0', 'setuptools', ), tests_require=( diff --git a/test_requirements.txt b/test_requirements.txt index 6bf66e087..5335c20f2 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -1,5 +1,5 @@ flexmock==0.10.2 -pykwalify==1.6.0 -pytest==2.9.1 +pykwalify==1.6.1 +pytest==3.6.3 pytest-cov==2.5.1 -ruamel.yaml==0.15.18 +ruamel.yaml>0.15.0,<0.16.0