diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f7979e7f76..4d9db7686c 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/python-3/.devcontainer/base.Dockerfile # [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3-bullseye, 3.10-bullseye, 3-buster, 3.10-buster, etc. -ARG VARIANT="3.10-bullseye" +ARG VARIANT="3.13-bullseye" FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1482088105..6ad456a941 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: name: PyInstaller for ${{ matrix.os }} / Py ${{ matrix.python_version }} runs-on: ${{ matrix.os }} strategy: - # set to false for debugging + fail-fast: true matrix: include: @@ -29,8 +29,8 @@ jobs: python_version: '3.10' - os: ubuntu-20.04 artifact_name: capa - asset_name: linux-py312 - python_version: '3.12' + asset_name: linux-py313 + python_version: '3.13' - os: windows-2019 artifact_name: capa.exe asset_name: windows @@ -87,7 +87,7 @@ jobs: asset_name: linux - os: ubuntu-22.04 artifact_name: capa - asset_name: linux-py312 + asset_name: linux-py313 - os: windows-2022 artifact_name: capa.exe asset_name: windows @@ -113,7 +113,7 @@ jobs: include: - asset_name: linux artifact_name: capa - - asset_name: linux-py312 + - asset_name: linux-py313 artifact_name: capa - asset_name: windows artifact_name: capa.exe diff --git a/requirements.txt b/requirements.txt index cfdeed80eb..11ce950d8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,7 +38,7 @@ python-flirt==0.9.2 pyyaml==6.0.2 rich==13.9.2 ruamel-yaml==0.18.6 -ruamel-yaml-clib==0.2.8 +ruamel-yaml-clib==0.2.12 setuptools==75.8.0 six==1.17.0 sortedcontainers==2.4.0