Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed course-run exam rule configuration

Browse Source
This commit is contained in:
Michael Roytman
2018-12-06 16:31:03 -05:00
committed by Dave St.Germain
parent 72a2e191fd
commit 23fcb7e7bb
20 changed files with 228 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
requirements/edx-sandbox/shared.txt
View File

@@ -13,10 +13,14 @@ cffi==1.11.5 # via cryptography
cryptography==2.4.2
enum34==1.1.6 # via cryptography
<<<<<<< HEAD
<<<<<<< HEAD
idna==2.8 # via cryptography
=======
idna==2.7
>>>>>>> make upgrade
=======
idna==2.8 # via cryptography
>>>>>>> Removed course-run exam rule configuration
ipaddress==1.0.22 # via cryptography
lxml==3.8.0
markupsafe==1.1.0

2
requirements/edx/base.in
View File

@@ -80,7 +80,7 @@ edx-enterprise
edx-milestones
edx-oauth2-provider
edx-organizations
edx-proctoring>=1.5.0b3
edx-proctoring==1.5.0rc2
edx-rest-api-client
edx-search
edx-submissions

21
requirements/edx/base.txt
View File

@@ -119,14 +119,23 @@ edx-django-sites-extensions==2.3.1
edx-django-utils==1.0.3
edx-drf-extensions==2.0.1
<<<<<<< HEAD
<<<<<<< HEAD
edx-enterprise==1.2.0
=======
=======
>>>>>>> Removed course-run exam rule configuration
<<<<<<< HEAD
edx-enterprise==1.1.2
=======
edx-enterprise==1.1.0
>>>>>>> make upgrade
<<<<<<< HEAD
>>>>>>> make upgrade
=======
=======
edx-enterprise==1.1.2
>>>>>>> Removed course-run exam rule configuration
>>>>>>> Removed course-run exam rule configuration
edx-i18n-tools==0.4.6
edx-milestones==0.1.13
edx-oauth2-provider==1.2.2
@@ -135,6 +144,7 @@ edx-organizations==1.0.0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
edx-proctoring==1.4.0
=======
edx-proctoring==1.5.0b1
@@ -145,6 +155,9 @@ edx-proctoring==1.5.0b3
=======
edx-proctoring==1.5.0rc1
>>>>>>> Set NPM dependencies more stably
=======
edx-proctoring==1.5.0rc2
>>>>>>> Removed course-run exam rule configuration
edx-rest-api-client==1.9.2
edx-search==1.2.1
edx-submissions==2.0.12
@@ -166,10 +179,14 @@ help-tokens==1.0.3
html5lib==1.0.1
httplib2==0.12.0 # via oauth2, zendesk
<<<<<<< HEAD
<<<<<<< HEAD
idna==2.8
=======
idna==2.7
>>>>>>> Enable course run level overrides for proctoring configuration.
=======
idna==2.8
>>>>>>> Removed course-run exam rule configuration
ipaddr==2.1.11
ipaddress==1.0.22
isodate==0.6.0 # via python-saml
@@ -251,8 +268,12 @@ reportlab==3.5.11
reportlab==3.5.12
>>>>>>> Updated edx-proctoring pre-release
requests-oauthlib==1.0.0
<<<<<<< HEAD
requests==2.20.1
>>>>>>> Enable course run level overrides for proctoring configuration.
=======
requests==2.21.0
>>>>>>> Removed course-run exam rule configuration
rest-condition==1.0.3
rfc6266-parser==0.0.5.post2
rules==2.0.1

1
requirements/edx/coverage.in
View File

@@ -14,3 +14,4 @@
coverage==4.4 # Code coverage testing for Python
diff-cover==0.9.8 # Automatically find diff lines that need test coverage
six==1.11.0 # Pinned because diff-cover needs it, but later transifex-client says ==1.11.0

5
requirements/edx/coverage.txt
View File

@@ -10,5 +10,10 @@ inflect==2.1.0 # via jinja2-pluralize
jinja2-pluralize==0.3.0 # via diff-cover
jinja2==2.10 # via diff-cover, jinja2-pluralize
markupsafe==1.1.0 # via jinja2
<<<<<<< HEAD
pygments==2.3.1 # via diff-cover
six==1.11.0 # via diff-cover
=======
pygments==2.3.0 # via diff-cover
six==1.11.0
>>>>>>> Removed course-run exam rule configuration

17
requirements/edx/development.txt
View File

