Skip to content

Commit

Permalink
changed name to nemosis
Browse files Browse the repository at this point in the history
  • Loading branch information
nick-gorman committed Oct 31, 2018
1 parent 04dfc65 commit a65ba8d
Show file tree
Hide file tree
Showing 41 changed files with 34 additions and 74 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion osdan/custom_tables.py → nemosis/custom_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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__)


Expand Down
2 changes: 1 addition & 1 deletion osdan/date_generators.py → nemosis/date_generators.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from osdan import defaults
from nemosis import defaults
from calendar import monthrange


Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion osdan/downloader.py → nemosis/downloader.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import requests
import zipfile
import io
from osdan import defaults
from nemosis import defaults



Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions osdan/gui.py → nemosis/gui.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion osdan/query_wrapers.py → nemosis/query_wrapers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pandas as pd
from datetime import datetime, timedelta
from osdan import defaults
from nemosis import defaults



Expand Down
2 changes: 1 addition & 1 deletion osdan/rows.py → nemosis/rows.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import tkinter as tk
import tkinter.ttk as ttk
from osdan import defaults
from nemosis import defaults


class Query:
Expand Down
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import unittest
from datetime import datetime
from osdan import date_generators
from nemosis import date_generators


class TestYearAndMonthGen(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion osdan/test_filters.py → nemosis/test_filters.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
4 changes: 2 additions & 2 deletions osdan/test_query_wrapers.py → nemosis/test_query_wrapers.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
2 changes: 1 addition & 1 deletion osdan/write_file_names.py → nemosis/write_file_names.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 0 additions & 14 deletions osdan.egg-info/PKG-INFO

This file was deleted.

25 changes: 0 additions & 25 deletions osdan.egg-info/SOURCES.txt

This file was deleted.

1 change: 0 additions & 1 deletion osdan.egg-info/dependency_links.txt

This file was deleted.

1 change: 0 additions & 1 deletion osdan.egg-info/top_level.txt

This file was deleted.

Binary file removed osdan/__pycache__/custom_tables.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/data_fetch_methods.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/data_fetch_methods.cpython-37.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/date_generators.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/defaults.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/defaults.cpython-37.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/downloader.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/filters.cpython-36.pyc
Binary file not shown.
Binary file not shown.
Binary file removed osdan/__pycache__/query_wrapers.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/rows.cpython-36.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/rows.cpython-37.pyc
Binary file not shown.
Binary file removed osdan/__pycache__/write_file_names.cpython-36.pyc
Binary file not shown.
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
long_description = fh.read()

setuptools.setup(
name="osdan",
version="0.0.5",
name="nemosis",
version="0.0.6",
author="Nicholas Gorman",
author_email="[email protected]",
description="A tool for accessing AEMO data.",
long_description="A tool for accessing AEMO data.",
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)",
Expand Down

0 comments on commit a65ba8d

Please sign in to comment.