Skip to content

Commit cb5048f

Browse files
authored
Make test_apply_pyprojecttoml more deterministic (pypa#4318)
... with new version of `ini2toml`
2 parents 42d1b3c + fb6dc4d commit cb5048f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ testing =
6262
jaraco.path>=3.2.0
6363
build[virtualenv]>=1.0.3
6464
filelock>=3.4.0
65-
ini2toml[lite]>=0.9
65+
ini2toml[lite]>=0.14
6666
tomli-w>=1.0.0
6767
pytest-timeout
6868
pytest-perf; \

setuptools/tests/config/test_apply_pyprojecttoml.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from zipfile import ZipFile
1515

1616
import pytest
17-
from ini2toml.api import Translator
17+
from ini2toml.api import LiteTranslator
1818

1919
from packaging.metadata import Metadata
2020

@@ -37,7 +37,6 @@ def makedist(path, **attrs):
3737
return Distribution({"src_root": path, **attrs})
3838

3939

40-
@pytest.mark.xfail(reason="#4315")
4140
@pytest.mark.parametrize("url", urls_from_file(HERE / EXAMPLES_FILE))
4241
@pytest.mark.filterwarnings("ignore")
4342
@pytest.mark.uses_network
@@ -46,7 +45,7 @@ def test_apply_pyproject_equivalent_to_setupcfg(url, monkeypatch, tmp_path):
4645
setupcfg_example = retrieve_file(url)
4746
pyproject_example = Path(tmp_path, "pyproject.toml")
4847
setupcfg_text = setupcfg_example.read_text(encoding="utf-8")
49-
toml_config = Translator().translate(setupcfg_text, "setup.cfg")
48+
toml_config = LiteTranslator().translate(setupcfg_text, "setup.cfg")
5049
pyproject_example.write_text(toml_config, encoding="utf-8")
5150

5251
dist_toml = pyprojecttoml.apply_configuration(makedist(tmp_path), pyproject_example)

0 commit comments

Comments
 (0)