@@ -138,14 +138,23 @@ edx-django-sites-extensions==2.3.1
edx-django-utils==1.0.3
edx-drf-extensions==2.0.1
<<<<<<< HEAD
<<<<<<< HEAD
edx-enterprise==1.2.0
=======
=======
>>>>>>> Removed course-run exam rule configuration
<<<<<<< HEAD
edx-enterprise==1.1.2
=======
edx-enterprise==1.1.0
>>>>>>> make upgrade
<<<<<<< HEAD
>>>>>>> make upgrade
=======
=======
edx-enterprise==1.1.2
>>>>>>> Removed course-run exam rule configuration
>>>>>>> Removed course-run exam rule configuration
edx-i18n-tools==0.4.6
edx-lint==1.0.0
edx-milestones==0.1.13
@@ -155,6 +164,7 @@ edx-organizations==1.0.0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
edx-proctoring==1.4.0
=======
edx-proctoring==1.5.0b1
@@ -165,6 +175,9 @@ edx-proctoring==1.5.0b3
=======
edx-proctoring==1.5.0rc1
>>>>>>> Set NPM dependencies more stably
=======
edx-proctoring==1.5.0rc2
>>>>>>> Removed course-run exam rule configuration
edx-rest-api-client==1.9.2
edx-search==1.2.1
edx-sphinx-theme==1.4.0
@@ -326,8 +339,12 @@ reportlab==3.5.11
reportlab==3.5.12
>>>>>>> Updated edx-proctoring pre-release
requests-oauthlib==1.0.0
<<<<<<< HEAD
requests==2.20.1
>>>>>>> Enable course run level overrides for proctoring configuration.
=======
requests==2.21.0
>>>>>>> Removed course-run exam rule configuration
rest-condition==1.0.3
rfc6266-parser==0.0.5.post2
rules==2.0.1

2
requirements/edx/paver.in
View File

@@ -24,3 +24,5 @@ requests # Simple interface for making HTTP requests
stevedore==1.10.0 # via edx-opaque-keys
watchdog # Used in paver watch_assets
wrapt==1.10.5 # Decorator utilities used in the @timed paver task decorator
six==1.11.0 # Pinned because a few things here need it, but later transifex-client says ==1.11.0

5
requirements/edx/paver.txt
View File

@@ -23,11 +23,16 @@ pymongo==2.9.1
python-memcached==1.48
pyyaml==3.13 # via watchdog
<<<<<<< HEAD
<<<<<<< HEAD
requests==2.21.0
=======
requests==2.20.1
>>>>>>> Enable course run level overrides for proctoring configuration.
six==1.11.0 # via edx-opaque-keys, libsass, paver, stevedore
=======
requests==2.21.0
six==1.11.0
>>>>>>> Removed course-run exam rule configuration
stevedore==1.10.0
urllib3==1.23 # via requests
watchdog==0.9.0

1
requirements/edx/pip-tools.in
View File

@@ -10,3 +10,4 @@
-c ../constraints.txt
pip-tools # Contains pip-compile, used to generate pip requirements files
six==1.11.0 # Pinned because pip-tools needs it, but later transifex-client says ==1.11.0

5
requirements/edx/pip-tools.txt
View File

@@ -5,5 +5,10 @@
# make upgrade
#
click==7.0 # via pip-tools
<<<<<<< HEAD
pip-tools==3.2.0
six==1.11.0 # via pip-tools
=======
pip-tools==3.1.0
six==1.11.0
>>>>>>> Removed course-run exam rule configuration

17
requirements/edx/testing.txt
View File

@@ -133,14 +133,23 @@ edx-django-sites-extensions==2.3.1
edx-django-utils==1.0.3
edx-drf-extensions==2.0.1
<<<<<<< HEAD
<<<<<<< HEAD
edx-enterprise==1.2.0
=======
=======
>>>>>>> Removed course-run exam rule configuration
<<<<<<< HEAD
edx-enterprise==1.1.2
=======
edx-enterprise==1.1.0
>>>>>>> make upgrade
<<<<<<< HEAD
>>>>>>> make upgrade
=======
=======
edx-enterprise==1.1.2
>>>>>>> Removed course-run exam rule configuration
>>>>>>> Removed course-run exam rule configuration
edx-i18n-tools==0.4.6
edx-lint==1.0.0
edx-milestones==0.1.13
@@ -150,6 +159,7 @@ edx-organizations==1.0.0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
edx-proctoring==1.4.0
=======
edx-proctoring==1.5.0b1
@@ -160,6 +170,9 @@ edx-proctoring==1.5.0b3
=======
edx-proctoring==1.5.0rc1
>>>>>>> Set NPM dependencies more stably
=======
edx-proctoring==1.5.0rc2
>>>>>>> Removed course-run exam rule configuration
edx-rest-api-client==1.9.2
edx-search==1.2.1
edx-submissions==2.0.12
@@ -315,8 +328,12 @@ reportlab==3.5.11
reportlab==3.5.12
>>>>>>> Updated edx-proctoring pre-release
requests-oauthlib==1.0.0
<<<<<<< HEAD
requests==2.20.1
>>>>>>> Enable course run level overrides for proctoring configuration.
=======
requests==2.21.0
>>>>>>> Removed course-run exam rule configuration
rest-condition==1.0.3
rfc6266-parser==0.0.5.post2
rules==2.0.1