diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df021db..0889b1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: name: Linux Test runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install dependencies run: | sudo apt-get update -qq @@ -46,9 +46,9 @@ jobs: macos-test: name: macOS Test - runs-on: macos-14 + runs-on: macos-15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install dependencies run: | brew install scons @@ -58,9 +58,9 @@ jobs: windows-test: name: Windows Test - runs-on: windows-2022 + runs-on: windows-2025 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install dependencies run: | python -m pip install -qq scons @@ -73,13 +73,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, macos-14, windows-2022] - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] + os: [ubuntu-24.04, macos-15, windows-2025] + python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} cache: "pip" @@ -110,11 +110,11 @@ jobs: name: Python Formatting runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: - python-version: "3.13" + python-version: "3.14" cache: "pip" cache-dependency-path: "requirements-black.txt" - name: Install dependencies diff --git a/.trustinsoft/SConscript b/.trustinsoft/SConscript index 4b1b87b..1cd355a 100644 --- a/.trustinsoft/SConscript +++ b/.trustinsoft/SConscript @@ -1,7 +1,7 @@ Import("env") tis_env = env.Clone() -tis_env.Append(CPPPATH="stubs") +tis_env.Append(CPPPATH=Dir("stubs").srcnode()) tis_env.Program("hash.c") tis_env.Program("x25519.c") diff --git a/SConstruct b/SConstruct index 952835c..3b3d74a 100644 --- a/SConstruct +++ b/SConstruct @@ -9,7 +9,7 @@ import SCons.Errors def build_with_env(path, env, tests=True, examples=False, measure_size=False): lith_env = env.Clone() - lith_env.Append(CPPPATH=[Dir("include")]) + lith_env.Append(CPPPATH=[Dir("include").srcnode()]) liblith_env = lith_env.Clone() liblith_env.Append(CFLAGS=["-ansi"]) liblithium = SConscript( @@ -33,7 +33,7 @@ def build_with_env(path, env, tests=True, examples=False, measure_size=False): lith_env.Append(CFLAGS=["-Wno-declaration-after-statement"]) hydro_env = lith_env.Clone() - hydro_env.Append(CPPPATH=[Dir("hydro")]) + hydro_env.Append(CPPPATH=[Dir("hydro").srcnode()]) libhydrogen = SConscript( dirs="hydro", variant_dir=os.path.join(path, "hydro", "lib"), @@ -44,7 +44,7 @@ def build_with_env(path, env, tests=True, examples=False, measure_size=False): if tests: test_env = lith_env.Clone() - test_env.Append(CPPPATH=Dir("src")) + test_env.Append(CPPPATH=Dir("src").srcnode()) SConscript( dirs="test", variant_dir=os.path.join(path, "test"), @@ -125,7 +125,7 @@ AddOption( dest="target", default="host", action="store", - help=f"choose targets ({', '.join(all_targets)}) or specify \"all\"", + help=f'choose targets ({", ".join(all_targets)}) or specify "all"', metavar="TARGET1[,TARGET2...]", ) diff --git a/requirements-black.txt b/requirements-black.txt index ad2b44c..d653a60 100644 --- a/requirements-black.txt +++ b/requirements-black.txt @@ -1 +1 @@ -black==24.10.0 +black==25.11.0 diff --git a/setup.py b/setup.py index ba9be5d..b7a88ee 100644 --- a/setup.py +++ b/setup.py @@ -20,11 +20,11 @@ "Topic :: Software Development :: Embedded Systems", "Programming Language :: C", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", "License :: OSI Approved :: Apache Software License", "License :: OSI Approved :: MIT License", ],