[Python-modules-commits] [python-django-extensions] 04/05: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun May 1 08:56:01 UTC 2016
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 61df5c958c2925c1f893c83cfd6abccaefc725a7
Merge: 44b3b13 74050c7
Author: Brian May <bam at debian.org>
Date: Sun May 1 18:52:10 2016 +1000
merge patched into master
.gitignore | 5 +-
.travis.yml | 11 +-
CHANGELOG.md | 39 +++++
Makefile | 40 +++++
README.rst | 48 ++----
conftest.py | 72 --------
debian/.git-dpm | 6 +-
debian/patches/0001-01-werkzeug-package.diff.patch | 6 +-
...d-Error-binding-parameter-2-in-Django-1.9.patch | 25 ---
debian/patches/series | 1 -
django_extensions/__init__.py | 4 +-
django_extensions/admin/__init__.py | 16 +-
django_extensions/admin/widgets.py | 9 +-
django_extensions/compat.py | 59 ++++++-
django_extensions/db/__init__.py | 1 +
django_extensions/db/fields/__init__.py | 30 ++--
django_extensions/db/fields/encrypted.py | 9 +-
django_extensions/db/fields/json.py | 10 +-
django_extensions/db/models.py | 5 +
django_extensions/jobs/__init__.py | 1 +
django_extensions/jobs/daily/__init__.py | 1 +
django_extensions/jobs/daily/cache_cleanup.py | 1 +
django_extensions/jobs/daily/daily_cleanup.py | 1 +
django_extensions/jobs/hourly/__init__.py | 1 +
django_extensions/jobs/minutely/__init__.py | 1 +
django_extensions/jobs/monthly/__init__.py | 1 +
django_extensions/jobs/weekly/__init__.py | 1 +
django_extensions/jobs/yearly/__init__.py | 1 +
django_extensions/logging/__init__.py | 1 +
django_extensions/logging/filters.py | 1 +
django_extensions/management/__init__.py | 1 +
django_extensions/management/base.py | 1 +
django_extensions/management/color.py | 1 +
django_extensions/management/commands/__init__.py | 1 +
.../management/commands/admin_generator.py | 48 +++---
django_extensions/management/commands/clean_pyc.py | 23 +--
.../management/commands/clear_cache.py | 2 +-
.../management/commands/compile_pyc.py | 18 +-
.../management/commands/create_app.py | 32 ++--
.../management/commands/create_command.py | 56 ++++---
.../management/commands/create_jobs.py | 42 +++--
.../management/commands/create_template_tags.py | 17 +-
.../management/commands/describe_form.py | 4 +-
.../management/commands/drop_test_database.py | 59 ++++---
.../management/commands/dumpscript.py | 29 ++--
.../management/commands/export_emails.py | 23 +--
.../management/commands/find_template.py | 14 +-
.../management/commands/generate_secret_key.py | 8 +-
.../management/commands/graph_models.py | 181 ++++++++++++++-------
.../management/commands/mail_debug.py | 22 ++-
django_extensions/management/commands/notes.py | 13 +-
django_extensions/management/commands/passwd.py | 4 +-
.../management/commands/pipchecker.py | 36 ++--
.../management/commands/print_settings.py | 17 +-
.../management/commands/print_user_for_session.py | 4 +-
django_extensions/management/commands/reset_db.py | 73 +++++----
django_extensions/management/commands/runjob.py | 15 +-
django_extensions/management/commands/runjobs.py | 15 +-
.../management/commands/runprofileserver.py | 96 ++++++-----
django_extensions/management/commands/runscript.py | 5 +-
.../management/commands/runserver_plus.py | 88 +++++-----
.../management/commands/set_default_site.py | 28 ++--
.../management/commands/set_fake_emails.py | 48 +++---
.../management/commands/set_fake_passwords.py | 25 +--
.../management/commands/shell_plus.py | 81 +++++----
.../management/commands/show_template_tags.py | 7 +-
.../management/commands/show_templatetags.py | 1 +
django_extensions/management/commands/show_urls.py | 68 +++++---
django_extensions/management/commands/sqlcreate.py | 22 +--
django_extensions/management/commands/sqldiff.py | 39 +++--
django_extensions/management/commands/sqldsn.py | 39 ++---
django_extensions/management/commands/sync_s3.py | 73 +++++----
django_extensions/management/commands/syncdata.py | 16 +-
.../management/commands/unreferenced_files.py | 7 +-
.../management/commands/update_permissions.py | 3 +-
.../management/commands/validate_templates.py | 32 ++--
.../management/email_notifications.py | 31 ++--
django_extensions/management/jobs.py | 1 +
django_extensions/management/modelviz.py | 85 +++++++---
django_extensions/management/mysql.py | 43 +++++
django_extensions/management/notebook_extension.py | 1 +
django_extensions/management/shells.py | 1 +
django_extensions/management/signals.py | 1 +
django_extensions/management/technical_response.py | 1 +
django_extensions/management/utils.py | 1 +
django_extensions/models.py | 1 +
django_extensions/mongodb/__init__.py | 1 +
django_extensions/mongodb/fields/__init__.py | 7 +-
django_extensions/mongodb/fields/encrypted.py | 3 +-
django_extensions/mongodb/fields/json.py | 1 +
django_extensions/mongodb/models.py | 1 +
django_extensions/settings.py | 1 +
django_extensions/south_migrations/__init__.py | 1 +
django_extensions/templatetags/__init__.py | 1 +
django_extensions/templatetags/highlighting.py | 3 +-
django_extensions/templatetags/indent_text.py | 1 +
django_extensions/templatetags/syntax_color.py | 1 +
django_extensions/templatetags/truncate_letters.py | 1 +
django_extensions/templatetags/widont.py | 1 +
django_extensions/utils/__init__.py | 1 +
django_extensions/utils/dia2django.py | 69 ++++----
django_extensions/utils/text.py | 1 +
django_extensions/utils/validatingtemplatetags.py | 1 +
django_extensions/validators.py | 1 +
docs/AUTHORS | 3 +-
docs/command_extensions.rst | 2 +
docs/conf.py | 72 ++++----
docs/field_extensions.rst | 32 +++-
docs/runprofileserver.rst | 20 +++
docs/runscript.rst | 40 +++--
docs/runserver_plus.rst | 21 +++
setup.cfg | 2 +-
setup.py | 24 ++-
tests/__init__.py | 1 +
tests/management/__init__.py | 1 +
tests/management/commands/__init__.py | 1 +
tests/management/commands/error_raising_command.py | 1 +
tests/test_autoslug_fields.py | 1 +
tests/test_clean_pyc.py | 1 +
tests/test_compile_pyc.py | 1 +
tests/test_dumpscript.py | 1 +
tests/test_encrypted_fields.py | 1 +
tests/test_find_template.py | 19 +++
tests/test_json_field.py | 29 ++++
tests/test_management_command.py | 103 ++++++++++++
tests/test_models.py | 1 +
tests/test_randomchar_field.py | 22 +--
tests/test_runscript.py | 1 +
tests/test_shortuuid_field.py | 1 +
tests/test_templatetags.py | 1 +
tests/test_timestamped_model.py | 25 +++
tests/test_uuid_field.py | 1 +
tests/testapp/__init__.py | 1 +
tests/testapp/apps.py | 1 +
tests/testapp/models.py | 15 +-
tests/testapp/scripts/__init__.py | 1 +
tests/testapp/scripts/sample_script.py | 1 +
tests/testapp/settings.py | 35 ++++
tests/testapp/urls.py | 1 +
tox.ini | 35 +---
140 files changed, 1643 insertions(+), 981 deletions(-)
diff --cc debian/.git-dpm
index 4af4210,0000000..5756b93
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
- fe22c16e9b097a0c63f88d98511d86f65d996102
- fe22c16e9b097a0c63f88d98511d86f65d996102
- e8e55ed79fca5962cfdf96bd3c9340e9a0c5b98b
++74050c7a46757ffe86165414c63a5c1b005f6cba
++74050c7a46757ffe86165414c63a5c1b005f6cba
++6f7d6c6b2899bc99eace29aee502ecc3ea08ef88
+6f7d6c6b2899bc99eace29aee502ecc3ea08ef88
+python-django-extensions_1.6.3.orig.tar.gz
+8890e38479834fd674ccf53400078b7d89fa1c64
+174812
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-01-werkzeug-package.diff.patch
index cbc0f15,0000000..b232315
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 3b05e07ea0d6447606af73efc8e8c4a303d21fc3 Mon Sep 17 00:00:00 2001
++From 74050c7a46757ffe86165414c63a5c1b005f6cba 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 ef1d03f..3986a06 100644
++index 34bd869..f88efa8 100644
+--- a/django_extensions/management/commands/runserver_plus.py
++++ b/django_extensions/management/commands/runserver_plus.py
- @@ -173,7 +173,7 @@ class Command(BaseCommand):
++@@ -175,7 +175,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'")
+
+ pdb_option = options.get('pdb', False)
+ ipdb_option = options.get('ipdb', False)
diff --cc debian/patches/series
index fc45005,0000000..a5b8584
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+0001-01-werkzeug-package.diff.patch
- 0002-Fixed-Error-binding-parameter-2-in-Django-1.9.patch
--
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