Allow setting PYPI_REPOSITORY for testing purposes

Author: Luke Bakken

Makefile

@@ -19,6 +19,8 @@ PROJDIR   = $(realpath $(CURDIR))
 TOOLS_DIR = $(PROJDIR)/tools/devrel
 CA_DIR    = $(PROJDIR)/tools/test-ca
 
+PYPI_REPOSITORY ?= pypi
+
 .PHONY: lint
 lint:
 	./.runner lint
@@ -58,25 +60,25 @@ endif
 	@python -c 'import pypandoc'
 	@echo "==> Python tagging version $(VERSION)"
 	@./build/publish $(VERSION) validate
-	@git tag --sign -a "$(VERSION)" -m "riak-python-client $(VERSION)" --local-user "$(RELEASE_GPG_KEYNAME)"
-	@git push --tags
-	@echo "==> Python (sdist release)"
-	@python setup.py sdist upload --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
+	@echo "==> pypi repository: $(PYPI_REPOSITORY)"
+	@echo "==> Python (sdist)"
+	@python setup.py sdist upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
 	@./build/publish $(VERSION)
 
 .PHONY: release
 release: release_sdist
 ifeq ($(RELEASE_GPG_KEYNAME),)
 	$(error RELEASE_GPG_KEYNAME must be set to build a release and deploy this package)
 endif
-	@echo "==> Python 2.7 (release)"
-	@python2.7 setup.py build --build-base=py-build/2.7 bdist_egg upload --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
-	@echo "==> Python 3.3 (release)"
-	@python3.3 setup.py build --build-base=py-build/3.3 bdist_egg upload --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
-	@echo "==> Python 3.4 (release)"
-	@python3.4 setup.py build --build-base=py-build/3.4 bdist_egg upload --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
-	@echo "==> Python 3.5 (release)"
-	@python3.5 setup.py build --build-base=py-build/3.5 bdist_egg upload --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
+	@echo "==> pypi repository: $(PYPI_REPOSITORY)"
+	@echo "==> Python 2.7 (bdist_egg)"
+	@python2.7 setup.py build --build-base=py-build/2.7 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
+	@echo "==> Python 3.3 (bdist_egg)"
+	@python3.3 setup.py build --build-base=py-build/3.3 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
+	@echo "==> Python 3.4 (bdist_egg)"
+	@python3.4 setup.py build --build-base=py-build/3.4 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
+	@echo "==> Python 3.5 (bdist_egg)"
+	@python3.5 setup.py build --build-base=py-build/3.5 bdist_egg upload --repository $(PYPI_REPOSITORY) --show-response --sign --identity $(RELEASE_GPG_KEYNAME)
 
 .PHONY: unit-test
 unit-test: