fix: add autoMergeType use dependancy from tox for update packages

charms/jupyter-controller/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"
+copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s"

charms/jupyter-controller/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-fmt.in
 #

charms/jupyter-controller/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-integration.in
 #
-asttokens==2.2.0
+asttokens==2.2.1
     # via stack-data
 attrs==22.1.0
     # via pytest

charms/jupyter-controller/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-lint.in
 #

charms/jupyter-controller/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-unit.in
 #

charms/jupyter-controller/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements.in
 #

charms/jupyter-controller/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]
@@ -52,7 +52,8 @@ commands =
     # codespell {[vars]lib_path}
     codespell {toxinidir}/. --skip {toxinidir}/.git --skip {toxinidir}/.tox \
       --skip {toxinidir}/build --skip {toxinidir}/lib --skip {toxinidir}/venv \
-      --skip {toxinidir}/.mypy_cache --skip {toxinidir}/icon.svg
+      --skip {toxinidir}/.mypy_cache \
+      --skip {toxinidir}/icon.svg --skip *.json.tmpl
     # pflake8 wrapper supports config from pyproject.toml
     pflake8 {[vars]all_path}
     isort --check-only --diff {[vars]all_path}

charms/jupyter-ui/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"
+copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s"

charms/jupyter-ui/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-ui/requirements-fmt.in
 #

charms/jupyter-ui/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-ui/requirements-lint.in
 #

charms/jupyter-ui/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-ui/requirements-unit.in
 #

charms/jupyter-ui/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.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./charms/jupyter-ui/requirements.in
 #

charms/jupyter-ui/tox.ini

@@ -7,7 +7,7 @@ max-line-length = 100
 [tox]
 skipsdist = True
 skip_missing_interpreters = True
-envlist = lint, unit, integration
+envlist = fmt, lint, unit, integration
 
 [vars]
 all_path = {[vars]src_path} {[vars]tst_path}
@@ -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]

renovate.json

@@ -10,6 +10,7 @@
             "schedule": null
         }
     },
+    "automergeType": "branch",
     "packageRules": [
         {
             "groupName": "testing deps",

requirements-integration.txt

@@ -1,12 +1,12 @@
 #
-# This file is autogenerated by pip-compile with python 3.8
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
 #
 #    pip-compile --resolver=backtracking ./requirements-integration.in
 #
 anyio==3.6.2
     # via httpcore
-asttokens==2.2.0
+asttokens==2.2.1
     # via stack-data
 async-generator==1.10
     # via
@@ -204,7 +204,7 @@ rfc3986[idna2008]==1.5.0
     # via httpx
 rsa==4.9
     # via google-auth
-selenium==4.7.0
+selenium==4.7.2
     # via
     #   -r ./requirements-integration.in
     #   selenium-wire

tox.ini

@@ -16,9 +16,6 @@ commands =
   tox -c charms/jupyter-{env:CHARM} -e {env:TYPE}
 
 [testenv:update-requirements]
-description = Update requirements files by executing pip-compile on all requirements*.in files, including those in subdirs.
-deps =
-    -r requirements-update-packages.txt
 allowlist_externals =
     bash
     find
@@ -27,6 +24,9 @@ allowlist_externals =
 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 =
+    pip-tools
+description = Update requirements files by executing pip-compile on all requirements*.in files, including those in subdirs.
 
 [testenv:integration]
 whitelist_externals = tox