diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,8 +1,8 @@ syntax: glob *.pyc *~ -projtest/projtest.db -projtest/south +testproject/testproject.db +testproject/south docs/_build tmp/ dist/ diff --git a/docs/development.rst b/docs/development.rst --- a/docs/development.rst +++ b/docs/development.rst @@ -73,14 +73,14 @@ Once the development environment has bee database with:: workon conntrackt - cd projtest/ + cd testproject/ ./manage.py syncdb ./manage.py migrate Once the database has been set-up, run the development server with:: workon conntrackt - cd projtest/ + cd testproject/ ./manage.py runserver To access the application via started development server, simply point @@ -96,7 +96,7 @@ projects. Once the development environme be easily run with:: workon conntrackt - cd ~/projects/conntrackt/projtest/ + cd ~/projects/conntrackt/testproject/ ./manage.py test conntrackt diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ os.chdir(os.path.normpath(os.path.join(o setup( name='django-conntrackt', version='0.2-dev', - packages=find_packages(exclude=["projtest", "projtest.*"]), + packages=find_packages(exclude=["testproject", "testproject.*"]), include_package_data=True, license='GPLv3+', description='A simple application for tracking connection requirements between different entities in a network.', diff --git a/projtest/conntrackt b/testproject/conntrackt rename from projtest/conntrackt rename to testproject/conntrackt diff --git a/projtest/manage.py b/testproject/manage.py rename from projtest/manage.py rename to testproject/manage.py --- a/projtest/manage.py +++ b/testproject/manage.py @@ -24,7 +24,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "projtest.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.settings") from django.core.management import execute_from_command_line diff --git a/projtest/projtest/__init__.py b/testproject/testproject/__init__.py rename from projtest/projtest/__init__.py rename to testproject/testproject/__init__.py diff --git a/projtest/projtest/settings.py b/testproject/testproject/settings.py rename from projtest/projtest/settings.py rename to testproject/testproject/settings.py --- a/projtest/projtest/settings.py +++ b/testproject/testproject/settings.py @@ -19,7 +19,7 @@ # -# Django settings for projtest project. +# Django settings for testproject project. DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -32,7 +32,7 @@ MANAGERS = ADMINS DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'projtest.db', # Or path to database file if using sqlite3. + 'NAME': 'testproject.db', # 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. @@ -117,10 +117,10 @@ MIDDLEWARE_CLASSES = ( # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -ROOT_URLCONF = 'projtest.urls' +ROOT_URLCONF = 'testproject.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'projtest.wsgi.application' +WSGI_APPLICATION = 'testproject.wsgi.application' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". diff --git a/projtest/projtest/urls.py b/testproject/testproject/urls.py rename from projtest/projtest/urls.py rename to testproject/testproject/urls.py --- a/projtest/projtest/urls.py +++ b/testproject/testproject/urls.py @@ -32,8 +32,8 @@ admin.autodiscover() urlpatterns = patterns( '', # Examples: - # url(r'^$', 'projtest.views.home', name='home'), - # url(r'^projtest/', include('projtest.foo.urls')), + # url(r'^$', 'testproject.views.home', name='home'), + # url(r'^testproject/', include('testproject.foo.urls')), url(r'^$', lambda r: HttpResponseRedirect('conntrackt/')), url(r'^conntrackt/', include('conntrackt.urls')), diff --git a/projtest/projtest/wsgi.py b/testproject/testproject/wsgi.py rename from projtest/projtest/wsgi.py rename to testproject/testproject/wsgi.py --- a/projtest/projtest/wsgi.py +++ b/testproject/testproject/wsgi.py @@ -20,7 +20,7 @@ """ -WSGI config for projtest project. +WSGI config for testproject 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 @@ -36,7 +36,7 @@ framework. """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "projtest.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testproject.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