From fad6645764c10ce9ffcecf2adbb521705324b047 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 29 Sep 2023 21:41:33 +0100
Subject: [PATCH 1/8] chore: update to python 3.11

---
 .github/actions/run-backend-tests/action.yml |  2 +-
 .github/workflows/benchmark.yml              |  2 +-
 .github/workflows/ci-backend.yml             |  8 ++--
 .github/workflows/ci-plugin-server.yml       |  4 +-
 .run/Celery.run.xml                          |  1 +
 .run/PostHog.run.xml                         |  4 +-
 posthog/clickhouse/client/escape.py          |  1 +
 production-unit.Dockerfile                   |  2 +-
 production.Dockerfile                        |  4 +-
 pyproject.toml                               |  2 +-
 requirements-dev.txt                         | 40 +-------------------
 requirements.in                              |  5 ++-
 requirements.txt                             | 20 +++++-----
 13 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/.github/actions/run-backend-tests/action.yml b/.github/actions/run-backend-tests/action.yml
index edd36992a6614..c742d87dde90d 100644
--- a/.github/actions/run-backend-tests/action.yml
+++ b/.github/actions/run-backend-tests/action.yml
@@ -6,7 +6,7 @@ name: Run Django tests
 inputs:
     python-version:
         required: true
-        description: Python version, e.g. 3.10.10
+        description: Python version, e.g. 3.11.4
     clickhouse-server-image:
         required: true
         description: ClickHouse server image tag, e.g. clickhouse/clickhouse-server:latest
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 191b481a045d2..eff3bfb7dc8e8 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -54,7 +54,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.10.10
+                  python-version: 3.11.4
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
index f80300fca0a56..3290e5ec8fd73 100644
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -103,7 +103,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.10.10
+                  python-version: 3.11.4
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -181,7 +181,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.10.10
+                  python-version: 3.11.4
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -237,7 +237,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                python-version: ['3.10.10']
+                python-version: ['3.11.4']
                 clickhouse-server-image: ['clickhouse/clickhouse-server:23.6.1.1524']
                 segment: ['FOSS', 'EE']
                 person-on-events: [false, true]
@@ -325,7 +325,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.10.10
+                  python-version: 3.11.4
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
diff --git a/.github/workflows/ci-plugin-server.yml b/.github/workflows/ci-plugin-server.yml
index 81aa5cf4cd81f..b51a25c42ad92 100644
--- a/.github/workflows/ci-plugin-server.yml
+++ b/.github/workflows/ci-plugin-server.yml
@@ -117,7 +117,7 @@ jobs:
               if: needs.changes.outputs.plugin-server == 'true'
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.10.10
+                  python-version: 3.11.4
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -215,7 +215,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.10.10
+                  python-version: 3.11.4
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
diff --git a/.run/Celery.run.xml b/.run/Celery.run.xml
index 82f170a5fa381..fc1702472e518 100644
--- a/.run/Celery.run.xml
+++ b/.run/Celery.run.xml
@@ -12,6 +12,7 @@
       <env name="SKIP_SERVICE_VERSION_REQUIREMENTS" value="1" />
     </envs>
     <option name="SDK_HOME" value="$PROJECT_DIR$/env/bin/python" />
+    <option name="SDK_NAME" value="Python 3.11 (posthog)" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/env/bin" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/.run/PostHog.run.xml b/.run/PostHog.run.xml
index df41d468add82..4f8d64fe01ff4 100644
--- a/.run/PostHog.run.xml
+++ b/.run/PostHog.run.xml
@@ -4,6 +4,7 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="BILLING_SERVICE_URL" value="https://billing.dev.posthog.dev" />
       <env name="CAPTURE_TIME_TO_SEE_DATA" value="0" />
       <env name="CLICKHOUSE_SECURE" value="False" />
@@ -14,7 +15,6 @@
       <env name="KEA_VERBOSE_LOGGING" value="false" />
       <env name="PRINT_SQL" value="1" />
       <env name="PYDEVD_USE_CYTHON" value="NO" />
-      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="SESSION_RECORDING_KAFKA_COMPRESSION" value="gzip" />
       <env name="SESSION_RECORDING_KAFKA_HOSTS" value="localhost" />
       <env name="SESSION_RECORDING_KAFKA_MAX_REQUEST_SIZE_BYTES" value="524288" />
