diff --git a/.circleci/config.yml b/.circleci/config.yml index 8861b97bd5..50f61c944f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,10 +25,6 @@ jobs: name: Unit tests & Coverage command: ./scion.sh coverage |& tee logs/coverage.run when: always - - run: - name: scion-web - command: ./sub/web/manage.py test &> logs/sweb_test.run - when: always - run: name: Python documentation (sphinx) command: make -f sphinx-doc/Makefile clean html |& tee logs/sphinx.run @@ -70,10 +66,6 @@ jobs: name: Unit tests & Coverage command: ./scion.sh coverage |& tee logs/coverage.run when: always - - run: - name: scion-web - command: ./sub/web/manage.py test &> logs/sweb_test.run - when: always - run: name: Python documentation (sphinx) command: make -f sphinx-doc/Makefile clean html |& tee logs/sphinx.run diff --git a/.gitmodules b/.gitmodules index 689bc76ff3..82c201b84f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "sub/lwip-contrib"] path = sub/lwip-contrib url = git@github.com:netsec-ethz/scion-lwip-contrib.git -[submodule "sub/web"] - path = sub/web - url = git@github.com:netsec-ethz/scion-web.git diff --git a/Makefile b/Makefile index cf7aa23fbf..e75b1e1b5e 100644 --- a/Makefile +++ b/Makefile @@ -41,4 +41,4 @@ uninstall: $(foreach var,$(SRC_DIRS),$(MAKE) -C $(var) uninstall || exit 1;) tags: - { git ls-files; git submodule --quiet foreach 'git ls-files | sed "s|^|$$path/|"'; } | grep -v sub/web/ad_manager/static/js/ | ctags -L - + { git ls-files; git submodule --quiet foreach 'git ls-files | sed "s|^|$$path/|"'; } | ctags -L - diff --git a/docker/Dockerfile b/docker/Dockerfile index 815db37234..a9954f1517 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,9 +13,5 @@ RUN docker/deps_check # Syncing should be a no-op, just need installation to run RUN make -C go deps -# Setup scion-web -RUN cp sub/web/web_scion/settings/private.dist.py sub/web/web_scion/settings/private.py -RUN sub/web/manage.py makemigrations - # Build topology files RUN ./scion.sh topology diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index bb9d439627..f951124002 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -38,11 +38,6 @@ RUN env/pip3/deps && rm -r ~/.cache/pip COPY env/pip2 env/pip2 RUN env/pip2/deps && rm -r ~/.cache/pip -# scion-web pip3 packages -COPY env/pip3web env/pip3web -COPY sub/web/requirements.txt env/pip3web -RUN env/pip3web/deps && rm -r ~/.cache/pip - # zlog packages COPY env/zlog env/zlog RUN env/zlog/deps diff --git a/env/deps b/env/deps index dbafad6729..e9d7e90e76 100755 --- a/env/deps +++ b/env/deps @@ -8,7 +8,6 @@ BASE=$(dirname "$0") "$BASE/debian/deps" "$BASE/pip3/deps" "$BASE/pip2/deps" -"$BASE/pip3web/deps" "$BASE/zlog/deps" "$BASE/go/deps" ( cd go && make deps ) diff --git a/env/pip3web/check b/env/pip3web/check deleted file mode 100755 index de3e4179ed..0000000000 --- a/env/pip3web/check +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -BASE=$(dirname "$0") -. $(dirname "$BASE")/common.sh -. "$BASE/common.sh" - -pip_compare pip3 "$req" diff --git a/env/pip3web/common.sh b/env/pip3web/common.sh deleted file mode 100644 index d283d62c06..0000000000 --- a/env/pip3web/common.sh +++ /dev/null @@ -1,2 +0,0 @@ -req="sub/web/requirements.txt" -[ -e "$req" ] || req="$BASE/requirements.txt" diff --git a/env/pip3web/deps b/env/pip3web/deps deleted file mode 100755 index fafccca360..0000000000 --- a/env/pip3web/deps +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -set -e - -BASE=$(dirname "$0") -. $(dirname "$BASE")/common.sh -. "$BASE/common.sh" - -[ -z "$("$BASE/check")" ] && exit - -echo "Installing necessary packages from pip3 for scion-web" -pip_install pip3 "$req" diff --git a/scion.sh b/scion.sh index bf19dc7ede..94417c44db 100755 --- a/scion.sh +++ b/scion.sh @@ -102,7 +102,7 @@ cmd_lint() { py_lint() { local ret=0 - for i in python python/mininet sub/web; do + for i in python python/mininet; do [ -d "$i" ] || continue echo "Linting $i" local cmd="flake8" diff --git a/sub/web b/sub/web deleted file mode 160000 index 2b2d68922e..0000000000 --- a/sub/web +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2b2d68922ea059b70651754ec4d388c4c214ca38 diff --git a/tools/ci/build_prep b/tools/ci/build_prep index 6289ccc2a9..0e85aa4d7c 100755 --- a/tools/ci/build_prep +++ b/tools/ci/build_prep @@ -13,7 +13,5 @@ tar xf ~/go_vendor.tar.gz -C go/vendor/ APTARGS=-y ./env/deps # Syncing should be a no-op, just need installation to run make -C go deps -cp sub/web/web_scion/settings/private.dist.py sub/web/web_scion/settings/private.py -./sub/web/manage.py makemigrations ./scion.sh topology --pseg-ttl 1800 exit $rt