From dba659386f9ab17461964fbbb2ec1f41f6ce6460 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 6 Dec 2023 11:43:09 +0000
Subject: [PATCH 1/4] Repackage to hatch/pyproject.toml

---
 .github/workflows/build.yml                |  41 ++++
 .github/workflows/qa.yml                   |  36 +++
 .github/workflows/test.yml                 |  24 +-
 library/CHANGELOG.txt => CHANGELOG.md      |   0
 library/MANIFEST.in => MANIFEST.in         |   0
 Makefile                                   |  90 ++++---
 README.md                                  |   1 -
 check.sh                                   |  88 +++++++
 install-legacy.sh                          | 256 --------------------
 install.sh                                 | 260 +++++++++++++++------
 library/.coveragerc                        |   4 -
 library/LICENSE.txt                        |  21 --
 library/README.md                          |  69 ------
 library/setup.cfg                          |  52 -----
 library/setup.py                           |  33 ---
 library/tox.ini                            |  24 --
 pyproject.toml                             | 121 ++++++++++
 requirements-dev.txt                       |   9 +
 {library/rv3032 => rv3032}/__init__.py     |   0
 {library/tests => tests}/test_alarm.py     |   0
 {library/tests => tests}/test_setup.py     |   0
 {library/tests => tests}/test_time.py      |   0
 {library/tests => tests}/test_timer.py     |   0
 {library/tests => tests}/test_unix_time.py |   0
 tox.ini                                    |  34 +++
 uninstall.sh                               |  77 ++++--
 26 files changed, 637 insertions(+), 603 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/qa.yml
 rename library/CHANGELOG.txt => CHANGELOG.md (100%)
 rename library/MANIFEST.in => MANIFEST.in (100%)
 create mode 100755 check.sh
 delete mode 100644 install-legacy.sh
 delete mode 100644 library/.coveragerc
 delete mode 100644 library/LICENSE.txt
 delete mode 100644 library/README.md
 delete mode 100644 library/setup.cfg
 delete mode 100644 library/setup.py
 delete mode 100644 library/tox.ini
 create mode 100644 pyproject.toml
 create mode 100644 requirements-dev.txt
 rename {library/rv3032 => rv3032}/__init__.py (100%)
 rename {library/tests => tests}/test_alarm.py (100%)
 rename {library/tests => tests}/test_setup.py (100%)
 rename {library/tests => tests}/test_time.py (100%)
 rename {library/tests => tests}/test_timer.py (100%)
 rename {library/tests => tests}/test_unix_time.py (100%)
 create mode 100644 tox.ini

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..87200ef
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,41 @@
+name: Build
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    name: Python ${{ matrix.python }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: ['3.9', '3.10', '3.11']
+
+    env:
+      RELEASE_FILE: ${{ github.event.repository.name }}-${{ github.event.release.tag_name || github.sha }}-py${{ matrix.python }}
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Set up Python ${{ matrix.python }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: Install Dependencies
+        run: |
+          make dev-deps
+
+      - name: Build Packages
+        run: |
+          make build
+
+      - name: Upload Packages
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.RELEASE_FILE }}
+          path: dist/
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
new file mode 100644
index 0000000..4f85883
--- /dev/null
+++ b/.github/workflows/qa.yml
@@ -0,0 +1,36 @@
+name: QA
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    name: linting & spelling
+    runs-on: ubuntu-latest
+
+    env:
+      TERM: xterm-256color
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Set up Python '3,11'
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.11'
+
+      - name: Install Dependencies
+        run: |
+          make dev-deps
+
+      - name: Run Quality Assurance
+        run: |
+          make qa
+
+      - name: Run Code Checks
+        run: |
+          make check
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 213fdea..016a678 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,37 +1,41 @@
-name: Python Tests
+name: Tests
 
 on:
   pull_request:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   test:
+    name: Python ${{ matrix.python }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [2.7, 3.5, 3.7, 3.9]
+        python: ['3.9', '3.10', '3.11']
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python }}
+
       - name: Install Dependencies
         run: |
-          python -m pip install --upgrade setuptools tox
+          make dev-deps
+
       - name: Run Tests
-        working-directory: library
         run: |
-          tox -e py
+          make pytest
+
       - name: Coverage
