Skip to content

Commit

Permalink
chore: Post Django32 Cleanup (#156)
Browse files Browse the repository at this point in the history
Co-authored-by: Mohammad Ahtasham ul Hassan <ahthassan74@gmail.com>
  • Loading branch information
edx-requirements-bot and aht007 authored Feb 7, 2022
1 parent ad91dce commit 74a9bb1
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 45 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django22-drf312, django30-drf312, django31-drf312, django32-drf312, django32-drflatest, quality, docs]
toxenv: [quality, docs, django32-drf312, django32-drflatest, django40-drf312, django40-drflatest]

steps:
- uses: actions/checkout@v2
Expand All @@ -36,8 +36,8 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django22-drf312'
if: matrix.python-version == '3.8' && matrix.toxenv=='django32-drf312'
uses: codecov/codecov-action@v1
with:
flags: unittests
fail_ci_if_error: true
fail_ci_if_error: true
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
asgiref==3.5.0
# via django
django==3.2.11
django==3.2.12
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
#
certifi==2021.10.8
# via requests
charset-normalizer==2.0.10
charset-normalizer==2.0.11
# via requests
coverage==6.3
coverage==6.3.1
# via coveralls
coveralls==3.3.1
# via -r requirements/ci.in
Expand Down
9 changes: 4 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ certifi==2021.10.8
# -r requirements/docs.txt
# -r requirements/test.txt
# requests
charset-normalizer==2.0.10
charset-normalizer==2.0.11
# via
# -r requirements/docs.txt
# -r requirements/test.txt
Expand All @@ -52,13 +52,13 @@ code-annotations==1.2.0
# via
# -r requirements/test.txt
# edx-lint
coverage[toml]==6.3
coverage[toml]==6.3.1
# via
# -r requirements/test.txt
# pytest-cov
ddt==1.4.4
# via -r requirements/test.txt
django==3.2.11
django==3.2.12
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
Expand All @@ -84,7 +84,7 @@ edx-lint==5.2.1
# via -r requirements/test.txt
factory-boy==3.2.1
# via -r requirements/test.txt
faker==11.3.0
faker==12.0.0
# via
# -r requirements/test.txt
# factory-boy
Expand Down Expand Up @@ -299,7 +299,6 @@ stevedore==3.5.0
text-unidecode==1.3
# via
# -r requirements/test.txt
# faker
# python-slugify
toml==0.10.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ babel==2.9.1
# via sphinx
certifi==2021.10.8
# via requests
charset-normalizer==2.0.10
charset-normalizer==2.0.11
# via requests
docutils==0.17.1
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.37.1
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==21.3.1
pip==22.0.2
# via -r requirements/pip.in
setuptools==60.5.0
setuptools==60.7.1
# via -r requirements/pip.in
10 changes: 4 additions & 6 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ certifi==2021.10.8
# via
# -r requirements/docs.txt
# requests
charset-normalizer==2.0.10
charset-normalizer==2.0.11
# via
# -r requirements/docs.txt
# requests
Expand All @@ -39,7 +39,7 @@ click-log==0.3.2
# via edx-lint
code-annotations==1.2.0
# via edx-lint
coverage[toml]==6.3
coverage[toml]==6.3.1
# via pytest-cov
ddt==1.4.4
# via -r requirements/test.in
Expand All @@ -61,7 +61,7 @@ edx-lint==5.2.1
# via -r requirements/test.in
factory-boy==3.2.1
# via -r requirements/test.in
faker==11.3.0
faker==12.0.0
# via factory-boy
freezegun==1.1.0
# via -r requirements/test.in
Expand Down Expand Up @@ -218,9 +218,7 @@ sqlparse==0.4.2
stevedore==3.5.0
# via code-annotations
text-unidecode==1.3
# via
# faker
# python-slugify
# via python-slugify
toml==0.10.2
# via
# pylint
Expand Down
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ def load_requirements(*requirements_paths):
classifiers=[
'Development Status :: 3 - Alpha',
'Framework :: Django',
'Framework :: Django :: 2.2',
'Framework :: Django :: 3.0',
'Framework :: Django :: 3.1',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Affero General Public License v3',
'Operating System :: OS Independent',
Expand Down
2 changes: 1 addition & 1 deletion submissions/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
""" API for creating submissions and scores. """
__version__ = '3.4.4'
__version__ = '3.5.0'
9 changes: 2 additions & 7 deletions submissions/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,10 @@
User = auth.get_user_model()

# Signal to inform listeners that a score has been changed
score_set = Signal(providing_args=[
'points_possible', 'points_earned', 'anonymous_user_id',
'course_id', 'item_id', 'created_at'
])
score_set = Signal()

# Signal to inform listeners that a score has been reset
score_reset = Signal(
providing_args=['anonymous_user_id', 'course_id', 'item_id', 'created_at']
)
score_reset = Signal()


class AnonymizedUserIDField(models.CharField):
Expand Down
25 changes: 11 additions & 14 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,34 +1,31 @@
[tox]
envlist = py38-django{22,30,31,32}-drf{12, latest}, quality, docs
envlist = py38-django{32,40}-drf{312, latest}, quality, docs

[testenv]
setenv=
setenv =
DJANGO_SETTINGS_MODULE = settings
deps =
deps =
-r{toxinidir}/requirements/test.txt
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2
django32: Django>=3.2,<4.0
drf311: djangorestframework<3.12.0
django40: Django>=4.0,<4.1
drf312: djangorestframework<3.13.0
drflatest: djangorestframework
commands =
commands =
python -Wd -m pytest {posargs}

[testenv:quality]
setenv=
setenv =
DJANGO_SETTINGS_MODULE=settings
whitelist_externals =
whitelist_externals =
make
deps =
deps =
-r{toxinidir}/requirements/dev.txt
commands =
commands =
make test_quality

[testenv:docs]
deps =
deps =
-r{toxinidir}/requirements/dev.txt
commands =
commands =
python setup.py build_sphinx

0 comments on commit 74a9bb1

Please sign in to comment.