Skip to content

Commit

Permalink
shoyld work fine now
Browse files Browse the repository at this point in the history
  • Loading branch information
nipunbatra committed Mar 24, 2017
1 parent 893e6e4 commit fc3197f
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 519 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ index.yaml
nilm_metadata.egg-info/
NILM_metadata.egg-info/
docs/build
.idea/
build/
dist/
4 changes: 0 additions & 4 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/nilm_metadata.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

484 changes: 0 additions & 484 deletions .idea/workspace.xml

This file was deleted.

Binary file modified dist/nilm_metadata-0.2.0-py2.7.egg
Binary file not shown.
2 changes: 1 addition & 1 deletion nilm_metadata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
def get_data(path):
return os.path.join(_ROOT, 'central_metadata', path)

print get_data('appliance_types/appliance.yaml')

4 changes: 1 addition & 3 deletions nilm_metadata/file_management.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import yaml



def get_appliance_types_from_disk():
obj_filenames = _find_all_appliance_type_files()
obj_cache = {}
Expand All @@ -25,7 +26,6 @@ def _find_all_appliance_type_files():


def _get_appliance_types_directory():
print(_path_to_directory('central_metadata', 'appliance_types'))
return _path_to_directory('central_metadata', 'appliance_types')


Expand Down Expand Up @@ -58,6 +58,4 @@ def _get_module_directory():
if not isdir(path_to_this_file):
path_to_this_file = getcwd()
assert isdir(path_to_this_file), path_to_this_file + ' is not a directory'
print(path_to_this_file)
print("MODULE")
return path_to_this_file
2 changes: 1 addition & 1 deletion nilm_metadata/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version = '0.2.0.dev-c326ead'
version = '0.2.0.dev-893e6e4'
short_version = '0.2.0'

0 comments on commit fc3197f

Please sign in to comment.