From 333a39ca6bf4b5475c0fcc36a9c401d875ea12bf Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 5 Sep 2012 11:26:10 +0200 Subject: [PATCH] rename project from aps42 to calebasse --- .gitignore | 2 +- MANIFEST.in | 4 +-- {aps42 => calebasse}/__init__.py | 0 calebasse/aps42.sqlite3 | Bin 0 -> 40960 bytes .../cale_base}/__init__.py | 0 .../a42base => calebasse/cale_base}/models.py | 0 .../cale_base}/models/__init__.py | 0 .../cale_base}/models/actes.py | 0 .../a42base => calebasse/cale_base}/tests.py | 0 .../a42base => calebasse/cale_base}/views.py | 0 {aps42 => calebasse}/settings/__init__.py | 4 +-- {aps42 => calebasse}/settings/aps42.py | 0 .../django.py => calebasse/settings/common.py | 29 +++++++++++------- {aps42 => calebasse}/urls.py | 4 +-- {aps42 => calebasse}/wsgi.py | 4 +-- manage.py | 2 +- setup.py | 6 ++-- 17 files changed, 31 insertions(+), 24 deletions(-) rename {aps42 => calebasse}/__init__.py (100%) create mode 100644 calebasse/aps42.sqlite3 rename {aps42/a42base => calebasse/cale_base}/__init__.py (100%) rename {aps42/a42base => calebasse/cale_base}/models.py (100%) rename {aps42/a42base => calebasse/cale_base}/models/__init__.py (100%) rename {aps42/a42base => calebasse/cale_base}/models/actes.py (100%) rename {aps42/a42base => calebasse/cale_base}/tests.py (100%) rename {aps42/a42base => calebasse/cale_base}/views.py (100%) rename {aps42 => calebasse}/settings/__init__.py (96%) rename {aps42 => calebasse}/settings/aps42.py (100%) rename aps42/settings/django.py => calebasse/settings/common.py (88%) rename {aps42 => calebasse}/urls.py (80%) rename {aps42 => calebasse}/wsgi.py (90%) diff --git a/.gitignore b/.gitignore index 891ef6fc..754e4d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ nosetests.xml # Django files local_settings.py -aps42.sqlite3 +calebasse.sqlite3 diff --git a/MANIFEST.in b/MANIFEST.in index 3f20424a..3a812f31 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include README INSTALL LICENSE AUTHORS recursive-include mockups * -recursive-include aps42/*/static * -recursive-include aps42/*/templates * +recursive-include calebasse/*/static * +recursive-include calebasse/*/templates * diff --git a/aps42/__init__.py b/calebasse/__init__.py similarity index 100% rename from aps42/__init__.py rename to calebasse/__init__.py diff --git a/calebasse/aps42.sqlite3 b/calebasse/aps42.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..494f4e15c1b6133eab82544a7a3bc8286f836516 GIT binary patch literal 40960 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 literal 0 HcmV?d00001 diff --git a/aps42/a42base/__init__.py b/calebasse/cale_base/__init__.py similarity index 100% rename from aps42/a42base/__init__.py rename to calebasse/cale_base/__init__.py diff --git a/aps42/a42base/models.py b/calebasse/cale_base/models.py similarity index 100% rename from aps42/a42base/models.py rename to calebasse/cale_base/models.py diff --git a/aps42/a42base/models/__init__.py b/calebasse/cale_base/models/__init__.py similarity index 100% rename from aps42/a42base/models/__init__.py rename to calebasse/cale_base/models/__init__.py diff --git a/aps42/a42base/models/actes.py b/calebasse/cale_base/models/actes.py similarity index 100% rename from aps42/a42base/models/actes.py rename to calebasse/cale_base/models/actes.py diff --git a/aps42/a42base/tests.py b/calebasse/cale_base/tests.py similarity index 100% rename from aps42/a42base/tests.py rename to calebasse/cale_base/tests.py diff --git a/aps42/a42base/views.py b/calebasse/cale_base/views.py similarity index 100% rename from aps42/a42base/views.py rename to calebasse/cale_base/views.py diff --git a/aps42/settings/__init__.py b/calebasse/settings/__init__.py similarity index 96% rename from aps42/settings/__init__.py rename to calebasse/settings/__init__.py index c04199e4..b04328ed 100644 --- a/aps42/settings/__init__.py +++ b/calebasse/settings/__init__.py @@ -2,8 +2,8 @@ import os.path PROJECT_PATH = os.path.dirname(os.path.dirname(__file__)) -from django import * -from aps42 import * +from common import * +from calebasse import * ######################################################################### # Import settings from local_settings.py, if it exists. diff --git a/aps42/settings/aps42.py b/calebasse/settings/aps42.py similarity index 100% rename from aps42/settings/aps42.py rename to calebasse/settings/aps42.py diff --git a/aps42/settings/django.py b/calebasse/settings/common.py similarity index 88% rename from aps42/settings/django.py rename to calebasse/settings/common.py index d80f4c66..3590aafd 100644 --- a/aps42/settings/django.py +++ b/calebasse/settings/common.py @@ -1,6 +1,7 @@ -# Django settings for aps42 project. +# Django settings for calebasse project. import os +from logging.handlers import SysLogHandler from ..settings import PROJECT_PATH @@ -16,7 +17,7 @@ MANAGERS = ADMINS DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': os.path.join(PROJECT_PATH, 'aps42.sqlite3'), # Or path to database file if using sqlite3. + 'NAME': os.path.join(PROJECT_PATH, 'calebasse.sqlite3'), # Or path to database file if using sqlite3. 'USER': '', # Not used with sqlite3. 'PASSWORD': '', # Not used with sqlite3. 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. @@ -104,10 +105,10 @@ MIDDLEWARE_CLASSES = ( # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -ROOT_URLCONF = 'aps42.urls' +ROOT_URLCONF = 'calebasse.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'aps42.wsgi.application' +WSGI_APPLICATION = 'calebasse.wsgi.application' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". @@ -128,7 +129,7 @@ INSTALLED_APPS = ( # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'aps42.a42base', + 'calebasse.cale_base', ) # A sample logging configuration. The only tangible logging @@ -149,13 +150,19 @@ LOGGING = { 'level': 'ERROR', 'filters': ['require_debug_false'], 'class': 'django.utils.log.AdminEmailHandler' - } + }, + 'syslog':{ + 'level':'INFO', + 'class':'logging.handlers.SysLogHandler', + 'formatter': 'syslog', + 'facility': SysLogHandler.LOG_LOCAL0, + 'address': '/dev/log', + }, }, 'loggers': { - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, + '': { + 'handlers': ['mail_admins','syslog'], + 'level': 'INFO', }, - } + }, } diff --git a/aps42/urls.py b/calebasse/urls.py similarity index 80% rename from aps42/urls.py rename to calebasse/urls.py index 8e8ffe6e..0e56e1f2 100644 --- a/aps42/urls.py +++ b/calebasse/urls.py @@ -6,8 +6,8 @@ from django.conf.urls import patterns, include, url urlpatterns = patterns('', # Examples: - # url(r'^$', 'aps42.views.home', name='home'), - # url(r'^aps42/', include('aps42.foo.urls')), + # url(r'^$', 'calebasse.views.home', name='home'), + # url(r'^calebasse/', include('aps42.foo.urls')), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), diff --git a/aps42/wsgi.py b/calebasse/wsgi.py similarity index 90% rename from aps42/wsgi.py rename to calebasse/wsgi.py index 27c30737..7c068bca 100644 --- a/aps42/wsgi.py +++ b/calebasse/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for aps42 project. +WSGI config for calebasse project. This module contains the WSGI application used by Django's development server and any production WSGI deployments. It should expose a module-level variable @@ -15,7 +15,7 @@ framework. """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aps42.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "calebasse.settings") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/manage.py b/manage.py index 44f04916..5640b54e 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aps42.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "calebasse.settings") from django.core.management import execute_from_command_line diff --git a/setup.py b/setup.py index b62042e9..3cec56f9 100755 --- a/setup.py +++ b/setup.py @@ -2,12 +2,12 @@ from setuptools import setup, find_packages import os -setup(name='aps42', +setup(name='calebasse', version='0.1', license='AGPLv3', description='', - url='http://dev.entrouvert.org/projects/aps42/', - download_url='http://repos.entrouvert.org/aps42.git/', + url='http://dev.entrouvert.org/projects/calebasse/', + download_url='http://repos.entrouvert.org/calebasse.git/', author="Entr'ouvert", author_email="info@entrouvert.com", packages=find_packages(os.path.dirname(__file__) or '.'),