Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.x merge #125

Merged
merged 9 commits into from
Mar 14, 2025
Merged

1.x merge #125

merged 9 commits into from
Mar 14, 2025

Conversation

larrybabb
Copy link
Contributor

merge issue #87 changes that were first merged into 1.x

brendanreardon and others added 9 commits February 14, 2025 11:02
* Reimplemented FeatureContextConstraint, other branch got very messy when rebasing post- merge of commit 11848ce / pull request 102

* Added empty line at end of cat-vrs-source.yaml

* Added compiled schema def and json files that were missed in pull request 102. I believe these not being committed were why tests were failing through github actions.

* Ran pre-commit hook locally, which fixed trailing whitepsace errors
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.5...3.1.6)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…3.1.6

Bump jinja2 from 3.1.5 to 3.1.6 in /docs/source
* modify RTD config to add "Edit in Github" link back
* Merge branch '1.x' into 1.0.0-snapshot.2025-02-to-1.x-merge
* fix 'FeatureContextConstraint` test
* align dev submodules
@larrybabb larrybabb merged commit 53f853f into 1.0.0-snapshot.2025-02 Mar 14, 2025
13 checks passed
@larrybabb larrybabb deleted the 1.x-merge branch March 14, 2025 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants