diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2018-12-28 22:00:08 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2018-12-28 22:00:08 -0500 |
commit | 4310c976400dc2eab8d8597b0dffaa7b787cff71 (patch) | |
tree | 04353290a2c8a62d62109face5b9b278720797c5 | |
parent | 8ac0f8736c746a829e6393ca5ba00fa8d042d426 (diff) | |
download | pytest-runner-4310c976400dc2eab8d8597b0dffaa7b787cff71.tar.gz |
Clarify purpose of local/upstream extras
-rw-r--r-- | skeleton.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/skeleton.md b/skeleton.md index bc78f37..0e0c0ef 100644 --- a/skeleton.md +++ b/skeleton.md @@ -68,7 +68,7 @@ The setup.cfg file implements the following features: - Supplies two 'extras': - testing: requirements for running tests - docs: requirements for building docs - - these extras split the declaration into "upstream" (requirements as declared by the skeleton) and "local" (those specific to the local project) + - these extras split the declaration into "upstream" (requirements as declared by the skeleton) and "local" (those specific to the local project); these markers help avoid merge conflicts - Placeholder for defining entry points Additionally, the setup.py file declares `use_scm_version` which relies on [setuptools_scm](https://pypi.org/project/setuptools_scm) to do two things: |