diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e4aae03a..6c7bdaa8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -25,32 +25,13 @@ "vscode": { // Add the IDs of extensions you want installed when the container is created. "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance", - "charliermarsh.ruff", "ms-azuretools.vscode-docker", "ms-azuretools.vscode-bicep", "esbenp.prettier-vscode", - "ms-python.black-formatter", - "ms-python.pylint", "ms-dotnettools.csdevkit", "cweijan.vscode-postgresql-client2", "EditorConfig.EditorConfig" - ], - // Set *default* container specific settings.json values on container create. - "settings": { - "python.defaultInterpreterPath": "/usr/local/python/current/bin/python", - "python.linting.enabled": true, - "python.testing.unittestEnabled": false, - "python.testing.pytestEnabled": true, - "[python]": { - "editor.formatOnSave": true, - "editor.codeActionsOnSave": { - "source.fixAll": "always" - } - }, - "python.formatting.provider": "black" - } + ] } }, diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index ea1d4826..e27e5426 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -7,9 +7,6 @@ services: network_mode: service:db command: sleep infinity environment: - # Connection string for Postgres in the proxy app - POSTGRES_CONNECTION_STRING: postgresql://admin:mypassword123@db:5432/aoai-proxy - POSTGRES_ENCRYPTION_KEY: myencryptionkey123 # Connection string for Postgres in the management app ConnectionStrings__AoaiProxyContext: Host=db:5432;Username=admin;Password=mypassword123;Database=aoai-proxy PostgresEncryptionKey: myencryptionkey123 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e90ce47..0ee24b42 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,15 +1,7 @@ repos: -- repo: https://github.com/pre-commit/pre-commit-hooks + - repo: https://github.com/pre-commit/pre-commit-hooks rev: v2.3.0 hooks: - - id: check-yaml - - id: end-of-file-fixer - - id: trailing-whitespace -- repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.237 - hooks: - - id: ruff -- repo: https://github.com/psf/black - rev: 22.12.0 - hooks: - - id: black + - id: check-yaml + - id: end-of-file-fixer + - id: trailing-whitespace diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index bc64ae4a..00000000 --- a/pyproject.toml +++ /dev/null @@ -1,21 +0,0 @@ -[tool.black] -line-length = 100 -target-version = ["py311"] -src = ["src/proxy/"] - -[tool.ruff] -line-length = 100 -target-version = "py311" -select = ["E", "F", "I", "UP"] - -[tool.pytest.ini_options] -addopts = "-ra --cov=src" -testpaths = [ - "src/proxy/", - "src/gunicorn_test.py" -] -pythonpath = ["src/proxy/"] - -[tool.coverage.report] -show_missing = true -fail_under = 100 diff --git a/requirements-dev.txt b/requirements-dev.txt index 5fab21b4..416634f5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1 @@ --r src/proxy/requirements.txt -fastapi[all] -black -ruff -pytest -coverage -pytest-cov pre-commit