diff --git a/.github/workflows/sync-upstream.yml b/.github/workflows/sync-upstream.yml index 5609b4f..02cdf18 100644 --- a/.github/workflows/sync-upstream.yml +++ b/.github/workflows/sync-upstream.yml @@ -57,7 +57,7 @@ jobs: if: steps.check.outputs.new_release == 'true' uses: actions/setup-python@v5 with: - python-version: '3.13' + python-version: '3.11' - name: Install and test if: steps.check.outputs.new_release == 'true' diff --git a/.python-version b/.python-version index c10780c..375f5ca 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.13.1 +3.11.6 diff --git a/pyproject.toml b/pyproject.toml index 5180998..77f0722 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -241,6 +241,8 @@ select = [ ignore = [ # mutable defaults "B006", + # import sorting - disabled because orb->orb_sdk rename changes sort order + "I001", ] unfixable = [ # disable auto fix for print statements diff --git a/scripts/apply-customizations.sh b/scripts/apply-customizations.sh index 30f9bc5..18bf69e 100755 --- a/scripts/apply-customizations.sh +++ b/scripts/apply-customizations.sh @@ -33,4 +33,8 @@ sed -i 's/--verifytypes orb /--verifytypes orb_sdk /' pyproject.toml sed -i "s/exclude = \['src\/orb\/_files.py'/exclude = ['src\/orb_sdk\/_files.py'/" pyproject.toml sed -i 's/known-first-party = \["orb", "tests"\]/known-first-party = ["orb_sdk", "tests"]/' pyproject.toml +# Disable import sorting lint (orb->orb_sdk changes sort order) +echo "Disabling I001 import sorting lint" +sed -i 's/ignore = \[/ignore = [\n # import sorting - disabled because orb->orb_sdk rename changes sort order\n "I001",/' pyproject.toml + echo "Customizations applied successfully"