Skip to content

Commit

Permalink
Fix typos (#2253)
Browse files Browse the repository at this point in the history
Co-authored-by: Jürgen Gmach <juergen.gmach@googlemail.com>
  • Loading branch information
kianmeng and jugmac00 committed Dec 3, 2021
1 parent 4cf816c commit 717b764
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Jürgen Gmach
Jurko Gospodnetić
Karthikeyan Singaravelan
Krisztian Fekete
Kian-Meng Ang
Laszlo Vasko
Lukasz Balcerzak
Lukasz Rogalski
Expand Down
2 changes: 1 addition & 1 deletion docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,7 @@ v2.8.0 (2017-09-01)
- `pull request 585 <https://github.com/tox-dev/tox/pull/585>`_: Expand documentation to explain pass through of flags from deps to pip
(e.g. ``-rrequirements.txt``, ``-cconstraints.txt``). Thanks Alexander Loechel (`@loechel <https://github.com/loechel>`_).

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

v2.7.0 (2017-04-02)
-------------------
Expand Down
8 changes: 4 additions & 4 deletions docs/drafts/extend-envs-and-packagebuilds.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ package_formats= # new option to specify wanted package formats for t
commands = py.test
```

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

```
(sdist) py27
Expand Down Expand Up @@ -152,17 +152,17 @@ Output of `tox --list`:
```


### Implemenation Details
### Implementation Details

```
tox_package_formats() -> ['conda'] # ['sdist', 'wheel']
tox_testenv_create(env_meta, package_type) -> # creates an environment for given package, using
# information from env_meta (like .envdir)
# returns: an "env" object which is forwaded to the next hooks
# returns: an "env" object which is forwarded to the next hooks
tox_testenv_install(env_meta, package_type, env) -> # installs deps and package into environment
tox_testenv_runtest(env_meta, package_type, env) -> # activates environment and runs test commands
tox_testenv_updated(env_meta, package_type) -> # returns True if hte environment is already up to date
tox_testenv_updated(env_meta, package_type) -> # returns True if the environment is already up to date
# otherwise, tox will remove the environment completely and
# create a new one
```
2 changes: 1 addition & 1 deletion docs/example/basic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ This variable can be also set in ``tox.ini``:
setenv =
PIP_INDEX_URL = https://pypi.my-alternative-index.org
Alternatively, a configuration where ``PIP_INDEX_URL`` could be overriden from environment:
Alternatively, a configuration where ``PIP_INDEX_URL`` could be overridden from environment:

.. code-block:: ini
Expand Down
2 changes: 1 addition & 1 deletion src/tox/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1751,7 +1751,7 @@ def getargv(self, name, default="", replace=True):
def getargv_install_command(self, name, default="", replace=True):
s = self.getstring(name, default, replace=False)
if not s:
# This occurs when factors are used, and a testenv doesnt have
# This occurs when factors are used, and a testenv doesn't have
# a factorised value for install_command, most commonly occurring
# if setting platform is also used.
# An empty value causes error install_command must contain '{packages}'.
Expand Down
2 changes: 1 addition & 1 deletion src/tox/logs/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def set_installed(self, packages):

def set_header(self, installpkg):
"""
:param py.path.local installpkg: Path ot the package.
:param py.path.local installpkg: Path to the package.
"""
self.dict["installpkg"] = {
"sha256": installpkg.computehash("sha256"),
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/test_quickstart.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def __str__(self):
(
_answers([1, "pytest", ""]),
_exp(
"choose current release Python and pytest with defaut deps",
"choose current release Python and pytest with default deps",
[tox.PYTHON.CURRENT_RELEASE_ENV, "pytest", "pytest"],
),
_cnf(),
Expand All @@ -173,14 +173,14 @@ def __str__(self):
(
_answers([2, "pytest", ""]),
_exp(
"choose py27, current release Python and pytest with defaut deps",
"choose py27, current release Python and pytest with default deps",
["py27, {}".format(tox.PYTHON.CURRENT_RELEASE_ENV), "pytest", "pytest"],
),
_cnf(),
),
(
_answers([3, "pytest", ""]),
_exp("choose all supported version and pytest with defaut deps"),
_exp("choose all supported version and pytest with default deps"),
_cnf(),
),
(
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_z_cmdline.py
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ def _alwayscopy_not_supported():
alwayscopy_not_supported = _alwayscopy_not_supported()


@pytest.mark.skipif(alwayscopy_not_supported, reason="Platform doesnt support alwayscopy")
@pytest.mark.skipif(alwayscopy_not_supported, reason="Platform doesn't support alwayscopy")
def test_alwayscopy(initproj, cmd):
initproj(
"example123",
Expand Down

0 comments on commit 717b764

Please sign in to comment.