diff --git a/.gitignore b/.gitignore index 7bece34..55f127b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ -.DS_Store +*.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 0dcd57b..be22e3b 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: xrzl8OxwlMtumGczQDWoLtoyv1zeMUjvgPF1NwhBZQ8676PR9dyaLcnWb/RDnG2Gc7Maxq4YR5N/ycsSoxqigGVliEpltleVs3FIwAa/z0JlmtEd4AQ9N3khQaYYdgmjCOlnNkIJCS26smoB1yHP2QQVJTdY46OBnxni81jz0B2ZdMzfJJyu75qyzPonWVOSVqKaPhdqbNECwDAjdFXqY7OnwzgYCfjAcLAyXHQlOmi2+mEFDlv3cypFoxJOruxaWSm2I1mBBpwwxtlKKkpcuuQGiFuJSxKO6FPHl4SRZcTog537K63BUwVluMuw4wk4GyA/mYONNGqtxEhwkopw0B0dxxIBoH2z/K/s55iKrRzZ4G+6LeS+stfNvqzbqjdL+R98V2aZfrjqIMwAP77XIYjLpINhvCSJUmUyOROwj7C6VN0+JjsQrvglFdyQjDnIhOZJe5q83khtSjm6arDL3Fs3pYbDKSzskETHvw5S7Alj5cS9MtSojBfjgPO+CZHgTW1gQ1ON61sRKyxu78Mtem22/v+RmkQB0I/3L8LOTQEyD3EsWXeXl0W3BZrbjIf4Zg/RVnFLrhX6S2qjV5au/K3eMS3+kIjDSNENfOAF3xpe06JMrE4kO9I7GUs6mSJFZQzA01JARsDgS95R8ndSZCxjFU3hf4QdQZPSvIgJPYA= 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_rgb_display/*.py - - ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) - - circuitpython-build-bundles --filename_prefix adafruit-circuitpython-rgb-display --library_location . - - cd docs && sphinx-build -E -W -b html . _build/html +- pylint adafruit_rgb_display/*.py +- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name examples/*.py) +- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-rgb-display + --library_location . +- cd docs && sphinx-build -E -W -b html . _build/html && cd .. diff --git a/adafruit_rgb_display/hx8353.py b/adafruit_rgb_display/hx8353.py index 1f78e5f..cef40b1 100644 --- a/adafruit_rgb_display/hx8353.py +++ b/adafruit_rgb_display/hx8353.py @@ -27,8 +27,8 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ -from adafruit_rgb_display.rgb import DisplaySPI from micropython import const +from adafruit_rgb_display.rgb import DisplaySPI __version__ = "0.0.0-auto.0" diff --git a/adafruit_rgb_display/rgb.py b/adafruit_rgb_display/rgb.py index ed3f088..6fc80ab 100644 --- a/adafruit_rgb_display/rgb.py +++ b/adafruit_rgb_display/rgb.py @@ -179,6 +179,7 @@ def reset(self): self.rst.value = 1 time.sleep(0.050) # 50 milliseconds + # pylint: disable=no-member def write(self, command=None, data=None): """SPI write to the device: commands and data""" if command is not None: diff --git a/adafruit_rgb_display/s6d02a1.py b/adafruit_rgb_display/s6d02a1.py index cedc285..7beb0f8 100644 --- a/adafruit_rgb_display/s6d02a1.py +++ b/adafruit_rgb_display/s6d02a1.py @@ -28,8 +28,8 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ -from adafruit_rgb_display.rgb import DisplaySPI from micropython import const +from adafruit_rgb_display.rgb import DisplaySPI __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git" diff --git a/adafruit_rgb_display/ssd1331.py b/adafruit_rgb_display/ssd1331.py index 926d9dc..5c087f3 100644 --- a/adafruit_rgb_display/ssd1331.py +++ b/adafruit_rgb_display/ssd1331.py @@ -28,8 +28,8 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ -from adafruit_rgb_display.rgb import DisplaySPI from micropython import const +from adafruit_rgb_display.rgb import DisplaySPI __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git" @@ -126,6 +126,7 @@ class SSD1331(DisplaySPI): def __init__(self, spi, dc, cs, rst=None, width=96, height=64): super().__init__(spi, dc, cs, rst, width, height) + # pylint: disable=no-member def write(self, command=None, data=None): """write procedure specific to SSD1331""" self.dc_pin.value = command is None diff --git a/adafruit_rgb_display/ssd1351.py b/adafruit_rgb_display/ssd1351.py index fc69dd8..ba6153d 100644 --- a/adafruit_rgb_display/ssd1351.py +++ b/adafruit_rgb_display/ssd1351.py @@ -27,8 +27,8 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ -from adafruit_rgb_display.rgb import DisplaySPI from micropython import const +from adafruit_rgb_display.rgb import DisplaySPI __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git" diff --git a/adafruit_rgb_display/st7735.py b/adafruit_rgb_display/st7735.py index f0cbf73..2cb4073 100644 --- a/adafruit_rgb_display/st7735.py +++ b/adafruit_rgb_display/st7735.py @@ -28,12 +28,12 @@ * Author(s): Radomir Dopieralski, Michael McWethy """ -from adafruit_rgb_display.rgb import DisplaySPI try: import struct except ImportError: import ustruct as struct from micropython import const +from adafruit_rgb_display.rgb import DisplaySPI __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display.git" diff --git a/docs/conf.py b/docs/conf.py index ab5bf58..90e9b64 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 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..eb841bc --- /dev/null +++ b/setup.py @@ -0,0 +1,61 @@ +"""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-rgb-display', + + use_scm_version=True, + setup_requires=['setuptools_scm'], + + description='CircuitPython library for RGB displays.', + long_description=long_description, + long_description_content_type='text/x-rst', + + # The project's main homepage. + url='https://github.com/adafruit/Adafruit_CircuitPython_RGB_Display', + + # Author details + author='Radomir Dopieralski, Michael McWethy', + 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 rgb display hx8353 ili9341 s6d02A1 ssd1331 ssd1351 st7735' + 'hardware micropython circuitpython', + + # You can just specify the packages manually here if your project is + # simple. Or you can use find_packages(). + packages=['adafruit_rgb_display'], +)