Skip to content

Commit ac4db2f

Browse files
committed
Make tests work with the current version of setuptools
Previously was failing because of multiple top-level packages.
1 parent d5cddef commit ac4db2f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

dowsing/setuptools/setup_and_metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
ConfigField(
176176
"packages",
177177
SetupCfg("options", "packages", writer_cls=ListCommaWriter),
178-
sample_value=["a", "b"],
178+
sample_value=["a"],
179179
),
180180
ConfigField(
181181
"package_dir",

dowsing/tests/setuptools_metadata.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ def egg_info(files: Dict[str, str]) -> Tuple[Message, Distribution]:
3131

3232
os.chdir(d)
3333
sys.stdout = io.StringIO()
34-
dist = run_setup(f"setup.py", ["egg_info"])
34+
dist = run_setup("setup.py", ["egg_info"])
3535
finally:
3636
os.chdir(cwd)
3737
sys.stdout = stdout
3838

3939
sources = list(Path(d).rglob("PKG-INFO"))
40-
assert len(sources) == 1
40+
assert len(sources) == 1, sources
4141

4242
with open(sources[0]) as f:
4343
parser = email.parser.Parser()
@@ -63,7 +63,6 @@ def test_arg_mapping(self) -> None:
6363
"setup.py": "from setuptools import setup\n"
6464
f"setup({field.keyword}={foo!r})\n",
6565
"a/__init__.py": "",
66-
"b/__init__.py": "",
6766
}
6867
)
6968

@@ -74,7 +73,6 @@ def test_arg_mapping(self) -> None:
7473
f"{field.cfg.key} = {cfg_format_foo}\n",
7574
"setup.py": "from setuptools import setup\n" "setup()\n",
7675
"a/__init__.py": "",
77-
"b/__init__.py": "",
7876
}
7977
)
8078

0 commit comments

Comments
 (0)