Skip to content

Commit

Permalink
Merge branch 'master' into rename-master-#252
Browse files Browse the repository at this point in the history
  • Loading branch information
MRichards99 committed Mar 17, 2022
2 parents f2f7794 + 464d754 commit ad0176e
Show file tree
Hide file tree
Showing 134 changed files with 13,669 additions and 1,805 deletions.
5 changes: 3 additions & 2 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ per-file-ignores =
test/*: S101
util/icat_db_generator.py: S311
datagateway_api/wsgi.py:E402,F401
datagateway_api/common/database/models.py: N815,A003
datagateway_api/common/icat/filters.py: C901
datagateway_api/src/datagateway_api/database/models.py: N815,A003
datagateway_api/src/datagateway_api/icat/filters.py: C901
datagateway_api/src/search_api/models.py: B950
enable-extensions=G
5 changes: 2 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ Add a set up instructions describing how the reviewer should test the code

- [ ] Review code
- [ ] Check GitHub Actions build
- [ ] If `icatdb Generator Script Consistency Test` CI job fails, is this because of a
deliberate change made to the script to change generated data (which isn't
actually a problem) or is there an underlying issue with the changes made?
- [ ] If `icatdb Generator Script Consistency Test` CI job fails, is this because of a deliberate change made to the script to change generated data (which isn't actually a problem) or is here an underlying issue with the changes made?
- [ ] Review changes to test coverage
- [ ] Does this change mean a new patch, minor or major version should be made? If so, does one of the commit messages feature `fix:`, `feat:` or `BREAKING CHANGE:` so a release is automatically made via GitHub Actions upon merge?
- [ ] {more steps here}

## Agile Board Tracking
Expand Down
4 changes: 4 additions & 0 deletions .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Only check commits so we don't need to squash and merge PRs preventing loss of commit history
commitsOnly: true
# One or more commits need to follow the Angular commit spec, though ideally we should be using this as much as possible for the changelog
anyCommit: true
Loading

0 comments on commit ad0176e

Please sign in to comment.