From d74cac265a9d1d8ce176a7ef96be2d91c4f40819 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 5 Dec 2016 07:18:53 +1300
Subject: Add YAML serialization of options

This uses ruamel.yaml. The library seems well-supported, and can do in-place
modification of config files that retains user comments and file structure.
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 56ba46fc..35f7edb3 100644
--- a/setup.py
+++ b/setup.py
@@ -79,6 +79,7 @@ setup(
         "pyparsing>=2.1.3, <2.2",
         "pyperclip>=1.5.22, <1.6",
         "requests>=2.9.1, <3",
+        "ruamel.yaml>=0.13.2, <0.14",
         "tornado>=4.3, <4.5",
         "urwid>=1.3.1, <1.4",
         "watchdog>=0.8.3, <0.9",
-- 
cgit v1.2.3


From d742d4fb8c8d601c19f7aa5ff746a4167d864f7e Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Mon, 5 Dec 2016 15:55:43 +1300
Subject: Replace configargparse with argparse, enable new options loading

This commit ditches configargparse and enables the new config file format. The
default location is ~/.mitmproxy/config.yaml. Unifying all of the various
Options objects will follow in the next patch.
---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 35f7edb3..927fbc5e 100644
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,6 @@ setup(
         "blinker>=1.4, <1.5",
         "click>=6.2, <7.0",
         "certifi>=2015.11.20.1",  # no semver here - this should always be on the last release!
-        "configargparse>=0.10, <0.12",
         "construct>=2.8, <2.9",
         "cryptography>=1.3, <1.7",
         "cssutils>=1.0.1, <1.1",
-- 
cgit v1.2.3