Merge branch 'main' into main

canonical · Oct 24, 2024 · 5af5ca3 · 5af5ca3
2 parents b4c6507 + 5d77628
commit 5af5ca3
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 123 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -38,15 +38,9 @@ jobs:
       - name: Run codespell
         run: |
           make test-codespell
-      - name: Run flake8
-        run: |
-          make test-flake8
       - name: Run mypy
         run: |
           make test-mypy
-      - name: Run pydocstyle
-        run: |
-          make test-pydocstyle
       - name: Run pyright
         run: |
           sudo snap watch --last=install

diff --git a/Makefile b/Makefile
@@ -11,7 +11,6 @@ autoformat: ## Run automatic code formatters.
 ifndef RUFF
 	$(error "Ruff not installed. Install it with `sudo snap install ruff` or using the official installation instructions: https://docs.astral.sh/ruff/installation/")
 endif
-	autoflake rockcraft/ tests/
 	black .
 	ruff check --fix-only rockcraft tests
 
@@ -74,7 +73,7 @@ install: clean ## Install python package.
 	python setup.py install
 
 .PHONY: lint
-lint: test-black test-codespell test-flake8 test-mypy test-pydocstyle test-pyright test-ruff test-sphinx-lint test-shellcheck ## Run all linting tests.
+lint: test-black test-codespell test-mypy test-pyright test-ruff test-sphinx-lint test-shellcheck ## Run all linting tests.
 
 .PHONY: release
 release: dist ## Release with twine.
@@ -88,10 +87,6 @@ test-black:
 test-codespell:
 	codespell rockcraft tests
 
-.PHONY: test-flake8
-test-flake8:
-	flake8 rockcraft tests
-
 .PHONY: test-ruff
 test-ruff:
 ifndef RUFF
@@ -107,10 +102,6 @@ test-integrations: ## Run integration tests.
 test-mypy:
 	mypy rockcraft tests
 
-.PHONY: test-pydocstyle
-test-pydocstyle:
-	pydocstyle rockcraft
-
 .PHONY: test-pylint
 test-pylint:
 	echo "rockcraft has replaced pylint with ruff. Please use `make test-ruff` instead."

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --extra=dev --output-file=requirements-dev.txt
@@ -10,7 +10,7 @@ annotated-types==0.7.0
     # via
     #   craft-platforms
     #   pydantic
-anyio==4.6.0
+anyio==4.6.2.post1
     # via
     #   starlette
     #   watchfiles
@@ -20,12 +20,8 @@ apeye-core==1.1.5
     # via apeye
 autodocsumm==0.2.13
     # via sphinx-toolbox
-autoflake==1.7.8
-    # via rockcraft (setup.py)
 babel==2.16.0
     # via sphinx
-backports-tarfile==1.2.0
-    # via jaraco-context
 beautifulsoup4==4.12.3
     # via
     #   canonical-sphinx-extensions
@@ -53,7 +49,9 @@ cffi==1.17.1
     #   cryptography
     #   pygit2
 chardet==5.2.0
-    # via tox
+    # via
+    #   python-debian
+    #   tox
 charset-normalizer==3.4.0
     # via requests
 click==8.1.7
@@ -66,15 +64,15 @@ colorama==0.4.6
     # via
     #   sphinx-autobuild
     #   tox
-coverage==7.6.2
+coverage==7.6.4
     # via rockcraft (setup.py)
 craft-application==4.3.0
     # via rockcraft (setup.py)
-craft-archives==2.0.0
+craft-archives==2.0.1
     # via
     #   craft-application
     #   rockcraft (setup.py)
-craft-cli==2.8.0
+craft-cli==2.9.0
     # via
     #   craft-application
     #   rockcraft (setup.py)
@@ -84,15 +82,15 @@ craft-parts==2.1.2
     # via
     #   craft-application
     #   rockcraft (setup.py)
-craft-platforms==0.3.1
+craft-platforms==0.4.0
     # via
     #   craft-application
     #   rockcraft (setup.py)
 craft-providers==2.0.4
     # via
     #   craft-application
     #   rockcraft (setup.py)
-cryptography==43.0.1
+cryptography==43.0.3
     # via secretstorage
 cssutils==2.11.1
     # via dict2css
@@ -120,18 +118,12 @@ domdf-python-tools==3.9.0
     #   apeye-core
     #   dict2css
     #   sphinx-toolbox
-exceptiongroup==1.2.2
-    # via
-    #   anyio
-    #   pytest
 filelock==3.16.1
     # via
     #   cachecontrol
     #   sphinx-toolbox
     #   tox
     #   virtualenv
-flake8==4.0.1
-    # via rockcraft (setup.py)
 furo==2024.8.6
     # via canonical-sphinx
 gitdb==4.0.11
@@ -156,9 +148,7 @@ idna==3.10
 imagesize==1.4.1
     # via sphinx
 importlib-metadata==8.5.0
