Skip to content

Removed unsupported Django 1.6 from tests to avoid confusion #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sl0thentr0py merged 6 commits into from
Feb 15, 2022
Merged

Removed unsupported Django 1.6 from tests to avoid confusion #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22f0c26
fix(tests): removed unsupported Django 1.6 from tests to avoid confusion
antonpirker Feb 14, 2022
4a8b738
fix: Formatting
Feb 14, 2022
df40c1c
Trigger CI
antonpirker Feb 14, 2022
5d447b6
Merge branch 'antonpirker/1233-minimum-django-version' of github.com:…
antonpirker Feb 14, 2022
9b04d90
Merge branch 'master' into antonpirker/1233-minimum-django-version
sl0thentr0py Feb 14, 2022
6f0dcf3
Merge branch 'master' into antonpirker/1233-minimum-django-version
sl0thentr0py Feb 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sentry_sdk/integrations/django/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ def __init__(self, transaction_style="url", middleware_spans=True):
def setup_once():
# type: () -> None

if DJANGO_VERSION < (1, 6):
raise DidNotEnable("Django 1.6 or newer is required.")
if DJANGO_VERSION < (1, 8):
raise DidNotEnable("Django 1.8 or newer is required.")

install_sql_hook()
# Patch in our custom middleware.
Expand Down
14 changes: 4 additions & 10 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ envlist =
# General format is {pythonversion}-{integrationname}-{frameworkversion}
# 1 blank line between different integrations
# Each framework version should only be mentioned once. I.e:
# {py2.7,py3.7}-django-{1.11}
# {py3.7}-django-{2.2}
# {py3.7,py3.10}-django-{3.2}
# {py3.10}-django-{4.0}
# instead of:
# {py2.7}-django-{1.11}
# {py2.7,py3.7}-django-{1.11,2.2}
# {py3.7}-django-{3.2}
# {py3.7,py3.10}-django-{3.2,4.0}

{pypy,py2.7}-django-{1.6,1.7}
{pypy,py2.7,py3.5}-django-{1.8,1.9,1.10}
{pypy,py2.7}-django-{1.8,1.9,1.10,1.11}
{py3.5,py3.6,py3.7}-django-{2.0,2.1}
Expand Down Expand Up @@ -100,13 +99,10 @@ deps =
{py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.0,2.1,2.2,3.0,3.1,3.2}: pytest-asyncio
{py2.7,py3.7,py3.8,py3.9,py3.10}-django-{1.11,2.2,3.0,3.1,3.2}: psycopg2-binary

django-{1.6,1.7}: pytest-django<3.0
django-{1.8,1.9,1.10,1.11,2.0,2.1}: pytest-django<4.0
django-{2.2,3.0,3.1,3.2}: pytest-django>=4.0
django-{2.2,3.0,3.1,3.2}: Werkzeug<2.0

django-1.6: Django>=1.6,<1.7
django-1.7: Django>=1.7,<1.8
django-1.8: Django>=1.8,<1.9
django-1.9: Django>=1.9,<1.10
django-1.10: Django>=1.10,<1.11
Expand Down Expand Up @@ -306,8 +302,6 @@ basepython =
pypy: pypy

commands =
django-{1.6,1.7}: pip install pytest<4

; https://github.com/pytest-dev/pytest/issues/5532
{py3.5,py3.6,py3.7,py3.8,py3.9}-flask-{0.10,0.11,0.12}: pip install pytest<5
{py3.6,py3.7,py3.8,py3.9}-flask-{0.11}: pip install Werkzeug<2
Expand Down