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
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,19 @@ repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0
hooks:
- id: check-ast
- id: check-docstring-first
- id: check-executables-have-shebangs
- id: check-merge-conflict
- id: check-symlinks
- id: debug-statements
- id: trailing-whitespace
- id: check-yaml
- id: mixed-line-ending
- id: name-tests-test
args: ['--django']
- id: check-json
- id: requirements-txt-fixer
- repo: https://github.com/codespell-project/codespell
rev: v1.16.0
hooks:
Expand All @@ -37,6 +44,10 @@ repos:
rev: v0.0.3
hooks:
- id: taskcluster_yml
- repo: https://github.com/asottile/yesqa
rev: v0.0.11
hooks:
- id: yesqa
- repo: meta
hooks:
- id: check-useless-excludes
Expand Down
6 changes: 2 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
boto3>=1.9
dockerfile-parse==0.0.15
multidict<4.6.0
Comment thread
marco-c marked this conversation as resolved.
pyyaml==5.2
taskcluster==24.1.0
taskcluster-urls==12.1.0
twine==2.0.0
pyyaml==5.2

# limits to avoid building with gcc on alpine
multidict<4.6.0
yarl<1.4.0
4 changes: 2 additions & 2 deletions taskboot/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

logger = logging.getLogger(__name__)

# docker.io/mozilla/taskboot:latest 172.3MiB 25 hours ago About an hour ago sha256:e339e39884d2a6f44b493e8f135e5275d0e47209b3f990b768228534944db6e7 # noqa
# docker.io/mozilla/taskboot:latest 172.3MiB 25 hours ago About an hour ago sha256:e339e39884d2a6f44b493e8f135e5275d0e47209b3f990b768228534944db6e7
IMG_LS_REGEX = re.compile(
r"([\w\.]+)/(([\w\-_\.]+)/([\w\-_\.]+)):([\w\-_\.]+)\t+([\.\w]+)\t+([\w ]+)\t+([\w ]+)\t+sha256:(\w{64})"
) # noqa
)

IMG_NAME_REGEX = re.compile(r"(?P<name>[\/\w\-\._]+):?(?P<tag>\S*)")

Expand Down
2 changes: 1 addition & 1 deletion tests/test_docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def test_list_local_images(mock_docker):
"1 days ago",
"1 days ago",
"sha256:991d19e5156799aa79cf7138b8b843601f180e68f625b892df40a1993b7ac7da",
) # noqa
)
]
assert mock_docker.list_images() == [
{
Expand Down