Update to pyproject.toml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46cefce5c3af5f02b9851d38536c2fc5bee7cdb7..723b7058d4a487d6545066ec30536b17d084e13a 100644 (file)
--- 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
       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:
       with:

-        python-version: 3.7
+        python-version: "3.x"

     - name: Versions
       run: |
         python3 --version
     - 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
       # (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: |
       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: 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: 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: 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 8d93708438a4903a7ec749d7ed7c2e69d60916f9..684dd10cf923843b837efc2c2e796cedcc68259e 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,25 +14,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1

-    - name: Check For setup.py
+    - name: Check For pyproject.toml

       id: need-pypi
       run: |
       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
     - 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
       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
       run: |
         python -m pip install --upgrade pip

-        pip install setuptools wheel twine
+        pip install --upgrade build twine

     - name: Build and publish
     - 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: |
       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/*
         twine upload dist/*

diff --git a/displayio/__init__.py b/displayio/__init__.py
index d0707ac13cb8e96dad4c07eefcbc2f547d253cca..a908e1aa50bb54441ba43de0c821834af08d3d12 100644 (file)
--- a/displayio/__init__.py
+++ b/displayio/__init__.py
@@ -33,7 +33,7 @@ from ._tilegrid import TileGrid
 from ._display import displays
 from ._displaybus import _DisplayBus
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_area.py b/displayio/_area.py
index e5ab94410c0db76213c84d64792a1f6d45d4a698..3eba700590bb7bb03249aad980ad2d9bc1f53275 100644 (file)
--- a/displayio/_area.py
+++ b/displayio/_area.py
@@ -20,7 +20,7 @@ Area for Blinka Displayio
 
 from __future__ import annotations
 
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git"
 
 

diff --git a/displayio/_bitmap.py b/displayio/_bitmap.py
index 9d06a6364a4ae632a0827849b308b22223c91d9e..08b383ec92b5e9aeda1fb0422127916e5d2033c1 100644 (file)
--- 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
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_colorconverter.py b/displayio/_colorconverter.py
index dc6fc164b48dc7f198449cc92ab8ec91d4dc637a..01c70d67d214fadd8793b82e5022792894096c2d 100644 (file)
--- 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
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 from ._colorspace import Colorspace

diff --git a/displayio/_colorspace.py b/displayio/_colorspace.py
index b5322a3bbf8cf7db80de8c042bf42152c343dcb0..42ab1481947df6c8a2b4ae341b3a0d6382ee8474 100644 (file)
--- 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_constants.py b/displayio/_constants.py
index 11b20c66a7131a1b7012e5ef8301b7dd1c5ad4f7..938b49ceacd20382d6784e7567f2068f095fb087 100644 (file)
--- a/displayio/_constants.py
+++ b/displayio/_constants.py
@@ -6,7 +6,7 @@
 """Constants"""
 
 
 """Constants"""
 
 

-__version__ = "0.0.0-auto.0"
+__version__ = "0.0.0+auto.0"

 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git"
 
 

diff --git a/displayio/_display.py b/displayio/_display.py
index 41d53d152971bbf149d57bd1c4caff5667a019ec..da94fb2bc433a8f0c769cffc1af70256b26f749f 100644 (file)
--- a/displayio/_display.py
+++ b/displayio/_display.py
@@ -41,7 +41,7 @@ from ._constants import (
     BACKLIGHT_PWM,
 )
 
     BACKLIGHT_PWM,
 )
 

-__version__ = "0.0.0-auto.0"
+__version__ = "0.0.0+auto.0"

 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 displays = []
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 displays = []

diff --git a/displayio/_displaybus.py b/displayio/_displaybus.py
index 976e2036812ac468dced39d3bb9d7f53be66e40c..8080e6445e4d96feef8ff617c14dd19276d71ec0 100644 (file)
--- a/displayio/_displaybus.py
+++ b/displayio/_displaybus.py
@@ -22,7 +22,7 @@ import paralleldisplay
 from ._fourwire import FourWire
 from ._i2cdisplay import I2CDisplay
 
 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]
 __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 afb92c8eccedf3a5d5190ea05fd6c7c95419d622..a50d094fb656a20bb4b75396490855fda378ffc2 100644 (file)
--- 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git"
 
 

diff --git a/displayio/_epaperdisplay.py b/displayio/_epaperdisplay.py
index 7e17fa96ae523ea09b85574fb4d41c8c2ab7851f..686f8bb12d58aae1bdc3356352e0c2d6a7421601 100644 (file)
--- a/displayio/_epaperdisplay.py
+++ b/displayio/_epaperdisplay.py
@@ -23,7 +23,7 @@ import circuitpython_typing
 from ._group import Group
 from ._displaybus import _DisplayBus
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_fourwire.py b/displayio/_fourwire.py
index 7c8f7c5edaeb45d725f2d75aee04c7ea2af5893c..31b1be5e5a1ea1d578d9ab22640b966742f1145a 100644 (file)
--- a/displayio/_fourwire.py
+++ b/displayio/_fourwire.py
@@ -30,7 +30,7 @@ from ._constants import (
     DISPLAY_DATA,
 )
 
     DISPLAY_DATA,
 )
 

-__version__ = "0.0.0-auto.0"
+__version__ = "0.0.0+auto.0"

 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_group.py b/displayio/_group.py
index b38eaffd03d9b6a19daf0a3157ea7c07c36278dd..505a3bffb19c4f598c4a2b4e4e732e1dfb5d7efa 100644 (file)
--- 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
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_i2cdisplay.py b/displayio/_i2cdisplay.py
index 958ce1d97433d12391806aef701d56892f536acb..26476599fa61acc0379b3d3b27c5b54163feb86d 100644 (file)
--- 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
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_ondiskbitmap.py b/displayio/_ondiskbitmap.py
index c052bcb2a71595ae4fe20e5de3bc3e7cdf647335..02647d10ed9f0244edd7e06b51c710983860f78f 100644 (file)
--- a/displayio/_ondiskbitmap.py
+++ b/displayio/_ondiskbitmap.py
@@ -22,7 +22,7 @@ from PIL import Image
 from ._colorconverter import ColorConverter
 from ._palette import Palette
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_palette.py b/displayio/_palette.py
index c008c8755e50f8794252ebb7a625fa3e0ae8b862..969c769b9ae6738cbce64e806c184d8805110976 100644 (file)
--- a/displayio/_palette.py
+++ b/displayio/_palette.py
@@ -20,7 +20,7 @@ displayio for Blinka
 from typing import Optional, Union, Tuple
 import circuitpython_typing
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_shape.py b/displayio/_shape.py
index 9fe565dda0553e8874af368f02503f639542f8aa..946919d41fcf804fa7336d5a35fadf820147a445 100644 (file)
--- a/displayio/_shape.py
+++ b/displayio/_shape.py
@@ -20,7 +20,7 @@ displayio for Blinka
 
 from ._bitmap import Bitmap
 
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/displayio/_structs.py b/displayio/_structs.py
index 1e76121417395e00cfdad90ae0d9da88e3d0e21c..955b9b4a1a8c803ba66d890bed013b4500379a84 100644 (file)
--- a/displayio/_structs.py
+++ b/displayio/_structs.py
@@ -19,7 +19,7 @@ Struct Data Classes for Blinka Displayio
 
 from dataclasses import dataclass
 
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_Displayio.git"
 
 

diff --git a/displayio/_tilegrid.py b/displayio/_tilegrid.py
index 7fc9189a4dcdca4b98dc0ddc0862e2554b1c809d..ce1d225d248459245621e5c4dc4e9569b39fac73 100644 (file)
--- 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
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/docs/conf.py b/docs/conf.py
index 44577df0436ba435de6cfd3d1a69875eb489a131..a8628abf91ec5138961a0bfac645b469ad72b2b0 100644 (file)
--- 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.
 #
 # 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.
 
 # 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 d31f1f889a714a413bd45e7e3f8a3178d4cef38f..3a502afc87b48fb068d17d46d9bf14bf052d309c 100644 (file)
--- a/fontio.py
+++ b/fontio.py
@@ -26,7 +26,7 @@ try:
 except ImportError:
     from typing_extensions import Protocol
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/paralleldisplay.py b/paralleldisplay.py
index 0627418233bc2b21527175aed809d93958b3e09c..59fb08c91bc06202762f00eb4de4749b79009c33 100644 (file)
--- a/paralleldisplay.py
+++ b/paralleldisplay.py
@@ -20,7 +20,7 @@ paralleldisplay for Blinka
 import microcontroller
 import circuitpython_typing
 
 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"
 
 
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644 (file)
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 5fe2d0af7ec496d74536f931b35d9f3791f98c45..ce177e80840bbd25cf89271459ee68cb65272f93 100644 (file)
--- a/terminalio.py
+++ b/terminalio.py
@@ -20,7 +20,7 @@ terminalio for Blinka
 import sys  # pylint: disable=unused-import
 import fontio
 
 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()
 __repo__ = "https://github.com/adafruit/Adafruit_Blinka_displayio.git"
 
 FONT = fontio.BuiltinFont()