diff --git a/requirements-dev.txt b/requirements-dev.txt index 92ac5c0d3..d77fff313 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,131 +1,135 @@ alabaster==0.7.13 -astroid==2.12.13 -attrs==22.1.0 +astroid==2.15.8 autoflake==1.7.8 -Babel==2.11.0 -beautifulsoup4==4.11.1 -black==22.12.0 -bleach==5.0.1 -cachetools==5.2.0 -certifi==2022.12.7 -cffi==1.15.1 -chardet==5.1.0 -charset-normalizer==2.1.1 -click==8.1.6 +Babel==2.12.1 +beautifulsoup4==4.12.2 +black==23.9.1 +bracex==2.4 +cachetools==5.3.1 +certifi==2023.7.22 +cffi==1.16.0 +chardet==5.2.0 +charset-normalizer==3.2.0 +click==8.1.7 codespell==2.2.5 colorama==0.4.6 -commonmark==0.9.1 -coverage==6.5.0 +coverage==7.3.1 craft-archives==1.1.3 craft-cli==2.1.0 craft-parts==1.25.1 -craft-providers==1.16.0 -cryptography==38.0.4 +craft-providers==1.18.0 +cryptography==41.0.4 Deprecated==1.2.14 dill==0.3.7 distlib==0.3.7 distro==1.8.0 -docutils==0.17.1 -exceptiongroup==1.0.4 -filelock==3.8.2 +docutils==0.18.1 +exceptiongroup==1.1.3 +filelock==3.12.4 flake8==4.0.1 -furo==2022.12.7 -gnupg==2.3.1 +furo==2023.9.10 +html5lib==1.1 httplib2==0.22.0 idna==3.4 imagesize==1.4.1 -importlib-metadata==5.1.0 -iniconfig==1.1.1 -isort==5.11.2 -jaraco.classes==3.2.3 +importlib-metadata==6.8.0 +iniconfig==2.0.0 +isort==5.12.0 +jaraco.classes==3.3.0 jeepney==0.8.0 Jinja2==3.1.2 -jsonpointer==2.3 -keyring==23.11.0 +jsonpointer==2.4 +keyring==24.2.0 launchpadlib==1.11.0 lazr.restfulclient==0.14.5 lazr.uri==1.0.6 -lazy-object-proxy==1.8.0 +lazy-object-proxy==1.9.0 livereload==2.6.3 +lxml==4.9.3 +Markdown==3.4.4 +markdown-it-py==3.0.0 MarkupSafe==2.1.3 mccabe==0.6.1 -more-itertools==9.0.0 -mypy==1.3.0 +mdurl==0.1.2 +more-itertools==10.1.0 +mypy==1.5.1 mypy-extensions==1.0.0 +nh3==0.2.14 oauthlib==3.2.2 -overrides==7.3.1 -packaging==22.0 -pathspec==0.10.3 +overrides==7.4.0 +packaging==23.1 +pathspec==0.11.2 pkginfo==1.9.6 -platformdirs==2.6.2 -pluggy==1.0.0 -polib==1.1.1 -psutil==5.9.5 +platformdirs==3.10.0 +pluggy==1.3.0 +polib==1.2.0 pycodestyle==2.8.0 pycparser==2.21 -pydantic==1.10.0 +pydantic==1.10.13 pydantic-yaml==0.11.2 -pydocstyle==6.1.1 +pydocstyle==6.3.0 pyflakes==2.4.0 -Pygments==2.13.0 -pylint==2.15.8 +Pygments==2.16.1 +pylint==2.17.6 pylint-fixme-info==1.0.3 pylint-pytest==1.1.2 -pyparsing==3.0.9 -pyproject_api==1.2.1 -pytest==7.2.0 -pytest-check==2.1.4 -pytest-mock==3.10.0 -pytest-subprocess==1.4.2 -pytz==2022.6 +pyparsing==3.1.1 +pyproject-api==1.6.1 +pyspelling==2.9 +pytest==7.4.2 +pytest-check==2.2.2 +pytest-mock==3.11.1 +pytest-subprocess==1.5.0 pyxdg==0.28 PyYAML==6.0.1 -readme-renderer==37.3 -regex==2022.10.31 -requests==2.28.1 -requests-toolbelt==0.10.1 +readme-renderer==42.0 +regex==2023.8.8 +requests==2.31.0 +requests-toolbelt==1.0.0 requests-unixsocket==0.3.0 rfc3986==2.0.0 -rich==12.6.0 +rich==13.5.3 +ruff==0.0.256 SecretStorage==3.3.3 -semver==2.13.0 six==1.16.0 snowballstemmer==2.2.0 -soupsieve==2.3.2.post1 +soupsieve==2.5 spdx==2.5.1 spdx-lookup==0.3.3 -Sphinx==5.3.0 +Sphinx==6.2.1 sphinx-autobuild==2021.3.14 -sphinx-basic-ng==1.0.0b1 -sphinx-copybutton==0.5.1 +sphinx-autodoc-typehints==1.23.0 +sphinx-basic-ng==1.0.0b2 +sphinx-copybutton==0.5.2 sphinx-jsonschema==1.19.1 -sphinx-lint==0.6.7 +sphinx-lint==0.6.8 sphinx-pydantic==0.1.1 -sphinx-rtd-theme==1.1.1 -sphinx_autodoc_typehints==1.19.5 -sphinx_design==0.3.0 -sphinxcontrib-applehelp==1.0.2 +sphinx-rtd-theme==1.3.0 +sphinx_design==0.5.0 +sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-jquery==4.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -tabulate==0.8.10 +tabulate==0.9.0 tomli==2.0.1 -tomlkit==0.11.8 -tornado==6.2 -tox==4.0.11 +tomlkit==0.12.1 +tornado==6.3.3 +tox==4.11.3 twine==4.0.2 -types-Deprecated==1.2.9 -types-PyYAML==6.0.12.2 -types-requests==2.28.11.5 -types-setuptools==65.6.0.2 -types-tabulate==0.9.0.2 -types-urllib3==1.26.25.4 -typing_extensions==4.4.0 +types-Deprecated==1.2.9.3 +types-PyYAML==6.0.12.12 +types-requests==2.31.0.6 +types-setuptools==68.2.0.0 +types-tabulate==0.9.0.3 +types-urllib3==1.26.25.14 +typing_extensions==4.8.0 urllib3==1.26.16 -virtualenv==20.17.1 +virtualenv==20.24.5 wadllib==1.3.6 +wcmatch==8.5 webencodings==0.5.1 -wrapt==1.14.1 -zipp==3.11.0 +wrapt==1.15.0 +zipp==3.17.0 diff --git a/requirements-doc.txt b/requirements-doc.txt index 5945e62f3..650fafaab 100644 --- a/requirements-doc.txt +++ b/requirements-doc.txt @@ -1,71 +1,77 @@ alabaster==0.7.13 -Babel==2.11.0 -beautifulsoup4==4.11.1 -certifi==2022.12.7 -charset-normalizer==2.1.1 +Babel==2.12.1 +beautifulsoup4==4.12.2 +bracex==2.4 +certifi==2023.7.22 +charset-normalizer==3.2.0 colorama==0.4.6 craft-archives==1.1.3 craft-cli==2.1.0 craft-parts==1.25.1 -craft-providers==1.16.0 +craft-providers==1.18.0 Deprecated==1.2.14 distro==1.8.0 -docutils==0.17.1 -furo==2022.12.7 -gnupg==2.3.1 +docutils==0.18.1 +furo==2023.9.10 +html5lib==1.1 httplib2==0.22.0 idna==3.4 imagesize==1.4.1 +importlib-metadata==6.8.0 Jinja2==3.1.2 -jsonpointer==2.3 +jsonpointer==2.4 launchpadlib==1.11.0 lazr.restfulclient==0.14.5 lazr.uri==1.0.6 livereload==2.6.3 +lxml==4.9.3 +Markdown==3.4.4 MarkupSafe==2.1.3 oauthlib==3.2.2 -overrides==7.3.1 -packaging==22.0 -platformdirs==2.6.2 -polib==1.1.1 -psutil==5.9.5 -pydantic==1.10.0 +overrides==7.4.0 +packaging==23.1 +platformdirs==3.10.0 +polib==1.2.0 +pydantic==1.10.13 pydantic-yaml==0.11.2 -Pygments==2.13.0 -pyparsing==3.0.9 -pytz==2022.6 +Pygments==2.16.1 +pyparsing==3.1.1 +pyspelling==2.9 pyxdg==0.28 PyYAML==6.0.1 -regex==2022.10.31 -requests==2.28.1 +regex==2023.8.8 +requests==2.31.0 requests-unixsocket==0.3.0 -semver==2.13.0 six==1.16.0 snowballstemmer==2.2.0 -soupsieve==2.3.2.post1 +soupsieve==2.5 spdx==2.5.1 spdx-lookup==0.3.3 -Sphinx==5.3.0 +Sphinx==6.2.1 sphinx-autobuild==2021.3.14 -sphinx-basic-ng==1.0.0b1 -sphinx-copybutton==0.5.1 +sphinx-autodoc-typehints==1.23.0 +sphinx-basic-ng==1.0.0b2 +sphinx-copybutton==0.5.2 sphinx-jsonschema==1.19.1 -sphinx-lint==0.6.7 +sphinx-lint==0.6.8 sphinx-pydantic==0.1.1 -sphinx-rtd-theme==1.1.1 -sphinx_autodoc_typehints==1.19.5 -sphinx_design==0.3.0 -sphinxcontrib-applehelp==1.0.2 +sphinx-rtd-theme==1.3.0 +sphinx_design==0.5.0 +sphinxcontrib-applehelp==1.0.4 sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-jquery==4.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -tabulate==0.8.10 -tornado==6.2 -types-Deprecated==1.2.9 -typing_extensions==4.4.0 +tabulate==0.9.0 +tornado==6.3.3 +types-Deprecated==1.2.9.3 +types-PyYAML==6.0.12.12 +typing_extensions==4.8.0 urllib3==1.26.16 wadllib==1.3.6 -wrapt==1.14.1 -pyspelling==2.8.2 +wcmatch==8.5 +webencodings==0.5.1 +wrapt==1.15.0 +zipp==3.17.0 diff --git a/requirements.txt b/requirements.txt index 692dac98b..eb4f6dea0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,66 +1,36 @@ -alabaster==0.7.13 -Babel==2.11.0 -beautifulsoup4==4.11.1 -certifi==2022.12.7 -charset-normalizer==2.1.1 -colorama==0.4.6 +certifi==2023.7.22 +charset-normalizer==3.2.0 craft-archives==1.1.3 craft-cli==2.1.0 craft-parts==1.25.1 -craft-providers==1.16.0 +craft-providers==1.18.0 Deprecated==1.2.14 distro==1.8.0 -docutils==0.17.1 -furo==2022.12.7 -gnupg==2.3.1 httplib2==0.22.0 idna==3.4 -imagesize==1.4.1 -Jinja2==3.1.2 -jsonpointer==2.3 +importlib-metadata==6.8.0 launchpadlib==1.11.0 lazr.restfulclient==0.14.5 lazr.uri==1.0.6 -livereload==2.6.3 -MarkupSafe==2.1.3 -overrides==7.3.1 -packaging==22.0 -platformdirs==2.6.2 -polib==1.1.1 -pydantic==1.10.0 +oauthlib==3.2.2 +overrides==7.4.0 +packaging==23.1 +platformdirs==3.10.0 +pydantic==1.10.13 pydantic-yaml==0.11.2 -Pygments==2.13.0 -pytz==2022.6 +pyparsing==3.1.1 pyxdg==0.28 PyYAML==6.0.1 -regex==2022.10.31 -requests==2.28.1 +requests==2.31.0 requests-unixsocket==0.3.0 -semver==2.13.0 six==1.16.0 -snowballstemmer==2.2.0 -soupsieve==2.3.2.post1 spdx==2.5.1 spdx-lookup==0.3.3 -Sphinx==5.3.0 -sphinx-autobuild==2021.3.14 -sphinx-basic-ng==1.0.0b1 -sphinx-copybutton==0.5.1 -sphinx-jsonschema==1.19.1 -sphinx-lint==0.6.7 -sphinx-pydantic==0.1.1 -sphinx-rtd-theme==1.1.1 -sphinx_autodoc_typehints==1.19.5 -sphinx_design==0.3.0 -sphinxcontrib-applehelp==1.0.2 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.0 -sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.5 -tabulate==0.8.10 -tornado==6.2 -types-Deprecated==1.2.9 -typing_extensions==4.4.0 +tabulate==0.9.0 +types-Deprecated==1.2.9.3 +types-PyYAML==6.0.12.12 +typing_extensions==4.8.0 urllib3==1.26.16 -wrapt==1.14.1 +wadllib==1.3.6 +wrapt==1.15.0 +zipp==3.17.0 diff --git a/setup.cfg b/setup.cfg index 49b78fbec..31cc27422 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,7 @@ rockcraft = py.typed [options.extras_require] doc = furo - sphinx + sphinx<7 sphinx-autobuild sphinx-autodoc-typehints sphinx-copybutton diff --git a/tests/unit/test_pebble.py b/tests/unit/test_pebble.py index 5291d2465..29da74220 100644 --- a/tests/unit/test_pebble.py +++ b/tests/unit/test_pebble.py @@ -258,12 +258,13 @@ def test_full_service(self, service): "backoff-factor": "not a float", }, r"^8 validation errors[\s\S]*" - r"unhashable type[\s\S]*" + r"unexpected value; permitted: 'merge', 'replace'[\s\S]*" + r"str type expected[\s\S]*" r"str type expected[\s\S]*" r"value is not a valid list[\s\S]*" r"value is not a valid dict[\s\S]*" r"value is not a valid integer[\s\S]*" - r"unhashable type[\s\S]*" + r"unexpected value; permitted: 'restart', 'shutdown'[\s\S]*" r"value is not a valid float[\s\S]*", ), ], @@ -407,8 +408,8 @@ def test_minimal_check(self): }, pydantic.ValidationError, r"^6 validation errors[\s\S]*" - r"unhashable type: 'list'[\s\S]*" - r"unhashable type: 'list'[\s\S]*" + r"unexpected value; permitted: 'merge', 'replace'[\s\S]*" + r"unexpected value; permitted: 'alive', 'ready'[\s\S]*" r"str type expected[\s\S]*" r"str type expected[\s\S]*" r"value is not a valid integer[\s\S]*" diff --git a/tools/freeze-requirements.sh b/tools/freeze-requirements.sh index 3843af9e2..e4d2834d7 100755 --- a/tools/freeze-requirements.sh +++ b/tools/freeze-requirements.sh @@ -24,15 +24,14 @@ dpkg -x ./*.deb . cp -r usr/lib/python3/dist-packages/* "$site_pkgs" popd +pip install -e . +pip freeze --exclude-editable > requirements.txt +requirements_fixups "requirements.txt" pip install -e .[doc] pip freeze --exclude-editable > requirements-doc.txt requirements_fixups "requirements-doc.txt" -pip install -e . -pip freeze --exclude-editable > requirements.txt -requirements_fixups "requirements.txt" - pip install -e .[dev] pip freeze --exclude-editable > requirements-dev.txt requirements_fixups "requirements-dev.txt" diff --git a/tox.ini b/tox.ini index e2d3ee90b..5072c7cf9 100644 --- a/tox.ini +++ b/tox.ini @@ -8,8 +8,6 @@ minversion = 4.3.5 # inside of a virtual environment, so users of Ubuntu >= focal can simply # install tox from apt. Older than that, the user gets an upgrade warning. requires = - # renovate: datasource=pypi - tox==4.4.7 # renovate: datasource=pypi tox-ignore-env-name-mismatch==0.2.0.post2 # Allow tox to access the user's $TMPDIR environment variable if set.