Skip to content

Commit

Permalink
Inadvertently committed a removal of the '--check' flag for the linter.
Browse files Browse the repository at this point in the history
Also removed unnecessary whitespace lines.

Co-authored-by: Claudio Jolowicz <[email protected]>
  • Loading branch information
gwynforthewyn and cjolowicz committed Mar 31, 2021
1 parent 80b9e63 commit a9bbab8
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 8 deletions.
4 changes: 0 additions & 4 deletions nox/sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ def run_always(
do not have a virtualenv.
:type external: bool
"""

if self._runner.global_config.no_install:
logger.info("Skipping run_always, as --no-install is set.")
return None
Expand Down Expand Up @@ -360,7 +359,6 @@ def conda_install(
.. _conda install:
"""

venv = self._runner.venv

prefix_args = () # type: Tuple[str, ...]
Expand Down Expand Up @@ -432,7 +430,6 @@ def install(self, *args: str, **kwargs: Any) -> None:
.. _pip: https://pip.readthedocs.org
"""

venv = self._runner.venv

if not isinstance(
Expand Down Expand Up @@ -532,7 +529,6 @@ def envdir(self) -> str:
return _normalize_path(self.global_config.envdir, self.friendly_name)

def _create_venv(self) -> None:

backend = (
self.global_config.force_venv_backend
or self.func.venv_backend
Expand Down
1 change: 0 additions & 1 deletion nox/virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ class ProcessEnv:
def __init__(self, bin_paths: None = None, env: Mapping[str, str] = None) -> None:
self._bin_paths = bin_paths
self.env = os.environ.copy()

self._venv_created = False

if env is not None:
Expand Down
2 changes: 1 addition & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def lint(session):
"nox",
)
files = ["nox", "tests", "noxfile.py", "setup.py"]
session.run("black", *files)
session.run("black", "--check", *files)
session.run("isort", "--check", "--recursive", *files)
session.run("flake8", "nox", *files)

Expand Down
2 changes: 0 additions & 2 deletions tests/test_sessions.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ class MockableSession(nox.sessions.Session):
Inherit session, but without __slots__ defined, and do nothing else
to enable testing of Session with mocks.
"""

pass


Expand Down Expand Up @@ -584,7 +583,6 @@ def test_session_no_install(
):
caplog.set_level(logging.INFO)
session, runner = self.make_session_and_runner()

runner.global_config.no_install = no_install
runner.venv._venv_created = venv_is_created

Expand Down

0 comments on commit a9bbab8

Please sign in to comment.