Patch for step #

.gitignore

@@ -2,7 +2,13 @@
 .ropeproject
 *.swp
 *.sw?
+.project
+.pydevproject
+.settings/
 
+htmlcov/*
+truffe2/.coverage
 truffe2/db.sqlite3
 venv/*
-truffe2/.idea/*
+truffe2/.idea/*
+

Deployement/django.py

@@ -168,7 +168,6 @@ def chmod_and_chown():
 def sync_databases():
     """Sync django databases"""
     with cd('/var/www/git-repo/truffe2/truffe2'):
-        sudo("python manage.py syncdb --noinput")
         sudo("python manage.py migrate --noinput")
 
 

README.md

@@ -19,6 +19,7 @@ Truffe 2 is licensed under the [BSD](http://opensource.org/licenses/BSD-2-Clause
 * Cedric Cook (Fixed a typo)
 * Yolan Romailler (Fixed a path)
 * Yann Beaud (Fixed VCARDs)
+* Laurent Gay (Migration to Python3/Django3)
 
 ## Development
 
@@ -38,16 +39,22 @@ Deployment scripts using fabric are located in the `Deployment` folder.
 
 ### Example development environment setup
 
-1. Create a virtual Python environment: `virtualenv --python=/usr/bin/python2 venv`
+1. Create a virtual Python 3 environment: `virtualenv --python=/usr/bin/python3 venv`
 2. Activate it: `. ./venv/bin/activate`
 3. Install dependencies: `pip install -r ./truffe2/data/pip-reqs.txt`
 4. `cp ./truffe2/app/settingsLocal.py{.dist,}`
 5. Edit `./truffe2/app/settingsLocal.py` and set the database engine to `django.db.backends.sqlite3` and database name to `db.sqlite3`
 6. To be apple to see the mails sent from the application, run a [maildump](https://pypi.python.org/pypi/maildump) instance on port 1025
 7. Go inside the `truffe2` directory for the next steps: `cd truffe2`
-8. Create the database tables not managed by south with `python manage.py syncdb`
-9. On OSX, if you get `ImportError: MagickWand shared library not found.`, it's probably because Python was not installed using MacPorts, you have to export MAGICK_HOME path. You should try to set the path with `export MAGICK_HOME=/opt/local` and go back to point 8.
-10. Create the database tables managed by south with `python manage.py migrate`
-11. Run the development server with `python manage.py runserver`
-12. Go to `http://localhost:8000/` and log in with Tequila
-13. Give your user superuser rights with `echo "update users_truffeuser set is_superuser=1 where id=1;" | sqlite3 db.sqlite3`
+8. On OSX, if you get `ImportError: MagickWand shared library not found.`, it's probably because Python was not installed using MacPorts, you have to export MAGICK_HOME path. You should try to set the path with `export MAGICK_HOME=/opt/local` and go back to point 8.
+9. Create the database tables with `python manage.py migrate`
+10. Run the development server with `python manage.py runserver`
+11. Go to `http://localhost:8000/` and log in with Tequila
+12. Give your user superuser rights with `echo "update users_truffeuser set is_superuser=1 where id=1;" | sqlite3 db.sqlite3`
+
+Those actions are setting in a script for Linux : `tools/install_venv.sh`.  
+2 Options for this script:
+ - `./tools/install_venv.sh noclean` : don't remove virtual Python environment, just delete SQLite DB file and reload a new DB.  
+ - `./tools/install_venv.sh "" demo` : add examples of data for testing in DB (5 users: admin, user1, user2, user3, user4 with username as password).  
+
+A new script, `tools/run_tests.sh`, allows to launch tests with code coverage.  

tools/install_venv.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# Script to install virtual environment for truffe2 for developpement
+# --- DO NOT USE IN PRODUCTION MODE ---
+
+set -e
+set +x
+
+project_dir="$(dirname $(dirname $(readlink -f "$0")))"
+
+if [ "$1" != "noclean" ]
+then
+	rm -rf "$project_dir/venv"
+	python3 -m virtualenv --python python3.8 "$project_dir/venv"
+
+	. "$project_dir/venv/bin/activate"
+	pip install -U pip
+	pip install -r "$project_dir/truffe2/data/pip-reqs.txt"
+else
+	. "$project_dir/venv/bin/activate"
+fi
+
+rm -rf "$project_dir/truffe2/db.sqlite3"
+cp "$project_dir/tools/settingsLocal.py.test" "$project_dir/truffe2/app/settingsLocal.py"
+
+(
+	cd "$project_dir/truffe2"
+	python -Wd manage.py migrate
+	if [ "$2" == "demo" ]
+	then
+		echo 'from main.test_data import setup_testing_all_data; setup_testing_all_data()' | python -Wd manage.py shell
+	fi
+)

tools/run_tests.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set +e
+set +x
+
+project_dir=$(dirname $(dirname $(readlink -f "$0")))
+
+rm -rf $project_dir/htmlcov
+. $project_dir/venv/bin/activate
+
+cd $project_dir/truffe2
+python -m pip install -U coverage >/dev/null
+python -m coverage erase
+python -Wd -m coverage run --branch --source=. manage.py test
+# python -m coverage report
+python -m coverage html -d $project_dir/htmlcov
+
+deactivate

tools/settingsLocal.py.test

@@ -0,0 +1,57 @@
+from os.path import join, dirname, abspath
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': join(dirname(dirname(abspath(__file__))), 'db.sqlite3'),
+    }
+}
+
+SECRET_KEY = "_____________________________________________________"
+
+# Deactivate Haystack indexing on save
+HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.BaseSignalProcessor'
+
+# Logging to console, for debug :)
+LOGGING = {
+    'disable_existing_loggers': False,
+    'version': 1,
+    'formatters': {
+        'verbose': {
+            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+        },
+        'simple': {
+            'format': '%(levelname)s %(message)s'
+        },
+    },
+    'handlers': {
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'formatter': 'simple'
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['console'],
+            'level': 'DEBUG',
+            'propagate': True,
+        },
+
+        'django.template': {
+            'handlers': ['console'],
+            'level': 'INFO',
+            'propagate': True,
+        },
+
+        'django.db.backends': {
+            'handlers': ['console'],
+            'level': 'ERROR',
+            'propagate': False,
+        },
+    },
+}
+
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 1025
+
+TEQUILA_ALLOW_GUEST = True # used for test