diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d246eb9..025f393 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,10 +1,20 @@ Release Notes ============= +v1.0.0-alpha.x +-------------- + +### Bug fixes + +- Bumped `pyyaml` version to `6.0.0` to avoid issues with `cython` 3+, + and `conan` `1.60.1` to be compatible with `pyyaml` `6.0.0`. + [pyyaml/#601](https://github.com/yaml/pyyaml/issues/601) + v1.0.0-alpha.6 -------------- ### Improvements + - Removed dependence on `TraitsBase` and `SpecificationBase` types in generated python code, rather generating the functionality previously provided by the base directly into the traits and specifications. This @@ -12,7 +22,6 @@ v1.0.0-alpha.6 dependency on OpenAssetIO. [#19](https://github.com/OpenAssetIO/OpenAssetIO-TraitGen/issues/19) - v1.0.0-alpha.5 -------------- @@ -29,7 +38,6 @@ v1.0.0-alpha.5 - Fixed line breaks to no longer be platform-specific, and instead conform to Unix-style `\n`. - v1.0.0-alpha.4 -------------- diff --git a/requirements.txt b/requirements.txt index 368ba4f..ec0a531 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.2 -pyyaml==5.4.1 +pyyaml==6.0.0 # We are currently constrained to pyyaml=6.0.0 exactly due to conan 1.60.1 jsonschema==4.7.2 diff --git a/setup.py b/setup.py index 59d8047..6eb1ec0 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,8 @@ packages=find_packages(where="python"), package_dir={"": "python"}, include_package_data=True, - install_requires=["jinja2==3.1.2", "pyyaml==5.4.1", "jsonschema==4.7.2"], + # We are currently constrained to pyyaml=6.0.0 exactly due to conan 1.60.1 + install_requires=["jinja2==3.1.2", "pyyaml==6.0.0", "jsonschema==4.7.2"], entry_points={ "console_scripts": ["openassetio-traitgen=openassetio_traitgen.__main__:main"], }, diff --git a/tests/ctest-requirements.txt b/tests/ctest-requirements.txt index b38146b..ce9fb42 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.59 # Install dependencies for C++ tests. +conan==1.60.1 # 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/requirements.txt b/tests/requirements.txt index 3abb18c..2565a22 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,5 +1,5 @@ pytest==6.2.4 -pyyaml==5.4.1 +pyyaml==6.0.0 # We are currently constrained to pyyaml=6.0.0 exactly due to conan 1.60.1 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.