Skip to content

Commit

Permalink
Merge branch 'develop' into merge-controls-md-json
Browse files Browse the repository at this point in the history
  • Loading branch information
jpower432 authored Nov 19, 2024
2 parents 94df588 + 65d7dce commit 8600882
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These owners will be the default owners for everything in
# the repo.
* @oscal-compass/compliance-trestle-maintainers
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ pull request so it can be tracked.
### Merge approval

The project maintainers use LGTM (Looks Good To Me) in comments on the code
review to indicate acceptance. A change requires LGTMs from one of the maintainers.
review to indicate acceptance.

For a list of the maintainers, see the [maintainers](https://oscal-compass.github.io/compliance-trestle/maintainers/) page.
A change requires LGTMs from at least two reviewers. One of the reviewers must be a [`CODEOWNER`](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners).

For a list of the maintainers (also codeowners), see the [maintainers](https://oscal-compass.github.io/compliance-trestle/maintainers/) page.

### Trestle updating, testing and release logistics

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ include_package_data = True
install_requires =
attrs
ilcli
cryptography==42.0.4
cryptography==43.0.3
paramiko==3.4.0
ruamel.yaml
furl
Expand Down

0 comments on commit 8600882

Please sign in to comment.