+        if: ${{ matrix.python == '3.9' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        working-directory: library
         run: |
           python -m pip install coveralls
           coveralls --service=github
-        if: ${{ matrix.python == '3.9' }}
 
diff --git a/library/CHANGELOG.txt b/CHANGELOG.md
similarity index 100%
rename from library/CHANGELOG.txt
rename to CHANGELOG.md
diff --git a/library/MANIFEST.in b/MANIFEST.in
similarity index 100%
rename from library/MANIFEST.in
rename to MANIFEST.in
diff --git a/Makefile b/Makefile
index 0813324..9e0c15c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,70 +1,60 @@
-LIBRARY_VERSION=$(shell grep version library/setup.cfg | awk -F" = " '{print $$2}')
-LIBRARY_NAME=$(shell grep name library/setup.cfg | awk -F" = " '{print $$2}')
+LIBRARY_NAME := $(shell hatch project metadata name 2> /dev/null)
+LIBRARY_VERSION := $(shell hatch version 2> /dev/null)
 
-.PHONY: usage install uninstall
+.PHONY: usage install uninstall check pytest qa build-deps check tag wheel sdist clean dist testdeploy deploy
 usage:
+ifdef LIBRARY_NAME
 	@echo "Library: ${LIBRARY_NAME}"
 	@echo "Version: ${LIBRARY_VERSION}\n"
+else
+	@echo "WARNING: You should 'make dev-deps'\n"
+endif
 	@echo "Usage: make <target>, where target is one of:\n"
-	@echo "install:       install the library locally from source"
-	@echo "uninstall:     uninstall the local library"
-	@echo "check:         peform basic integrity checks on the codebase"
-	@echo "python-readme: generate library/README.md from README.md + library/CHANGELOG.txt"
-	@echo "python-wheels: build python .whl files for distribution"
-	@echo "python-sdist:  build python source distribution"
-	@echo "python-clean:  clean python build and dist directories"
-	@echo "python-dist:   build all python distribution files"
-	@echo "python-testdeploy: build all and deploy to test PyPi"
-	@echo "tag:           tag the repository with the current version"
+	@echo "install:      install the library locally from source"
+	@echo "uninstall:    uninstall the local library"
+	@echo "dev-deps:     install Python dev dependencies"
+	@echo "check:        perform basic integrity checks on the codebase"
+	@echo "qa:           run linting and package QA"
+	@echo "pytest:       run Python test fixtures"
+	@echo "clean:        clean Python build and dist directories"
+	@echo "build:        build Python distribution files"
+	@echo "testdeploy:   build and upload to test PyPi"
+	@echo "deploy:       build and upload to PyPi"
+	@echo "tag:          tag the repository with the current version\n"
 
 install:
-	./install.sh
+	./install.sh --unstable
 
 uninstall:
 	./uninstall.sh
 
-check:
-	@echo "Checking for trailing whitespace"
-	@! grep -IUrn --color "[[:blank:]]$$" --exclude-dir=sphinx --exclude-dir=.tox --exclude-dir=.git --exclude=PKG-INFO
-	@echo "Checking for DOS line-endings"
-	@! grep -lIUrn --color "
" --exclude-dir=sphinx --exclude-dir=.tox --exclude-dir=.git --exclude=Makefile
-	@echo "Checking library/CHANGELOG.txt"
-	@cat library/CHANGELOG.txt | grep ^${LIBRARY_VERSION}
-	@echo "Checking library/${LIBRARY_NAME}/__init__.py"
-	@cat library/${LIBRARY_NAME}/__init__.py | grep "^__version__ = '${LIBRARY_VERSION}'"
-
-tag:
-	git tag -a "v${LIBRARY_VERSION}" -m "Version ${LIBRARY_VERSION}"
+dev-deps:
+	python3 -m pip install -r requirements-dev.txt
+	sudo apt install dos2unix
 
-python-readme: library/README.md
-
-python-license: library/LICENSE.txt
+check:
+	@bash check.sh
 
-library/README.md: README.md library/CHANGELOG.txt
-	cp README.md library/README.md
-	printf "\n# Changelog\n" >> library/README.md
-	cat library/CHANGELOG.txt >> library/README.md
+qa:
+	tox -e qa
 
-library/LICENSE.txt: LICENSE
-	cp LICENSE library/LICENSE.txt
+pytest:
+	tox -e py
 
-python-wheels: python-readme python-license
-	cd library; python3 setup.py bdist_wheel
-	cd library; python setup.py bdist_wheel
+nopost:
+	@bash check.sh --nopost
 
-python-sdist: python-readme python-license
-	cd library; python setup.py sdist
+tag:
+	git tag -a "v${LIBRARY_VERSION}" -m "Version ${LIBRARY_VERSION}"
 
-python-clean:
-	-rm -r library/dist
-	-rm -r library/build
-	-rm -r library/*.egg-info
+build: check
+	@hatch build
 
-python-dist: python-clean python-wheels python-sdist
-	ls library/dist
+clean:
+	-rm -r dist
 
-python-testdeploy: python-dist
-	twine upload --repository-url https://test.pypi.org/legacy/ library/dist/*
+testdeploy: build
+	twine upload --repository testpypi dist/*
 
-python-deploy: check python-dist
-	twine upload library/dist/*
+deploy: nopost build
+	twine upload dist/*
diff --git a/README.md b/README.md
index 72cc937..109e60b 100644
--- a/README.md
+++ b/README.md
@@ -37,4 +37,3 @@ This library depends upon smbus:
 sudo apt install python-smbus   # Python 2
 sudo apt install python3-smbus  # Python 3
 ```
-
diff --git a/check.sh b/check.sh
new file mode 100755
index 0000000..4395d89
--- /dev/null
+++ b/check.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# This script handles some basic QA checks on the source
+
+NOPOST=$1
+LIBRARY_NAME=`hatch project metadata name`
+LIBRARY_VERSION=`hatch version | awk -F "." '{print $1"."$2"."$3}'`
+POST_VERSION=`hatch version | awk -F "." '{print substr($4,0,length($4))}'`
+TERM=${TERM:="xterm-256color"}
+
+success() {
+	echo -e "$(tput setaf 2)$1$(tput sgr0)"
+}
+
+inform() {
+	echo -e "$(tput setaf 6)$1$(tput sgr0)"
+}
+
+warning() {
+	echo -e "$(tput setaf 1)$1$(tput sgr0)"
+}
+
+while [[ $# -gt 0 ]]; do
+	K="$1"
+	case $K in
+	-p|--nopost)
+		NOPOST=true
+		shift
+		;;
+	*)
+		if [[ $1 == -* ]]; then
+			printf "Unrecognised option: $1\n";
+			exit 1
+		fi
+		POSITIONAL_ARGS+=("$1")
+		shift
+	esac
+done
+
+inform "Checking $LIBRARY_NAME $LIBRARY_VERSION\n"
+
+inform "Checking for trailing whitespace..."
+grep -IUrn --color "[[:blank:]]$" --exclude-dir=dist --exclude-dir=.tox --exclude-dir=.git --exclude=PKG-INFO
+if [[ $? -eq 0 ]]; then
+    warning "Trailing whitespace found!"
+    exit 1
+else
+    success "No trailing whitespace found."
+fi
+printf "\n"
+
+inform "Checking for DOS line-endings..."
+grep -lIUrn --color $'\r' --exclude-dir=dist --exclude-dir=.tox --exclude-dir=.git --exclude=Makefile
+if [[ $? -eq 0 ]]; then
+    warning "DOS line-endings found!"
+    exit 1
+else
+    success "No DOS line-endings found."
+fi
+printf "\n"
+
+inform "Checking CHANGELOG.md..."
+cat CHANGELOG.md | grep ^${LIBRARY_VERSION} > /dev/null 2>&1
+if [[ $? -eq 1 ]]; then
+    warning "Changes missing for version ${LIBRARY_VERSION}! Please update CHANGELOG.md."
+    exit 1
+else
+    success "Changes found for version ${LIBRARY_VERSION}."
+fi
+printf "\n"
+
+inform "Checking for git tag ${LIBRARY_VERSION}..."
+git tag -l | grep -E "${LIBRARY_VERSION}$"
+if [[ $? -eq 1 ]]; then
+    warning "Missing git tag for version ${LIBRARY_VERSION}"
+fi
+printf "\n"
+
+if [[ $NOPOST ]]; then
+    inform "Checking for .postN on library version..."
+    if [[ "$POST_VERSION" != "" ]]; then
+        warning "Found .$POST_VERSION on library version."
+        inform "Please only use these for testpypi releases."
+        exit 1
+    else
+        success "OK"
+    fi
+fi
diff --git a/install-legacy.sh b/install-legacy.sh
deleted file mode 100644
index 3572e50..0000000
--- a/install-legacy.sh
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/bin/bash
-
-CONFIG=/boot/config.txt
-DATESTAMP=`date "+%Y-%m-%d-%H-%M-%S"`
-CONFIG_BACKUP=false
-APT_HAS_UPDATED=false
-USER_HOME=/home/$SUDO_USER
-RESOURCES_TOP_DIR=$USER_HOME/Pimoroni
-WD=`pwd`
-USAGE="sudo ./install.sh (--unstable)"
-POSITIONAL_ARGS=()
-FORCE=false
-UNSTABLE=false
-CODENAME=`lsb_release -sc`
-
-if [[ $CODENAME == "bullseye" ]]; then
-	bash ./install.sh $@
-	exit $?
-fi
-
-user_check() {
-	if [ $(id -u) -ne 0 ]; then
-		printf "Script must be run as root. Try 'sudo ./install.sh'\n"
-		exit 1
-	fi
-}
-
-confirm() {
-	if $FORCE; then
-		true
-	else
-		read -r -p "$1 [y/N] " response < /dev/tty
-		if [[ $response =~ ^(yes|y|Y)$ ]]; then
-			true
-		else
-			false
-		fi
-	fi
-}
-
-prompt() {
-	read -r -p "$1 [y/N] " response < /dev/tty
-	if [[ $response =~ ^(yes|y|Y)$ ]]; then
-		true
-	else
-		false
-	fi
-}
-
-success() {
-	echo -e "$(tput setaf 2)$1$(tput sgr0)"
-}
-
-inform() {
-	echo -e "$(tput setaf 6)$1$(tput sgr0)"
-}
-
-warning() {
-	echo -e "$(tput setaf 1)$1$(tput sgr0)"
-}
-
-function do_config_backup {
-	if [ ! $CONFIG_BACKUP == true ]; then
-		CONFIG_BACKUP=true
-		FILENAME="config.preinstall-$LIBRARY_NAME-$DATESTAMP.txt"
-		inform "Backing up $CONFIG to /boot/$FILENAME\n"
-		cp $CONFIG /boot/$FILENAME
-		mkdir -p $RESOURCES_TOP_DIR/config-backups/
-		cp $CONFIG $RESOURCES_TOP_DIR/config-backups/$FILENAME
-		if [ -f "$UNINSTALLER" ]; then
-			echo "cp $RESOURCES_TOP_DIR/config-backups/$FILENAME $CONFIG" >> $UNINSTALLER
-		fi
-	fi
-}
-
-function apt_pkg_install {
-	PACKAGES=()
-	PACKAGES_IN=("$@")
-	for ((i = 0; i < ${#PACKAGES_IN[@]}; i++)); do
-		PACKAGE="${PACKAGES_IN[$i]}"
-		if [ "$PACKAGE" == "" ]; then continue; fi
-		printf "Checking for $PACKAGE\n"
-		dpkg -L $PACKAGE > /dev/null 2>&1
-		if [ "$?" == "1" ]; then
-			PACKAGES+=("$PACKAGE")
-		fi
-	done
-	PACKAGES="${PACKAGES[@]}"
-	if ! [ "$PACKAGES" == "" ]; then
-		echo "Installing missing packages: $PACKAGES"
-		if [ ! $APT_HAS_UPDATED ]; then
-			apt update
-			APT_HAS_UPDATED=true
-		fi
-		apt install -y $PACKAGES
-		if [ -f "$UNINSTALLER" ]; then
-			echo "apt uninstall -y $PACKAGES"
-		fi
-	fi
-}
-
-while [[ $# -gt 0 ]]; do
-	K="$1"
-	case $K in
-	-u|--unstable)
-		UNSTABLE=true
-		shift
-		;;
-	-f|--force)
-		FORCE=true
-		shift
-		;;
-	*)
-		if [[ $1 == -* ]]; then
-			printf "Unrecognised option: $1\n";
-			printf "Usage: $USAGE\n";
-			exit 1
-		fi
-		POSITIONAL_ARGS+=("$1")
-		shift
-	esac
-done
-
-user_check
-
-apt_pkg_install python-configparser
-
-CONFIG_VARS=`python - <<EOF
-from configparser import ConfigParser
-c = ConfigParser()
-c.read('library/setup.cfg')
-p = dict(c['pimoroni'])
-# Convert multi-line config entries into bash arrays
-for k in p.keys():
-    fmt = '"{}"'
-    if '\n' in p[k]:
-        p[k] = "'\n\t'".join(p[k].split('\n')[1:])
-        fmt = "('{}')"
-    p[k] = fmt.format(p[k])
-print("""
-LIBRARY_NAME="{name}"
-LIBRARY_VERSION="{version}"
-""".format(**c['metadata']))
-print("""
-PY3_DEPS={py3deps}
-PY2_DEPS={py2deps}
-SETUP_CMDS={commands}
-CONFIG_TXT={configtxt}
-""".format(**p))
-EOF`
-
-if [ $? -ne 0 ]; then
-	warning "Error parsing configuration...\n"
-	exit 1
-fi
-
-eval $CONFIG_VARS
-
-RESOURCES_DIR=$RESOURCES_TOP_DIR/$LIBRARY_NAME
-UNINSTALLER=$RESOURCES_DIR/uninstall.sh
-
-mkdir -p $RESOURCES_DIR
-
-cat << EOF > $UNINSTALLER
-printf "It's recommended you run these steps manually.\n"
-printf "If you want to run the full script, open it in\n"
-printf "an editor and remove 'exit 1' from below.\n"
-exit 1
-EOF
-
-printf "$LIBRARY_NAME $LIBRARY_VERSION Python Library: Installer\n\n"
-
-if $UNSTABLE; then
-	warning "Installing unstable library from source.\n\n"
-else
-	printf "Installing stable library from pypi.\n\n"
-fi
-
-cd library
-
-printf "Installing for Python 2..\n"
-apt_pkg_install "${PY2_DEPS[@]}"
-if $UNSTABLE; then
-	python setup.py install > /dev/null
-else
-	pip install --upgrade $LIBRARY_NAME
-fi
-if [ $? -eq 0 ]; then
-	success "Done!\n"
-	echo "pip uninstall $LIBRARY_NAME" >> $UNINSTALLER
-fi
-
-if [ -f "/usr/bin/python3" ]; then
-	printf "Installing for Python 3..\n"
-	apt_pkg_install "${PY3_DEPS[@]}"
-	if $UNSTABLE; then
-		python3 setup.py install > /dev/null
-	else
-		pip3 install --upgrade $LIBRARY_NAME
-	fi
-	if [ $? -eq 0 ]; then
-		success "Done!\n"
-		echo "pip3 uninstall $LIBRARY_NAME" >> $UNINSTALLER
-	fi
-fi
-
-cd $WD
-
-for ((i = 0; i < ${#SETUP_CMDS[@]}; i++)); do
-	CMD="${SETUP_CMDS[$i]}"
-	# Attempt to catch anything that touches /boot/config.txt and trigger a backup
-	if [[ "$CMD" == *"raspi-config"* ]] || [[ "$CMD" == *"$CONFIG"* ]] || [[ "$CMD" == *"\$CONFIG"* ]]; then
-		do_config_backup
-	fi
-	eval $CMD
-done
-
-for ((i = 0; i < ${#CONFIG_TXT[@]}; i++)); do
-	CONFIG_LINE="${CONFIG_TXT[$i]}"
-	if ! [ "$CONFIG_LINE" == "" ]; then
-		do_config_backup
-		inform "Adding $CONFIG_LINE to $CONFIG\n"
-		sed -i "s/^#$CONFIG_LINE/$CONFIG_LINE/" $CONFIG
-		if ! grep -q "^$CONFIG_LINE" $CONFIG; then
-			printf "$CONFIG_LINE\n" >> $CONFIG
-		fi
-	fi
-done
-
-if [ -d "examples" ]; then
-	if confirm "Would you like to copy examples to $RESOURCES_DIR?"; then
-		inform "Copying examples to $RESOURCES_DIR"
-		cp -r examples/ $RESOURCES_DIR
-		echo "rm -r $RESOURCES_DIR" >> $UNINSTALLER
-		success "Done!"
-	fi
-fi
-
-printf "\n"
-
-if [ -f "/usr/bin/pydoc" ]; then
-	printf "Generating documentation.\n"
-	pydoc -w $LIBRARY_NAME > /dev/null
-	if [ -f "$LIBRARY_NAME.html" ]; then
-		cp $LIBRARY_NAME.html $RESOURCES_DIR/docs.html
-		rm -f $LIBRARY_NAME.html
-		inform "Documentation saved to $RESOURCES_DIR/docs.html"
-		success "Done!"
-	else
-		warning "Error: Failed to generate documentation."
-	fi
-fi
-
-success "\nAll done!"
-inform "If this is your first time installing you should reboot for hardware changes to take effect.\n"
-inform "Find uninstall steps in $UNINSTALLER\n"
diff --git a/install.sh b/install.sh
index 28d3d46..d42c48d 100644
--- a/install.sh
+++ b/install.sh
@@ -1,22 +1,25 @@
 #!/bin/bash
-CONFIG=/boot/config.txt
+LIBRARY_NAME=`grep -m 1 name pyproject.toml | awk -F" = " '{print substr($2,2,length($2)-2)}'`
+CONFIG_FILE=config.txt
+CONFIG_DIR="/boot/firmware"
 DATESTAMP=`date "+%Y-%m-%d-%H-%M-%S"`
 CONFIG_BACKUP=false
 APT_HAS_UPDATED=false
-USER_HOME=/home/$SUDO_USER
-RESOURCES_TOP_DIR=$USER_HOME/Pimoroni
+RESOURCES_TOP_DIR="$HOME/Pimoroni"
+VENV_BASH_SNIPPET="$RESOURCES_TOP_DIR/auto_venv.sh"
+VENV_DIR="$HOME/.virtualenvs/pimoroni"
 WD=`pwd`
-USAGE="sudo ./install.sh (--unstable)"
+USAGE="./install.sh (--unstable)"
 POSITIONAL_ARGS=()
 FORCE=false
 UNSTABLE=false
-PYTHON="/usr/bin/python3"
+PYTHON="python"
+CMD_ERRORS=false
 
 
 user_check() {
-	if [ $(id -u) -ne 0 ]; then
-		printf "Script must be run as root. Try 'sudo ./install.sh'\n"
-		exit 1
+	if [ $(id -u) -eq 0 ]; then
+		fatal "Script should not be run as root. Try './install.sh'\n"
 	fi
 }
 
@@ -51,19 +54,91 @@ inform() {
 }
 
 warning() {
-	echo -e "$(tput setaf 1)$1$(tput sgr0)"
+	echo -e "$(tput setaf 1)⚠ WARNING:$(tput sgr0) $1"
+}
+
+fatal() {
+	echo -e "$(tput setaf 1)⚠ FATAL:$(tput sgr0) $1"
+	exit 1
+}
+
+find_config() {
+	if [ ! -f "$CONFIG_DIR/$CONFIG_FILE" ]; then
+		CONFIG_DIR="/boot"
+		if [ ! -f "$CONFIG_DIR/$CONFIG_FILE" ]; then
+			fatal "Could not find $CONFIG_FILE!"
+		fi
+	else
+		if [ -f "/boot/$CONFIG_FILE" ] && [ ! -L "/boot/$CONFIG_FILE" ]; then
+			warning "Oops! It looks like /boot/$CONFIG_FILE is not a link to $CONFIG_DIR/$CONFIG_FILE"
+			warning "You might want to fix this!"
+		fi
+	fi
+	inform "Using $CONFIG_FILE in $CONFIG_DIR"
+}
+
+venv_bash_snippet() {
+	inform "Checking for $VENV_BASH_SNIPPET\n"
+	if [ ! -f $VENV_BASH_SNIPPET ]; then
+		inform "Creating $VENV_BASH_SNIPPET\n"
+		mkdir -p $RESOURCES_TOP_DIR
+		cat << EOF > $VENV_BASH_SNIPPET
+# Add "source $VENV_BASH_SNIPPET" to your ~/.bashrc to activate
+# the Pimoroni virtual environment automagically!
+VENV_DIR="$VENV_DIR"
+if [ ! -f \$VENV_DIR/bin/activate ]; then
+  printf "Creating user Python environment in \$VENV_DIR, please wait...\n"
+  mkdir -p \$VENV_DIR
+  python3 -m venv --system-site-packages \$VENV_DIR
+fi
+printf " ↓ ↓ ↓ ↓   Hello, we've activated a Python venv for you. To exit, type \"deactivate\".\n"
+source \$VENV_DIR/bin/activate
+EOF
+	fi
+}
+
+venv_check() {
+	PYTHON_BIN=`which $PYTHON`
+	if [[ $VIRTUAL_ENV == "" ]] || [[ $PYTHON_BIN != $VIRTUAL_ENV* ]]; then
+		printf "This script should be run in a virtual Python environment.\n"
+		if confirm "Would you like us to create and/or use a default one?"; then
+			printf "\n"
+			if [ ! -f $VENV_DIR/bin/activate ]; then
+				inform "Creating a new virtual Python environment in $VENV_DIR, please wait...\n"
+				mkdir -p $VENV_DIR
+				/usr/bin/python3 -m venv $VENV_DIR --system-site-packages
+				venv_bash_snippet
+				source $VENV_DIR/bin/activate
+			else
+				inform "Activating existing virtual Python environment in $VENV_DIR\n"
+				printf "source $VENV_DIR/bin/activate\n"
+				source $VENV_DIR/bin/activate
+			fi
+		else
+			printf "\n"
+			fatal "Please create and/or activate a virtual Python environment and try again!\n"
+		fi
+	fi
+	printf "\n"
+}
+
+check_for_error() {
+	if [ $? -ne 0 ]; then
+		CMD_ERRORS=true
+		warning "^^^ 😬"
+	fi
 }
 
 function do_config_backup {
 	if [ ! $CONFIG_BACKUP == true ]; then
 		CONFIG_BACKUP=true
 		FILENAME="config.preinstall-$LIBRARY_NAME-$DATESTAMP.txt"
-		inform "Backing up $CONFIG to /boot/$FILENAME\n"
-		cp $CONFIG /boot/$FILENAME
+		inform "Backing up $CONFIG_DIR/$CONFIG_FILE to $CONFIG_DIR/$FILENAME\n"
+		sudo cp $CONFIG_DIR/$CONFIG_FILE $CONFIG_DIR/$FILENAME
 		mkdir -p $RESOURCES_TOP_DIR/config-backups/
-		cp $CONFIG $RESOURCES_TOP_DIR/config-backups/$FILENAME
+		cp $CONFIG_DIR/$CONFIG_FILE $RESOURCES_TOP_DIR/config-backups/$FILENAME
 		if [ -f "$UNINSTALLER" ]; then
-			echo "cp $RESOURCES_TOP_DIR/config-backups/$FILENAME $CONFIG" >> $UNINSTALLER
+			echo "cp $RESOURCES_TOP_DIR/config-backups/$FILENAME $CONFIG_DIR/$CONFIG_FILE" >> $UNINSTALLER
 		fi
 	fi
 }
@@ -71,6 +146,7 @@ function do_config_backup {
 function apt_pkg_install {
 	PACKAGES=()
 	PACKAGES_IN=("$@")
+	# Check the list of packages and only run update/install if we need to
 	for ((i = 0; i < ${#PACKAGES_IN[@]}; i++)); do
 		PACKAGE="${PACKAGES_IN[$i]}"
 		if [ "$PACKAGE" == "" ]; then continue; fi
@@ -82,18 +158,26 @@ function apt_pkg_install {
 	done
 	PACKAGES="${PACKAGES[@]}"
 	if ! [ "$PACKAGES" == "" ]; then
-		echo "Installing missing packages: $PACKAGES"
+		printf "\n"
+		inform "Installing missing packages: $PACKAGES"
 		if [ ! $APT_HAS_UPDATED ]; then
-			apt update
+			sudo apt update
 			APT_HAS_UPDATED=true
 		fi
-		apt install -y $PACKAGES
+		sudo apt install -y $PACKAGES
+		check_for_error
 		if [ -f "$UNINSTALLER" ]; then
-			echo "apt uninstall -y $PACKAGES"
+			echo "apt uninstall -y $PACKAGES" >> $UNINSTALLER
 		fi
 	fi
 }
 
+function pip_pkg_install {
+	# A null Keyring prevents pip stalling in the background
+	PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring $PYTHON -m pip install --upgrade "$@"
+	check_for_error
+}
+
 while [[ $# -gt 0 ]]; do
 	K="$1"
 	case $K in
@@ -121,46 +205,43 @@ while [[ $# -gt 0 ]]; do
 	esac
 done
 
+printf "Installing $LIBRARY_NAME...\n\n"
+
 user_check
+venv_check
 
-if [ ! -f "$PYTHON" ]; then
-	printf "Python path $PYTHON not found!\n"
-	exit 1
+if [ ! -f `which $PYTHON` ]; then
+	fatal "Python path $PYTHON not found!\n"
 fi
 
 PYTHON_VER=`$PYTHON --version`
 
-inform "Installing. Please wait..."
+inform "Checking Dependencies. Please wait..."
+
+# Install toml and try to read pyproject.toml into bash variables
 
-$PYTHON -m pip install --upgrade configparser
+pip_pkg_install toml
 
 CONFIG_VARS=`$PYTHON - <<EOF
-from configparser import ConfigParser
-c = ConfigParser()
-c.read('library/setup.cfg')
-p = dict(c['pimoroni'])
-# Convert multi-line config entries into bash arrays
-for k in p.keys():
-    fmt = '"{}"'
-    if '\n' in p[k]:
-        p[k] = "'\n\t'".join(p[k].split('\n')[1:])
-        fmt = "('{}')"
-    p[k] = fmt.format(p[k])
-print("""
-LIBRARY_NAME="{name}"
-LIBRARY_VERSION="{version}"
-""".format(**c['metadata']))
+import toml
+config = toml.load("pyproject.toml")
+github_url = config['project']['urls']['GitHub']
+p = dict(config['tool']['pimoroni'])
+# Convert list config entries into bash arrays
+for k, v in p.items():
+    v = "'\n\t'".join(v)
+    p[k] = f"('{v}')"
+print(f'GITHUB_URL="{github_url}"')
 print("""
-PY3_DEPS={py3deps}
-PY2_DEPS={py2deps}
+APT_PACKAGES={apt_packages}
 SETUP_CMDS={commands}
 CONFIG_TXT={configtxt}
 """.format(**p))
 EOF`
 
 if [ $? -ne 0 ]; then
-	warning "Error parsing configuration...\n"
-	exit 1
+	# This is bad, this should not happen in production!
+	fatal "Error parsing configuration...\n"
 fi
 
 eval $CONFIG_VARS
@@ -168,32 +249,44 @@ eval $CONFIG_VARS
 RESOURCES_DIR=$RESOURCES_TOP_DIR/$LIBRARY_NAME
 UNINSTALLER=$RESOURCES_DIR/uninstall.sh
 
+RES_DIR_OWNER=`stat -c "%U" $RESOURCES_TOP_DIR`
+
+# Previous install.sh scripts were run as root with sudo, which caused
+# the ~/Pimoroni dir to be created with root ownership. Try and fix it.
+if [[ "$RES_DIR_OWNER" == "root" ]]; then
+	warning "\n\nFixing $RESOURCES_TOP_DIR permissions!\n\n"
+	sudo chown -R $USER:$USER $RESOURCES_TOP_DIR
+fi
+
 mkdir -p $RESOURCES_DIR
 
+# Create a stub uninstaller file, we'll try to add the inverse of every
+# install command run to here, though it's not complete.
 cat << EOF > $UNINSTALLER
 printf "It's recommended you run these steps manually.\n"
 printf "If you want to run the full script, open it in\n"
 printf "an editor and remove 'exit 1' from below.\n"
 exit 1
+source $VIRTUAL_ENV/bin/activate
 EOF
 
-printf "$LIBRARY_NAME $LIBRARY_VERSION Python Library: Installer\n\n"
+printf "\n"
 
-if $UNSTABLE; then
-	warning "Installing unstable library from source.\n\n"
-else
-	printf "Installing stable library from pypi.\n\n"
-fi
+inform "Installing for $PYTHON_VER...\n"
+
+# Install apt packages from pyproject.toml / tool.pimoroni.apt_packages
+apt_pkg_install "${APT_PACKAGES[@]}"
 
-cd library
+printf "\n"
 
-printf "Installing for $PYTHON_VER...\n"
-apt_pkg_install "${PY3_DEPS[@]}"
 if $UNSTABLE; then
-	$PYTHON setup.py install > /dev/null
+	warning "Installing unstable library from source.\n"
+	pip_pkg_install .
 else
-	$PYTHON -m pip install --upgrade $LIBRARY_NAME
+	inform "Installing stable library from pypi.\n"
+	pip_pkg_install $LIBRARY_NAME
 fi
+
 if [ $? -eq 0 ]; then
 	success "Done!\n"
 	echo "$PYTHON -m pip uninstall $LIBRARY_NAME" >> $UNINSTALLER
@@ -201,27 +294,40 @@ fi
 
 cd $WD
 
+find_config
+
+# Run the setup commands from pyproject.toml / tool.pimoroni.commands
+
 for ((i = 0; i < ${#SETUP_CMDS[@]}; i++)); do
 	CMD="${SETUP_CMDS[$i]}"
-	# Attempt to catch anything that touches /boot/config.txt and trigger a backup
-	if [[ "$CMD" == *"raspi-config"* ]] || [[ "$CMD" == *"$CONFIG"* ]] || [[ "$CMD" == *"\$CONFIG"* ]]; then
+	# Attempt to catch anything that touches config.txt and trigger a backup
+	if [[ "$CMD" == *"raspi-config"* ]] || [[ "$CMD" == *"$CONFIG_DIR/$CONFIG_FILE"* ]] || [[ "$CMD" == *"\$CONFIG_DIR/\$CONFIG_FILE"* ]]; then
 		do_config_backup
 	fi
 	eval $CMD
+	check_for_error
 done
 
+printf "\n"
+
+# Add the config.txt entries from pyproject.toml / tool.pimoroni.configtxt
+
 for ((i = 0; i < ${#CONFIG_TXT[@]}; i++)); do
 	CONFIG_LINE="${CONFIG_TXT[$i]}"
 	if ! [ "$CONFIG_LINE" == "" ]; then
 		do_config_backup
-		inform "Adding $CONFIG_LINE to $CONFIG\n"
-		sed -i "s/^#$CONFIG_LINE/$CONFIG_LINE/" $CONFIG
-		if ! grep -q "^$CONFIG_LINE" $CONFIG; then
-			printf "$CONFIG_LINE\n" >> $CONFIG
+		inform "Adding $CONFIG_LINE to $CONFIG_DIR/$CONFIG_FILE"
+		sudo sed -i "s/^#$CONFIG_LINE/$CONFIG_LINE/" $CONFIG_DIR/$CONFIG_FILE
+		if ! grep -q "^$CONFIG_LINE" $CONFIG_DIR/$CONFIG_FILE; then
+			printf "$CONFIG_LINE\n" | sudo tee --append $CONFIG_DIR/$CONFIG_FILE
 		fi
 	fi
 done
 
+printf "\n"
+
+# Just a straight copy of the examples/ dir into ~/Pimoroni/board/examples
+
 if [ -d "examples" ]; then
 	if confirm "Would you like to copy examples to $RESOURCES_DIR?"; then
 		inform "Copying examples to $RESOURCES_DIR"
@@ -233,19 +339,37 @@ fi
 
 printf "\n"
 
-if [ -f "/usr/bin/pydoc" ]; then
-	printf "Generating documentation.\n"
-	pydoc -w $LIBRARY_NAME > /dev/null
-	if [ -f "$LIBRARY_NAME.html" ]; then
-		cp $LIBRARY_NAME.html $RESOURCES_DIR/docs.html
-		rm -f $LIBRARY_NAME.html
-		inform "Documentation saved to $RESOURCES_DIR/docs.html"
+# Use pdoc to generate basic documentation from the installed module
+
+if confirm "Would you like to generate documentation?"; then
+	inform "Installing pdoc. Please wait..."
+	pip_pkg_install pdoc
+	inform "Generating documentation.\n"
+	$PYTHON -m pdoc $LIBRARY_NAME -o $RESOURCES_DIR/docs > /dev/null
+	if [ $? -eq 0 ]; then
+		inform "Documentation saved to $RESOURCES_DIR/docs"
 		success "Done!"
 	else
 		warning "Error: Failed to generate documentation."
 	fi
 fi
 
-success "\nAll done!"
-inform "If this is your first time installing you should reboot for hardware changes to take effect.\n"
-inform "Find uninstall steps in $UNINSTALLER\n"
+printf "\n"
+
+if [ "$CMD_ERRORS" = true ]; then
+	warning "One or more setup commands appear to have failed."
+	printf "This might prevent things from working properly.\n"
+	printf "Make sure your OS is up to date and try re-running this installer.\n"
+	printf "If things still don't work, report this or find help at $GITHUB_URL.\n\n"
+else
+	success "\nAll done!"
+fi
+
+printf "If this is your first time installing you should reboot for hardware changes to take effect.\n"
+printf "Find uninstall steps in $UNINSTALLER\n\n"
+
+if [ "$CMD_ERRORS" = true ]; then
+	exit 1
+else
+	exit 0
+fi
\ No newline at end of file
diff --git a/library/.coveragerc b/library/.coveragerc
deleted file mode 100644
index 1e51aeb..0000000
--- a/library/.coveragerc
+++ /dev/null
@@ -1,4 +0,0 @@
-[run]
-source = rv3028
-omit =
-    .tox/*
diff --git a/library/LICENSE.txt b/library/LICENSE.txt
deleted file mode 100644
index aed751a..0000000
--- a/library/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Pimoroni Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/library/README.md b/library/README.md
deleted file mode 100644
index da24e37..0000000
--- a/library/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# RV3028 Real Time Clock Breakout
-
-[![Build Status](https://shields.io/github/workflow/status/pimoroni/rv3028-python/Python%20Tests.svg)](https://github.com/pimoroni/rv3028-python/actions/workflows/test.yml)
-[![Coverage Status](https://coveralls.io/repos/github/pimoroni/rv3028-python/badge.svg?branch=master)](https://coveralls.io/github/pimoroni/rv3028-python?branch=master)
-[![PyPi Package](https://img.shields.io/pypi/v/rv3028.svg)](https://pypi.python.org/pypi/rv3028)
-[![Python Versions](https://img.shields.io/pypi/pyversions/rv3028.svg)](https://pypi.python.org/pypi/rv3028)
-
-# Note
-
-This is just a Python library to interface with the RV3028 and does not install the RTC as a time source for Raspbian.
-
-In order to set up as a RTC in Raspbian you will need to add something like the following to `/boot/config.txt`:
-
-```
-dtoverlay=i2c-rtc,rv3028,backup-switchover-mode=1
-```
-
-More information is available in the `i2c-rtc` dtoverlay documentation: https://github.com/raspberrypi/linux/blob/0d72d83ec92acda1e8cbad0d4213a5ec2b3f2e1b/arch/arm/boot/dts/overlays/README#L1079
-
-# Installing
-
-Stable library from PyPi:
-
-* Just run `python3 -m pip install rv3028`
-
-Latest/development library from GitHub:
-
-* `git clone https://github.com/pimoroni/rv3028-python`
-* `cd rv3028-python`
-* `sudo ./install.sh --unstable`
-
-# Requirements
-
-This library depends upon smbus:
-
-```
-sudo apt install python-smbus   # Python 2
-sudo apt install python3-smbus  # Python 3
-```
-
-
-# Changelog
-0.0.5
------
-
-* Bugfix: corrected BCD month to include Oct, Nov, Dec
-
-0.0.4
------
-
-* Port to i2cdevice>=0.0.6 set/get API
-* Cleaned up i2cdevice bindings
-* Corrected 12-hour and am/pm bits in bindings
-
-0.0.3
------
-
-* Bugfix to support days of month in the 20s
-
-0.0.2
------
-
-* Major bugfix to support hours past 8PM
-* Other minor fixes and improvements
-
-0.0.1
------
-
-* Initial Release
diff --git a/library/setup.cfg b/library/setup.cfg
deleted file mode 100644
index 490055f..0000000
--- a/library/setup.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-[metadata]
-name = rv3032
-version = 0.0.5
-author = Gee Bartlett
-author_email = gee@pimoroni.com
-description = Python library for the RV3032 Temperature Compansated Real Time Clock
-long_description = file: README.md
-long_description_content_type = text/markdown
-keywords = Raspberry Pi
-url = https://www.pimoroni.com
-project_urls =
-	GitHub=https://www.github.com/pimoroni/rv3032-python
-license = MIT
-# This includes the license file(s) in the wheel.
-# https://wheel.readthedocs.io/en/stable/user_guide.html#including-license-files-in-the-generated-wheel-file
-license_files = LICENSE.txt
-classifiers =
-	Development Status :: 4 - Beta
-	Operating System :: POSIX :: Linux
-	License :: OSI Approved :: MIT License
-	Intended Audience :: Developers
-	Programming Language :: Python :: 2.7
-	Programming Language :: Python :: 3
-	Topic :: Software Development
-	Topic :: Software Development :: Libraries
-	Topic :: System :: Hardware
-
-[options]
-python_requires = >= 2.7
-packages = rv3032
-install_requires =
-	i2cdevice >= 0.0.6
-
-[flake8]
-exclude =
-	.tox,
-	.eggs,
-	.git,
-	__pycache__,
-	build,
-	dist
-ignore =
-	E501
-
-[pimoroni]
-py2deps =
-py3deps =
-configtxt =
-commands =
-	printf "Setting up i2c..\n"
-	raspi-config nonint do_i2c 0
diff --git a/library/setup.py b/library/setup.py
deleted file mode 100644
index afb1ee1..0000000
--- a/library/setup.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-Copyright (c) 2016 Pimoroni
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-from setuptools import setup, __version__
-from pkg_resources import parse_version
-
-minimum_version = parse_version('30.4.0')
-
-if parse_version(__version__) < minimum_version:
-    raise RuntimeError("Package setuptools must be at least version {}".format(minimum_version))
-
-setup()
diff --git a/library/tox.ini b/library/tox.ini
deleted file mode 100644
index cb6472d..0000000
--- a/library/tox.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[tox]
-envlist = py{27,35,37,39},qa
-skip_missing_interpreters = True
-
-[testenv]
-commands =
-	python setup.py install
-	coverage run -m py.test -v -r wsx
-	coverage report
-deps =
-	mock
-	pytest>=3.1
-	pytest-cov
-
-[testenv:qa]
-commands =
-	check-manifest --ignore tox.ini,tests*,.coveragerc
-	python setup.py check -m -r -s
-	flake8 --ignore E501
-	rstcheck README.rst
-deps =
-	check-manifest
-	flake8
-	rstcheck
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..03174bd
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,121 @@
+[build-system]
+requires = ["hatchling", "hatch-fancy-pypi-readme"]
+build-backend = "hatchling.build"
+
+[project]
+name = "rv3032"
+dynamic = ["version", "readme"]
+description = "Python library for the RV3032 Temperature Compansated Real Time Clock"
+license = {file = "LICENSE"}
+requires-python = ">= 3.7"
+authors = [
+    { name = "Gee Bartlett", email = "gee@pimoroni.com" },
+]
+maintainers = [
+    { name = "Philip Howard", email = "phil@pimoroni.com" },
+]
+keywords = [
+    "Pi",
+    "Raspberry",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3 :: Only",
+    "Topic :: Software Development",
+    "Topic :: Software Development :: Libraries",
+    "Topic :: System :: Hardware",
+]
+dependencies = [
+    "i2cdevice >= 0.0.6"
+]
+
+[project.urls]
+GitHub = "https://www.github.com/pimoroni/rv3032-python"
+Homepage = "https://www.pimoroni.com"
+
+[tool.hatch.version]
+path = "rv3032/__init__.py"
+
+[tool.hatch.build]
+include = [
+    "rv3032",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+]
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "*"
+]
+exclude = [
+    ".*",
+    "dist"
+]
+
+[tool.hatch.metadata.hooks.fancy-pypi-readme]
+content-type = "text/markdown"
+fragments = [
+  { path = "README.md" },
+  { text = "\n" },
+  { path = "CHANGELOG.md" }
+]
+
+[tool.ruff]
+exclude = [
+    '.tox',
+    '.egg',
+    '.git',
+    '__pycache__',
+    'build',
+    'dist'
+]
+line-length = 200
+
+[tool.codespell]
+skip = """
+./.tox,\
+./.egg,\
+./.git,\
+./__pycache__,\
+./build,\
+./dist.\
+"""
+
+[tool.isort]
+line_length = 200
+
+[tool.black]
+line-length = 200
+
+[tool.check-manifest]
+ignore = [
+    '.stickler.yml',
+    'boilerplate.md',
+    'check.sh',
+    'install.sh',
+    'uninstall.sh',
+    'Makefile',
+    'tox.ini',
+    'tests/*',
+    'examples/*',
+    '.coveragerc',
+    'requirements-dev.txt'
+]
+
+[tool.pimoroni]
+apt_packages = []
+configtxt = []
+commands = [
+    "printf \"Setting up i2c..\n\"",
+	"sudo raspi-config nonint do_i2c 0"
+]
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 0000000..525b042
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,9 @@
+check-manifest
+ruff
+codespell
+isort
+twine
+hatch
+hatch-fancy-pypi-readme
+tox
+pdoc
diff --git a/library/rv3032/__init__.py b/rv3032/__init__.py
similarity index 100%
rename from library/rv3032/__init__.py
rename to rv3032/__init__.py
diff --git a/library/tests/test_alarm.py b/tests/test_alarm.py
similarity index 100%
rename from library/tests/test_alarm.py
rename to tests/test_alarm.py
diff --git a/library/tests/test_setup.py b/tests/test_setup.py
similarity index 100%
rename from library/tests/test_setup.py
rename to tests/test_setup.py
diff --git a/library/tests/test_time.py b/tests/test_time.py
similarity index 100%
rename from library/tests/test_time.py
rename to tests/test_time.py
diff --git a/library/tests/test_timer.py b/tests/test_timer.py
similarity index 100%
rename from library/tests/test_timer.py
rename to tests/test_timer.py
diff --git a/library/tests/test_unix_time.py b/tests/test_unix_time.py
similarity index 100%
rename from library/tests/test_unix_time.py
rename to tests/test_unix_time.py
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..44c8654
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,34 @@
+[tox]
+envlist = py,qa
+skip_missing_interpreters = True
+isolated_build = true
+minversion = 4.0.0
+
+[testenv]
+commands =
+	coverage run -m pytest -v -r wsx
+	coverage report
+deps =
+	mock
+	pytest>=3.1
+	pytest-cov
+	build
+
+[testenv:qa]
+commands =
+	check-manifest
+	python -m build --no-isolation
+	python -m twine check dist/*
+	isort --check .
+	ruff .
+	codespell .
+deps =
+	check-manifest
+	ruff
+	codespell
+	isort
+	twine
+	build
+	hatch
+	hatch-fancy-pypi-readme
+
diff --git a/uninstall.sh b/uninstall.sh
index 4848039..f213fc5 100644
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,25 +1,72 @@
 #!/bin/bash
 
-LIBRARY_VERSION=`cat library/setup.cfg | grep version | awk -F" = " '{print $2}'`
-LIBRARY_NAME=`cat library/setup.cfg | grep name | awk -F" = " '{print $2}'`
+FORCE=false
+LIBRARY_NAME=`grep -m 1 name pyproject.toml | awk -F" = " '{print substr($2,2,length($2)-2)}'`
+RESOURCES_DIR=$HOME/Pimoroni/$LIBRARY_NAME
+PYTHON="python"
 
-printf "$LIBRARY_NAME $LIBRARY_VERSION Python Library: Uninstaller\n\n"
 
-if [ $(id -u) -ne 0 ]; then
-	printf "Script must be run as root. Try 'sudo ./uninstall.sh'\n"
-	exit 1
-fi
+venv_check() {
+	PYTHON_BIN=`which $PYTHON`
+	if [[ $VIRTUAL_ENV == "" ]] || [[ $PYTHON_BIN != $VIRTUAL_ENV* ]]; then
+		printf "This script should be run in a virtual Python environment.\n"
+		exit 1
+	fi
+}
 
-cd library
+user_check() {
+	if [ $(id -u) -eq 0 ]; then
+		printf "Script should not be run as root. Try './uninstall.sh'\n"
+		exit 1
+	fi
+}
 
-printf "Unnstalling for Python 2..\n"
-pip uninstall $LIBRARY_NAME
+confirm() {
+	if $FORCE; then
+		true
+	else
+		read -r -p "$1 [y/N] " response < /dev/tty
+		if [[ $response =~ ^(yes|y|Y)$ ]]; then
+			true
+		else
+			false
+		fi
+	fi
+}
 
-if [ -f "/usr/bin/pip3" ]; then
-	printf "Uninstalling for Python 3..\n"
-	pip3 uninstall $LIBRARY_NAME
-fi
+prompt() {
+	read -r -p "$1 [y/N] " response < /dev/tty
+	if [[ $response =~ ^(yes|y|Y)$ ]]; then
+		true
+	else
+		false
+	fi
+}
+
+success() {
+	echo -e "$(tput setaf 2)$1$(tput sgr0)"
+}
+
+inform() {
+	echo -e "$(tput setaf 6)$1$(tput sgr0)"
+}
+
+warning() {
+	echo -e "$(tput setaf 1)$1$(tput sgr0)"
+}
 
-cd ..
+printf "$LIBRARY_NAME Python Library: Uninstaller\n\n"
+
+user_check
+venv_check
+
+printf "Uninstalling for Python 3...\n"
+$PYTHON -m pip uninstall $LIBRARY_NAME
+
+if [ -d $RESOURCES_DIR ]; then
+	if confirm "Would you like to delete $RESOURCES_DIR?"; then
+		rm -r $RESOURCES_DIR
+	fi
+fi
 
 printf "Done!\n"

From 3ebcafc9212a96db94ef7e685ad2bd5aeff3c0c4 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 6 Dec 2023 11:45:14 +0000
Subject: [PATCH 2/4] QA: Apply isort suggestions.

---
 examples/get-time.py            | 3 ++-
 examples/set-alarm.py           | 5 +++--
 examples/set-countdown-timer.py | 3 ++-
 examples/set-time.py            | 5 +++--
 rv3032/__init__.py              | 5 +++--
 tests/test_alarm.py             | 3 ++-
 tests/test_setup.py             | 3 ++-
 tests/test_time.py              | 3 ++-
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/examples/get-time.py b/examples/get-time.py
index 3887759..386925a 100644
--- a/examples/get-time.py
+++ b/examples/get-time.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-import rv3032
 import time
 
+import rv3032
+
 print("""get-time.py - Gets time and date from the RTC.
 
 Press Ctrl+C to exit.
diff --git a/examples/set-alarm.py b/examples/set-alarm.py
index 24155f7..8af7e21 100644
--- a/examples/set-alarm.py
+++ b/examples/set-alarm.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-import rv3032
-import time
 import datetime
+import time
+
+import rv3032
 
 print("""set-time.py - Sets alarm for 5 minutes time, recurring hourly,
 and waits for alarm to be triggered.
diff --git a/examples/set-countdown-timer.py b/examples/set-countdown-timer.py
index 24c66cd..96ffcc4 100644
--- a/examples/set-countdown-timer.py
+++ b/examples/set-countdown-timer.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-import rv3032
 import time
 
+import rv3032
+
 print("""set-countdown-timer.py - Set the periodic countdown timer to 5 x 1 second ticks and waits for alarm to be triggered.
 
 Press Ctrl+C to exit.
diff --git a/examples/set-time.py b/examples/set-time.py
index cc42c41..281192c 100644
--- a/examples/set-time.py
+++ b/examples/set-time.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
 
-import rv3032
-import time
 import datetime
+import time
+
+import rv3032
 
 print("""set-time.py - Sets RTC with current time for your system and
 enables battery backup to preserve the time when power is off.
diff --git a/rv3032/__init__.py b/rv3032/__init__.py
index 2cc2ea8..fdc7959 100644
--- a/rv3032/__init__.py
+++ b/rv3032/__init__.py
@@ -1,7 +1,8 @@
+import datetime
 import time
-from i2cdevice import Device, Register, BitField
+
+from i2cdevice import BitField, Device, Register
 from i2cdevice.adapter import Adapter, LookupAdapter, U16ByteSwapAdapter
-import datetime
 
 __version__ = '0.0.5'
 
diff --git a/tests/test_alarm.py b/tests/test_alarm.py
index a9e9bfd..d6992eb 100644
--- a/tests/test_alarm.py
+++ b/tests/test_alarm.py
@@ -1,6 +1,7 @@
-from i2cdevice import MockSMBus
 import datetime
+
 import pytest
+from i2cdevice import MockSMBus
 
 
 def test_alarm_hours_24():
diff --git a/tests/test_setup.py b/tests/test_setup.py
index 822b542..b346904 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -1,6 +1,7 @@
 import sys
-from i2cdevice import MockSMBus
+
 import mock
+from i2cdevice import MockSMBus
 
 
 def test_setup():
diff --git a/tests/test_time.py b/tests/test_time.py
index 6ec9691..43cd8cc 100644
--- a/tests/test_time.py
+++ b/tests/test_time.py
@@ -1,6 +1,7 @@
-from i2cdevice import MockSMBus
 import datetime
+
 import pytest
+from i2cdevice import MockSMBus
 
 
 def test_time_and_date():

From 0a5756f098bbed39df66bcd231d1943edb022f15 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 6 Dec 2023 11:46:19 +0000
Subject: [PATCH 3/4] QA: Apply codespell suggestion.

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 03174bd..22d0ab8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "rv3032"
 dynamic = ["version", "readme"]
-description = "Python library for the RV3032 Temperature Compansated Real Time Clock"
+description = "Python library for the RV3032 Temperature Compensated Real Time Clock"
 license = {file = "LICENSE"}
 requires-python = ">= 3.7"
 authors = [

From c1f4593086e6e556033de051eaa0959a25c362a7 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 6 Dec 2023 11:49:25 +0000
Subject: [PATCH 4/4] README.md: Fix references to rv3028 and update
 badges/install instructions.

---
 README.md | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 109e60b..6356d90 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-# RV3028 Real Time Clock Breakout
+# RV3032 Real Time Clock Breakout
 
-[![Build Status](https://shields.io/github/workflow/status/pimoroni/rv3028-python/Python%20Tests.svg)](https://github.com/pimoroni/rv3028-python/actions/workflows/test.yml)
-[![Coverage Status](https://coveralls.io/repos/github/pimoroni/rv3028-python/badge.svg?branch=master)](https://coveralls.io/github/pimoroni/rv3028-python?branch=master)
-[![PyPi Package](https://img.shields.io/pypi/v/rv3028.svg)](https://pypi.python.org/pypi/rv3028)
-[![Python Versions](https://img.shields.io/pypi/pyversions/rv3028.svg)](https://pypi.python.org/pypi/rv3028)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/pimoroni/rv3032-python/test.yml?branch=main)](https://github.com/pimoroni/rv3032-python/actions/workflows/test.yml)
+[![Coverage Status](https://coveralls.io/repos/github/pimoroni/rv3032-python/badge.svg?branch=main)](https://coveralls.io/github/pimoroni/rv3032-python?branch=main)
+[![PyPi Package](https://img.shields.io/pypi/v/rv3032.svg)](https://pypi.python.org/pypi/rv3032)
+[![Python Versions](https://img.shields.io/pypi/pyversions/rv3032.svg)](https://pypi.python.org/pypi/rv3032)
 
 # Note
 
-This is just a Python library to interface with the RV3028 and does not install the RTC as a time source for Raspbian.
+This is just a Python library to interface with the RV3032 and does not install the RTC as a time source for Raspbian.
 
 In order to set up as a RTC in Raspbian you will need to add something like the following to `/boot/config.txt`:
 
@@ -21,19 +21,10 @@ More information is available in the `i2c-rtc` dtoverlay documentation: https://
 
 Stable library from PyPi:
 
-* Just run `python3 -m pip install rv3028`
+* Just run `python3 -m pip install rv3032`
 
 Latest/development library from GitHub:
 
-* `git clone https://github.com/pimoroni/rv3028-python`
-* `cd rv3028-python`
-* `sudo ./install.sh --unstable`
-
-# Requirements
-
-This library depends upon smbus:
-
-```
-sudo apt install python-smbus   # Python 2
-sudo apt install python3-smbus  # Python 3
-```
+* `git clone https://github.com/pimoroni/rv3032-python`
+* `cd rv3032-python`
+* `./install.sh --unstable`