Skip to content

Commit 4b0bb31

Browse files
committed
Switched to pyproject.toml
1 parent a6a7c08 commit 4b0bb31

File tree

6 files changed

+70
-71
lines changed

6 files changed

+70
-71
lines changed

.github/workflows/build.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ jobs:
4747
pip install --force-reinstall Sphinx sphinx-rtd-theme pre-commit
4848
- name: Library version
4949
run: git describe --dirty --always --tags
50+
- name: Setup problem matchers
51+
uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1
5052
- name: Pre-commit hooks
5153
run: |
5254
pre-commit run --all-files
@@ -60,16 +62,16 @@ jobs:
6062
- name: Build docs
6163
working-directory: docs
6264
run: sphinx-build -E -W -b html . _build/html
63-
- name: Check For setup.py
65+
- name: Check For pyproject.toml
6466
id: need-pypi
6567
run: |
66-
echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
68+
echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
6769
- name: Build Python package
68-
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
70+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
6971
run: |
70-
pip install --upgrade setuptools wheel twine readme_renderer testresources
71-
python setup.py sdist
72-
python setup.py bdist_wheel --universal
72+
pip install --upgrade build twine
73+
for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
74+
sed -i -e "s/0.0.0-auto.0/1.2.3/" $file;
75+
done;
76+
python -m build
7377
twine check dist/*
74-
- name: Setup problem matchers
75-
uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1

.github/workflows/release.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,28 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- uses: actions/checkout@v1
64-
- name: Check For setup.py
64+
- name: Check For pyproject.toml
6565
id: need-pypi
6666
run: |
67-
echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
67+
echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
6868
- name: Set up Python
69-
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
69+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
7070
uses: actions/setup-python@v2
7171
with:
7272
python-version: '3.x'
7373
- name: Install dependencies
74-
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
74+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
7575
run: |
7676
python -m pip install --upgrade pip
77-
pip install setuptools wheel twine
77+
pip install --upgrade build twine
7878
- name: Build and publish
79-
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
79+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
8080
env:
8181
TWINE_USERNAME: ${{ secrets.pypi_username }}
8282
TWINE_PASSWORD: ${{ secrets.pypi_password }}
8383
run: |
84-
python setup.py sdist
84+
for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
85+
sed -i -e "s/0.0.0-auto.0/${{github.event.release.tag_name}}/" $file;
86+
done;
87+
python -m build
8588
twine upload dist/*

optional_requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: Unlicense

pyproject.toml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
2+
#
3+
# SPDX-License-Identifier: MIT
4+
5+
[build-system]
6+
requires = [
7+
"setuptools",
8+
"wheel",
9+
]
10+
11+
[project]
12+
name = "adafruit-circuitpython-ssd1327"
13+
description = "DisplayIO driver for grayscale OLEDs drive by SSD1327"
14+
version = "0.0.0-auto.0"
15+
readme = "README.rst"
16+
authors = [
17+
{name = "Adafruit Industries", email = "[email protected]"}
18+
]
19+
urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1327"}
20+
keywords = [
21+
"adafruit",
22+
"blinka",
23+
"circuitpython",
24+
"micropython",
25+
"ssd1327",
26+
"oled",
27+
"grayscale",
28+
"displayio",
29+
]
30+
license = {text = "MIT"}
31+
classifiers = [
32+
"Intended Audience :: Developers",
33+
"Topic :: Software Development :: Libraries",
34+
"Topic :: Software Development :: Embedded Systems",
35+
"Topic :: System :: Hardware",
36+
"License :: OSI Approved :: MIT License",
37+
"Programming Language :: Python :: 3",
38+
]
39+
dynamic = ["dependencies", "optional-dependencies"]
40+
41+
[tool.setuptools]
42+
py-modules = ["adafruit_ssd1327"]
43+
44+
[tool.setuptools.dynamic]
45+
dependencies = {file = ["requirements.txt"]}
46+
optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
1+
# SPDX-FileCopyrightText: 2022 Alec Delaney, for Adafruit Industries
22
#
33
# SPDX-License-Identifier: Unlicense
44

setup.py

-55
This file was deleted.

0 commit comments

Comments
 (0)