Simplify Releases with bumpversion

.bumpversion.cfg

@@ -0,0 +1,7 @@
+[bumpversion]
+current_version = 0.2.0
+commit = True
+tag = False
+
+[bumpversion:file:setup.py]
+

HISTORY.rst

@@ -0,0 +1,65 @@
+=======
+History
+=======
+
+0.2.0 (2017-07-30)
+------------------
+
+    - Reorganize project to follow best practices (PR `#9`_)
+    - Allow setup.py to run tests by overriding test command (PR `#9`_)
+    - Test locally with Tox (PR `#10`_)
+    - Remove Django 1.9 from supported versions (PR `#10`_)
+    - Enforce styleguide with flake8, isort, and pylint.
+      Use flake8-commas and flake8-quotes to enhance flake8.
+      Override default distutils check command to check package metadata.
+      Use check-manifest to check contents of MANIFEST.in (PR `#11`_)
+    - Integrate https://pyup.io/ into project (PR `#12`_)
+    - Upgrade flake8 to version 3.4.1 (PR `#13`_)
+    - Make release and distribution less painful with
+      bumpversion package and a Makefile (PR `#15`_)
+    - Add HISTORY.rst file to provide change log (PR `#15`_)
+
+.. _#9: https://github.com/jambonsw/django-improved-user/pull/9
+.. _#10: https://github.com/jambonsw/django-improved-user/pull/10
+.. _#11: https://github.com/jambonsw/django-improved-user/pull/11
+.. _#12: https://github.com/jambonsw/django-improved-user/pull/12
+.. _#13: https://github.com/jambonsw/django-improved-user/pull/13
+.. _#15: https://github.com/jambonsw/django-improved-user/pull/15
+
+0.1.1 (2017-06-28)
+------------------
+
+    - Fix metadata in setup.py for warehouse
+      (see https://github.com/pypa/warehouse/issues/2155 and PR `#8`_)
+
+.. _#8: https://github.com/jambonsw/django-improved-user/pull/8
+
+0.1.0 (2017-06-28)
+------------------
+
+    - Add tests for Django 1.11 (PR `#5`_)
+    - Allow for integration with UserAttributeSimilarityValidator
+      (see https://code.djangoproject.com/ticket/28127,
+      https://github.com/django/django/pull/8408, and PR `#5`_)
+    - Rename project django-improved-user (from django-simple-user)
+    - Make development default branch (PR `#6`_)
+    - Initial public release (PR `#7`_)
+    - Use Simplified BSD License instead of Revised BSD License (`#7`_)
+
+.. _#5: https://github.com/jambonsw/django-improved-user/pull/5
+.. _#6: https://github.com/jambonsw/django-improved-user/pull/6
+.. _#7: https://github.com/jambonsw/django-improved-user/pull/7
+
+0.0.1 (2016-10-26)
+------------------
+
+    - Simplified User model for better international handling.
+      Includes forms and admin configuration (PR `#1`_)
+    - All tests run on TravisCI (PR `#3`_)
+    - Compatible with:
+        - Python 3.4, 3.5, 3.6
+        - Django 1.8 through 1.10 (PR `#3`_ and `#4`_)
+
+.. _#1: https://github.com/jambonsw/django-improved-user/pull/1
+.. _#3: https://github.com/jambonsw/django-improved-user/pull/3
+.. _#4: https://github.com/jambonsw/django-improved-user/pull/4

MANIFEST.in

@@ -1,6 +1,9 @@
+exclude Makefile
+include .bumpversion.cfg
 include .isort.cfg
 include .pylintrc
 include .pyup.yml
+include HISTORY.rst
 include LICENSE
 include requirements.txt
 include runtests.py

Makefile

@@ -0,0 +1,31 @@
+.PHONY: all clean dist release
+
+all:
+	@echo 'Available Commands:'
+	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null \
+		| awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' \
+		| sort \
+		| egrep -v -e '^[^[:alnum:]]' -e '^$@$$' \
+		| xargs -I {} echo '    {}'
+
+dist:
+	python setup.py sdist --formats=gztar bdist_wheel
+	gpg --armor --detach-sign -u 5878672C -a dist/django_improved_user*.whl
+	gpg --armor --detach-sign -u 5878672C -a dist/django-improved-user*.tar.gz
+
+release:
+	git tag v`bumpversion --dry-run --list patch | grep current | cut -d'=' -f 2`
+	twine upload dist/*
+	git push --tags
+
+clean:
+	rm -f .coverage
+	rm -f .coverage.*
+	rm -rf *.egg-info
+	rm -rf .eggs
+	rm -rf .tox
+	rm -rf build
+	rm -rf dist
+	rm -rf htmlcov
+	find . -name "*.py[co]" -delete
+	find . -name "__pycache__" -delete

requirements.txt

@@ -1,3 +1,4 @@
+bumpversion==0.5.3
 check-manifest==0.35
 docutils==0.13.1
 flake8-commas==0.4.3

setup.py

@@ -132,7 +132,7 @@ def run_tests(self):
 
 setup(
     name='django-improved-user',
-    version='0.1.1',
+    version='0.2.0',
     description=(
         'A custom Django user model for best practices email-based login.'
     ),

tox.ini

@@ -8,7 +8,6 @@ envlist =
 [testenv:pkgcheck]
 basepython=python3.6
 deps =
-    Pygments
     -r{toxinidir}/requirements.txt
 setenv =
        PYTHONDONTWRITEBYTECODE=1