From b6a386441e38441495a56ee4c649076ba59d8019 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 4 Apr 2026 14:59:55 +0000 Subject: [PATCH 1/3] fix: skip neon workflow when secrets are unavailable Agent-Logs-Url: https://github.com/quantumdynamics927-dotcom/QPyth/sessions/215a653e-2dbf-4ef6-a217-39cd115d2f5f Co-authored-by: quantumdynamics927-dotcom <247722560+quantumdynamics927-dotcom@users.noreply.github.com> --- .github/workflows/neon-preview-branches.yml | 23 +++++++++++++++++++-- GITHUB_ACTIONS_SETUP.md | 8 +++++++ docs/neon-preview-workflow.md | 12 +++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/.github/workflows/neon-preview-branches.yml b/.github/workflows/neon-preview-branches.yml index d542f8e..6365ccb 100644 --- a/.github/workflows/neon-preview-branches.yml +++ b/.github/workflows/neon-preview-branches.yml @@ -16,11 +16,30 @@ jobs: name: Setup outputs: branch: ${{ steps.branch_name.outputs.current_branch }} + neon_enabled: ${{ steps.neon_guard.outputs.enabled }} runs-on: ubuntu-latest steps: - name: Get branch name id: branch_name uses: tj-actions/branch-names@v8 + - name: Check Neon preview availability + id: neon_guard + env: + NEON_API_KEY: ${{ secrets.NEON_API_KEY }} + NEON_PROJECT_ID: ${{ vars.NEON_PROJECT_ID }} + WORKFLOW_ACTOR: ${{ github.actor }} + run: | + enabled=true + + if [ -z "$NEON_API_KEY" ] || [ -z "$NEON_PROJECT_ID" ]; then + enabled=false + echo "Skipping Neon preview jobs because repository Neon credentials are unavailable." + elif [ "$WORKFLOW_ACTOR" = "dependabot[bot]" ]; then + enabled=false + echo "Skipping Neon preview jobs for Dependabot pull requests because secrets are not exposed." + fi + + echo "enabled=$enabled" >> "$GITHUB_OUTPUT" create_neon_branch: name: Create Neon Branch @@ -29,7 +48,7 @@ jobs: db_url_with_pooler: ${{ steps.create_neon_branch_encode.outputs.db_url_with_pooler }} needs: setup if: | - github.event_name == 'pull_request' && ( + needs.setup.outputs.neon_enabled == 'true' && github.event_name == 'pull_request' && ( github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.action == 'reopened') @@ -86,7 +105,7 @@ jobs: delete_neon_branch: name: Delete Neon Branch needs: setup - if: github.event_name == 'pull_request' && github.event.action == 'closed' + if: needs.setup.outputs.neon_enabled == 'true' && github.event_name == 'pull_request' && github.event.action == 'closed' runs-on: ubuntu-latest steps: - name: Delete Neon Branch diff --git a/GITHUB_ACTIONS_SETUP.md b/GITHUB_ACTIONS_SETUP.md index 6bc4627..5c717a1 100644 --- a/GITHUB_ACTIONS_SETUP.md +++ b/GITHUB_ACTIONS_SETUP.md @@ -317,6 +317,14 @@ neonctl branches delete --project-id YOUR_PROJECT_ID preview/pr-123-old 3. Update GitHub Secret: `NEON_API_KEY` 4. Re-run workflow +### Workflow Is Skipped on Dependabot PRs + +**Cause**: GitHub does not expose repository secrets to Dependabot-triggered `pull_request` workflows. + +**Fix**: +1. Treat this as expected behavior for Dependabot PRs +2. If you want Neon preview branches on non-Dependabot PRs, verify both `NEON_API_KEY` and `NEON_PROJECT_ID` are configured + ### Branch Already Exists **Cause**: Previous workflow didn't clean up diff --git a/docs/neon-preview-workflow.md b/docs/neon-preview-workflow.md index f71831e..b4c3c55 100644 --- a/docs/neon-preview-workflow.md +++ b/docs/neon-preview-workflow.md @@ -229,6 +229,18 @@ Use Vercel's API to set environment variables for preview deployment: 2. Check API key has sufficient permissions 3. Regenerate API key if needed +### Workflow Skips Neon Jobs on Dependabot or Unconfigured PRs + +**Behavior**: `create_neon_branch` and `delete_neon_branch` are skipped instead of failing. + +**Why it happens**: +1. GitHub does not expose repository secrets to Dependabot-triggered `pull_request` workflows +2. The repository is missing `NEON_API_KEY` or `NEON_PROJECT_ID` + +**What to do**: +1. No action is required for Dependabot PRs; skipping is expected +2. For regular PRs, add `NEON_API_KEY` and `NEON_PROJECT_ID` in repository Actions settings if Neon preview branches should run + ### Branch Already Exists **Error**: `Branch already exists` From a131a4a1b648f4ba6b2b22daa2f6a76dd123f000 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 4 Apr 2026 15:01:07 +0000 Subject: [PATCH 2/3] chore: finalize neon workflow fix Agent-Logs-Url: https://github.com/quantumdynamics927-dotcom/QPyth/sessions/215a653e-2dbf-4ef6-a217-39cd115d2f5f Co-authored-by: quantumdynamics927-dotcom <247722560+quantumdynamics927-dotcom@users.noreply.github.com> --- coverage.xml | 3848 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 2938 insertions(+), 910 deletions(-) diff --git a/coverage.xml b/coverage.xml index 7c95a97..32e52eb 100644 --- a/coverage.xml +++ b/coverage.xml @@ -1,9 +1,9 @@ - + - D:\QPyth\quantumpytho + /home/runner/work/QPyth/QPyth/quantumpytho @@ -11,8 +11,8 @@ - + @@ -298,7 +298,7 @@ - + @@ -306,99 +306,18 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - @@ -406,167 +325,287 @@ - + + + + + - + + - - - - - - - - + + + + + - + + - - - - + - - - - - - - - - - - + + + - - - - - + - - - - + + - - - - - + - - - - + - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - + + + + + + - - - - - - + + + - - - - - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + - - + + + + + + + @@ -574,914 +613,2869 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + - - - - - + + - - + + + + + - - - - - - - - - + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - + + + + + + - - - + + - - - - - - - - - - - + + - + + + + - + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + - + + + + + + + + - - - - + + - - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - - - - + + - - - - + + - - - - - - - - - - - + + + + + + + - - + - - - - + + - + + + + + + + - - - + + + + - + - - + - - + + - - + + + + + - + + + + + - - - - - - - - - + + + + + - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - + - + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + + + + + - + + - - - - + + + + + + - - - - - - + + + + - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + - - + - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + - - + + + - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - + - + + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - - + + + + + + + + + + + + + - - - - + + - - - + + - + + - - - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + @@ -1492,111 +3486,145 @@ + + + - - - - - - - - - - - + - + + + + + + - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + + + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + - + - + + + - - + + + + + + + + + + + + + + + + + + + - + + + + + + From 119e77afbe3d952c5b6a223b88a2137fbe6276fe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 4 Apr 2026 15:01:31 +0000 Subject: [PATCH 3/3] chore: restore unchanged coverage report Agent-Logs-Url: https://github.com/quantumdynamics927-dotcom/QPyth/sessions/215a653e-2dbf-4ef6-a217-39cd115d2f5f Co-authored-by: quantumdynamics927-dotcom <247722560+quantumdynamics927-dotcom@users.noreply.github.com> --- coverage.xml | 3764 ++++++++++++-------------------------------------- 1 file changed, 868 insertions(+), 2896 deletions(-) diff --git a/coverage.xml b/coverage.xml index 32e52eb..7c95a97 100644 --- a/coverage.xml +++ b/coverage.xml @@ -1,9 +1,9 @@ - + - /home/runner/work/QPyth/QPyth/quantumpytho + D:\QPyth\quantumpytho @@ -11,8 +11,8 @@ + - @@ -298,7 +298,7 @@ - + @@ -306,18 +306,99 @@ - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -325,287 +406,167 @@ - + - - - - - - + + - - - - - + + + + + + + - - + + - + + + + + + + + - - + + + + + + - - + + + + + - - + + + + + + + + - + - + + + + - - + + + + + + + + + + + + - - - - - + - - - - + + + + + + + + + + - - + + + + + - + - - + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + + + + + + - - + + - - - - - - - @@ -613,2869 +574,914 @@ - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + + + + - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + - - + + + - - + + + + + + + + + + + - + - - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - + - - - + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + - - - - - - - - + + + + + - + - - - - - - - - + - - - - + + + - + - + + + + - - + - - - - - + - - - - - + + + + + + + + + + - - - - - + - - - - + - - - - - - - - - - - - + + + + + + + + + + + - - + - - - + + - + + - - + - - - - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + - - - - - - + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - - - + - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - - - - - - - + + + + - + - - + - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - + - + + + + - - - - + - + + + + + - + + - - + + - - - - - - - - - - - - - + + - + + - - - - - - - - - - - - - - - - - + - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - + - - - - - - - - - - - - + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - + + - + + + + + + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + - - + + + + + - - + + - - + - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - + - - - - - - - - - - - - - - - - - - - @@ -3486,145 +1492,111 @@ - - - + + + + + + + + + + + - - + - - - - - + + - - - - - - - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + - + - - - - - - - - - - - - - - - + - - - - - - - + - - - - + - - - - - - + + - - - - - - - - - - - - - - - - - - - +