Revert back to using setup.py to fix install problems

This commit is contained in:
Melissa LeBlanc-Williams 2025-06-23 08:26:25 -07:00
parent b595f89212
commit 8794838fab
5 changed files with 17 additions and 83 deletions

View file

@ -2,32 +2,30 @@
# #
# SPDX-License-Identifier: Unlicense # SPDX-License-Identifier: Unlicense
name: Release Actions name: Release Actions
on: on:
release: release:
types: [published] types: [published]
jobs: jobs:
upload-pypi: upload-pypi:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Check For pyproject.toml - name: Check For setup.py
id: need-pypi id: need-pypi
run: | run: |
echo "pyproject-toml=$( find . -wholename './pyproject.toml' )" >> $GITHUB_OUTPUT echo "setup-py=$( find . -wholename './setup.py' )" >> $GITHUB_OUTPUT
- name: Set up Python - name: Set up Python
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
uses: actions/setup-python@v4 uses: actions/setup-python@v4
with: with:
python-version: '3.11' python-version: '3.x'
- name: Install dependencies - name: Install dependencies
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install --upgrade build twine pip install --upgrade build twine
- name: Build and publish - name: Build and publish
if: contains(steps.need-pypi.outputs.pyproject-toml, 'pyproject.toml') if: contains(steps.need-pypi.outputs.setup-py, 'setup.py')
env: env:
TWINE_USERNAME: ${{ secrets.pypi_username }} TWINE_USERNAME: ${{ secrets.pypi_username }}
TWINE_PASSWORD: ${{ secrets.pypi_password }} TWINE_PASSWORD: ${{ secrets.pypi_password }}

View file

@ -111,7 +111,7 @@ html_static_path = ["_static"]
html_favicon = "_static/favicon.ico" html_favicon = "_static/favicon.ico"
# Output file base name for HTML help builder. # Output file base name for HTML help builder.
htmlhelp_basename = "Adafruit_blinkaDisplayioLibrarydoc" htmlhelp_basename = "AdafruitBlinkaLibrarydoc"
# -- Options for LaTeX output --------------------------------------------- # -- Options for LaTeX output ---------------------------------------------

View file

@ -1,61 +0,0 @@
# SPDX-FileCopyrightText: 2022 Alec Delaney for Adafruit Industries
#
# SPDX-License-Identifier: MIT
[build-system]
requires = [
"setuptools",
"wheel",
"setuptools-scm",
]
[project]
name = "Adafruit-Blinka"
description = "CircuitPython APIs for non-CircuitPython versions of Python such as CPython on Linux and MicroPython."
version = "0.0.0+auto.0"
readme = "README.rst"
authors = [
{name = "Adafruit Industries", email = "circuitpython@adafruit.com"}
]
urls = {Homepage = "https://github.com/adafruit/Adafruit_Blinka"}
license = {text = "MIT"}
classifiers=[
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"Topic :: Software Development :: Libraries",
"Topic :: System :: Hardware",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
]
dynamic = ["dependencies"]
[tool.setuptools]
py-modules = [
"analogio",
"bitbangio",
"board",
"busio",
"digitalio",
"keypad",
"micropython",
"neopixel_write",
"onewireio",
"pulseio",
"pwmio",
"rainbowio",
"usb_hid",
]
[tool.setuptools.packages.find]
where = ["src"]
include = [
"adafruit_blinka",
"adafruit_blinka.microcontroller.bcm283x.libgpiod_pulsein*",
"adafruit_blinka.microcontroller.amlogic.meson_g12_common.pulseio.libgpiod_pulsein*",
"microcontroller",
"*.pyi"
]
[tool.setuptools.dynamic]
dependencies = {file = ["requirements.txt"]}

View file

@ -1,12 +1,9 @@
Adafruit-PlatformDetect>=3.70.1 # requirements.txt
Adafruit-PureIO>=1.1.7 #
Jetson.GPIO; platform_machine=='aarch64' # installs dependencies from ./setup.py, and the package itself,
RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l' or platform_machine=='aarch64' # in editable mode
rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l' or platform_machine=='aarch64' # -e .
sysv_ipc>=1.1.0; sys_platform == 'linux' and platform_machine!='mips'
pyftdi>=0.40.0 # (the -e above is optional). you could also just install the package
binho-host-adapter>=0.1.6 # normally with just the line below (after uncommenting)
adafruit-circuitpython-typing .
toml>=0.10.2; python_version<'3.11'
lgpio>=0.2.2.0; sys_platform=='linux' and python_version<'3.13'
Adafruit-Blinka-Raspberry-Pi5-Neopixel; platform_machine=='aarch64'

0
setup.py Normal file
View file