Skip to content

Commit

Permalink
Merge pull request #4626 from pypa/bugfix/msvc-EnvironmentInfo
Browse files Browse the repository at this point in the history
Restore msvc.EnvironmentInfo
  • Loading branch information
jaraco committed Sep 2, 2024
2 parents 5d4473e + a16582b commit 4d9a750
Show file tree
Hide file tree
Showing 3 changed files with 1,515 additions and 0 deletions.
7 changes: 7 additions & 0 deletions conftest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import platform
import sys

import pytest
Expand Down Expand Up @@ -67,3 +68,9 @@ def conditional_skip(request):
pytest.skip("running integration tests only")
if not running_integration_tests and is_integration_test:
pytest.skip("skipping integration tests")


@pytest.fixture
def windows_only():
if platform.system() != 'Windows':
pytest.skip("Windows only")
1 change: 1 addition & 0 deletions newsfragments/4625.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Restored ``setuptools.msvc.Environmentinfo`` as it is used externally.
Loading

0 comments on commit 4d9a750

Please sign in to comment.