@@ -22,7 +22,7 @@
       <env name="REPLAY_EVENTS_NEW_CONSUMER_RATIO" value="1" />
     </envs>
     <option name="SDK_HOME" value="$PROJECT_DIR$/env/bin/python" />
-    <option name="SDK_NAME" value="Python 3.10 (posthog)" />
+    <option name="SDK_NAME" value="Python 3.11 (posthog)" />
     <option name="WORKING_DIRECTORY" value="" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/posthog/clickhouse/client/escape.py b/posthog/clickhouse/client/escape.py
index 49e7b1047f372..4f3c6b11af4ba 100644
--- a/posthog/clickhouse/client/escape.py
+++ b/posthog/clickhouse/client/escape.py
@@ -90,5 +90,6 @@ def escape_param_for_clickhouse(param: Any) -> str:
         revision="placeholder server_info value",
         display_name="placeholder server_info value",
         timezone="UTC",
+        used_revision="placeholder server_info value",
     )
     return escape_param(param, context=context)
diff --git a/production-unit.Dockerfile b/production-unit.Dockerfile
index fb79f50912fb0..a3a31f075bd22 100644
--- a/production-unit.Dockerfile
+++ b/production-unit.Dockerfile
@@ -81,7 +81,7 @@ RUN corepack enable && \
 #
 # ---------------------------------------------------------
 #
-FROM python:3.10.10-slim-bullseye AS posthog-build
+FROM python:3.11.4-slim-bullseye AS posthog-build
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/production.Dockerfile b/production.Dockerfile
index d147edb7da7b2..9add315c4fe7b 100644
--- a/production.Dockerfile
+++ b/production.Dockerfile
@@ -97,7 +97,7 @@ RUN corepack enable && \
 #
 # ---------------------------------------------------------
 #
-FROM python:3.10.10-slim-bullseye AS posthog-build
+FROM python:3.11.4-slim-bullseye AS posthog-build
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -152,7 +152,7 @@ RUN apt-get update && \
 #
 # ---------------------------------------------------------
 #
-FROM python:3.10.10-slim-bullseye
+FROM python:3.11.4-slim-bullseye
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV PYTHONUNBUFFERED 1
diff --git a/pyproject.toml b/pyproject.toml
index 689a4c32bf2a2..a0363f6278e98 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 120
-target-version = ['py310']
+target-version = ['py311']
 
 [tool.isort]
 profile = "black"
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4ed1eb4080e41..6ff1b2403a607 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements-dev.in
@@ -34,11 +34,6 @@ certifi==2019.11.28
     # via
     #   -c requirements.txt
     #   requests
-    #   urllib3
-cffi==1.14.5
-    # via
-    #   -c requirements.txt
-    #   cryptography
 chardet==5.1.0
     # via
     #   -c requirements.txt
@@ -62,11 +57,6 @@ coreschema==0.0.4
     # via coreapi
 coverage[toml]==5.5
     # via pytest-cov
-cryptography==37.0.2
-    # via
-    #   -c requirements.txt
-    #   pyopenssl
-    #   urllib3
 datamodel-code-generator==0.21.5
     # via -r requirements-dev.in
 django==3.2.19
@@ -90,8 +80,6 @@ docopt==0.6.2
     # via pytest-watch
 email-validator==2.0.0.post2
     # via pydantic
-exceptiongroup==1.1.2
-    # via pytest
 faker==17.5.0
     # via -r requirements-dev.in
 fakeredis[lua]==2.11.0
@@ -109,7 +97,6 @@ idna==2.8
     #   -c requirements.txt
     #   email-validator
     #   requests
-    #   urllib3
 importlib-resources==5.10.2
     # via openapi-spec-validator
 inflect==5.6.2
@@ -179,10 +166,6 @@ prance==0.22.2.22.0
     #   -c requirements.txt
     #   -r requirements-dev.in
     #   datamodel-code-generator
-pycparser==2.20
-    # via
-    #   -c requirements.txt
-    #   cffi
 pydantic[email]==2.3.0
     # via
     #   -c requirements.txt
@@ -191,10 +174,6 @@ pydantic-core==2.6.3
     # via
     #   -c requirements.txt
     #   pydantic
-pyopenssl==22.0.0
-    # via
-    #   -c requirements.txt
-    #   urllib3
 pyproject-hooks==1.0.0
     # via build
 pyrsistent==0.18.1
