cleanup, version bump

.gitmodules

@@ -1,27 +1,27 @@
 [submodule "drivers/qwiic_bme280"]
-	path = drivers/qwiic_bme280
+	path = qwiic/drivers/qwiic_bme280
 	url = https://github.com/sparkfun/Qwiic_BME280_Py.git
 [submodule "drivers/qwiic_ccs811"]
-	path = drivers/qwiic_ccs811
+	path = qwiic/drivers/qwiic_ccs811
 	url = https://github.com/sparkfun/Qwiic_CCS811_Py.git
 [submodule "drivers/qwiic_mico_oled"]
-	path = drivers/qwiic_micro_oled
+	path = qwiic/drivers/qwiic_micro_oled
 	url = https://github.com/sparkfun/Qwiic_Micro_OLED_Py.git
 [submodule "drivers/qwiic_proximity"]
-	path = drivers/qwiic_proximity
+	path = qwiic/drivers/qwiic_proximity
 	url = https://github.com/sparkfun/Qwiic_Proximity_Py.git
 [submodule "drivers/qwiic_scmd"]
-	path = drivers/qwiic_scmd
+	path = qwiic/drivers/qwiic_scmd
 	url = https://github.com/sparkfun/Qwiic_SCMD_Py.git
 [submodule "qwiic_i2c"]
 	path = qwiic_i2c
 	url = https://github.com/sparkfun/Qwiic_I2C_Py.git
 [submodule "drivers/qwiic_keypad"]
-	path = drivers/qwiic_keypad
+	path = qwiic/drivers/qwiic_keypad
 	url = https://github.com/sparkfun/Qwiic_Keypad_Py.git
 [submodule "drivers/qwiic_joystick"]
-	path = drivers/qwiic_joystick
+	path = qwiic/drivers/qwiic_joystick
 	url = https://github.com/sparkfun/Qwiic_Joystick_Py.git
 [submodule "drivers/qwiic_twist"]
-	path = drivers/qwiic_twist
+	path = qwiic/drivers/qwiic_twist
 	url = https://github.com/sparkfun/Qwiic_Twist_Py.git

setup.py

@@ -3,10 +3,10 @@
 # This is a python install script written for qwiic python package.
 #
 # Written by  SparkFun Electronics, May 2019
-# 
-# This python library supports the SparkFun Electroncis qwiic 
-# ecosystem, providing an plaform indepenant interface to the 
-# I2C bus. 
+#
+# This python library supports the SparkFun Electroncis qwiic
+# ecosystem, providing an plaform indepenant interface to the
+# I2C bus.
 #
 # More information on qwiic is at https://www.sparkfun.com/qwiic
 #
@@ -15,22 +15,22 @@
 #==================================================================================
 # Copyright (c) 2019 SparkFun Electronics
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy 
-# of this software and associated documentation files (the "Software"), to deal 
-# in the Software without restriction, including without limitation the rights 
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-# copies of the Software, and to permit persons to whom the Software is 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be included in all 
+# The above copyright notice and this permission notice shall be included in all
 # copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #==================================================================================
 
@@ -45,7 +45,7 @@
 with io.open(path.join(here, "DESCRIPTION.rst"), encoding="utf-8") as f:
     long_description = f.read()
 
-# Build up our list of dependant modules. 
+# Build up our list of dependant modules.
 #
 setup_requires = ['sparkfun-qwiic-i2c']
 
@@ -61,7 +61,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # http://packaging.python.org/en/latest/tutorial.html#version
-    version='0.9.4',
+    version='0.9.6',
 
     description='SparkFun Electronics qwiic library',
     long_description=long_description,
@@ -93,12 +93,12 @@
         'License :: OSI Approved :: MIT License',
 
         # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both. 
+        # that you indicate whether you support Python 2, Python 3 or both.
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
-   
+
     ],
 
     # What does your project relate to?
@@ -107,5 +107,6 @@
     # You can just specify the packages manually here if your project is
     # simple. Or you can use find_packages().
     packages=["qwiic"],
+    package_data={ "qwiic/drivers" : ['*'] },
 
 )