Skip to content

Commit

Permalink
Merge pull request #185 from ucam-department-of-psychiatry/reinstate-…
Browse files Browse the repository at this point in the history
…security-fixes

Reinstate Django and Tornado security fixes
  • Loading branch information
martinburchell authored Jan 7, 2025
2 parents ae4eb78 + b4e4ad0 commit 8a1d828
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- github_action_scripts/python_setup.sh
jobs:
build-gate:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
gate_version: ["8.6.1", "9.0.1"]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- github_action_scripts/python_setup.sh
jobs:
run-integration-tests:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
# add "postgres" when supported
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
- github_action_scripts/redis_setup.sh
jobs:
python-tests:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
# Run tests with sqlite for all python versions
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"cherrypy==18.6.0", # Cross-platform web server
"colorlog==4.1.0", # colour in logs
"distro==1.5.0", # replaces platform.linux_distribution
"django==4.2.16", # for main CRATE research database web server
"django==4.2.17", # for main CRATE research database web server
"django-debug-toolbar==3.2.1", # Django debug toolbar
# "django-debug-toolbar-template-profiler==2.0.1", # v1.0.1 removed 2017-01-30: division by zero when rendering time is zero # noqa: E501
"django-extensions==3.1.1", # for graph_models, show_urls etc.
Expand Down Expand Up @@ -132,7 +132,7 @@
"pyramid_tm==2.4", # Pyramid transaction management
"redis==4.5.4", # interface to Redis in-memory key-value database
"requests==2.32.2", # HTTP requests
"tornado==6.4.1", # web framework
"tornado==6.4.2", # web framework
"transaction==3.0.0", # generic transaction management
"urllib3==1.26.19", # used by requests
"waitress==3.0.1", # pure-Python WSGI server
Expand Down

0 comments on commit 8a1d828

Please sign in to comment.