diff --git a/README.rst b/README.rst index 3a3304780..8bea757ad 100644 --- a/README.rst +++ b/README.rst @@ -34,7 +34,7 @@ Here's a screenshot of the toolbar in action: In addition to the built-in panels, a number of third-party panels are contributed by the community. -The current stable version of the Debug Toolbar is 3.2.1. It works on +The current stable version of the Debug Toolbar is 3.2.2. It works on Django ≥ 2.2. Documentation, including installation and configuration instructions, is diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py index 05d62a515..93c78c7f0 100644 --- a/debug_toolbar/__init__.py +++ b/debug_toolbar/__init__.py @@ -5,7 +5,7 @@ # Do not use pkg_resources to find the version but set it here directly! # see issue #1446 -VERSION = "3.2.1" +VERSION = "3.2.2" # Code that discovers files or modules in INSTALLED_APPS imports this module. diff --git a/docs/changes.rst b/docs/changes.rst index 663ade63b..1a322752e 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,10 @@ Change log Next version ------------ + +3.2.2 (2021-08-14) +------------------ + * Ensured that the handle stays within bounds when resizing the window. * Disabled ``HistoryPanel`` when ``RENDER_PANELS`` is ``True`` or if ``RENDER_PANELS`` is ``None`` and the WSGI container is diff --git a/docs/conf.py b/docs/conf.py index f3afd1888..1fdad323e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,7 +25,7 @@ copyright = copyright.format(datetime.date.today().year) # The full version, including alpha/beta/rc tags -release = "3.2.1" +release = "3.2.2" # -- General configuration --------------------------------------------------- diff --git a/example/django-debug-toolbar.png b/example/django-debug-toolbar.png index 762411772..3ad4a4af1 100644 Binary files a/example/django-debug-toolbar.png and b/example/django-debug-toolbar.png differ diff --git a/example/screenshot.py b/example/screenshot.py index 0d0ae8dc5..8c1135eb2 100644 --- a/example/screenshot.py +++ b/example/screenshot.py @@ -3,6 +3,7 @@ import os import signal import subprocess +from time import sleep from selenium.webdriver.common.keys import Keys from selenium.webdriver.support import expected_conditions as EC @@ -33,7 +34,10 @@ def create_webdriver(browser, headless): def example_server(): - return subprocess.Popen(["make", "example"]) + proc = subprocess.Popen(["make", "example"]) + # `make example` runs a few things before runserver. + sleep(2) + return proc def set_viewport_size(selenium, width, height): @@ -67,12 +71,15 @@ def main(): submit_form(selenium, {"username": os.environ["USER"], "password": "p"}) selenium.get("http://localhost:8000/admin/auth/user/") - # Close the admin sidebar. - el = selenium.find_element_by_id("toggle-nav-sidebar") - el.click() + # Check if SQL Panel is already visible: + sql_panel = selenium.find_element_by_id("djdt-SQLPanel") + if not sql_panel: + # Open the admin sidebar. + el = selenium.find_element_by_id("djDebugToolbarHandle") + el.click() + sql_panel = selenium.find_element_by_id("djdt-SQLPanel") # Open the SQL panel. - el = selenium.find_element_by_id("djdt-SQLPanel") - el.click() + sql_panel.click() selenium.save_screenshot(args.outfile) finally: diff --git a/setup.cfg b/setup.cfg index b65f3a887..912fe1186 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = django-debug-toolbar -version = 3.2.1 +version = 3.2.2 description = A configurable set of panels that display various debug information about the current request/response. long_description = file: README.rst long_description_content_type = text/x-rst