From 9b2723e05440f52546bb3c160cacbfd7f3cddb3c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Apr 2026 07:38:39 +0000 Subject: fix: resolve 18 failing CI checks (pip version, macOS ARM, flake8 E721) Agent-Logs-Url: https://github.com/luciferreeves/edify/sessions/e7f51b79-93cc-48ac-bcc0-db3ca7b27a85 Co-authored-by: luciferreeves <30593201+luciferreeves@users.noreply.github.com> --- .github/workflows/github-actions.yml | 6 +++--- ci/requirements.txt | 2 +- ci/templates/.github/workflows/github-actions.yml | 2 +- src/edify/builder/helpers/core.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index df099ea..d36f91a 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -36,7 +36,7 @@ jobs: toxpython: 'python3.8' python_arch: 'x64' tox_env: 'py38' - os: 'macos-latest' + os: 'macos-13' - name: 'py39 (ubuntu)' python: '3.9' toxpython: 'python3.9' @@ -54,7 +54,7 @@ jobs: toxpython: 'python3.9' python_arch: 'x64' tox_env: 'py39' - os: 'macos-latest' + os: 'macos-13' - name: 'py310 (ubuntu)' python: '3.10' toxpython: 'python3.10' @@ -72,7 +72,7 @@ jobs: toxpython: 'python3.10' python_arch: 'x64' tox_env: 'py310' - os: 'macos-latest' + os: 'macos-13' - name: 'py311 (ubuntu)' python: '3.11' toxpython: 'python3.11' diff --git a/ci/requirements.txt b/ci/requirements.txt index 8130f03..99dbcff 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,5 +1,5 @@ virtualenv>=21.3.0 -pip>=26.0.1 +pip>=25.0 setuptools>=82.0.1 six>=1.17.0 tox diff --git a/ci/templates/.github/workflows/github-actions.yml b/ci/templates/.github/workflows/github-actions.yml index 33869cd..0a1f70e 100644 --- a/ci/templates/.github/workflows/github-actions.yml +++ b/ci/templates/.github/workflows/github-actions.yml @@ -41,7 +41,7 @@ jobs: toxpython: '{{ toxpython }}' python_arch: '{{ python_arch }}' tox_env: '{{ env }}{% if 'cover' in env %},codecov{% endif %}' - os: '{{ os }}-latest' + os: '{% if os == "macos" and prefix in ["py38", "py39", "py310"] %}macos-13{% else %}{{ os }}-latest{% endif %}' {% endfor %} {% endif %} {% endfor %} diff --git a/src/edify/builder/helpers/core.py b/src/edify/builder/helpers/core.py index f8cabe3..38e8929 100644 --- a/src/edify/builder/helpers/core.py +++ b/src/edify/builder/helpers/core.py @@ -47,9 +47,9 @@ def apply_subexpression_defaults(expr): out['namespace'] = "" if 'namespace' not in out else out['namespace'] out['ignore_flags'] = True if 'ignore_flags' not in out else out['ignore_flags'] out['ignore_start_and_end'] = True if 'ignore_start_and_end' not in out else out['ignore_start_and_end'] - assertion(type(out['namespace']) == str, 'namespace must be a string') - assertion(type(out['ignore_flags']) == bool, 'ignore_flags must be a boolean') - assertion(type(out['ignore_start_and_end']) == bool, 'ignore_start_and_end must be a boolean') + assertion(isinstance(out['namespace'], str), 'namespace must be a string') + assertion(isinstance(out['ignore_flags'], bool), 'ignore_flags must be a boolean') + assertion(isinstance(out['ignore_start_and_end'], bool), 'ignore_start_and_end must be a boolean') return out -- cgit v1.2.3