summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2015-05-24 16:57:33 +0800
committerJeremy Kerr <jk@ozlabs.org>2015-05-27 10:26:41 +0800
commitad2762cf775a8dde508de47164d6429f3fd724f1 (patch)
treee63015a468cfe32c961908f0338d423227799815
parentf09e982f58384946111d4157fd2b7c2b31b78612 (diff)
downloadpatchwork-ad2762cf775a8dde508de47164d6429f3fd724f1.tar.bz2
patchwork-ad2762cf775a8dde508de47164d6429f3fd724f1.tar.xz
Move to a more recent django project structure
This change updates patchwor to the newer project struture: we've moved the actual application out of the apps/ directory, and the patchwork-specific templates to under the patchwork application. This gives us the manage.py script in the top-level now. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--apps/patchwork/templatetags/__init__.py0
-rw-r--r--docs/HACKING4
-rw-r--r--docs/INSTALL13
-rw-r--r--lib/apache2/patchwork.mod_python.conf2
-rw-r--r--lib/apache2/patchwork.wsgi3
-rwxr-xr-xmanage.py (renamed from apps/manage.py)0
-rw-r--r--patchwork/__init__.py (renamed from apps/__init__.py)0
-rw-r--r--patchwork/admin.py (renamed from apps/patchwork/admin.py)0
-rw-r--r--patchwork/bin/__init__.py (renamed from apps/patchwork/__init__.py)0
-rw-r--r--patchwork/bin/bash_completion (renamed from apps/patchwork/bin/bash_completion)0
-rwxr-xr-xpatchwork/bin/parsemail-batch.sh (renamed from apps/patchwork/bin/parsemail-batch.sh)0
-rwxr-xr-xpatchwork/bin/parsemail.py (renamed from apps/patchwork/bin/parsemail.py)0
-rwxr-xr-xpatchwork/bin/parsemail.sh (renamed from apps/patchwork/bin/parsemail.sh)6
-rwxr-xr-xpatchwork/bin/patchwork-cron.py (renamed from apps/patchwork/bin/patchwork-cron.py)0
-rwxr-xr-xpatchwork/bin/pwclient (renamed from apps/patchwork/bin/pwclient)0
-rwxr-xr-xpatchwork/bin/rehash.py (renamed from apps/patchwork/bin/rehash.py)0
-rwxr-xr-xpatchwork/bin/update-patchwork-status.py (renamed from apps/patchwork/bin/update-patchwork-status.py)0
-rw-r--r--patchwork/context_processors.py (renamed from apps/patchwork/context_processors.py)0
-rw-r--r--patchwork/filters.py (renamed from apps/patchwork/filters.py)0
-rw-r--r--patchwork/fixtures/default_projects.xml (renamed from apps/patchwork/fixtures/default_projects.xml)0
-rw-r--r--patchwork/fixtures/initial_data.xml (renamed from apps/patchwork/fixtures/initial_data.xml)0
-rw-r--r--patchwork/forms.py (renamed from apps/patchwork/forms.py)0
-rw-r--r--patchwork/models.py (renamed from apps/patchwork/models.py)0
-rw-r--r--patchwork/paginator.py (renamed from apps/patchwork/paginator.py)0
-rw-r--r--patchwork/parser.py (renamed from apps/patchwork/parser.py)0
-rw-r--r--patchwork/requestcontext.py (renamed from apps/patchwork/requestcontext.py)0
-rw-r--r--patchwork/settings/__init__.py (renamed from apps/patchwork/bin/__init__.py)0
-rw-r--r--patchwork/settings/base.py (renamed from apps/patchwork/settings/base.py)2
-rw-r--r--patchwork/settings/dev.py (renamed from apps/patchwork/settings/dev.py)0
-rw-r--r--patchwork/settings/prod.py (renamed from apps/patchwork/settings/prod.py)0
-rw-r--r--patchwork/templates/patchwork/activation_email.txt (renamed from templates/patchwork/activation_email.txt)0
-rw-r--r--patchwork/templates/patchwork/activation_email_subject.txt (renamed from templates/patchwork/activation_email_subject.txt)0
-rw-r--r--patchwork/templates/patchwork/bundle.html (renamed from templates/patchwork/bundle.html)0
-rw-r--r--patchwork/templates/patchwork/bundles.html (renamed from templates/patchwork/bundles.html)0
-rw-r--r--patchwork/templates/patchwork/confirm-error.html (renamed from templates/patchwork/confirm-error.html)0
-rw-r--r--patchwork/templates/patchwork/filters.html (renamed from templates/patchwork/filters.html)0
-rw-r--r--patchwork/templates/patchwork/help/about.html (renamed from templates/patchwork/help/about.html)0
-rw-r--r--patchwork/templates/patchwork/help/index.html (renamed from templates/patchwork/help/index.html)0
-rw-r--r--patchwork/templates/patchwork/help/pwclient.html (renamed from templates/patchwork/help/pwclient.html)0
-rw-r--r--patchwork/templates/patchwork/list.html (renamed from templates/patchwork/list.html)0
-rw-r--r--patchwork/templates/patchwork/login.html (renamed from templates/patchwork/login.html)0
-rw-r--r--patchwork/templates/patchwork/logout.html (renamed from templates/patchwork/logout.html)0
-rw-r--r--patchwork/templates/patchwork/mail-form.html (renamed from templates/patchwork/mail-form.html)0
-rw-r--r--patchwork/templates/patchwork/mail-settings.html (renamed from templates/patchwork/mail-settings.html)0
-rw-r--r--patchwork/templates/patchwork/optin-request.html (renamed from templates/patchwork/optin-request.html)0
-rw-r--r--patchwork/templates/patchwork/optin-request.mail (renamed from templates/patchwork/optin-request.mail)0
-rw-r--r--patchwork/templates/patchwork/optin.html (renamed from templates/patchwork/optin.html)0
-rw-r--r--patchwork/templates/patchwork/optout-request.html (renamed from templates/patchwork/optout-request.html)0
-rw-r--r--patchwork/templates/patchwork/optout-request.mail (renamed from templates/patchwork/optout-request.mail)0
-rw-r--r--patchwork/templates/patchwork/optout.html (renamed from templates/patchwork/optout.html)0
-rw-r--r--patchwork/templates/patchwork/pagination.html (renamed from templates/patchwork/pagination.html)0
-rw-r--r--patchwork/templates/patchwork/patch-change-notification-subject.text (renamed from templates/patchwork/patch-change-notification-subject.text)0
-rw-r--r--patchwork/templates/patchwork/patch-change-notification.mail (renamed from templates/patchwork/patch-change-notification.mail)0
-rw-r--r--patchwork/templates/patchwork/patch-list.html (renamed from templates/patchwork/patch-list.html)0
-rw-r--r--patchwork/templates/patchwork/patch.html (renamed from templates/patchwork/patch.html)0
-rw-r--r--patchwork/templates/patchwork/profile.html (renamed from templates/patchwork/profile.html)0
-rw-r--r--patchwork/templates/patchwork/project.html (renamed from templates/patchwork/project.html)0
-rw-r--r--patchwork/templates/patchwork/projects.html (renamed from templates/patchwork/projects.html)0
l---------patchwork/templates/patchwork/pwclient1
-rw-r--r--patchwork/templates/patchwork/pwclientrc (renamed from templates/patchwork/pwclientrc)0
-rw-r--r--patchwork/templates/patchwork/register.mail (renamed from templates/patchwork/register.mail)0
-rw-r--r--patchwork/templates/patchwork/registration-confirm.html (renamed from templates/patchwork/registration-confirm.html)0
-rw-r--r--patchwork/templates/patchwork/registration_form.html (renamed from templates/patchwork/registration_form.html)0
-rw-r--r--patchwork/templates/patchwork/todo-list.html (renamed from templates/patchwork/todo-list.html)0
-rw-r--r--patchwork/templates/patchwork/todo-lists.html (renamed from templates/patchwork/todo-lists.html)0
-rw-r--r--patchwork/templates/patchwork/user-link-confirm.html (renamed from templates/patchwork/user-link-confirm.html)0
-rw-r--r--patchwork/templates/patchwork/user-link.html (renamed from templates/patchwork/user-link.html)0
-rw-r--r--patchwork/templates/patchwork/user-link.mail (renamed from templates/patchwork/user-link.mail)0
-rw-r--r--patchwork/templatetags/__init__.py (renamed from apps/patchwork/settings/__init__.py)0
-rw-r--r--patchwork/templatetags/filter.py (renamed from apps/patchwork/templatetags/filter.py)0
-rw-r--r--patchwork/templatetags/listurl.py (renamed from apps/patchwork/templatetags/listurl.py)0
-rw-r--r--patchwork/templatetags/order.py (renamed from apps/patchwork/templatetags/order.py)0
-rw-r--r--patchwork/templatetags/patch.py (renamed from apps/patchwork/templatetags/patch.py)0
-rw-r--r--patchwork/templatetags/person.py (renamed from apps/patchwork/templatetags/person.py)0
-rw-r--r--patchwork/templatetags/pwurl.py (renamed from apps/patchwork/templatetags/pwurl.py)0
-rw-r--r--patchwork/templatetags/syntax.py (renamed from apps/patchwork/templatetags/syntax.py)0
-rw-r--r--patchwork/tests/__init__.py (renamed from apps/patchwork/tests/__init__.py)0
-rw-r--r--patchwork/tests/mail/0001-git-pull-request.mbox (renamed from apps/patchwork/tests/mail/0001-git-pull-request.mbox)0
-rw-r--r--patchwork/tests/mail/0002-git-pull-request-wrapped.mbox (renamed from apps/patchwork/tests/mail/0002-git-pull-request-wrapped.mbox)0
-rw-r--r--patchwork/tests/mail/0003-git-pull-request-with-diff.mbox (renamed from apps/patchwork/tests/mail/0003-git-pull-request-with-diff.mbox)0
-rw-r--r--patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox (renamed from apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox)0
-rw-r--r--patchwork/tests/mail/0005-git-pull-request-ssh.mbox (renamed from apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox)0
-rw-r--r--patchwork/tests/mail/0006-git-pull-request-http.mbox (renamed from apps/patchwork/tests/mail/0006-git-pull-request-http.mbox)0
-rw-r--r--patchwork/tests/mail/0007-cvs-format-diff.mbox (renamed from apps/patchwork/tests/mail/0007-cvs-format-diff.mbox)0
-rw-r--r--patchwork/tests/mail/0008-git-rename.mbox (renamed from apps/patchwork/tests/mail/0008-git-rename.mbox)0
-rw-r--r--patchwork/tests/mail/0009-git-rename-with-diff.mbox (renamed from apps/patchwork/tests/mail/0009-git-rename-with-diff.mbox)0
-rw-r--r--patchwork/tests/mail/0010-invalid-charset.mbox (renamed from apps/patchwork/tests/mail/0010-invalid-charset.mbox)0
-rw-r--r--patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox (renamed from apps/patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox)0
-rw-r--r--patchwork/tests/patches/0001-add-line.patch (renamed from apps/patchwork/tests/patches/0001-add-line.patch)0
-rw-r--r--patchwork/tests/patches/0002-utf-8.patch (renamed from apps/patchwork/tests/patches/0002-utf-8.patch)0
-rw-r--r--patchwork/tests/test_bundles.py (renamed from apps/patchwork/tests/test_bundles.py)0
-rw-r--r--patchwork/tests/test_confirm.py (renamed from apps/patchwork/tests/test_confirm.py)0
-rw-r--r--patchwork/tests/test_encodings.py (renamed from apps/patchwork/tests/test_encodings.py)0
-rw-r--r--patchwork/tests/test_expiry.py (renamed from apps/patchwork/tests/test_expiry.py)0
-rw-r--r--patchwork/tests/test_filters.py (renamed from apps/patchwork/tests/test_filters.py)0
-rw-r--r--patchwork/tests/test_list.py (renamed from apps/patchwork/tests/test_list.py)0
-rw-r--r--patchwork/tests/test_mail_settings.py (renamed from apps/patchwork/tests/test_mail_settings.py)0
-rw-r--r--patchwork/tests/test_mboxviews.py (renamed from apps/patchwork/tests/test_mboxviews.py)0
-rw-r--r--patchwork/tests/test_notifications.py (renamed from apps/patchwork/tests/test_notifications.py)0
-rw-r--r--patchwork/tests/test_patchparser.py (renamed from apps/patchwork/tests/test_patchparser.py)0
-rw-r--r--patchwork/tests/test_person.py (renamed from apps/patchwork/tests/test_person.py)0
-rw-r--r--patchwork/tests/test_registration.py (renamed from apps/patchwork/tests/test_registration.py)0
-rw-r--r--patchwork/tests/test_updates.py (renamed from apps/patchwork/tests/test_updates.py)0
-rw-r--r--patchwork/tests/test_user.py (renamed from apps/patchwork/tests/test_user.py)0
-rw-r--r--patchwork/tests/test_xmlrpc.py (renamed from apps/patchwork/tests/test_xmlrpc.py)0
-rw-r--r--patchwork/tests/utils.py (renamed from apps/patchwork/tests/utils.py)0
-rw-r--r--patchwork/urls.py (renamed from apps/patchwork/urls.py)0
-rw-r--r--patchwork/utils.py (renamed from apps/patchwork/utils.py)0
-rw-r--r--patchwork/views/__init__.py (renamed from apps/patchwork/views/__init__.py)0
-rw-r--r--patchwork/views/base.py (renamed from apps/patchwork/views/base.py)0
-rw-r--r--patchwork/views/bundle.py (renamed from apps/patchwork/views/bundle.py)0
-rw-r--r--patchwork/views/mail.py (renamed from apps/patchwork/views/mail.py)0
-rw-r--r--patchwork/views/patch.py (renamed from apps/patchwork/views/patch.py)0
-rw-r--r--patchwork/views/project.py (renamed from apps/patchwork/views/project.py)0
-rw-r--r--patchwork/views/user.py (renamed from apps/patchwork/views/user.py)0
-rw-r--r--patchwork/views/xmlrpc.py (renamed from apps/patchwork/views/xmlrpc.py)0
l---------templates/patchwork/pwclient1
-rwxr-xr-xtools/patchwork-update-commits2
-rwxr-xr-xtools/post-receive.hook2
-rw-r--r--tox.ini12
120 files changed, 23 insertions, 25 deletions
diff --git a/apps/patchwork/templatetags/__init__.py b/apps/patchwork/templatetags/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/apps/patchwork/templatetags/__init__.py
+++ /dev/null
diff --git a/docs/HACKING b/docs/HACKING
index cab59eb..c1b478e 100644
--- a/docs/HACKING
+++ b/docs/HACKING
@@ -43,9 +43,9 @@ It's always a good idea to use virtualenv to develop python software.
5. Now one can run patchwork within that environment
- (django-1.7)$ ./apps/manage.py --version
+ (django-1.7)$ ./manage.py --version
1.7
- (django-1.7)$ ./apps/manage.py runserver
+ (django-1.7)$ ./manage.py runserver
6. To exit the virtual environment
diff --git a/docs/INSTALL b/docs/INSTALL
index 16ab2b5..b006178 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -135,8 +135,7 @@ in brackets):
Then, get patchwork to create its tables in your configured database:
- cd apps/
- PYTHONPATH=../lib/python ./manage.py syncdb
+ PYTHONPATH=lib/python ./manage.py syncdb
And add privileges for your mail and web users. This is only needed if
you use the ident-based approach. If you use password-based database
@@ -190,7 +189,7 @@ in brackets):
Once you have apache set up, you can start the fastcgi server with:
- cd /srv/patchwork/apps
+ cd /srv/patchwork/
./manage.py runfcgi method=prefork \
socket=/srv/patchwork/var/fcgi.sock \
pidfile=/srv/patchwork/var/fcgi.pid
@@ -222,14 +221,14 @@ in brackets):
directory. (Note, do not use the parsemail.py script directly). Something
like this in /etc/aliases is suitable for postfix:
- patchwork: "|/srv/patchwork/apps/patchwork/bin/parsemail.sh"
+ patchwork: "|/srv/patchwork/patchwork/bin/parsemail.sh"
You may need to customise the parsemail.sh script if you haven't installed
patchwork in /srv/patchwork.
Test that you can deliver a patch to this script:
- sudo -u nobody /srv/patchwork/apps/patchwork/bin/parsemail.sh < mail
+ sudo -u nobody /srv/patchwork/patchwork/bin/parsemail.sh < mail
7. Set up the patchwork cron script
@@ -240,9 +239,9 @@ in brackets):
Something like this in your crontab should work:
# m h dom mon dow command
- PYTHONPATH=apps:.
+ PYTHONPATH=.
DJANGO_SETTINGS_MODULE=settings
- */10 * * * * cd patchwork; python apps/patchwork/bin/patchwork-cron.py
+ */10 * * * * cd patchwork; python patchwork/bin/patchwork-cron.py
- the frequency should be the same as the NOTIFICATION_DELAY_MINUTES
diff --git a/lib/apache2/patchwork.mod_python.conf b/lib/apache2/patchwork.mod_python.conf
index 6395738..c46f86c 100644
--- a/lib/apache2/patchwork.mod_python.conf
+++ b/lib/apache2/patchwork.mod_python.conf
@@ -7,7 +7,7 @@ NameVirtualHost patchwork.example.com:80
<Location "/">
SetHandler python-program
PythonHandler django.core.handlers.modpython
- PythonPath "['/srv/patchwork/apps', '/srv/patchwork/lib/python'] + sys.path"
+ PythonPath "['/srv/patchwork', '/srv/patchwork/lib/python'] + sys.path"
SetEnv DJANGO_SETTINGS_MODULE settings
</Location>
diff --git a/lib/apache2/patchwork.wsgi b/lib/apache2/patchwork.wsgi
index 869bb9d..52feb58 100644
--- a/lib/apache2/patchwork.wsgi
+++ b/lib/apache2/patchwork.wsgi
@@ -12,8 +12,7 @@ import sys
basedir = os.path.join(
os.path.dirname(__file__), os.path.pardir, os.path.pardir)
sys.path.append(basedir)
-sys.path.append(os.path.join(basedir, 'apps'))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'apps.settings'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'patchwork.settings.prod'
import django.core.handlers.wsgi
application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/apps/manage.py b/manage.py
index 04eac77..04eac77 100755
--- a/apps/manage.py
+++ b/manage.py
diff --git a/apps/__init__.py b/patchwork/__init__.py
index e69de29..e69de29 100644
--- a/apps/__init__.py
+++ b/patchwork/__init__.py
diff --git a/apps/patchwork/admin.py b/patchwork/admin.py
index 5297903..5297903 100644
--- a/apps/patchwork/admin.py
+++ b/patchwork/admin.py
diff --git a/apps/patchwork/__init__.py b/patchwork/bin/__init__.py
index e69de29..e69de29 100644
--- a/apps/patchwork/__init__.py
+++ b/patchwork/bin/__init__.py
diff --git a/apps/patchwork/bin/bash_completion b/patchwork/bin/bash_completion
index a120a76..a120a76 100644
--- a/apps/patchwork/bin/bash_completion
+++ b/patchwork/bin/bash_completion
diff --git a/apps/patchwork/bin/parsemail-batch.sh b/patchwork/bin/parsemail-batch.sh
index 31ef4f0..31ef4f0 100755
--- a/apps/patchwork/bin/parsemail-batch.sh
+++ b/patchwork/bin/parsemail-batch.sh
diff --git a/apps/patchwork/bin/parsemail.py b/patchwork/bin/parsemail.py
index 19e6e57..19e6e57 100755
--- a/apps/patchwork/bin/parsemail.py
+++ b/patchwork/bin/parsemail.py
diff --git a/apps/patchwork/bin/parsemail.sh b/patchwork/bin/parsemail.sh
index 246c2a1..d9ad005 100755
--- a/apps/patchwork/bin/parsemail.sh
+++ b/patchwork/bin/parsemail.sh
@@ -20,10 +20,10 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
BIN_DIR=`dirname $0`
-PATCHWORK_BASE=`readlink -e $BIN_DIR/../../..`
+PATCHWORK_BASE=`readlink -e $BIN_DIR/../..`
-PYTHONPATH="$PATCHWORK_BASE/apps":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \
+PYTHONPATH="$PATCHWORK_BASE":"$PATCHWORK_BASE/lib/python:$PYTHONPATH" \
DJANGO_SETTINGS_MODULE=settings \
- "$PATCHWORK_BASE/apps/patchwork/bin/parsemail.py"
+ "$PATCHWORK_BASE/patchwork/bin/parsemail.py"
exit 0
diff --git a/apps/patchwork/bin/patchwork-cron.py b/patchwork/bin/patchwork-cron.py
index 148e97c..148e97c 100755
--- a/apps/patchwork/bin/patchwork-cron.py
+++ b/patchwork/bin/patchwork-cron.py
diff --git a/apps/patchwork/bin/pwclient b/patchwork/bin/pwclient
index 8d1f476..8d1f476 100755
--- a/apps/patchwork/bin/pwclient
+++ b/patchwork/bin/pwclient
diff --git a/apps/patchwork/bin/rehash.py b/patchwork/bin/rehash.py
index c44e49b..c44e49b 100755
--- a/apps/patchwork/bin/rehash.py
+++ b/patchwork/bin/rehash.py
diff --git a/apps/patchwork/bin/update-patchwork-status.py b/patchwork/bin/update-patchwork-status.py
index 2da5d23..2da5d23 100755
--- a/apps/patchwork/bin/update-patchwork-status.py
+++ b/patchwork/bin/update-patchwork-status.py
diff --git a/apps/patchwork/context_processors.py b/patchwork/context_processors.py
index f4ab5a9..f4ab5a9 100644
--- a/apps/patchwork/context_processors.py
+++ b/patchwork/context_processors.py
diff --git a/apps/patchwork/filters.py b/patchwork/filters.py
index 8c9690e..8c9690e 100644
--- a/apps/patchwork/filters.py
+++ b/patchwork/filters.py
diff --git a/apps/patchwork/fixtures/default_projects.xml b/patchwork/fixtures/default_projects.xml
index c67fa56..c67fa56 100644
--- a/apps/patchwork/fixtures/default_projects.xml
+++ b/patchwork/fixtures/default_projects.xml
diff --git a/apps/patchwork/fixtures/initial_data.xml b/patchwork/fixtures/initial_data.xml
index 86e1105..86e1105 100644
--- a/apps/patchwork/fixtures/initial_data.xml
+++ b/patchwork/fixtures/initial_data.xml
diff --git a/apps/patchwork/forms.py b/patchwork/forms.py
index 0327958..0327958 100644
--- a/apps/patchwork/forms.py
+++ b/patchwork/forms.py
diff --git a/apps/patchwork/models.py b/patchwork/models.py
index 54b8656..54b8656 100644
--- a/apps/patchwork/models.py
+++ b/patchwork/models.py
diff --git a/apps/patchwork/paginator.py b/patchwork/paginator.py
index 31c0190..31c0190 100644
--- a/apps/patchwork/paginator.py
+++ b/patchwork/paginator.py
diff --git a/apps/patchwork/parser.py b/patchwork/parser.py
index a51a7b6..a51a7b6 100644
--- a/apps/patchwork/parser.py
+++ b/patchwork/parser.py
diff --git a/apps/patchwork/requestcontext.py b/patchwork/requestcontext.py
index 3b1afaf..3b1afaf 100644
--- a/apps/patchwork/requestcontext.py
+++ b/patchwork/requestcontext.py
diff --git a/apps/patchwork/bin/__init__.py b/patchwork/settings/__init__.py
index e69de29..e69de29 100644
--- a/apps/patchwork/bin/__init__.py
+++ b/patchwork/settings/__init__.py
diff --git a/apps/patchwork/settings/base.py b/patchwork/settings/base.py
index 5440de6..9b52989 100644
--- a/apps/patchwork/settings/base.py
+++ b/patchwork/settings/base.py
@@ -7,7 +7,7 @@ import os
import django
ROOT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)),
- os.pardir, os.pardir, os.pardir)
+ os.pardir, os.pardir)
#
# Core settings
diff --git a/apps/patchwork/settings/dev.py b/patchwork/settings/dev.py
index 6e373cc..6e373cc 100644
--- a/apps/patchwork/settings/dev.py
+++ b/patchwork/settings/dev.py
diff --git a/apps/patchwork/settings/prod.py b/patchwork/settings/prod.py
index d71f3df..d71f3df 100644
--- a/apps/patchwork/settings/prod.py
+++ b/patchwork/settings/prod.py
diff --git a/templates/patchwork/activation_email.txt b/patchwork/templates/patchwork/activation_email.txt
index caf514a..caf514a 100644
--- a/templates/patchwork/activation_email.txt
+++ b/patchwork/templates/patchwork/activation_email.txt
diff --git a/templates/patchwork/activation_email_subject.txt b/patchwork/templates/patchwork/activation_email_subject.txt
index c409f38..c409f38 100644
--- a/templates/patchwork/activation_email_subject.txt
+++ b/patchwork/templates/patchwork/activation_email_subject.txt
diff --git a/templates/patchwork/bundle.html b/patchwork/templates/patchwork/bundle.html
index 4a96b6b..4a96b6b 100644
--- a/templates/patchwork/bundle.html
+++ b/patchwork/templates/patchwork/bundle.html
diff --git a/templates/patchwork/bundles.html b/patchwork/templates/patchwork/bundles.html
index 11fb89d..11fb89d 100644
--- a/templates/patchwork/bundles.html
+++ b/patchwork/templates/patchwork/bundles.html
diff --git a/templates/patchwork/confirm-error.html b/patchwork/templates/patchwork/confirm-error.html
index 81292e2..81292e2 100644
--- a/templates/patchwork/confirm-error.html
+++ b/patchwork/templates/patchwork/confirm-error.html
diff --git a/templates/patchwork/filters.html b/patchwork/templates/patchwork/filters.html
index 10ca587..10ca587 100644
--- a/templates/patchwork/filters.html
+++ b/patchwork/templates/patchwork/filters.html
diff --git a/templates/patchwork/help/about.html b/patchwork/templates/patchwork/help/about.html
index 7befa6b..7befa6b 100644
--- a/templates/patchwork/help/about.html
+++ b/patchwork/templates/patchwork/help/about.html
diff --git a/templates/patchwork/help/index.html b/patchwork/templates/patchwork/help/index.html
index 5cb6467..5cb6467 100644
--- a/templates/patchwork/help/index.html
+++ b/patchwork/templates/patchwork/help/index.html
diff --git a/templates/patchwork/help/pwclient.html b/patchwork/templates/patchwork/help/pwclient.html
index 7101ec1..7101ec1 100644
--- a/templates/patchwork/help/pwclient.html
+++ b/patchwork/templates/patchwork/help/pwclient.html
diff --git a/templates/patchwork/list.html b/patchwork/templates/patchwork/list.html
index 654fe8c..654fe8c 100644
--- a/templates/patchwork/list.html
+++ b/patchwork/templates/patchwork/list.html
diff --git a/templates/patchwork/login.html b/patchwork/templates/patchwork/login.html
index 2dfc2a7..2dfc2a7 100644
--- a/templates/patchwork/login.html
+++ b/patchwork/templates/patchwork/login.html
diff --git a/templates/patchwork/logout.html b/patchwork/templates/patchwork/logout.html
index f030aee..f030aee 100644
--- a/templates/patchwork/logout.html
+++ b/patchwork/templates/patchwork/logout.html
diff --git a/templates/patchwork/mail-form.html b/patchwork/templates/patchwork/mail-form.html
index d71b2fb..d71b2fb 100644
--- a/templates/patchwork/mail-form.html
+++ b/patchwork/templates/patchwork/mail-form.html
diff --git a/templates/patchwork/mail-settings.html b/patchwork/templates/patchwork/mail-settings.html
index 440af08..440af08 100644
--- a/templates/patchwork/mail-settings.html
+++ b/patchwork/templates/patchwork/mail-settings.html
diff --git a/templates/patchwork/optin-request.html b/patchwork/templates/patchwork/optin-request.html
index 3dfb1bd..3dfb1bd 100644
--- a/templates/patchwork/optin-request.html
+++ b/patchwork/templates/patchwork/optin-request.html
diff --git a/templates/patchwork/optin-request.mail b/patchwork/templates/patchwork/optin-request.mail
index d97c78b..d97c78b 100644
--- a/templates/patchwork/optin-request.mail
+++ b/patchwork/templates/patchwork/optin-request.mail
diff --git a/templates/patchwork/optin.html b/patchwork/templates/patchwork/optin.html
index 01aaa0e..01aaa0e 100644
--- a/templates/patchwork/optin.html
+++ b/patchwork/templates/patchwork/optin.html
diff --git a/templates/patchwork/optout-request.html b/patchwork/templates/patchwork/optout-request.html
index 092dbbb..092dbbb 100644
--- a/templates/patchwork/optout-request.html
+++ b/patchwork/templates/patchwork/optout-request.html
diff --git a/templates/patchwork/optout-request.mail b/patchwork/templates/patchwork/optout-request.mail
index 67203ca..67203ca 100644
--- a/templates/patchwork/optout-request.mail
+++ b/patchwork/templates/patchwork/optout-request.mail
diff --git a/templates/patchwork/optout.html b/patchwork/templates/patchwork/optout.html
index b140bf4..b140bf4 100644
--- a/templates/patchwork/optout.html
+++ b/patchwork/templates/patchwork/optout.html
diff --git a/templates/patchwork/pagination.html b/patchwork/templates/patchwork/pagination.html
index 3e95126..3e95126 100644
--- a/templates/patchwork/pagination.html
+++ b/patchwork/templates/patchwork/pagination.html
diff --git a/templates/patchwork/patch-change-notification-subject.text b/patchwork/templates/patchwork/patch-change-notification-subject.text
index c9d96d4..c9d96d4 100644
--- a/templates/patchwork/patch-change-notification-subject.text
+++ b/patchwork/templates/patchwork/patch-change-notification-subject.text
diff --git a/templates/patchwork/patch-change-notification.mail b/patchwork/templates/patchwork/patch-change-notification.mail
index 4246704..4246704 100644
--- a/templates/patchwork/patch-change-notification.mail
+++ b/patchwork/templates/patchwork/patch-change-notification.mail
diff --git a/templates/patchwork/patch-list.html b/patchwork/templates/patchwork/patch-list.html
index 675f67f..675f67f 100644
--- a/templates/patchwork/patch-list.html
+++ b/patchwork/templates/patchwork/patch-list.html
diff --git a/templates/patchwork/patch.html b/patchwork/templates/patchwork/patch.html
index f18ee3b..f18ee3b 100644
--- a/templates/patchwork/patch.html
+++ b/patchwork/templates/patchwork/patch.html
diff --git a/templates/patchwork/profile.html b/patchwork/templates/patchwork/profile.html
index 116d6d6..116d6d6 100644
--- a/templates/patchwork/profile.html
+++ b/patchwork/templates/patchwork/profile.html
diff --git a/templates/patchwork/project.html b/patchwork/templates/patchwork/project.html
index be8cadc..be8cadc 100644
--- a/templates/patchwork/project.html
+++ b/patchwork/templates/patchwork/project.html
diff --git a/templates/patchwork/projects.html b/patchwork/templates/patchwork/projects.html
index 8c727ad..8c727ad 100644
--- a/templates/patchwork/projects.html
+++ b/patchwork/templates/patchwork/projects.html
diff --git a/patchwork/templates/patchwork/pwclient b/patchwork/templates/patchwork/pwclient
new file mode 120000
index 0000000..5ce255f
--- /dev/null
+++ b/patchwork/templates/patchwork/pwclient
@@ -0,0 +1 @@
+../../bin/pwclient \ No newline at end of file
diff --git a/templates/patchwork/pwclientrc b/patchwork/templates/patchwork/pwclientrc
index d331003..d331003 100644
--- a/templates/patchwork/pwclientrc
+++ b/patchwork/templates/patchwork/pwclientrc
diff --git a/templates/patchwork/register.mail b/patchwork/templates/patchwork/register.mail
index 9079203..9079203 100644
--- a/templates/patchwork/register.mail
+++ b/patchwork/templates/patchwork/register.mail
diff --git a/templates/patchwork/registration-confirm.html b/patchwork/templates/patchwork/registration-confirm.html
index 6111401..6111401 100644
--- a/templates/patchwork/registration-confirm.html
+++ b/patchwork/templates/patchwork/registration-confirm.html
diff --git a/templates/patchwork/registration_form.html b/patchwork/templates/patchwork/registration_form.html
index 3a314b8..3a314b8 100644
--- a/templates/patchwork/registration_form.html
+++ b/patchwork/templates/patchwork/registration_form.html
diff --git a/templates/patchwork/todo-list.html b/patchwork/templates/patchwork/todo-list.html
index b301901..b301901 100644
--- a/templates/patchwork/todo-list.html
+++ b/patchwork/templates/patchwork/todo-list.html
diff --git a/templates/patchwork/todo-lists.html b/patchwork/templates/patchwork/todo-lists.html
index e268160..e268160 100644
--- a/templates/patchwork/todo-lists.html
+++ b/patchwork/templates/patchwork/todo-lists.html
diff --git a/templates/patchwork/user-link-confirm.html b/patchwork/templates/patchwork/user-link-confirm.html
index 449bfeb..449bfeb 100644
--- a/templates/patchwork/user-link-confirm.html
+++ b/patchwork/templates/patchwork/user-link-confirm.html
diff --git a/templates/patchwork/user-link.html b/patchwork/templates/patchwork/user-link.html
index e436c3a..e436c3a 100644
--- a/templates/patchwork/user-link.html
+++ b/patchwork/templates/patchwork/user-link.html
diff --git a/templates/patchwork/user-link.mail b/patchwork/templates/patchwork/user-link.mail
index 8db6726..8db6726 100644
--- a/templates/patchwork/user-link.mail
+++ b/patchwork/templates/patchwork/user-link.mail
diff --git a/apps/patchwork/settings/__init__.py b/patchwork/templatetags/__init__.py
index e69de29..e69de29 100644
--- a/apps/patchwork/settings/__init__.py
+++ b/patchwork/templatetags/__init__.py
diff --git a/apps/patchwork/templatetags/filter.py b/patchwork/templatetags/filter.py
index 7a5d9df..7a5d9df 100644
--- a/apps/patchwork/templatetags/filter.py
+++ b/patchwork/templatetags/filter.py
diff --git a/apps/patchwork/templatetags/listurl.py b/patchwork/templatetags/listurl.py
index 5fe03e4..5fe03e4 100644
--- a/apps/patchwork/templatetags/listurl.py
+++ b/patchwork/templatetags/listurl.py
diff --git a/apps/patchwork/templatetags/order.py b/patchwork/templatetags/order.py
index e392f03..e392f03 100644
--- a/apps/patchwork/templatetags/order.py
+++ b/patchwork/templatetags/order.py
diff --git a/apps/patchwork/templatetags/patch.py b/patchwork/templatetags/patch.py
index bec0cab..bec0cab 100644
--- a/apps/patchwork/templatetags/patch.py
+++ b/patchwork/templatetags/patch.py
diff --git a/apps/patchwork/templatetags/person.py b/patchwork/templatetags/person.py
index c337c74..c337c74 100644
--- a/apps/patchwork/templatetags/person.py
+++ b/patchwork/templatetags/person.py
diff --git a/apps/patchwork/templatetags/pwurl.py b/patchwork/templatetags/pwurl.py
index 98bc1ca..98bc1ca 100644
--- a/apps/patchwork/templatetags/pwurl.py
+++ b/patchwork/templatetags/pwurl.py
diff --git a/apps/patchwork/templatetags/syntax.py b/patchwork/templatetags/syntax.py
index abdbb4d..abdbb4d 100644
--- a/apps/patchwork/templatetags/syntax.py
+++ b/patchwork/templatetags/syntax.py
diff --git a/apps/patchwork/tests/__init__.py b/patchwork/tests/__init__.py
index 85200bd..85200bd 100644
--- a/apps/patchwork/tests/__init__.py
+++ b/patchwork/tests/__init__.py
diff --git a/apps/patchwork/tests/mail/0001-git-pull-request.mbox b/patchwork/tests/mail/0001-git-pull-request.mbox
index 0dbedbe..0dbedbe 100644
--- a/apps/patchwork/tests/mail/0001-git-pull-request.mbox
+++ b/patchwork/tests/mail/0001-git-pull-request.mbox
diff --git a/apps/patchwork/tests/mail/0002-git-pull-request-wrapped.mbox b/patchwork/tests/mail/0002-git-pull-request-wrapped.mbox
index d3ccee1..d3ccee1 100644
--- a/apps/patchwork/tests/mail/0002-git-pull-request-wrapped.mbox
+++ b/patchwork/tests/mail/0002-git-pull-request-wrapped.mbox
diff --git a/apps/patchwork/tests/mail/0003-git-pull-request-with-diff.mbox b/patchwork/tests/mail/0003-git-pull-request-with-diff.mbox
index b4d578c..b4d578c 100644
--- a/apps/patchwork/tests/mail/0003-git-pull-request-with-diff.mbox
+++ b/patchwork/tests/mail/0003-git-pull-request-with-diff.mbox
diff --git a/apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox b/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox
index da96465..da96465 100644
--- a/apps/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox
+++ b/patchwork/tests/mail/0004-git-pull-request-git+ssh.mbox
diff --git a/apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox b/patchwork/tests/mail/0005-git-pull-request-ssh.mbox
index 7f4c93e..7f4c93e 100644
--- a/apps/patchwork/tests/mail/0005-git-pull-request-ssh.mbox
+++ b/patchwork/tests/mail/0005-git-pull-request-ssh.mbox
diff --git a/apps/patchwork/tests/mail/0006-git-pull-request-http.mbox b/patchwork/tests/mail/0006-git-pull-request-http.mbox
index e4f9007..e4f9007 100644
--- a/apps/patchwork/tests/mail/0006-git-pull-request-http.mbox
+++ b/patchwork/tests/mail/0006-git-pull-request-http.mbox
diff --git a/apps/patchwork/tests/mail/0007-cvs-format-diff.mbox b/patchwork/tests/mail/0007-cvs-format-diff.mbox
index 99735fa..99735fa 100644
--- a/apps/patchwork/tests/mail/0007-cvs-format-diff.mbox
+++ b/patchwork/tests/mail/0007-cvs-format-diff.mbox
diff --git a/apps/patchwork/tests/mail/0008-git-rename.mbox b/patchwork/tests/mail/0008-git-rename.mbox
index 8277049..8277049 100644
--- a/apps/patchwork/tests/mail/0008-git-rename.mbox
+++ b/patchwork/tests/mail/0008-git-rename.mbox
diff --git a/apps/patchwork/tests/mail/0009-git-rename-with-diff.mbox b/patchwork/tests/mail/0009-git-rename-with-diff.mbox
index 761cfc1..761cfc1 100644
--- a/apps/patchwork/tests/mail/0009-git-rename-with-diff.mbox
+++ b/patchwork/tests/mail/0009-git-rename-with-diff.mbox
diff --git a/apps/patchwork/tests/mail/0010-invalid-charset.mbox b/patchwork/tests/mail/0010-invalid-charset.mbox
index 10b369d..10b369d 100644
--- a/apps/patchwork/tests/mail/0010-invalid-charset.mbox
+++ b/patchwork/tests/mail/0010-invalid-charset.mbox
diff --git a/apps/patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox b/patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox
index 3ed0597..3ed0597 100644
--- a/apps/patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox
+++ b/patchwork/tests/mail/0011-no-newline-at-end-of-file.mbox
diff --git a/apps/patchwork/tests/patches/0001-add-line.patch b/patchwork/tests/patches/0001-add-line.patch
index c6cb9f1..c6cb9f1 100644
--- a/apps/patchwork/tests/patches/0001-add-line.patch
+++ b/patchwork/tests/patches/0001-add-line.patch
diff --git a/apps/patchwork/tests/patches/0002-utf-8.patch b/patchwork/tests/patches/0002-utf-8.patch
index 71a2f24..71a2f24 100644
--- a/apps/patchwork/tests/patches/0002-utf-8.patch
+++ b/patchwork/tests/patches/0002-utf-8.patch
diff --git a/apps/patchwork/tests/test_bundles.py b/patchwork/tests/test_bundles.py
index 38f3a2c..38f3a2c 100644
--- a/apps/patchwork/tests/test_bundles.py
+++ b/patchwork/tests/test_bundles.py
diff --git a/apps/patchwork/tests/test_confirm.py b/patchwork/tests/test_confirm.py
index fad5125..fad5125 100644
--- a/apps/patchwork/tests/test_confirm.py
+++ b/patchwork/tests/test_confirm.py
diff --git a/apps/patchwork/tests/test_encodings.py b/patchwork/tests/test_encodings.py
index b9032bb..b9032bb 100644
--- a/apps/patchwork/tests/test_encodings.py
+++ b/patchwork/tests/test_encodings.py
diff --git a/apps/patchwork/tests/test_expiry.py b/patchwork/tests/test_expiry.py
index 844ed4b..844ed4b 100644
--- a/apps/patchwork/tests/test_expiry.py
+++ b/patchwork/tests/test_expiry.py
diff --git a/apps/patchwork/tests/test_filters.py b/patchwork/tests/test_filters.py
index 2c464e5..2c464e5 100644
--- a/apps/patchwork/tests/test_filters.py
+++ b/patchwork/tests/test_filters.py
diff --git a/apps/patchwork/tests/test_list.py b/patchwork/tests/test_list.py
index a795a5f..a795a5f 100644
--- a/apps/patchwork/tests/test_list.py
+++ b/patchwork/tests/test_list.py
diff --git a/apps/patchwork/tests/test_mail_settings.py b/patchwork/tests/test_mail_settings.py
index a193c97..a193c97 100644
--- a/apps/patchwork/tests/test_mail_settings.py
+++ b/patchwork/tests/test_mail_settings.py
diff --git a/apps/patchwork/tests/test_mboxviews.py b/patchwork/tests/test_mboxviews.py
index 0e57f42..0e57f42 100644
--- a/apps/patchwork/tests/test_mboxviews.py
+++ b/patchwork/tests/test_mboxviews.py
diff --git a/apps/patchwork/tests/test_notifications.py b/patchwork/tests/test_notifications.py
index ed35140..ed35140 100644
--- a/apps/patchwork/tests/test_notifications.py
+++ b/patchwork/tests/test_notifications.py
diff --git a/apps/patchwork/tests/test_patchparser.py b/patchwork/tests/test_patchparser.py
index 119936a..119936a 100644
--- a/apps/patchwork/tests/test_patchparser.py
+++ b/patchwork/tests/test_patchparser.py
diff --git a/apps/patchwork/tests/test_person.py b/patchwork/tests/test_person.py
index d948096..d948096 100644
--- a/apps/patchwork/tests/test_person.py
+++ b/patchwork/tests/test_person.py
diff --git a/apps/patchwork/tests/test_registration.py b/patchwork/tests/test_registration.py
index 845b60b..845b60b 100644
--- a/apps/patchwork/tests/test_registration.py
+++ b/patchwork/tests/test_registration.py
diff --git a/apps/patchwork/tests/test_updates.py b/patchwork/tests/test_updates.py
index 177ee78..177ee78 100644
--- a/apps/patchwork/tests/test_updates.py
+++ b/patchwork/tests/test_updates.py
diff --git a/apps/patchwork/tests/test_user.py b/patchwork/tests/test_user.py
index 0faa970..0faa970 100644
--- a/apps/patchwork/tests/test_user.py
+++ b/patchwork/tests/test_user.py
diff --git a/apps/patchwork/tests/test_xmlrpc.py b/patchwork/tests/test_xmlrpc.py
index 2b459b2..2b459b2 100644
--- a/apps/patchwork/tests/test_xmlrpc.py
+++ b/patchwork/tests/test_xmlrpc.py
diff --git a/apps/patchwork/tests/utils.py b/patchwork/tests/utils.py
index 782ed36..782ed36 100644
--- a/apps/patchwork/tests/utils.py
+++ b/patchwork/tests/utils.py
diff --git a/apps/patchwork/urls.py b/patchwork/urls.py
index b28eb90..b28eb90 100644
--- a/apps/patchwork/urls.py
+++ b/patchwork/urls.py
diff --git a/apps/patchwork/utils.py b/patchwork/utils.py
index 9ed9e41..9ed9e41 100644
--- a/apps/patchwork/utils.py
+++ b/patchwork/utils.py
diff --git a/apps/patchwork/views/__init__.py b/patchwork/views/__init__.py
index dfca56d..dfca56d 100644
--- a/apps/patchwork/views/__init__.py
+++ b/patchwork/views/__init__.py
diff --git a/apps/patchwork/views/base.py b/patchwork/views/base.py
index 6d7dd13..6d7dd13 100644
--- a/apps/patchwork/views/base.py
+++ b/patchwork/views/base.py
diff --git a/apps/patchwork/views/bundle.py b/patchwork/views/bundle.py
index 3fb47e2..3fb47e2 100644
--- a/apps/patchwork/views/bundle.py
+++ b/patchwork/views/bundle.py
diff --git a/apps/patchwork/views/mail.py b/patchwork/views/mail.py
index aebba34..aebba34 100644
--- a/apps/patchwork/views/mail.py
+++ b/patchwork/views/mail.py
diff --git a/apps/patchwork/views/patch.py b/patchwork/views/patch.py
index 62ff853..62ff853 100644
--- a/apps/patchwork/views/patch.py
+++ b/patchwork/views/patch.py
diff --git a/apps/patchwork/views/project.py b/patchwork/views/project.py
index 114dbe0..114dbe0 100644
--- a/apps/patchwork/views/project.py
+++ b/patchwork/views/project.py
diff --git a/apps/patchwork/views/user.py b/patchwork/views/user.py
index 126ecc9..126ecc9 100644
--- a/apps/patchwork/views/user.py
+++ b/patchwork/views/user.py
diff --git a/apps/patchwork/views/xmlrpc.py b/patchwork/views/xmlrpc.py
index 84ed408..84ed408 100644
--- a/apps/patchwork/views/xmlrpc.py
+++ b/patchwork/views/xmlrpc.py
diff --git a/templates/patchwork/pwclient b/templates/patchwork/pwclient
deleted file mode 120000
index ae4faf3..0000000
--- a/templates/patchwork/pwclient
+++ /dev/null
@@ -1 +0,0 @@
-../../apps/patchwork/bin/pwclient \ No newline at end of file
diff --git a/tools/patchwork-update-commits b/tools/patchwork-update-commits
index b2a658a..820fd1c 100755
--- a/tools/patchwork-update-commits
+++ b/tools/patchwork-update-commits
@@ -1,7 +1,7 @@
#!/bin/bash
toolsdir="$(dirname "$0")"
-pwpath="${toolsdir}"/../apps/patchwork
+pwpath="${toolsdir}"/../patchwork
if [ "$#" -lt 1 ]
then
diff --git a/tools/post-receive.hook b/tools/post-receive.hook
index a38522e..8f05b8d 100755
--- a/tools/post-receive.hook
+++ b/tools/post-receive.hook
@@ -15,7 +15,7 @@ STATE_MAP="refs/heads/master:Accepted"
#
EXCLUDE=""
-PWDIR=/srv/patchwork/apps/patchwork
+PWDIR=/srv/patchwork/patchwork
do_exit=0
trap "do_exit=1" INT
diff --git a/tox.ini b/tox.ini
index 8d99e6a..485f7c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,14 +8,14 @@ commands = flake8 {posargs}
[flake8]
ignore = E121,E122,E123,E124,E125,E126,E127,E128,E129,E131,E251,H405
-exclude = ./apps/patchwork/tests
+exclude = ./patchwork/tests
[testenv:lint]
basepython = python2.7
deps =
pylint
-r{toxinidir}/docs/requirements-django-1.7-mysql.txt
-commands = pylint apps --rcfile=pylint.rc
+commands = pylint patchwork --rcfile=pylint.rc
[testenv:coverage]
basepython = python2.7
@@ -26,16 +26,16 @@ setenv =
DJANGO_SETTINGS_MODULE = patchwork.settings.dev
commands =
coverage erase
- {toxinidir}/apps/manage.py syncdb
- coverage run --omit=*tox* --branch {toxinidir}/apps/manage.py test patchwork
+ {toxinidir}/manage.py syncdb
+ coverage run --omit=*tox* --branch {toxinidir}/manage.py test patchwork
coverage report -m
[testenv]
basepython =
py27: python2.7
commands =
- {toxinidir}/apps/manage.py syncdb
- {toxinidir}/apps/manage.py test patchwork
+ {toxinidir}/manage.py syncdb
+ {toxinidir}/manage.py test patchwork
deps =
python-dateutil==1.5
MySQL-python==1.2.5