Skip to content

Commit

Permalink
Merge pull request #496 from edx/dcs/release
Browse files Browse the repository at this point in the history
Unpin django-waffle
  • Loading branch information
davestgermain committed Dec 26, 2018
2 parents bf05a9e + 4324d5a commit 66db765
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@edx/edx-proctoring",
"//": "Be sure to update the version number in edx_proctoring/__init__.py",
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
"version": "1.5.0-rc.7",
"version": "1.5.0",
"main": "edx_proctoring/static/index.js",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pytz>=2018
pycryptodomex>=3.4.7
python-dateutil>=2.1
django-webpack-loader>=0.6.0
django-waffle>=0.14.0
django-waffle

# edX packages
event-tracking>=0.2.5
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ six==1.12.0 # via astroid, bleach, diff-cover, edx-i18n-tools, edx
snowballstemmer==1.2.1 # via pydocstyle
toml==0.10.0 # via tox
tox-battery==0.5.1
tox==3.6.0
tox==3.6.1
tqdm==4.28.1 # via twine
twine==1.12.1
urllib3==1.24.1 # via requests
Expand Down
2 changes: 1 addition & 1 deletion requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ 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, packaging, pockets, pyjwkest, python-dateutil, readme-renderer, sphinx, sphinxcontrib-napoleon, stevedore
slumber==0.7.1 # via edx-rest-api-client
snowballstemmer==1.2.1 # via sphinx
sphinx==1.8.2
sphinx==1.8.3
sphinxcontrib-napoleon==0.7
sphinxcontrib-websupport==1.1.0 # via sphinx
stevedore==1.30.0 # via doc8, edx-opaque-keys
Expand Down
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ six==1.12.0 # via bok-choy, edx-drf-extensions, edx-opaque-keys, f
slumber==0.7.1 # via edx-rest-api-client
stevedore==1.30.0 # via edx-opaque-keys
sure==1.2.7
testfixtures==6.4.0
testfixtures==6.4.1
urllib3==1.24.1 # via requests, selenium

0 comments on commit 66db765

Please sign in to comment.