Revert back to using setup.py to fix install problems

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 71f7c07a467fa32ff3ae6305d335d0a670cfc812..ab6669f21d74c949592de1beff72b744895bd55b 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,32 +2,30 @@
 #
 # SPDX-License-Identifier: Unlicense
 name: Release Actions
 #
 # SPDX-License-Identifier: Unlicense
 name: Release Actions

-

 on:
   release:
     types: [published]
 on:
   release:
     types: [published]

-

 jobs:
   upload-pypi:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
 jobs:
   upload-pypi:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

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

       id: need-pypi
       run: |
       id: need-pypi
       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
       with:
       uses: actions/setup-python@v4
       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: |
         python -m pip install --upgrade pip
         pip install --upgrade build twine
     - name: Build and publish
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade build twine
     - 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:
         TWINE_USERNAME: ${{ secrets.pypi_username }}
         TWINE_PASSWORD: ${{ secrets.pypi_password }}
       env:
         TWINE_USERNAME: ${{ secrets.pypi_username }}
         TWINE_PASSWORD: ${{ secrets.pypi_password }}


@@ -36,4 +34,4 @@ jobs:
             sed -i -e "s/0.0.0+auto.0/${{github.event.release.tag_name}}/" $file;
         done;
         python -m build
             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/*
\ No newline at end of file

diff --git a/docs/conf.py b/docs/conf.py
index 35c7aeafbcbf5a0e28f84e04c26525f755d904c4..97f47fe7ae368446fff0791e3fb5b982d1a3bc14 100755 (executable)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -111,7 +111,7 @@ html_static_path = ["_static"]
 html_favicon = "_static/favicon.ico"
 
 # Output file base name for HTML help builder.
 html_favicon = "_static/favicon.ico"
 
 # Output file base name for HTML help builder.

-htmlhelp_basename = "Adafruit_blinkaDisplayioLibrarydoc"
+htmlhelp_basename = "AdafruitBlinkaLibrarydoc"

 
 # -- Options for LaTeX output ---------------------------------------------
 
 
 # -- Options for LaTeX output ---------------------------------------------
 

diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644 (file)
index 72da97f..0000000
--- a/pyproject.toml
+++ /dev/null
@@ -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"]}

diff --git a/requirements.txt b/requirements.txt
index ca51f295a9366404d3cb2392ea143da12ed74cb4..4737d9b8120f5f86f37b27eeaedee4e70fd864b3 100755 (executable)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,9 @@
-Adafruit-PlatformDetect>=3.70.1
-Adafruit-PureIO>=1.1.7
-Jetson.GPIO; platform_machine=='aarch64'
-RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l' or platform_machine=='aarch64'
-rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l' or platform_machine=='aarch64'
-sysv_ipc>=1.1.0; sys_platform == 'linux' and platform_machine!='mips'
-pyftdi>=0.40.0
-binho-host-adapter>=0.1.6
-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'
+ # requirements.txt
+ #
+ # installs dependencies from ./setup.py, and the package itself,
+ # in editable mode
+ # -e .
+
+ # (the -e above is optional). you could also just install the package
+ # normally with just the line below (after uncommenting)
+ .
\ No newline at end of file

diff --git a/setup.py b/setup.py
new file mode 100644 (file)
index 0000000..e69de29