diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d91bef347..455d7918d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -66,6 +66,7 @@ Jürgen Gmach Jurko Gospodnetić Karthikeyan Singaravelan Krisztian Fekete +Kian-Meng Ang Laszlo Vasko Lukasz Balcerzak Lukasz Rogalski diff --git a/docs/changelog.rst b/docs/changelog.rst index 3e16b6d1d..03a0f8454 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1476,7 +1476,7 @@ v2.8.0 (2017-09-01) - `pull request 585 `_: Expand documentation to explain pass through of flags from deps to pip (e.g. ``-rrequirements.txt``, ``-cconstraints.txt``). Thanks Alexander Loechel (`@loechel `_). -- `pull request 588 `_: Run pytest wit xfail_strict and adapt affected tests. +- `pull request 588 `_: Run pytest with xfail_strict and adapt affected tests. v2.7.0 (2017-04-02) ------------------- diff --git a/docs/drafts/extend-envs-and-packagebuilds.md b/docs/drafts/extend-envs-and-packagebuilds.md index 0fb82e201..ed8379117 100644 --- a/docs/drafts/extend-envs-and-packagebuilds.md +++ b/docs/drafts/extend-envs-and-packagebuilds.md @@ -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 @@ -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 ``` diff --git a/docs/example/basic.rst b/docs/example/basic.rst index 0734b904b..c7b15e445 100644 --- a/docs/example/basic.rst +++ b/docs/example/basic.rst @@ -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 diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index b51c86339..10acbe12a 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -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}'. diff --git a/src/tox/logs/env.py b/src/tox/logs/env.py index c941f24c0..ff8fc8e02 100644 --- a/src/tox/logs/env.py +++ b/src/tox/logs/env.py @@ -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"), diff --git a/tests/unit/test_quickstart.py b/tests/unit/test_quickstart.py index 6ac896ec1..f52378e2b 100644 --- a/tests/unit/test_quickstart.py +++ b/tests/unit/test_quickstart.py @@ -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(), @@ -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(), ), ( diff --git a/tests/unit/test_z_cmdline.py b/tests/unit/test_z_cmdline.py index 658c118a2..c0549c0ea 100644 --- a/tests/unit/test_z_cmdline.py +++ b/tests/unit/test_z_cmdline.py @@ -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",