From 48dd7de07e2e658e34658f726782dfd0f771452a Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 20 Sep 2025 22:07:33 -0700 Subject: [PATCH] Changing to ruff linter --- .github/workflows/python-package.yml | 7 ++----- pyproject.toml | 8 ++++++-- src/ptulsconv/commands.py | 2 +- src/ptulsconv/docparser/__init__.py | 2 +- src/ptulsconv/pdf/__init__.py | 14 +++++++------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 3569e57..3c67e6a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -29,12 +29,9 @@ jobs: python -m pip install --upgrade pip python -m pip install flake8 pytest pip install -e . - - name: Lint with flake8 + - name: Lint with ruff run: | - # stop the build if there are Python syntax errors or undefined names - flake8 src/ptulsconv tests --count --select=E9,F63,F7,F82 --show-source --statistics - # exit-zero treats all errors as warnings. - flake8 src/ptulsconv tests --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics + ruff check src - name: Test with pytest run: | pytest diff --git a/pyproject.toml b/pyproject.toml index e1d1cf8..ea48d54 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ version = "4.0.0" description = "Read Pro Tools Text exports and generate PDF ADR Reports, JSON" readme = "README.md" requires-python = ">=3.9" -license = { file = "LICENSE" } +license-files = ["LICENSE"] keywords = ["text-processing", "parsers", "film", "broadcast", "editing", "editorial"] classifiers = [ @@ -27,6 +27,9 @@ dependencies = [ "tqdm>=4.67.1", ] +# [tool.uv.build-backend] +# data = { headers = "include/headers", scripts = "bin" } + [project.urls] Source = 'https://github.com/iluvcapra/ptulsconv' Issues = 'https://github.com/iluvcapra/ptulsconv/issues' @@ -48,5 +51,6 @@ build-backend = "uv_build" [dependency-groups] dev = [ - "flake8>=7.3.0", + # "flake8>=7.3.0", + "ruff>=0.13.1", ] diff --git a/src/ptulsconv/commands.py b/src/ptulsconv/commands.py index cb1422b..70e92c7 100644 --- a/src/ptulsconv/commands.py +++ b/src/ptulsconv/commands.py @@ -55,7 +55,7 @@ def output_adr_csv(lines: List[ADRLine], time_format: TimecodeFormat): directories for each character number and name pair, and within that directory, creates a CSV file for each reel. """ - reels = set([ln.reel for ln in lines]) + reels: set[str | None] = set([ln.reel for ln in lines]) for n, name in [(n.character_id, n.character_name) for n in lines]: dir_name = "%s_%s" % (n, name) diff --git a/src/ptulsconv/docparser/__init__.py b/src/ptulsconv/docparser/__init__.py index d950b6d..ad327ec 100644 --- a/src/ptulsconv/docparser/__init__.py +++ b/src/ptulsconv/docparser/__init__.py @@ -2,4 +2,4 @@ Docparser module """ -from .pt_doc_parser import parse_document +# from .pt_doc_parser import parse_document diff --git a/src/ptulsconv/pdf/__init__.py b/src/ptulsconv/pdf/__init__.py index ea106de..985ced9 100644 --- a/src/ptulsconv/pdf/__init__.py +++ b/src/ptulsconv/pdf/__init__.py @@ -79,13 +79,13 @@ def make_doc_template(page_size, filename, document_title, header_box, page_box = page_box.split_y(0.75 * inch, direction='d') title_box, report_box = header_box.split_x(3.5 * inch, direction='r') - on_page_lambda = (lambda c, _: - draw_header_footer(c, report_box, title_box, - footer_box, title=title, - supervisor=supervisor, - document_subheader=document_subheader, - client=client, - doc_title=document_header)) + def on_page_lambda(c, _): + draw_header_footer(c, report_box, title_box, + footer_box, title=title, + supervisor=supervisor, + document_subheader=document_subheader, + client=client, + doc_title=document_header) frames = [Frame(page_box.min_x, page_box.min_y, page_box.width, page_box.height)]