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
10 changes: 6 additions & 4 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ permissions:
jobs:
autofix:
runs-on: ubuntu-latest
env:
RUFF_OUTPUT_FORMAT: github
steps:
- uses: actions/checkout@v4

- uses: astral-sh/ruff-action@v3
- uses: astral-sh/setup-uv@v7
with:
version-file: "pyproject.toml"
args: "check --fix"
activate-environment: true
- run: uv sync --locked --only-group=ruff
- run: ruff check --fix
- run: ruff format
# Format even if the the previous step failed
if: ${{ !cancelled() }}
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/lint-and-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up uv for Python ${{ matrix.python-version }}
uses: astral-sh/setup-uv@v6
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
python-version: ${{ matrix.python-version }}
activate-environment: true
- run: scripts/install.ps1
Expand All @@ -70,7 +69,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: astral-sh/setup-uv@v6
- uses: astral-sh/setup-uv@v7
- run: uvx uv-secure[faster-async]

Build:
Expand All @@ -83,18 +82,21 @@ jobs:
python-version: ["3.13", "3.14"]
steps:
- uses: actions/checkout@v4
# region pyinstaller/pyinstaller#9012 + astral-sh/uv#12906
- name: Set up Python for PyInstaller tk and ARM64 issue
if: matrix.os != 'windows-latest'
# https://github.com/astral-sh/uv/issues/12906#issuecomment-3587439179
- name: Set UV_PYTHON for ARM runners
if: ${{ endsWith(matrix.os, 'arm') }}
run: echo "UV_PYTHON=arm64" >> "$GITHUB_ENV"
# region https://github.com/pyinstaller/pyinstaller/issues/9204
- name: Set up Python for PyInstaller tk issue on Linux
if: ${{ startsWith(matrix.os, 'ubuntu') }}
uses: actions/setup-python@v5
with:
allow-prereleases: true
python-version: ${{ matrix.python-version }}
- name: Set up uv for Python ${{ matrix.python-version }}
uses: astral-sh/setup-uv@v6
uses: astral-sh/setup-uv@v7
with:
enable-cache: true
python-version: ${{ matrix.os == 'windows-latest' && matrix.python-version || null }}
python-version: ${{ !startsWith(matrix.os, 'ubuntu') && matrix.python-version || null }}
# endregion
- run: scripts/install.ps1
shell: pwsh
Expand Down
15 changes: 10 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
80,
100,
],
"[git-commit]": {
"editor.rulers": [
72,
],
},
"editor.detectIndentation": false,
"editor.tabSize": 2,
"editor.insertSpaces": true,
Expand All @@ -51,6 +46,7 @@
"files.trimTrailingWhitespace": true,
"editor.bracketPairColorization.enabled": true,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
// "source.*Imports": https://github.com/microsoft/TypeScript/pull/50931#issuecomment-1416288712
Expand All @@ -61,6 +57,15 @@
"source.removeUnusedImports": "never",
},

/*
* Git
*/
"[git-commit]": {
"editor.rulers": [
72,
],
},

// NOTE: due to a bug in VSCode, we have to specify editor.defaultFormatter individually to ensure
// it overrides user settings. Please upvote: https://github.com/microsoft/vscode/issues/168411

Expand Down
10 changes: 6 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name = "AutoSplit"
version = "2.3.2"
requires-python = ">=3.13"
dependencies = [
# Dependencies:
"Levenshtein >=0.25",
"PyAutoGUI >=0.9.52",
"PyWinCtl >=0.0.42", # py.typed
Expand All @@ -19,7 +18,7 @@ dependencies = [

#
# Build and compile resources
"pyinstaller >=6.14.0", # Mitigate issues with pkg_resources deprecation warning
"pyinstaller >=6.15.0", # Python 3.14 support

#
# https://packaging.python.org/en/latest/specifications/dependency-specifiers/#environment-markers
Expand All @@ -44,17 +43,20 @@ dependencies = [
"python-xlib >=0.33; sys_platform == 'linux'",
]
[dependency-groups]
ruff = [
"beslogic-ruff-config",
"ruff", # Version should come from beslogic-ruff-config and the lock file
]
dev = [
#
# Visual Designer
"qt6-applications >=6.5.0",
#
# Linters & Formatters
"beslogic-ruff-config",
"dprint-py>=0.50.0.0",
"mypy[faster-cache] >=1.18",
"pyright[nodejs] >=1.1.400", # reportPrivateImportUsage behaviour change
"ruff", # Version should come from beslogic-ruff-config
{ include-group = "ruff" },
#
# Types
"types-PyAutoGUI",
Expand Down
2 changes: 1 addition & 1 deletion ruff.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ extend = ".venv/Beslogic-Ruff-Config/ruff.toml"

[lint]
explicit-preview-rules = false # This project uses bleeding-edge behaviours
ignore=[
ignore = [
"D205", # Not all docstrings have a short description + description
# We have some Pascal case module names
"N999", # pep8-naming: Invalid module name
Expand Down
Empty file modified src/AutoSplit.py
100644 → 100755
Empty file.
Loading
Loading