Merge branch 'master' of git://github.com/mitsuhiko/flask

This commit is contained in:
Ned Jackson Lovely 2012-03-12 15:27:41 -04:00
commit 12544c3a8d
2 changed files with 6 additions and 3 deletions

View file

@ -332,9 +332,9 @@ extension to be approved you have to follow these guidelines:
2. It must ship a testing suite that can either be invoked with ``make test`` 2. It must ship a testing suite that can either be invoked with ``make test``
or ``python setup.py test``. For test suites invoked with ``make or ``python setup.py test``. For test suites invoked with ``make
test`` the extension has to ensure that all dependencies for the test test`` the extension has to ensure that all dependencies for the test
are installed automatically, in case of ``python setup.py test`` are installed automatically. If tests are invoked with ``python setup.py
dependencies for tests alone can be specified in the `setup.py` test``, test dependencies can be specified in the `setup.py` file. The
file. The test suite also has to be part of the distribution. test suite also has to be part of the distribution.
3. APIs of approved extensions will be checked for the following 3. APIs of approved extensions will be checked for the following
characteristics: characteristics:

View file

@ -100,6 +100,9 @@ setup(
'License :: OSI Approved :: BSD License', 'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent', 'Operating System :: OS Independent',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
'Topic :: Software Development :: Libraries :: Python Modules' 'Topic :: Software Development :: Libraries :: Python Modules'
], ],