Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation fixes, spelling, etc #134

Merged
merged 2 commits into from
Sep 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Breaking changes and other important notes:
* Nox is now published as "nox" on PyPI. This means that Nox is installed via `pip install nox` instead of `nox-automation`. Since the new release makes so many breaking changes, we won't be updating the old `nox-automation` package.
* Nox's configuration file is now called `noxfile.py` instead of `nox.py`.
* Nox no longer supports Python 2.7. You can still create and run Python 2.7 sessions, but Nox itself must be installed using Python 3.5+.
* Nox's behavior has been changed from *declarative* to *imperative*. Session actions now run immediately. Existing code to setup session virtualenv, such as `session.interpreter` **will break**! Please consult the documention on how to use `@nox.session(python=[...])` to configure virtualenvs for sessions.
* Nox's behavior has been changed from *declarative* to *imperative*. Session actions now run immediately. Existing code to setup session virtualenv, such as `session.interpreter` **will break**! Please consult the documentation on how to use `@nox.session(python=[...])` to configure virtualenvs for sessions.
* Nox now uses calver for releases.
* Support for the legacy naming convention (for example, `session_tests`) has been removed.

Expand Down
2 changes: 1 addition & 1 deletion docs/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Session arguments can be parametrized with the :func:`nox.parametrize` decorator
session.install(f'django=={django}')
session.run('py.test')

When you run ``nox``, it will create a three distinct sessions::
When you run ``nox``, it will create a two distinct sessions::

$ nox
nox > Running session tests(django='1.9')
Expand Down
2 changes: 1 addition & 1 deletion nox/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def run(self, *args, env=None, **kwargs):
success_codes=[0, 5])

:param env: A dictionary of environment variables to expose to the
command. By default, all evironment variables are passed.
command. By default, all environment variables are passed.
:type env: dict or None
:param bool silent: Silence command output, unless the command fails.
``False`` by default.
Expand Down
2 changes: 1 addition & 1 deletion nox/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def load_nox_module(global_config):
"""
try:
# Save the absolute path to the Noxfile.
# This will innoculate it if nox changes paths because of an implicit
# This will inoculate it if nox changes paths because of an implicit
# or explicit chdir (like the one below).
global_config.noxfile = os.path.realpath(global_config.noxfile)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def test_create_interpreter(make_one):

def test__resolved_interpreter_none(make_one):
# Establish that the _resolved_interpreter method is a no-op if the
# interpeter is not set.
# interpreter is not set.
venv, _ = make_one(interpreter=None)
assert venv._resolved_interpreter == sys.executable

Expand Down