Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/qa/1.x' into qa/2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sevein committed Aug 29, 2024
2 parents b97dd03 + ee0ba15 commit a75a04b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
worker/install/.*\.json
)
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.6
rev: v0.6.2
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down Expand Up @@ -45,7 +45,7 @@ repos:
hooks:
- id: validate-cff
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.11.1
rev: v1.11.2
hooks:
- id: mypy
files: "^worker/"
Expand Down
26 changes: 13 additions & 13 deletions worker/requirements/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ bagit @ git+https://github.com/artefactual-labs/bagit-python.git@4b8fde73b4e6314
# via -r requirements.txt
build==1.2.1
# via pip-tools
cachetools==5.3.3
cachetools==5.5.0
# via tox
certifi==2024.7.4
# via
Expand All @@ -34,7 +34,7 @@ click==8.1.7
# via pip-tools
colorama==0.4.6
# via tox
coverage[toml]==7.5.4
coverage[toml]==7.6.1
# via
# -r requirements-dev.in
# pytest-cov
Expand All @@ -52,17 +52,17 @@ filelock==3.15.4
# virtualenv
gearman3 @ git+https://github.com/artefactual-labs/python-gearman.git@b68efc868c7a494dd6a2d2e820fb098a6da9f797
# via -r requirements.txt
idna==3.7
idna==3.8
# via
# -r requirements.txt
# requests
importlib-resources==6.4.0
importlib-resources==6.4.4
# via
# -r requirements.txt
# opf-fido
iniconfig==2.0.0
# via pytest
lxml==5.2.2
lxml==5.3.0
# via
# -r requirements.txt
# ammcpc
Expand All @@ -79,7 +79,7 @@ olefile==0.47
# opf-fido
opf-fido @ git+https://github.com/artefactual-labs/fido.git@564ceb8018a8650fe931cf20e6780ee008e60fca
# via -r requirements.txt
orjson==3.10.6
orjson==3.10.7
# via -r requirements.txt
packaging==24.1
# via
Expand All @@ -105,7 +105,7 @@ pyproject-hooks==1.1.0
# via
# build
# pip-tools
pytest==8.2.2
pytest==8.3.2
# via
# -r requirements-dev.in
# pytest-cov
Expand All @@ -124,7 +124,7 @@ python-dateutil==2.9.0.post0
# via
# -r requirements.txt
# django-tastypie
python-mimeparse==1.6.0
python-mimeparse==2.0.0
# via
# -r requirements.txt
# django-tastypie
Expand All @@ -138,11 +138,11 @@ six==1.16.0
# -r requirements.txt
# opf-fido
# python-dateutil
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements.txt
# django
tox==4.16.0
tox==4.18.0
# via -r requirements-dev.in
unidecode==1.3.8
# via -r requirements.txt
Expand All @@ -152,11 +152,11 @@ urllib3==2.2.2
# requests
virtualenv==20.26.3
# via tox
wheel==0.43.0
wheel==0.44.0
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
pip==24.1.2
pip==24.2
# via pip-tools
setuptools==70.3.0
setuptools==74.0.0
# via pip-tools
12 changes: 6 additions & 6 deletions worker/requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ django-tastypie==0.14.7
# via -r requirements.in
gearman3 @ git+https://github.com/artefactual-labs/python-gearman.git@b68efc868c7a494dd6a2d2e820fb098a6da9f797
# via -r requirements.in
idna==3.7
idna==3.8
# via requests
importlib-resources==6.4.0
importlib-resources==6.4.4
# via opf-fido
lxml==5.2.2
lxml==5.3.0
# via
# -r requirements.in
# ammcpc
Expand All @@ -43,13 +43,13 @@ olefile==0.47
# via opf-fido
opf-fido @ git+https://github.com/artefactual-labs/fido.git@564ceb8018a8650fe931cf20e6780ee008e60fca
# via -r requirements.in
orjson==3.10.6
orjson==3.10.7
# via -r requirements.in
prometheus-client==0.20.0
# via -r requirements.in
python-dateutil==2.9.0.post0
# via django-tastypie
python-mimeparse==1.6.0
python-mimeparse==2.0.0
# via django-tastypie
requests==2.32.3
# via
Expand All @@ -60,7 +60,7 @@ six==1.16.0
# via
# opf-fido
# python-dateutil
sqlparse==0.5.0
sqlparse==0.5.1
# via django
unidecode==1.3.8
# via -r requirements.in
Expand Down

0 comments on commit a75a04b

Please sign in to comment.