fix test_new_module

Author: gilesknap

src/python3_pip_skeleton/__main__.py

@@ -16,16 +16,12 @@
 # The name of the merge branch that will be created
 MERGE_BRANCH = "skeleton-merge-branch"
 # Extensions to change
-CHANGE_SUFFIXES = [".py", ".rst", ".cfg", ""]
+CHANGE_SUFFIXES = [".py", ".rst", ".cfg", "", ".toml"]
 # Files not to change
-IGNORE_FILES = ["CHANGELOG.rst", "test_boilerplate_removed.py", "_version_git.py"]
+IGNORE_FILES = ["CHANGELOG.rst", "test_boilerplate_removed.py"]
 # Ranges to ignore between
 IGNORE_RANGES = {
     "CONTRIBUTING.rst": ("\nUpdating the tools\n", None),
-    "api.rst": (
-        "Version number as calculated by",
-        "https://github.com/epics-containers/versiongit",
-    ),
 }
 SKELETON_ROOT_COMMIT = "ededf00035e6ccfac78946213009c1ecd7c110a9"
 
@@ -94,7 +90,7 @@ def replace_text(text: str) -> str:
         git_tmp("pull", SKELETON, "skeleton")
         # Move things around
         git_tmp("mv", "src/python3_pip_skeleton", f"src/{package}")
-        git_tmp("mv", "tests/test_python3_pip_skeleton.py", f"tests/test_{package}.py")
+        git_tmp("mv", "tests/test_dls_python3_skeleton.py", f"tests/test_{package}.py")
         # Change contents of all children known to git
         for relative_child in git_tmp("ls-files").splitlines():
             child = Path(git_tmp.name) / relative_child
@@ -170,7 +166,7 @@ def new(args):
         path.mkdir(parents=True)
 
     package = validate_package(args)
-    git("init", cwd=path)
+    git("init", "-b", "main", cwd=path)
     print(f"Created git repo in {path}")
     merge_skeleton(
         path=path,

tests/test_python3_pip_skeleton.py tests/test_dls_python3_skeleton.pytests/test_python3_pip_skeleton.py renamed to tests/test_dls_python3_skeleton.py

@@ -47,19 +47,29 @@ def test_new_module(tmp_path: Path):
     versiongit_lines = [
         line
         for line in (module / "docs" / "reference" / "api.rst").read_text().splitlines()
-        if "versiongit" in line
+        if "setuptools" in line
     ]
-    assert "    Version number as calculated by setuptools_scm" in versiongit_lines
+    assert (
+        "    Version number as calculated by https://github.com/pypa/setuptools_scm"
+        in versiongit_lines
+    )
     assert (module / "src" / "my_module").is_dir()
     assert check_output("git", "branch", cwd=module).strip() == "* main"
     check_output("virtualenv", ".venv", cwd=module)
     check_output(".venv/bin/pip", "install", ".[dev]", cwd=module)
-    check_output(".venv/bin/tox", "-e", "docs", cwd=module)
+    check_output(
+        ".venv/bin/sphinx-build",
+        "-EWT",
+        "--keep-going",
+        "docs",
+        "build/html",
+        cwd=module,
+    )
     with pytest.raises(ValueError) as ctx:
-        check_output(".venv/bin/pytest", "tests", cwd=module)
+        check_output(module / ".venv/bin/pytest", "tests", cwd=module)
     out = ctx.value.args[0]
     print(out)
-    assert "6 failed, 5 passed" in out
+    assert "6 failed, 4 passed" in out
     assert "Please change description in ./setup.cfg" in out
     assert "Please change ./README.rst" in out
     assert "Please change ./docs/reference/api.rst" in out