mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/multidb] Merged up to trunk r11413.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-08-09 02:39:23 +00:00
parent 2231e64115
commit 2899accd26
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/__init__.py
View File

@ -1,4 +1,4 @@
VERSION = (1, 1, 0, 'final', 0) VERSION = (1, 2, 0, 'alpha', 0)
def get_version(): def get_version():
version = '%s.%s' % (VERSION[0], VERSION[1]) version = '%s.%s' % (VERSION[0], VERSION[1])

4
docs/conf.py
View File

@ -41,11 +41,11 @@ copyright = 'Django Software Foundation and contributors'
# other places throughout the built documents. # other places throughout the built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.0' version = '1.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = version release = version
# The next version to be released # The next version to be released
django_next_version = '1.1' django_next_version = '1.2'
# There are two options for replacing |today|: either, you set today to some # There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used: # non-false value, then it is used:

14
docs/internals/committers.txt
View File

@ -135,19 +135,21 @@ Joseph Kocherhans
.. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software) .. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software)
`Brian Rosner`_ `Brian Rosner`_
Brian is currently a web developer working on an e-commerce system in Brian is currently the tech lead at Eldarion_ managing and developing
Django. He spends his free time contributing to Django and enjoys to learn Django / Pinax_ based websites. He enjoys learning more about programming
more about programming languages and system architectures. Brian is the languages and system architectures and contributing to open source
co-host of the weekly podcast, `This Week in Django`_. projects. Brian is the host of the `Django Dose`_ podcasts.
Brian helped immensely in getting Django's "newforms-admin" branch finished Brian helped immensely in getting Django's "newforms-admin" branch finished
in time for Django 1.0; he's now a full committer, continuing to improve on in time for Django 1.0; he's now a full committer, continuing to improve on
the admin and forms system. the admin and forms system.
Brian lives in Denver, USA. Brian lives in Denver, Colorado, USA.
.. _brian rosner: http://oebfare.com/ .. _brian rosner: http://oebfare.com/
.. _this week in django: http://thisweekindjango.com/ .. _eldarion: http://eldarion.com/
.. _pinax: http://pinaxproject.com/
.. _django dose: http://djangodose.com/
`Gary Wilson`_ `Gary Wilson`_
Gary starting contributing patches to Django in 2006 while developing Web Gary starting contributing patches to Django in 2006 while developing Web

2
setup.py
View File

@ -74,7 +74,6 @@ setup(
name = "Django", name = "Django",
version = version.replace(' ', '-'), version = version.replace(' ', '-'),
url = 'http://www.djangoproject.com/', url = 'http://www.djangoproject.com/',
download_url = 'http://media.djangoproject.com/releases/1.1/Django-1.1.tar.gz',
author = 'Django Software Foundation', author = 'Django Software Foundation',
author_email = 'foundation@djangoproject.com', author_email = 'foundation@djangoproject.com',
description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.', description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
@ -92,6 +91,7 @@ setup(
'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Internet :: WWW/HTTP :: WSGI', 'Topic :: Internet :: WWW/HTTP :: WSGI',
'Topic :: Software Development :: Libraries :: Application Frameworks',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',
], ],
) )