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 e17230c..19432eb 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: ER64nToNISCz0gNNyg2l2fjhhDRcueERkmIQR1k3DqbugzKwBbiXdNx2xp9Tl5nm271T/IFKE1sANEbbA0WsU4BkzqOvQtg/m8ziufsDw7EExgo1hR9OGnARerNPQNkJnXCdUnDpaznb845kfFaoNGlOP303z02Lj/mkjOhNjUT7HjqTF/dQiyyUhDrSjp+2QptkixpT6mtLaIQvCzFF4V+Ww0E5PnmV7zr4+Dpl1XwuiOEYf5kcDHC6PP9krYgg3Ufe6bQlJv2FDZqSyHs9Wqig9kLWn+iwztXlMTn6oMLcAoF1b9Ao4o4iPtu3EL0KNruWpvEDQnxcW5Yhui0fELpWfinubZMnrPPVsREp61tD0Bp5+ycW557VJYc1uIQ9VtHnz/zq8oElC6OhKqy9z2pIQHpd1Xz6fBusWoE2TiVHtDn3FwReZCB0+I4h9CTOovimb+OTFD4FMXniE8XryP5iGwbyhzhYreBuIiiZLmEKq1uROwww4xnWir/etXqlbWTtNPELiptex4O/VfPkPE5lvizPFeoxcoPPZ44ccWLmbfCeeJKiP0nGj20Mg2mL732+K6vt3JrSFoUpPBO/ZNcTsP+O408P7+fQA9Y70rxntQRtv0CKipSzRYHOwR8/Fsu8mQPCzmjpaqkoTBIrSkwJ57CGLPqQfU8yMD//mO4= 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_ssd1306.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ssd1306 --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_ssd1306.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace + examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-ssd1306 --library_location + . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/adafruit_ssd1306.py b/adafruit_ssd1306.py index 4abe3eb..7f635b8 100644 --- a/adafruit_ssd1306.py +++ b/adafruit_ssd1306.py @@ -29,10 +29,10 @@ """ import time -import framebuf -from adafruit_bus_device import i2c_device, spi_device from micropython import const +from adafruit_bus_device import i2c_device, spi_device +import framebuf __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1306.git" @@ -215,6 +215,8 @@ class SSD1306_SPI(_SSD1306): :param reset: the reset pin to use, :param cs: the chip-select pin to use (sometimes labeled "SS"). """ + # pylint: disable=no-member + # Disable should be reconsidered when refactor can be tested. def __init__(self, width, height, spi, dc, reset, cs, *, external_vcc=False, baudrate=8000000, polarity=0, phase=0): self.rate = 10 * 1024 * 1024 diff --git a/docs/conf.py b/docs/conf.py index 4c91afa..7cfd30c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -19,7 +19,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 = [ "framebuf", "adafruit_bus_device", "micropython" ] +autodoc_mock_imports = ["framebuf"] intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'BusDevice': ('https://circuitpython.readthedocs.io/projects/bus_device/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..5a5b7f6 --- /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-ssd1306', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for SSD1306 OLED displays.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_SSD1306', + + # 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 ssd1306 oled displays 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_ssd1306'], +)