From 2899accd269b12310d415a0c1457c0b54c0716ea Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 9 Aug 2009 02:39:23 +0000 Subject: [PATCH] [soc2009/multidb] Merged up to trunk r11413. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11416 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/__init__.py | 2 +- docs/conf.py | 4 ++-- docs/internals/committers.txt | 16 +++++++++------- setup.py | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/django/__init__.py b/django/__init__.py index 8f9d3c6e00..2b87a7e242 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, 'final', 0) +VERSION = (1, 2, 0, 'alpha', 0) def get_version(): version = '%s.%s' % (VERSION[0], VERSION[1]) diff --git a/docs/conf.py b/docs/conf.py index 078c83a492..bdc1280c0b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,11 +41,11 @@ copyright = 'Django Software Foundation and contributors' # other places throughout the built documents. # # The short X.Y version. -version = '1.0' +version = '1.1' # The full version, including alpha/beta/rc tags. release = version # 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 # non-false value, then it is used: diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index 69736ce880..7326532ec9 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -135,19 +135,21 @@ Joseph Kocherhans .. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software) `Brian Rosner`_ - Brian is currently a web developer working on an e-commerce system in - Django. He spends his free time contributing to Django and enjoys to learn - more about programming languages and system architectures. Brian is the - co-host of the weekly podcast, `This Week in Django`_. - + Brian is currently the tech lead at Eldarion_ managing and developing + Django / Pinax_ based websites. He enjoys learning more about programming + languages and system architectures and contributing to open source + projects. Brian is the host of the `Django Dose`_ podcasts. + 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 the admin and forms system. - Brian lives in Denver, USA. + Brian lives in Denver, Colorado, USA. .. _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 starting contributing patches to Django in 2006 while developing Web diff --git a/setup.py b/setup.py index 6ccf827e45..da565be2b5 100644 --- a/setup.py +++ b/setup.py @@ -74,7 +74,6 @@ setup( name = "Django", version = version.replace(' ', '-'), url = 'http://www.djangoproject.com/', - download_url = 'http://media.djangoproject.com/releases/1.1/Django-1.1.tar.gz', author = 'Django Software Foundation', author_email = 'foundation@djangoproject.com', 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 :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: WSGI', + 'Topic :: Software Development :: Libraries :: Application Frameworks', 'Topic :: Software Development :: Libraries :: Python Modules', ], )