Patch 0.10.1 (#120)

README.rst

@@ -104,7 +104,8 @@ For more information about less commonly-used features, see the Netconan help (`
       -h, --help            show this help message and exit
       -a, --anonymize-ips   Anonymize IP addresses
       -c CONFIG, --config CONFIG
-                            Config file specifying params
+                            Netconan configuration file with defaults for these
+                            CLI parameters
       -d DUMP_IP_MAP, --dump-ip-map DUMP_IP_MAP
                             Dump IP address anonymization map to specified file
       -i INPUT, --input INPUT
@@ -114,7 +115,8 @@ For more information about less commonly-used features, see the Netconan help (`
       -n AS_NUMBERS, --as-numbers AS_NUMBERS
                             List of comma separated AS numbers to anonymize
       -o OUTPUT, --output OUTPUT
-                            Output file or directory where anonymized files are placed
+                            Output file or directory where anonymized files are
+                            placed
       -p, --anonymize-passwords
                             Anonymize password and snmp community lines
       -r RESERVED_WORDS, --reserved-words RESERVED_WORDS
@@ -124,7 +126,5 @@ For more information about less commonly-used features, see the Netconan help (`
       -u, --undo            Undo reversible anonymization (must specify salt)
       -w SENSITIVE_WORDS, --sensitive-words SENSITIVE_WORDS
                             List of comma separated keywords to anonymize
-      --preserve-prefix PRESERVE_PREFIXES
+      --preserve-prefixes PRESERVE_PREFIXES
                             List of comma separated IPv4 prefixes to preserve
-                            (overrides default of IPv4 classes and private-use
-                            prefixes)

netconan/__version__.py

@@ -19,4 +19,4 @@
 
 __url__ = 'https://github.com/intentionet/netconan'
 
-__version__ = "0.10.0"
+__version__ = "0.10.1"

netconan/netconan.py

@@ -40,7 +40,7 @@ def _parse_args(argv):
     parser.add_argument('-a', '--anonymize-ips', action='store_true', default=False,
                         help='Anonymize IP addresses')
     parser.add_argument('-c', '--config', is_config_file=True,
-                        help='Config file specifying params')
+                        help='Netconan configuration file with defaults for these CLI parameters')
     parser.add_argument('-d', '--dump-ip-map', default=None,
                         help='Dump IP address anonymization map to specified file')
     parser.add_argument('-i', '--input', required=True,

setup.py

@@ -64,7 +64,7 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=[
-        'configargparse', 'bidict', 'enum34', 'ipaddress', 'passlib', 'regex==2019.02.18', 'six'
+        'configargparse', 'bidict', 'enum34', 'ipaddress', 'passlib', 'regex', 'six'
     ],
 
     # List additional groups of dependencies here (e.g. development