Skip to content

Commit

Permalink
Upgrade Python dependencies
Browse files Browse the repository at this point in the history
* Upgrade pre-commit dependencies
* Update GitHub CI workflow
* Remove pyvcr
  • Loading branch information
replaceafill authored Nov 13, 2023
1 parent ca50b02 commit b0c5f93
Show file tree
Hide file tree
Showing 61 changed files with 1,598 additions and 9,270 deletions.
23 changes: 17 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,14 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: [
"3.8",
"3.9",
"3.10",
]
steps:
- name: "Check out repository"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"
- name: "Set up Python ${{ matrix.python-version }}"
uses: "actions/setup-python@v4"
with:
Expand Down Expand Up @@ -56,11 +60,18 @@ jobs:
strategy:
fail-fast: false
matrix:
ubuntu-version: ["20.04", "22.04"]
python-version: ["3.8", "3.9", "3.10"]
ubuntu-version: [
"20.04",
"22.04",
]
python-version: [
"3.8",
"3.9",
"3.10",
]
steps:
- name: "Check out repository"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"
- name: "Run tests"
run: |
./run.sh
Expand All @@ -77,7 +88,7 @@ jobs:
runs-on: "ubuntu-22.04"
steps:
- name: "Check out repository"
uses: "actions/checkout@v3"
uses: "actions/checkout@v4"
- name: "Set up Python 3.9"
uses: "actions/setup-python@v4"
with:
Expand Down
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: pretty-format-json
args: [--no-ensure-ascii, --autofix]
Expand All @@ -9,22 +9,22 @@ repos:
osdeps/.*\.json
)
- repo: https://github.com/asottile/pyupgrade
rev: v3.10.1
rev: v3.15.0
hooks:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/asottile/reorder_python_imports
rev: v3.10.0
rev: v3.12.0
hooks:
- id: reorder-python-imports
args: [--py38-plus]
- repo: https://github.com/adamchainz/django-upgrade
rev: "1.14.1"
rev: "1.15.0"
hooks:
- id: django-upgrade
args: [--target-version, "3.2"]
- repo: https://github.com/psf/black
rev: "23.7.0"
rev: "23.10.1"
hooks:
- id: black
args: [--safe, --quiet]
Expand All @@ -36,13 +36,13 @@ repos:
- flake8-bugbear==23.9.16
- flake8-comprehensions==3.14.0
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.48.0
rev: v8.52.0
hooks:
- id: eslint
files: ^storage_service/static/js/(project|.*directory_picker|file-explorer).js
args: [--fix]
additional_dependencies:
- eslint@8.46.0
- eslint@8.52.0
- eslint-config-prettier@9.0.0
- eslint-plugin-prettier@5.0.0
- prettier@3.0.2
- eslint-plugin-prettier@5.0.1
- prettier@3.0.3
1 change: 0 additions & 1 deletion requirements-dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ pytest-mock
pytest-randomly
pytest
tox
vcrpy
62 changes: 26 additions & 36 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
#
# pip-compile --allow-unsafe --output-file=requirements-dev.txt requirements-dev.in
#
agentarchives==0.8.0
agentarchives==0.9.0
# via -r requirements.txt
asgiref==3.7.2
# via
# -r requirements.txt
# django
bagit==1.8.1
# via -r requirements.txt
boto3==1.28.62
boto3==1.28.84
# via -r requirements.txt
botocore==1.31.62
botocore==1.31.84
# via
# -r requirements.txt
# boto3
Expand All @@ -23,7 +23,7 @@ brotli==1.1.0
# via -r requirements.txt
build==1.0.3
# via pip-tools
cachetools==5.3.1
cachetools==5.3.2
# via tox
certifi==2023.7.22
# via
Expand All @@ -35,7 +35,7 @@ cffi==1.16.0
# cryptography
chardet==5.2.0
# via tox
charset-normalizer==3.3.0
charset-normalizer==3.3.2
# via
# -r requirements.txt
# requests
Expand All @@ -47,7 +47,7 @@ coverage[toml]==7.3.2
# via
# -r requirements-dev.in
# pytest-cov
cryptography==41.0.4
cryptography==41.0.5
# via
# -r requirements.txt
# josepy
Expand All @@ -63,7 +63,7 @@ distlib==0.3.7
# via virtualenv
dj-database-url==2.1.0
# via -r requirements.txt
django==3.2.22
django==3.2.23
# via
# -r requirements.txt
# dj-database-url
Expand All @@ -74,7 +74,7 @@ django==3.2.22
# mozilla-django-oidc
django-auth-ldap==4.6.0
# via -r requirements.txt
django-cas-ng==5.0.0
django-cas-ng==5.0.1
# via -r requirements.txt
django-csp==3.7
# via -r requirements.txt
Expand All @@ -86,13 +86,13 @@ django-tastypie==0.14.6
# via -r requirements.txt
exceptiongroup==1.1.3
# via pytest
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
gevent==23.9.1
# via -r requirements.txt
greenlet==3.0.0
greenlet==3.0.1
# via
# -r requirements.txt
# gevent
Expand All @@ -106,12 +106,11 @@ idna==3.4
# via
# -r requirements.txt
# requests
# yarl
importlib-metadata==6.8.0
# via
# build
# pytest-randomly
importlib-resources==6.1.0
importlib-resources==6.1.1
# via -r requirements.txt
iniconfig==2.0.0
# via pytest
Expand All @@ -125,7 +124,7 @@ jmespath==1.0.1
# -r requirements.txt
# boto3
# botocore
josepy==1.13.0
josepy==1.14.0
# via
# -r requirements.txt
# mozilla-django-oidc
Expand All @@ -141,16 +140,14 @@ lxml==4.9.3
# metsrw
# python-cas
# sword2
metsrw==0.4.0
metsrw==0.5.0
# via -r requirements.txt
mozilla-django-oidc==3.0.0
# via -r requirements.txt
msgpack==1.0.7
# via
# -r requirements.txt
# oslo-serialization
multidict==6.0.4
# via yarl
mysqlclient==2.2.0
# via
# -r requirements.txt
Expand Down Expand Up @@ -182,7 +179,7 @@ oslo-serialization==5.2.0
# via
# -r requirements.txt
# python-keystoneclient
oslo-utils==6.2.1
oslo-utils==6.3.0
# via
# -r requirements.txt
# oslo-serialization
Expand All @@ -197,7 +194,7 @@ packaging==23.2
# pytest
# python-keystoneclient
# tox
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements.txt
# keystoneauth1
Expand All @@ -216,7 +213,7 @@ pluggy==1.3.0
# via
# pytest
# tox
prometheus-client==0.17.1
prometheus-client==0.18.0
# via
# -r requirements.txt
# django-prometheus
Expand All @@ -233,7 +230,7 @@ pycparser==2.21
# via
# -r requirements.txt
# cffi
pyopenssl==23.2.0
pyopenssl==23.3.0
# via
# -r requirements.txt
# josepy
Expand All @@ -246,7 +243,7 @@ pyproject-api==1.6.1
# via tox
pyproject-hooks==1.0.0
# via build
pytest==7.4.2
pytest==7.4.3
# via
# -r requirements-dev.in
# pytest-cov
Expand All @@ -255,9 +252,9 @@ pytest==7.4.2
# pytest-randomly
pytest-cov==4.1.0
# via -r requirements-dev.in
pytest-django==4.5.2
pytest-django==4.7.0
# via -r requirements-dev.in
pytest-mock==3.11.1
pytest-mock==3.12.0
# via -r requirements-dev.in
pytest-randomly==3.15.0
# via -r requirements-dev.in
Expand Down Expand Up @@ -294,7 +291,7 @@ pyyaml==6.0.1
# via
# -r requirements.txt
# oslo-config
# vcrpy
# oslo-utils
requests==2.31.0
# via
# -r requirements.txt
Expand Down Expand Up @@ -352,27 +349,21 @@ tzdata==2023.3
# -r requirements.txt
# oslo-serialization
# oslo-utils
urllib3==1.26.17
urllib3==1.26.18
# via
# -r requirements.txt
# botocore
# requests
# vcrpy
vcrpy==5.1.0
# via -r requirements-dev.in
virtualenv==20.24.5
virtualenv==20.24.6
# via tox
wheel==0.41.2
wheel==0.41.3
# via pip-tools
whitenoise==6.6.0
# via -r requirements.txt
wrapt==1.15.0
wrapt==1.16.0
# via
# -r requirements.txt
# debtcollector
# vcrpy
yarl==1.9.2
# via vcrpy
zipp==3.17.0
# via
# -r requirements.txt
Expand All @@ -388,12 +379,11 @@ zope-interface==6.1
# gevent

# The following packages are considered to be unsafe in a requirements file:
pip==23.2.1
pip==23.3.1
# via pip-tools
setuptools==68.2.2
# via
# -r requirements.txt
# josepy
# pip-tools
# zope-event
# zope-interface
Loading

0 comments on commit b0c5f93

Please sign in to comment.