Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades jasmine, karma-webpack, webdriver-manager, covergae, pygithub & webpack to their latest version #6770

Merged
merged 22 commits into from
Jun 20, 2019
Merged

Upgrades jasmine, karma-webpack, webdriver-manager, covergae, pygithub & webpack to their latest version #6770

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
751d99d
for travis
May 10, 2019
e4564fa
for travis 2
May 10, 2019
6f74ccd
for travis 2
May 10, 2019
3319edd
for travis 2
May 10, 2019
88d0039
set circle ci
May 10, 2019
a623021
set circle ci 2
May 10, 2019
5d30cf8
Rever travis and circle
May 10, 2019
d5d700f
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 16, 2019
7ba9021
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 19, 2019
4c863b6
Initial upgrade
May 21, 2019
dac2d12
Remove un-necc
May 21, 2019
b78c203
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 21, 2019
5646bf9
Merge branch 'develop' of https://github.com/NishealJ/oppia into nm_u…
May 21, 2019
c1b3e6b
Merge branch 'develop' of https://github.com/oppia/oppia into develop
May 21, 2019
38b2219
Resolve conflicts
May 21, 2019
3367dda
Reslove conflict
May 21, 2019
9ae1d54
Revert webdriver-manager
May 23, 2019
1ce2578
Upgrade webdriver-manager to 12.1.4
May 24, 2019
e0aa6c0
Upgrage coverage and pygithub
Jun 3, 2019
a08b1af
Fix merge
Jun 17, 2019
e46fb5f
Merge remote-tracking branch 'origin/develop' into nm_u_webpack
Jun 18, 2019
31185ae
Update Package-lock
Jun 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Upgrage coverage and pygithub
  • Loading branch information
NishealJ committed Jun 3, 2019
commit e0aa6c079c6b7bdea36fff4f369f646f42e8fa7f
2 changes: 1 addition & 1 deletion scripts/backend_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@


COVERAGE_PATH = os.path.join(
os.getcwd(), '..', 'oppia_tools', 'coverage-4.5.1', 'coverage')
os.getcwd(), '..', 'oppia_tools', 'coverage-4.5.3', 'coverage')
TEST_RUNNER_PATH = os.path.join(os.getcwd(), 'core', 'tests', 'gae_suite.py')
LOG_LOCK = threading.Lock()
ALL_ERRORS = []
Expand Down
4 changes: 2 additions & 2 deletions scripts/install_third_party.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@ if [ ! -d "$TOOLS_DIR/PIL-1.1.7" ]; then
fi

echo Checking if PyGithub is installed in $TOOLS_DIR
if [ ! -d "$TOOLS_DIR/PyGithub-1.43.5" ]; then
if [ ! -d "$TOOLS_DIR/PyGithub-1.43.7" ]; then
echo Installing PyGithub

pip_install PyGithub==1.43.5 --target="$TOOLS_DIR/PyGithub-1.43.5"
pip_install PyGithub==1.43.7 --target="$TOOLS_DIR/PyGithub-1.43.7"
fi

# install pre-push script
Expand Down
2 changes: 1 addition & 1 deletion scripts/pre_commit_linter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@
os.path.join(_PARENT_DIR, 'oppia_tools', 'pylint-quotes-0.1.9'),
os.path.join(_PARENT_DIR, 'oppia_tools', 'selenium-2.53.2'),
os.path.join(_PARENT_DIR, 'oppia_tools', 'PIL-1.1.7'),
os.path.join(_PARENT_DIR, 'oppia_tools', 'PyGithub-1.43.5'),
os.path.join(_PARENT_DIR, 'oppia_tools', 'PyGithub-1.43.7'),
os.path.join('third_party', 'backports.functools_lru_cache-1.5'),
os.path.join('third_party', 'gae-pipeline-1.9.17.0'),
os.path.join('third_party', 'bleach-1.2.2'),
Expand Down
2 changes: 1 addition & 1 deletion scripts/release_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import sys

_PARENT_DIR = os.path.abspath(os.path.join(os.getcwd(), os.pardir))
_PY_GITHUB_PATH = os.path.join(_PARENT_DIR, 'oppia_tools', 'PyGithub-1.43.5')
_PY_GITHUB_PATH = os.path.join(_PARENT_DIR, 'oppia_tools', 'PyGithub-1.43.7')
sys.path.insert(0, _PY_GITHUB_PATH)

# pylint: disable=wrong-import-position
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_backend_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ bash scripts/install_third_party.sh
for arg in "$@"; do
if [ "$arg" == "--generate_coverage_report" ]; then
echo Checking whether coverage is installed in $TOOLS_DIR
if [ ! -d "$TOOLS_DIR/coverage-4.5.1" ]; then
if [ ! -d "$TOOLS_DIR/coverage-4.5.3" ]; then
echo Installing coverage
pip install coverage==4.5.1 --target="$TOOLS_DIR/coverage-4.5.1"
pip install coverage==4.5.3 --target="$TOOLS_DIR/coverage-4.5.3"
fi
fi
done
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_gae.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi

export GOOGLE_APP_ENGINE_HOME=$TOOLS_DIR/google_appengine_1.9.67/google_appengine
export GOOGLE_CLOUD_SDK_HOME=$TOOLS_DIR/google-cloud-sdk-222.0.0/google-cloud-sdk
export COVERAGE_HOME=$TOOLS_DIR/coverage-4.5.1
export COVERAGE_HOME=$TOOLS_DIR/coverage-4.5.3

# Note that if the following line is changed so that it uses webob_1_1_1, PUT requests from the frontend fail.
export PYTHONPATH=.:$COVERAGE_HOME:$GOOGLE_APP_ENGINE_HOME:$GOOGLE_APP_ENGINE_HOME/lib/webob_0_9:$TOOLS_DIR/webtest-1.4.2:$PYTHONPATH
Expand Down