Add support for Python 3.5 and 3.6 (#69)

* Update README.md and include Python versions

Author: briandealwis

README.md

@@ -2,8 +2,6 @@
 
 # Container Runtime Debugging Support (aka Duct Tape)
 
-_Caution: this is work-in-progress_
-
 This repository gathers additional dependencies required to debug
 particular language runtimes with [`skaffold debug`](https://skaffold.dev/docs/how-tos/debug/). 
 These dependencies are packaged as a set of container images suitable
@@ -22,23 +20,29 @@ Current language runtimes:
   * `go`: provides [Delve](https://github.com/go-delve/delve)
   * `python`: provides [`ptvsd`](https://github.com/Microsoft/ptvsd),
     a debug adapter that can be used for VS Code and more, for
-    Python 2.7 and 3.7
+    Python 2.7 and 3.5+
+  * `nodejs`: provides a `node` wrapper that propagates `--inspect`
+    args to the application invokation
   * `netcore`: provides `vsdbg` for .NET Core
 
 ## Development
 
-This directory includes a `skaffold.yaml` for development of the
-these `duct-tape` initContainer images.  Each image is expected to
-be standalone and not require downloading content across the network.
-To add support for a new language runtime, an image definition
-should download the necessary files into the container image.  The
-image's entrypoint should then copy those files into place at
-`/dbg/<runtime>`.  The image should be added to the `skaffold.yaml`
-and referenced within `test/k8s-test-installation.yaml`.
+This project uses Skaffold's multiple config support to allow
+developing for each language runtime separately.
+
+Each language runtime is broken out to a separate directory
+with a `skaffold.yaml` for development of the `duct-tape` initContainer
+image.  Each image is expected to be standalone and not require
+downloading content across the network.  To add support for a new
+language runtime, an image definition should download the necessary
+files into the container image.  The image's entrypoint should then
+copy those files into place at `/dbg/<runtime>`.  The image should
+be added to the respective `skaffold.yaml` and referenced within
+`test/k8s-*-installation.yaml`.
 
-### Testing
+# Testing
 
-Integration tests are found in `integration/`.  These build and
+Integration tests are found in `test/`.  These tests build and
 launch applications as pods that are similar to the transformed
 form produced by `skaffold debug`.  To run:
 

python/helper-image/Dockerfile

@@ -14,7 +14,9 @@
 
 # This Dockerfile creates a debug helper base image for Python.
 # It provides installations of debugpy, ptvsd, pydevd, and pydevd-pycharm
-# for Python 2.7, 3.7, 3.8, and 3.9.
+# for Python 2.7, 3.5, 3.6, 3.7, 3.8, and 3.9.
+#   - Apache Beam is based around Python 3.5
+#   - Many ML/NLP images are based on Python 3.6
 #
 # debugpy and ptvsd are well-structured packages installed in separate
 # directories under # /dbg/python/lib/pythonX.Y/site-packages and
@@ -27,23 +29,33 @@
 
 FROM python:2.7 as python27
 RUN PYTHONUSERBASE=/dbgpy pip install --user ptvsd debugpy
-RUN PYTHONUSERBASE=/dbgpy/pydevd/python2.7 pip install --user pydevd
-RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python2.7 pip install --user pydevd-pycharm
+RUN PYTHONUSERBASE=/dbgpy/pydevd/python2.7 pip install --user pydevd --no-warn-script-location
+RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python2.7 pip install --user pydevd-pycharm --no-warn-script-location
+
+FROM python:3.5 as python35
+RUN PYTHONUSERBASE=/dbgpy pip install --user ptvsd debugpy
+RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.5 pip install --user pydevd --no-warn-script-location
+RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.5 pip install --user pydevd-pycharm --no-warn-script-location
+
+FROM python:3.6 as python36
+RUN PYTHONUSERBASE=/dbgpy pip install --user ptvsd debugpy
+RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.6 pip install --user pydevd --no-warn-script-location
+RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.6 pip install --user pydevd-pycharm --no-warn-script-location
 
 FROM python:3.7 as python37
 RUN PYTHONUSERBASE=/dbgpy pip install --user ptvsd debugpy
-RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.7 pip install --user pydevd
-RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.7 pip install --user pydevd-pycharm
+RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.7 pip install --user pydevd --no-warn-script-location
+RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.7 pip install --user pydevd-pycharm --no-warn-script-location
 
 FROM python:3.8 as python38
 RUN PYTHONUSERBASE=/dbgpy pip install --user ptvsd debugpy
-RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.8 pip install --user pydevd
-RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.8 pip install --user pydevd-pycharm
+RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.8 pip install --user pydevd --no-warn-script-location
+RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.8 pip install --user pydevd-pycharm --no-warn-script-location
 
 FROM python:3.9 as python39
 RUN PYTHONUSERBASE=/dbgpy pip install --user ptvsd debugpy
-RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.9 pip install --user pydevd
-RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.9 pip install --user pydevd-pycharm
+RUN PYTHONUSERBASE=/dbgpy/pydevd/python3.9 pip install --user pydevd --no-warn-script-location
+RUN PYTHONUSERBASE=/dbgpy/pydevd-pycharm/python3.9 pip install --user pydevd-pycharm --no-warn-script-location
 
 FROM golang:1.14.1 as build
 COPY launcher/ .
@@ -60,6 +72,8 @@ COPY install.sh /
 CMD ["/bin/sh", "/install.sh"]
 WORKDIR /duct-tape
 COPY --from=python27 /dbgpy/ python/
+COPY --from=python35 /dbgpy/ python/
+COPY --from=python36 /dbgpy/ python/
 COPY --from=python37 /dbgpy/ python/
 COPY --from=python38 /dbgpy/ python/
 COPY --from=python39 /dbgpy/ python/

python/structure-tests-python.yaml

@@ -5,18 +5,56 @@ fileExistenceTests:
     path: '/duct-tape/python/lib/python2.7/site-packages/ptvsd/__init__.py'
   - name: 'debugpy for python 2.7'
     path: '/duct-tape/python/lib/python2.7/site-packages/debugpy/__init__.py'
+  - name: 'pydevd for python 2.7'
+    path: '/duct-tape/python/pydevd/python2.7/lib/python2.7/site-packages/pydevd.py'
+  - name: 'pydevd-pycharm for python 2.7'
+    path: '/duct-tape/python/pydevd-pycharm/python2.7/lib/python2.7/site-packages/pydevd.py'
+
+  - name: 'ptvsd for python 3.5'
+    path: '/duct-tape/python/lib/python3.5/site-packages/ptvsd/__init__.py'
+  - name: 'debugpy for python 3.5'
+    path: '/duct-tape/python/lib/python3.5/site-packages/debugpy/__init__.py'
+  - name: 'pydevd for python 3.5'
+    path: '/duct-tape/python/pydevd/python3.5/lib/python3.5/site-packages/pydevd.py'
+  - name: 'pydevd-pycharm for python 3.5'
+    path: '/duct-tape/python/pydevd-pycharm/python3.5/lib/python3.5/site-packages/pydevd.py'
+
+  - name: 'ptvsd for python 3.6'
+    path: '/duct-tape/python/lib/python3.6/site-packages/ptvsd/__init__.py'
+  - name: 'debugpy for python 3.6'
+    path: '/duct-tape/python/lib/python3.6/site-packages/debugpy/__init__.py'
+  - name: 'pydevd for python 3.6'
+    path: '/duct-tape/python/pydevd/python3.6/lib/python3.6/site-packages/pydevd.py'
+  - name: 'pydevd-pycharm for python 3.6'
+    path: '/duct-tape/python/pydevd-pycharm/python3.6/lib/python3.6/site-packages/pydevd.py'
+
   - name: 'ptvsd for python 3.7'
     path: '/duct-tape/python/lib/python3.7/site-packages/ptvsd/__init__.py'
   - name: 'debugpy for python 3.7'
     path: '/duct-tape/python/lib/python3.7/site-packages/debugpy/__init__.py'
+  - name: 'pydevd for python 3.7'
+    path: '/duct-tape/python/pydevd/python3.7/lib/python3.7/site-packages/pydevd.py'
+  - name: 'pydevd-pycharm for python 3.7'
+    path: '/duct-tape/python/pydevd-pycharm/python3.7/lib/python3.7/site-packages/pydevd.py'
+
   - name: 'ptvsd for python 3.8'
     path: '/duct-tape/python/lib/python3.8/site-packages/ptvsd/__init__.py'
   - name: 'debugpy for python 3.8'
     path: '/duct-tape/python/lib/python3.8/site-packages/debugpy/__init__.py'
+  - name: 'pydevd for python 3.8'
+    path: '/duct-tape/python/pydevd/python3.8/lib/python3.8/site-packages/pydevd.py'
+  - name: 'pydevd-pycharm for python 3.8'
+    path: '/duct-tape/python/pydevd-pycharm/python3.8/lib/python3.8/site-packages/pydevd.py'
+
   - name: 'ptvsd for python 3.9'
     path: '/duct-tape/python/lib/python3.9/site-packages/ptvsd/__init__.py'
   - name: 'debugpy for python 3.9'
     path: '/duct-tape/python/lib/python3.9/site-packages/debugpy/__init__.py'
+  - name: 'pydevd for python 3.9'
+    path: '/duct-tape/python/pydevd/python3.9/lib/python3.9/site-packages/pydevd.py'
+  - name: 'pydevd-pycharm for python 3.9'
+    path: '/duct-tape/python/pydevd-pycharm/python3.9/lib/python3.9/site-packages/pydevd.py'
+
   - name: 'python launcher'
     path: '/duct-tape/python/launcher'
     isExecutableBy: any