Skip to content

Commit

Permalink
squash merge of previous commits
Browse files Browse the repository at this point in the history
Bump pip-tools from 6.6.0 to 6.6.2

Bumps [pip-tools](https://github.com/jazzband/pip-tools) from 6.6.0 to 6.6.2.
- [Release notes](https://github.com/jazzband/pip-tools/releases)
- [Changelog](https://github.com/jazzband/pip-tools/blob/master/CHANGELOG.md)
- [Commits](jazzband/pip-tools@6.6.0...6.6.2)

---
updated-dependencies:
- dependency-name: pip-tools
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and mmdbalkhi committed Jun 1, 2022
1 parent f733dda commit 642b08b
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 4 deletions.
23 changes: 23 additions & 0 deletions .github/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Configuration for probot-auto-merge - https://github.com/bobvanderlinden/probot-auto-merge

updateBranch: true
deleteBranchAfterMerge: true
reportStatus: true

minApprovals:
COLLABORATOR: 0
maxRequestedChanges:
NONE: 0
blockingLabels:
- dont-merge
e
# Will merge whenever the above conditions are met, but also
# the owner has approved or merge label was added.
rules:
- minApprovals:
OWNER: 1
- requiredLabels:
- auto-merge

mergeCommitMessage: "{title} (#{number})"
mergeMethod: squash
6 changes: 3 additions & 3 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
alabaster==0.7.12
# via sphinx
asgiref==3.5.1
asgiref==3.5.2
# via -r requirements/tests.in
attrs==21.2.0
# via pytest
Expand Down Expand Up @@ -60,15 +60,15 @@ pallets-sphinx-themes==2.0.2
# via -r requirements/docs.in
pep517==0.11.0
# via pip-tools
pip-tools==6.6.0
pip-tools==6.6.2
# via -r requirements/dev.in
platformdirs==2.3.0
# via virtualenv
pluggy==1.0.0
# via
# pytest
# tox
pre-commit==2.18.1
pre-commit==2.19.0
# via -r requirements/dev.in
py==1.10.0
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# pip-compile requirements/tests.in
#
asgiref==3.5.1
asgiref==3.5.2
# via -r requirements/tests.in
attrs==21.2.0
# via pytest
Expand Down

0 comments on commit 642b08b

Please sign in to comment.