Synced with bootstrap

.travis.yml

@@ -11,8 +11,6 @@ matrix:
       env: TOXENV=py27
     - python: "3.5"
       env: TOXENV=py35
-    - python: "2.7"
-      env: TOXENV=py27
 
 install:
   - pip install --ignore-installed --upgrade setuptools pip tox coveralls
@@ -22,3 +20,6 @@ script:
   - tox -vv
 
 after_success: if [ "$TOXENV" == "py35" ]; then coveralls; fi
+
+notifications:
+  email: false

Makefile

@@ -1,8 +1,10 @@
-LIBRARY_VERSION=`cat library/setup.py | grep version | awk -F"'" '{print $$2}'`
-LIBRARY_NAME=`cat library/setup.py | grep name | awk -F"'" '{print $$2}'`
+LIBRARY_VERSION=$(shell cat library/setup.py | grep version | awk -F"'" '{print $$2}')
+LIBRARY_NAME=$(shell cat library/setup.py | grep name | awk -F"'" '{print $$2}')
 
 .PHONY: usage install uninstall
 usage:
+	@echo "Library: ${LIBRARY_NAME}"
+	@echo "Version: ${LIBRARY_VERSION}\n"
 	@echo "Usage: make <target>, where target is one of:\n"
 	@echo "install:       install the library locally from source"
 	@echo "uninstall:     uninstall the local library"
@@ -13,6 +15,7 @@ usage:
 	@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"
 
 install:
 	./install.sh
@@ -22,14 +25,17 @@ uninstall:
 
 check:
 	@echo "Checking for trailing whitespace"
-	@! grep -IUrn --color "[[:blank:]]$$" --exclude-dir=.tox --exclude-dir=.git --exclude=PKG-INFO
+	@! grep -IUrn --color "[[:blank:]]$$" --exclude-dir=sphinx --exclude-dir=.tox --exclude-dir=.git --exclude=PKG-INFO
 	@echo "Checking for DOS line-endings"
-	@! grep -IUrn --color "" --exclude-dir=.tox --exclude-dir=.git --exclude=Makefile
+	@! grep -IUrn --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}"
+
 python-readme: library/README.rst
 
 python-license: library/LICENSE.txt

install.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-printf "KEYBOW Python Library: Installer\n\n"
+LIBRARY_VERSION=`cat library/setup.py | grep version | awk -F"'" '{print $2}'`
+LIBRARY_NAME=`cat library/setup.py | grep name | awk -F"'" '{print $2}'`
+
+printf "$LIBRARY_NAME $LIBRARY_VERSION Python Library: Installer\n\n"
 
 if [ $(id -u) -ne 0 ]; then
 	printf "Script must be run as root. Try 'sudo ./install.sh'\n"

library/setup.cfg

@@ -1,3 +1,8 @@
+[metadata]
+# 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
+
 [flake8]
 exclude =
 	.tox,

library/setup.py

@@ -47,7 +47,7 @@
     license='MIT',
     keywords='Raspberry Pi',
     url='http://www.pimoroni.com',
+    project_urls={'GitHub': 'https://www.github.com/pimoroni/{{LIBNAME}}-python'},
     classifiers=classifiers,
-    packages=['keybow'],
-    install_requires=[]
+    packages=['keybow']
 )

library/tox.ini

@@ -16,6 +16,11 @@ deps =
 commands =
 	flake8 --ignore E501
 	rstcheck README.rst
+	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

uninstall.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-PACKAGE="keybow"
+LIBRARY_VERSION=`cat library/setup.py | grep version | awk -F"'" '{print $2}'`
+LIBRARY_NAME=`cat library/setup.py | grep name | awk -F"'" '{print $2}'`
 
-printf "KEYBOW Python Library: Uninstaller\n\n"
+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"
@@ -12,11 +13,11 @@ fi
 cd library
 
 printf "Unnstalling for Python 2..\n"
-pip uninstall $PACKAGE
+pip uninstall $LIBRARY_NAME
 
 if [ -f "/usr/bin/pip3" ]; then
 	printf "Uninstalling for Python 3..\n"
-	pip3 uninstall $PACKAGE
+	pip3 uninstall $LIBRARY_NAME
 fi
 
 cd ..