@@ -203,10 +182,6 @@ pyrsistent==0.18.1
     #   jsonschema
 pysnooper==1.1.1
     # via datamodel-code-generator
-pysocks==1.7.1
-    # via
-    #   -c requirements.txt
-    #   urllib3
 pytest==7.4.0
     # via
     #   -r requirements-dev.in
@@ -293,13 +268,6 @@ toml==0.10.1
     # via
     #   coverage
     #   datamodel-code-generator
-tomli==1.2.3
-    # via
-    #   black
-    #   build
-    #   mypy
-    #   pyproject-hooks
-    #   pytest
 types-freezegun==1.1.10
     # via -r requirements-dev.in
 types-markdown==3.3.9
@@ -332,15 +300,11 @@ uritemplate==4.1.1
     # via
     #   -c requirements.txt
     #   coreapi
-urllib3[secure,socks]==1.26.13
+urllib3==1.26.13
     # via
     #   -c requirements.txt
     #   requests
     #   responses
-urllib3-secure-extra==0.1.0
-    # via
-    #   -c requirements.txt
-    #   urllib3
 watchdog==2.1.8
     # via pytest-watch
 wheel==0.38.1
diff --git a/requirements.in b/requirements.in
index d5c9e9449a32b..0df1e047011fd 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,6 +4,9 @@
 # - `pip-compile --rebuild requirements.in`
 # - `pip-compile --rebuild requirements-dev.in`
 #
+yarl>=1.8.1
+frozenlist>=1.3.1
+lxml>=4.9.0
 aiohttp>=3.8.4
 aioboto3==11.1
 antlr4-python3-runtime==4.13.1
@@ -13,7 +16,7 @@ boto3-stubs[s3]
 brotli==1.1.0
 celery==5.3.4
 celery-redbeat==2.1.1
-clickhouse-driver==0.2.4
+clickhouse-driver==0.2.6
 clickhouse-pool==0.5.3
 cryptography==37.0.2
 defusedxml==0.6.0
diff --git a/requirements.txt b/requirements.txt
index 44eef0d14f9b6..49ff4c1a5b6b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements.in
 #
-aioboto3==11.1
+aioboto3==11.1.0
     # via -r requirements.in
 aiobotocore[boto3]==2.5.0
     # via aioboto3
@@ -102,7 +102,7 @@ click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-clickhouse-driver==0.2.4
+clickhouse-driver==0.2.6
     # via
     #   -r requirements.in
     #   clickhouse-pool
@@ -210,8 +210,9 @@ drf-spectacular==0.24.2
     # via -r requirements.in
 filelock==3.12.0
     # via snowflake-connector-python
-frozenlist==1.3.0
+frozenlist==1.4.0
     # via
+    #   -r requirements.in
     #   aiohttp
     #   aiosignal
 future==0.18.3
@@ -285,8 +286,9 @@ kombu==5.3.2
     # via
     #   -r requirements.in
     #   celery
-lxml==4.6.5
+lxml==4.9.3
     # via
+    #   -r requirements.in
     #   python3-saml
     #   toronado
     #   xmlsec
@@ -401,7 +403,6 @@ python-dateutil==2.8.2
     #   celery-redbeat
     #   google-cloud-bigquery
     #   posthoganalytics
-    #   temporalio
 python-dotenv==0.21.0
     # via webdriver-manager
 python-statsd==2.1.0
@@ -452,8 +453,6 @@ rsa==4.9
     # via google-auth
 ruamel-yaml==0.17.21
     # via prance
-ruamel-yaml-clib==0.2.7
-    # via ruamel-yaml
 s3transfer==0.6.0
     # via boto3
 selenium==4.1.5
@@ -563,9 +562,12 @@ wsproto==1.1.0
     # via trio-websocket
 xmlsec==1.3.13
     # via python3-saml
-yarl==1.7.2
+yarl==1.9.2
     # via aiohttp
 zipp==3.17.0
+    # via
+    #   -r requirements.in
+    #   aiohttp
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

From 1b1e2a66b11d3db59bc233f23558e780796ce4bf Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 29 Sep 2023 21:44:58 +0100
Subject: [PATCH 2/8] update devcontainer too

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index cea55fdf04693..a2975958c05d9 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -7,7 +7,7 @@
 # experience as rich as possible. Perhaps later down the line it might be worth
 # rolling our own
 #
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.10-bullseye
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.11-bullseye
 
 # Make sure all exit codes on pipes cause failures
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

