Skip to content

Commit

Permalink
Merge pull request #110 from openedx/salman/django-4.2-upgrade
Browse files Browse the repository at this point in the history
Add django 4.2 support
  • Loading branch information
salman2013 authored Jul 27, 2023
2 parents 4a94650 + 927ff2e commit 5ae84bb
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@ jobs:
- csslint
- eslint
- quality
- django22
- django30
- django31
- django32
- django42
steps:
- uses: actions/checkout@v2
- name: setup python
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def is_requirement(line):

setup(
name='xblock-sql-grader',
version='0.3.1',
version='0.4.0',
description='SQL Grader XBlock', # TODO: write a better description.
license='AGPLv3',
long_description=README,
Expand All @@ -120,10 +120,8 @@ def is_requirement(line):
classifiers=[
'Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: Apache Software License',
'Natural Language :: English',
Expand Down
2 changes: 1 addition & 1 deletion sql_grader/mixins/grading.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# despite it also being a third-party package.
from codejail.safe_exec import safe_exec
from codejail.safe_exec import SafeExecException
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from xblock.fields import Boolean
from xblock.fields import Float
from xblock.fields import Integer
Expand Down
8 changes: 2 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,14 @@
envlist =
csslint
eslint
py38-django{22,30,31,32}
quality
py38-django{32,42}quality

[testenv]
deps =
-rrequirements/test.txt
-e git+https://github.com/openedx/[email protected]#egg=codejail
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<4.0

django42: Django>=4.2,<4.3
commands =
coverage run manage.py test
coverage report
Expand Down

0 comments on commit 5ae84bb

Please sign in to comment.