From 8c6a9347b1bc7d054813e693039d2090d8bb5678 Mon Sep 17 00:00:00 2001 From: misohu Date: Mon, 5 Dec 2022 15:10:47 +0100 Subject: [PATCH] fix: add autoMergeType use dependancy from tox for update packages --- pyproject.toml | 2 +- renovate.json | 3 ++- requirements-fmt.txt | 4 ++-- requirements-integration.txt | 8 ++++---- requirements-lint.txt | 4 ++-- requirements-unit.txt | 4 ++-- requirements-update-packages.in | 1 - requirements-update-packages.txt | 28 ---------------------------- requirements.txt | 4 ++-- tox.ini | 2 +- 10 files changed, 16 insertions(+), 44 deletions(-) delete mode 100644 requirements-update-packages.in delete mode 100644 requirements-update-packages.txt diff --git a/pyproject.toml b/pyproject.toml index c81e391..4dfb102 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" \ No newline at end of file +copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s" diff --git a/renovate.json b/renovate.json index e59c6d4..fe3e732 100644 --- a/renovate.json +++ b/renovate.json @@ -10,6 +10,7 @@ "schedule": null } }, + "automergeType": "branch", "packageRules": [ { "groupName": "testing deps", @@ -31,4 +32,4 @@ "automerge": true } ] -} \ No newline at end of file +} diff --git a/requirements-fmt.txt b/requirements-fmt.txt index 536f683..74ec167 100644 --- a/requirements-fmt.txt +++ b/requirements-fmt.txt @@ -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 # diff --git a/requirements-integration.txt b/requirements-integration.txt index 6967050..48f2164 100644 --- a/requirements-integration.txt +++ b/requirements-integration.txt @@ -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 @@ -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 diff --git a/requirements-lint.txt b/requirements-lint.txt index af4a1f5..cea9cbb 100644 --- a/requirements-lint.txt +++ b/requirements-lint.txt @@ -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 # diff --git a/requirements-unit.txt b/requirements-unit.txt index 3d0e0c7..281c63d 100644 --- a/requirements-unit.txt +++ b/requirements-unit.txt @@ -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 # diff --git a/requirements-update-packages.in b/requirements-update-packages.in deleted file mode 100644 index 2c2a9f3..0000000 --- a/requirements-update-packages.in +++ /dev/null @@ -1 +0,0 @@ -pip-tools diff --git a/requirements-update-packages.txt b/requirements-update-packages.txt deleted file mode 100644 index 3daa27d..0000000 --- a/requirements-update-packages.txt +++ /dev/null @@ -1,28 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.8 -# To update, run: -# -# pip-compile --resolver=backtracking ./requirements-update-packages.in -# -build==0.9.0 - # via pip-tools -click==8.1.3 - # via pip-tools -packaging==21.3 - # via build -pep517==0.13.0 - # via build -pip-tools==6.10.0 - # via -r ./requirements-update-packages.in -pyparsing==3.0.9 - # via packaging -tomli==2.0.1 - # via - # build - # pep517 -wheel==0.38.4 - # via pip-tools - -# The following packages are considered to be unsafe in a requirements file: -# pip -# setuptools diff --git a/requirements.txt b/requirements.txt index 876dbef..898c060 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 # diff --git a/tox.ini b/tox.ini index b124650..13f98ba 100644 --- a/tox.ini +++ b/tox.ini @@ -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]