Skip to content

Commit f671758

Browse files
authored
No longer run make python_deps. (#214)
## Summary: This builds the python2 deps, but we no longer need that, because we no longer run any python2 code from jenkins! Issue: https://khanacademy.atlassian.net/browse/INFRA-9771 ## Test plan: None Author: csilvers Reviewers: MiguelCastillo Required Reviewers: Approved By: MiguelCastillo Checks: Pull Request URL: #214
1 parent 873403d commit f671758

10 files changed

+1
-10
lines changed

jobs/build-webapp.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ def mergeFromMasterAndInitializeGlobals() {
301301

302302
dir("webapp") {
303303
clean(params.CLEAN);
304-
sh("make python_deps");
305304

306305
// Let's do a sanity check.
307306
def headSHA1 = exec.outputOf(["git", "rev-parse", "HEAD"]);

jobs/delete-version.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def _setupWebapp() {
5151
def deleteVersion() {
5252
withTimeout('25m') {
5353
dir("webapp") {
54-
sh("make python_deps");
5554
def args = (["deploy/delete_gae_versions.py"]
5655
// We need to cast because split() returns an Array and
5756
// groovy wants a List, apparently.

jobs/deploy-webapp.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ def mergeFromMasterAndInitializeGlobals() {
390390
withVirtualenv.python3() {
391391
dir("webapp") {
392392
clean(params.CLEAN);
393-
sh("make python_deps"); // this script only uses python!
394393

395394
// Let's do a sanity check.
396395
def headSHA1 = exec.outputOf(["git", "rev-parse", "HEAD"]);

jobs/deploy-znd.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ def deploy() {
348348

349349
dir("webapp") {
350350
clean(params.CLEAN);
351-
sh("make python_deps");
352351

353352
def shouldDeployArgs = ["deploy/should_deploy.py"];
354353

jobs/emergency-rollback.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ def doSetup() {
8989
kaGit.safeSyncToOrigin("[email protected]:Khan/webapp", "master");
9090
dir("webapp") {
9191
sh("make clean_pyc");
92-
sh("make python_deps");
9392
}
9493
}
9594
_alert("Setup has just been completed :white_check_mark:");

jobs/find-failing-taskqueue-tasks.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ onMaster('1h') {
3030
when: ['FAILURE', 'UNSTABLE', 'ABORTED']]]) {
3131
stage("Running script") {
3232
kaGit.safeSyncToOrigin("[email protected]:Khan/webapp", "master");
33-
sh("make -C webapp python_deps")
3433
withSecrets.slackAlertlibOnly() { // because we pass --slack-channel
3534
withVirtualenv.python3() {
3635
dir("webapp") {

jobs/firstinqueue-priming.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ def _setupWebapp() {
8787
kaGit.safeSyncToOrigin("[email protected]:Khan/webapp", GIT_SHA1);
8888
dir("webapp") {
8989
sh("make clean_pyc");
90-
sh("make python_deps");
9190
}
9291
}
9392

jobs/notify-znd-owners.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ def runScript() {
3737
withSecrets.slackAlertlibOnly() { // because we pass --notify_slack
3838
dir("webapp") {
3939
sh("make clean_pyc"); // in case some .py files went away
40-
sh("make python_deps");
4140
sh("deploy/notify_znd_owners.py --notify_slack");
4241
}
4342
}

jobs/webapp-test.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ def _setupWebapp() {
203203

204204
dir("webapp") {
205205
clean(params.CLEAN);
206-
sh("make python_deps");
207206
// We always delete the ka-lint cache so we run all lints every time.
208207
// In theory we could use the cache, but just to be safe...
209208
sh("rm -rf genfiles/ka-lint");

weekly-maintenance.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set -x
3737
jenkins-jobs/safe_git.sh sync_to_origin "[email protected]:Khan/webapp" "automated-commits"
3838
jenkins-jobs/safe_git.sh sync_to_origin "[email protected]:Khan/network-config" "master"
3939

40-
( cd webapp && make deps python_deps )
40+
( cd webapp && make deps )
4141

4242
failed_jobs=""
4343
for job in $jobs_to_run; do

0 commit comments

Comments
 (0)