Fixes to dev container and tests (but some test cases fail, e.g. running test_template_mypy

Author: OCopping

__init__.py

@@ -32,8 +32,8 @@ RUN touch dev-requirements.txt && uv pip install -c dev-requirements.txt .
 # The runtime stage copies the built venv into a slim runtime container
 FROM python:${PYTHON_VERSION}-slim AS runtime
 # Add apt-get system dependecies for runtime here if needed
-COPY --from=build /venv/ /venv/
-ENV VIRTUAL_ENV=/venv
+COPY --from=build /venv/ .venv/
+ENV VIRTUAL_ENV=./.venv
 ENV PATH=$VIRTUAL_ENV/bin:$PATH
 
 # change this entrypoint if it is not the same as the repo

template/Dockerfile.jinja

@@ -49,6 +49,8 @@ GitHub = "{{ repo_url }}"
 email = "{{ author_email }}"
 name = "{{ author_name }}"
 
+[tool.uv]
+default-groups = []
 
 [tool.setuptools_scm]
 version_file = "src/{{ package_name }}/_version.py"
@@ -61,6 +63,8 @@ typeCheckingMode = "standard"
 {% endif %}{% if type_checker=="mypy" %}
 [tool.mypy]
 ignore_missing_imports = true # Ignore missing stubs in imported modules
+explicit_package_bases = true
+#no_namespace_packages = true
 {% endif %}
 [tool.pytest.ini_options]
 # Run pytest with all our checkers, and don't spam us with massive tracebacks on error

template/pyproject.toml.jinja

@@ -37,10 +37,12 @@ def run_pipe(cmd: str, cwd=None):
 
 
 def make_venv(project_path: Path) -> callable:
-    venv_path = project_path / "venv"
-    run_pipe(f"python -m venv {venv_path}")
+    venv_path = project_path / ".venv"
+    run_pipe(f"uv venv {venv_path}")
     run = functools.partial(run_pipe, cwd=str(project_path))
-    run("./venv/bin/pip install -e .[dev]")
+    # install to this env (hence the -p)
+    run(f"uv pip install -e .[dev] -p {venv_path}/bin/python")
+    # run("ls -la .venv/bin >&2")
     return run
 
 
@@ -53,14 +55,14 @@ def test_template_defaults(tmp_path: Path):
     catalog_info = tmp_path / "catalog-info.yaml"
     assert catalog_info.exists()
     assert 'typeCheckingMode = "strict"' in pyproject_toml.read_text()
-    run("./venv/bin/tox -p")
+    run(".venv/bin/tox -p")
     if not run_pipe("git tag --points-at HEAD"):
         # Only run linkcheck if not on a tag, as the CI might not have pushed
         # the docs for this tag yet, so we will fail
-        run("./venv/bin/tox -e docs build -- -b linkcheck")
-    run("./venv/bin/pip install build twine")
-    run("./venv/bin/python -m build")
-    run("./venv/bin/twine check --strict dist/*")
+        run(".venv/bin/tox -p -e docs -- -b linkcheck")
+    run(".venv/bin/uv pip install build twine")
+    run(".venv/bin/python -m build")
+    run(".venv/bin/twine check --strict dist/*")
 
 
 def test_template_with_extra_code_and_api_docs(tmp_path: Path):
@@ -100,7 +102,7 @@ class Thing:
     # Add to make sure pre-commit doesn't moan
     run("git add .")
     # Build
-    run("./venv/bin/tox -p")
+    run(".venv/bin/tox -p")
     # Check it generates the right output
     api_dir = tmp_path / "build" / "html" / "_api"
     top_html = api_dir / "python_copier_template_example.html"
@@ -121,13 +123,13 @@ class Thing:
 def test_template_mypy(tmp_path: Path):
     copy_project(tmp_path, type_checker="mypy")
     run = make_venv(tmp_path)
-    run("./venv/bin/tox -p")
+    run(".venv/bin/tox -p")
 
 
 def test_template_no_docs(tmp_path: Path):
     copy_project(tmp_path, docs_type="README")
     run = make_venv(tmp_path)
-    run("./venv/bin/tox -p")
+    run(".venv/bin/tox -p")
 
 
 def test_template_in_different_org_has_no_catalog(tmp_path: Path):
@@ -141,7 +143,7 @@ def test_template_no_docker_has_no_docs_and_works(tmp_path: Path):
     container_doc = tmp_path / "docs" / "how-to" / "run-container.md"
     assert not container_doc.exists()
     run = make_venv(tmp_path)
-    run("./venv/bin/tox -p")
+    run(".venv/bin/tox -p")
 
 
 def test_bad_repo_name(tmp_path: Path):
@@ -232,7 +234,7 @@ def test_pyright_works_in_standard_typing_mode(tmp_path: Path):
 
     # Ensure pyright is still happy
     run = make_venv(tmp_path)
-    run(f"./venv/bin/pyright {tmp_path}")
+    run(f".venv/bin/pyright {tmp_path}")
 
 
 def test_ignores_mypy_strict_mode(tmp_path: Path):