[Python-modules-commits] [python-django-extensions] 04/08: merge patched into master
Brian May
bam at moszumanska.debian.org
Sat Oct 24 03:44:50 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 cc9b01a1760ea961b94d0c68b4ca5abdb7011124
Merge: 8d5d182 f200c5b
Author: Brian May <brian at linuxpenguins.xyz>
Date: Sat Oct 24 14:33:59 2015 +1100
merge patched into master
.travis.yml | 17 +-
CHANGELOG => CHANGELOG.md | 125 ++++++++
README.rst | 64 ++++
debian/.git-dpm | 6 +-
debian/patches/01-werkzeug-package.diff | 6 +-
django_extensions/__init__.py | 2 +-
django_extensions/admin/__init__.py | 5 +-
django_extensions/db/fields/__init__.py | 31 +-
django_extensions/db/fields/encrypted.py | 14 +-
django_extensions/db/fields/json.py | 6 +-
django_extensions/jobs/daily/cache_cleanup.py | 32 +-
django_extensions/jobs/daily/daily_cleanup.py | 7 +-
.../management/commands/admin_generator.py | 332 +++++++++++++++++++++
django_extensions/management/commands/clean_pyc.py | 27 +-
.../management/commands/clear_cache.py | 16 +
.../management/commands/compile_pyc.py | 26 +-
.../management/commands/create_app.py | 3 +-
.../management/commands/create_command.py | 3 +-
.../management/commands/create_jobs.py | 3 +-
.../management/commands/create_template_tags.py | 3 +-
.../management/commands/describe_form.py | 11 +-
.../{reset_db.py => drop_test_database.py} | 89 +++---
.../management/commands/dumpscript.py | 48 ++-
.../management/commands/export_emails.py | 4 +-
.../management/commands/find_template.py | 3 +
.../management/commands/generate_secret_key.py | 3 +
.../management/commands/graph_models.py | 6 +-
.../management/commands/mail_debug.py | 3 +-
django_extensions/management/commands/notes.py | 2 +
django_extensions/management/commands/passwd.py | 2 +
.../management/commands/pipchecker.py | 2 +
.../management/commands/print_settings.py | 2 +
.../management/commands/print_user_for_session.py | 3 +-
django_extensions/management/commands/reset_db.py | 28 +-
django_extensions/management/commands/runjob.py | 4 +-
django_extensions/management/commands/runjobs.py | 8 +-
.../management/commands/runprofileserver.py | 14 +-
django_extensions/management/commands/runscript.py | 54 +++-
.../management/commands/runserver_plus.py | 12 +-
.../management/commands/set_default_site.py | 4 +-
.../management/commands/set_fake_emails.py | 3 +
.../management/commands/set_fake_passwords.py | 3 +
.../management/commands/shell_plus.py | 207 +++++++++----
.../management/commands/show_templatetags.py | 7 +-
django_extensions/management/commands/show_urls.py | 34 ++-
django_extensions/management/commands/sqlcreate.py | 4 +-
django_extensions/management/commands/sqldiff.py | 236 +++++++++++----
django_extensions/management/commands/sync_s3.py | 3 +
django_extensions/management/commands/syncdata.py | 43 ++-
.../management/commands/unreferenced_files.py | 3 +
.../management/commands/update_permissions.py | 38 ++-
.../management/commands/validate_templates.py | 2 +
.../management/email_notifications.py | 136 +++++++++
django_extensions/management/jobs.py | 3 +-
django_extensions/management/shells.py | 6 +-
django_extensions/management/signals.py | 3 +
django_extensions/management/utils.py | 11 +
django_extensions/mongodb/fields/__init__.py | 12 +-
django_extensions/tests/__init__.py | 10 +-
django_extensions/tests/management_command.py | 47 +++
django_extensions/tests/test_clean_pyc.py | 9 -
django_extensions/tests/test_compile_pyc.py | 10 -
django_extensions/utils/dia2django.py | 2 +-
django_extensions/validators.py | 65 ++++
docs/AUTHORS | 2 +
docs/command_extensions.rst | 9 +
docs/command_signals.rst | 91 ++++++
docs/conf.py | 6 +-
docs/field_extensions.rst | 10 +
docs/graph_models.rst | 2 +-
docs/index.rst | 3 +-
docs/runserver_plus.rst | 15 +
docs/sqldiff.rst | 5 +
setup.py | 1 +
tox.ini | 22 +-
75 files changed, 1708 insertions(+), 385 deletions(-)
diff --cc debian/.git-dpm
index 348fd39,0000000..7ce44e9
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
- f394ddb2fc93c3bd89cfb4aca726f496356b038f
- f394ddb2fc93c3bd89cfb4aca726f496356b038f
- de9979744e4229bedaa103ce8211d839e6d4e8eb
++f200c5b4b1bcb5b994a66b23b2b13b2aa904b6bf
++f200c5b4b1bcb5b994a66b23b2b13b2aa904b6bf
++71fba97c97ae2d4188f72fdee179d65c5e0619ef
+71fba97c97ae2d4188f72fdee179d65c5e0619ef
+python-django-extensions_1.5.0.orig.tar.gz
+2f10b2bddfc53e21b9ac2c3ab1701e305951207d
+193654
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/01-werkzeug-package.diff
index 81960cd,0000000..99f2805
mode 100644,000000..100644
--- a/debian/patches/01-werkzeug-package.diff
+++ b/debian/patches/01-werkzeug-package.diff
@@@ -1,27 -1,0 +1,27 @@@
- From f394ddb2fc93c3bd89cfb4aca726f496356b038f Mon Sep 17 00:00:00 2001
++From f200c5b4b1bcb5b994a66b23b2b13b2aa904b6bf Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby at debian.org>
+Date: Sat, 24 Oct 2015 14:11:00 +1100
+Subject: 01-werkzeug-package.diff
+
+Description:
+ Point people towards installing the python-werzeug package, not to download
+ random files from the internet.
+
+Patch-Name: 01-werkzeug-package.diff
+---
+ 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 b00bd95..a95648a 100644
++index bbbe298..9090501 100644
+--- a/django_extensions/management/commands/runserver_plus.py
++++ b/django_extensions/management/commands/runserver_plus.py
- @@ -135,7 +135,7 @@ class Command(BaseCommand):
++@@ -143,7 +143,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
--
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