Skip to content

Commit

Permalink
Merge branch 'fix-py312-virtualenv' into core_metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
abravalheri committed May 3, 2023
2 parents 8e9c330 + 3f17282 commit a4cc066
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions changelog.d/3915.misc.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adequate tests to the latest changes in ``virtualenv`` for Python 3.12.
2 changes: 1 addition & 1 deletion docs/userguide/ext_modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ To instruct setuptools to compile the ``foo.c`` file into the extension module
.. seealso::
You can find more information on the `Python docs about C/C++ extensions`_.
Alternatively, you might also be interested in learn about `Cython`_.
Alternatively, you might also be interested in learning about `Cython`_.

If you plan to distribute a package that uses extensions across multiple
platforms, :pypi:`cibuildwheel` can also be helpful.
Expand Down
4 changes: 3 additions & 1 deletion setuptools/tests/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ def venv(tmp_path, setuptools_wheel):
"""Virtual env with the version of setuptools under test installed"""
env = environment.VirtualEnv()
env.root = path.Path(tmp_path / 'venv')
env.create_opts = ['--no-setuptools', '--wheel=bundle']
# TODO: Use `--no-wheel` when setuptools implements its own bdist_wheel
env.req = str(setuptools_wheel)
# In some environments (eg. downstream distro packaging),
# where tox isn't used to run tests and PYTHONPATH is set to point to
Expand All @@ -125,7 +127,7 @@ def venv_without_setuptools(tmp_path):
"""Virtual env without any version of setuptools installed"""
env = environment.VirtualEnv()
env.root = path.Path(tmp_path / 'venv_without_setuptools')
env.create_opts = ['--no-setuptools']
env.create_opts = ['--no-setuptools', '--no-wheel']
env.ensure_env()
return env

Expand Down
4 changes: 2 additions & 2 deletions setuptools/tests/test_virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ def sdist(distname, version):


def test_test_command_install_requirements(venv, tmpdir, tmpdir_cwd):
# Ensure pip/wheel packages are installed.
venv.run(["python", "-c", "__import__('pkg_resources').require(['pip', 'wheel'])"])
# Ensure pip is installed.
venv.run(["python", "-c", "import pip"])
# disable index URL so bits and bobs aren't requested from PyPI
with contexts.environment(PYTHONPATH=None, PIP_NO_INDEX="1"):
_check_test_command_install_requirements(venv, tmpdir)
Expand Down
4 changes: 2 additions & 2 deletions setuptools/version.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from ._importlib import metadata

try:
__version__ = metadata.version('setuptools')
__version__ = metadata.version('setuptools') or '0.dev0+unknown'
except Exception:
__version__ = 'unknown'
__version__ = '0.dev0+unknown'

0 comments on commit a4cc066

Please sign in to comment.