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.

Sign up for GitHub

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

Jump to bottom

Don't run python 2.7 virtualenv tests for newer versions of virtualenv #702

Merged
merged 7 commits into from
Apr 22, 2023
Merged

Don't run python 2.7 virtualenv tests for newer versions of virtualenv #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8684e7e
Don't run python 2.7 virtualenv tests for newer versions of virtualenv
crwilcox Apr 22, 2023
4b66853
add python3 variety of 2.7 test so skipping doesn't result in coverag…
crwilcox Apr 22, 2023
f57ac7d
coverage
crwilcox Apr 22, 2023
cf69d12
exercise inner functions to ensure coverage
crwilcox Apr 22, 2023
9ed7b13
don't require 3.10
crwilcox Apr 22, 2023
4b37d1f
fix lint, remove Unused type: ignore[no-any-return, no-untyped-call] …
crwilcox Apr 22, 2023
7068067
windows doesn't test pyvenv cfg
crwilcox Apr 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion nox/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class InvalidVersionSpecifier(Exception):

def get_nox_version() -> str:
"""Return the version of the installed Nox package."""
return metadata.version("nox") # type: ignore[no-untyped-call, no-any-return]
return metadata.version("nox")


def _parse_string_constant(node: ast.AST) -> str | None: # pragma: no cover
Expand Down
30 changes: 30 additions & 0 deletions tests/test_virtualenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,15 @@
from unittest import mock

import pytest
import virtualenv
from packaging import version

import nox.virtualenv

IS_WINDOWS = nox.virtualenv._SYSTEM == "Windows"
HAS_CONDA = shutil.which("conda") is not None
RAISE_ERROR = "RAISE_ERROR"
VIRTUALENV_VERSION = virtualenv.version.version
Copy link

@stefanor stefanor May 8, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's only available in recent versions of virtualenv, using hatch-vcs.

A quick dig didn't show me exactly what made it change, but in older versions, the path was: virtualenv.__version__ (which is still available today)



class TextProcessResult(NamedTuple):
Expand Down Expand Up @@ -472,6 +475,33 @@ def test_create_reuse_oldstyle_virtualenv_environment(make_one):


@enable_staleness_check
@pytest.mark.skipif(IS_WINDOWS, reason="Avoid 'No pyvenv.cfg file' error on Windows.")
def test_inner_functions_reusing_venv(make_one):
venv, location = make_one(reuse_existing=True)
venv.create()

# Drop a venv-style pyvenv.cfg into the environment.
pyvenv_cfg = """\
home = /usr/bin
include-system-site-packages = false
version = 3.10
base-prefix = foo
"""
location.join("pyvenv.cfg").write(dedent(pyvenv_cfg))

base_prefix = venv._read_base_prefix_from_pyvenv_cfg()
assert base_prefix == "foo"

reused_interpreter = venv._check_reused_environment_interpreter()
# The created won't match 'foo'
assert not reused_interpreter


@enable_staleness_check
@pytest.mark.skipif(
version.parse(VIRTUALENV_VERSION) >= version.parse("20.22.0"),
reason="Python 2.7 unsupported for virtualenv>=20.22.0",
)
def test_create_reuse_python2_environment(make_one):
venv, location = make_one(reuse_existing=True, interpreter="2.7")

Expand Down