summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Van Brunt <kmvanbrunt@gmail.com>2020-01-06 12:05:08 -0500
committerGitHub <noreply@github.com>2020-01-06 12:05:08 -0500
commit3fc6388395020dd63cd15fd93252f05844927874 (patch)
tree3564ebe093db031e1f8821fd0357bca0e0a1aa81
parentc2ce4b0210531a4cec35b14c51395a91ff092b91 (diff)
parent112d8c4c05df07e7ea8e9e9a72100c4e99381275 (diff)
downloadcmd2-git-3fc6388395020dd63cd15fd93252f05844927874.tar.gz
Merge pull request #839 from python-cmd2/setuptools_dependency
Add missing setuptools dependency
-rw-r--r--CHANGELOG.md1
-rw-r--r--CONTRIBUTING.md1
-rwxr-xr-xsetup.py4
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20427976..fec93d02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 0.9.23 (TBD, 2019)
* Bug Fixes
* Fixed bug where startup script containing a single quote in its file name was incorrectly quoted
+ * Added missing implicit dependency on `setuptools` due to build with `setuptools_scm`
## 0.9.22 (December 9, 2019)
* Bug Fixes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6055fa7d..96c2d312 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,6 +51,7 @@ The tables below list all prerequisites along with the minimum required version
| [attrs](https://github.com/python-attrs/attrs) | `16.3` |
| [colorama](https://github.com/tartley/colorama) | `0.3.7` |
| [pyperclip](https://github.com/asweigart/pyperclip) | `1.6` |
+| [setuptools](https://pypi.org/project/setuptools/) | `34.4` |
| [wcwidth](https://pypi.python.org/pypi/wcwidth) | `0.1.7` |
diff --git a/setup.py b/setup.py
index 90a3793d..9b78fc5b 100755
--- a/setup.py
+++ b/setup.py
@@ -29,9 +29,9 @@ Programming Language :: Python :: Implementation :: CPython
Topic :: Software Development :: Libraries :: Python Modules
""".splitlines()))) # noqa: E128
-SETUP_REQUIRES = ['setuptools_scm']
+SETUP_REQUIRES = ['setuptools_scm >= 3.0.0']
-INSTALL_REQUIRES = ['pyperclip >= 1.6', 'colorama >= 0.3.7', 'attrs >= 16.3.0', 'wcwidth >= 0.1.7']
+INSTALL_REQUIRES = ['attrs >= 16.3.0', 'colorama >= 0.3.7', 'pyperclip >= 1.6', 'setuptools >= 34.4', 'wcwidth >= 0.1.7']
EXTRAS_REQUIRE = {
# Windows also requires pyreadline to ensure tab completion works