From bcbe224e4b1b40d78cc6d265e3527e6d4333a599 Mon Sep 17 00:00:00 2001
From: Jace Browning <jacebrowning@gmail.com>
Date: Fri, 9 Sep 2016 15:54:46 -0400
Subject: [PATCH] Use twine to upload packages

---
 {{cookiecutter.project_name}}/Makefile        | 39 +++++++++++--------
 .../requirements/dev.txt                      |  7 +++-
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/{{cookiecutter.project_name}}/Makefile b/{{cookiecutter.project_name}}/Makefile
index a1abfae..18b616b 100644
--- a/{{cookiecutter.project_name}}/Makefile
+++ b/{{cookiecutter.project_name}}/Makefile
@@ -277,11 +277,26 @@ mkdocs-live: mkdocs ## Launch and continuously rebuild the mkdocs site
 	eval "sleep 3; open http://127.0.0.1:8000" &
 	$(MKDOCS) serve
 
+%.rst: %.md
+	pandoc -f markdown_github -t rst -o $@ $<
+
 # BUILD ########################################################################
 
 PYINSTALLER := $(BIN_)pyinstaller
 PYINSTALLER_MAKESPEC := $(BIN_)pyi-makespec
 
+.PHONY: sdist
+sdist: install dist/*.tar.gz
+dist/*.tar.gz: $(MODULES) README.rst CHANGELOG.rst
+	$(PYTHON) setup.py check --restructuredtext --strict --metadata
+	$(PYTHON) setup.py sdist
+
+.PHONY: bdist
+bdist: install dist/*.whl
+dist/*.whl: $(MODULES) README.rst CHANGELOG.rst
+	$(PYTHON) setup.py check --restructuredtext --strict --metadata
+	$(PYTHON) setup.py bdist_wheel
+
 .PHONY: exe
 exe: install $(PROJECT).spec
 	# For framework/shared support: https://github.com/yyuu/pyenv/wiki
@@ -292,25 +307,18 @@ $(PROJECT).spec:
 
 # RELEASE ######################################################################
 
-.PHONY: register-test
-register-test: README.rst CHANGELOG.rst ## Register the project on the test PyPI
-	$(PYTHON) setup.py register --strict --repository https://testpypi.python.org/pypi
+TWINE := $(BIN_)twine
 
 .PHONY: register
-register: README.rst CHANGELOG.rst ## Register the project on PyPI
-	$(PYTHON) setup.py register --strict
-
-.PHONY: upload-test
-upload-test: register-test ## Upload the current version to the test PyPI
-	$(PYTHON) setup.py sdist upload --repository https://testpypi.python.org/pypi
-	$(PYTHON) setup.py bdist_wheel upload --repository https://testpypi.python.org/pypi
-	$(OPEN) https://testpypi.python.org/pypi/$(PROJECT)
+register: sdist bdist ## Register the project on PyPI
+	@ echo NOTE: your project must be registered manually
+	@ echo https://github.com/pypa/python-packaging-user-guide/issues/263
+	# TODO: switch to twine when the above issue is resolved
+	# $(TWINE) register dist/*.whl
 
 .PHONY: upload
 upload: .git-no-changes register ## Upload the current version to PyPI
-	$(PYTHON) setup.py check --restructuredtext --strict --metadata
-	$(PYTHON) setup.py sdist upload
-	$(PYTHON) setup.py bdist_wheel upload
+	$(TWINE) upload dist/*
 	$(OPEN) https://pypi.python.org/pypi/$(PROJECT)
 
 .PHONY: .git-no-changes
@@ -324,9 +332,6 @@ upload: .git-no-changes register ## Upload the current version to PyPI
 		exit -1;                                  \
 	fi;
 
-%.rst: %.md
-	pandoc -f markdown_github -t rst -o $@ $<
-
 # CLEANUP ######################################################################
 
 .PHONY: clean
diff --git a/{{cookiecutter.project_name}}/requirements/dev.txt b/{{cookiecutter.project_name}}/requirements/dev.txt
index a582351..857968f 100644
--- a/{{cookiecutter.project_name}}/requirements/dev.txt
+++ b/{{cookiecutter.project_name}}/requirements/dev.txt
@@ -13,6 +13,9 @@ sniffer
 # Runner
 honcho
 
-# Release
-pyinstaller
+# Build
 wheel
+pyinstaller
+
+# Release
+twine