Skip to content

Commit dbb3b39

Browse files
committed
Switched to pyproject.toml
1 parent 688f7e2 commit dbb3b39

File tree

5 files changed

+65
-87
lines changed

5 files changed

+65
-87
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,19 @@ jobs:
5959
with:
6060
name: bundles
6161
path: ${{ github.workspace }}/bundles/
62-
- name: Check for docs folder
63-
id: need-docs
64-
run: |
65-
echo ::set-output name=docs::$( find . -wholename './docs' )
6662
- name: Build docs
67-
if: contains(steps.need-docs.outputs.docs, 'docs')
6863
working-directory: docs
6964
run: sphinx-build -E -W -b html . _build/html
70-
- name: Check For setup.py
65+
- name: Check For pyproject.toml
7166
id: need-pypi
7267
run: |
73-
echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
68+
echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
7469
- name: Build Python package
75-
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
70+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
7671
run: |
77-
pip install --upgrade setuptools wheel twine readme_renderer testresources
78-
python setup.py sdist
79-
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
8077
twine check dist/*

.github/workflows/release.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +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-
for file in $(find -not -path "./.*" -not -path "./docs*" -name "*.py"); do
84+
for file in $(find -not -path "./.*" -not -path "./docs*" \( -name "*.py" -o -name "*.toml" \) ); do
8585
sed -i -e "s/0.0.0-auto.0/${{github.event.release.tag_name}}/" $file;
8686
done;
87-
python setup.py sdist
87+
python -m build
8888
twine upload dist/*

optional_requirements.txt

Lines changed: 3 additions & 0 deletions
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

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,48 @@
1-
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
1+
# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
22
#
3-
# SPDX-License-Identifier: Unlicense
3+
# SPDX-License-Identifier: MIT
44

5-
[tool.black]
6-
target-version = ['py35']
5+
[build-system]
6+
requires = [
7+
"setuptools",
8+
"wheel",
9+
"setuptools-scm",
10+
]
11+
12+
[project]
13+
name = "adafruit-circuitpython-ags02ma"
14+
description = "CircuitPython / Python library for AGS02MA gas sensor"
15+
version = "0.0.0-auto.0"
16+
readme = "README.rst"
17+
authors = [
18+
{name = "Adafruit Industries", email = "[email protected]"}
19+
]
20+
urls = {Homepage = "https://github.com/adafruit/Adafruit_CircuitPython_AGS02MA"}
21+
keywords = [
22+
"adafruit",
23+
"blinka",
24+
"circuitpython",
25+
"micropython",
26+
"ags02ma",
27+
"tvoc",
28+
"gas",
29+
"resistance",
30+
"sensor",
31+
]
32+
license = {text = "MIT"}
33+
classifiers = [
34+
"Intended Audience :: Developers",
35+
"Topic :: Software Development :: Libraries",
36+
"Topic :: Software Development :: Embedded Systems",
37+
"Topic :: System :: Hardware",
38+
"License :: OSI Approved :: MIT License",
39+
"Programming Language :: Python :: 3",
40+
]
41+
dynamic = ["dependencies", "optional-dependencies"]
42+
43+
[tool.setuptools]
44+
py-modules = ["adafruit_ags02ma"]
45+
46+
[tool.setuptools.dynamic]
47+
dependencies = {file = ["requirements.txt"]}
48+
optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}

setup.py

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)