Commit Graph

51947 Commits

Author SHA1 Message Date
edX cache uploader bot
c27643e5ce Updating Bokchoy testing database cache (#22049) 2019-10-16 10:15:41 -04:00
Feanil Patel
5da7a98d63 Merge pull request #22050 from edx/jenkins/upgrade-python-requirements-98b381d
Python Requirements Update
2019-10-16 08:51:15 -04:00
edX requirements bot
96112149ac Updating Python Requirements 2019-10-16 06:49:07 -04:00
Ayub
98b381d4ac Merge pull request #22048 from edx/bump-recommender-xblock-version
-version bump recommender-xblock
2019-10-16 15:24:23 +05:00
Ayub khan
f168aa16ae -version bump recommender-xblock 2019-10-16 14:36:13 +05:00
Awais Qureshi
f529e2e393 Merge pull request #22033 from edx/awais786/bom-415-ora2
awais786/bom 415 ora2
2019-10-16 14:15:58 +05:00
Awais Qureshi
6bf8cfc5bd BOM-415
Bump the edx-ora2 version.
Run make upgrade.
2019-10-16 11:56:46 +05:00
Aarif
6e7f2f61ef Merge pull request #21994 from edx/BOM-914
Fixed all instances of "TypeError: a bytes-like object is required, not 'str" - BOM-914
2019-10-16 01:44:31 +05:00
Ned Batchelder
69255bee73 Merge pull request #21816 from regisb/regisb/simplify-swagger-auto-schema
Regisb/simplify swagger auto schema
2019-10-15 14:35:46 -04:00
edX cache uploader bot
f37de7464c Updating Bokchoy testing database cache (#22044) 2019-10-15 14:29:16 -04:00
Matt Hughes
b14ce70053 Add program enrollment status option: ended
We'd like to add this status to help distinguish between learners
who've graduated from the program and learners who warranted some sort
of removal from the program.

JIRA:EDUCATOR-4702
2019-10-15 12:47:20 -04:00
Feanil Patel
9de36477ea Merge pull request #22040 from edx/jenkins/upgrade-python-requirements-149f47f
Python Requirements Update
2019-10-15 10:13:44 -04:00
Zia Fazal
ebe29d9303 Merge pull request #21943 from edx/ziafazal/ENT-1688
ENT-1688: Changed logout message on on logout screen for Enterprise SSO flow
2019-10-15 18:53:34 +05:00
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp
remove mailchimp tracking
2019-10-15 09:47:08 -04:00
Zia Fazal
c718c02d6e Show blank screen instead of logout message for Enterprise SSO flow
Changes to show blank screen instead of logout message for Enterprise SSO flow. It confuses learner when they are already signed in and access their course from B2B site.
ENT-1688

Fixed pep8 quality violation

use testserver as HOST instead of edx.org

assert enterprise app is enabled

added logging

Print different values

Reload django url config

assert all quote operations to see how they work on jenkins

debug url resolved values

login user in setup

added log to debug test on jenkins

Using UrlResetMixin

Using regex instead of resolve

Fixed quality violation

Fixed pylint quality violations

Fixed target interpolation syntax

Added developer's comment
2019-10-15 18:28:19 +05:00
Christie Rice
1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) 2019-10-15 08:18:54 -04:00
Zia Fazal
0358587320 Merge pull request #22039 from edx/ziafazal/ENT-2384
ENT-2384: Invoke learner transmission task only for enterprise learners
2019-10-15 16:42:13 +05:00
Aarif
6304aa5b9b Merge pull request #22030 from edx/BOM-922
Fixed - " AttributeError: 'str' object has no attribute 'decode' " - BOM-922
2019-10-15 16:21:25 +05:00
Zia Fazal
3b69a4f279 Invoke learner transmission task only for enterprise learners
Invoke learner transmission task only for enterprise learners
ENT-2384

added docstring

Fixed brokent unit test
2019-10-15 15:58:37 +05:00
edX requirements bot
a40b3376f6 Updating Python Requirements 2019-10-15 06:48:51 -04:00
Awais Qureshi
149f47ff49 Merge pull request #22038 from edx/awais786/BOM-925
BOM-925
2019-10-15 13:58:59 +05:00
Ayub
f08a7e7268 Merge pull request #22032 from edx/BOM-xblock-recommender-tests-fix
BOM Project Xblock Recommber integration tests fix
2019-10-15 13:03:40 +05:00
Awais Qureshi
f679768f9e BOM-925
Fixing TypeError, the JSON object must be str, not 'bytes'.
2019-10-15 12:57:49 +05:00
Awais Qureshi
ce18f581c7 Merge pull request #22034 from edx/awais786/BOM-924
BOM-924
2019-10-15 12:39:42 +05:00
Awais Qureshi
f7adc71c44 BOM-924
Fixing TypeError, the JSON object must be str, not 'bytes'.
2019-10-15 12:11:24 +05:00
aarif
d176957708 Updated the tests to fix the string/bytes input
changes made to pass tests with python 2 and other minor changes

Updated the tests to fix the string/bytes input

changes made to pass tests with python 2 and other minor changes

made some changes as suggested

made changes as suggested

changes made as suggested
2019-10-14 18:47:18 +05:00
Ayub khan
f0133d861d BOM Project Xblock Recommber integration tests fix
Python3 json can not work with bytes type input so used simplejson
instead of python json which works with both bytes and unicode
type input.
Previously we mistakenly updated StringIO to six.String io. which
caused the tests failure. Used io.BytesIO to fix the issues as
assci character bytes can not be converted to unicode.
2019-10-14 18:20:42 +05:00
Ayub
8aa2fad4ec Merge pull request #21988 from edx/BOM-898
BOM fix remaining capa module issues
2019-10-14 17:33:27 +05:00
aarif
ea4557ff70 removed unnecesary transcript decode 2019-10-14 17:28:47 +05:00
Aarif
d600a5a087 Merge pull request #21910 from edx/BOM-837
Removed encode method to fix input to csv write method - BOM-837
2019-10-14 16:54:18 +05:00
Ayub
dbc27fd57d Merge pull request #21921 from edx/BOM-805
BOM-805
2019-10-14 16:42:26 +05:00
aarif
6c98571bbd removed unnecessary encode method to fix input to csv write method
removed unnecessary encode method to fix input to csv write method
2019-10-14 16:17:11 +05:00
Ayub khan
8717510d35 BOM-805
python3 compatibility: Before comparison with unicode decode text if its type is bytes.
2019-10-14 15:15:28 +05:00
Ayub khan
e9c4c22e6a BOM fixed remaining capa module issues
BOM-898 fix test_responsetypes.py issues
Updated safe_exec to use random2 library instead of random.
As python3 random generates different results as compared to
python2, which causes a lot of test failures and if we use
python3 random and fix tests it will cause state invalidation
of capa problems, So random2 was uses to make the behaviour same
in python3.

BOM-899 name xrange is not defined
xrange is used in safe_exec and there might be old courses where
this is being used in capa problems. All those tests fail in python3
as this was renamed to range. Used six.moves.xrange so that code
works for python3 and if there is any old code using xrange it
works too.
2019-10-14 13:29:12 +05:00
Ayub
c3735cef01 Merge pull request #21874 from edx/BOM-804
BOM-804
2019-10-14 12:30:18 +05:00
Aarif
4bce520f29 Merge pull request #21919 from edx/BOM-819
Updated the items order in response list comparison to work with both python versions - BOM-819
2019-10-14 11:32:05 +05:00
Régis Behmo
ae216c8584 Rename API decorators to "apidocs" to be provider-agnostic
The API documentation decorators do not have to leak which solution we
use to generate the docs. Here, and as discussed in PR #21820, we rename
the `openapi` module to `apidocs`, and we make sure that this module
includes all the right functions to document API Views without referring
to Open API.
2019-10-14 08:14:18 +02:00
Régis Behmo
1d9a5ab4e7 Rename swagger_auto_schema decorator 2019-10-14 08:14:08 +02:00
Régis Behmo
e78d69695d Ensure proper arguments in swagger decorator 2019-10-14 08:14:08 +02:00
Régis Behmo
33bd0f953a Update swagger.yml 2019-10-14 08:14:08 +02:00
Régis Behmo
59635b689e Simplify BookmarksListView.get docs
Instead of relying on a `method_decorator`, we explicitely declare the
`get` method.
2019-10-14 08:14:08 +02:00
Régis Behmo
dac393e9e7 Auto-document API endpoints using view function docstring
The `swagger_auto_schema` view function decorator allows us to
auto-document API endpoints. All swagger arguments are passed as kwargs
to the decorator, but this feels a bit unnatural: we would like to use
the function documentation as the endpoint summary and description. We
introduce this feature here by reading the `__doc_`_attribute of the
view function.
2019-10-14 08:14:08 +02:00
edX Transifex Bot
c7cb995797 fix(i18n): update translations 2019-10-13 17:22:52 -04:00
Awais Qureshi
14e8e782c9 Merge pull request #22013 from edx/awais786/BOM-917
BOM-917
2019-10-12 13:12:12 +05:00
Awais Qureshi
b254df3c52 Merge pull request #22011 from edx/awais786/BOM-916
BOM-916
2019-10-12 13:10:20 +05:00
Jeremy Bowman
3db3403fc4 Fix mock transcript responses BOM-918 (#22020) 2019-10-11 16:22:52 -04:00
Nick
b4d36383e5 Merge pull request #22021 from edx/Remove-backtick-typo
Remove backtick typo in advanced_entry.underscore
2019-10-11 16:11:09 -04:00
Jeremy Bowman
b939791fe0 Fix problematic mock in instructor_task tests BOM-403 (#22007) 2019-10-11 15:44:42 -04:00
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Nick
d1ebd1294b Remove backtick typo in advanced_entry.underscore 2019-10-11 15:25:33 -04:00