Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
matrix:
os:
- ubuntu-latest
python-version: ['3.8', '3.11', '3.12']
python-version: ['3.11', '3.12']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
22 changes: 12 additions & 10 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
-e git+https://github.com/openedx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
# via -r requirements/base.in
certifi==2022.12.7
certifi==2025.1.31
# via requests
charset-normalizer==3.1.0
charset-normalizer==3.4.1
# via requests
dogstatsd-python==0.5.6
# via -r requirements/base.in
idna==3.4
idna==3.10
# via requests
newrelic==8.7.0
newrelic==10.9.0
# via -r requirements/base.in
path==16.6.0
path==17.1.0
# via path-py
path-py==12.5.0
# via -r requirements/base.in
requests==2.28.2
requests==2.32.3
# via -r requirements/base.in
six==1.16.0
six==1.17.0
# via -r requirements/base.in
urllib3==1.26.15
# via requests
urllib3==2.2.3
# via
# -c requirements/common_constraints.txt
# requests
46 changes: 17 additions & 29 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,76 +1,64 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
-e git+https://github.com/openedx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
# via -r requirements/test.txt
attrs==22.2.0
# via
# -r requirements/test.txt
# pytest
certifi==2022.12.7
certifi==2025.1.31
# via
# -r requirements/test.txt
# requests
charset-normalizer==3.1.0
charset-normalizer==3.4.1
# via
# -r requirements/test.txt
# requests
coverage[toml]==7.2.1
coverage[toml]==7.8.0
# via
# -r requirements/ci.in
# -r requirements/test.txt
# pytest-cov
dogstatsd-python==0.5.6
# via -r requirements/test.txt
exceptiongroup==1.1.1
# via
# -r requirements/test.txt
# pytest
idna==3.4
idna==3.10
# via
# -r requirements/test.txt
# requests
iniconfig==2.0.0
iniconfig==2.1.0
# via
# -r requirements/test.txt
# pytest
mock==5.0.1
mock==5.2.0
# via -r requirements/test.txt
newrelic==8.7.0
newrelic==10.9.0
# via -r requirements/test.txt
packaging==23.0
packaging==25.0
# via
# -r requirements/test.txt
# pytest
path==16.6.0
path==17.1.0
# via
# -r requirements/test.txt
# path-py
path-py==12.5.0
# via -r requirements/test.txt
pluggy==1.0.0
pluggy==1.5.0
# via
# -r requirements/test.txt
# pytest
pytest==7.2.2
pytest==8.3.5
# via
# -r requirements/test.txt
# pytest-cov
pytest-cov==4.0.0
pytest-cov==6.1.1
# via -r requirements/test.txt
requests==2.28.2
requests==2.32.3
# via -r requirements/test.txt
six==1.16.0
six==1.17.0
# via -r requirements/test.txt
tomli==2.0.1
# via
# -r requirements/test.txt
# coverage
# pytest
urllib3==1.26.15
urllib3==2.2.3
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
# requests
17 changes: 8 additions & 9 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,21 @@
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<4.0
Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
# Cause: https://github.com/openedx/edx-lint/issues/475
# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
urllib3<2.3.0
12 changes: 7 additions & 5 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
wheel==0.40.0
wheel==0.45.1
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.0.1
# via -r requirements/pip.in
setuptools==67.6.0
pip==24.2
# via
# -c requirements/common_constraints.txt
# -r requirements/pip.in
setuptools==79.0.0
# via -r requirements/pip.in
20 changes: 10 additions & 10 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
build==0.10.0
build==1.2.2.post1
# via pip-tools
click==8.1.3
click==8.1.8
# via pip-tools
packaging==23.0
packaging==25.0
# via build
pip-tools==6.12.3
pip-tools==7.4.1
# via -r requirements/pip_tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via build
wheel==0.40.0
pyproject-hooks==1.2.0
# via
# build
# pip-tools
wheel==0.45.1
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
19 changes: 10 additions & 9 deletions requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
-e git+https://github.com/openedx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
# via -r requirements/base.txt
certifi==2022.12.7
certifi==2025.1.31
# via
# -r requirements/base.txt
# requests
charset-normalizer==3.1.0
charset-normalizer==3.4.1
# via
# -r requirements/base.txt
# requests
dogstatsd-python==0.5.6
# via -r requirements/base.txt
idna==3.4
idna==3.10
# via
# -r requirements/base.txt
# requests
newrelic==8.7.0
newrelic==10.9.0
# via -r requirements/base.txt
path==16.6.0
path==17.1.0
# via
# -r requirements/base.txt
# path-py
path-py==12.5.0
# via -r requirements/base.txt
requests==2.28.2
requests==2.32.3
# via -r requirements/base.txt
six==1.16.0
six==1.17.0
# via -r requirements/base.txt
urllib3==1.26.15
urllib3==2.2.3
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
# requests
41 changes: 17 additions & 24 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,60 +1,53 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
-e git+https://github.com/openedx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
# via -r requirements/production.txt
attrs==22.2.0
# via pytest
certifi==2022.12.7
certifi==2025.1.31
# via
# -r requirements/production.txt
# requests
charset-normalizer==3.1.0
charset-normalizer==3.4.1
# via
# -r requirements/production.txt
# requests
coverage[toml]==7.2.1
coverage[toml]==7.8.0
# via pytest-cov
dogstatsd-python==0.5.6
# via -r requirements/production.txt
exceptiongroup==1.1.1
# via pytest
idna==3.4
idna==3.10
# via
# -r requirements/production.txt
# requests
iniconfig==2.0.0
iniconfig==2.1.0
# via pytest
mock==5.0.1
mock==5.2.0
# via -r requirements/test.in
newrelic==8.7.0
newrelic==10.9.0
# via -r requirements/production.txt
packaging==23.0
packaging==25.0
# via pytest
path==16.6.0
path==17.1.0
# via
# -r requirements/production.txt
# path-py
path-py==12.5.0
# via -r requirements/production.txt
pluggy==1.0.0
pluggy==1.5.0
# via pytest
pytest==7.2.2
pytest==8.3.5
# via pytest-cov
pytest-cov==4.0.0
pytest-cov==6.1.1
# via -r requirements/test.in
requests==2.28.2
requests==2.32.3
# via -r requirements/production.txt
six==1.16.0
six==1.17.0
# via -r requirements/production.txt
tomli==2.0.1
# via
# coverage
# pytest
urllib3==1.26.15
urllib3==2.2.3
# via
# -c requirements/common_constraints.txt
# -r requirements/production.txt
# requests
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

setup(
name='xqueue_watcher',
version='0.3',
version='0.4',
description='XQueue Pull Grader',
packages=[
'grader_support',
Expand Down
4 changes: 2 additions & 2 deletions xqueue_watcher/grader.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Implementation of a grader compatible with XServer
"""
import html
import sys
import os
import time
import json
from path import Path
Expand Down Expand Up @@ -130,7 +130,7 @@ def process_item(self, content, queue=None):

self.log.debug(f"Processing submission, grader payload: {payload}")
relative_grader_path = grader_config['grader']
grader_path = (self.grader_root / relative_grader_path).abspath()
grader_path = os.path.abspath(self.grader_root / relative_grader_path)
start = time.time()
results = self.grade(grader_path, grader_config, student_response)

Expand Down