Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some fixes to unbreak main #353

Merged
merged 2 commits into from
May 31, 2024
Merged

Some fixes to unbreak main #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec91e9b
chore: some new ruff lints
tigarmo May 31, 2024
e3f9442
build(deps): pin requests to <2.32.0
tigarmo May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions craft_application/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ def _get_dispatcher(self) -> craft_cli.Dispatcher:
except KeyboardInterrupt as err:
self._emit_error(craft_cli.CraftError("Interrupted."), cause=err)
sys.exit(128 + signal.SIGINT)
except Exception as err: # noqa: BLE001
except Exception as err:
self._emit_error(
craft_cli.CraftError(
f"Internal error while loading {self.app.name}: {err!r}"
Expand Down Expand Up @@ -548,7 +548,7 @@ def run(self) -> int: # noqa: PLR0912 (too many branches)
cause=err,
)
return_code = 1
except Exception as err: # noqa: BLE001 pylint: disable=broad-except
except Exception as err:
self._emit_error(
craft_cli.CraftError(f"{self.app.name} internal error: {err!r}"),
cause=err,
Expand Down
2 changes: 1 addition & 1 deletion craft_application/remote/git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def _init_repo(self) -> None:
f"Could not initialize a git repository in {str(self.path)!r}."
) from error

def push_url( # pylint: disable=too-many-branches
def push_url( # noqa: PLR0912 (too-many-branches)
self,
remote_url: str,
remote_branch: str,
Expand Down
2 changes: 2 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ dev = [
"pytest-mock==3.14.0",
"pytest-rerunfailures==14.0",
"pytest-time>=0.3.1",
# Pin requests because of https://github.com/msabramo/requests-unixsocket/issues/73
mr-cal marked this conversation as resolved.
Show resolved Hide resolved
"requests<2.32.0",
"responses~=0.25.0",
"craft-application[remote]"
]
Expand Down