[SQL-CVS] SQLObject development repository branch master updated. 2.0.0a2-7-gbcb6971

[Oleg B. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".

The branch, master has been updated
       via  bcb697182fb07f7ac59b473553ff7818db96b923 (commit)
       via  0c21ff40f0a9eac3ab0058b0c02f90a5012fcc31 (commit)
       via  6fe93344f9ffb7c190ab3dab472079c6aa5d0c73 (commit)
       via  47b2e40b9c90067324843310ff5a1b7fa5ff0ab3 (commit)
      from  faba9cac121d78779c437f226642c1f72c026c43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/bcb697182fb07f7ac59b473553ff7818db96b923

commit bcb697182fb07f7ac59b473553ff7818db96b923
Merge: 6fe9334 0c21ff4
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 4 18:03:35 2014 +0300

    Merge branch '1.7'


http://sourceforge.net/p/sqlobject/sqlobject/ci/6fe93344f9ffb7c190ab3dab472079c6aa5d0c73

commit 6fe93344f9ffb7c190ab3dab472079c6aa5d0c73
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 4 17:51:54 2014 +0300

    Install itself into site-packages (requires by conftest.py)

diff --git a/.travis.yml b/.travis.yml
index daef19f..58facf8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ install:
   - if [[ $DB == mysql ]]; then pip install --use-mirrors mysql-python; fi;
   - if [[ $DB == postgres ]]; then pip install --use-mirrors psycopg2; fi;
   - pip install --use-mirrors pytest 'FormEncode>=1.1.1'
+  - pip install .
 
 before_script:
   - if [[ $DB == mysql ]]; then mysql -e 'create database sqlobject_test;'; fi;

http://sourceforge.net/p/sqlobject/sqlobject/ci/47b2e40b9c90067324843310ff5a1b7fa5ff0ab3

commit 47b2e40b9c90067324843310ff5a1b7fa5ff0ab3
Author: Oleg Broytman <ph...@ph...>
Date:   Thu Dec 4 17:42:44 2014 +0300

    Install FormEncode

diff --git a/.travis.yml b/.travis.yml
index 979db91..daef19f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ env:
 install:
   - if [[ $DB == mysql ]]; then pip install --use-mirrors mysql-python; fi;
   - if [[ $DB == postgres ]]; then pip install --use-mirrors psycopg2; fi;
-  - pip install --use-mirrors pytest
+  - pip install --use-mirrors pytest 'FormEncode>=1.1.1'
 
 before_script:
   - if [[ $DB == mysql ]]; then mysql -e 'create database sqlobject_test;'; fi;

-----------------------------------------------------------------------

Summary of changes:
 .travis.yml |    3 +-
 ez_setup.py |  216 ++++++++++++++++++++++++++++++++++-------------------------
 2 files changed, 126 insertions(+), 93 deletions(-)


hooks/post-receive
-- 
SQLObject development repository