Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/develop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,14 @@ jobs:
- name: Check automation
run: python Automation/Setup/check.py --verbosity debug

- name: Set up sources
- name: Set up workspace
run: .venv-automation/bin/automation --verbosity debug develop

- name: Run spell checker
run: |
npm install
npx cspell lint --dot .

- name: Run linter
run: .venv-automation/bin/automation --verbosity debug lint

Expand Down Expand Up @@ -67,9 +72,14 @@ jobs:
- name: Check automation
run: python Automation/Setup/check.py --verbosity debug

- name: Set up sources
- name: Set up workspace
run: .venv-automation/Scripts/automation.exe --verbosity debug develop

- name: Run spell checker
run: |
npm install
npx cspell lint --dot .

- name: Run linter
run: .venv-automation/Scripts/automation.exe --verbosity debug lint

Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@ jobs:
- name: Check automation
run: python Automation/Setup/check.py --verbosity debug

- name: Set up sources
run: .venv-automation/bin/automation --verbosity debug develop
- name: Set up workspace
run: .venv-automation/Scripts/automation.exe --verbosity debug develop

- name: Run spell checker
run: |
npm install
npx cspell lint --dot .

- name: Run linter
run: .venv-automation/bin/automation --verbosity debug lint
Expand Down Expand Up @@ -67,9 +72,14 @@ jobs:
- name: Check automation
run: python Automation/Setup/check.py --verbosity debug

- name: Set up sources
- name: Set up workspace
run: .venv-automation/Scripts/automation.exe --verbosity debug develop

- name: Run spell checker
run: |
npm install
npx cspell lint --dot .

- name: Run linter
run: .venv-automation/Scripts/automation.exe --verbosity debug lint

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
# Logs
*.log

# NodeJS
node_modules/

# Python
__pycache__/
*.egg-info/
Expand Down
5 changes: 3 additions & 2 deletions .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[settings]
line_length = 160
src_paths = Automation/*, Sources/*, Tests/*
force_single_line = True
single_line_exclusions = typing
src_paths = Automation/*, Sources/*, Tests/*
line_length = 160
lines_after_imports = 2
3 changes: 0 additions & 3 deletions .vscode/schema.json

This file was deleted.

39 changes: 28 additions & 11 deletions .vscode/settings_default.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,40 @@
{
"$schema": "./schema.json",
// cspell:words pylint pytest venv

"$schema": "vscode://schemas/settings/user",

"files.associations": {
"**/templates/**/*.html": "jinja-html",
},

"isort.args": [ "--settings-file", ".isort.cfg" ],

// For sources
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/scripts/python",
"python.analysis.typeCheckingMode": "basic",
"python.analysis.extraPaths": [ "./Sources/website/" ],
//// "python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",
"pylint.interpreter": [ "${workspaceFolder}/.venv/bin/python" ],

"python.analysis.extraPaths": [ "Sources/website", "Tests/website" ],
"python.analysis.typeCheckingMode": "standard",
"python.analysis.aiCodeActions": {
"convertFormatString": false,
"generateSymbol": false,
"implementAbstractClasses": false,
},

"python.testing.pytestEnabled": true,
"python.testing.pytestArgs": [ "-c", "${workspaceFolder}/pytest.ini", "Tests" ],
"python.testing.pytestArgs": [ "Tests" ],

// // For automation
// "python.defaultInterpreterPath": "${workspaceFolder}/.venv-automation/scripts/python",
// "python.analysis.typeCheckingMode": "basic",
// "python.analysis.extraPaths": [ "./Automation/Scripts" ],
// //// "python.defaultInterpreterPath": "${workspaceFolder}/.venv-automation/bin/python",
// "pylint.interpreter": [ "${workspaceFolder}/.venv/bin/python" ],

// "python.analysis.extraPaths": [ "Automation/Scripts" ],
// "python.analysis.typeCheckingMode": "standard",
// "python.analysis.aiCodeActions": {
// "convertFormatString": false,
// "generateSymbol": false,
// "implementAbstractClasses": false,
// },

// "python.testing.pytestEnabled": true,
// "python.testing.pytestArgs": [ "-c", "${workspaceFolder}/pytest.ini", "Automation" ],
// "python.testing.pytestArgs": [ "Automation" ],

}
2 changes: 1 addition & 1 deletion Automation/Scripts/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ classifiers = [

dependencies = [
"bhamon-development-toolkit[python] ~= 3.1.0",
"mockito ~= 1.5.4",
"mockito ~= 1.5.5",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion Deployment/dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# cspell:words gunicorn venv
# cspell:words gunicorn multiproc venv

FROM debian:12

Expand Down
10 changes: 5 additions & 5 deletions Sources/website/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ classifiers = [

dependencies = [
"benjaminhamon-standard-extensions ~= 1.0.1",
"Flask ~= 3.1.1",
"Flask ~= 3.1.3",
"prometheus-flask-exporter ~= 0.23.2",
]

[project.optional-dependencies]
dev = [
"mockito ~= 1.5.4",
"pylint ~= 3.3.8",
"pytest ~= 8.4.1",
"pytest-asyncio ~= 1.1.0",
"mockito ~= 1.5.5",
"pylint ~= 3.3.9",
"pytest ~= 8.4.2",
"pytest-asyncio ~= 1.3.0",
"pytest-json ~= 0.4.0",
"requests ~= 2.32.5",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import pytest_asyncio
import requests

from .website_runner import WebsiteRunner
from benjaminhamon_developer_website_tests.website_runner import WebsiteRunner


@pytest_asyncio.fixture(name = "website", scope = "module", loop_scope = "module")
Expand Down
18 changes: 13 additions & 5 deletions cspell.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
# cspell:words pycache pytest venv

---

# cspell:words pycache venv
import:
- "@cspell/dict-fr-fr/cspell-ext.json"

files:
- "**"
- "**/.*/**"

ignorePaths:
- ".git/**"
- ".venv-automation/**"
- ".venv/**"
- "**/__pycache__/**"
- "**/.pytest_cache/**"
- "**/*.egg-info/**"
- "Artifacts/**"
- "Sources/*/build/**"

language: en

words:
- benjaminhamon
- bhamon
- gunicorn
- hamon

enableFiletypes:
- jinja-html
- toml
Loading
Loading