Skip to content

Commit ecc5b35

Browse files
author
Marat
committed
Merge branch 'main' into fix-500-named-arguments
# Conflicts: # drafts/40-define-functions/500-named-arguments/description.en.yml
2 parents bfe125a + 901a8b0 commit ecc5b35

File tree

362 files changed

+1619
-5121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

362 files changed

+1619
-5121
lines changed

.github/workflows/Docker.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ jobs:
1717
with:
1818
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
1919
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
20-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.markdownlint.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"MD013": false,
3+
"MD033": false,
4+
"MD041": false,
5+
"MD040": false
6+
}

Dockerfile

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
FROM hexletbasics/base-image
22

3-
RUN apt update && apt install -y python3-venv python3-pytest python3-pip
3+
# Install pipx using apt to avoid externally-managed Python issues
4+
RUN apt-get update && apt-get install -y pipx \
5+
&& pipx ensurepath \
6+
&& apt-get clean \
7+
&& rm -rf /var/lib/apt/lists/*
48

5-
RUN pip3 install --break-system-package flake8
9+
# Update PATH
10+
ENV PATH="/root/.local/bin:${PATH}"
11+
ENV PATH="/exercises-python/bin:${PATH}"
612

7-
RUN python3 -m venv /exercises-python/venv
8-
RUN /exercises-python/venv/bin/pip install --upgrade pip
13+
RUN pipx install uv
14+
15+
ENV UV_PROJECT_ENVIRONMENT=/usr
916

1017
WORKDIR /exercises-python
1118

19+
COPY pyproject.toml uv.lock ./
20+
21+
RUN uv sync --locked
22+
1223
COPY . .
1324

1425
ENV PYTHONPATH=/exercises-python/src
15-
16-
ENV PATH=/exercises-python/bin:$PATH

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ compose-code-lint:
2828
docker compose run exercises make code-lint
2929

3030
code-lint:
31-
flake8 modules
31+
ruff check

drafts/10-basics/10-hello-world/description.en.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

drafts/10-basics/20-comments/description.en.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

drafts/10-basics/30-instructions/description.en.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

drafts/10-basics/40-testing/description.en.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

drafts/10-basics/50-syntax-errors/description.en.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

drafts/10-basics/description.en.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)