@@ -5,13 +5,15 @@ cms/django *.DS_Store *.svn +.* cms/media/cms_page_media/ cms/docs/build example/run example/local_settings.py reversion/ - +build +dist .ropeproject .project .pydevproject .gitignore @@ -1,28 +1,5 @@ -from django.core.exceptions import ImproperlyConfigured + VERSION = (2, 0, 0, 'RC1') __version__ = '.'.join(map(str, VERSION)) -import signals -import plugin_pool - -from django.conf import settings as d_settings -plugin_pool.plugin_pool.discover_plugins() - -def validate_settings(): - if not "django.core.context_processors.request" in d_settings.TEMPLATE_CONTEXT_PROCESSORS: - raise ImproperlyConfigured('django-cms needs django.core.context_processors.request in settings.TEMPLATE_CONTEXT_PROCESSORS to work correctly.') - if not 'mptt' in d_settings.INSTALLED_APPS: - raise ImproperlyConfigured('django-cms needs django-mptt installed.') - -validate_settings() - - -def validate_dependencies(): - # check for right version of reversions - if 'reversion' in d_settings.INSTALLED_APPS: - from reversion.admin import VersionAdmin - if not hasattr(VersionAdmin, 'get_urls'): - raise ImproperlyConfigured('django-cms requires never version of reversion (VersionAdmin must contain get_urls method)') -validate_dependencies() - \ No newline at end of file cms/__init__.py cms/docs/Makefile cms/media/cms/wymeditor/skins/silver/COPYING cms/media/cms/wymeditor/skins/silver/README @@ -3,3 +3,29 @@ from pagemodel import * from permissionmodels import * from pluginmodel import * from titlemodels import * + +from django.core.exceptions import ImproperlyConfigured +from cms import signals +from cms import plugin_pool + +from django.conf import settings as d_settings +plugin_pool.plugin_pool.discover_plugins() + +def validate_settings(): + if not "django.core.context_processors.request" in d_settings.TEMPLATE_CONTEXT_PROCESSORS: + raise ImproperlyConfigured('django-cms needs django.core.context_processors.request in settings.TEMPLATE_CONTEXT_PROCESSORS to work correctly.') + if not 'mptt' in d_settings.INSTALLED_APPS: + raise ImproperlyConfigured('django-cms needs django-mptt installed.') + +validate_settings() + + +def validate_dependencies(): + # check for right version of reversions + if 'reversion' in d_settings.INSTALLED_APPS: + from reversion.admin import VersionAdmin + if not hasattr(VersionAdmin, 'get_urls'): + raise ImproperlyConfigured('django-cms requires never version of reversion (VersionAdmin must contain get_urls method)') + +validate_dependencies() + \ No newline at end of file cms/models/__init__.py example/manage.py @@ -1,16 +1,37 @@ from setuptools import setup, find_packages import os - +import cms media_files = [] for dirpath, dirnames, filenames in os.walk('cms/media'): media_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]]) setup( + author="Patrick Lauber", + author_email="digi@treepy.com", name='django-cms', - version='2.0.0.alpha', + version=cms.__version__, description='An Advanced Django CMS', - url='http://github.com/digi604/django-cms-2.0/', + long_description=open(os.path.join(os.path.dirname(__file__), 'README.md')).read(), + url='http://www.django-cms.org/', + license='BSD License', + platforms=['OS Independent'], + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', + 'Programming Language :: Python', + 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', + 'Topic :: Software Development', + 'Topic :: Software Development :: Libraries :: Application Frameworks', + ], + requires=[ + 'django (>1.1.0)', + ], + packages=find_packages(), package_dir={ 'cms': 'cms', @@ -31,4 +52,5 @@ setup( 'locale/*/LC_MESSAGES/*' ] }, + zip_safe = False ) setup.py a62a9977991f07618d3adeaa10dae18ceddc1b9c Patrick Lauber patrick.lauber@divio.ch http://github.com/digi604/django-cms-2.0/commit/407a6709516da5b41f4aeef43c8ddc6306eeb21e 407a6709516da5b41f4aeef43c8ddc6306eeb21e 2009-10-07T15:03:18-07:00 2009-10-07T15:03:18-07:00 merge 550cb54b3bb9707cd920f0ba3fc63b2ea9a008db Patrick Lauber patrick.lauber@divio.ch