From a94203addedf0b7d4e5885848117b10bf6fa9fe1 Mon Sep 17 00:00:00 2001 From: Alec Delaney Date: Wed, 31 Aug 2022 18:46:17 -0400 Subject: [PATCH] Update to pyproject.toml --- .github/workflows/build.yml | 32 +++++++++++++++++++---- .github/workflows/release.yml | 19 ++++++++------ displayio/__init__.py | 2 +- displayio/_area.py | 2 +- displayio/_bitmap.py | 2 +- displayio/_colorconverter.py | 2 +- displayio/_colorspace.py | 2 +- displayio/_constants.py | 2 +- displayio/_display.py | 2 +- displayio/_displaybus.py | 2 +- displayio/_displaycore.py | 2 +- displayio/_epaperdisplay.py | 2 +- displayio/_fourwire.py | 2 +- displayio/_group.py | 2 +- displayio/_i2cdisplay.py | 2 +- displayio/_ondiskbitmap.py | 2 +- displayio/_palette.py | 2 +- displayio/_shape.py | 2 +- displayio/_structs.py | 2 +- displayio/_tilegrid.py | 2 +- docs/conf.py | 2 +- fontio.py | 2 +- paralleldisplay.py | 2 +- pyproject.toml | 48 +++++++++++++++++++++++++++++++++++ terminalio.py | 2 +- 25 files changed, 108 insertions(+), 35 deletions(-) create mode 100644 pyproject.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46cefce..723b705 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,10 +19,10 @@ jobs: id: repo-name run: | echo ::set-output name=repo-name::Adafruit-Blinka-displayio - - name: Set up Python 3.7 - uses: actions/setup-python@v1 + - name: Set up Python 3.x + uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: "3.x" - name: Versions run: | python3 --version @@ -39,14 +39,36 @@ jobs: # (e.g. - apt-get: gettext, etc; pip: circuitpython-build-tools, requirements.txt; etc.) run: | source actions-ci/install.sh - - name: Pip install pylint, black, & Sphinx + - name: Pip install Sphinx, pre-commit run: | - pip install --force-reinstall pylint black Sphinx sphinx-rtd-theme pre-commit + pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit - name: Library version run: git describe --dirty --always --tags + - name: Setup problem matchers + uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1 - name: Pre-commit hooks run: | pre-commit run --all-files + - name: Build assets + run: circuitpython-build-bundles --filename_prefix ${{ steps.repo-name.outputs.repo-name }} --library_location . + - name: Archive bundles + uses: actions/upload-artifact@v2 + with: + name: bundles + path: ${{ github.workspace }}/bundles/ - name: Build docs working-directory: docs run: sphinx-build -E -W -b html . _build/html + - name: Check For pyproject.toml + id: need-pypi + run: | + echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' ) + - name: Build Python package + if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') + run: | + pip install --upgrade build twine + for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do + sed -i -e "s/0.0.0+auto.0/1.2.3/" $file; + done; + python -m build + twine check dist/* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8d93708..684dd10 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,25 +14,28 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Check For setup.py + - name: Check For pyproject.toml id: need-pypi run: | - echo ::set-output name=setup-py::$( find . -wholename './setup.py' ) + echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' ) - name: Set up Python - if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') - uses: actions/setup-python@v1 + if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') + uses: actions/setup-python@v2 with: python-version: '3.x' - name: Install dependencies - if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') + if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') run: | python -m pip install --upgrade pip - pip install setuptools wheel twine + pip install --upgrade build twine - name: Build and publish - if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') + if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') env: TWINE_USERNAME: ${{ secrets.pypi_username }} TWINE_PASSWORD: ${{ secrets.pypi_password }} run: | - python setup.py sdist + for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do + sed -i -e "s/0.0.0+auto.0/${{github.event.release.tag_name}}/" $file; + done; + python -m build twine upload dist/* diff --git a/displayio/__init__.py b/displayio/__init__.py index d0707ac..a908e1a 100644 --- a/displayio/__init__.py +++ b/displayio/__init__.py @@ -33,7 +33,7 @@ from ._tilegrid import TileGrid from ._display import displays from ._displaybus import _DisplayBus -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_area.py b/displayio/_area.py index e5ab944..3eba700 100644 --- a/displayio/_area.py +++ b/displayio/_area.py @@ -20,7 +20,7 @@ Area for Blinka Displayio from __future__ import annotations -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" diff --git a/displayio/_bitmap.py b/displayio/_bitmap.py index 9d06a63..08b383e 100644 --- a/displayio/_bitmap.py +++ b/displayio/_bitmap.py @@ -22,7 +22,7 @@ from typing import Union, Tuple from PIL import Image from ._structs import RectangleStruct -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_colorconverter.py b/displayio/_colorconverter.py index dc6fc16..01c70d6 100644 --- a/displayio/_colorconverter.py +++ b/displayio/_colorconverter.py @@ -17,7 +17,7 @@ displayio for Blinka """ -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" from ._colorspace import Colorspace diff --git a/displayio/_colorspace.py b/displayio/_colorspace.py index b5322a3..42ab148 100644 --- a/displayio/_colorspace.py +++ b/displayio/_colorspace.py @@ -18,7 +18,7 @@ displayio for Blinka """ -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_constants.py b/displayio/_constants.py index 11b20c6..938b49c 100644 --- a/displayio/_constants.py +++ b/displayio/_constants.py @@ -6,7 +6,7 @@ """Constants""" -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" diff --git a/displayio/_display.py b/displayio/_display.py index 41d53d1..da94fb2 100644 --- a/displayio/_display.py +++ b/displayio/_display.py @@ -41,7 +41,7 @@ from ._constants import ( BACKLIGHT_PWM, ) -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" displays = [] diff --git a/displayio/_displaybus.py b/displayio/_displaybus.py index 976e203..8080e64 100644 --- a/displayio/_displaybus.py +++ b/displayio/_displaybus.py @@ -22,7 +22,7 @@ import paralleldisplay from ._fourwire import FourWire from ._i2cdisplay import I2CDisplay -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" _DisplayBus = Union[FourWire, I2CDisplay, paralleldisplay.ParallelBus] diff --git a/displayio/_displaycore.py b/displayio/_displaycore.py index afb92c8..a50d094 100644 --- a/displayio/_displaycore.py +++ b/displayio/_displaycore.py @@ -18,7 +18,7 @@ Super class of the display classes """ -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" diff --git a/displayio/_epaperdisplay.py b/displayio/_epaperdisplay.py index 7e17fa9..686f8bb 100644 --- a/displayio/_epaperdisplay.py +++ b/displayio/_epaperdisplay.py @@ -23,7 +23,7 @@ import circuitpython_typing from ._group import Group from ._displaybus import _DisplayBus -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_fourwire.py b/displayio/_fourwire.py index 7c8f7c5..31b1be5 100644 --- a/displayio/_fourwire.py +++ b/displayio/_fourwire.py @@ -30,7 +30,7 @@ from ._constants import ( DISPLAY_DATA, ) -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_group.py b/displayio/_group.py index b38eaff..505a3bf 100644 --- a/displayio/_group.py +++ b/displayio/_group.py @@ -22,7 +22,7 @@ from typing import Union, Callable from ._structs import TransformStruct from ._tilegrid import TileGrid -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_i2cdisplay.py b/displayio/_i2cdisplay.py index 958ce1d..2647659 100644 --- a/displayio/_i2cdisplay.py +++ b/displayio/_i2cdisplay.py @@ -26,7 +26,7 @@ import digitalio import circuitpython_typing from ._constants import CHIP_SELECT_UNTOUCHED, DISPLAY_COMMAND -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_ondiskbitmap.py b/displayio/_ondiskbitmap.py index c052bcb..02647d1 100644 --- a/displayio/_ondiskbitmap.py +++ b/displayio/_ondiskbitmap.py @@ -22,7 +22,7 @@ from PIL import Image from ._colorconverter import ColorConverter from ._palette import Palette -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_palette.py b/displayio/_palette.py index c008c87..969c769 100644 --- a/displayio/_palette.py +++ b/displayio/_palette.py @@ -20,7 +20,7 @@ displayio for Blinka from typing import Optional, Union, Tuple import circuitpython_typing -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_shape.py b/displayio/_shape.py index 9fe565d..946919d 100644 --- a/displayio/_shape.py +++ b/displayio/_shape.py @@ -20,7 +20,7 @@ displayio for Blinka from ._bitmap import Bitmap -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/displayio/_structs.py b/displayio/_structs.py index 1e76121..955b9b4 100644 --- a/displayio/_structs.py +++ b/displayio/_structs.py @@ -19,7 +19,7 @@ Struct Data Classes for Blinka Displayio from dataclasses import dataclass -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git" diff --git a/displayio/_tilegrid.py b/displayio/_tilegrid.py index 7fc9189..ce1d225 100644 --- a/displayio/_tilegrid.py +++ b/displayio/_tilegrid.py @@ -26,7 +26,7 @@ from ._shape import Shape from ._palette import Palette from ._structs import RectangleStruct, TransformStruct -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/docs/conf.py b/docs/conf.py index 44577df..a8628ab 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,7 +59,7 @@ release = "1.0" # # This is also used if you do content translation via gettext catalogs. # Usually you set "language" from the command line for these cases. -language = None +language = "en" # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. diff --git a/fontio.py b/fontio.py index d31f1f8..3a502af 100644 --- a/fontio.py +++ b/fontio.py @@ -26,7 +26,7 @@ try: except ImportError: from typing_extensions import Protocol -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/paralleldisplay.py b/paralleldisplay.py index 0627418..59fb08c 100644 --- a/paralleldisplay.py +++ b/paralleldisplay.py @@ -20,7 +20,7 @@ paralleldisplay for Blinka import microcontroller import circuitpython_typing -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..dc2d186 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,48 @@ +# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries +# +# SPDX-License-Identifier: MIT + +[build-system] +requires = [ + "setuptools", + "wheel", + "setuptools-scm", +] + +[project] +name = "adafruit-blinka-displayio" +description = "displayio for Blinka" +version = "0.0.0+auto.0" +readme = "README.rst" +authors = [ + {name = "Adafruit Industries", email = "circuitpython@adafruit.com"} +] +urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_SI1145.git"} +keywords = [ + "adafruit", + "blinka", + "circuitpython", + "micropython", + "displayio", + "lcd", + "tft", + "display", + "pitft", +] +license = {text = "MIT"} +classifiers = [ + "Intended Audience :: Developers", + "Topic :: Software Development :: Libraries", + "Topic :: Software Development :: Embedded Systems", + "Topic :: System :: Hardware", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", +] +dynamic = ["dependencies"] + +[tool.setuptools] +py-modules = ["fontio", "terminalio", "paralleldisplay"] +packages = ["displayio"] + +[tool.setuptools.dynamic] +dependencies = {file = ["requirements.txt"]} diff --git a/terminalio.py b/terminalio.py index 5fe2d0a..ce177e8 100644 --- a/terminalio.py +++ b/terminalio.py @@ -20,7 +20,7 @@ terminalio for Blinka import sys # pylint: disable=unused-import import fontio -__version__ = "0.0.0-auto.0" +__version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git" FONT = fontio.BuiltinFont() -- 2.49.0