Changeset - 75ffbf8c8b18
[Not reviewed]
default
6 3 6
Branko Majic (branko) - 6 years ago 2017-12-19 14:47:37
branko@majic.rs
CONNT-28: Renamed test project projtest to testproject:

- Updated Mercurial ignore file for new naming schema.
- Updated documentation.
- Renamed the directory.
- Updated the setup script.
- Updated the project files.
9 files changed with 15 insertions and 15 deletions:
0 comments (0 inline, 0 general)
.hgignore
Show inline comments
 
syntax: glob
 
*.pyc
 
*~
 
projtest/projtest.db
 
projtest/south
 
testproject/testproject.db
 
testproject/south
 
docs/_build
 
tmp/
 
dist/
 
django_conntrackt.egg-info/
 
projtect/.coverage
docs/development.rst
Show inline comments
 
@@ -70,20 +70,20 @@ Development/test Django project
 
out-of-the-box once database has been initialised.
 

	
 
Once the development environment has been set-up, you can set-up its
 
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
 
your browser to http://localhost:8000/conntrackt/ .
 

	
 

	
 
@@ -93,13 +93,13 @@ Running tests
 
The application is well covered with various (primarily unit) tests,
 
and the tests can be easily run via the supplied test/development
 
projects. Once the development environment has been set-up, tests can
 
be easily run with::
 

	
 
  workon conntrackt
 
  cd ~/projects/conntrackt/projtest/
 
  cd ~/projects/conntrackt/testproject/
 
  ./manage.py test conntrackt
 

	
 

	
 
Keeping installation and development requirements up-to-date
 
------------------------------------------------------------
 

	
setup.py
Show inline comments
 
@@ -35,13 +35,13 @@ INSTALL_REQUIREMENTS = [
 
# allow setup.py to be run from any path
 
os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 

	
 
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.',
 
    long_description=README,
 
    url='http://projects.majic.rs/conntrackt',
 
    author='Branko Majic',
testproject/conntrackt
Show inline comments
 
file renamed from projtest/conntrackt to testproject/conntrackt
testproject/manage.py
Show inline comments
 
file renamed from projtest/manage.py to testproject/manage.py
 
@@ -21,11 +21,11 @@
 

	
 

	
 
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
 

	
 
    execute_from_command_line(sys.argv)
testproject/testproject/__init__.py
Show inline comments
 
file renamed from projtest/projtest/__init__.py to testproject/testproject/__init__.py
testproject/testproject/settings.py
Show inline comments
 
file renamed from projtest/projtest/settings.py to testproject/testproject/settings.py
 
@@ -16,26 +16,26 @@
 
#
 
# You should have received a copy of the GNU General Public License along with
 
# Django Conntrackt.  If not, see <http://www.gnu.org/licenses/>.
 
#
 

	
 

	
 
# Django settings for projtest project.
 
# Django settings for testproject project.
 
DEBUG = True
 
TEMPLATE_DEBUG = DEBUG
 

	
 
ADMINS = (
 
    ('Branko Majic', 'branko@majic.rs'),
 
)
 

	
 
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.
 
        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
 
    }
 
}
 
@@ -114,16 +114,16 @@ MIDDLEWARE_CLASSES = (
 
    'django.contrib.auth.middleware.AuthenticationMiddleware',
 
    'django.contrib.messages.middleware.MessageMiddleware',
 
    # Uncomment the next line for simple clickjacking protection:
 
    # '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".
 
    # Always use forward slashes, even on Windows.
 
    # Don't forget to use absolute paths, not relative paths.
 
)
testproject/testproject/urls.py
Show inline comments
 
file renamed from projtest/projtest/urls.py to testproject/testproject/urls.py
 
@@ -29,14 +29,14 @@ from django.http import HttpResponseRedi
 
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')),
 

	
 

	
 
    # Uncomment the admin/doc line below to enable admin documentation:
 
    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
testproject/testproject/wsgi.py
Show inline comments
 
file renamed from projtest/projtest/wsgi.py to testproject/testproject/wsgi.py
 
@@ -17,13 +17,13 @@
 
# You should have received a copy of the GNU General Public License along with
 
# Django Conntrackt.  If not, see <http://www.gnu.org/licenses/>.
 
#
 

	
 

	
 
"""
 
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
 
named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
 
this application via the ``WSGI_APPLICATION`` setting.
 

	
 
@@ -33,13 +33,13 @@ that later delegates to the Django one. 
 
middleware here, or combine a Django application with an application of another
 
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
 
# setting points here.
 
from django.core.wsgi import get_wsgi_application
 
application = get_wsgi_application()
0 comments (0 inline, 0 general)