Skip to content

Commit

Permalink
Merge branch 'master' into image-upload-fail
Browse files Browse the repository at this point in the history
  • Loading branch information
irtazaakram authored Sep 12, 2024
2 parents dad100b + 79f9fea commit 317cf00
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
db-version: ['mysql80']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Start container
run: |
docker compose -f .ci/docker-compose-ci.yml up -d
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
8 changes: 4 additions & 4 deletions .github/workflows/migrations-mysql8-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-20.04 ]
os: [ ubuntu-latest ]
python-version: [ '3.11', '3.12' ]

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -36,7 +36,7 @@ jobs:
echo "dir=$(pip cache dir)" >> $GITHUB_OUTPUT
- name: Cache pip dependencies
id: cache-dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.pip-cache-dir.outputs.dir }}
key: ${{ runner.os }}-pip-${{ hashFiles('requirements/pip-tools.txt') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/trivy-code-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Build an image from Dockerfile
run: |
Expand All @@ -29,6 +29,6 @@ jobs:
output: 'trivy-results.sarif'

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: 'trivy-results.sarif'
10 changes: 5 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ certifi==2024.8.30
# via
# elasticsearch
# requests
cffi==1.17.0
cffi==1.17.1
# via
# cryptography
# pynacl
chardet==3.0.4
# via requests
click==8.1.7
# via edx-django-utils
cryptography==43.0.0
cryptography==43.0.1
# via pyjwt
django==4.2.15
django==4.2.16
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
Expand Down Expand Up @@ -72,9 +72,9 @@ edx-django-utils==5.15.0
# via
# -r requirements/base.in
# edx-drf-extensions
edx-drf-extensions==10.3.0
edx-drf-extensions==10.4.0
# via -r requirements/base.in
edx-opaque-keys==2.10.0
edx-opaque-keys==2.11.0
# via edx-drf-extensions
elasticsearch==7.13.4
# via
Expand Down
8 changes: 4 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.15.4
filelock==3.16.0
# via
# tox
# virtualenv
packaging==24.1
# via
# pyproject-api
# tox
platformdirs==4.2.2
platformdirs==4.3.2
# via
# tox
# virtualenv
pluggy==1.5.0
# via tox
pyproject-api==1.7.1
# via tox
tox==4.18.0
tox==4.18.1
# via -r requirements/ci.in
virtualenv==20.26.3
virtualenv==20.26.4
# via tox
3 changes: 0 additions & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,3 @@ python-dateutil==2.4.0
more-itertools==5.0.0
pylint==1.5.0
django-cors-headers==3.14.0


backports-zoneinfo==0.2.1; python_version < '3.9'
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==4.2.15
django==4.2.16
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
build==1.2.1
build==1.2.2
# via pip-tools
click==8.1.7
# via pip-tools
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.44.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via -r requirements/pip.in
setuptools==74.0.0
setuptools==74.1.2
# via -r requirements/pip.in
20 changes: 10 additions & 10 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ certifi==2024.8.30
# -r requirements/base.txt
# elasticsearch
# requests
cffi==1.17.0
cffi==1.17.1
# via
# -r requirements/base.txt
# cryptography
Expand All @@ -41,13 +41,13 @@ coverage[toml]==7.6.1
# via
# -r requirements/test.in
# pytest-cov
cryptography==43.0.0
cryptography==43.0.1
# via
# -r requirements/base.txt
# pyjwt
ddt==1.7.2
# via -r requirements/test.in
diff-cover==9.1.1
diff-cover==9.2.0
# via -r requirements/test.in
distlib==0.3.8
# via virtualenv
Expand Down Expand Up @@ -111,9 +111,9 @@ edx-django-utils==5.15.0
# via
# -r requirements/base.txt
# edx-drf-extensions
edx-drf-extensions==10.3.0
edx-drf-extensions==10.4.0
# via -r requirements/base.txt
edx-opaque-keys==2.10.0
edx-opaque-keys==2.11.0
# via
# -r requirements/base.txt
# edx-drf-extensions
Expand All @@ -132,9 +132,9 @@ elasticsearch-dsl==7.4.1
# django-elasticsearch-dsl-drf
factory-boy==3.3.1
# via -r requirements/test.in
faker==28.1.0
faker==28.4.1
# via factory-boy
filelock==3.15.4
filelock==3.16.0
# via
# tox
# virtualenv
Expand Down Expand Up @@ -186,7 +186,7 @@ pbr==6.1.0
# stevedore
pep8==1.7.1
# via -r requirements/test.in
platformdirs==4.2.2
platformdirs==4.3.2
# via virtualenv
pluggy==1.5.0
# via
Expand Down Expand Up @@ -229,7 +229,7 @@ pytest==8.3.2
# pytest-django
pytest-cov==5.0.0
# via -r requirements/test.in
pytest-django==4.8.0
pytest-django==4.9.0
# via -r requirements/test.in
python-dateutil==2.4.0
# via
Expand Down Expand Up @@ -297,7 +297,7 @@ urllib3==1.26.20
# -r requirements/base.txt
# elasticsearch
# requests
virtualenv==20.26.3
virtualenv==20.26.4
# via tox
wrapt==1.16.0
# via astroid

0 comments on commit 317cf00

Please sign in to comment.