diff --git a/docs/.sphinx/pinned-requirements.txt b/docs/.sphinx/pinned-requirements.txt index d496aee799..39f36c149b 100644 --- a/docs/.sphinx/pinned-requirements.txt +++ b/docs/.sphinx/pinned-requirements.txt @@ -1,4 +1,4 @@ -alabaster==0.7.13 +alabaster==0.7.16 Babel==2.11.0 beautifulsoup4==4.11.1 certifi==2023.7.22 @@ -10,7 +10,7 @@ idna==3.4 imagesize==1.4.1 Jinja2==3.1.3 livereload==2.6.3 -MarkupSafe==2.1.3 +MarkupSafe==2.1.5 packaging==23.2 pyenchant==3.2.2 Pygments==2.15.0 diff --git a/docs/requirements.txt b/docs/requirements.txt index 2155d39e97..54b02fc9e1 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -15,7 +15,7 @@ httplib2==0.22.0 jsonpointer==2.3 jsonschema==2.5.1 launchpadlib==1.11.0 -lazr.restfulclient==0.14.5 +lazr.restfulclient==0.14.6 lazr.uri==1.0.6 mypy-extensions==1.0.0 oauthlib==3.2.2 @@ -24,12 +24,12 @@ platformdirs==3.11.0 polib==1.1.1 progressbar==2.5 protobuf==3.20.3 -psutil==5.9.6 -pydantic==1.10.13 +psutil==5.9.8 +pydantic==1.10.14 pydantic-yaml==0.11.2 pyelftools==0.29 pygit2==1.13.3 -pylxd==2.3.1 +pylxd==2.3.2 python-debian==0.1.49 pyxdg==0.28 PyYAML==6.0.1 diff --git a/requirements-devel.txt b/requirements-devel.txt index 502c50b963..0b64308bf5 100644 --- a/requirements-devel.txt +++ b/requirements-devel.txt @@ -1,7 +1,7 @@ astroid==2.15.8 attrs==23.2.0 black==24.3.0 -cachetools==5.3.2 +cachetools==5.3.3 catkin-pkg==1.0.0 certifi==2023.11.17 cffi==1.16.0 @@ -10,7 +10,7 @@ charset-normalizer==3.3.2 click==8.1.7 codespell==2.2.6 colorama==0.4.6 -coverage==7.4.0 +coverage==7.4.4 craft-application==2.2.0 craft-archives==1.1.3 craft-cli==2.5.1 @@ -18,27 +18,27 @@ craft-grammar==1.1.2 craft-parts==1.29.0 craft-providers==1.23.1 craft-store==2.6.1 -cryptography==42.0.4 +cryptography==42.0.5 Deprecated==1.2.14 -dill==0.3.7 +dill==0.3.8 distlib==0.3.8 distro==1.9.0 docutils==0.19 -filelock==3.13.1 +filelock==3.13.3 fixtures==4.1.0 gnupg==2.3.1 httplib2==0.22.0 -hupper==1.12 +hupper==1.12.1 idna==3.6 importlib-metadata==7.0.1 iniconfig==2.0.0 isort==5.13.2 -jaraco.classes==3.3.0 +jaraco.classes==3.3.1 jeepney==0.8.0 jsonschema==2.5.1 -keyring==24.3.0 +keyring==24.3.1 launchpadlib==1.11.0 -lazr.restfulclient==0.14.5 +lazr.restfulclient==0.14.6 lazr.uri==1.0.6 lazy-object-proxy==1.10.0 lxml==5.0.0 @@ -60,11 +60,11 @@ platformdirs==4.1.0 pluggy==1.3.0 progressbar==2.5 protobuf==3.20.3 -psutil==5.9.7 +psutil==5.9.8 ptyprocess==0.7.0 pycodestyle==2.11.1 pycparser==2.21 -pydantic==1.10.13 +pydantic==1.10.14 pydantic-yaml==0.11.2 pydocstyle==6.3.0 pyelftools==0.30 @@ -74,14 +74,14 @@ pygit2==1.13.3 pylint==2.17.7 pylint-fixme-info==1.0.3 pylint-pytest==1.1.7 -pylxd==2.3.1 +pylxd==2.3.2 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyparsing==3.1.1 +pyparsing==3.1.2 pyproject-api==1.6.1 pyramid==2.0.2 pyRFC3339==1.1 -pyright==1.1.350 +pyright==1.1.356 pytest==7.4.4 pytest-cov==4.1.0 pytest-mock==3.14.0 @@ -105,7 +105,7 @@ testscenarios==0.5.0 testtools==2.7.1 tinydb==4.8.0 toml==0.10.2 -tomlkit==0.12.3 +tomlkit==0.12.4 tox==4.11.4 translationstring==1.4 types-Deprecated==1.2.9.3 @@ -119,7 +119,7 @@ types-urllib3==1.26.25.14 typing_extensions==4.9.0 urllib3==1.26.18 venusian==3.1.0 -virtualenv==20.25.0 +virtualenv==20.25.1 wadllib==1.3.6 WebOb==1.8.7 wrapt==1.16.0 @@ -129,4 +129,4 @@ zipp==3.17.0 zope.deprecation==5.0 zope.interface==6.1 python-apt @ https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/python-apt/2.4.0ubuntu1/python-apt_2.4.0ubuntu1.tar.xz; sys.platform == "linux" -pyinstaller==5.13.1; sys.platform == "win32" +pyinstaller==5.13.2; sys.platform == "win32" diff --git a/requirements.txt b/requirements.txt index e2cc50dcc3..69af70b0fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ craft-grammar==1.1.2 craft-parts==1.29.0 craft-providers==1.23.1 craft-store==2.6.1 -cryptography==42.0.4 +cryptography==42.0.5 Deprecated==1.2.14 distro==1.9.0 docutils==0.19 @@ -20,12 +20,12 @@ gnupg==2.3.1 httplib2==0.22.0 idna==3.6 importlib-metadata==7.0.1 -jaraco.classes==3.3.0 +jaraco.classes==3.3.1 jeepney==0.8.0 jsonschema==2.5.1 -keyring==24.3.0 +keyring==24.3.1 launchpadlib==1.11.0 -lazr.restfulclient==0.14.5 +lazr.restfulclient==0.14.6 lazr.uri==1.0.6 lxml==5.0.0 macaroonbakery==1.3.4 @@ -37,16 +37,16 @@ packaging==23.2 platformdirs==4.1.0 progressbar==2.5 protobuf==3.20.3 -psutil==5.9.7 +psutil==5.9.8 pycparser==2.21 -pydantic==1.10.13 +pydantic==1.10.14 pydantic-yaml==0.11.2 pyelftools==0.30 pygit2==1.13.3 -pylxd==2.3.1 +pylxd==2.3.2 pymacaroons==0.13.0 PyNaCl==1.5.0 -pyparsing==3.1.1 +pyparsing==3.1.2 pyRFC3339==1.1 python-dateutil==2.8.2 python-debian==0.1.49 diff --git a/snapcraft/remote/git.py b/snapcraft/remote/git.py index f6ae785662..bc1be8146a 100644 --- a/snapcraft/remote/git.py +++ b/snapcraft/remote/git.py @@ -84,7 +84,7 @@ def get_git_repo_type(path: Path) -> GitType: :returns: GitType """ if is_repo(path): - repo = pygit2.Repository(path) + repo = pygit2.Repository(str(path)) if repo.is_shallow: return GitType.SHALLOW return GitType.NORMAL @@ -138,7 +138,7 @@ def __init__(self, path: Path) -> None: if not is_repo(path): self._init_repo() - self._repo = pygit2.Repository(path) + self._repo = pygit2.Repository(str(path)) def add_all(self) -> None: """Add all changes from the working tree to the index. diff --git a/tests/unit/remote/test_git.py b/tests/unit/remote/test_git.py index 4993a1c681..b90f7d37d5 100644 --- a/tests/unit/remote/test_git.py +++ b/tests/unit/remote/test_git.py @@ -183,7 +183,9 @@ def test_add_all(new_dir): (repo.path / "bar").touch() repo.add_all() - status = pygit2.Repository(new_dir).status() + status = pygit2.Repository( # type: ignore[reportAttributeAccessIssue] + new_dir + ).status() assert status == { "foo": pygit2.GIT_STATUS_INDEX_NEW, @@ -196,7 +198,9 @@ def test_add_all_no_files_to_add(new_dir): repo = GitRepo(new_dir) repo.add_all() - status = pygit2.Repository(new_dir).status() + status = pygit2.Repository( # type: ignore[reportAttributeAccessIssue] + new_dir + ).status() assert status == {} @@ -223,7 +227,9 @@ def test_commit(new_dir): repo.commit() # verify commit (the `isinstance` checks are to satsify pyright) - commit = pygit2.Repository(new_dir).revparse_single("HEAD") + commit = pygit2.Repository( # type: ignore[reportAttributeAccessIssue] + new_dir + ).revparse_single("HEAD") assert isinstance(commit, pygit2.Commit) assert commit.message == "auto commit" assert commit.committer.name == "auto commit"