-    # via
-    #   keyring
-    #   twine
+    # via twine
 iniconfig==2.0.0
     # via pytest
 jaraco-classes==3.4.0
@@ -202,14 +192,12 @@ markdown-it-py==3.0.0
     #   mdit-py-plugins
     #   myst-parser
     #   rich
-markupsafe==3.0.1
+markupsafe==3.0.2
     # via
     #   jinja2
     #   sphinx-jinja2-compat
 mccabe==0.6.1
-    # via
-    #   flake8
-    #   rockcraft (setup.py)
+    # via rockcraft (setup.py)
 mdit-py-plugins==0.4.2
     # via myst-parser
 mdurl==0.1.2
@@ -221,7 +209,7 @@ more-itertools==10.5.0
     #   jaraco-functools
 msgpack==1.1.0
     # via cachecontrol
-mypy==1.11.2
+mypy==1.13.0
     # via rockcraft (setup.py)
 mypy-extensions==1.0.0
     # via
@@ -267,8 +255,6 @@ pluggy==1.5.0
     #   tox
 polib==1.2.0
     # via sphinx-lint
-pycodestyle==2.8.0
-    # via flake8
 pycparser==2.22
     # via cffi
 pydantic==2.9.2
@@ -280,12 +266,6 @@ pydantic==2.9.2
     #   craft-providers
 pydantic-core==2.23.4
     # via pydantic
-pydocstyle==6.3.0
-    # via rockcraft (setup.py)
-pyflakes==2.4.0
-    # via
-    #   autoflake
-    #   flake8
 pygit2==1.14.1
     # via craft-application
 pygments==2.18.0
@@ -296,7 +276,7 @@ pygments==2.18.0
     #   sphinx
     #   sphinx-prompt
     #   sphinx-tabs
-pyparsing==3.1.4
+pyparsing==3.2.0
     # via httplib2
 pyproject-api==1.8.0
     # via tox
@@ -316,6 +296,8 @@ pytest-mock==3.14.0
     # via rockcraft (setup.py)
 pytest-subprocess==1.5.2
     # via rockcraft (setup.py)
+python-debian==0.1.49
+    # via craft-archives
 pyxdg==0.28
     # via craft-parts
 pyyaml==6.0.2
@@ -351,11 +333,11 @@ requests-unixsocket2==0.4.2
     #   craft-providers
 rfc3986==2.0.0
     # via twine
-rich==13.9.2
+rich==13.9.3
     # via twine
 ruamel-yaml==0.18.6
     # via sphinx-toolbox
-ruamel-yaml-clib==0.2.8
+ruamel-yaml-clib==0.2.12
     # via ruamel-yaml
 secretstorage==3.3.3
     # via keyring
@@ -370,9 +352,7 @@ snap-helpers==0.4.2
 sniffio==1.3.1
     # via anyio
 snowballstemmer==2.2.0
-    # via
-    #   pydocstyle
-    #   sphinx
+    # via sphinx
 soupsieve==2.6
     # via
     #   beautifulsoup4
@@ -447,47 +427,33 @@ sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
 sphinxext-opengraph==0.9.1
     # via canonical-sphinx
-starlette==0.40.0
+starlette==0.41.0
     # via sphinx-autobuild
 tabulate==0.9.0
     # via
     #   rockcraft (setup.py)
     #   sphinx-toolbox
-tomli==2.0.2
-    # via
-    #   autoflake
-    #   black
-    #   mypy
-    #   pyproject-api
-    #   pytest
-    #   sphinx
-    #   tox
-tox==4.21.2
+tox==4.23.2
     # via rockcraft (setup.py)
 twine==5.1.1
     # via rockcraft (setup.py)
 types-pyyaml==6.0.12.20240917
     # via rockcraft (setup.py)
-types-requests==2.32.0.20240914
+types-requests==2.32.0.20241016
     # via rockcraft (setup.py)
-types-setuptools==75.1.0.20240917
+types-setuptools==75.2.0.20241019
     # via rockcraft (setup.py)
 types-tabulate==0.9.0.20240106
     # via rockcraft (setup.py)
 typing-extensions==4.12.2
     # via
-    #   anyio
-    #   black
     #   craft-application
     #   craft-platforms
     #   domdf-python-tools
     #   mypy
     #   pydantic
     #   pydantic-core
-    #   rich
     #   sphinx-toolbox
-    #   tox
-    #   uvicorn
 uc-micro-py==1.0.3
     # via linkify-it-py
 urllib3==2.2.3
@@ -496,9 +462,9 @@ urllib3==2.2.3
     #   requests-unixsocket2
     #   twine
     #   types-requests
-uvicorn==0.31.1
+uvicorn==0.32.0
     # via sphinx-autobuild
-virtualenv==20.26.6
+virtualenv==20.27.0
     # via tox
 wadllib==2.0.0
     # via lazr-restfulclient