diff --git a/.gitignore b/.gitignore index 0dd8629..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ +*.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 b33515f..5b63dcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,33 @@ -# 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: Ybuc+nxQAcuWb8U6rYfzwW+9mf/Mxktcjtfk1d2FmriSgHeG+M/x+D4xOXsR9YyPjei+9JL5yYzg8KuYX9tXoh42pdmrTIW48YEw6BR06r2TKQA6WqZTJZD52ut6LrtQJJXwP6kc468lLhpZUuaDp8O90BJ+fX/IG2ZVgyEuWVgLO0eEhGKhk96WETGalNIPqy6bYKB6oFDytEj2fcAAY4I4X7KENCeARZ5n6zwMNNgR7WYPdjnzt1VR+z7jWDBk6jMfhTgrlRLixwiVa500BgLwLCeTkXK3ShTBW7tHZKVWW5hDj7BOsaetYmzhEXfwnFFbRtH/tEJnL4RcebP1/iGQ27FFlxyVx4MLe5lC+DIl6R5IzIaVTYsjNvRDRfSzDzu5dXVAsZ/1r3S4r6nU/LoYy9pZ7gxguOBfd3wnp7V7MWoR6AjK8eBMzwtjVYMUODuLZveK/11oXtSpu/w4ekHw8gS55cc7Z1+ZThPx80HuembdezASpfw1ye42Di/Aq4RvId9jRQLU4ycy9ihgNe6ixM31dNJeulako7BuZXF/0QtfN4o9iNWcG7xbcbRVXe/OH9byT0/XWjDiJyg9Y9lxZXnh7OiVf04ZiGHdoKfiebapmivyzjDYi0wgVUmivbxgdK1MfKSxu2iOZZySXuYpZaBx0fYNmA8WrF+JF7U= 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_trellis.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-trellis --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_trellis.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace + examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-trellis --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/docs/conf.py b/docs/conf.py index 090ded4..c56811a 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 = ["micropython", "adafruit_bus_device"] +# autodoc_mock_imports = ["micropython", "adafruit_bus_device"] intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),'Register': ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)} diff --git a/examples/trellis_simpletest.py b/examples/trellis_simpletest.py index 16516bd..b1f8414 100644 --- a/examples/trellis_simpletest.py +++ b/examples/trellis_simpletest.py @@ -14,7 +14,7 @@ i2c = busio.I2C(SCL, SDA) # Create a Trellis object -trellis = Trellis(i2c) # 0x70 when no I2C address is supplied +trellis = Trellis(i2c) # 0x70 when no I2C address is supplied # 'auto_show' defaults to 'True', so anytime LED states change, # the changes are automatically sent to the Trellis board. If you @@ -39,7 +39,7 @@ # Turn off every LED, one at a time print('Turning off each LED, one at a time...') -for i in range(15,0,-1): +for i in range(15, 0, -1): trellis.led[i] = False time.sleep(.1) 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..1afca37 --- /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-trellis', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for Adafruit Trellis boards.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_trellis', + + # 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 trellis button led board 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_trellis'], +)