From 54de4f7622747b8141a0f8b8c01dd2abda63d9c2 Mon Sep 17 00:00:00 2001
From: mehtank <mehtank>
Date: Wed, 28 Apr 2021 14:35:57 -0700
Subject: [PATCH] Fixed packaging
---
rocolib/api/__init__.py | 3 ---
rocolib/api/ports/__init__.py | 42 -----------------------------------
rocolib/utils/io.py | 14 ++++++++++++
setup.py | 4 ++--
4 files changed, 16 insertions(+), 47 deletions(-)
create mode 100644 rocolib/utils/io.py
diff --git a/rocolib/api/__init__.py b/rocolib/api/__init__.py
index c376a9d..e69de29 100644
--- a/rocolib/api/__init__.py
+++ b/rocolib/api/__init__.py
@@ -1,3 +0,0 @@
-
-#from CodeComponent import CodeComponent
-#from UIComponent import UIComponent
\ No newline at end of file
diff --git a/rocolib/api/ports/__init__.py b/rocolib/api/ports/__init__.py
index 4107d13..125bbed 100644
--- a/rocolib/api/ports/__init__.py
+++ b/rocolib/api/ports/__init__.py
@@ -4,45 +4,3 @@ from .EdgePort import EdgePort
from .FacePort import FacePort
from .MountPort import MountPort
from .AnchorPort import AnchorPort
-
-from .ElectricalPort import ElectricalPort
-from .ElectricalInputPort import ElectricalInputPort
-from .ElectricalOutputPort import ElectricalOutputPort
-from .PowerInputPort import PowerInputPort
-from .PowerOutputPort import PowerOutputPort
-from .SerialTXPort import SerialTXPort
-from .SerialRXPort import SerialRXPort
-from .PWMInputPort import PWMInputPort
-from .PWMOutputPort import PWMOutputPort
-from .ServoInputPort import ServoInputPort
-from .ServoOutputPort import ServoOutputPort
-from .AnalogInputPort import AnalogInputPort
-from .AnalogOutputPort import AnalogOutputPort
-from .DigitalInputPort import DigitalInputPort
-from .DigitalOutputPort import DigitalOutputPort
-from .OneWireSerialPort import OneWireSerialPort
-
-from .DataPort import DataPort
-from .DataOutputPort import DataOutputPort
-from .DataInputPort import DataInputPort
-
-all_ports = [
- ElectricalInputPort,
- ElectricalOutputPort,
- PowerInputPort,
- PowerOutputPort,
- SerialTXPort,
- SerialRXPort,
- PWMInputPort,
- PWMOutputPort,
- ServoInputPort,
- ServoOutputPort,
- AnalogInputPort,
- AnalogOutputPort,
- DigitalInputPort,
- DigitalOutputPort,
- OneWireSerialPort,
- DataInputPort,
- DataOutputPort,
-]
-
diff --git a/rocolib/utils/io.py b/rocolib/utils/io.py
new file mode 100644
index 0000000..1290898
--- /dev/null
+++ b/rocolib/utils/io.py
@@ -0,0 +1,14 @@
+from os.path import join
+
+from yaml import safe_load
+
+from rocolib import ROCOLIB_DIR
+
+def load_yaml(file_name):
+ if file_name[-5:] != '.yaml':
+ file_name += '.yaml'
+
+ fqn = join(ROCOLIB_DIR, 'library', file_name)
+ with open(fqn, 'r') as fd:
+ return safe_load(fd)
+
diff --git a/setup.py b/setup.py
index 6bb61b1..40aba8c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup
+from setuptools import setup, find_packages
import codecs
import os.path
@@ -23,7 +23,7 @@ setup(
version=get_metadata("rocolib/__init__.py", "version"),
author=get_metadata("rocolib/__init__.py", "author"),
license='LGPLv3',
- packages=['rocolib'],
+ packages=find_packages(exclude=['*.test', '*.builders']),
install_requires=[
'dxfwrite',
'numpy',
--
GitLab