diff --git a/.gitignore b/.gitignore index 77c5ef1..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,93 +1,12 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -env/ -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -*.egg-info/ -.installed.cfg -*.egg - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*,cover -.hypothesis/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -target/ - -# IPython Notebook -.ipynb_checkpoints - -# pyenv -.python-version - -# celery beat schedule file -celerybeat-schedule - -# dotenv -.env - -# virtualenv -venv/ -ENV/ - -# Spyder project settings -.spyderproject - -# Rope project settings -.ropeproject - +*.mpy +.idea +__pycache__ +_build +*.pyc .env build* bundles +*.DS_Store +.eggs +dist +**/*.egg-info \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 881d2aa..7c3234f 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: QHtuRzRJceW/x1clk1GANeoyh6Hqu54jQcSWADMvKgokwU+rpB3Qj7Hh3KOvDgFbCxpPRWvYABCOJCd/lBBshRp8ctMWlFSyOtsS3HEO1Uie+T2FuhOIK3Llc3093EdPemNtFJbRrVaUs6n+r0e/INin5PxkqR5fgPY/gzXIgHtseF7ly39u21ugAICsSjbXC94FS2TtfjPHy30Orp9u2J3tFShh9ls/ENMMXRk+TUWJnMCcqmNf76I09IFIeB+9syNqBfDINdGknt/kaW4IaLSh+bJhuLyip1awO0zOQq+kFFJ29aLUNjM/hyHNYKV/XKR+H36bKL+BEA4rRTZ2tJjBMYEFv/LB9WK8E8Dfto+qNNoU749ns0OF1Zj5T9IaPMsTMdsqfDrAYgwOtiNUQlLsERmFJBhkobHrihHACBXYvUXbkg82jeBede7k6sTwysg+JRhyJipoLrP+KoMRfN7xMkkRu35Ge708B8EVDkENOx8xXPYkaPJIbgx8o9yt+JmthIp0pBrRfO/3/7XUijFJuZAFR0RT6BBi89ne+bDJHNPXr+ejlR/Gd2SHYpKlwhYGQaRXqdk35cS+UCNHjQLxTrW+gUWkGFc/QKKAJHG7JJXlmqKItLIV63sXHOO/Fr653p+s7O2cYtSHhJqKlHclU45Go7DrCwVMZi7Jnq8= 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_mpr121.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-mpr121 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_mpr121.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-mpr121 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/docs/conf.py b/docs/conf.py index f4222d0..36fabe0 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/examples/mpr121_simpletest.py b/examples/mpr121_simpletest.py index e51f04b..786ae2e 100644 --- a/examples/mpr121_simpletest.py +++ b/examples/mpr121_simpletest.py @@ -3,14 +3,12 @@ # board are touched. Open the serial REPL after running to see the output. # Author: Tony DiCola import time - +import board +import busio # Import MPR121 module. import adafruit_mpr121 -import busio - # Create I2C bus. -import board i2c = busio.I2C(board.SCL, board.SDA) # Create MPR121 class. 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..70bb9a8 --- /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-mpr121', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for MPR121 capacitive touch breakout board.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_MPR121', + + # 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 mpr121 capacitive touch 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_mpr121'], +)