diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index d7005ef..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "Default Linux Universal", - "image": "mcr.microsoft.com/devcontainers/python:0-3.11-bullseye", - "features": { - "ghcr.io/devcontainers-contrib/features/poetry:2": {} - }, - "postCreateCommand": "poetry config virtualenvs.in-project true && poetry install && poetry run pre-commit install", - "customizations": { - "vscode": { - "settings": { - "python.envFile": "", - "python.analysis.diagnosticMode": "workspace", - "ruff.organizeImports": false, - "[python]": { - "editor.defaultFormatter": "ms-python.black-formatter", - "editor.codeActionsOnSave": { - "source.fixAll.ruff": true, - "source.organizeImports": true - } - }, - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[javascriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "files.exclude": { - "**/__pycache__": true - }, - "files.watcherExclude": { - "**/target/**": true, - "**/__pycache__": true - } - }, - "extensions": [ - "ms-python.python", - "ms-python.vscode-pylance", - "ms-python.isort", - "ms-python.black-formatter", - "charliermarsh.ruff", - "EditorConfig.EditorConfig", - "esbenp.prettier-vscode" - ] - } - } -} diff --git a/.github/workflows/pyright.yml b/.github/workflows/pyright.yml index 1e47a8c..6157cd6 100644 --- a/.github/workflows/pyright.yml +++ b/.github/workflows/pyright.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Python environment uses: ./.github/actions/setup-python - - run: echo "$(poetry env info --path)/bin" >> $GITHUB_PATH + - run: echo "$PWD/.venv/bin" >> $GITHUB_PATH - name: Run Pyright uses: jakebailey/pyright-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2b7d90..68b32ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: - name: Get Version id: version run: | - echo "VERSION=$(poetry version -s)" >> $GITHUB_OUTPUT + echo "VERSION=$(pdm show --version)" >> $GITHUB_OUTPUT echo "TAG=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT - name: Check Version @@ -81,7 +81,7 @@ jobs: run: | REPO=starheart/${{ github.event.repository.name }} echo "IMAGE=${REPO,,}" >> $GITHUB_OUTPUT - echo "SCOPE=${{ hashFiles('**/poetry.lock') }}-${{ matrix.platform }}" >> $GITHUB_OUTPUT + echo "SCOPE=${{ hashFiles('**/pdm.lock') }}-${{ matrix.platform }}" >> $GITHUB_OUTPUT PLATFORM="${{ matrix.platform }}" echo "ARTIFACT=${PLATFORM/\//-}-digests" >> $GITHUB_OUTPUT