From 3037bda5eee79d981bd55d3a59b3bbba10ff2fc7 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Sun, 5 Aug 2018 15:47:42 -0400 Subject: [PATCH 1/2] PyPi setup. --- .gitignore | 7 +++++- .travis.yml | 38 ++++++++++++++-------------- adafruit_lsm9ds1.py | 14 +++++------ docs/conf.py | 2 +- requirements.txt | 3 ++- setup.py | 61 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 96 insertions(+), 29 deletions(-) create mode 100644 setup.py diff --git a/.gitignore b/.gitignore index 6337ada..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ +*.mpy +.idea __pycache__ _build *.pyc -*.mpy .env build* bundles +*.DS_Store +.eggs +dist +**/*.egg-info \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 7b99a22..499d77b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,32 @@ -# This is a common .travis.yml for generating library release zip files for -# CircuitPython library releases using circuitpython-build-tools. -# See https://github.com/adafruit/circuitpython-build-tools for detailed setup -# instructions. - dist: trusty sudo: false language: python python: - - "3.6" - +- '3.6' cache: - pip: true - + pip: true deploy: - provider: releases - api_key: $GITHUB_TOKEN +- provider: releases + api_key: "$GITHUB_TOKEN" file_glob: true - file: $TRAVIS_BUILD_DIR/bundles/* + file: "$TRAVIS_BUILD_DIR/bundles/*" skip_cleanup: true overwrite: true on: tags: true - +- provider: pypi + user: adafruit-travis + on: + tags: true + password: + secure: FEkH02ho+7peMJLEUNy6jzdi+bdpWMrZmDJc54Cuot9kcCcEssvgvxVTTIQEgIbNz3cgl+VimVfzXzSWhSTECsap/JHik0jiEXjJ2DZd4CeByETes03ioslYROh/fvHsjt4Bxy7inf8AjogNxOUHqtyzmKKs5BTy8kng5u2TWdfkuWeFQv49lmLmy8lrmhQfmHc+gDk3TCUxUGZzdw2b7QUgCwBeHTaoj/6UPsbfkgKn/EndmCsKE3vul6l4JAY758VYqLuYvP8ZFdCSShJ0F6TU7K/A0mELi7LXEj1zyxEL7x29ToDI0Q773hyWoqfctMYc+nOy7j4fQW0UdZQMH1hu4s4Ki0TaHDzWRjz7UqRe43fp0zyPNwsqcGVHH4YXsXnFddy22myshCJKz+7TAv5xEpyOFpJYfE1WfTXO/cLUZkfHREDPTH8qYHw0H33ORpgJXF4mhwlL9nbLyIl+gqRlnBrrwsVEy2ZOnHJB0wUvWqUZFEZHiQUtdcuvZE9b5ZPvs0+OA+Pb8KZfbRVJGtzpUgi4S+ttevLle6csGh2ZNuzX11166HrIhfey7xg3qK0vUs3OKGEE2wOMRYYw3kr11+lf8q+ZkjM91vRRnkuJqfggyhLuCdF4CARRZ5C1K+XMB+i5KYD4BcnG0vJhKCkH5y1jKZxKvyvp3RfriWU= install: - - pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme - +- pip install -r requirements.txt +- pip install pylint circuitpython-build-tools Sphinx sphinx-rtd-theme +- pip install --force-reinstall pylint==1.9.2 script: - - pylint adafruit_lsm9ds1.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-lsm9ds1 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_lsm9ds1.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-lsm9ds1 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/adafruit_lsm9ds1.py b/adafruit_lsm9ds1.py index a224859..57fe011 100644 --- a/adafruit_lsm9ds1.py +++ b/adafruit_lsm9ds1.py @@ -55,8 +55,8 @@ except ImportError: import ustruct as struct -import adafruit_bus_device.i2c_device as i2c_device -import adafruit_bus_device.spi_device as spi_device +import adafruit_bus_device.i2c_device as i2c_dev +import adafruit_bus_device.spi_device as spi_dev from micropython import const # Internal constants and register values: @@ -366,8 +366,8 @@ class LSM9DS1_I2C(LSM9DS1): """Driver for the LSM9DS1 connect over I2C.""" def __init__(self, i2c): - self._mag_device = i2c_device.I2CDevice(i2c, _LSM9DS1_ADDRESS_MAG) - self._xg_device = i2c_device.I2CDevice(i2c, _LSM9DS1_ADDRESS_ACCELGYRO) + self._mag_device = i2c_dev.I2CDevice(i2c, _LSM9DS1_ADDRESS_MAG) + self._xg_device = i2c_dev.I2CDevice(i2c, _LSM9DS1_ADDRESS_ACCELGYRO) super().__init__() def _read_u8(self, sensor_type, address): @@ -404,10 +404,10 @@ def _write_u8(self, sensor_type, address, val): class LSM9DS1_SPI(LSM9DS1): """Driver for the LSM9DS1 connect over SPI.""" - + # pylint: disable=no-member def __init__(self, spi, xgcs, mcs): - self._mag_device = spi_device.I2CDevice(spi, mcs) - self._xg_device = spi_device.I2CDevice(spi, xgcs) + self._mag_device = spi_dev.I2CDevice(spi, mcs) + self._xg_device = spi_dev.I2CDevice(spi, xgcs) super().__init__() def _read_u8(self, sensor_type, address): diff --git a/docs/conf.py b/docs/conf.py index 44374ce..41620f7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ # Uncomment the below if you use native CircuitPython modules such as # digitalio, micropython and busio. List the modules you use. Without it, the # autodoc module docs will fail to generate with a warning. -autodoc_mock_imports = ["adafruit_bus_device", "micropython"] +# autodoc_mock_imports = ["adafruit_bus_device", "micropython"] intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} diff --git a/requirements.txt b/requirements.txt index c47d35a..3031961 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -adafruit-circuitpython-bus-device +Adafruit-Blinka +adafruit-circuitpython-busdevice diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..d387b20 --- /dev/null +++ b/setup.py @@ -0,0 +1,61 @@ +"""A setuptools based setup module. + +See: +https://packaging.python.org/en/latest/distributing.html +https://github.com/pypa/sampleproject +""" + +# Always prefer setuptools over distutils +from setuptools import setup, find_packages +# To use a consistent encoding +from codecs import open +from os import path + +here = path.abspath(path.dirname(__file__)) + +# Get the long description from the README file +with open(path.join(here, 'README.rst'), encoding='utf-8') as f: + long_description = f.read() + +setup( + name='adafruit-circuitpython-lsm9ds1', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for LSM9DS1 accelerometer, magnetometer, gyroscope.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_LSM9DS1', + + # Author details + author='Adafruit Industries', + author_email='circuitpython@adafruit.com', + + install_requires=['Adafruit-Blinka', 'adafruit-circuitpython-busdevice'], + + # Choose your license + license='MIT', + + # See https://pypi.python.org/pypi?%3Aaction=list_classifiers + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'Topic :: Software Development :: Libraries', + 'Topic :: System :: Hardware', + 'License :: OSI Approved :: MIT License', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + ], + + # What does your project relate to? + keywords='adafruit accelerometer magnetometer gyroscope lsm9ds1' + 'breakout hardware micropython circuitpython', + + # You can just specify the packages manually here if your project is + # simple. Or you can use find_packages(). + py_modules=['adafruit_lsm9ds1'], +) From 60aa4a03236a0ad20cfc5b5b316c7fc4470190e0 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Mon, 6 Aug 2018 12:38:14 -0400 Subject: [PATCH 2/2] refactor to original state --- adafruit_lsm9ds1.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/adafruit_lsm9ds1.py b/adafruit_lsm9ds1.py index 57fe011..735d691 100644 --- a/adafruit_lsm9ds1.py +++ b/adafruit_lsm9ds1.py @@ -55,8 +55,8 @@ except ImportError: import ustruct as struct -import adafruit_bus_device.i2c_device as i2c_dev -import adafruit_bus_device.spi_device as spi_dev +import adafruit_bus_device.i2c_device as i2c_device +import adafruit_bus_device.spi_device as spi_device from micropython import const # Internal constants and register values: @@ -366,8 +366,8 @@ class LSM9DS1_I2C(LSM9DS1): """Driver for the LSM9DS1 connect over I2C.""" def __init__(self, i2c): - self._mag_device = i2c_dev.I2CDevice(i2c, _LSM9DS1_ADDRESS_MAG) - self._xg_device = i2c_dev.I2CDevice(i2c, _LSM9DS1_ADDRESS_ACCELGYRO) + self._mag_device = i2c_device.I2CDevice(i2c, _LSM9DS1_ADDRESS_MAG) + self._xg_device = i2c_device.I2CDevice(i2c, _LSM9DS1_ADDRESS_ACCELGYRO) super().__init__() def _read_u8(self, sensor_type, address): @@ -406,8 +406,8 @@ class LSM9DS1_SPI(LSM9DS1): """Driver for the LSM9DS1 connect over SPI.""" # pylint: disable=no-member def __init__(self, spi, xgcs, mcs): - self._mag_device = spi_dev.I2CDevice(spi, mcs) - self._xg_device = spi_dev.I2CDevice(spi, xgcs) + self._mag_device = spi_device.I2CDevice(spi, mcs) + self._xg_device = spi_device.I2CDevice(spi, xgcs) super().__init__() def _read_u8(self, sensor_type, address):