Skip to content

Commit 7eb0988

Browse files
authored
Merge branch 'master' into optimise
2 parents 4dacca5 + d1a9486 commit 7eb0988

34 files changed

+225
-102
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ ARG VARIANT=3.13-bookworm
33
FROM mcr.microsoft.com/vscode/devcontainers/python:${VARIANT}
44
COPY requirements.txt /tmp/pip-tmp/
55
RUN python3 -m pip install --upgrade pip \
6-
&& python3 -m pip install --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
7-
&& pipx install pre-commit ruff \
8-
&& pre-commit install
6+
&& python3 -m pip install --no-cache-dir -r /tmp/pip-tmp/requirements.txt \
7+
&& pipx install pre-commit ruff

.devcontainer/README.md

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,42 @@
1-
https://code.visualstudio.com/docs/devcontainers/tutorial
1+
# Development Container
2+
3+
This is **Devcontainer** configuration to provide a consistent development environment for all contributors.
4+
5+
## Features
6+
7+
- [x] Pre-configured **Python environment**
8+
- [x] Automatic installation of **pre-commit hooks**
9+
- [x] **Ruff** linter ready to check your code
10+
- [x] **Oh My Zsh** with plugins:
11+
- `zsh-autosuggestions`
12+
- `zsh-syntax-highlighting`
13+
14+
## Usage
15+
16+
1. Install [**Docker** ](https://www.docker.com/get-started/) and [**Visual Studio Code**](https://code.visualstudio.com/)
17+
2. Install the **Remote - Containers** extension in VS Code
18+
19+
- Do `CTRL+P`, paste this command and press `Enter`
20+
21+
```shell
22+
ext install ms-vscode-remote.remote-containers
23+
```
24+
3. Open this repository in VS Code
25+
4. When prompted, click **"Reopen in Container"**
26+
5. Wait for the environment to build and initialize
27+
28+
After setup:
29+
30+
- `pre-commit` hooks are installed
31+
- `ruff` and other tools are available
32+
- The shell uses Zsh by default
33+
34+
## Tips
35+
36+
To manually run checks on all files:
37+
38+
```bash
39+
pre-commit run --all-files
40+
```
41+
42+
> For further information here's [Microsoft tutorial about devcontainers.](https://code.visualstudio.com/docs/devcontainers/tutorial)

.devcontainer/devcontainer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
// Update 'VARIANT' to pick a Python version: 3, 3.11, 3.10, 3.9, 3.8
88
// Append -bullseye or -buster to pin to an OS version.
99
// Use -bullseye variants on local on arm64/Apple Silicon.
10-
"VARIANT": "3.13-bookworm",
10+
"VARIANT": "3.13-bookworm"
1111
}
1212
},
1313

14+
"postCreateCommand": "zsh .devcontainer/post_install",
15+
1416
// Configure tool-specific properties.
1517
"customizations": {
1618
// Configure properties specific to VS Code.
@@ -20,7 +22,8 @@
2022
"python.defaultInterpreterPath": "/usr/local/bin/python",
2123
"python.linting.enabled": true,
2224
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
23-
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy"
25+
"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
26+
"terminal.integrated.defaultProfile.linux": "zsh"
2427
},
2528

2629
// Add the IDs of extensions you want installed when the container is created.

.devcontainer/post_install

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/usr/bin/env bash
2+
3+
echo "Begin post-installation steps..."
4+
5+
set -e
6+
7+
echo "Installing pre-commit hooks..."
8+
pre-commit install
9+
10+
echo "Installing Oh My Zsh plugins..."
11+
12+
# Install zsh-autosuggestions if not present
13+
if [ ! -d "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions" ]; then
14+
echo "Cloning zsh-autosuggestions..."
15+
git clone https://github.com/zsh-users/zsh-autosuggestions \
16+
"${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-autosuggestions"
17+
fi
18+
19+
# Install zsh-syntax-highlighting if not present
20+
if [ ! -d "${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting" ]; then
21+
echo "Cloning zsh-syntax-highlighting..."
22+
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git \
23+
"${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting"
24+
fi
25+
26+
echo "Configuring plugins in ~/.zshrc..."
27+
sed -i '/^plugins=/c\plugins=(git zsh-autosuggestions zsh-syntax-highlighting)' ~/.zshrc
28+
29+
echo "Post-installation steps completed successfully. Enjoy!"

