Merge branch 'fix/_/python_3.5_3.6'

.travis.yml

@@ -25,9 +25,8 @@ before_script:
   - sh -c "if [ '$DB' = 'postgres' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\1postgresql:\/\/postgres:dummy@127.0.0.1:5432\/tracim_test?client_encoding=utf8/\" development.ini; fi"
 
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE tracim_test;'; fi"
-  - sh -c "if [ '$DB' = 'mysql' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\mysql+oursql:\/\/root@localhost\/tracim_test/\" test.ini; fi"
-  - sh -c "if [ '$DB' = 'mysql' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/<replace_database_uri_here>/mysql+oursql:\/\/root@localhost\/tracim_test/\" development.ini; fi"
-  - sh -c "if [ '$DB' = 'mysql' ]; then pip install https://launchpad.net/oursql/py3k/py3k-0.9.4/+download/oursql-0.9.4.zip; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\mysql+pymysql:\/\/root@localhost\/tracim_test/\" test.ini; fi"
+  - sh -c "if [ '$DB' = 'mysql' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/<replace_database_uri_here>/mysql+pymysql:\/\/root@localhost\/tracim_test/\" development.ini; fi"
 
   - sh -c "if [ '$DB' = 'sqlite' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/\(sqlalchemy.url *= *\).*/\sqlite:\/\/\/tracim_test.sqlite/\" test.ini; fi"
   - sh -c "if [ '$DB' = 'sqlite' ]; then cd ${TRAVIS_BUILD_DIR}/tracim && sed -i \"s/<replace_database_uri_here>/sqlite:\/\/\/tracim.sqlite/\" development.ini; fi"

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/tracim/tracim.svg?branch=master)](https://travis-ci.org/tracim/tracim) [![Coverage Status](https://img.shields.io/coveralls/tracim/tracim.svg)](https://coveralls.io/r/tracim/tracim) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tracim/tracim/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/tracim/tracim/?branch=master)
+[![Build Status](https://travis-ci.org/tracim/tracim.svg?branch=master)](https://travis-ci.org/tracim/tracim) [![Coverage Status](https://img.shields.io/coveralls/tracim/tracim.svg)](https://coveralls.io/r/tracim/tracim) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tracim/tracim/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/tracim/tracim/?branch=master) [![PyPI](https://img.shields.io/pypi/pyversions/tracim.svg)](https://pypi.python.org/pypi/tracim)
 
 # Tracim - Introduction #
 
@@ -67,7 +67,7 @@ Tracim is licensed under the terms of the
 
 Tracim is a web application:
 
-* developed with python >=3.4.
+* developed with python 3.4, 3.5, 3.6
 * based on the [TurboGears](http://www.turbogears.org/) web framework.
 * relying on [PostgreSQL](http://www.postgresql.org/) or [MySQL](https://www.mysql.fr/) or [sqlite](https://www.sqlite.org/) as the storage engine.
 
@@ -138,7 +138,7 @@ If you want use PostgreSQL as database engine:
 
 Or if you want to use MySQL as database engine
 
-    apt-get install mysql-server mysql-client libmysqlclient-dev
+    apt-get install mysql-server
 
 Or if you want to use SQLite as database engine
 
@@ -163,7 +163,7 @@ To install frontend dependencies listed in the file package.json, proceed as fol
 
 ### Setting-up python virtualenv ###
 
-_Reminder : Tracim is developed and tested using python3.4._
+_Reminder : Tracim is developed and tested using python3.4, python3.5, python3.6._
 
 We strongly recommend to use virtualenv as deployment environment. This ensure that there will be no conflict between system-wide python installation and Tracim required ones. To Create the virtual environment:
 
@@ -178,8 +178,6 @@ To install tracim and it's dependencies:
     cd tracim && python setup.py develop && cd -
     pip install -r install/requirements.txt
 
-**Note**: If you want to use MySQL database, please refer to Configuration/database schema note to install required package.
-
 ## Database Setup ##
 
 ### Minimalist introduction to PostgreSQL ###
@@ -257,7 +255,14 @@ In this case, delete the user and database you previously created (using pgtool)
 
 ### Minimalist introduction to MySQL ###
 
-## Create database ##
+#### Driver ####
+
+Tracim uses the PyMySQL driver between the SQLAlchemy ORM and the MySQL RDBMS.
+The only requirement is a pip installable package:
+
+    pip install PyMySQL
+
+#### Create database ####
 
 Connect to mysql with root user (password has been set at "Installation" -> "Dependencies" chapter, when installing package)
 
@@ -304,9 +309,9 @@ Configure database in the development.ini file. This is defined as sqlalchemy.ur
 
     sqlalchemy.url = postgresql://tracimuser:tracimpassword@127.0.0.1:5432/tracimdb?client_encoding=utf8
 
-There is an example value for MySQL below (please refer to Configuration/database schema note to install required package):
+There is an example value for MySQL below:
 
-    sqlalchemy.url = mysql+oursql://tracimuser:tracimpassword@127.0.0.1/tracimdb
+    sqlalchemy.url = mysql+pymysql://tracimuser:tracimpassword@127.0.0.1/tracimdb
 
 There is an example value for SQLite below :
 
@@ -421,8 +426,6 @@ or
 
 The last step before to run the application is to initialize the database schema. This is done through the following command:
 
-**Note**: If you want to use MySQL database, please install this pip package: ```pip install https://launchpad.net/oursql/py3k/py3k-0.9.4/+download/oursql-0.9.4.zip```
-
     cd tracim && gearbox setup-app && cd -
 
 ## Running the server ##

install/requirements.txt

@@ -40,7 +40,7 @@ python-dateutil==2.5.3
 python-editor==1.0.1
 python-ldap-test==0.2.1
 repoze.lru==0.6
-repoze.who==2.2
+repoze.who==2.3
 requests==2.10.0
 six==1.8.0
 speaklater==1.3
@@ -57,7 +57,7 @@ tw2.forms==2.2.2.1
 unicode-slugify==0.1.3
 vobject==0.9.2
 waitress==0.8.9
-who-ldap==3.1.0
+who_ldap==3.2.2
 -e git+https://github.com/algoo/wsgidav.git@py3#egg=wsgidav
 zope.interface==4.1.3
 zope.sqlalchemy==0.7.6
@@ -66,3 +66,4 @@ redis==2.10.5
 typing==3.5.3.0
 rq==0.7.1
 click==6.7
+PyMySQL==0.7.11

tracim/development.ini.base

@@ -94,7 +94,8 @@ beaker.session.validate_key = 3283411b-1904-4554-b0e1-883863b53080
 # invalidate the URI when specifying a SQLite db via path name
 # sqlalchemy.url=postgresql://username:password@hostname:port/databasename
 # sqlalchemy.url=mysql://username:password@hostname:port/databasename
-# sqlalchemy.url = postgresql://tracim_user:tracim_user_password@127.0.0.1:5432/tracim?client_encoding=utf8
+# sqlalchemy.url = postgresql://tracimuser:tracimpassword@127.0.0.1:5432/tracimdb?client_encoding=utf8
+# sqlalchemy.url = mysql+pymysql://tracimuser:tracimpassword@127.0.0.1/tracimdb
 sqlalchemy.url = <replace_database_uri_here>
 
 #echo shouldn't be used together with the logging module.

tracim/setup.py

@@ -25,6 +25,14 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
+classifiers = [
+    "License :: OSI Approved :: GNU Affero General Public License v3",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.4",
+    "Programming Language :: Python :: 3.5",
+    "Programming Language :: Python :: 3.6",
+]
+
 testpkgs=['WebTest >= 1.2.3',
                'nose',
                'coverage',
@@ -39,7 +47,7 @@ install_requires=[
     "sqlalchemy",
     "alembic",
     "repoze.who",
-    "who-ldap==3.1.0",
+    "who_ldap>=3.2.1",
     "python-ldap-test==0.2.1",
     "unicode-slugify==0.1.3",
     "pytz==2014.7",

tracim/test.ini

@@ -22,7 +22,8 @@ host = 127.0.0.1
 port = 8080
 
 [app:main]
-sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
+sqlalchemy.url = postgresql://tracimuser:tracimpassword@127.0.0.1:5432/tracimdb_test?client_encoding=utf8
+# sqlalchemy.url = mysql+pymysql://tracimuser:tracimpassword@127.0.0.1/tracimdb_test
 use = config:development.ini
 
 [app:main_without_authn]
@@ -30,7 +31,8 @@ use = main
 skip_authentication = True
 
 [app:ldap]
-sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
+sqlalchemy.url = postgresql://tracimuser:tracimpassword@127.0.0.1:5432/tracimdb_test?client_encoding=utf8
+# sqlalchemy.url = mysql+pymysql://tracimuser:tracimpassword@127.0.0.1/tracimdb_test
 auth_type = ldap
 ldap_url = ldap://localhost:3333
 ldap_base_dn = dc=directory,dc=fsf,dc=org
@@ -49,7 +51,8 @@ resetpassword.smtp_passwd =  fake
 use = config:development.ini
 
 [app:radicale]
-sqlalchemy.url =  postgresql://postgres:dummy@127.0.0.1:5432/tracim_test?client_encoding=utf8
+sqlalchemy.url = postgresql://tracimuser:tracimpassword@127.0.0.1:5432/tracimdb_test?client_encoding=utf8
+# sqlalchemy.url = mysql+pymysql://tracimuser:tracimpassword@127.0.0.1/tracimdb_test
 
 use = config:development.ini