Skip to content

Commit

Permalink
Merge branch 'master' into andytr1/proctored_report
Browse files Browse the repository at this point in the history
  • Loading branch information
@Andytr1
Andytr1 authored May 20, 2019
2 parents 989c966 + 7058a0a commit 9bff904
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 61 deletions.
11 changes: 6 additions & 5 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,14 @@ clean: ## remove generated byte code, coverage reports, and build artifacts
find . -name '*.pyc' -o -name '*.pyo' -o -name '*~' -delete
rm -fr build/ dist/ *.egg-info

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -q pip-tools
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --rebuild --upgrade -o requirements/base.txt requirements/base.in
pip-compile --rebuild --upgrade -o requirements/dev.txt requirements/dev.in
pip-compile --rebuild --upgrade -o requirements/doc.txt requirements/doc.in
pip-compile --rebuild --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in
# Let tox control the Django and djangorestframework versions for tests
sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
Expand Down
17 changes: 10 additions & 7 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --upgrade -o requirements/base.txt requirements/base.in
# make upgrade
#
appdirs==1.4.3 # via fs
backports.os==0.1.1 # via fs
certifi==2019.3.9 # via requests
chardet==3.0.4 # via requests
django-crum==0.7.3
Expand All @@ -14,15 +15,16 @@ django-waffle==0.16.0
django-webpack-loader==0.6.0
django==1.11.20
djangorestframework-jwt==1.11.0 # via edx-drf-extensions
djangorestframework==3.9.3
djangorestframework==3.9.4
edx-django-utils==1.0.3 # via edx-drf-extensions
edx-drf-extensions==2.2.0
edx-drf-extensions==2.2.1
edx-opaque-keys==0.4.4
edx-rest-api-client==1.9.2
edx-when==0.1.3
edx-when==0.1.4
enum34==1.1.6 # via fs
event-tracking==0.2.8
fs==2.4.4 # via xblock
future==0.17.1 # via pyjwkest
fs==2.4.5 # via xblock
future==0.17.1 # via backports.os, pyjwkest
idna==2.8 # via requests
jsonfield==2.0.2
lxml==4.3.3 # via xblock
Expand All @@ -44,7 +46,8 @@ semantic-version==2.6.0 # via edx-drf-extensions
six==1.12.0 # via edx-drf-extensions, edx-opaque-keys, event-tracking, fs, pyjwkest, python-dateutil, stevedore, xblock
slumber==0.7.1 # via edx-rest-api-client
stevedore==1.30.1 # via edx-opaque-keys
urllib3==1.24.2 # via requests
typing==3.6.6 # via fs
urllib3==1.24.3 # via requests
web-fragments==0.3.0 # via xblock
webob==1.8.5 # via xblock
xblock==1.2.2 # via edx-when
8 changes: 6 additions & 2 deletions requirements/constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.

# Sphinx 2.0.0 drops support for python 2.7 which we still need.
Sphinx<2.0.0
# This is a backport which can only be installed on Python 2.7
futures ; python_version == "2.7"

# Sphinx 2.0.0 drops support for python 2.7 which we still need.
# pip-compile can't resolve dependencies for Sphinx 1.8.5:
# https://github.com/jazzband/pip-tools/issues/810
Sphinx<1.8.5

