[Python-modules-commits] [python-django-extensions] 05/07: merge patched into master
Brian May
bam at moszumanska.debian.org
Sun Nov 6 10:36:37 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 5e92633aea33d3b88dd84a2c76a3ded22251c755
Merge: 50b90d1 9c9b80a
Author: Brian May <bam at debian.org>
Date: Sun Nov 6 09:53:02 2016 +1100
merge patched into master
.pre-commit-config.yaml | 31 +++
.travis.yml | 60 ++---
CHANGELOG.md | 76 +++++-
Makefile | 2 +-
README.rst | 16 +-
debian/.git-dpm | 6 +-
...-URLs-to-use-local-copy-of-images-to-pre.patch} | 6 +-
...date-reference-to-python-werzeug-package.patch} | 21 +-
debian/patches/series | 4 +-
django_extensions/__init__.py | 4 +-
django_extensions/admin/__init__.py | 38 +--
django_extensions/admin/filter.py | 6 +-
django_extensions/admin/widgets.py | 7 +-
django_extensions/compat.py | 214 +---------------
django_extensions/conf/app_template/forms.py.tmpl | 2 +-
django_extensions/conf/app_template/urls.py.tmpl | 5 +-
.../management/commands/sample.py.tmpl | 5 +-
.../templatetags/sample.py.tmpl | 1 -
django_extensions/db/__init__.py | 1 -
django_extensions/db/fields/__init__.py | 96 +-------
django_extensions/db/fields/encrypted.py | 37 +--
django_extensions/db/fields/json.py | 75 +++---
django_extensions/db/models.py | 20 +-
django_extensions/jobs/__init__.py | 1 -
django_extensions/jobs/daily/__init__.py | 1 -
django_extensions/jobs/daily/cache_cleanup.py | 10 +-
django_extensions/jobs/daily/daily_cleanup.py | 9 +-
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 | 2 +-
django_extensions/management/__init__.py | 1 -
django_extensions/management/base.py | 2 +-
django_extensions/management/color.py | 15 +-
django_extensions/management/commands/__init__.py | 1 -
.../management/commands/admin_generator.py | 66 ++---
django_extensions/management/commands/clean_pyc.py | 5 +-
.../management/commands/clear_cache.py | 2 +-
.../management/commands/compile_pyc.py | 5 +-
.../management/commands/create_app.py | 39 +--
.../management/commands/create_command.py | 54 ++--
.../management/commands/create_jobs.py | 12 +-
.../management/commands/create_template_tags.py | 12 +-
.../management/commands/describe_form.py | 15 +-
.../management/commands/drop_test_database.py | 18 +-
.../management/commands/dumpscript.py | 96 ++------
.../management/commands/export_emails.py | 8 +-
.../management/commands/find_template.py | 13 +-
.../management/commands/generate_secret_key.py | 5 +-
.../management/commands/graph_models.py | 20 +-
.../management/commands/mail_debug.py | 6 +-
django_extensions/management/commands/notes.py | 7 +-
django_extensions/management/commands/passwd.py | 24 +-
.../management/commands/pipchecker.py | 6 +-
.../management/commands/print_settings.py | 20 +-
.../management/commands/print_user_for_session.py | 28 +--
django_extensions/management/commands/reset_db.py | 31 ++-
django_extensions/management/commands/runjob.py | 27 +-
django_extensions/management/commands/runjobs.py | 40 ++-
.../management/commands/runprofileserver.py | 59 +----
django_extensions/management/commands/runscript.py | 72 +++---
.../management/commands/runserver_plus.py | 273 ++++++++++-----------
.../management/commands/set_default_site.py | 6 +-
.../management/commands/set_fake_emails.py | 8 +-
.../management/commands/set_fake_passwords.py | 9 +-
.../management/commands/shell_plus.py | 45 ++--
.../management/commands/show_template_tags.py | 11 +-
.../management/commands/show_templatetags.py | 2 +-
django_extensions/management/commands/show_urls.py | 13 +-
django_extensions/management/commands/sqlcreate.py | 8 +-
django_extensions/management/commands/sqldiff.py | 70 ++----
django_extensions/management/commands/sqldsn.py | 7 +-
django_extensions/management/commands/sync_s3.py | 8 +-
django_extensions/management/commands/syncdata.py | 32 +--
.../management/commands/unreferenced_files.py | 16 +-
.../management/commands/update_permissions.py | 34 +--
.../management/commands/validate_templates.py | 27 +-
.../management/email_notifications.py | 5 +-
django_extensions/management/jobs.py | 5 +-
django_extensions/management/modelviz.py | 41 +---
django_extensions/management/mysql.py | 2 +-
django_extensions/management/notebook_extension.py | 2 +-
django_extensions/management/shells.py | 55 ++---
django_extensions/management/signals.py | 2 +-
django_extensions/management/technical_response.py | 2 +-
django_extensions/management/utils.py | 2 +-
django_extensions/models.py | 1 -
django_extensions/mongodb/__init__.py | 1 -
django_extensions/mongodb/fields/__init__.py | 2 +-
django_extensions/mongodb/fields/encrypted.py | 2 +-
django_extensions/mongodb/fields/json.py | 11 +-
django_extensions/mongodb/models.py | 18 +-
django_extensions/settings.py | 2 +-
django_extensions/south_migrations/0001_empty.py | 17 --
django_extensions/south_migrations/__init__.py | 1 -
.../django_extensions/css/jquery.autocomplete.css | 2 +-
.../static/django_extensions/js/jquery.bgiframe.js | 39 +++
.../django_extensions/js/jquery.bgiframe.min.js | 10 -
django_extensions/templatetags/__init__.py | 1 -
django_extensions/templatetags/highlighting.py | 11 +-
django_extensions/templatetags/indent_text.py | 5 +-
django_extensions/templatetags/syntax_color.py | 2 +-
django_extensions/templatetags/truncate_letters.py | 13 +-
django_extensions/templatetags/widont.py | 17 +-
django_extensions/utils/__init__.py | 1 -
django_extensions/utils/deprecation.py | 8 +
django_extensions/utils/dia2django.py | 2 +-
django_extensions/utils/text.py | 11 +-
django_extensions/utils/validatingtemplatetags.py | 51 ++--
django_extensions/validators.py | 2 +-
docs/admin_extensions.rst | 2 +-
docs/command_extensions.rst | 7 +-
docs/conf.py | 4 +-
docs/creating_release.txt | 1 -
docs/field_extensions.rst | 3 +
docs/index.rst | 2 +-
docs/runprofileserver.rst | 10 +-
docs/runscript.rst | 11 +-
docs/runserver_plus.rst | 46 ++--
docs/shell_plus.rst | 28 ++-
docs/validate_templates.rst | 12 +-
setup.cfg | 4 +-
setup.py | 14 +-
tests/__init__.py | 11 +-
tests/management/__init__.py | 1 -
tests/management/commands/__init__.py | 1 -
tests/management/commands/error_raising_command.py | 2 +-
tests/management/test_modelviz.py | 28 +++
tests/test_autoslug_fields.py | 18 +-
tests/test_clean_pyc.py | 2 +-
tests/test_color.py | 23 ++
tests/test_compat.py | 25 ++
tests/test_compile_pyc.py | 2 +-
...est_find_template.py => test_create_command.py} | 8 +-
tests/test_dumpscript.py | 2 +-
tests/test_encrypted_fields.py | 7 +-
tests/test_find_template.py | 2 +-
tests/test_json_field.py | 86 ++++++-
tests/test_management_command.py | 99 +++++++-
tests/test_models.py | 2 +-
tests/test_randomchar_field.py | 2 +-
tests/test_runscript.py | 9 +-
tests/test_shortuuid_field.py | 2 +-
tests/test_template_rendering.py | 16 ++
tests/test_templatetags.py | 11 +-
tests/test_timestamped_model.py | 2 +-
tests/test_uuid_field.py | 2 +-
tests/testapp/__init__.py | 3 +-
tests/testapp/apps.py | 11 +-
tests/testapp/models.py | 2 +-
tests/testapp/scripts/__init__.py | 1 -
tests/testapp/scripts/sample_script.py | 2 +-
tests/testapp/settings.py | 22 +-
tests/testapp/urls.py | 27 +-
tests/testapp_with_no_models_file/__init__.py | 0
tests/testapp_with_no_models_file/admin.py | 7 +
tox.ini | 14 +-
160 files changed, 1431 insertions(+), 1551 deletions(-)
diff --cc debian/.git-dpm
index c99e994,0000000..f5cae6b
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
- d38fb6627fe31e9b3412d6b93a3f2b4df4e765ca
- d38fb6627fe31e9b3412d6b93a3f2b4df4e765ca
- cd6e080fa705fcd290cf62d0ea7a9c2823a4544d
++9c9b80a1e42105f3ffaabaf337a459e6a802ddee
++9c9b80a1e42105f3ffaabaf337a459e6a802ddee
++6c5a19a5479a7f4c0db8c4cc709ec0ce6406b270
+6c5a19a5479a7f4c0db8c4cc709ec0ce6406b270
+python-django-extensions_1.7.4.orig.tar.gz
+b78d9f349415a0f3f442a06ea8d71d1fad84b799
+176156
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
index a5c78ec,0000000..a717032
mode 100644,000000..100644
--- a/debian/patches/0001-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
+++ b/debian/patches/0001-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
@@@ -1,49 -1,0 +1,49 @@@
- From d38fb6627fe31e9b3412d6b93a3f2b4df4e765ca Mon Sep 17 00:00:00 2001
++From 97538487b83157a34764ec2c74d6c3418b50f807 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 19 May 2016 11:08:28 +0200
+Subject: Change image URLs to use local copy of images to prevent privacy
+ breach.
+
+---
+ docs/runserver_plus.rst | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/runserver_plus.rst b/docs/runserver_plus.rst
- index 98b1f47..f80ea5b 100644
++index 189537b..4f7a36a 100644
+--- a/docs/runserver_plus.rst
++++ b/docs/runserver_plus.rst
+@@ -43,14 +43,14 @@ Usage
- Instead of the default Django traceback page, the Werkzeug traceback page
++ Instead of the default Django traceback page, the Werkzeug traceback page
+ will be shown when an exception occurs.
+
+-.. image:: https://f.cloud.github.com/assets/202559/1261027/2637f826-2c22-11e3-83c6-646acc87808b.png
++.. image:: images/2637f826-2c22-11e3-83c6-646acc87808b.png
+ :alt: werkzeug-traceback
+
+ Along with the typical traceback information we have a couple of options. These
+ options appear when hovering over a particular traceback line. Notice that
+ two buttons appear to the right:
+
+-.. image:: https://f.cloud.github.com/assets/202559/1261035/558ad0ee-2c22-11e3-8ddd-6678d84d77e7.png
++.. image:: images/558ad0ee-2c22-11e3-8ddd-6678d84d77e7.png
+ :alt: werkzeug-options
+
+ The options are:
+@@ -61,7 +61,7 @@ View Source
+
+ This displays the source underneath the traceback:
+
+-.. image:: https://f.cloud.github.com/assets/202559/1261036/583c8c42-2c22-11e3-9eb9-5c16b8732512.png
++.. image:: images/583c8c42-2c22-11e3-9eb9-5c16b8732512.png
+ :alt: werkzeug-source
+
+ Being able to view the source file is handy because it provides more
+@@ -78,7 +78,7 @@ Interactive Debugging Console
+ Clicking on this button opens up a new pane under the traceback line
+ you're on. This is the money shot:
+
+-.. image:: https://f.cloud.github.com/assets/202559/1261037/5d12eda6-2c22-11e3-802a-2639ff8813fa.png
++.. image:: images/5d12eda6-2c22-11e3-802a-2639ff8813fa.png
+ :alt: werkzeug-debugger
+
+ An ajax based console appears in the pane and you can start debugging.
diff --cc debian/patches/0002-Update-reference-to-python-werzeug-package.patch
index 5ca9e51,0000000..415b914
mode 100644,000000..100644
--- a/debian/patches/0002-Update-reference-to-python-werzeug-package.patch
+++ b/debian/patches/0002-Update-reference-to-python-werzeug-package.patch
@@@ -1,25 -1,0 +1,24 @@@
- From 536a0fdc20712f3a606d7e609c237ff985222e66 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
++From 9c9b80a1e42105f3ffaabaf337a459e6a802ddee Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Sun, 6 Nov 2016 09:51:19 +1100
++Subject: Update reference to python-werzeug package
+
- Description:
- Point people towards installing the python-werzeug package, not to download
- random files from the internet.
++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 34bd869..f88efa8 100644
++index 50ef6d7..4d4b58e 100644
+--- a/django_extensions/management/commands/runserver_plus.py
++++ b/django_extensions/management/commands/runserver_plus.py
- @@ -175,7 +175,7 @@ class Command(BaseCommand):
++@@ -231,7 +231,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)
++ class WSGIRequestHandler(_WSGIRequestHandler):
++ def make_environ(self):
diff --cc debian/patches/series
index bceebc3,0000000..89860cd
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- 0001-01-werkzeug-package.diff.patch
- 0002-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
++0001-Change-image-URLs-to-use-local-copy-of-images-to-pre.patch
++0002-Update-reference-to-python-werzeug-package.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