Skip to content

Commit 1174fd9

Browse files
authored
Merge pull request #19 from tekktrik/main
Switch to pyproject.toml
2 parents 49eaff2 + 282d9a0 commit 1174fd9

File tree

5 files changed

+75
-90
lines changed

5 files changed

+75
-90
lines changed

.github/workflows/build.yml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
awk -F '\/' '{ print tolower($2) }' |
2323
tr '_' '-'
2424
)
25-
- name: Set up Python 3.7
26-
uses: actions/setup-python@v1
25+
- name: Set up Python 3.x
26+
uses: actions/setup-python@v2
2727
with:
28-
python-version: 3.7
28+
python-version: "3.x"
2929
- name: Versions
3030
run: |
3131
python3 --version
@@ -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
@@ -57,24 +59,19 @@ jobs:
5759
with:
5860
name: bundles
5961
path: ${{ github.workspace }}/bundles/
60-
- name: Check For docs folder
61-
id: need-docs
62-
run: |
63-
echo ::set-output name=docs::$( find . -wholename './docs' )
6462
- name: Build docs
65-
if: contains(steps.need-docs.outputs.docs, 'docs')
6663
working-directory: docs
6764
run: sphinx-build -E -W -b html . _build/html
68-
- name: Check For setup.py
65+
- name: Check For pyproject.toml
6966
id: need-pypi
7067
run: |
71-
echo ::set-output name=setup-py::$( find . -wholename './setup.py' )
68+
echo ::set-output name=pyproject-toml::$( find . -wholename './pyproject.toml' )
7269
- name: Build Python package
73-
if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
70+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
7471
run: |
75-
pip install --upgrade setuptools wheel twine readme_renderer testresources
76-
python setup.py sdist
77-
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
7877
twine check dist/*
79-
- name: Setup problem matchers
80-
uses: adafruit/circuitpython-action-library-ci-problem-matchers@v1

.github/workflows/release.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
awk -F '\/' '{ print tolower($2) }' |
2525
tr '_' '-'
2626
)
27-
- name: Set up Python 3.7
28-
uses: actions/setup-python@v1
27+
- name: Set up Python 3.x
28+
uses: actions/setup-python@v2
2929
with:
30-
python-version: 3.7
30+
python-version: "3.x"
3131
- name: Versions
3232
run: |
3333
python3 --version
@@ -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')
70-
uses: actions/setup-python@v1
69+
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml')
70+
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

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: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,47 @@
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-ble-file-transfer"
14+
description = "Simple BLE Service for reading and writing files over BLE"
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_BLE_File_Transfer.git"}
21+
keywords = [
22+
"adafruit",
23+
"blinka",
24+
"circuitpython",
25+
"micropython",
26+
"ble_file_transfer",
27+
"ble",
28+
"file",
29+
"transfer",
30+
]
31+
license = {text = "MIT"}
32+
classifiers = [
33+
"Intended Audience :: Developers",
34+
"Topic :: Software Development :: Libraries",
35+
"Topic :: Software Development :: Embedded Systems",
36+
"Topic :: System :: Hardware",
37+
"License :: OSI Approved :: MIT License",
38+
"Programming Language :: Python :: 3",
39+
]
40+
dynamic = ["dependencies", "optional-dependencies"]
41+
42+
[tool.setuptools]
43+
py-modules = ["adafruit_ble_file_transfer"]
44+
45+
[tool.setuptools.dynamic]
46+
dependencies = {file = ["requirements.txt"]}
47+
optional-dependencies = {optional = {file = ["optional_requirements.txt"]}}

setup.py

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

0 commit comments

Comments
 (0)