Skip to content

Commit 717b764

Browse files
kianmengjugmac00
andauthored
Fix typos (#2253)
Co-authored-by: Jürgen Gmach <[email protected]>
1 parent 4cf816c commit 717b764

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

CONTRIBUTORS

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Jürgen Gmach
6666
Jurko Gospodnetić
6767
Karthikeyan Singaravelan
6868
Krisztian Fekete
69+
Kian-Meng Ang
6970
Laszlo Vasko
7071
Lukasz Balcerzak
7172
Lukasz Rogalski

docs/changelog.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ v2.8.0 (2017-09-01)
14761476
- `pull request 585 <https://github.com/tox-dev/tox/pull/585>`_: Expand documentation to explain pass through of flags from deps to pip
14771477
(e.g. ``-rrequirements.txt``, ``-cconstraints.txt``). Thanks Alexander Loechel (`@loechel <https://github.com/loechel>`_).
14781478

1479-
- `pull request 588 <https://github.com/tox-dev/tox/pull/588>`_: Run pytest wit xfail_strict and adapt affected tests.
1479+
- `pull request 588 <https://github.com/tox-dev/tox/pull/588>`_: Run pytest with xfail_strict and adapt affected tests.
14801480

14811481
v2.7.0 (2017-04-02)
14821482
-------------------

docs/drafts/extend-envs-and-packagebuilds.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ package_formats= # new option to specify wanted package formats for t
9393
commands = py.test
9494
```
9595

96-
Lising tox environments (`tox --list`) would display the following output:
96+
Listing tox environments (`tox --list`) would display the following output:
9797

9898
```
9999
(sdist) py27
@@ -152,17 +152,17 @@ Output of `tox --list`:
152152
```
153153

154154

155-
### Implemenation Details
155+
### Implementation Details
156156

157157
```
158158
tox_package_formats() -> ['conda'] # ['sdist', 'wheel']
159159
tox_testenv_create(env_meta, package_type) -> # creates an environment for given package, using
160160
# information from env_meta (like .envdir)
161-
# returns: an "env" object which is forwaded to the next hooks
161+
# returns: an "env" object which is forwarded to the next hooks
162162
tox_testenv_install(env_meta, package_type, env) -> # installs deps and package into environment
163163
tox_testenv_runtest(env_meta, package_type, env) -> # activates environment and runs test commands
164164
165-
tox_testenv_updated(env_meta, package_type) -> # returns True if hte environment is already up to date
165+
tox_testenv_updated(env_meta, package_type) -> # returns True if the environment is already up to date
166166
# otherwise, tox will remove the environment completely and
167167
# create a new one
168168
```

docs/example/basic.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ This variable can be also set in ``tox.ini``:
169169
setenv =
170170
PIP_INDEX_URL = https://pypi.my-alternative-index.org
171171
172-
Alternatively, a configuration where ``PIP_INDEX_URL`` could be overriden from environment:
172+
Alternatively, a configuration where ``PIP_INDEX_URL`` could be overridden from environment:
173173

174174
.. code-block:: ini
175175

src/tox/config/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ def getargv(self, name, default="", replace=True):
17511751
def getargv_install_command(self, name, default="", replace=True):
17521752
s = self.getstring(name, default, replace=False)
17531753
if not s:
1754-
# This occurs when factors are used, and a testenv doesnt have
1754+
# This occurs when factors are used, and a testenv doesn't have
17551755
# a factorised value for install_command, most commonly occurring
17561756
# if setting platform is also used.
17571757
# An empty value causes error install_command must contain '{packages}'.

src/tox/logs/env.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def set_installed(self, packages):
2828

2929
def set_header(self, installpkg):
3030
"""
31-
:param py.path.local installpkg: Path ot the package.
31+
:param py.path.local installpkg: Path to the package.
3232
"""
3333
self.dict["installpkg"] = {
3434
"sha256": installpkg.computehash("sha256"),

tests/unit/test_quickstart.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def __str__(self):
157157
(
158158
_answers([1, "pytest", ""]),
159159
_exp(
160-
"choose current release Python and pytest with defaut deps",
160+
"choose current release Python and pytest with default deps",
161161
[tox.PYTHON.CURRENT_RELEASE_ENV, "pytest", "pytest"],
162162
),
163163
_cnf(),
@@ -173,14 +173,14 @@ def __str__(self):
173173
(
174174
_answers([2, "pytest", ""]),
175175
_exp(
176-
"choose py27, current release Python and pytest with defaut deps",
176+
"choose py27, current release Python and pytest with default deps",
177177
["py27, {}".format(tox.PYTHON.CURRENT_RELEASE_ENV), "pytest", "pytest"],
178178
),
179179
_cnf(),
180180
),
181181
(
182182
_answers([3, "pytest", ""]),
183-
_exp("choose all supported version and pytest with defaut deps"),
183+
_exp("choose all supported version and pytest with default deps"),
184184
_cnf(),
185185
),
186186
(

tests/unit/test_z_cmdline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ def _alwayscopy_not_supported():
773773
alwayscopy_not_supported = _alwayscopy_not_supported()
774774

775775

776-
@pytest.mark.skipif(alwayscopy_not_supported, reason="Platform doesnt support alwayscopy")
776+
@pytest.mark.skipif(alwayscopy_not_supported, reason="Platform doesn't support alwayscopy")
777777
def test_alwayscopy(initproj, cmd):
778778
initproj(
779779
"example123",

0 commit comments

Comments
 (0)