forked from oppia/oppia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into rules-json
Conflicts: core/controllers/editor.py core/domain/rule_domain_test.py core/templates/dev/head/editor/EditorServices.js core/tests/protractor_utils/editor.js extensions/rules/code_evaluation.py
- Loading branch information
Showing
364 changed files
with
10,640 additions
and
4,103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,5 +13,4 @@ venv/ | |
| *.db | ||
| .DS_Store | ||
| .idea | ||
| static/images/splash/* | ||
| .vagrant/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,40 @@ | ||
| sudo: required | ||
| # In order to install Chrome stable we need trusty distribution. | ||
| dist: trusty | ||
| language: python | ||
|
|
||
| python: | ||
| - 2.7 | ||
|
|
||
| addons: | ||
| firefox: latest | ||
| apt: | ||
| sources: | ||
| - google-chrome | ||
| packages: | ||
| - google-chrome-stable | ||
| - google-chrome-beta | ||
|
|
||
| branches: | ||
| only: | ||
| - master | ||
| - develop | ||
|
|
||
| env: | ||
| - RUN_BACKEND_TESTS=false RUN_FRONTEND_TESTS=false RUN_LINT=true REPORT_BACKEND_COVERAGE=false | ||
| - RUN_BACKEND_TESTS=false RUN_FRONTEND_TESTS=true RUN_LINT=false REPORT_BACKEND_COVERAGE=false | ||
| - RUN_BACKEND_TESTS=true RUN_FRONTEND_TESTS=false RUN_LINT=false REPORT_BACKEND_COVERAGE=false | ||
| - RUN_BACKEND_TESTS=true RUN_FRONTEND_TESTS=false RUN_LINT=false REPORT_BACKEND_COVERAGE=true | ||
|
|
||
|
|
||
| matrix: | ||
| - RUN_LINT=true | ||
| - RUN_FRONTEND_TESTS=true | ||
| - RUN_E2E_TESTS_EDITOR=true | ||
| - RUN_E2E_TESTS_EXTENSIONS=true | ||
| - RUN_E2E_TESTS_LIBRARY=true | ||
| - RUN_E2E_TESTS_MISC=true | ||
| - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=false | ||
| - RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true | ||
| matrix: | ||
| allow_failures: | ||
| # The backend tests, with coverage, take too long to run, so we make this | ||
| # optional. | ||
| - env: RUN_BACKEND_TESTS=true RUN_FRONTEND_TESTS=false RUN_LINT=false REPORT_BACKEND_COVERAGE=true | ||
| - env: RUN_BACKEND_TESTS=true REPORT_BACKEND_COVERAGE=true | ||
| fast_finish: true | ||
|
|
||
| notifications: | ||
|
|
@@ -30,10 +45,23 @@ notifications: | |
| - [email protected] | ||
| on_success: change | ||
| on_failure: change | ||
| irc: | ||
| channels: | ||
| - chat.freenode.net#oppia | ||
| on_success: never | ||
| on_failure: always | ||
| webhooks: | ||
| urls: | ||
| # This URL can be obtained by going to the Gitter chat room | ||
| # and clicking Settings > Integrations. | ||
| - https://webhooks.gitter.im/e/f8f782497ec1ffcea2e7 | ||
| on_success: always | ||
| on_failure: always | ||
|
|
||
| before_install: | ||
| - pip install codecov | ||
| - export CHROME_BIN=chromium-browser | ||
| - pip install numpy==1.6.1 | ||
| - export CHROME_BIN=/usr/bin/google-chrome-stable | ||
| - export DISPLAY=:99.0 | ||
| - bash -e /etc/init.d/xvfb start | ||
|
|
||
|
|
@@ -42,13 +70,12 @@ install: | |
| - pushd $TRAVIS_BUILD_DIR | ||
| - source scripts/setup.sh || exit 1 | ||
| - source scripts/setup_gae.sh || exit 1 | ||
| - mkdir -p $GOOGLE_APP_ENGINE_HOME | ||
| - curl --silent https://storage.googleapis.com/appengine-sdks/deprecated/1919/google_appengine_1.9.19.zip | ||
| -o gae-download.zip | ||
| - unzip -qq gae-download.zip -d $TOOLS_DIR/google_appengine_1.9.19/ | ||
| - rm gae-download.zip | ||
|
|
||
| script: | ||
| - if [ $RUN_E2E_TESTS_EDITOR == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="editor"; fi | ||
| - if [ $RUN_E2E_TESTS_EXTENSIONS == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="extensions"; fi | ||
| - if [ $RUN_E2E_TESTS_LIBRARY == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="library"; fi | ||
| - if [ $RUN_E2E_TESTS_MISC == 'true' ]; then bash scripts/run_e2e_tests.sh --suite="misc"; fi | ||
| - if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'true' ]; then bash scripts/run_backend_tests.sh --generate_coverage_report; fi | ||
| - if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'false' ]; then bash scripts/run_backend_tests.sh; fi | ||
| - if [ $RUN_LINT == 'true' ]; then bash scripts/install_third_party.sh; python scripts/pre_commit_linter.py --path=.; fi | ||
|
|
@@ -59,3 +86,14 @@ script: | |
| after_success: | ||
| - if [ $RUN_BACKEND_TESTS == 'true' ] && [ $REPORT_BACKEND_COVERAGE == 'true' ]; then codecov; fi | ||
| - if [ $RUN_FRONTEND_TESTS == 'true' ]; then codecov --file ../karma_coverage_reports/coverage-final.json; fi | ||
|
|
||
| cache: | ||
| # Cache Oppia's dependencies. | ||
| directories: | ||
| - ../node_modules/ | ||
| - ../oppia_tools/ | ||
| - third_party/ | ||
|
|
||
| before_cache: | ||
| # Delete python bytecode to prevent cache rebuild. | ||
| - find third_party -name "*.pyc" -print -delete | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,22 +8,28 @@ | |
| # | ||
| # Please keep the list sorted alphabetically. | ||
|
|
||
| Abhijit Suresh <[email protected]> | ||
| Alex Gower <[email protected]> | ||
| Allan Zhou <[email protected]> | ||
| Andrew Low <[email protected]> | ||
| Andrey Mironyuk <[email protected]> | ||
| Arun Kumar <[email protected]> | ||
| Avijit Gupta <[email protected]> | ||
| Barnabas Makonda <[email protected]> | ||
| Ben Targan <[email protected]> | ||
| Bolaji Fatade <[email protected]> | ||
| Brenton Briggs <[email protected]> | ||
| Charisse De Torres <[email protected]> | ||
| Chase Albert <[email protected]> | ||
| Chin Zhan Xiong <[email protected]> | ||
| Debanshu Bhaumik <[email protected]> | ||
| Deepank Agarwal <[email protected]> | ||
| Edward Allison <[email protected]> | ||
| Estelle Lee <[email protected]> | ||
| Frederik Creemers <[email protected]> | ||
| Google Inc. | ||
| Grace Guo <[email protected]> | ||
| Hitesh Sharma <[email protected]> | ||
| Jacob Davis <[email protected]> | ||
| Jakub Osika <[email protected]> | ||
| Jasper Deng <[email protected]> | ||
|
|
@@ -32,30 +38,43 @@ Jérôme (zolk232) <[email protected]> | |
| Jerry Chen <[email protected]> | ||
| Joshua Lusk <[email protected]> | ||
| Karen Rustad <[email protected]> | ||
| Kenneth Ho <[email protected]> | ||
| Kerry Wang <[email protected]> | ||
| Kevin Lee <[email protected]> | ||
| Kristin Anthony <[email protected]> | ||
| Kumari Shalini <[email protected]> | ||
| Marcel Schmittfull <[email protected]> | ||
| Mark Cabanero <[email protected]> | ||
| Mark Halpin <[email protected]> | ||
| Michael Mossey <[email protected]> | ||
| Michael Wagner <[email protected]> | ||
| Milagro Teruel <[email protected]> | ||
| Mungo Dewar <[email protected]> | ||
| Oskar Cieslik <[email protected]> | ||
| Oswell Chan <[email protected]> | ||
| Owen Parry <[email protected]> | ||
| Philip Hayes <[email protected]> | ||
| Prasanna Patil <[email protected]> | ||
| Raine Hoover <[email protected]> | ||
| Rajat Patwa <[email protected]> | ||
| Reto Brunner <[email protected]> | ||
| Richard Cho <[email protected]> | ||
| Samara Trilling <[email protected]> | ||
| Santos Hernandez <[email protected]> | ||
| Sanyam Khurana <[email protected]> | ||
| Satwik Kansal <[email protected]> | ||
| Scott Junner <[email protected]> | ||
| Shafqat Dulal <[email protected]> | ||
| Shouvik Roy <[email protected]> | ||
| Sourav Badami <[email protected]> | ||
| Sreenivasulu Giritheja <[email protected]> | ||
| Tarashish Mishra <[email protected]> | ||
| Travis Shafer <[email protected]> | ||
| Tuguldur Baigalmaa <[email protected]> | ||
| Umesh Singla <[email protected]> | ||
| Viraj Prabhu <[email protected]> | ||
| Vishal Gupta <[email protected]> | ||
| Xinyu Wu <[email protected]> | ||
| Yi Yan <[email protected]> | ||
| Yousef Hamza <[email protected]> | ||
| Zoe Madden-Wood <[email protected]> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.