[Python-modules-commits] [python-django] 03/03: Clean up examples and documentation installed
Raphaël Hertzog
hertzog at moszumanska.debian.org
Tue May 30 14:22:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
hertzog pushed a commit to branch debian/experimental
in repository python-django.
commit f19f7d431fbd0b839233ffb892a47e3d82bdda6f
Author: Raphaël Hertzog <hertzog at debian.org>
Date: Tue May 30 16:15:54 2017 +0200
Clean up examples and documentation installed
* Remove README.Debian which contained only outdated information.
* Drop FastCGI initscript, it's obsolete, WSGI is required nowadays.
* Drop migrate-south helper script as south is gone for a long time
already.
* Add same documentation in python3-django as in python-django.
Closes: #831838
---
debian/changelog | 6 ++
debian/contrib/default | 16 ----
debian/contrib/initscript | 131 ---------------------------
debian/contrib/migrate-south | 14 ---
debian/python-django.README.Debian | 178 -------------------------------------
debian/python-django.examples | 1 -
debian/python3-django.NEWS | 1 +
debian/python3-django.docs | 1 +
8 files changed, 8 insertions(+), 340 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 114e77a..844cd28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ python-django (1:1.11.1-4) UNRELEASED; urgency=medium
* Update README.source and debian/gbp.conf.
* Document a minimal Django packaging policy in
README.Django-packaging-policy. Closes: #863514
+ * Remove README.Debian which contained only outdated information.
+ * Drop FastCGI initscript, it's obsolete, WSGI is required nowadays.
+ * Drop migrate-south helper script as south is gone for a long time
+ already.
+ * Add same documentation in python3-django as in python-django.
+ Closes: #831838
-- Raphaël Hertzog <hertzog at debian.org> Tue, 30 May 2017 14:42:53 +0200
diff --git a/debian/contrib/default b/debian/contrib/default
deleted file mode 100644
index 8601e25..0000000
--- a/debian/contrib/default
+++ /dev/null
@@ -1,16 +0,0 @@
-# django project names/directories
-DJANGO_SITES="myapp myapp2 myapp3"
-
-# path to the directory with your django projects
-#SITES_PATH=/home/django/projects
-
-# path to the directory for socket and pid files
-RUNFILES_PATH=$SITES_PATH/run
-
-# please make sure this is NOT root
-# local user prefered, www-data accepted
-RUN_AS=django
-
-# maximum requests before fast-cgi process respawns
-# (a.k.a. get killed and let live)
-MAXREQUESTS=100
diff --git a/debian/contrib/initscript b/debian/contrib/initscript
deleted file mode 100644
index 905236f..0000000
--- a/debian/contrib/initscript
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: FastCGI servers for Django
-# Required-Start: networking
-# Required-Stop: networking
-# Default-Start: 2 3 4 5
-# Default-Stop: S 0 1 6
-# Short-Description: Start FastCGI servers with Django.
-# Description: Django, in order to operate with FastCGI, must be started
-# in a very specific way with manage.py. This must be done
-# for each Django web server that has to run.
-### END INIT INFO
-#
-# Author: Guillermo Fernandez Castellanos
-# <guillermo.fernandez.castellanos AT gmail.com>.
-#
-# Changed: Jannis Leidel
-# <jannis AT leidel.info>
-# Joost Cassee
-# <joost at cassee.net>
-#
-# Version: @(#)fastcgi 0.3 05-Aug-2008 joost AT cassee.net
-#
-
-set -e
-
-#### CONFIGURATION (override in /etc/default/django)
-
-# django project names/directories
-DJANGO_SITES=""
-
-# path to the directory with your django projects
-SITES_PATH=/var/lib/django
-
-# path to the directory for socket and pid files
-RUNFILES_PATH=/var/run/django
-
-# please make sure this is NOT root
-# local user prefered, www-data accepted
-RUN_AS=www-data
-
-# maximum requests before fast-cgi process respawns
-# (a.k.a. get killed and let live)
-MAXREQUESTS=1000
-
-#### END CONFIGURATION
-
-# Include defaults if available
-if [ -f /etc/default/django ] ; then
- . /etc/default/django
-fi
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Django FastCGI servers"
-NAME=$0
-SCRIPTNAME=/etc/init.d/$NAME
-mkdir -p $RUNFILES_PATH
-chown -R $RUN_AS:$RUN_AS $RUNFILES_PATH
-
-#
-# Function that starts the daemon/service.
-#
-d_start()
-{
- # Starting all Django FastCGI processes
- # PORT=$PORT_START
- for SITE in $DJANGO_SITES
- do
- echo -n ", $SITE"
- if [ -f $RUNFILES_PATH/$SITE.pid ]; then
- echo -n " already running"
- else
- start-stop-daemon --start --quiet \
- --pidfile $RUNFILES_PATH/$SITE.pid \
- --chuid $RUN_AS --exec /usr/bin/env -- python \
- $SITES_PATH/$SITE/manage.py runfcgi \
- protocol=fcgi method=threaded maxrequests=$MAXREQUESTS \
- socket=$RUNFILES_PATH/$SITE.socket \
- pidfile=$RUNFILES_PATH/$SITE.pid
- chmod 400 $RUNFILES_PATH/$SITE.pid
- fi
- sleep 1
- done
-}
-
-#
-# Function that stops the daemon/service.
-#
-d_stop() {
- # Killing all Django FastCGI processes running
- for SITE in $DJANGO_SITES
- do
- echo -n ", $SITE"
- start-stop-daemon --stop --quiet --pidfile $RUNFILES_PATH/$SITE.pid \
- || echo -n " not running"
- if [ -f $RUNFILES_PATH/$SITE.pid ]; then
- rm -f $RUNFILES_PATH/$SITE.pid
- fi
- sleep 1
- done
-}
-
-ACTION="$1"
-case "$ACTION" in
- start)
- echo -n "Starting $DESC: $NAME"
- d_start
- echo "."
- ;;
-
- stop)
- echo -n "Stopping $DESC: $NAME"
- d_stop
- echo "."
- ;;
-
- restart|force-reload)
- echo -n "Restarting $DESC: $NAME"
- d_stop
- sleep 2
- d_start
- echo "."
- ;;
-
- *)
- echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-exit 0
diff --git a/debian/contrib/migrate-south b/debian/contrib/migrate-south
deleted file mode 100755
index cc40f51..0000000
--- a/debian/contrib/migrate-south
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-TMPDIR=$(mktemp -d)
-trap "rm -rf -- '$TMPDIR'" EXIT HUP INT TERM
-
-virtualenv --system-site-packages "$TMPDIR"
-. "$TMPDIR/bin/activate"
-
-pip install django==1.6.5
-pip install south
-
-CMD="$(command -v django-admin)"
-PYTHONPATH="$PWD" python "$CMD" migrate "$@"
diff --git a/debian/python-django.README.Debian b/debian/python-django.README.Debian
deleted file mode 100644
index 550ce14..0000000
--- a/debian/python-django.README.Debian
+++ /dev/null
@@ -1,178 +0,0 @@
-0.96 -> 1.0
-===========
-
-Django 1.0 has a number of backwards-incompatible changes from Django
-0.96. If you have apps written against Django 0.96 that you need to port,
-see the detailed porting guide:
-/usr/share/doc/python-django/html/releases/1.0-porting-guide.html
-or
-http://docs.djangoproject.com/en/dev/releases/1.0-porting-guide/
-
-You can also find a complete list of backwards incompatible changes
-here:
-http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
-
-0.95 -> 0.96
-============
-
-Information here has been gathered from:
- http://www.djangoproject.com/documentation/release_notes_0.96/
-and
- http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
-
-Backwards Incompatible Changes
-------------------------------
-
- Database constraint names changed
- =================================
-
- As of [3512], the format of the constraint names Django generates for
- foreign key references changed slightly. These names are only used
- sometimes, when it is not possible to put the reference directly on the
- affected column, so this is not always visible.
-
- The effect of this change is that manage.py reset app_name and similar
- commands may generate SQL with invalid constraint names and thus generate
- an error when run against the database (the database server will complain
- about the constraint not existing). To fix this, you will need to tweak the
- output of manage.py sqlreset app_name to match the correct constraint names
- and pass the results to the database server manually.
-
- Backslash escaping changed
- ==========================
-
- As of [3552], the Django database API now escapes backslashes given as
- query parameters. If you have any database API code that match backslashes,
- and it was working before (despite the broken escaping), you'll have to
- change your code to "unescape" the slashes one level.
-
- For example, this used to work:
-
- # Code that matches a single backslash
- MyModel.objects.filter(text__contains='\\\\')
-
- But it should be rewritten as this:
-
- # Code that matches a single backslash
- MyModel.objects.filter(text__contains='\\')
-
- Removed ENABLE_PSYCO setting
- ============================
-
- As of [3877], the ENABLE_PSYCO setting no longer exists. If your settings
- file includes ENABLE_PSYCO, nothing will break per se, but it just won't do
- anything. If you want to use Psyco with Django, write some custom
- middleware that activates Psyco.
-
- Changed Admin.manager option to more flexible hook
- ==================================================
-
- As of [4342], the manager option to class Admin no longer exists. This
- option was undocumented, but we're mentioning the change here in case you
- used it. In favor of this option, class Admin may now define one of these
- methods:
-
- * queryset()
- * queryset_add()
- * queryset_change()
-
- These give you much more flexibility.
-
- Note that this change was made to the NewformsAdminBranch. (We initially
- called the new method change_list_queryset, but this was changed in [4584]
- to be more flexible.) The change will not be made to trunk until that
- branch is merged to trunk.
-
- Changed prepopulate_from to be defined in the Admin class,
- not database field classes ¶
- ==========================================================
-
- As of [4446], the prepopulate_from option to database fields no
- longer exists. It's been discontinued in favor of the new
- prepopulated_fields option on class Admin. The new
- prepopulated_fields option, if given, should be a dictionary
- mapping field names to lists/tuples of field names. Here's an
- example comparing old syntax and new syntax:
-
- # OLD:
- class MyModel(models.Model):
- first_name = models.CharField(maxlength=30)
- last_name = models.CharField(maxlength=30)
- slug = models.CharField(maxlength=60, prepopulate_from=('first_name', 'last_name'))
-
- class Admin:
- pass
-
- # NEW:
- class MyModel(models.Model):
- first_name = models.CharField(maxlength=30)
- last_name = models.CharField(maxlength=30)
- slug = models.CharField(maxlength=60)
-
- class Admin:
- prepopulated_fields = {'slug': ('first_name', 'last_name')}
-
- Moved admin doc views into django.contrib.admindocs
- ====================================================
-
- As of [4585], the documentation views for the Django admin site were moved
- into a new package, django.contrib.admindocs.
-
- The admin docs, which aren't documented very well, were located at docs/ in
- the admin site. They're also linked-to by the "Documentation" link in the
- upper right of default admin templates.
-
- Because we've moved the doc views, you now have to activate admin docs
- explicitly. Do this by adding the following line to your URLconf:
-
- (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
- Note that this change was made to the NewformsAdminBranch. The change will
- not be made to trunk until that branch is merged to trunk.
-
- Enforcing MySQLdb version
- =========================
-
- As of [4724], Django will raise an error if you try to use the MySQL
- backend with a MySQLdb ( MySQL python module) version earlier than 1.2.1p2.
- There were significant, production-related bugs in earlier versions, so we
- have upgraded the minimum requirement.
-
- In [4767], a mysql_old backend was added, that is identical to the original
- mysql backend prior to the change in [4724]. This backend can be used if
- upgrading the MySQLdb module is not immediately possible, however, it is
- deprecated and no further development will be done on it.
-
-New Features
-------------
-
- New forms library
- =================
-
- The new forms library has been merged from the new forms branch in to
- django.newforms in 0.96, the next revision will replace django.forms with
- django.newforms, the current forms library is already copied to
- django.oldforms to make the transition easier - it's advised to either
- upgrade your forms code to the newforms library or to change your imports
- as follows:
-
- from django import forms
- becomes
- from django import oldforms as forms
-
- URLconf improvements
- ====================
-
- It's now possible to use imported views in the urlconf rather than a string
- representing the view to call.
-
- Test framework
- ==============
-
- Now possible to write tests based on doctest and unittest
-
- Admin area changes
- ==================
-
- Changes to the user adding and updating views so that you don't need to
- worry about hashed passwords.
diff --git a/debian/python-django.examples b/debian/python-django.examples
deleted file mode 100644
index 9564fbc..0000000
--- a/debian/python-django.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/contrib/*
diff --git a/debian/python3-django.NEWS b/debian/python3-django.NEWS
new file mode 120000
index 0000000..54dcb73
--- /dev/null
+++ b/debian/python3-django.NEWS
@@ -0,0 +1 @@
+python-django.NEWS
\ No newline at end of file
diff --git a/debian/python3-django.docs b/debian/python3-django.docs
new file mode 120000
index 0000000..c8b0e56
--- /dev/null
+++ b/debian/python3-django.docs
@@ -0,0 +1 @@
+python-django.docs
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django.git
More information about the Python-modules-commits
mailing list