Install python3 version of supervisor, ditch pip2 (#3372)

.buildkite/scripts/build_scion_img

@@ -2,7 +2,7 @@
 
 set -e
 
-BASE_IMG=${BASE_IMG:-1e281bd0bb1069bbe12cec5e73f2ed4d3e6e43440208550682be5a0086bf6a46}
+BASE_IMG=${BASE_IMG:-d8764a89c436c929fce76d5803e2f7afaaee420d46f0f2008cd08c95124480f5}
 
 docker pull scionproto/scion_base@sha256:$BASE_IMG
 docker tag scionproto/scion_base@sha256:$BASE_IMG scion_base:latest

docker/Dockerfile.base

@@ -44,17 +44,11 @@ RUN sudo mkdir -p /scioncache;
 
 # Pip packages
 COPY env/pip3 env/pip3
-COPY env/pip2 env/pip2
 RUN set -ex; \
-    env/pip2/deps; \
     env/pip3/deps; \
     sudo tar czf /scioncache/python_local.tar.gz --owner=scion -C ~ .local; \
     rm -r ~/.cache/pip ~/.local
 
-# Pip2 packages
-COPY env/pip2 env/pip2
-RUN env/pip2/deps && rm -r ~/.cache/pip
-
 # Dependencies managed by Bazel.
 COPY WORKSPACE .
 COPY tools/fetch.sh tools/

env/debian/pkgs.txt

@@ -22,13 +22,9 @@ netcat-openbsd
 ntp
 openssh-client
 patch
-python-flake8
-python-minimal
-python-pip
-python-setuptools
-python-wheel
 python3-coverage
 python3-dev
+python3-flake8
 python3-lz4
 python3-minimal
 python3-nacl

env/deps

@@ -7,4 +7,3 @@ BASE=$(dirname "$0")
 
 "$BASE/debian/deps"
 "$BASE/pip3/deps"
-"$BASE/pip2/deps"

env/pip3/licenses/supervisor

@@ -0,0 +1,106 @@
+Supervisor is licensed under the following license:
+
+  A copyright notice accompanies this license document that identifies
+  the copyright holders.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  1.  Redistributions in source code must retain the accompanying
+      copyright notice, this list of conditions, and the following
+      disclaimer.
+
+  2.  Redistributions in binary form must reproduce the accompanying
+      copyright notice, this list of conditions, and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+  3.  Names of the copyright holders must not be used to endorse or
+      promote products derived from this software without prior
+      written permission from the copyright holders.
+
+  4.  If any files are modified, you must cause the modified files to
+      carry prominent notices stating that you changed the files and
+      the date of any change.
+
+  Disclaimer
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND
+    ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+    TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+    TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+    THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+http_client.py code is based on code by Daniel Krech, which was
+released under this license:
+
+  LICENSE AGREEMENT FOR RDFLIB 0.9.0 THROUGH 2.3.1
+  ------------------------------------------------
+  Copyright (c) 2002-2005, Daniel Krech, http://eikeon.com/
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+    * Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+    * Neither the name of Daniel Krech nor the names of its
+  contributors may be used to endorse or promote products derived
+  from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Medusa, the asynchronous communications framework upon which
+supervisor's server and client code is based, was created by Sam
+Rushing:
+
+  Medusa was once distributed under a 'free for non-commercial use'
+  license, but in May of 2000 Sam Rushing changed the license to be
+  identical to the standard Python license at the time.  The standard
+  Python license has always applied to the core components of Medusa,
+  this change just frees up the rest of the system, including the http
+  server, ftp server, utilities, etc.  Medusa is therefore under the
+  following license:
+
+  ==============================
+  Permission to use, copy, modify, and distribute this software and
+  its documentation for any purpose and without fee is hereby granted,
+  provided that the above copyright notice appear in all copies and
+  that both that copyright notice and this permission notice appear in
+  supporting documentation, and that the name of Sam Rushing not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+  NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+  NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+  WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  ==============================

env/pip3/requirements.txt

@@ -32,3 +32,7 @@ pypacker==4.1 --hash=sha256:05bc5c873cfef620ce8b07df4aa286ea199e328b5b1eabd0b10a
 toml==0.9.4 --hash=sha256:8e86bd6ce8cc11b9620cb637466453d94f5d57ad86f17e98a98d1f73e3baab2d # Direct dependency
 # plumbum: licenses/MIT
 plumbum==1.6.7 --hash=sha256:df96a5facf621db4a6d682bdc93afa5ed6b107a8667c73c3f0a0f0fab4217c81 # Direct dependency
+# supervisor: licenses/supervisor
+supervisor==4.1.0 --hash=sha256:2dc86fe0476e945e61483d614ceb2cf4f93b95282eb243bdf792621994360383 --hash=sha256:a76b2f77a560f2dc411c0254a4eb15f555e99faac48621b0f1fc9ab013944f47 # Direct dependency
+# supervisor-wildcards: licenses/BSD-3-Clause
+supervisor-wildcards==0.1.3 --hash=sha256:02f532bf059e99aa38a3170cf4295f9dd123cfb16f209240575d853fd90710f8 # Direct dependency