diff --git a/LICENSE b/LICENSE index ed34e57..4cca570 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - nem-data, a program for accessing and compiling data on the Australian + NEMOSIS, a program for accessing and compiling data on the Australian National Electricity Market. Copyright (C) 2018 Nicholas Gorman diff --git a/README.md b/README.md index 34d2b03..365cab5 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# OSDAN +# NEMOSIS -# Use OSDAN without python -Download the latest executable file [here](https://github.com/UNSW-CEEM/osdan/releases) +# Use NEMOSIS without python +Download the latest executable file [here](https://github.com/UNSW-CEEM/NEMOSIS/releases) # Use the source code ``` -from osdan import data_fetch_methods +from nemosis import data_fetch_methods start_time = '2017/01/01 00:00:00' end_time = '2017/01/01 00:00:00' diff --git a/osdan/__init__.py b/nemosis/__init__.py similarity index 100% rename from osdan/__init__.py rename to nemosis/__init__.py diff --git a/osdan/compiling to exe b/nemosis/compiling to exe similarity index 100% rename from osdan/compiling to exe rename to nemosis/compiling to exe diff --git a/osdan/custom_tables.py b/nemosis/custom_tables.py similarity index 99% rename from osdan/custom_tables.py rename to nemosis/custom_tables.py index 25a9a8b..696ed0f 100644 --- a/osdan/custom_tables.py +++ b/nemosis/custom_tables.py @@ -2,7 +2,7 @@ from datetime import timedelta, datetime import math import numpy as np -from osdan import defaults, data_fetch_methods, filters +from nemosis import defaults, data_fetch_methods, filters def fcas4s_scada_match(start_time, end_time, table_name, raw_data_location, select_columns=None, filter_cols=None, diff --git a/osdan/data_fetch_methods.py b/nemosis/data_fetch_methods.py similarity index 99% rename from osdan/data_fetch_methods.py rename to nemosis/data_fetch_methods.py index 0d5ee3e..35be5ad 100644 --- a/osdan/data_fetch_methods.py +++ b/nemosis/data_fetch_methods.py @@ -2,7 +2,7 @@ from datetime import datetime, timedelta import pandas as pd import feather -from osdan import filters, downloader, processing_info_maps, defaults, custom_tables +from nemosis import filters, downloader, processing_info_maps, defaults, custom_tables print(custom_tables.__file__) diff --git a/osdan/date_generators.py b/nemosis/date_generators.py similarity index 98% rename from osdan/date_generators.py rename to nemosis/date_generators.py index c729e7d..1255630 100644 --- a/osdan/date_generators.py +++ b/nemosis/date_generators.py @@ -1,4 +1,4 @@ -from osdan import defaults +from nemosis import defaults from calendar import monthrange diff --git a/osdan/defaults.py b/nemosis/defaults.py similarity index 100% rename from osdan/defaults.py rename to nemosis/defaults.py diff --git a/osdan/downloader.py b/nemosis/downloader.py similarity index 98% rename from osdan/downloader.py rename to nemosis/downloader.py index d705bc8..bc0b185 100644 --- a/osdan/downloader.py +++ b/nemosis/downloader.py @@ -1,7 +1,7 @@ import requests import zipfile import io -from osdan import defaults +from nemosis import defaults diff --git a/osdan/favicon.ico b/nemosis/favicon.ico similarity index 100% rename from osdan/favicon.ico rename to nemosis/favicon.ico diff --git a/osdan/filters.py b/nemosis/filters.py similarity index 100% rename from osdan/filters.py rename to nemosis/filters.py diff --git a/osdan/gui.py b/nemosis/gui.py similarity index 99% rename from osdan/gui.py rename to nemosis/gui.py index 735bf68..aee213d 100644 --- a/osdan/gui.py +++ b/nemosis/gui.py @@ -1,6 +1,6 @@ -from osdan import rows -from osdan import defaults -from osdan import data_fetch_methods +from nemosis import rows +from nemosis import defaults +from nemosis import data_fetch_methods import pandas as pd import tkinter as tk import tkinter.ttk as ttk @@ -71,7 +71,7 @@ def __init__(self, parent, *args, **kwargs): ttk.Frame.__init__(self, parent=None, style='App.TFrame', borderwidth=0, width=890, height=590) self.parent = parent - self.parent.title('Osdan') + self.parent.title('NEMOSIS') self.parent.geometry('1000x600') self.setStyle() self.createWidgets() diff --git a/osdan/hook-pandas.py b/nemosis/hook-pandas.py similarity index 100% rename from osdan/hook-pandas.py rename to nemosis/hook-pandas.py diff --git a/osdan/processing_info_maps.py b/nemosis/processing_info_maps.py similarity index 98% rename from osdan/processing_info_maps.py rename to nemosis/processing_info_maps.py index dd8cb67..457a429 100644 --- a/osdan/processing_info_maps.py +++ b/nemosis/processing_info_maps.py @@ -1,6 +1,6 @@ import os -from osdan import filters, downloader, query_wrapers, write_file_names, date_generators +from nemosis import filters, downloader, query_wrapers, write_file_names, date_generators setup = {'DISPATCHLOAD': None, diff --git a/osdan/query_wrapers.py b/nemosis/query_wrapers.py similarity index 98% rename from osdan/query_wrapers.py rename to nemosis/query_wrapers.py index 5a85b03..1ebc319 100644 --- a/osdan/query_wrapers.py +++ b/nemosis/query_wrapers.py @@ -1,6 +1,6 @@ import pandas as pd from datetime import datetime, timedelta -from osdan import defaults +from nemosis import defaults diff --git a/osdan/rows.py b/nemosis/rows.py similarity index 99% rename from osdan/rows.py rename to nemosis/rows.py index 1c17805..7b43381 100644 --- a/osdan/rows.py +++ b/nemosis/rows.py @@ -1,6 +1,6 @@ import tkinter as tk import tkinter.ttk as ttk -from osdan import defaults +from nemosis import defaults class Query: diff --git a/osdan/test_data_fetch_methods.py b/nemosis/test_data_fetch_methods.py similarity index 99% rename from osdan/test_data_fetch_methods.py rename to nemosis/test_data_fetch_methods.py index 61d1c11..af76215 100644 --- a/osdan/test_data_fetch_methods.py +++ b/nemosis/test_data_fetch_methods.py @@ -1,9 +1,9 @@ import unittest from datetime import timedelta -from osdan import data_fetch_methods -from osdan import defaults +from nemosis import data_fetch_methods +from nemosis import defaults import pandas as pd -from osdan import custom_tables +from nemosis import custom_tables class TestDynamicDataCompilerWithSettlementDateFiltering(unittest.TestCase): diff --git a/osdan/test_date_generators.py b/nemosis/test_date_generators.py similarity index 99% rename from osdan/test_date_generators.py rename to nemosis/test_date_generators.py index d60ba5e..c2c95d7 100644 --- a/osdan/test_date_generators.py +++ b/nemosis/test_date_generators.py @@ -1,6 +1,6 @@ import unittest from datetime import datetime -from osdan import date_generators +from nemosis import date_generators class TestYearAndMonthGen(unittest.TestCase): diff --git a/osdan/test_filters.py b/nemosis/test_filters.py similarity index 99% rename from osdan/test_filters.py rename to nemosis/test_filters.py index 7305f28..1d62b85 100644 --- a/osdan/test_filters.py +++ b/nemosis/test_filters.py @@ -1,6 +1,6 @@ import unittest import pandas as pd -from osdan import filters +from nemosis import filters from pandas.util.testing import assert_frame_equal from datetime import datetime import numpy as np diff --git a/osdan/test_performance_stats.py b/nemosis/test_performance_stats.py similarity index 99% rename from osdan/test_performance_stats.py rename to nemosis/test_performance_stats.py index 1860893..4d95e1f 100644 --- a/osdan/test_performance_stats.py +++ b/nemosis/test_performance_stats.py @@ -1,11 +1,11 @@ import unittest -from osdan import data_fetch_methods +from nemosis import data_fetch_methods import pandas as pd -from osdan import custom_tables +from nemosis import custom_tables import math import numpy as np import time -from osdan import defaults +from nemosis import defaults from datetime import datetime, timedelta import os diff --git a/osdan/test_processing_info_maps.py b/nemosis/test_processing_info_maps.py similarity index 98% rename from osdan/test_processing_info_maps.py rename to nemosis/test_processing_info_maps.py index 6ce52bc..cb84774 100644 --- a/osdan/test_processing_info_maps.py +++ b/nemosis/test_processing_info_maps.py @@ -1,10 +1,10 @@ import unittest -from osdan import processing_info_maps -from osdan import data_fetch_methods -from osdan import defaults +from nemosis import processing_info_maps +from nemosis import data_fetch_methods +from nemosis import defaults import pandas as pd from datetime import datetime -from osdan import query_wrapers +from nemosis import query_wrapers class TestSearchTypeValidity(unittest.TestCase): diff --git a/osdan/test_query_wrapers.py b/nemosis/test_query_wrapers.py similarity index 99% rename from osdan/test_query_wrapers.py rename to nemosis/test_query_wrapers.py index 6090200..12cf770 100644 --- a/osdan/test_query_wrapers.py +++ b/nemosis/test_query_wrapers.py @@ -1,9 +1,9 @@ import unittest import pandas as pd -from osdan import query_wrapers +from nemosis import query_wrapers from pandas.util.testing import assert_frame_equal from datetime import datetime -from osdan import defaults +from nemosis import defaults class TestDispatchDateSetup(unittest.TestCase): diff --git a/osdan/write_file_names.py b/nemosis/write_file_names.py similarity index 98% rename from osdan/write_file_names.py rename to nemosis/write_file_names.py index 23439cc..596555e 100644 --- a/osdan/write_file_names.py +++ b/nemosis/write_file_names.py @@ -1,5 +1,5 @@ import os -from osdan import defaults +from nemosis import defaults def write_file_names(name, month, year, day, index, raw_data_location): # Add the year and month information to the generic AEMO file name diff --git a/osdan.egg-info/PKG-INFO b/osdan.egg-info/PKG-INFO deleted file mode 100644 index 9cac2fa..0000000 --- a/osdan.egg-info/PKG-INFO +++ /dev/null @@ -1,14 +0,0 @@ -Metadata-Version: 2.1 -Name: osdan -Version: 0.0.5 -Summary: A tool for accessing AEMO data. -Home-page: https://github.com/UNSW-CEEM/osdan -Author: Nicholas Gorman -Author-email: n.gorman305@gmail.com -License: UNKNOWN -Description: A tool for accessing AEMO data. -Platform: UNKNOWN -Classifier: Programming Language :: Python :: 3 -Classifier: License :: OSI Approved :: GNU General Public License (GPL) -Classifier: Operating System :: OS Independent -Description-Content-Type: text/markdown diff --git a/osdan.egg-info/SOURCES.txt b/osdan.egg-info/SOURCES.txt deleted file mode 100644 index 759c2d7..0000000 --- a/osdan.egg-info/SOURCES.txt +++ /dev/null @@ -1,25 +0,0 @@ -README.md -setup.py -osdan/__init__.py -osdan/custom_tables.py -osdan/data_fetch_methods.py -osdan/date_generators.py -osdan/defaults.py -osdan/downloader.py -osdan/filters.py -osdan/gui.py -osdan/hook-pandas.py -osdan/processing_info_maps.py -osdan/query_wrapers.py -osdan/rows.py -osdan/test_data_fetch_methods.py -osdan/test_date_generators.py -osdan/test_filters.py -osdan/test_performance_stats.py -osdan/test_processing_info_maps.py -osdan/test_query_wrapers.py -osdan/write_file_names.py -osdan.egg-info/PKG-INFO -osdan.egg-info/SOURCES.txt -osdan.egg-info/dependency_links.txt -osdan.egg-info/top_level.txt \ No newline at end of file diff --git a/osdan.egg-info/dependency_links.txt b/osdan.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/osdan.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/osdan.egg-info/top_level.txt b/osdan.egg-info/top_level.txt deleted file mode 100644 index 74fda20..0000000 --- a/osdan.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -osdan diff --git a/osdan/__pycache__/custom_tables.cpython-36.pyc b/osdan/__pycache__/custom_tables.cpython-36.pyc deleted file mode 100644 index f4ebd73..0000000 Binary files a/osdan/__pycache__/custom_tables.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/data_fetch_methods.cpython-36.pyc b/osdan/__pycache__/data_fetch_methods.cpython-36.pyc deleted file mode 100644 index 73fdc42..0000000 Binary files a/osdan/__pycache__/data_fetch_methods.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/data_fetch_methods.cpython-37.pyc b/osdan/__pycache__/data_fetch_methods.cpython-37.pyc deleted file mode 100644 index 7851df7..0000000 Binary files a/osdan/__pycache__/data_fetch_methods.cpython-37.pyc and /dev/null differ diff --git a/osdan/__pycache__/date_generators.cpython-36.pyc b/osdan/__pycache__/date_generators.cpython-36.pyc deleted file mode 100644 index 9542ea5..0000000 Binary files a/osdan/__pycache__/date_generators.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/defaults.cpython-36.pyc b/osdan/__pycache__/defaults.cpython-36.pyc deleted file mode 100644 index 59be574..0000000 Binary files a/osdan/__pycache__/defaults.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/defaults.cpython-37.pyc b/osdan/__pycache__/defaults.cpython-37.pyc deleted file mode 100644 index fbf950b..0000000 Binary files a/osdan/__pycache__/defaults.cpython-37.pyc and /dev/null differ diff --git a/osdan/__pycache__/downloader.cpython-36.pyc b/osdan/__pycache__/downloader.cpython-36.pyc deleted file mode 100644 index e37f670..0000000 Binary files a/osdan/__pycache__/downloader.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/filters.cpython-36.pyc b/osdan/__pycache__/filters.cpython-36.pyc deleted file mode 100644 index 0acd140..0000000 Binary files a/osdan/__pycache__/filters.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/processing_info_maps.cpython-36.pyc b/osdan/__pycache__/processing_info_maps.cpython-36.pyc deleted file mode 100644 index fb0a1e3..0000000 Binary files a/osdan/__pycache__/processing_info_maps.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/query_wrapers.cpython-36.pyc b/osdan/__pycache__/query_wrapers.cpython-36.pyc deleted file mode 100644 index d81a0f7..0000000 Binary files a/osdan/__pycache__/query_wrapers.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/rows.cpython-36.pyc b/osdan/__pycache__/rows.cpython-36.pyc deleted file mode 100644 index 313c88e..0000000 Binary files a/osdan/__pycache__/rows.cpython-36.pyc and /dev/null differ diff --git a/osdan/__pycache__/rows.cpython-37.pyc b/osdan/__pycache__/rows.cpython-37.pyc deleted file mode 100644 index 36f4e60..0000000 Binary files a/osdan/__pycache__/rows.cpython-37.pyc and /dev/null differ diff --git a/osdan/__pycache__/write_file_names.cpython-36.pyc b/osdan/__pycache__/write_file_names.cpython-36.pyc deleted file mode 100644 index 19b9833..0000000 Binary files a/osdan/__pycache__/write_file_names.cpython-36.pyc and /dev/null differ diff --git a/setup.py b/setup.py index a87e86f..9ea4a69 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,8 @@ long_description = fh.read() setuptools.setup( - name="osdan", - version="0.0.5", + name="nemosis", + version="0.0.6", author="Nicholas Gorman", author_email="n.gorman305@gmail.com", description="A tool for accessing AEMO data.", @@ -13,6 +13,7 @@ long_description_content_type="text/markdown", url="https://github.com/UNSW-CEEM/osdan", packages=setuptools.find_packages(), + install_requires=['requests', 'joblib', 'pyarrow', 'feather-format', 'pandas'], classifiers=[ "Programming Language :: Python :: 3", "License :: OSI Approved :: GNU General Public License (GPL)",