# A dependency of pytest. Pytest doesn't constrain it and 6.0.0 onward
# only works with python 3
Expand Down
41 changes: 25 additions & 16 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,48 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
# make upgrade
#
argparse==1.4.0 # via caniusepython3
astroid==1.5.2 # via edx-lint, pylint, pylint-celery
backports.functools-lru-cache==1.5 # via caniusepython3
backports.functools-lru-cache==1.5 # via astroid, caniusepython3, isort, pylint
bleach==3.1.0 # via readme-renderer
caniusepython3==7.0.0
caniusepython3==7.1.0
certifi==2019.3.9 # via requests
chardet==3.0.4 # via requests
click-log==0.1.8 # via edx-lint
click==7.0 # via click-log, edx-lint, pip-tools
diff-cover==2.0.0
distlib==0.2.8 # via caniusepython3
configparser==3.7.4 # via importlib-metadata, pydocstyle, pylint
contextlib2==0.5.5 # via importlib-metadata
diff-cover==2.0.1
distlib==0.2.9.post0 # via caniusepython3
django==1.11.20
docutils==0.14 # via readme-renderer
edx-i18n-tools==0.4.8
edx_lint==0.5.5
enum34==1.1.6 # via astroid
filelock==3.0.10 # via tox
futures==3.2.0 ; python_version == "2.7" # via caniusepython3, isort
idna==2.8 # via requests
importlib-metadata==0.12 # via path.py
inflect==2.1.0 # via jinja2-pluralize
isort==4.3.17
isort==4.3.20
jinja2-pluralize==0.3.0 # via diff-cover
jinja2==2.10.1 # via diff-cover, jinja2-pluralize
lazy-object-proxy==1.3.1 # via astroid
lazy-object-proxy==1.4.1 # via astroid
markupsafe==1.1.1 # via jinja2
mccabe==0.6.1 # via pylint
packaging==19.0 # via caniusepython3
path.py==11.5.2
pip-tools==3.6.1
pathlib2==2.3.3 # via importlib-metadata
pip-tools==3.7.0
pkginfo==1.5.0.1 # via twine
pluggy==0.9.0 # via tox
pluggy==0.11.0 # via tox
polib==1.1.0 # via edx-i18n-tools
py==1.8.0 # via tox
pycodestyle==2.5.0
pydocstyle==3.0.0
pygments==2.3.1 # via diff-cover, readme-renderer
pygments==2.4.0 # via diff-cover, readme-renderer
pylint-celery==0.3 # via edx-lint
pylint-django==0.7.2 # via edx-lint
pylint-plugin-utils==0.5 # via pylint-celery, pylint-django
Expand All @@ -48,15 +54,18 @@ pyyaml==5.1 # via edx-i18n-tools
readme-renderer==24.0 # via twine
requests-toolbelt==0.9.1 # via twine
requests==2.21.0 # via caniusepython3, requests-toolbelt, twine
six==1.12.0 # via astroid, bleach, diff-cover, edx-i18n-tools, edx-lint, packaging, pip-tools, pydocstyle, pylint, readme-renderer, tox
scandir==1.10.0 # via pathlib2
singledispatch==3.4.0.3 # via astroid, pylint
six==1.12.0 # via astroid, bleach, diff-cover, edx-i18n-tools, edx-lint, packaging, pathlib2, pip-tools, pydocstyle, pylint, readme-renderer, singledispatch, tox
snowballstemmer==1.2.1 # via pydocstyle
toml==0.10.0 # via tox
tox-battery==0.5.1
tox==3.9.0
tqdm==4.31.1 # via twine
tox==3.10.0
tqdm==4.32.1 # via twine
twine==1.13.0
urllib3==1.24.2 # via requests
virtualenv==16.5.0 # via tox
urllib3==1.24.3 # via requests
virtualenv==16.6.0 # via tox
webencodings==0.5.1 # via bleach
wheel==0.33.1
wheel==0.33.4
wrapt==1.11.1 # via astroid
zipp==0.5.0 # via importlib-metadata
2 changes: 1 addition & 1 deletion requirements/doc.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
doc8 # reStructuredText style checker
edx_sphinx_theme # edX theme for Sphinx output
readme_renderer # Validates README.rst for usage on PyPI
sphinx==1.8.5 # Documentation builder
sphinx # Documentation builder
sphinxcontrib-napoleon # Google Style docstring support for sphinx
21 changes: 12 additions & 9 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
# make upgrade
#
alabaster==0.7.12 # via sphinx
appdirs==1.4.3 # via fs
babel==2.6.0 # via sphinx
backports.os==0.1.1 # via fs
bleach==3.1.0 # via readme-renderer
certifi==2019.3.9 # via requests
chardet==3.0.4 # via doc8, requests
Expand All @@ -17,18 +18,19 @@ django-waffle==0.16.0
django-webpack-loader==0.6.0
django==1.11.20
djangorestframework-jwt==1.11.0 # via edx-drf-extensions
djangorestframework==3.9.3
djangorestframework==3.9.4
doc8==0.8.0
docutils==0.14 # via doc8, readme-renderer, restructuredtext-lint, sphinx
edx-django-utils==1.0.3 # via edx-drf-extensions
edx-drf-extensions==2.2.0
edx-drf-extensions==2.2.1
edx-opaque-keys==0.4.4
edx-rest-api-client==1.9.2
edx-sphinx-theme==1.4.0
edx-when==0.1.3
edx-when==0.1.4
enum34==1.1.6 # via fs
event-tracking==0.2.8
fs==2.4.4 # via xblock
future==0.17.1 # via pyjwkest
fs==2.4.5 # via xblock
future==0.17.1 # via backports.os, pyjwkest
idna==2.8 # via requests
imagesize==1.1.0 # via sphinx
jinja2==2.10.1 # via sphinx
Expand All @@ -41,7 +43,7 @@ pbr==5.2.0 # via stevedore
pockets==0.7.2 # via sphinxcontrib-napoleon
psutil==1.2.1 # via edx-django-utils, edx-drf-extensions
pycryptodomex==3.8.1
pygments==2.3.1 # via readme-renderer, sphinx
pygments==2.4.0 # via readme-renderer, sphinx
pyjwkest==1.3.2 # via edx-drf-extensions
pyjwt==1.7.1 # via djangorestframework-jwt, edx-rest-api-client
pymongo==3.8.0 # via edx-opaque-keys, event-tracking
Expand All @@ -58,11 +60,12 @@ semantic-version==2.6.0 # via edx-drf-extensions
six==1.12.0 # via bleach, doc8, edx-drf-extensions, edx-opaque-keys, edx-sphinx-theme, event-tracking, fs, packaging, pockets, pyjwkest, python-dateutil, readme-renderer, sphinx, sphinxcontrib-napoleon, stevedore, xblock
slumber==0.7.1 # via edx-rest-api-client
snowballstemmer==1.2.1 # via sphinx
sphinx==1.8.5
sphinx==1.8.4
sphinxcontrib-napoleon==0.7
sphinxcontrib-websupport==1.1.0 # via sphinx
stevedore==1.30.1 # via doc8, edx-opaque-keys
urllib3==1.24.2 # via requests
typing==3.6.6 # via fs, sphinx
urllib3==1.24.3 # via requests
web-fragments==0.3.0 # via xblock
webencodings==0.5.1 # via bleach
webob==1.8.5 # via xblock
Expand Down
20 changes: 12 additions & 8 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,25 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
# make upgrade
#
argparse==1.4.0 # via caniusepython3
astroid==1.5.2 # via edx-lint, pylint, pylint-celery
backports.functools-lru-cache==1.5 # via caniusepython3
caniusepython3==7.0.0
backports.functools-lru-cache==1.5 # via astroid, caniusepython3, isort, pylint
caniusepython3==7.1.0
certifi==2019.3.9 # via requests
chardet==3.0.4 # via requests
click-log==0.1.8 # via edx-lint
click==7.0 # via click-log, edx-lint
distlib==0.2.8 # via caniusepython3
configparser==3.7.4 # via pydocstyle, pylint
distlib==0.2.9.post0 # via caniusepython3
django==1.11.20
edx_lint==0.5.5
enum34==1.1.6 # via astroid
futures==3.2.0 ; python_version == "2.7" # via caniusepython3, isort
idna==2.8 # via requests
isort==4.3.17
lazy-object-proxy==1.3.1 # via astroid
isort==4.3.20
lazy-object-proxy==1.4.1 # via astroid
mccabe==0.6.1 # via pylint
packaging==19.0 # via caniusepython3
pycodestyle==2.5.0
Expand All @@ -29,7 +32,8 @@ pylint==1.7.1 # via edx-lint, pylint-celery, pylint-django, pylint-p
pyparsing==2.4.0 # via packaging
pytz==2019.1 # via django
requests==2.21.0 # via caniusepython3
six==1.12.0 # via astroid, edx-lint, packaging, pydocstyle, pylint
singledispatch==3.4.0.3 # via astroid, pylint
six==1.12.0 # via astroid, edx-lint, packaging, pydocstyle, pylint, singledispatch
snowballstemmer==1.2.1 # via pydocstyle
urllib3==1.24.2 # via requests
urllib3==1.24.3 # via requests
wrapt==1.11.1 # via astroid
34 changes: 21 additions & 13 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --upgrade -o requirements/test.txt requirements/test.in
# make upgrade
#
apipkg==1.5 # via execnet
appdirs==1.4.3 # via fs
atomicwrites==1.3.0 # via pytest
attrs==19.1.0 # via pytest
backports.os==0.1.1 # via fs
bok-choy==1.0.0
certifi==2019.3.9 # via requests
chardet==3.0.4 # via requests
cookies==2.2.1 # via responses
coverage==4.5.3 # via pytest-cov
ddt==1.2.1
django-crum==0.7.3
Expand All @@ -20,16 +22,18 @@ django-waffle==0.16.0
django-webpack-loader==0.6.0
djangorestframework-jwt==1.11.0 # via edx-drf-extensions
edx-django-utils==1.0.3 # via edx-drf-extensions
edx-drf-extensions==2.2.0
edx-drf-extensions==2.2.1
edx-i18n-tools==0.4.8
edx-opaque-keys==0.4.4
edx-rest-api-client==1.9.2
edx-when==0.1.3
edx-when==0.1.4
enum34==1.1.6 # via fs
event-tracking==0.2.8
execnet==1.6.0 # via pytest-xdist
freezegun==0.3.11
fs==2.4.4 # via xblock
future==0.17.1 # via pyjwkest
fs==2.4.5 # via xblock
funcsigs==1.0.2 # via mock, pytest
future==0.17.1 # via backports.os, pyjwkest
httmock==1.3.0
httpretty==0.9.6
idna==2.8 # via requests
Expand All @@ -38,39 +42,43 @@ lazy==1.4 # via bok-choy
logilab-common==1.4.2
lxml==4.3.3 # via xblock
markupsafe==1.1.1 # via xblock
mock==2.0.0
mock==3.0.5
more-itertools==5.0.0 # via pytest
newrelic==4.18.0.118 # via edx-django-utils
path.py==11.5.2 # via edx-i18n-tools
pbr==5.2.0 # via mock, stevedore
pluggy==0.9.0 # via pytest
pathlib2==2.3.3 # via pytest, pytest-django
pbr==5.2.0 # via stevedore
pluggy==0.11.0 # via pytest
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1 # via edx-django-utils, edx-drf-extensions
py==1.8.0 # via pytest
pycryptodomex==3.8.1
pyjwkest==1.3.2 # via edx-drf-extensions
pyjwt==1.7.1 # via djangorestframework-jwt, edx-rest-api-client
pymongo==3.8.0 # via edx-opaque-keys, event-tracking
pytest-cov==2.6.1
pytest-cov==2.7.1
pytest-django==3.4.8
pytest-forked==1.0.2 # via pytest-xdist
pytest-xdist==1.28.0
pytest==4.4.1 # via pytest-cov, pytest-django, pytest-forked, pytest-xdist
pytest==4.5.0 # via pytest-cov, pytest-django, pytest-forked, pytest-xdist
python-dateutil==2.8.0
pytz==2019.1
pyyaml==5.1 # via edx-i18n-tools, xblock
requests==2.21.0 # via edx-drf-extensions, edx-rest-api-client, httmock, pyjwkest, responses, slumber
responses==0.10.6
rest-condition==1.0.3 # via edx-drf-extensions
rules==2.0.1
scandir==1.10.0 # via pathlib2
selenium==3.141.0
semantic-version==2.6.0 # via edx-drf-extensions
six==1.12.0 # via bok-choy, edx-drf-extensions, edx-i18n-tools, edx-opaque-keys, event-tracking, freezegun, fs, httpretty, logilab-common, mock, more-itertools, pyjwkest, pytest, pytest-xdist, python-dateutil, responses, stevedore, xblock
six==1.12.0 # via bok-choy, edx-drf-extensions, edx-i18n-tools, edx-opaque-keys, event-tracking, freezegun, fs, httpretty, logilab-common, mock, pathlib2, pyjwkest, pytest, pytest-xdist, python-dateutil, responses, stevedore, xblock
slumber==0.7.1 # via edx-rest-api-client
stevedore==1.30.1 # via edx-opaque-keys
sure==1.2.7
testfixtures==6.7.1
urllib3==1.24.2 # via requests, selenium
testfixtures==6.8.2
typing==3.6.6 # via fs
urllib3==1.24.3 # via requests, selenium
wcwidth==0.1.7 # via pytest
web-fragments==0.3.0 # via xblock
webob==1.8.5 # via xblock
xblock==1.2.2 # via edx-when

0 comments on commit 9bff904

Please sign in to comment.