.github/workflows/devcontainer_ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Test DevContainer Build
2+
3+
on:
4+
push:
5+
paths:
6+
- ".devcontainer/**"
7+
pull_request:
8+
paths:
9+
- ".devcontainer/**"
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: devcontainers/[email protected]
17+
with:
18+
push: never
19+
runCmd: "true"

.pre-commit-config.yaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ repos:
1616
- id: auto-walrus
1717

1818
- repo: https://github.com/astral-sh/ruff-pre-commit
19-
rev: v0.11.11
19+
rev: v0.12.3
2020
hooks:
21-
- id: ruff
21+
- id: ruff-check
2222
- id: ruff-format
2323

2424
- repo: https://github.com/codespell-project/codespell
@@ -29,7 +29,7 @@ repos:
2929
- tomli
3030

3131
- repo: https://github.com/tox-dev/pyproject-fmt
32-
rev: "v2.6.0"
32+
rev: v2.6.0
3333
hooks:
3434
- id: pyproject-fmt
3535

@@ -53,12 +53,11 @@ repos:
5353
args:
5454
- --explicit-package-bases
5555
- --ignore-missing-imports
56-
- --install-types # See mirrors-mypy README.md
56+
- --install-types
5757
- --non-interactive
58-
additional_dependencies: [types-requests]
5958

6059
- repo: https://github.com/pre-commit/mirrors-prettier
61-
rev: "v4.0.0-alpha.8"
60+
rev: v4.0.0-alpha.8
6261
hooks:
6362
- id: prettier
6463
types_or: [toml, yaml]

DIRECTORY.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,7 @@
443443
* [Present Value](financial/present_value.py)
444444
* [Price Plus Tax](financial/price_plus_tax.py)
445445
* [Simple Moving Average](financial/simple_moving_average.py)
446+
* [Straight Line Depreciation](financial/straight_line_depreciation.py)
446447
* [Time And Half Pay](financial/time_and_half_pay.py)
447448

448449
## Fractals
@@ -790,6 +791,7 @@
790791
* [Sumset](maths/sumset.py)
791792
* [Sylvester Sequence](maths/sylvester_sequence.py)
792793
* [Tanh](maths/tanh.py)
794+
* [Test Factorial](maths/test_factorial.py)
793795
* [Test Prime Check](maths/test_prime_check.py)
794796
* [Three Sum](maths/three_sum.py)
795797
* [Trapezoidal Rule](maths/trapezoidal_rule.py)

ciphers/hill_cipher.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ def replace_digits(self, num: int) -> str:
7878
'T'
7979
>>> hill_cipher.replace_digits(26)
8080
'0'
81+
>>> hill_cipher.replace_digits(26.1)
82+
'0'
8183
"""
82-
return self.key_string[round(num)]
84+
return self.key_string[int(num)]
8385

8486
def check_determinant(self) -> None:
8587
"""

data_structures/binary_tree/non_recursive_segment_tree.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
from __future__ import annotations
4040

4141
from collections.abc import Callable
42-
from typing import Any, Generic, TypeVar
42+
from typing import Any, TypeVar
4343

4444
T = TypeVar("T")
4545

4646

47-
class SegmentTree(Generic[T]):
47+
class SegmentTree[T]:
4848
def __init__(self, arr: list[T], fnc: Callable[[T, T], T]) -> None:
4949
"""
5050
Segment Tree constructor, it works just with commutative combiner.

data_structures/hashing/hash_map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
from collections.abc import Iterator, MutableMapping
1212
from dataclasses import dataclass
13-
from typing import Generic, TypeVar
13+
from typing import TypeVar
1414

1515
KEY = TypeVar("KEY")
1616
VAL = TypeVar("VAL")
1717

1818

1919
@dataclass(slots=True)
20-
class _Item(Generic[KEY, VAL]):
20+
class _Item[KEY, VAL]:
2121
key: KEY
2222
val: VAL
2323

0 commit comments

Comments
 (0)