Skip to content

Commit 887c6c0

Browse files
committed
Update to 1.2.3. Fixes import issue with latest django-debug-toolbar
1 parent e654bd1 commit 887c6c0

File tree

3 files changed

+42
-26
lines changed

3 files changed

+42
-26
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Changelog
22

3+
* 1.2.3 Updates import from DebugPanel to Panel (Thanks @ciotto & @WilliamMayor!)
34
* 1.2.2 Fixes pathlib issue (Thanks @adamb70!)
45
* 1.2.1 Fixes document.ready ReferenceError (Thanks @nschlemm!)
56
* 1.2.0 Removes jquery dependence. Compatible with django-debug-toolbar 1.10+.
67
* 1.1.0 Fixes display of html-only emails. (Thanks @hugotacito!)
7-
* 1.0.0 Initial release
8+
* 1.0.0 Initial release

README.md

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,6 @@ DEBUG_TOOLBAR_PANELS = (
3838
```
3939

4040

41-
If you use the `DEBUG_TOOLBAR_PANELS` to custom order your panels:
42-
43-
```python
44-
DEBUG_TOOLBAR_PANELS = [
45-
'debug_toolbar.panels.versions.VersionsPanel',
46-
'debug_toolbar.panels.timer.TimerPanel',
47-
'debug_toolbar.panels.settings.SettingsPanel',
48-
'debug_toolbar.panels.headers.HeadersPanel',
49-
'debug_toolbar.panels.request.RequestPanel',
50-
'debug_toolbar.panels.sql.SQLPanel',
51-
'debug_toolbar.panels.staticfiles.StaticFilesPanel',
52-
'debug_toolbar.panels.templates.TemplatesPanel',
53-
'debug_toolbar.panels.cache.CachePanel',
54-
'debug_toolbar.panels.signals.SignalsPanel',
55-
'debug_toolbar.panels.logging.LoggingPanel',
56-
'debug_toolbar.panels.redirects.RedirectsPanel',
57-
'mail_panel.panels.MailToolbarPanel',
58-
]
59-
```
60-
6141
Collect static and you'll be good to go.
6242

6343
```bash
@@ -75,12 +55,34 @@ EMAIL_BACKEND = 'mail_panel.backend.MailToolbarBackend'
7555
```
7656

7757

58+
**[Optional]**
7859
By default, mail toolbar stores messages for one day before removing them from cache. You can change this with the following setting:
7960

8061
```python
8162
MAIL_TOOLBAR_TTL = 86400 # 1 Day
8263
```
8364

65+
**[Optional]**
66+
If you use the `DEBUG_TOOLBAR_PANELS` to custom order your panels:
67+
68+
```python
69+
DEBUG_TOOLBAR_PANELS = [
70+
'debug_toolbar.panels.versions.VersionsPanel',
71+
'debug_toolbar.panels.timer.TimerPanel',
72+
'debug_toolbar.panels.settings.SettingsPanel',
73+
'debug_toolbar.panels.headers.HeadersPanel',
74+
'debug_toolbar.panels.request.RequestPanel',
75+
'debug_toolbar.panels.sql.SQLPanel',
76+
'debug_toolbar.panels.staticfiles.StaticFilesPanel',
77+
'debug_toolbar.panels.templates.TemplatesPanel',
78+
'debug_toolbar.panels.cache.CachePanel',
79+
'debug_toolbar.panels.signals.SignalsPanel',
80+
'debug_toolbar.panels.logging.LoggingPanel',
81+
'debug_toolbar.panels.redirects.RedirectsPanel',
82+
'mail_panel.panels.MailToolbarPanel',
83+
]
84+
```
85+
8486

8587

8688
Testing
@@ -107,3 +109,12 @@ original_outbox = len(mail.outbox)
107109
# Send mail ...
108110
assert(len(mail.outbox) == original_outbox + 1)
109111
```
112+
113+
Shameless Plugs
114+
=======
115+
Like Django Mail Panel? Be sure to check out and support these other tools for Mac that will improve your workflow:
116+
117+
**[Kubermagic](https://echodot.com/kubermagic/)** - Automate, and script away tedious kubectl commands with Kubermagic; a UI for developers, QA teams, and those starting to learn the ins-and-outs of Kubernetes.
118+
119+
120+
**[Red](https://echodot.com/red/)** - A visual and interactive Redis client, featuring live updating keys, an interactive console, pub/sub, lua script support and much more.

setup.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
import os
22
import sys
3-
from setuptools import setup, find_packages
3+
from pathlib import Path
4+
5+
from setuptools import find_packages, setup
46

57
# allow setup.py to be run from any path
6-
os.chdir(os.path.abspath(os.path.dirname(os.path.realpath(__file__))))
8+
os.chdir(str(Path(__file__).absolute().parent))
79

810
if 'publish' in sys.argv:
911
if 'test' in sys.argv:
1012
os.system('python setup.py sdist bdist_wheel upload -rtest')
1113
else:
12-
os.system('python setup.py sdist bdist_wheel')
13-
# twine upload --repository pypi dist/*1.1.0* # For markdown to render, use twine
14+
pass
15+
# Build with: python setup.py sdist bdist_wheel
16+
# Upload with: twine upload --repository pypi dist/*1.2.3* # For markdown to render, use twine
1417
sys.exit()
1518

1619

@@ -21,7 +24,7 @@ def read(fname):
2124

2225
setup(
2326
name='django-mail-panel',
24-
version='1.2.2',
27+
version='1.2.3',
2528
description='A panel for django-debug-toolbar that allows for ' +
2629
'viewing of recently sent email.',
2730
url='https://github.com/scuml/django-mail-panel',
@@ -57,5 +60,6 @@ def read(fname):
5760
'Programming Language :: Python :: 3.5',
5861
'Programming Language :: Python :: 3.6',
5962
'Programming Language :: Python :: 3.7',
63+
'Programming Language :: Python :: 3.8',
6064
],
6165
)

0 commit comments

Comments
 (0)