Resolve merge conflicts

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 antonku
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

ncssl_api_client/configure.py

@@ -1,10 +1,10 @@
 import os
 import yaml
-import ipgetter
 from shutil import copyfile
 from builtins import input
 from getpass import getpass
 from pprint import pprint
+from ncssl_api_client.services import ipgetter
 
 BASE_DIR = 'ncsslapi'
 CERTS_DIR = 'certs'
@@ -66,7 +66,7 @@ def setup_configs():
             source_api_config = yaml.load(f)
             api_config = update_with_user_api_info(source_api_config)
             stream = open(user_api_config_path, 'w')
-            yaml.dump(api_config, stream, default_flow_style=False, indent=4, width=79)
+            yaml.safe_dump(api_config, stream, default_flow_style=False, indent=4, width=79)
 
     user_crypto_config_path = DELIMITER.join([CRYPTO_CONFIG_PATH, SETTINGS_FILE_NAME])
     if not os.path.exists(user_crypto_config_path):

ncssl_api_client/services/ipgetter/__init__.py

@@ -0,0 +1,5 @@
+from requests import get
+
+
+def myip():
+    return get('http://checkip.amazonaws.com/').text.strip()

setup.py

@@ -16,7 +16,6 @@
           'xmltodict',
           'pyyaml',
           'coloredlogs',
-          'ipgetter',
       ],
       classifiers=[
           'Development Status :: 5 - Production/Stable',