Skip to content

Commit

Permalink
fix: add autoMergeType use dependancy from tox for update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
misohu committed Dec 5, 2022
1 parent da00655 commit 8c6a934
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 44 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ docstring-convention = "google"
# Check for properly formatted copyright header in each file
copyright-check = "True"
copyright-author = "Canonical Ltd."
copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s"
copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s"
3 changes: 2 additions & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"schedule": null
}
},
"automergeType": "branch",
"packageRules": [
{
"groupName": "testing deps",
Expand All @@ -31,4 +32,4 @@
"automerge": true
}
]
}
}
4 changes: 2 additions & 2 deletions requirements-fmt.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --resolver=backtracking ./requirements-fmt.in
#
Expand Down
8 changes: 4 additions & 4 deletions requirements-integration.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --resolver=backtracking ./requirements-integration.in
#
asttokens==2.2.0
asttokens==2.2.1
# via stack-data
async-generator==1.10
# via
Expand Down Expand Up @@ -266,7 +266,7 @@ wcwidth==0.2.5
# via prompt-toolkit
websocket-client==1.4.2
# via kubernetes
websockets==7.0
websockets==8.1
# via juju
wsproto==1.2.0
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --resolver=backtracking ./requirements-lint.in
#
Expand Down
4 changes: 2 additions & 2 deletions requirements-unit.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --resolver=backtracking ./requirements-unit.in
#
Expand Down
1 change: 0 additions & 1 deletion requirements-update-packages.in

This file was deleted.

28 changes: 0 additions & 28 deletions requirements-update-packages.txt

This file was deleted.

4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --resolver=backtracking ./requirements.in
#
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ commands =
; uses 'bash -c' because piping didn't work in regular tox commands
bash -c \'find . -type f -name "requirements*.in" | xargs --replace=\{\} pip-compile --resolver=backtracking \{\}'
deps =
-r requirements-update-packages.txt
pip-tools
description = Update requirements files by executing pip-compile on all requirements*.in files, including those in subdirs.

[testenv:fmt]
Expand Down

0 comments on commit 8c6a934

Please sign in to comment.