8000 Merge PR153: fix typos · admdev8/python-versioneer@6b55507 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6b55507

Browse files
warnerwarner
committed
Merge PR153: fix typos
closes python-versioneer#153
2 parents 3973079 + 7de0179 commit 6b55507

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ two common reasons why `setup.py` might not be in the root:
171171
`setup.cfg`, and `tox.ini`. Projects like these produce multiple PyPI
172172
distributions (and upload multiple independently-installable tarballs).
173173
* Source trees whose main purpose is to contain a C library, but which also
174-
provide bindings to Python (and perhaps other langauges) in subdirectories.
174+
provide bindings to Python (and perhaps other languages) in subdirectories.
175175

176176
Versioneer will look for `.git` in parent directories, and most operations
177177
should get the right version string. However `pip` and `setuptools` have bugs

‎details.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The renderer function is controlled by a configuration value called `style`. You
7070
| key | description |
7171
| --- | ----------- |
7272
| `default` | same as `pep440` |
73-
| `pep440` | `TAG[+DISTANCE.gSHORTHASH[.dirty]]`, a PEP-440 compatible version string which uses the "local version identifier" to record the complete non-tag information. This format provides compliant versions even under unusual/error circumstances. It returns `0+untagged.DISTANCE.gHASH[.dirty]` before any tags have been set, `0+unknown` if the tree does not contain enough information to report a verion (e.g. the .git directory has been removed), and `0.unparseable[.dirty]` if `git describe` emits something weird. If TAG includes a plus sign, then this will use a dot as a separator instead (`TAG[.DISTANCE.gSHORTHASH[.dirty]]`).|
73+
| `pep440` | `TAG[+DISTANCE.gSHORTHASH[.dirty]]`, a PEP-440 compatible version string which uses the "local version identifier" to record the complete non-tag information. This format provides compliant versions even under unusual/error circumstances. It returns `0+untagged.DISTANCE.gHASH[.dirty]` before any tags have been set, `0+unknown` if the tree does not contain enough information to report a version (e.g. the .git directory has been removed), and `0.unparseable[.dirty]` if `git describe` emits something weird. If TAG includes a plus sign, then this will use a dot as a separator instead (`TAG[.DISTANCE.gSHORTHASH[.dirty]]`).|
7474
| `pep440-pre` | `TAG[.post.devDISTANCE]`, a PEP-440 compatible version string which loses information but has the useful property that non-tagged versions qualify for `pip install --pre` (by virtue of the `.dev` component). This form does not record the commit hash, nor the `-dirty` flag. |
7575
| `pep440-post` | `TAG[.postDISTANCE[.dev0]+gSHORTHASH]`, a PEP-440 compatible version string which allows all commits to get installable versions, and retains the commit hash.
7676
| `pep440-old` | `TAG[.postDISTANCE[.dev0]]`, a PEP-440 compatible version string which loses information but enables downstream projects to depend upon post-release versions (by counting commits). The ".dev0" suffix indicates a dirty tree. This form does not record the commit hash. If nothing has been tagged, this will be `0.postDISTANCE[.dev0]`. Note that PEP-0440 rules indicate that `X.dev0` sorts as "older" than `X`, so our -dirty flag is expressed somewhat backwards (usually "dirty" indicates newer changes than the base commit), but PEP-0440 offers no positive post-".postN" component. You should never be releasing software with -dirty anyways. |

‎src/render.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def render_pep440_old(pieces):
7979
8080
The ".dev0" means dirty.
8181
82-
Eexceptions:
82+
Exceptions:
8383
1: no tags. 0.postDISTANCE[.dev0]
8484
"""
8585
if pieces["closest-tag"]:

‎test/git/test_invocations.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def make_demolib_sdist(self):
119119
self.git("init", workdir=libdir)
120120
self.python("versioneer.py", "setup", workdir=libdir)
121121
self.git("add", "--all", workdir=libdir)
122-
self.git("commit", "-m", "commemt", workdir=libdir)
122+
self.git("commit", "-m", "comment", workdir=libdir)
123123
self.git("tag", "demolib-1.0", workdir=libdir)
124124
self.python("setup.py", "sdist", "--format=tar", workdir=libdir)
125125
created = os.path.join(libdir, "dist", "demolib-1.0.tar")
@@ -154,7 +154,7 @@ def make_distutils_repo(self):
154154
self.git("init", workdir=repodir)
155155
self.python("versioneer.py", "setup", workdir=repodir)
156156
self.git("add", "--all", workdir=repodir)
157-
self.git("commit", "-m", "commemt", workdir=repodir)
157+
self.git("commit", "-m", "comment", workdir=repodir)
158158
self.git("tag", "demoapp2-2.0", workdir=repodir)
159159
return repodir
160160

@@ -169,7 +169,7 @@ def make_distutils_repo_subproject(self):
169169
self.git("init", workdir=repodir)
170170
self.python("versioneer.py", "setup", workdir=projectdir)
171171
self.git("add", "--all", workdir=repodir)
172-
self.git("commit", "-m", "commemt", workdir=repodir)
172+
self.git("commit", "-m", "comment", workdir=repodir)
173173
self.git("tag", "demoapp2-2.0", workdir=repodir)
174174
return projectdir
175175

@@ -253,7 +253,7 @@ def make_setuptools_repo(self):
253253
self.git("init", workdir=repodir)
254254
self.python("versioneer.py", "setup", workdir=repodir)
255255
self.git("add", "--all", workdir=repodir)
256-
self.git("commit", "-m", "commemt", workdir=repodir)
256+
self.git("commit", "-m", "comment", workdir=repodir)
257257
self.git("tag", "demoapp2-2.0", workdir=repodir)
258258
return repodir
259259

@@ -268,7 +268,7 @@ def make_setuptools_repo_subproject(self):
268268
self.git("init", workdir=repodir)
269269
self.python("versioneer.py", "setup", workdir=projectdir)
270270
self.git("add", "--all", workdir=repodir)
271-
self.git("commit", "-m", "commemt", workdir=repodir)
271+
self.git("commit", "-m", "comment", workdir=repodir)
272272
self.git("tag", "demoapp2-2.0", workdir=repodir)
273273
return projectdir
274274

0 commit comments

Comments
 (0)
0