Merge branch 'install-admin-templates' of https://github.com/onepercentclub/django_polymorphic into onepercentclub-install-admin-templates

Conflicts:
	MANIFEST.in
fix_request_path_info
Chris Glass 2013-02-24 14:04:31 +01:00
commit c22e50662d
3 changed files with 16 additions and 8 deletions

View File

@ -239,7 +239,7 @@ Example
child_models = ( child_models = (
(ModelB, ModelBAdmin), (ModelB, ModelBAdmin),
(ModelC, ModelCAdmin), (ModelC, ModelCAdmin),
} )
# Only the parent needs to be registered: # Only the parent needs to be registered:
admin.site.register(ModelA, ModelAParentAdmin) admin.site.register(ModelA, ModelAParentAdmin)

View File

@ -2,4 +2,4 @@ include README.rst
include LICENSE include LICENSE
include DOCS.rst include DOCS.rst
include CHANGES.rst include CHANGES.rst
recursive-include polymorphic/templates *.html recursive-include polymorphic/templates *

View File

@ -1,18 +1,26 @@
from distutils.core import setup from setuptools import setup, find_packages
setup( setup(
name = 'django_polymorphic', name = 'django_polymorphic',
version = '0.2', version = '0.2',
description = 'Seamless Polymorphic Inheritance for Django Models', description = 'Seamless Polymorphic Inheritance for Django Models',
url = 'https://github.com/chrisglass/django_polymorphic',
author = 'Bert Constantin', author = 'Bert Constantin',
author_email = 'bert.constantin@gmx.de', author_email = 'bert.constantin@gmx.de',
maintainer = 'Christopher Glass', maintainer = 'Christopher Glass',
maintainer_email = 'tribaal@gmail.com', maintainer_email = 'tribaal@gmail.com',
url = 'https://github.com/chrisglass/django_polymorphic',
packages = [ packages = find_packages(),
'polymorphic', package_data = {
'polymorphic.templatetags', 'polymorphic': [
'templates/admin/polymorphic/*.html',
], ],
},
install_requires=['setuptools'],
classifiers=[ classifiers=[
'Framework :: Django', 'Framework :: Django',
'Intended Audience :: Developers', 'Intended Audience :: Developers',