feat: Remove outdated version pins (#2690)

sentrivana · antonpirker · web-flow · commit 467bde90285e · 2024-04-10T09:37:39.000+02:00
---------

Co-authored-by: Anton Pirker &lt;anton.pirker@sentry.io&gt;
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,27 +9,9 @@ updates:
   - dependency-type: direct
   - dependency-type: indirect
   ignore:
-  - dependency-name: pytest
-    versions:
-    - "> 3.7.3"
-  - dependency-name: flake8  # Later versions dropped Python 2 support
-    versions:
-    - "> 5.0.4"
-  - dependency-name: jsonschema  # Later versions dropped Python 2 support
-    versions:
-    - "> 3.2.0"
-  - dependency-name: pytest-cov
-    versions:
-    - "> 2.8.1"
-  - dependency-name: pytest-forked
-    versions:
-    - "> 1.1.3"
   - dependency-name: sphinx
     versions:
     - ">= 2.4.a, < 2.5"
-  - dependency-name: tox
-    versions:
-    - "> 3.7.0"
   - dependency-name: werkzeug
     versions:
     - "> 0.15.5, < 1"
diff --git a/.github/workflows/test-integrations-aws-lambda.yml b/.github/workflows/test-integrations-aws-lambda.yml
@@ -73,7 +73,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-cloud-computing.yml b/.github/workflows/test-integrations-cloud-computing.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -86,7 +86,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-common.yml b/.github/workflows/test-integrations-common.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-data-processing.yml b/.github/workflows/test-integrations-data-processing.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -94,7 +94,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-databases.yml b/.github/workflows/test-integrations-databases.yml
@@ -46,10 +46,9 @@ jobs:
         ports:
           - 5432:5432
     env:
+      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
-      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-python@v5
@@ -58,9 +57,7 @@ jobs:
       - uses: getsentry/action-clickhouse-in-ci@v1
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
-          psql postgresql://postgres:sentry@localhost:5432 -c "create database ${SENTRY_PYTHON_TEST_POSTGRES_NAME};" || true
-          psql postgresql://postgres:sentry@localhost:5432 -c "grant all privileges on database ${SENTRY_PYTHON_TEST_POSTGRES_NAME} to ${SENTRY_PYTHON_TEST_POSTGRES_USER};" || true
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -124,10 +121,9 @@ jobs:
         ports:
           - 5432:5432
     env:
+      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
-      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-python@v5
@@ -136,9 +132,7 @@ jobs:
       - uses: getsentry/action-clickhouse-in-ci@v1
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
-          psql postgresql://postgres:sentry@localhost:5432 -c "create database ${SENTRY_PYTHON_TEST_POSTGRES_NAME};" || true
-          psql postgresql://postgres:sentry@localhost:5432 -c "grant all privileges on database ${SENTRY_PYTHON_TEST_POSTGRES_NAME} to ${SENTRY_PYTHON_TEST_POSTGRES_USER};" || true
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-graphql.yml b/.github/workflows/test-integrations-graphql.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -86,7 +86,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-miscellaneous.yml b/.github/workflows/test-integrations-miscellaneous.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -86,7 +86,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-networking.yml b/.github/workflows/test-integrations-networking.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -86,7 +86,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-web-frameworks-1.yml b/.github/workflows/test-integrations-web-frameworks-1.yml
@@ -46,20 +46,17 @@ jobs:
         ports:
           - 5432:5432
     env:
+      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
-      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
-          psql postgresql://postgres:sentry@localhost:5432 -c "create database ${SENTRY_PYTHON_TEST_POSTGRES_NAME};" || true
-          psql postgresql://postgres:sentry@localhost:5432 -c "grant all privileges on database ${SENTRY_PYTHON_TEST_POSTGRES_NAME} to ${SENTRY_PYTHON_TEST_POSTGRES_USER};" || true
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -115,20 +112,17 @@ jobs:
         ports:
           - 5432:5432
     env:
+      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
-      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
     steps:
       - uses: actions/checkout@v4.1.1
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
-          psql postgresql://postgres:sentry@localhost:5432 -c "create database ${SENTRY_PYTHON_TEST_POSTGRES_NAME};" || true
-          psql postgresql://postgres:sentry@localhost:5432 -c "grant all privileges on database ${SENTRY_PYTHON_TEST_POSTGRES_NAME} to ${SENTRY_PYTHON_TEST_POSTGRES_USER};" || true
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/.github/workflows/test-integrations-web-frameworks-2.yml b/.github/workflows/test-integrations-web-frameworks-2.yml
@@ -38,7 +38,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
@@ -106,7 +106,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
+          pip install coverage tox
       - name: Erase coverage
         run: |
           coverage erase
diff --git a/linter-requirements.txt b/linter-requirements.txt
@@ -2,7 +2,7 @@ mypy
 black
 flake8==5.0.4  # flake8 depends on pyflakes>=3.0.0 and this dropped support for Python 2 "# type:" comments
 types-certifi
-types-protobuf==4.24.0.20240311  # newer raises an error on mypy sentry_sdk
+types-protobuf
 types-redis
 types-setuptools
 pymongo # There is no separate types module.
diff --git a/scripts/runtox.sh b/scripts/runtox.sh
@@ -40,4 +40,4 @@ if [ -z "${ENV}" ]; then
     exit 0
 fi
 
-exec $TOXPATH -vv -e "$ENV" -- "${@:2}"
+exec $TOXPATH -e "$ENV" -- "${@:2}"
diff --git a/scripts/split-tox-gh-actions/templates/test_group.jinja b/scripts/split-tox-gh-actions/templates/test_group.jinja
@@ -32,10 +32,10 @@
         ports:
           - 5432:5432
     env:
+      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
       SENTRY_PYTHON_TEST_POSTGRES_USER: postgres
       SENTRY_PYTHON_TEST_POSTGRES_PASSWORD: sentry
-      SENTRY_PYTHON_TEST_POSTGRES_NAME: ci_test
-      SENTRY_PYTHON_TEST_POSTGRES_HOST: localhost
+
     {% endif %}
 
     steps:
@@ -55,11 +55,7 @@
 
       - name: Setup Test Env
         run: |
-          pip install coverage "tox>=3,<4"
-          {% if needs_postgres %}
-          psql postgresql://postgres:sentry@localhost:5432 -c "create database ${SENTRY_PYTHON_TEST_POSTGRES_NAME};" || true
-          psql postgresql://postgres:sentry@localhost:5432 -c "grant all privileges on database ${SENTRY_PYTHON_TEST_POSTGRES_NAME} to ${SENTRY_PYTHON_TEST_POSTGRES_USER};" || true
-          {% endif %}
+          pip install coverage tox
 
       - name: Erase coverage
         run: |
@@ -69,7 +65,6 @@
       - name: Test {{ framework }} {{ category }}
         run: |
           set -x # print commands that are executed
-
           {% if category == "pinned" %}
           ./scripts/runtox.sh --exclude-latest "{% raw %}py${{ matrix.python-version }}{% endraw %}-{{ framework }}" --cov=tests --cov=sentry_sdk --cov-report= --cov-branch
           {% elif category == "latest" %}
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,15 +1,14 @@
-pip  # always use newest pip
-mock ; python_version<'3.3'
+pip
 pytest
-pytest-cov==2.8.1
-pytest-forked<=1.4.0
-pytest-localserver==0.5.1  # TODO(py3): 0.6.0 drops 2.7 support: https://github.com/pytest-dev/pytest-localserver/releases/tag/v0.6.0
-pytest-watch==4.2.0
-tox==3.7.0
-jsonschema==3.2.0
-pyrsistent==0.16.0 # TODO(py3): 0.17.0 requires python3, see https://github.com/tobgu/pyrsistent/issues/205
-executing<2.0.0  # TODO(py3): 2.0.0 requires python3
+pytest-cov
+pytest-forked
+pytest-localserver
+pytest-watch
+jsonschema
+pyrsistent
+executing
 asttokens
 responses
 pysocks
 ipdb
+setuptools
diff --git a/tests/integrations/asyncpg/test_asyncpg.py b/tests/integrations/asyncpg/test_asyncpg.py
@@ -12,11 +12,11 @@
 import os
 
 
-PG_NAME = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_NAME", "postgres")
-PG_USER = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_USER", "foo")
-PG_PASSWORD = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_PASSWORD", "bar")
 PG_HOST = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_HOST", "localhost")
 PG_PORT = 5432
+PG_USER = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_USER", "postgres")
+PG_PASSWORD = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_PASSWORD", "sentry")
+PG_NAME = os.getenv("SENTRY_PYTHON_TEST_POSTGRES_NAME", "postgres")
 
 import datetime
 from contextlib import contextmanager
diff --git a/tests/integrations/beam/test_beam.py b/tests/integrations/beam/test_beam.py
@@ -182,7 +182,11 @@ def inner(fn):
         signature = pardo._signature
         output_processor = _OutputHandler()
         return DoFnInvoker.create_invoker(
-            signature, output_processor, DoFnContext("test")
+            signature,
+            output_processor,
+            DoFnContext("test"),
+            input_args=[],
+            input_kwargs={},
         )
 
     return inner
diff --git a/tests/integrations/django/asgi/test_asgi.py b/tests/integrations/django/asgi/test_asgi.py
@@ -133,8 +133,12 @@ async def test_async_views_concurrent_execution(sentry_init, settings):
 
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
 
-    comm = HttpCommunicator(asgi_application, "GET", "/my_async_view")
-    comm2 = HttpCommunicator(asgi_application, "GET", "/my_async_view")
+    comm = HttpCommunicator(
+        asgi_application, "GET", "/my_async_view"
+    )  # sleeps for 1 second
+    comm2 = HttpCommunicator(
+        asgi_application, "GET", "/my_async_view"
+    )  # sleeps for 1 second
 
     loop = asyncio.get_event_loop()
 
@@ -150,7 +154,9 @@ async def test_async_views_concurrent_execution(sentry_init, settings):
     assert resp1.result()["status"] == 200
     assert resp2.result()["status"] == 200
 
-    assert end - start < 1.5
+    assert (
+        end - start < 2
+    )  # it takes less than 2 seconds so it was ececuting concurrently
 
 
 @pytest.mark.asyncio
@@ -171,8 +177,12 @@ async def test_async_middleware_that_is_function_concurrent_execution(
 
     sentry_init(integrations=[DjangoIntegration()], send_default_pii=True)
 
-    comm = HttpCommunicator(asgi_application, "GET", "/my_async_view")
-    comm2 = HttpCommunicator(asgi_application, "GET", "/my_async_view")
+    comm = HttpCommunicator(
+        asgi_application, "GET", "/my_async_view"
+    )  # sleeps for 1 second
+    comm2 = HttpCommunicator(
+        asgi_application, "GET", "/my_async_view"
+    )  # sleeps for 1 second
 
     loop = asyncio.get_event_loop()
 
@@ -188,7 +198,9 @@ async def test_async_middleware_that_is_function_concurrent_execution(
     assert resp1.result()["status"] == 200
     assert resp2.result()["status"] == 200
 
-    assert end - start < 1.5
+    assert (
+        end - start < 2
+    )  # it takes less than 2 seconds so it was ececuting concurrently
 
 
 @pytest.mark.asyncio
diff --git a/tests/integrations/django/myapp/settings.py b/tests/integrations/django/myapp/settings.py
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
diff --git a/tests/integrations/rq/test_rq.py b/tests/integrations/rq/test_rq.py
diff --git a/tests/integrations/sqlalchemy/test_sqlalchemy.py b/tests/integrations/sqlalchemy/test_sqlalchemy.py
diff --git a/tox.ini b/tox.ini
