Skip to content

Commit 5bbb867

Browse files
Revert discussed changes and remove commented out parts
1 parent 45c895a commit 5bbb867

File tree

5 files changed

+572
-779
lines changed

5 files changed

+572
-779
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ FROM python:${PYTHON_VERSION} AS developer
55

66
# Add any system dependencies for the developer/build environment here
77
RUN apt-get update && apt-get install -y --no-install-recommends \
8-
graphviz vim \
8+
graphviz \
99
&& rm -rf /var/lib/apt/lists/*
10+
1011
# Install uv using the official installer script
1112
RUN curl -LsSf https://astral.sh/uv/install.sh | \
1213
env UV_INSTALL_DIR="/usr/local/bin" sh
1314

1415
# Configure environment
1516
ENV UV_CHECK_UPDATE=false
16-
# Configure UV to use system Python
17-
# ENV UV_SYSTEM_PYTHON=1
1817

19-
# Creates virtual environment
18+
# Create virtual environment
2019
RUN uv venv --seed venv
2120
ENV VIRTUAL_ENV=/venv
2221
ENV PATH=$VIRTUAL_ENV/bin:$PATH

pyproject.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ build-backend = "setuptools.build_meta"
66
name = "python-copier-template"
77
dynamic = ["version"]
88
requires-python = ">=3.11"
9-
optional-dependencies = { dev = [
9+
10+
[project.optional-dependencies]
11+
dev = [
1012
"copier",
1113
"myst-parser",
1214
"pre-commit",
@@ -18,11 +20,7 @@ optional-dependencies = { dev = [
1820
"sphinx-design",
1921
"tox-uv",
2022
"twine>=6.1.0",
21-
] }
22-
23-
# # Without this, setuptools apparently try to scan the whole image's filesystem while working in /
24-
# [tool.setuptools.packages.find]
25-
# where = []
23+
]
2624

2725
[tool.setuptools_scm]
2826

@@ -55,14 +53,14 @@ commands = [
5553
"run",
5654
#"--all-files",
5755
"--show-diff-on-failure",
58-
"{posargs}",
56+
{ replace = "posargs", default = [], extend = true },
5957
],
6058
]
6159

6260
[tool.tox.env.tests]
6361
description = "Run tests"
6462
allowlist_externals = ["pytest"]
65-
commands = [["pytest", "{posargs}"]]
63+
commands = [["pytest", { replace = "posargs", default = [], extend = true }]]
6664

6765
[tool.tox.env.docs]
6866
description = "Run docs"

template/Dockerfile.jinja

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ FROM python:${PYTHON_VERSION} AS developer
55

66
# Add any system dependencies for the developer/build environment here
77
RUN apt-get update && apt-get install -y --no-install-recommends \
8-
graphviz vim \
8+
graphviz \
99
&& rm -rf /var/lib/apt/lists/*
10+
1011
# Install uv using the official installer script
1112
RUN curl -LsSf https://astral.sh/uv/install.sh | \
1213
env UV_INSTALL_DIR="/usr/local/bin" sh
1314

1415
# Configure environment
1516
ENV UV_CHECK_UPDATE=false
16-
# Configure UV to use system Python
17-
# ENV UV_SYSTEM_PYTHON=1
1817

19-
# Creates virtual environment
18+
# Create virtual environment
2019
RUN uv venv --seed venv
2120
ENV VIRTUAL_ENV=/venv
2221
ENV PATH=$VIRTUAL_ENV/bin:$PATH{% if docker %}

template/pyproject.toml.jinja

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ typeCheckingMode = "standard"
6363
{% endif %}{% if type_checker=="mypy" %}
6464
[tool.mypy]
6565
ignore_missing_imports = true # Ignore missing stubs in imported modules
66-
explicit_package_bases = true
67-
#no_namespace_packages = true
6866
{% endif %}
6967
[tool.pytest.ini_options]
7068
# Run pytest with all our checkers, and don't spam us with massive tracebacks on error

0 commit comments

Comments
 (0)