From c697fd8b4db63160833191db198ef9ea2847b76c Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:11:21 -0700 Subject: [PATCH 1/9] Allow releasing on PyPI --- docs/conf.py | 1 - requirements.txt | 2 +- setup.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++ setup.py.disabled | 4 ---- 4 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 setup.py delete mode 100644 setup.py.disabled diff --git a/docs/conf.py b/docs/conf.py index 4dd28b8..6e383dd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,6 @@ # 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", "busio"] -autodoc_mock_imports = ["displayio"] intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), diff --git a/requirements.txt b/requirements.txt index cf4cac0..d5b0cea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Adafruit-Blinka - +Adafruit_Blinka_Displayio diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..48f9866 --- /dev/null +++ b/setup.py @@ -0,0 +1,53 @@ +"""A setuptools based setup module. +See: +https://packaging.python.org/en/latest/distributing.html +https://github.com/pypa/sampleproject +""" + +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-ili9341", + use_scm_version=True, + setup_requires=["setuptools_scm"], + description="displayio driver for ILI9341 and ILI9340 TFT-LCD displays.", + long_description=long_description, + long_description_content_type="text/x-rst", + # The project's main homepage. + url="https://github.com/adafruit/Adafruit_CircuitPython_ili9341", + # Author details + author="Adafruit Industries", + author_email="circuitpython@adafruit.com", + install_requires=[ + "Adafruit-Blinka", + "adafruit-blinka-displayio", + ], + # 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 blinka circuitpython micropython ili9341 display tft lcd displayio", + # You can just specify the packages manually here if your project is + # simple. Or you can use find_packages(). + py_modules=["adafruit_ili9341"], +) diff --git a/setup.py.disabled b/setup.py.disabled deleted file mode 100644 index a80b9bf..0000000 --- a/setup.py.disabled +++ /dev/null @@ -1,4 +0,0 @@ -""" -This library is not deployed to PyPI. It is either a board-specific helper library, or -does not make sense for use on or is incompatible with single board computers and Linux. -""" From 312a414463df2bffa57ffa7816f4c274918e3da0 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:12:29 -0700 Subject: [PATCH 2/9] Fix requirements displayio repo spelling --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d5b0cea..f99129c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Adafruit-Blinka -Adafruit_Blinka_Displayio +adafruit-blinka-displayio From ff31e082779fc5cf9017a7289c62c452c4770371 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:14:03 -0700 Subject: [PATCH 3/9] Black formatted --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 48f9866..6c95431 100644 --- a/setup.py +++ b/setup.py @@ -28,10 +28,7 @@ # Author details author="Adafruit Industries", author_email="circuitpython@adafruit.com", - install_requires=[ - "Adafruit-Blinka", - "adafruit-blinka-displayio", - ], + install_requires=["Adafruit-Blinka", "adafruit-blinka-displayio",], # Choose your license license="MIT", # See https://pypi.python.org/pypi?%3Aaction=list_classifiers From beba6b080946a57fa088d86a42f4169ac3404c87 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:18:15 -0700 Subject: [PATCH 4/9] Fix wrong order import in examples --- examples/ili9341_shield_simpletest.py | 2 +- examples/ili9341_simpletest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ili9341_shield_simpletest.py b/examples/ili9341_shield_simpletest.py index cc453ad..310cf68 100644 --- a/examples/ili9341_shield_simpletest.py +++ b/examples/ili9341_shield_simpletest.py @@ -5,8 +5,8 @@ Pinouts are for the 2.8" TFT Shield """ import board -import displayio import terminalio +import displayio from adafruit_display_text import label import adafruit_ili9341 diff --git a/examples/ili9341_simpletest.py b/examples/ili9341_simpletest.py index deb0b46..8e7fa83 100644 --- a/examples/ili9341_simpletest.py +++ b/examples/ili9341_simpletest.py @@ -6,8 +6,8 @@ Pinouts are for the 2.4" TFT FeatherWing or Breakout with a Feather M4 or M0. """ import board -import displayio import terminalio +import displayio from adafruit_display_text import label import adafruit_ili9341 From 09850e788cbdd3f3062ba7fb5a3591404d6ae5cb Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:27:13 -0700 Subject: [PATCH 5/9] Add intersphinx mapping for displayio --- docs/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conf.py b/docs/conf.py index 6e383dd..77807c2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,6 +26,7 @@ intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None), + "displayio": ("https://adafruit-blinka-displayio.readthedocs.io/en/latest/"), } # Add any paths that contain templates here, relative to this directory. From 671b1350d1ee1699f4c254d4278bfcf14a84ab40 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:32:31 -0700 Subject: [PATCH 6/9] Fix mapping link --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 77807c2..f4ee88f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,7 @@ intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None), - "displayio": ("https://adafruit-blinka-displayio.readthedocs.io/en/latest/"), + "displayio": ("https://adafruit-blinka-displayio.readthedocs.io/en/latest/", "None"), } # Add any paths that contain templates here, relative to this directory. From 48af203df158593de166dc8ff5c4ed0db916e3da Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:34:45 -0700 Subject: [PATCH 7/9] Black formatted again --- docs/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index f4ee88f..e155589 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,7 +26,10 @@ intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None), - "displayio": ("https://adafruit-blinka-displayio.readthedocs.io/en/latest/", "None"), + "displayio": ( + "https://adafruit-blinka-displayio.readthedocs.io/en/latest/", + "None", + ), } # Add any paths that contain templates here, relative to this directory. From e13c0c4bfba610312553e007ce0e4ef80ea1d905 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:38:21 -0700 Subject: [PATCH 8/9] Unquated None --- docs/conf.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e155589..d4f7b82 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -26,10 +26,7 @@ intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None), - "displayio": ( - "https://adafruit-blinka-displayio.readthedocs.io/en/latest/", - "None", - ), + "displayio": ("https://adafruit-blinka-displayio.readthedocs.io/en/latest/", None), } # Add any paths that contain templates here, relative to this directory. From 6606bfbccb41fb3f9b1213b17aaef3be79a73e71 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 8 Jun 2020 16:44:35 -0700 Subject: [PATCH 9/9] Remocked displayio for docs --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index d4f7b82..4dd28b8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,11 +22,11 @@ # 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", "busio"] +autodoc_mock_imports = ["displayio"] intersphinx_mapping = { "python": ("https://docs.python.org/3.4", None), "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None), - "displayio": ("https://adafruit-blinka-displayio.readthedocs.io/en/latest/", None), } # Add any paths that contain templates here, relative to this directory.