Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repos:
rev: 5.10.1
hooks:
- id: isort
- repo: https://gitlab.com/pycqa/flake8
- repo: https://github.com/pycqa/flake8
rev: 5.0.4
hooks:
- id: flake8
Expand Down
3 changes: 2 additions & 1 deletion noxfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def safety(session: nox.Session) -> None:
"""Scan dependencies for insecure packages."""
session.install(".[dev]")
session.install("safety")
session.run("safety", "check", "--full-report")
# Ignore https://github.com/pytest-dev/py/issues/287
session.run("safety", "check", "--full-report", "-i", "51457")


@nox.session
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ install_requires=

[options.extras_require]
tests =
pytest==7.1.2
pytest==7.2.0
pytest-sugar==0.9.5
pytest-cov==3.0.0
pytest-mock==3.8.2
Expand Down
6 changes: 4 additions & 2 deletions src/iterative_telemetry/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

@dataclasses.dataclass
class TelemetryEvent:
# pylint: disable=multiple-statements
interface: str
action: str
error: Optional[str] = None
Expand Down Expand Up @@ -283,7 +284,8 @@ def _generate_github_id():
group_id = f"{server_url}/{os.path.dirname(repository)}"
try:
user_id = subprocess.check_output( # nosec B603, B607
["gh", "api", f"users/{actor}", "--jq", ".name, .login, .id"]
["gh", "api", f"users/{actor}", "--jq", ".name, .login, .id"],
text=True,
)
except subprocess.SubprocessError:
return None
Expand Down Expand Up @@ -316,7 +318,7 @@ def _generate_bitbucket_id():
return None
try:
user_id = subprocess.check_output( # nosec B603, B607
["git", "log", "-1", "--pretty=format:'%ae'"]
["git", "log", "-1", "--pretty=format:'%ae'"], text=True
)
return group_id, user_id
except subprocess.SubprocessError:
Expand Down