[Python-modules-commits] [python-django-extensions] 04/08: merge patched into master
Brian May
bam at moszumanska.debian.org
Sat Oct 24 06:50:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository python-django-extensions.
commit cd84ccd08c0be94e06dbf3af3496b4ce331ac613
Merge: 93fd5c3 b338c2f
Author: Brian May <brian at linuxpenguins.xyz>
Date: Sat Oct 24 14:45:50 2015 +1100
merge patched into master
.editorconfig | 18 ++
.gitignore | 5 +-
.travis.yml | 87 +++----
CHANGELOG.md | 107 +++++++++
MANIFEST.in | 1 -
README.rst | 11 +-
conftest.py | 72 ++++++
debian/.git-dpm | 6 +-
debian/patches/0001-01-werkzeug-package.diff.patch | 10 +-
django_extensions/__init__.py | 2 +-
django_extensions/admin/__init__.py | 18 +-
django_extensions/admin/filter.py | 59 +++++
django_extensions/admin/widgets.py | 7 +-
django_extensions/compat.py | 95 ++++++++
.../app_template/migrations/__init__.py.tmpl} | 0
django_extensions/db/fields/__init__.py | 266 ++++++++++++++++-----
django_extensions/db/fields/encrypted.py | 7 +-
django_extensions/db/fields/json.py | 6 +-
django_extensions/db/models.py | 21 +-
django_extensions/future_1_5.py | 16 --
django_extensions/jobs/daily/cache_cleanup.py | 4 +-
.../management/commands => logging}/__init__.py | 0
django_extensions/logging/filters.py | 35 +++
django_extensions/management/base.py | 1 -
django_extensions/management/color.py | 8 +
.../management/commands/admin_generator.py | 32 ++-
django_extensions/management/commands/clean_pyc.py | 9 +-
.../management/commands/compile_pyc.py | 9 +-
.../management/commands/create_app.py | 18 +-
.../management/commands/create_command.py | 6 +-
.../management/commands/create_jobs.py | 4 +-
.../management/commands/create_template_tags.py | 8 +-
.../management/commands/describe_form.py | 3 +-
.../management/commands/drop_test_database.py | 11 +-
.../management/commands/dumpscript.py | 17 +-
.../management/commands/export_emails.py | 12 +-
.../management/commands/find_template.py | 6 +-
.../management/commands/generate_secret_key.py | 3 +-
.../management/commands/graph_models.py | 9 +-
.../management/commands/mail_debug.py | 13 +-
django_extensions/management/commands/notes.py | 9 +-
django_extensions/management/commands/passwd.py | 11 +-
.../management/commands/pipchecker.py | 50 ++--
.../management/commands/print_settings.py | 6 +-
.../management/commands/print_user_for_session.py | 10 +-
django_extensions/management/commands/reset_db.py | 9 +-
django_extensions/management/commands/runjob.py | 4 +-
django_extensions/management/commands/runjobs.py | 8 +-
.../management/commands/runprofileserver.py | 10 +-
django_extensions/management/commands/runscript.py | 13 +-
.../management/commands/runserver_plus.py | 104 +++++++-
.../management/commands/set_default_site.py | 2 +-
.../management/commands/set_fake_emails.py | 13 +-
.../management/commands/set_fake_passwords.py | 7 +-
.../management/commands/shell_plus.py | 165 ++++++++++---
.../management/commands/show_templatetags.py | 5 +-
django_extensions/management/commands/show_urls.py | 122 ++++++----
django_extensions/management/commands/sqlcreate.py | 7 +-
django_extensions/management/commands/sqldiff.py | 34 ++-
django_extensions/management/commands/sqldsn.py | 143 +++++++++++
django_extensions/management/commands/sync_s3.py | 14 +-
django_extensions/management/commands/syncdata.py | 12 +-
.../management/commands/unreferenced_files.py | 3 +-
.../management/commands/update_permissions.py | 3 +-
.../management/commands/validate_templates.py | 19 +-
.../management/email_notifications.py | 4 +-
django_extensions/management/modelviz.py | 48 ++--
django_extensions/management/shells.py | 47 ++--
django_extensions/management/technical_response.py | 1 -
django_extensions/management/utils.py | 33 +--
django_extensions/mongodb/fields/encrypted.py | 4 +-
django_extensions/mongodb/fields/json.py | 18 +-
django_extensions/mongodb/models.py | 10 +-
django_extensions/settings.py | 1 +
django_extensions/templatetags/highlighting.py | 18 +-
django_extensions/templatetags/syntax_color.py | 17 +-
django_extensions/templatetags/truncate_letters.py | 1 -
django_extensions/templatetags/widont.py | 2 +
django_extensions/tests/__init__.py | 26 --
django_extensions/tests/shortuuid_field.py | 39 ---
django_extensions/tests/utils.py | 76 ------
django_extensions/utils/dia2django.py | 11 +-
django_extensions/utils/text.py | 1 -
django_extensions/utils/validatingtemplatetags.py | 3 +-
docs/AUTHORS | 1 +
docs/admin_extensions.rst | 19 ++
docs/command_extensions.rst | 5 +
docs/conf.py | 2 +-
docs/field_extensions.rst | 18 ++
docs/index.rst | 3 +-
docs/model_extensions.rst | 7 +-
docs/runscript.rst | 2 +-
docs/runserver_plus.rst | 38 ++-
docs/shell_plus.rst | 25 ++
docs/sqldsn.rst | 52 ++++
run_tests.py | 141 -----------
setup.cfg | 14 ++
setup.py | 37 ++-
.../tests/testapp => tests}/__init__.py | 0
.../tests => tests}/management/__init__.py | 0
.../management/commands}/__init__.py | 0
.../management/commands/error_raising_command.py | 2 -
.../fields.py => tests/test_autoslug_fields.py | 73 +++---
.../tests => tests}/test_clean_pyc.py | 21 +-
.../tests => tests}/test_compile_pyc.py | 35 ++-
.../tests => tests}/test_dumpscript.py | 30 +--
.../test_encrypted_fields.py | 88 +++----
.../json_field.py => tests/test_json_field.py | 13 +-
.../test_management_command.py | 34 ++-
{django_extensions/tests => tests}/test_models.py | 3 +-
tests/test_randomchar_field.py | 92 +++++++
tests/test_runscript.py | 33 +++
tests/test_shortuuid_field.py | 29 +++
.../tests => tests}/test_templatetags.py | 1 -
tests/test_utils.py | 26 ++
.../uuid_field.py => tests/test_uuid_field.py | 20 +-
.../tests/management => tests/testapp}/__init__.py | 0
tests/testapp/apps.py | 8 +
.../tests => tests}/testapp/models.py | 81 ++++++-
.../testapp/scripts}/__init__.py | 0
tests/testapp/scripts/sample_script.py | 2 +
{django_extensions/tests => tests}/testapp/urls.py | 0
tox.ini | 103 +++-----
123 files changed, 2168 insertions(+), 1055 deletions(-)
diff --cc debian/.git-dpm
index 225652f,0000000..f02cac8
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 3ccc519ec4ee393437b2a39144be150eff85cf8f
- 3ccc519ec4ee393437b2a39144be150eff85cf8f
- 71fba97c97ae2d4188f72fdee179d65c5e0619ef
++b338c2fd8f53304cf7b462fd91cd7db38465550d
++b338c2fd8f53304cf7b462fd91cd7db38465550d
++ab5069fe8d44daa6b3fc004252476a00ed6c3f63
+ab5069fe8d44daa6b3fc004252476a00ed6c3f63
+python-django-extensions_1.5.7.orig.tar.gz
+f78aceda831e465278703af8787ea9c0eb5aec01
+202862
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-01-werkzeug-package.diff.patch
index 8d53f6c,0000000..8ed02e5
mode 100644,000000..100644
--- a/debian/patches/0001-01-werkzeug-package.diff.patch
+++ b/debian/patches/0001-01-werkzeug-package.diff.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 3ccc519ec4ee393437b2a39144be150eff85cf8f Mon Sep 17 00:00:00 2001
++From b338c2fd8f53304cf7b462fd91cd7db38465550d Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby at debian.org>
+Date: Sat, 24 Oct 2015 14:34:26 +1100
+Subject: 01-werkzeug-package.diff
+
+Description:
+ Point people towards installing the python-werzeug package, not to download
+ random files from the internet.
+---
+ django_extensions/management/commands/runserver_plus.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/django_extensions/management/commands/runserver_plus.py b/django_extensions/management/commands/runserver_plus.py
- index bbbe298..9090501 100644
++index cfa5ff8..ad36249 100644
+--- a/django_extensions/management/commands/runserver_plus.py
++++ b/django_extensions/management/commands/runserver_plus.py
- @@ -143,7 +143,7 @@ class Command(BaseCommand):
++@@ -158,7 +158,7 @@ class Command(BaseCommand):
+ pass
+
+ except ImportError:
+- raise CommandError("Werkzeug is required to use runserver_plus. Please visit http://werkzeug.pocoo.org/ or install via pip. (pip install Werkzeug)")
++ raise CommandError("Werkzeug is required to use runserver_plus. Please install `python-werkzeug'")
+
- # usurp django's handler
- from django.views import debug
++ pdb_option = options.get('pdb', False)
++ ipdb_option = options.get('ipdb', False)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-extensions.git
More information about the Python-modules-commits
mailing list