Skip to content

Commit

Permalink
Merge changes from main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
inean committed Aug 30, 2024
2 parents 2b55495 + 995be24 commit 0a945a1
Show file tree
Hide file tree
Showing 9 changed files with 368 additions and 629 deletions.
2 changes: 0 additions & 2 deletions .dockerignore

This file was deleted.

4 changes: 2 additions & 2 deletions .github/actions/setup-python-with-rye/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ runs:
rye config --set-bool behavior.use-uv=true
shell: bash

- name: Pin Python Version ${{ steps.extract-python-version.outputs.python-version }}
- name: Pin Python Version
run: |
export PYTHONUNBUFFERED=True
rye pin ${{ steps.extract-python-version.outputs.python-version }}
Expand All @@ -55,7 +55,7 @@ runs:
shell: bash

- name: Cache pre-commit
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
with:
path: ~/.cache/pre-commit
key: pre-commit-|${{ steps.extract-python-version.outputs.python-version }}|${{ hashFiles('.pre-commit-config.yaml') }}
11 changes: 5 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,24 @@ on:

# Trigger the workflow on new releases
release:
types: [ published ]
types: [published]

# Trigger the workflow on push or pull request when the
# Dockerfile is updated or the dependencies are updated
pull_request:
branches: [ main ]
branches: [main]
paths:
- Dockerfile
- requirements.lock
- pyproject.toml
- src/__about__.py
- src/dns_synchub/dns_synchub/__about__.py

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build-and-push-image:

runs-on: ubuntu-latest

permissions:
Expand All @@ -55,10 +54,10 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract version from src/__about__.py
- name: Extract version from src/dns_synchub/__about__.py
id: extract_version
run: |
VERSION=$(grep -Po '(?<=^__version__ = ")[^"]*' src/__about__.py)
VERSION=$(grep -Po '(?<=^__version__ = ")[^"]*' src/dns_synchub/__about__.py)
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
shell: bash

Expand Down
11 changes: 7 additions & 4 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"version": "0.2.0",
"configurations": [
{
"name": "Run with local .env file",
"name": "Run Main",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/src/dns_synchub.py",
"module": "dns_synchub",
"console": "integratedTerminal",
"args": [ "--env-file", "${workspaceFolder}/.env" ],
"justMyCode": false
"args": [ "--env-file", "${workspaceFolder}/.env", "--dry-run" ],
"justMyCode": false,
"env": {
"PYTHONPATH": "${workspaceFolder}/src"
}
}
]
}
9 changes: 5 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"debugpy.debugJustMyCode": false,
"python.analysis.typeCheckingMode": "strict",
"python.analysis.autoImportCompletions": true,
"python.analysis.diagnosticMode": "workspace",

"[markdown]": {
"editor.fontLigatures": false
}

}
Loading

0 comments on commit 0a945a1

Please sign in to comment.