* 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
This commit is contained in:
pareid 2019-08-06 19:03:16 +01:00 коммит произвёл Ian Hellen
Родитель 3844fc065e
Коммит 5339f537f4
5 изменённых файлов: 14 добавлений и 14 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -1,2 +1,2 @@
"""Version file."""
VERSION = "0.2.3"
VERSION = "0.2.4"

Просмотреть файл

@ -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)

Просмотреть файл

Просмотреть файл

@ -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=[