diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index fa9b095..54e37ee 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -25,14 +25,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 # Override language selection by uncommenting this and choosing your languages with: languages: python - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 \ No newline at end of file + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 79a5be9..bb8a095 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,10 +29,10 @@ jobs: timeout-minutes: 12 - name: Repo checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} diff --git a/JobRunner/callback_server.py b/JobRunner/callback_server.py index 4b9845b..995b9d6 100644 --- a/JobRunner/callback_server.py +++ b/JobRunner/callback_server.py @@ -5,13 +5,13 @@ from sanic import Sanic from sanic.config import Config -from sanic.exceptions import abort +from sanic.exceptions import SanicException from sanic.log import logger from sanic.response import json Config.SANIC_REQUEST_TIMEOUT = 300 -app = Sanic(__name__) +app = Sanic("jobrunner") outputs = dict() prov = [] @@ -67,7 +67,7 @@ def _check_rpc_token(token): if app.config.get("bypass_token"): pass else: - abort(401) + raise SanicException(status_code=401) def _handle_provenance(): @@ -85,7 +85,7 @@ def _handle_submit(module, method, data, token): def _handle_checkjob(data): if "params" not in data: - abort(404) + raise SanicException(status_code=404) job_id = data["params"][0] _check_finished(f"Checkjob for {job_id}") resp = {"finished": 0} diff --git a/requirements-dev.txt b/requirements-dev.txt index 873df76..69292fb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,4 @@ nose==1.3.7 -aiohttp==3.8.4 +aiohttp==3.9.1 nose-cov sanic-testing==0.8.3 - diff --git a/requirements.txt b/requirements.txt index 1d87790..906d13d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -sanic==21.9.3 -docker==3.6.0 +sanic==21.12.2 +docker==7.0.0 websockets==10.0 -requests==2.27.1 -uvloop==0.17.0 -websocket-client==1.6.1 +requests==2.31.0 +uvloop==0.19.0 +websocket-client==1.7.0