summary refs log tree commit diff
diff options
context:
space:
mode:
authorJorik Schellekens <joriks@matrix.org>2019-06-14 15:23:57 +0100
committerGitHub <noreply@github.com>2019-06-14 15:23:57 +0100
commit1e7864c929fa31463903f80a1ca2f3caaf3d3ec6 (patch)
tree7a069f48417ab03ec5977b7f94b6c21229ca0628
parentMerge pull request #5390 from matrix-org/erikj/dont_log_on_fail_to_get_file (diff)
parentChangelog (diff)
downloadsynapse-1e7864c929fa31463903f80a1ca2f3caaf3d3ec6.tar.xz
Merge pull request #5460 from matrix-org/joriks/demo_python3
Use python3 in the demo
-rw-r--r--changelog.d/5460.misc1
-rwxr-xr-xdemo/start.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5460.misc b/changelog.d/5460.misc
new file mode 100644
index 0000000000..badc8bb79a
--- /dev/null
+++ b/changelog.d/5460.misc
@@ -0,0 +1 @@
+Demo script now uses python3.
diff --git a/demo/start.sh b/demo/start.sh
index c4a1328a6f..5c3a8fe61f 100755
--- a/demo/start.sh
+++ b/demo/start.sh
@@ -21,7 +21,7 @@ for port in 8080 8081 8082; do
     pushd demo/$port
 
     #rm $DIR/etc/$port.config
-    python -m synapse.app.homeserver \
+    python3 -m synapse.app.homeserver \
         --generate-config \
         -H "localhost:$https_port" \
         --config-path "$DIR/etc/$port.config" \
@@ -55,7 +55,7 @@ for port in 8080 8081 8082; do
         echo "report_stats: false" >> $DIR/etc/$port.config
     fi
 
-    python -m synapse.app.homeserver \
+    python3 -m synapse.app.homeserver \
         --config-path "$DIR/etc/$port.config" \
         -D \
         -vv \