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 b1b348c..5b1eaa5 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: pVhTN80nv+/BP427ERFD4eFEaGNPaphHoY3t3olKHPHQWHqwjko4bLQSsee6zQdU4USfYHiH+6HiTw5Z5rBgHxuFKxX1MOYLPDU4mG0NRfB5+lMgEAKAWYoM6h/RIZEVHmLRLkTmR7Ai+KQvN66ArnV7NULZvgteYI4RxG4u7ZEB0nGxoFy4OKV096xar1A9Tc86LpkNZv9OzAEgytwDCw3FJwpQIJ4A8AtfU4xUbCMfvf+0oyWM7+dDnsleqdcwjvxhYJvbzaYZme2bFvWaH4rgLryVZ3FmaZb+/ph8F1FuPe0mfandjVq91IpcmFhgap9sIpJWpLTPMUpdfk2BUkYwDfpEywOStGWS16sGzXZcx1adeNeyJZ78sV4KD7NQ/oH9x1dvgehWE7j1+MB6fYLTaiZ1NjZfApf9zSwq7Za3q5NCn9p3DKgkfMZ/aB6DMG/d4cqcSHJH3FixXhbwsX8gHBYukHYD+crdhOGp1u/LqRZpfYxjtVsgbEi4VkyX7A1xqZL8VVN0nqHFnl2HND22eeZzKVMeqDGJC2x31SRFpnulCbdx1ldWjQf96nR4xB/6yXM02FN6w0eHpLd/+sm7usjyfhQ7qYz+VwlihMIHY5J29JykqwIdUej/V0M6zLmuIYYyM5rxKk6vmyNs2tEPK6fEzhNnh1P5sA+85C8= 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_fxos8700.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-fxos8700 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_fxos8700.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-fxos8700 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/adafruit_fxos8700.py b/adafruit_fxos8700.py index 6193e20..6b57573 100644 --- a/adafruit_fxos8700.py +++ b/adafruit_fxos8700.py @@ -50,7 +50,7 @@ except ImportError: import struct -import adafruit_bus_device.i2c_device as i2c_device +import adafruit_bus_device.i2c_device as i2c_dev from micropython import const # Register addresses and other constants: @@ -113,7 +113,7 @@ def __init__(self, i2c, address=_FXOS8700_ADDRESS, accel_range=ACCEL_RANGE_2G): assert accel_range in (ACCEL_RANGE_2G, ACCEL_RANGE_4G, ACCEL_RANGE_8G) self._accel_range = accel_range - self._device = i2c_device.I2CDevice(i2c, address) + self._device = i2c_dev.I2CDevice(i2c, address) # Check for chip ID value. if self._read_u8(_FXOS8700_REGISTER_WHO_AM_I) != _FXOS8700_ID: raise RuntimeError('Failed to find FXOS8700, check wiring!') diff --git a/docs/conf.py b/docs/conf.py index 5a0bf90..f5e7908 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..0325c4c --- /dev/null +++ b/setup.py @@ -0,0 +1,60 @@ +"""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-fxos8700', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for NXP FXOS8700 accelerometer and magnetometer.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_FXOS8700', + + # 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 nxp fxos8700 accelerometer magnetometer 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_fxos8700'], +)