diff --git a/.gitignore b/.gitignore index 73f174b..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +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 1482448..1fe3700 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: DHzhwDVhmIZEmfIPlOBgg+jif1lbKp8btvnzXtxaZIftLHBayY68IGOPD2SIEm/bIope3I4tknlsKgGdUbuSvDIgaPo7oeVP9LnqiWJzd86vh16UcydLEwIDN9AlSkzhz+d2Vz+DqYeSAo1nAsPXqKiuXQ7FzEqiAorOfcjBIZnZpi70OzmsjgZV5V8J9/xO0PkQH2K9AUjZ3zFNpcpvxOWhpjh8Rl75xxSTbf7YrABcZonHK20UnbCJblmYx36pUtYedUx5hsxymjEQQOhQ3OdQOWn2Xf2nROHDCx0lmoHJvHjhRWGRra7esAMbRMFvAvGzMMBThIOGTApo85oI4h3HhQBoxoi9NHzQUsn5/GDUlIZ17pRT+NJi+plea7Zmvd8gnLHSwDAu5BvyfF4Kfn0TOSrE7fSA4cCvHwbo+kS19zxYT9GXuLfjR4gBXgpbl5emVcbOMqIbskKPOplhZZ1z59ehyEfzidADR45gPXtc1vQhG+xURR8HzRUV9RUczIFQIEtlBYIa4d4R+XMS2aMM9zyB5qxQARt0wGGbvNnlsOinTHdMXsJNCQYJiTeboQ7aL88lIn+z73vS5+Ln2r+cOc1mUgzXiTFvJ5YDtLAJ3Od6boWj20qqYZF5NO9RfuwlpU7UeWHGYscz3EGDfhZdSj860YnJHA4Kuq+vzEU= 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_max7219/*.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-max7219 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_max7219/*.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace + examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-max7219 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/adafruit_max7219/bcddigits.py b/adafruit_max7219/bcddigits.py index 63bc98e..9fd9def 100644 --- a/adafruit_max7219/bcddigits.py +++ b/adafruit_max7219/bcddigits.py @@ -25,8 +25,8 @@ `adafruit_max7219.bcddigits.BCDDigits` ==================================================== """ -from adafruit_max7219 import max7219 from micropython import const +from adafruit_max7219 import max7219 __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MAX7219.git" diff --git a/adafruit_max7219/matrices.py b/adafruit_max7219/matrices.py index 6724cc2..c8c6129 100644 --- a/adafruit_max7219/matrices.py +++ b/adafruit_max7219/matrices.py @@ -25,8 +25,8 @@ `adafruit_max7219.matrices.Matrix8x8` ==================================================== """ -from adafruit_max7219 import max7219 from micropython import const +from adafruit_max7219 import max7219 __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MAX7219.git" diff --git a/adafruit_max7219/max7219.py b/adafruit_max7219/max7219.py index 3a1ebcb..cad40b0 100644 --- a/adafruit_max7219/max7219.py +++ b/adafruit_max7219/max7219.py @@ -54,11 +54,10 @@ #. Datasheet: https://cdn-shop.adafruit.com/datasheets/MAX7219.pdf """ # MicroPython SSD1306 OLED driver, I2C and SPI interfaces -import framebuf import digitalio - from adafruit_bus_device import spi_device from micropython import const +import framebuf __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_MAX7219.git" @@ -142,6 +141,7 @@ def scroll(self, delta_x, delta_y): self.framebuf.scroll(delta_x, delta_y) def write_cmd(self, cmd, data): + # pylint: disable=no-member """Writes a command to spi device.""" #print('cmd {} data {}'.format(cmd,data)) self._chip_select.value = False diff --git a/docs/conf.py b/docs/conf.py index 1d25400..2539ff5 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 = ["digitalio", "adafruit_bus_device", "micropython", "framebuf"] +autodoc_mock_imports = ["framebuf"] 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/max7219_simpletest.py b/examples/max7219_simpletest.py index 4be719c..99f6151 100644 --- a/examples/max7219_simpletest.py +++ b/examples/max7219_simpletest.py @@ -1,12 +1,12 @@ import time -from board import TX, RX, A2 +from board import TX, RX, D1 import busio import digitalio from adafruit_max7219 import matrices mosi = TX clk = RX -cs = digitalio.DigitalInOut(A2) +cs = digitalio.DigitalInOut(D1) spi = busio.SPI(clk, MOSI=mosi) diff --git a/examples/showbcddigits.py b/examples/showbcddigits.py index 4bf0563..fdcdc47 100644 --- a/examples/showbcddigits.py +++ b/examples/showbcddigits.py @@ -1,13 +1,13 @@ import time import random -from board import TX, RX, A2 +from board import TX, RX, D1 import busio import digitalio from adafruit_max7219 import bcddigits mosi = TX clk = RX -cs = digitalio.DigitalInOut(A2) +cs = digitalio.DigitalInOut(D1) spi = busio.SPI(clk, MOSI=mosi) diff --git a/requirements.txt b/requirements.txt index 8b13789..3031961 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ - +Adafruit-Blinka +adafruit-circuitpython-busdevice diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..44df31e --- /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-max7219', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for MAX7219 LED matrix driver.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_DRV2605', + + # 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 max7219 LED matrix breakout hardware micropython circuitpython', + + # You can just specify the packages manually here if your project is + # simple. Or you can use find_packages(). + packages=['adafruit_max7219'], +)