Merge branch '3765-cohort-by-trend' of github.com:PostHog/posthog int…

…o 3765-cohort-by-trend * '3765-cohort-by-trend' of github.com:PostHog/posthog: (39 commits) 'string, parsable as datetime' (#3942) Update plugin server to 0.16.3 (#3944) Resizable table columns in Sessions (#3927) bump cryptography==3.4.7 and add macosx_arm64 install script (#3935) 🤖: Add jeduden as a contributor 🎉 (#3938) Fix feature flags default rollout (#3745) Less dancing in dashboards (#3824) Always show event stats and add warnings (#3908) Update plugin server to 0.16.2 (#3932) Minimum PostHog version in plugins (#3916) Renames Active users to Unique users (#3930) Fix action with same name (#3909) Fix navigation to insights from dashboards (#3928) User V2 Part II - Frontend changes (#3866) update autocapture label to be more descriptive (#3925) Log to sentry when migrations are out of date (#3924) Revert "Increase Element model varchar limits (#3912)" (#3923) Update plugin server to 0.16.1 (#3920) Are migrations safe to run on cloud? (#3917) Run Automerge as posthog-bot (#3919) ...
PostHog · Apr 19, 2021 · b984c38 · b984c38
2 parents 4990777 + 8d336c5
commit b984c38
Show file tree

Hide file tree

Showing 149 changed files with 2,836 additions and 2,041 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -39,7 +39,9 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/4550621?v=4",
       "profile": "https://github.com/Twixes",
       "contributions": [
-        "code"
+        "code",
+        "test",
+        "design"
       ]
     },
     {
@@ -1008,7 +1010,11 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/611271?v=4",
       "profile": "https://www.linkedin.com/in/adrien-brault-4b987426/",
       "contributions": [
-        "code"
+        "code",
+        "test",
+        "bug",
+        "content",
+        "doc"
       ]
     },
     {
@@ -1046,6 +1052,45 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "well-balanced",
+      "name": "Woosik Kim",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48206623?v=4",
+      "profile": "http://well-balanced.medium.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jeduden",
+      "name": "jeduden",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1117699?v=4",
+      "profile": "https://github.com/jeduden",
+      "contributions": [
+        "ideas",
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "gempain",
+      "name": "Geoffroy Empain",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13135149?v=4",
+      "profile": "https://github.com/gempain",
+      "contributions": [
+        "userTesting"
+      ]
+    },
+    {
+      "login": "rethab",
+      "name": "rethab",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2222044?v=4",
+      "profile": "https://github.com/rethab",
+      "contributions": [
+        "code",
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -9,3 +9,4 @@
 - [ ] Django backend tests
 - [ ] Jest frontend tests
 - [ ] Cypress end-to-end tests
+- [ ] Migrations are safe to run at scale (e.g. PostHog Cloud) – present proof if not obvious
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -0,0 +1,30 @@
+name: Automerge
+
+env:
+    MERGE_METHOD: 'squash'
+    MERGE_RETRY_SLEEP: 300000
+
+on:
+    pull_request:
+        types:
+            - labeled
+            - unlabeled
+            - synchronize
+            - opened
+            - edited
+            - ready_for_review
+            - reopened
+            - unlocked
+    check_suite:
+        types:
+            - completed
+    status: {}
+
+jobs:
+    automerge:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Automerge
+              uses: 'pascalgn/automerge-action@v0.13.1'
+              env:
+                  GITHUB_TOKEN: '${{ secrets.POSTHOG_BOT_GITHUB_TOKEN }}'
diff --git a/.github/workflows/ci-backend.yml b/.github/workflows/ci-backend.yml
@@ -187,20 +187,12 @@ jobs:
               with:
                   python-version: 3.8
 
-            - uses: actions/cache@v2
-              with:
-                  path: ~/.cache/pip
-                  key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-                  restore-keys: |
-                      ${{ runner.os }}-pip-
-
             - name: Install requirements.txt dependencies with pip
               run: |
                   cd deploy
                   python -m pip install --upgrade pip
                   python -m pip install -r requirements.txt
                   python -m pip install freezegun fakeredis pytest pytest-mock pytest-django
-              if: steps.cache.outputs.cache-hit != 'true'
 
             # The 2-step migration process (first master, then current branch) verifies that it'll always
             # be possible to migrate to the new version without problems in production
@@ -216,6 +208,13 @@ jobs:
               with:
                   path: 'deploy/'
 
+            - name: Install requirements.txt dependencies with pip at current branch
+              run: |
+                  cd deploy
+                  python -m pip install --upgrade pip
+                  python -m pip install -r requirements.txt
+                  python -m pip install freezegun fakeredis pytest pytest-mock pytest-django
+
             - name: Link posthog-cloud at current branch
               run: |
                   cp deploy/ee/conftest.py multi_tenancy/conftest.py

diff --git a/README.md b/README.md
diff --git a/bin/e2e-test-runner b/bin/e2e-test-runner
@@ -5,11 +5,11 @@ dropdb --if-exists posthog_e2e_test
 createdb posthog_e2e_test
 DEBUG=1 DATABASE_URL=postgres://localhost:5432/posthog_e2e_test python manage.py migrate &&
 DEBUG=1 DATABASE_URL=postgres://localhost:5432/posthog_e2e_test python manage.py setup_dev &
-yarn add cypress-terminal-report
+yarn add cypress@6.7.0 cypress-terminal-report@2.1.0 @cypress/react@4.16.4 @cypress/webpack-preprocessor@5.7.0
 
 # Only start webpack if not already running
 nc -vz 127.0.0.1 8234 2> /dev/null || ./bin/start-frontend &
 
 CYPRESS_BASE_URL=http://localhost:8080 npx cypress open --config-file cypress.e2e.json &
 DEBUG=1 TEST=1 E2E_TESTING=1 DATABASE_URL=postgres://localhost:5432/posthog_e2e_test python manage.py runserver 8080
-yarn remove cypress-terminal-report
+yarn remove cypress cypress-terminal-report @cypress/react @cypress/webpack-preprocessor
diff --git a/bin/install-macosx_arm64 b/bin/install-macosx_arm64
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Install scripts for M1 Macs
+# See https://github.com/PostHog/posthog/issues/2916
+# NB: use cryptography==3.4.7
+
+# Set ld flags to use OpenSSL installed with brew
+export LDFLAGS="-L$(brew --prefix openssl)/lib"
+export CPPFLAGS="-I$(brew --prefix openssl)/include"
+
+# Use system OpenSSL instead of BoringSSL for GRPC
+export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+
+pip cache purge
+pip install -r requirements.txt