Skip to content

Commit

Permalink
Upgrade GAE version from 1.9.10 to 1.9.11.
Browse files Browse the repository at this point in the history
  • Loading branch information
seanlip committed Sep 19, 2014
1 parent da89746 commit 32f0a26
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# pylint core --rcfile=.pylintrc -i y

[GENERAL]
init-hook='import sys; sys.path.append("../oppia_tools/google_appengine_1.9.10/google_appengine")'
init-hook='import sys; sys.path.append("../oppia_tools/google_appengine_1.9.11/google_appengine")'

[BASIC]

Expand Down
4 changes: 2 additions & 2 deletions core/tests/gae_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@

DIRS_TO_ADD_TO_SYS_PATH = [
os.path.join(
OPPIA_TOOLS_DIR, 'google_appengine_1.9.10', 'google_appengine'),
OPPIA_TOOLS_DIR, 'google_appengine_1.9.11', 'google_appengine'),
CURR_DIR,
os.path.join(OPPIA_TOOLS_DIR, 'webtest-1.4.2'),
os.path.join(
OPPIA_TOOLS_DIR, 'google_appengine_1.9.10', 'google_appengine',
OPPIA_TOOLS_DIR, 'google_appengine_1.9.11', 'google_appengine',
'lib', 'webob_0_9'),
os.path.join(CURR_DIR, 'third_party', 'bleach-1.2.2'),
os.path.join(THIRD_PARTY_DIR, 'html5lib-python-0.95'),
Expand Down
2 changes: 1 addition & 1 deletion scripts/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
RELEASE_DIR_PATH = os.path.join(os.getcwd(), '..', RELEASE_DIR_NAME)

APPCFG_PATH = os.path.join(
'..', 'oppia_tools', 'google_appengine_1.9.10', 'google_appengine',
'..', 'oppia_tools', 'google_appengine_1.9.11', 'google_appengine',
'appcfg.py')

LOG_FILE_PATH = os.path.join('..', 'deploy.log')
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_gae.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if [ "$SETUP_GAE_DONE" ]; then
fi
export SETUP_GAE_DONE=true

export GOOGLE_APP_ENGINE_HOME=$TOOLS_DIR/google_appengine_1.9.10/google_appengine
export GOOGLE_APP_ENGINE_HOME=$TOOLS_DIR/google_appengine_1.9.11/google_appengine
export COVERAGE_HOME=$TOOLS_DIR/coverage-3.6

# Note that if the following line is changed so that it uses webob_1_1_1, PUT requests from the frontend fail.
Expand Down
4 changes: 2 additions & 2 deletions scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ echo Checking whether GAE is installed in $GOOGLE_APP_ENGINE_HOME
if [ ! -f "$GOOGLE_APP_ENGINE_HOME/appcfg.py" ]; then
echo Installing Google App Engine
mkdir -p $GOOGLE_APP_ENGINE_HOME
wget https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.10.zip -O gae-download.zip
unzip gae-download.zip -d $TOOLS_DIR/google_appengine_1.9.10/
wget https://storage.googleapis.com/appengine-sdks/featured/google_appengine_1.9.11.zip -O gae-download.zip
unzip gae-download.zip -d $TOOLS_DIR/google_appengine_1.9.11/
rm gae-download.zip
fi

Expand Down

0 comments on commit 32f0a26

Please sign in to comment.