changed structure for pypi

.gitignore

@@ -3,5 +3,6 @@ __pycache__/*
 venv/*
 build/*
 dist/*
-
+gui.spec
 .pkl
+cd

README.md

@@ -1,2 +1,3 @@
-# nem-data
+# osdan
 See wiki for more information.
+

osdan.egg-info/PKG-INFO

@@ -0,0 +1,14 @@
+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: [email protected]
+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

osdan.egg-info/SOURCES.txt

@@ -0,0 +1,25 @@
+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

osdan.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

osdan.egg-info/top_level.txt

@@ -0,0 +1 @@
+osdan

osdan/__init__.py

@@ -0,0 +1 @@
+name = "osdan"

compiling to exe → osdan/compiling to exe

@@ -2,7 +2,7 @@
 Use call like:
 
 # Add to spec file
-a.datas += [('favicon.ico', 'C:\\Users\\user\\Documents\\GitHub\\nem-data\\favicon.ico',  'DATA')]
+a.datas += [('favicon.ico', 'C:\\Users\\user\\Documents\\GitHub\\osdan\\favicon.ico',  'DATA')]
 
 # Run in terminal
 C:\Users\user\AppData\Local\Programs\Python\Python36\python.exe -m PyInstaller --onefile --icon=favicon.ico gui.py

custom_tables.py → osdan/custom_tables.py

@@ -2,13 +2,8 @@
 from datetime import timedelta, datetime
 import math
 import numpy as np
+from osdan import defaults, data_fetch_methods, filters
 
-import os
-
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import defaults, data_fetch_methods
-else:
-    from osdan import defaults, data_fetch_methods
 
 def fcas4s_scada_match(start_time, end_time, table_name, raw_data_location, select_columns=None, filter_cols=None,
                        filter_values=None):
@@ -360,3 +355,4 @@ def trading_and_dispatch_cost():
     scada_and_regions = scada_and_regions.groupby('DUID').sum()
 
     scada_and_regions.to_csv('C:/Users/user/Documents/dispatch_trading_cost.csv')
+

data_fetch_methods.py → osdan/data_fetch_methods.py

@@ -2,11 +2,8 @@
 from datetime import datetime, timedelta
 import pandas as pd
 import feather
-
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import filters, downloader, processing_info_maps, custom_tables, defaults
-else:
-    from osdan import filters, downloader, processing_info_maps, custom_tables, defaults
+from osdan import filters, downloader, processing_info_maps, defaults, custom_tables
+print(custom_tables.__file__)
 
 
 def dynamic_data_compiler(start_time, end_time, table_name, raw_data_location, select_columns=None, filter_cols=None,

date_generators.py → osdan/date_generators.py

@@ -1,10 +1,4 @@
-import os
-
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import defaults
-else:
-    from osdan import defaults
-
+from osdan import defaults
 from calendar import monthrange
 
 

defaults.py → osdan/defaults.py

@@ -119,7 +119,7 @@
                    'DISPATCHTYPE', 'CONSTRAINTID', 'PREDISPATCH', 'STPASA', 'MTPASA', 'LIMITTYPE', 'STATIONNAME',
                    'AGCFLAG', 'INTERCONNECTORID', 'NAME', 'Fuel Source - Primary', 'Fuel Source - Descriptor',
                    'Technology Type - Primary', 'Technology Type - Descriptor', 'ELEMENTNUMBER', 'MARKETNAME',
-                   'VARIABLENUMBER', 'VARIABLETYPE', 'MMSDESCRIPTOR', 'ELEMENTTYPE']
+                   'VARIABLENUMBER', 'VARIABLETYPE', 'MMSDESCRIPTOR', 'ELEMENTTYPE', 'Region']
 
 table_columns = {
 

downloader.py → osdan/downloader.py

@@ -1,12 +1,8 @@
 import requests
 import zipfile
 import io
-import os
+from osdan import defaults
 
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import defaults
-else:
-    from osdan import defaults
 
 
 def run(year, month, day, index, filename, down_load_to):

gui.py → osdan/gui.py

@@ -1,6 +1,6 @@
-import rows
-import defaults
-import data_fetch_methods
+from osdan import rows
+from osdan import defaults
+from osdan import data_fetch_methods
 import pandas as pd
 import tkinter as tk
 import tkinter.ttk as ttk

processing_info_maps.py → osdan/processing_info_maps.py

@@ -1,9 +1,7 @@
 import os
 
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import filters, downloader, query_wrapers, write_file_names, date_generators
-else:
-    from osdan import filters, downloader, query_wrapers, write_file_names, date_generators
+from osdan import filters, downloader, query_wrapers, write_file_names, date_generators
+
 
 setup = {'DISPATCHLOAD': None,
          'TRADINGLOAD': None,

query_wrapers.py → osdan/query_wrapers.py

@@ -1,11 +1,7 @@
 import pandas as pd
 from datetime import datetime, timedelta
-import os
+from osdan import defaults
 
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import defaults
-else:
-    from osdan import defaults
 
 
 def dispatch_date_setup(start_time, end_time):

rows.py → osdan/rows.py

@@ -1,6 +1,6 @@
 import tkinter as tk
 import tkinter.ttk as ttk
-import defaults
+from osdan import defaults
 
 
 class Query:

test_data_fetch_methods.py → osdan/test_data_fetch_methods.py

@@ -1,9 +1,9 @@
 import unittest
 from datetime import timedelta
-import data_fetch_methods
-import defaults
+from osdan import data_fetch_methods
+from osdan import defaults
 import pandas as pd
-import custom_tables
+from osdan import custom_tables
 
 
 class TestDynamicDataCompilerWithSettlementDateFiltering(unittest.TestCase):

test_date_generators.py → osdan/test_date_generators.py

@@ -1,6 +1,6 @@
 import unittest
 from datetime import datetime
-import date_generators
+from osdan import date_generators
 
 
 class TestYearAndMonthGen(unittest.TestCase):

test_filters.py → osdan/test_filters.py

@@ -1,6 +1,6 @@
 import unittest
 import pandas as pd
-import filters
+from osdan import filters
 from pandas.util.testing import assert_frame_equal
 from datetime import datetime
 import numpy as np

test_performance_stats.py → osdan/test_performance_stats.py

@@ -1,11 +1,11 @@
 import unittest
-import data_fetch_methods
+from osdan import data_fetch_methods
 import pandas as pd
-import custom_tables
+from osdan import custom_tables
 import math
 import numpy as np
 import time
-import defaults
+from osdan import defaults
 from datetime import datetime, timedelta
 import os
 

test_processing_info_maps.py → osdan/test_processing_info_maps.py

@@ -1,10 +1,10 @@
 import unittest
-import processing_info_maps
-import data_fetch_methods
-import defaults
+from osdan import processing_info_maps
+from osdan import data_fetch_methods
+from osdan import defaults
 import pandas as pd
 from datetime import datetime
-import query_wrapers
+from osdan import query_wrapers
 
 
 class TestSearchTypeValidity(unittest.TestCase):

test_query_wrapers.py → osdan/test_query_wrapers.py

@@ -1,9 +1,9 @@
 import unittest
 import pandas as pd
-import query_wrapers
+from osdan import query_wrapers
 from pandas.util.testing import assert_frame_equal
 from datetime import datetime
-import defaults
+from osdan import defaults
 
 
 class TestDispatchDateSetup(unittest.TestCase):

write_file_names.py → osdan/write_file_names.py

@@ -1,10 +1,5 @@
 import os
-
-if os.getcwd().split('\\')[-1] == 'osdan':
-    import defaults
-else:
-    from osdan import defaults
-
+from osdan 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

setup.py

@@ -0,0 +1,21 @@
+import setuptools
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name="osdan",
+    version="0.0.5",
+    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(),
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: GNU General Public License (GPL)",
+        "Operating System :: OS Independent",
+    ],
+)