From 8b9c878044b4f3e1a65f356f75ce909c7a7d7c8f Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 29 Sep 2023 21:49:00 +0100
Subject: [PATCH 3/8] fix

---
 .devcontainer/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a2975958c05d9..c9eaa41e55139 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update \
     netcat brotli curl \
     && rm -rf /var/lib/apt/lists/*
 
+# hadolint ignore=DL3004
 RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
     && sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
     && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \

From 88caa0d736f76e1f21f7c4475cd6a8dd6b8085b1 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 13 Oct 2023 09:37:25 +0100
Subject: [PATCH 4/8] time has passed, use 3.11.6

---
 .github/workflows/benchmark.yml        | 2 +-
 .github/workflows/ci-backend.yml       | 6 +++---
 .github/workflows/ci-plugin-server.yml | 4 ++--
 production-unit.Dockerfile             | 2 +-
 production.Dockerfile                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index eff3bfb7dc8e8..1541c9515d4a2 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -54,7 +54,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.11.4
+                  python-version: 3.11.6
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
index 3290e5ec8fd73..386c929760c9e 100644
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -103,7 +103,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.11.4
+                  python-version: 3.11.6
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -181,7 +181,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.11.4
+                  python-version: 3.11.6
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -325,7 +325,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.11.4
+                  python-version: 3.11.6
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
diff --git a/.github/workflows/ci-plugin-server.yml b/.github/workflows/ci-plugin-server.yml
index b51a25c42ad92..411d66e06ca25 100644
--- a/.github/workflows/ci-plugin-server.yml
+++ b/.github/workflows/ci-plugin-server.yml
@@ -117,7 +117,7 @@ jobs:
               if: needs.changes.outputs.plugin-server == 'true'
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.11.4
+                  python-version: 3.11.6
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
@@ -215,7 +215,7 @@ jobs:
             - name: Set up Python
               uses: actions/setup-python@v4
               with:
-                  python-version: 3.11.4
+                  python-version: 3.11.6
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
 
             - uses: syphar/restore-virtualenv@v1
diff --git a/production-unit.Dockerfile b/production-unit.Dockerfile
index a3a31f075bd22..2ebece50ffc66 100644
--- a/production-unit.Dockerfile
+++ b/production-unit.Dockerfile
@@ -81,7 +81,7 @@ RUN corepack enable && \
 #
 # ---------------------------------------------------------
 #
-FROM python:3.11.4-slim-bullseye AS posthog-build
+FROM python:3.11.6-slim-bullseye AS posthog-build
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
diff --git a/production.Dockerfile b/production.Dockerfile
index 9add315c4fe7b..1372c1b7065eb 100644
--- a/production.Dockerfile
+++ b/production.Dockerfile
@@ -97,7 +97,7 @@ RUN corepack enable && \
 #
 # ---------------------------------------------------------
 #
-FROM python:3.11.4-slim-bullseye AS posthog-build
+FROM python:3.11.6-slim-bullseye AS posthog-build
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

From de8f492d982c7a4f8f3853469e9938e9697a0e3c Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 13 Oct 2023 10:01:08 +0100
Subject: [PATCH 5/8] update psycop maybe

---
 production.Dockerfile |  2 +-
 requirements-dev.txt  | 29 ++++++++++++++++++++++++++++-
 requirements.in       |  2 +-
 requirements.txt      |  4 ++--
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/production.Dockerfile b/production.Dockerfile
index 1372c1b7065eb..36896cfa226bb 100644
--- a/production.Dockerfile
+++ b/production.Dockerfile
@@ -152,7 +152,7 @@ RUN apt-get update && \
 #
 # ---------------------------------------------------------
 #
-FROM python:3.11.4-slim-bullseye
+FROM python:3.11.6-slim-bullseye
 WORKDIR /code
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV PYTHONUNBUFFERED 1
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 6ff1b2403a607..99c76c196dd4c 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -34,6 +34,11 @@ certifi==2019.11.28
     # via
     #   -c requirements.txt
     #   requests
+    #   urllib3
+cffi==1.14.5
+    # via
+    #   -c requirements.txt
+    #   cryptography
 chardet==5.1.0
     # via
     #   -c requirements.txt
@@ -57,6 +62,11 @@ coreschema==0.0.4
     # via coreapi
 coverage[toml]==5.5
     # via pytest-cov
+cryptography==37.0.2
+    # via
+    #   -c requirements.txt
+    #   pyopenssl
+    #   urllib3
 datamodel-code-generator==0.21.5
     # via -r requirements-dev.in
 django==3.2.19
@@ -97,6 +107,7 @@ idna==2.8
     #   -c requirements.txt
     #   email-validator
     #   requests
+    #   urllib3
 importlib-resources==5.10.2
     # via openapi-spec-validator
 inflect==5.6.2
@@ -166,6 +177,10 @@ prance==0.22.2.22.0
     #   -c requirements.txt
     #   -r requirements-dev.in
     #   datamodel-code-generator
+pycparser==2.20
+    # via
+    #   -c requirements.txt
+    #   cffi
 pydantic[email]==2.3.0
     # via
     #   -c requirements.txt
@@ -174,6 +189,10 @@ pydantic-core==2.6.3
     # via
     #   -c requirements.txt
     #   pydantic
+pyopenssl==22.0.0
+    # via
+    #   -c requirements.txt
+    #   urllib3
 pyproject-hooks==1.0.0
     # via build
 pyrsistent==0.18.1
@@ -182,6 +201,10 @@ pyrsistent==0.18.1
     #   jsonschema
 pysnooper==1.1.1
     # via datamodel-code-generator
+pysocks==1.7.1
+    # via
+    #   -c requirements.txt
+    #   urllib3
 pytest==7.4.0
     # via
     #   -r requirements-dev.in
@@ -300,11 +323,15 @@ uritemplate==4.1.1
     # via
     #   -c requirements.txt
     #   coreapi
-urllib3==1.26.13
+urllib3[secure,socks]==1.26.13
     # via
     #   -c requirements.txt
     #   requests
     #   responses
+urllib3-secure-extra==0.1.0
+    # via
+    #   -c requirements.txt
+    #   urllib3
 watchdog==2.1.8
     # via pytest-watch
 wheel==0.38.1
diff --git a/requirements.in b/requirements.in
index 0df1e047011fd..c78415d6b9da3 100644
--- a/requirements.in
+++ b/requirements.in
@@ -60,7 +60,7 @@ pickleshare==0.7.5
 Pillow==9.2.0
 posthoganalytics==3.0.1
 prance==0.22.2.22.0
-psycopg2-binary==2.9.7
+psycopg2-binary==2.9.9
 pyarrow==12.0.1
 pydantic==2.3.0
 pyjwt==2.4.0
diff --git a/requirements.txt b/requirements.txt
index 49ff4c1a5b6b4..148f811ea2556 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
 #
 #    pip-compile requirements.in
 #
-aioboto3==11.1.0
+aioboto3==11.1
     # via -r requirements.in
 aiobotocore[boto3]==2.5.0
     # via aioboto3
@@ -358,7 +358,7 @@ protobuf==4.22.1
     #   grpcio-status
     #   proto-plus
     #   temporalio
-psycopg2-binary==2.9.7
+psycopg2-binary==2.9.9
     # via -r requirements.in
 ptyprocess==0.6.0
     # via pexpect

From c8481dd9c7a815bcb1b9895c6b95e54efe5423f3 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 13 Oct 2023 10:26:35 +0100
Subject: [PATCH 6/8] don't share cache with other branches?

---
 .github/workflows/ci-backend.yml       | 8 ++++----
 .github/workflows/ci-hobby.yml         | 2 +-
 .github/workflows/ci-plugin-server.yml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
index 386c929760c9e..83a77f03d4586 100644
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -109,7 +109,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-
+                  custom_cache_key_element: v1-3-11-6
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'
@@ -187,7 +187,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-
+                  custom_cache_key_element: v1-py-3-11-6
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'
@@ -237,7 +237,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                python-version: ['3.11.4']
+                python-version: ['3.11.6']
                 clickhouse-server-image: ['clickhouse/clickhouse-server:23.6.1.1524']
                 segment: ['FOSS', 'EE']
                 person-on-events: [false, true]
@@ -331,7 +331,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-
+                  custom_cache_key_element: v1-py-3-11-6
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'
diff --git a/.github/workflows/ci-hobby.yml b/.github/workflows/ci-hobby.yml
index 9985a4402118b..3aae42d144c6a 100644
--- a/.github/workflows/ci-hobby.yml
+++ b/.github/workflows/ci-hobby.yml
@@ -29,7 +29,7 @@ jobs:
             - uses: actions/checkout@v3
             - uses: actions/setup-python@v4
               with:
-                  python-version: '3.8'
+                  python-version: '3.11.6'
                   cache: 'pip' # caching pip dependencies
                   token: ${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}
             - name: Get python deps
diff --git a/.github/workflows/ci-plugin-server.yml b/.github/workflows/ci-plugin-server.yml
index 411d66e06ca25..2897861247763 100644
--- a/.github/workflows/ci-plugin-server.yml
+++ b/.github/workflows/ci-plugin-server.yml
@@ -124,7 +124,7 @@ jobs:
               if: needs.changes.outputs.plugin-server == 'true'
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-
+                  custom_cache_key_element: v1-py-3-11-6
 
             - uses: syphar/restore-pip-download-cache@v1
               if: needs.changes.outputs.plugin-server == 'true' && steps.cache-backend-tests.outputs.cache-hit != 'true'
@@ -221,7 +221,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-
+                  custom_cache_key_element: v1-py-3-11-6
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'

From 20083b6a4715fcb6315b9429b355ce97f4b4bd5e Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 13 Oct 2023 10:34:02 +0100
Subject: [PATCH 7/8] fix helm namespace

---
 .github/workflows/pr-deploy.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/pr-deploy.yml b/.github/workflows/pr-deploy.yml
index 5bcdc2ca1e49f..81638f4d29967 100644
--- a/.github/workflows/pr-deploy.yml
+++ b/.github/workflows/pr-deploy.yml
@@ -62,7 +62,10 @@ jobs:
                   export PR_NUM=${{ github.event.number }}
                   export BRANCH_NAME=${{ github.head_ref }}
                   export RELEASE_NAME=posthog
+                  # branch name but with no forward slashes
                   export NAMESPACE=pr-$PR_NUM-${BRANCH_NAME//\//-}
+                  # and no full stops
+                  export NAMESPACE=${NAMESPACE//./-}
                   export NAMESPACE=${NAMESPACE:0:38}
                   export NAMESPACE=${NAMESPACE%%-}
                   export HOSTNAME=$NAMESPACE

From 20bde05f598cac45231d3a44d11922ffa97ca359 Mon Sep 17 00:00:00 2001
From: Paul D'Ambra <paul@posthog.com>
Date: Fri, 13 Oct 2023 10:42:22 +0100
Subject: [PATCH 8/8] nope

---
 .github/workflows/ci-backend.yml       | 6 +++---
 .github/workflows/ci-plugin-server.yml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
index 83a77f03d4586..3f58a57a03bbd 100644
--- a/.github/workflows/ci-backend.yml
+++ b/.github/workflows/ci-backend.yml
@@ -109,7 +109,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-3-11-6
+                  custom_cache_key_element: v1
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'
@@ -187,7 +187,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-py-3-11-6
+                  custom_cache_key_element: v1
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'
@@ -331,7 +331,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-py-3-11-6
+                  custom_cache_key_element: v1
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'
diff --git a/.github/workflows/ci-plugin-server.yml b/.github/workflows/ci-plugin-server.yml
index 2897861247763..fb47b5bc241e6 100644
--- a/.github/workflows/ci-plugin-server.yml
+++ b/.github/workflows/ci-plugin-server.yml
@@ -124,7 +124,7 @@ jobs:
               if: needs.changes.outputs.plugin-server == 'true'
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-py-3-11-6
+                  custom_cache_key_element: v1
 
             - uses: syphar/restore-pip-download-cache@v1
               if: needs.changes.outputs.plugin-server == 'true' && steps.cache-backend-tests.outputs.cache-hit != 'true'
@@ -221,7 +221,7 @@ jobs:
             - uses: syphar/restore-virtualenv@v1
               id: cache-backend-tests
               with:
-                  custom_cache_key_element: v1-py-3-11-6
+                  custom_cache_key_element: v1
 
             - uses: syphar/restore-pip-download-cache@v1
               if: steps.cache-backend-tests.outputs.cache-hit != 'true'