[IMP] Add suppor for Pydevd/Pycharm

Author: david-banon-tecnativa

11.0.Dockerfile

@@ -26,6 +26,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -94,6 +97,8 @@ RUN pip install \
         ptvsd \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         pudb \
         watchdog \
         wdb \

12.0.Dockerfile

@@ -26,6 +26,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -88,6 +91,8 @@ RUN pip install \
         ptvsd \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         pudb \
         python-magic \
         watchdog \

13.0.Dockerfile

@@ -26,6 +26,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -138,6 +141,8 @@ RUN build_deps=" \
         ptvsd \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         pudb \
         python-magic \
         watchdog \

14.0.Dockerfile

@@ -25,6 +25,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -149,6 +152,8 @@ RUN build_deps=" \
         git+https://github.com/Tecnativa/click-odoo-contrib.git@fix-active-modules-hashing \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         geoip2 \
         "git-aggregator<3.0.0" \
         inotify \

15.0.Dockerfile

@@ -25,6 +25,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -146,6 +149,8 @@ RUN build_deps=" \
         click-odoo-contrib \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         flanker[validator] \
         geoip2 \
         "git-aggregator<3.0.0" \

16.0.Dockerfile

@@ -31,6 +31,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -152,6 +155,8 @@ RUN build_deps=" \
         click-odoo-contrib \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         git+https://github.com/mailgun/flanker.git@v0.9.15#egg=flanker[validator] \
         geoip2 \
         "git-aggregator==4.0" \

17.0.Dockerfile

@@ -30,6 +30,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -151,6 +154,8 @@ RUN build_deps=" \
         click-odoo-contrib \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         git+https://github.com/mailgun/flanker.git@v0.9.15#egg=flanker[validator] \
         geoip2 \
         "git-aggregator==4.0" \

18.0.Dockerfile

@@ -30,6 +30,9 @@ ENV DB_FILTER=.* \
     DEBUGPY_ENABLE=0 \
     PUDB_RDB_HOST=0.0.0.0 \
     PUDB_RDB_PORT=6899 \
+    PYDEVD_PORT=6988 \
+    PYDEVD_ENABLE=0 \
+    PYCHARM_ENABLE=0 \
     PYTHONOPTIMIZE="" \
     UNACCENT=true \
     WAIT_DB=true \
@@ -151,6 +154,8 @@ RUN build_deps=" \
         click-odoo-contrib \
         debugpy \
         pydevd-odoo \
+        pydevd \
+        pydevd-pycharm \
         git+https://github.com/mailgun/flanker.git@v0.9.15#egg=flanker[validator] \
         geoip2 \
         "git-aggregator==4.0" \

bin/direxec

@@ -67,6 +67,8 @@ if extra_command:
                 + os.environ["DEBUGPY_ARGS"].split()
                 + extra_command
             )
+        elif os.environ["PYDEVD_ENABLE"] == "1" or os.environ["PYCHARM_ENABLE"] == "1":
+            extra_command[0] = "/usr/local/bin/odoo_pydevd"
     logger.log(
         DEBUG if extra_command[0] == "/qa/insider" else INFO,
         "Executing %s",

bin/odoo_pydevd

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+# set server timezone in UTC before time module imported
+import os
+os.environ["TZ"] = "UTC"
+
+# import regular pydevd or pycharm's version depending on flags
+if os.environ["PYCHARM_ENABLE"] == "1":
+    import pydevd_pycharm as pydevd
+else:
+    import pydevd
+import odoo
+
+# If we don't get host, we guess it from within the container
+if os.environ.get("PYDEVD_HOST", False):
+    pydevd_host = os.environ["PYDEVD_HOST"]
+else:
+    import socket
+    local_ip = socket.gethostbyname(socket.gethostname())
+    pydevd_host = ".".join(local_ip.split(".")[0:3] + ["1"])
+# Port needs casting to int if obtained from env variable
+port=int(os.environ.get("PYDEVD_PORT", 6988))
+pydevd.settrace(
+    pydevd_host, port=port, suspend=False, stdoutToServer=True, stderrToServer=True
+)
+if __name__ == "__main__":
+    odoo.cli.main()