feat: configure renovate, nd separate requirements for each tox.ini e…

…nvironment (use .in files for spec).

charms/jupyter-controller/pyproject.toml

@@ -18,6 +18,7 @@ line-length = 99
 target-version = ["py38"]
 
 [tool.isort]
+line_length = 99
 profile = "black"
 
 # Linting tools configuration
@@ -29,12 +30,11 @@ exclude = [".git", "__pycache__", ".tox", "build", "dist", "*.egg_info", "venv"]
 select = ["E", "W", "F", "C", "N", "R", "D", "H"]
 # Ignore W503, E501 because using black creates errors with this
 # Ignore D107 Missing docstring in __init__
-# Ignore E231 missing whitespace after ':', which work against W291 trailing whitespace
-ignore = ["W503", "E501", "D107", "E231"]
+ignore = ["W503", "E501", "D107"]
 # D100, D101, D102, D103: Ignore missing docstrings in tests
 per-file-ignores = ["tests/*:D100,D101,D102,D103,D104"]
 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.in

@@ -0,0 +1,2 @@
+black
+isort

charms/jupyter-controller/requirements-fmt.txt

@@ -0,0 +1,22 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-fmt.in
+#
+black==22.10.0
+    # via -r ./charms/jupyter-controller/requirements-fmt.in
+click==8.1.3
+    # via black
+isort==5.10.1
+    # via -r ./charms/jupyter-controller/requirements-fmt.in
+mypy-extensions==0.4.3
+    # via black
+pathspec==0.10.2
+    # via black
+platformdirs==2.5.4
+    # via black
+tomli==2.0.1
+    # via black
+typing-extensions==4.4.0
+    # via black

charms/jupyter-controller/requirements-integration.in

@@ -0,0 +1,3 @@
+juju
+pytest-operator
+-r requirements.txt

charms/jupyter-controller/requirements-integration.txt

@@ -0,0 +1,188 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-integration.in
+#
+asttokens==2.2.0
+    # via stack-data
+attrs==22.1.0
+    # via pytest
+backcall==0.2.0
+    # via ipython
+bcrypt==4.0.1
+    # via paramiko
+cachetools==5.2.0
+    # via google-auth
+certifi==2022.9.24
+    # via
+    #   kubernetes
+    #   requests
+cffi==1.15.1
+    # via
+    #   cryptography
+    #   pynacl
+charset-normalizer==2.1.1
+    # via requests
+cryptography==38.0.4
+    # via paramiko
+decorator==5.1.1
+    # via
+    #   ipdb
+    #   ipython
+exceptiongroup==1.0.4
+    # via pytest
+executing==1.2.0
+    # via stack-data
+google-auth==2.15.0
+    # via kubernetes
+idna==3.4
+    # via requests
+iniconfig==1.1.1
+    # via pytest
+ipdb==0.13.9
+    # via pytest-operator
+ipython==8.7.0
+    # via ipdb
+jedi==0.18.2
+    # via ipython
+jinja2==3.1.2
+    # via pytest-operator
+juju==3.0.4
+    # via
+    #   -r ./charms/jupyter-controller/requirements-integration.in
+    #   pytest-operator
+jujubundlelib==0.5.7
+    # via theblues
+kubernetes==25.3.0
+    # via juju
+macaroonbakery==1.3.1
+    # via
+    #   juju
+    #   theblues
+markupsafe==2.1.1
+    # via jinja2
+matplotlib-inline==0.1.6
+    # via ipython
+mypy-extensions==0.4.3
+    # via typing-inspect
+oauthlib==3.2.2
+    # via requests-oauthlib
+oci-image==1.0.0
+    # via -r ./charms/jupyter-controller/requirements.txt
+ops==1.5.4
+    # via -r ./charms/jupyter-controller/requirements.txt
+packaging==21.3
+    # via pytest
+paramiko==2.12.0
+    # via juju
+parso==0.8.3
+    # via jedi
+pexpect==4.8.0
+    # via ipython
+pickleshare==0.7.5
+    # via ipython
+pluggy==1.0.0
+    # via pytest
+prompt-toolkit==3.0.33
+    # via ipython
+protobuf==3.20.3
+    # via macaroonbakery
+ptyprocess==0.7.0
+    # via pexpect
+pure-eval==0.2.2
+    # via stack-data
+pyasn1==0.4.8
+    # via
+    #   juju
+    #   pyasn1-modules
+    #   rsa
+pyasn1-modules==0.2.8
+    # via google-auth
+pycparser==2.21
+    # via cffi
+pygments==2.13.0
+    # via ipython
+pymacaroons==0.13.0
+    # via macaroonbakery
+pynacl==1.5.0
+    # via
+    #   macaroonbakery
+    #   paramiko
+    #   pymacaroons
+pyparsing==3.0.9
+    # via packaging
+pyrfc3339==1.1
+    # via
+    #   juju
+    #   macaroonbakery
+pytest==7.2.0
+    # via
+    #   pytest-asyncio
+    #   pytest-operator
+pytest-asyncio==0.20.2
+    # via pytest-operator
+pytest-operator==0.22.0
+    # via -r ./charms/jupyter-controller/requirements-integration.in
+python-dateutil==2.8.2
+    # via kubernetes
+pytz==2022.6
+    # via pyrfc3339
+pyyaml==6.0
+    # via
+    #   -r ./charms/jupyter-controller/requirements.txt
+    #   juju
+    #   jujubundlelib
+    #   kubernetes
+    #   ops
+    #   pytest-operator
+requests==2.28.1
+    # via
+    #   kubernetes
+    #   macaroonbakery
+    #   requests-oauthlib
+    #   theblues
+requests-oauthlib==1.3.1
+    # via kubernetes
+rsa==4.9
+    # via google-auth
+six==1.16.0
+    # via
+    #   asttokens
+    #   google-auth
+    #   kubernetes
+    #   macaroonbakery
+    #   paramiko
+    #   pymacaroons
+    #   python-dateutil
+stack-data==0.6.2
+    # via ipython
+theblues==0.5.2
+    # via juju
+toml==0.10.2
+    # via ipdb
+tomli==2.0.1
+    # via pytest
+toposort==1.7
+    # via juju
+traitlets==5.6.0
+    # via
+    #   ipython
+    #   matplotlib-inline
+typing-extensions==4.4.0
+    # via typing-inspect
+typing-inspect==0.8.0
+    # via juju
+urllib3==1.26.13
+    # via
+    #   kubernetes
+    #   requests
+wcwidth==0.2.5
+    # via prompt-toolkit
+websocket-client==1.4.2
+    # via kubernetes
+websockets==7.0
+    # via juju
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

