From 501b145eac2e09996dca7dba8d0053ea10ec1b42 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Apr 17 2020 22:16:55 +0000 Subject: Make twine a dev dependency. Since twine is not actually a setup requirement we should make it a dev dependency. Signed-off-by: James Hilliard --- diff --git a/ChangeLog b/ChangeLog index 1ab2c51..3c63146 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,7 @@ Version NEXT :Released: FUTURE :Maintainer: UNKNOWN -No changes. +* Declare Twine as a dev dependency instead of build dependency. Version 2.2.4 diff --git a/setup.py b/setup.py index ddad4bc..01f7bb0 100644 --- a/setup.py +++ b/setup.py @@ -67,8 +67,7 @@ setup_kwargs = dict( # Setuptools metadata. zip_safe=False, setup_requires=[ - "docutils", - "twine", + "docutils" ], test_suite="setup.test_suite", tests_require=test_requirements, @@ -77,6 +76,9 @@ setup_kwargs = dict( "lockfile >=0.10", ], extras_require={ + 'dev': [ + 'twine' + ], 'test': test_requirements, }, diff --git a/twine.mk b/twine.mk index 624207d..e6b07c2 100644 --- a/twine.mk +++ b/twine.mk @@ -18,15 +18,20 @@ TWINE_DIST_FILES ?= ${DIST_DIR}/* .PHONY: twine-upload -twine-upload: setuptools-dist +twine-upload: setuptools-dist pip-install-dev-requirements $(PYTHON_TWINE) upload ${PYTHON_TWINE_UPLOAD_OPTS} ${TWINE_DIST_FILES} .PHONY: twine-check -twine-check: setuptools-dist +twine-check: setuptools-dist pip-install-dev-requirements $(PYTHON_TWINE) check ${TWINE_DIST_FILES} +.PHONY: pip-install-dev-requirements +pip-install-dev-requirements: + $(PYTHON) -m pip install .[dev] + + # Copyright © 2006–2019 Ben Finney # # This is free software: you may copy, modify, and/or distribute this work