Merge pull request #43 from tekktrik/dev/infrastructure

Add additional infrastructure

.github/workflows/push.yml

@@ -39,9 +39,15 @@ jobs:
       - name: Run pre-commit via make
         run: |
           make check
-      - name: Run pytest via coverage.py
+      - name: Prepare tests
+        run : |
+          make test-prep
+      - name: Run tests
         run: |
-          make test
+          make test-run
+      - name: Clean up after tests
+        run: |
+          make test-clean
       - name: Create coverage.py XML report
         run: |
           coverage xml -o coverage_${{ matrix.os }}_${{ matrix.py-version }}.xml

Makefile

@@ -15,42 +15,49 @@ format:
 check:
 	@pre-commit run --all-files
 
-.PHONY: test
-test:
-# Test setup
+.PHONY: test-prep
+test-prep:
 ifeq "$(OS)" "Windows_NT"
-	@mkdir testmount
-	@xcopy tests\assets\info_uf2.txt testmount
-	@subst T: testmount
+	-@mkdir testmount
+	-@xcopy tests\assets\info_uf2.txt testmount
+	-@subst T: testmount
 else ifeq "$(shell uname -s)" "Linux"
-	@truncate testfs -s 1M
-	@mkfs.vfat -F12 -S512 testfs
-	@mkdir testmount
-	@sudo mount -o loop,user,umask=000 testfs testmount/
-	@cp tests/assets/info_uf2.txt testmount/
+	-@truncate testfs -s 1M
+	-@mkfs.vfat -F12 -S512 testfs
+	-@mkdir testmount
+	-@sudo mount -o loop,user,umask=000 testfs testmount/
+	-@cp tests/assets/info_uf2.txt testmount/
 else ifeq "$(shell uname -s)" "Darwin"
-	@hdiutil create -size 512m -volname TESTMOUNT -fs FAT32 testfs.dmg
-	@hdiutil attach testfs.dmg
-	@cp tests/assets/info_uf2.txt /Volumes/TESTMOUNT
+	-@hdiutil create -size 512m -volname TESTMOUNT -fs FAT32 testfs.dmg
+	-@hdiutil attach testfs.dmg
+	-@cp tests/assets/info_uf2.txt /Volumes/TESTMOUNT
 else
 	@echo "Current OS not supported"
 	@exit 1
 endif
 
-# Run tests
+.PHONY: test
+test:
+	-@${MAKE} test-prep --no-print-directory
+	-@${MAKE} test-run --no-print-directory
+	-@${MAKE} test-clean --no-print-directory
+
+.PHONY:
+test-run:
 	@coverage run -m pytest
-	@coverage report
-	@coverage html
+	-@coverage report
+	-@coverage html
 
-# Test cleanup
+.PHONY: test-clean
+test-clean:
 ifeq "$(OS)" "Windows_NT"
-	@subst T: /d
-	@python scripts/rmdir.py testmount
+	-@subst T: /d
+	-@python scripts/rmdir.py testmount
 else ifeq "$(shell uname -s)" "Linux"
-	@sudo umount testmount
-	@sudo rm -rf testmount
-	@rm testfs
+	-@sudo umount testmount
+	-@sudo rm -rf testmount
+	-@rm testfs -f
 else
-	@hdiutil detach /Volumes/TESTMOUNT
-	@rm testfs.dmg
+	-@hdiutil detach /Volumes/TESTMOUNT
+	-@rm testfs.dmg -f
 endif

circfirm/py.typed

@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alec Delaney, for Adafruit Industries
+
+SPDX-License-Identifier: MIT

pyproject.toml

@@ -44,12 +44,14 @@ classifiers = [
     "Operating System :: Unix",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: MacOS",
+    "Typing :: Typed",
 ]
 dynamic = ["version", "dependencies", "optional-dependencies"]
 
 [project.urls]
 Homepage = "https://github.com/tekktrik/circfirm"
 Repository = "https://github.com/tekktrik/circfirm.git"
+Issues = "https://github.com/tekktrik/circfirm/issues"
 
 [project.scripts]
 circfirm = "circfirm.cli:cli"
@@ -58,9 +60,6 @@ circfirm = "circfirm.cli:cli"
 packages = ["circfirm"]
 include-package-data = true
 
-[tool.setuptools.package-data]
-templates = ["*.yaml"]
-
 [tool.setuptools.dynamic.version]
 file = "VERSION"