From 5339f537f4c857580202c9779d94e9b214a50576 Mon Sep 17 00:00:00 2001
From: pareid <45851594+pareid@users.noreply.github.com>
Date: Tue, 6 Aug 2019 19:03:16 +0100
Subject: [PATCH] License fixes (#21)

* Bug fixes for 0.2.3 release

* changed LICENSE name to more common format and explicity stated MIT License

* removed reading of license from setup

* changed ordered dict to normal dict for docs

* changedd to pre release version for testing

* removed unused ordered dict import in setup

* incrementing version
---
 LICENSE.TXT => LICENSE       |  6 ++++--
 msticpy/_version.py          |  2 +-
 msticpy/sectools/geoip.py    |  2 ++
 msticpy/mypy.ini => mypy.ini |  0
 setup.py                     | 18 +++++++-----------
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename LICENSE.TXT => LICENSE (92%)
 rename msticpy/mypy.ini => mypy.ini (100%)

diff --git a/LICENSE.TXT b/LICENSE
similarity index 92%
rename from LICENSE.TXT
rename to LICENSE
index 3826ed06..4c027eea 100644
--- a/LICENSE.TXT
+++ b/LICENSE
@@ -1,4 +1,6 @@
-msticpy Copyright (c) Microsoft Corporation. All rights reserved.
+MIT License
+
+Copyright (c) Microsoft Corporation. All rights reserved.
 
 MIT License Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -16,4 +18,4 @@ 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
\ No newline at end of file
+SOFTWARE
diff --git a/msticpy/_version.py b/msticpy/_version.py
index 79aca8b6..d61e5ab5 100644
--- a/msticpy/_version.py
+++ b/msticpy/_version.py
@@ -1,2 +1,2 @@
 """Version file."""
-VERSION = "0.2.3"
+VERSION = "0.2.4"
diff --git a/msticpy/sectools/geoip.py b/msticpy/sectools/geoip.py
index f9b69339..52d0c5ee 100644
--- a/msticpy/sectools/geoip.py
+++ b/msticpy/sectools/geoip.py
@@ -351,6 +351,8 @@ class GeoLiteLookup(GeoIpLookup):
         if db_folder is None:
             db_folder = self._PKG_DIR
 
+        if not os.path.exists(db_folder):
+            os.mkdir(db_folder)
         db_archive_path = os.path.join(db_folder, self._DB_ARCHIVE)
         db_file_path = os.path.join(db_folder, self._DB_FILE)
 
diff --git a/msticpy/mypy.ini b/mypy.ini
similarity index 100%
rename from msticpy/mypy.ini
rename to mypy.ini
diff --git a/setup.py b/setup.py
index 5e4b742f..6ce660cc 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,6 @@
 """Setup script for msticpy."""
 
 import re
-from collections import OrderedDict
 import setuptools
 
 
@@ -14,6 +13,7 @@ INSTALL_REQUIRES = [
     "attrs>=18.2.0",
     "bokeh>=1.0.2",
     "deprecated>=1.2.4",
+    "folium>=0.9.0"
     "ipython>=7.1.1",
     "ipywidgets>=7.4.2",
     "Kqlmagic>=0.1.94",
@@ -33,10 +33,8 @@ INSTALL_REQUIRES = [
 # pylint: disable=locally-disabled, invalid-name
 with open("README.md", "r") as fh:
     long_description = fh.read()
-with open("LICENSE.TXT", "r") as fh:
-    license_txt = fh.read()
-# pylint: enable=locally-disabled, invalid-name
 
+# pylint: enable=locally-disabled, invalid-name
 with open("msticpy/_version.py", "r") as fd:
     v_match = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE)
     __version__ = v_match.group(1) if v_match else "no version"
@@ -47,16 +45,14 @@ setuptools.setup(
     author="Ian Hellen",
     author_email="ianhelle@microsoft.com",
     description="MSTIC Security Tools",
-    license=license_txt,
+    license="MIT License",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://github.com/microsoft/msticpy",
-    project_urls=OrderedDict(
-        (
-            ("Documentation", "http://msticpy.readthedocs.io"),
-            ("Code", "https://github.com/microsoft/msticpy"),
-        )
-    ),
+    project_urls={
+        "Documentation": "https://msticpy.readthedocs.io",
+        "Code": "https://github.com/microsoft/msticpy",
+    },
     python_requires=">=3.6",
     packages=setuptools.find_packages(exclude=["*.tests"]),
     classifiers=[