diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index d2a1859..34a2fb5 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -25,7 +25,7 @@ jobs: # tests/requirements.txt specifies a range. Also see # build_openassetio action. run: | - python -m pip install openassetio==1.0.0rc1.rev0 + python -m pip install openassetio==1.0.2 python -m pip install -r requirements.txt python -m pip install -r tests/requirements.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1234f25..789695b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,8 +17,8 @@ jobs: strategy: fail-fast: false matrix: - os: ['windows-2022', 'ubuntu-22.04', 'macos-15-intel'] - python: ["3.10", "3.11"] + os: ['windows-2022', 'ubuntu-22.04', 'macos-15'] + python: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v7 @@ -29,7 +29,7 @@ jobs: # tests/requirements.txt specifies a range. Also see # build_openassetio action. - run: | - python -m pip install openassetio==1.0.0rc1.rev0 + python -m pip install openassetio==1.0.2 python -m pip install -r tests/requirements.txt python -m pip install . - name: Test diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 384f40a..f70fdbb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,15 @@ Release Notes ============= +v1.0.0-alpha.14 +-------------- + +### Bug fixes + +- Bumped `pyyaml` version from `6.0.0` to `6.0.3` since Conan restrictions + first added in v1.0.0-alpha.7 are no longer present and 6.0.0 is not + compatible with Python 3.12+. + v1.0.0-alpha.13 -------------- diff --git a/pyproject.toml b/pyproject.toml index 41fe9d8..1e702ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta" name = "openassetio-traitgen" version = "1.0.0a13" requires-python = ">=3.10" -dependencies = ["jinja2==3.1.6", "pyyaml==6.0.0", "jsonschema==4.7.2"] +dependencies = ["jinja2==3.1.6", "pyyaml==6.0.3", "jsonschema==4.7.2"] authors = [ { name = "Contributors to the OpenAssetIO project", email = "openassetio-discussion@lists.aswf.io" } diff --git a/requirements.txt b/requirements.txt index a8be526..a622a82 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ # This allows them to be collected/installed prior to build if # required. jinja2==3.1.6 -pyyaml==6.0.0 # We are currently constrained to pyyaml=6.0.0 exactly due to conan 1.60.1 +pyyaml==6.0.3 jsonschema==4.7.2 diff --git a/tests/ctest-requirements.txt b/tests/ctest-requirements.txt index ce9fb42..3601352 100644 --- a/tests/ctest-requirements.txt +++ b/tests/ctest-requirements.txt @@ -1,5 +1,5 @@ cmake==3.25.2 # Configure/build C++ tests -conan==1.60.1 # Install dependencies for C++ tests. +conan==1.62.0 # Install dependencies for C++ tests. cmakelang==0.6.13 # Lint CMake cpplint==1.6.1 # Basic linting of C++ files. clang-tidy==15.0.2.1 # Static analysis of C++ files diff --git a/tests/generators/test_cpp.py b/tests/generators/test_cpp.py index 937c555..d936a98 100644 --- a/tests/generators/test_cpp.py +++ b/tests/generators/test_cpp.py @@ -841,7 +841,7 @@ def fn( (function_definition declarator: ( function_declarator - declarator: (field_identifier) @func_name (eq? @func_name "{func}") + declarator: (field_identifier) @func_name (#eq? @func_name "{func}") ) @func_decl ) )""") @@ -867,7 +867,7 @@ def fn( query = cpp_language.query("""(parameter_list ( parameter_declaration declarator: ( reference_declarator (identifier) @var_name - (eq? @var_name "defaultValue") )))""") + (#eq? @var_name "defaultValue") )))""") first_has_default = bool(query.captures(first_decl)) second_has_default = bool(query.captures(second_decl)) diff --git a/tests/requirements.txt b/tests/requirements.txt index 3927e63..ffa1254 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,9 +1,9 @@ pytest==9.0.3 -pyyaml==6.0.0 # We are currently constrained to pyyaml=6.0.0 exactly due to conan 1.60.1 +pyyaml==6.0.3 pylint==2.15.5 # Guard against warn/error changes jsonschema==4.7.2 -tree-sitter==0.20.1 # For parsing C++ AST to assert on comment text. -tree-sitter-languages==1.5.0 +tree-sitter==0.21.3 # For parsing C++ AST to assert on comment text. +tree-sitter-languages==1.10.2 # Do not pin openassetio to a specific version, so that pip will not # complain when testing against future openassetio versions (e.g. # OpenAssetIO integration test CI).