charms/jupyter-controller/requirements-lint.in

@@ -0,0 +1,9 @@
+codespell
+flake8<6
+flake8-builtins
+# Pinned because `flake8-copyright==0.2.3` is incompatible with `flake8>=6`.  Can unpin this
+# when https://github.com/savoirfairelinux/flake8-copyright/pull/20 or a similar fix is released
+flake8-copyright
+pep8-naming
+pyproject-flake8
+-r requirements-fmt.txt

charms/jupyter-controller/requirements-lint.txt

@@ -0,0 +1,60 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-lint.in
+#
+black==22.10.0
+    # via -r ./charms/jupyter-controller/requirements-fmt.txt
+click==8.1.3
+    # via
+    #   -r ./charms/jupyter-controller/requirements-fmt.txt
+    #   black
+codespell==2.2.2
+    # via -r ./charms/jupyter-controller/requirements-lint.in
+flake8==5.0.4
+    # via
+    #   -r ./charms/jupyter-controller/requirements-lint.in
+    #   flake8-builtins
+    #   pep8-naming
+    #   pyproject-flake8
+flake8-builtins==2.0.1
+    # via -r ./charms/jupyter-controller/requirements-lint.in
+flake8-copyright==0.2.3
+    # via -r ./charms/jupyter-controller/requirements-lint.in
+isort==5.10.1
+    # via -r ./charms/jupyter-controller/requirements-fmt.txt
+mccabe==0.7.0
+    # via flake8
+mypy-extensions==0.4.3
+    # via
+    #   -r ./charms/jupyter-controller/requirements-fmt.txt
+    #   black
+pathspec==0.10.2
+    # via
+    #   -r ./charms/jupyter-controller/requirements-fmt.txt
+    #   black
+pep8-naming==0.13.2
+    # via -r ./charms/jupyter-controller/requirements-lint.in
+platformdirs==2.5.4
+    # via
+    #   -r ./charms/jupyter-controller/requirements-fmt.txt
+    #   black
+pycodestyle==2.9.1
+    # via flake8
+pyflakes==2.5.0
+    # via flake8
+pyproject-flake8==5.0.4.post1
+    # via -r ./charms/jupyter-controller/requirements-lint.in
+tomli==2.0.1
+    # via
+    #   -r ./charms/jupyter-controller/requirements-fmt.txt
+    #   black
+    #   pyproject-flake8
+typing-extensions==4.4.0
+    # via
+    #   -r ./charms/jupyter-controller/requirements-fmt.txt
+    #   black
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools

charms/jupyter-controller/requirements-unit.in

@@ -0,0 +1,3 @@
+coverage
+pytest
+-r requirements.txt

charms/jupyter-controller/requirements-unit.txt

@@ -0,0 +1,32 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements-unit.in
+#
+attrs==22.1.0
+    # via pytest
+coverage==6.5.0
+    # via -r ./charms/jupyter-controller/requirements-unit.in
+exceptiongroup==1.0.4
+    # via pytest
+iniconfig==1.1.1
+    # via pytest
+oci-image==1.0.0
+    # via -r ./charms/jupyter-controller/requirements.txt
+ops==1.5.4
+    # via -r ./charms/jupyter-controller/requirements.txt
+packaging==21.3
+    # via pytest
+pluggy==1.0.0
+    # via pytest
+pyparsing==3.0.9
+    # via packaging
+pytest==7.2.0
+    # via -r ./charms/jupyter-controller/requirements-unit.in
+pyyaml==6.0
+    # via
+    #   -r ./charms/jupyter-controller/requirements.txt
+    #   ops
+tomli==2.0.1
+    # via pytest

charms/jupyter-controller/requirements-update-packages.in

@@ -0,0 +1 @@
+pip-tools

charms/jupyter-controller/requirements-update-packages.txt

@@ -0,0 +1,28 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    pip-compile --resolver=backtracking ./charms/jupyter-controller/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 ./charms/jupyter-controller/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

charms/jupyter-controller/requirements.in

@@ -0,0 +1,2 @@
+ops
+oci-image

charms/jupyter-controller/requirements.txt

@@ -1,2 +1,12 @@
-ops==1.3.0
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    pip-compile --resolver=backtracking ./charms/jupyter-controller/requirements.in
+#
 oci-image==1.0.0
+    # via -r ./charms/jupyter-controller/requirements.in
+ops==1.5.4
+    # via -r ./charms/jupyter-controller/requirements.in
+pyyaml==6.0
+    # via ops