|
From: Oleg B. <no...@so...> - 2017-02-08 22:10:52
|
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 b06003c4189912aae186244e90ed950cc641f19d (commit)
via aca6f12710642610c0711e5446efb21a6df09f3c (commit)
from 11c9d096545979fdca49bb20dd7e12bb8f295b13 (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/b06003c4189912aae186244e90ed950cc641f19d
commit b06003c4189912aae186244e90ed950cc641f19d
Author: Oleg Broytman <ph...@ph...>
Date: Wed Feb 8 22:56:23 2017 +0300
Start and configure Firebird server only in *firebird* environments
diff --git a/.travis.yml b/.travis.yml
index 315b73c..cb55d65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,13 +15,22 @@ addons:
- firebird2.5-super
postgresql: "9.4"
-# Start the firebird database server
-# We use firebird-super, so there's none of the inetd configuration required by firebird-classic
-# We also create a test user for the firebird test and create a script that can be fed into isql-fb to create the test database
before_install:
- - sudo sed -i /etc/default/firebird2.5 -e 's/=no/=yes/' && sudo /etc/init.d/firebird2.5-super start
- - sudo touch /var/lib/firebird/create_test_db && sudo chmod 666 /var/lib/firebird/create_test_db && echo "CREATE DATABASE 'localhost:/tmp/test.fdb';" > /var/lib/firebird/create_test_db && sudo chmod 644 /var/lib/firebird/create_test_db
- - sudo gsec -user sysdba -pass masterkey -add test -pw test
+ # Start the firebird database server.
+ # We use firebird-super, so there's none of the inetd configuration
+ # required by firebird-classic.
+ # We also create a test user for the firebird test and
+ # create a script that can be fed into isql-fb
+ # to create the test database.
+ - if [[ $TOXENV = *firebird* ]]; then
+ sudo sed -i /etc/default/firebird2.5 -e 's/=no/=yes/' &&
+ sudo /etc/init.d/firebird2.5-super start &&
+ sudo touch /var/lib/firebird/create_test_db &&
+ sudo chmod 666 /var/lib/firebird/create_test_db &&
+ echo "CREATE DATABASE 'localhost:/tmp/test.fdb';" > /var/lib/firebird/create_test_db &&
+ sudo chmod 644 /var/lib/firebird/create_test_db &&
+ sudo gsec -user sysdba -pass masterkey -add test -pw test;
+ fi
env:
- TOXENV=py26-mysqldb
http://sourceforge.net/p/sqlobject/sqlobject/ci/aca6f12710642610c0711e5446efb21a6df09f3c
commit aca6f12710642610c0711e5446efb21a6df09f3c
Author: Oleg Broytman <ph...@ph...>
Date: Wed Feb 8 21:51:06 2017 +0300
Remove pg8000 driver
There are major problems with the driver. We can reconsider it
if our pull requests will be accepted.
diff --git a/.travis.yml b/.travis.yml
index 0f83b96..315b73c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,10 +48,6 @@ env:
- TOXENV=py35-postgres-pygresql
- TOXENV=py34-pypostgresql
- TOXENV=py35-pypostgresql
- - TOXENV=py26-postgres-pg8000
- - TOXENV=py27-postgres-pg8000
- - TOXENV=py34-postgres-pg8000
- - TOXENV=py35-postgres-pg8000
- TOXENV=py26-sqlite
- TOXENV=py27-sqlite
- TOXENV=py34-sqlite
@@ -79,10 +75,6 @@ matrix:
- env: TOXENV=py35-postgres-pygresql
- env: TOXENV=py34-pypostgresql
- env: TOXENV=py35-pypostgresql
- - env: TOXENV=py26-postgres-pg8000
- - env: TOXENV=py27-postgres-pg8000
- - env: TOXENV=py34-postgres-pg8000
- - env: TOXENV=py35-postgres-pg8000
- env: TOXENV=py27-firebird-fdb
- env: TOXENV=py34-firebird-fdb
- env: TOXENV=py35-firebird-fdb
diff --git a/docs/News.rst b/docs/News.rst
index 534171b..b27c6dc 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -53,10 +53,6 @@ Drivers (work in progress)
<https://pypi.python.org/pypi/py-postgresql>`_ PostgreSQL driver. There
are still problems with the driver.
-* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver. There are major problems with the driver caused by both
- the driver and SQLObject.
-
* Add support for `pyfirebirdsql
<https://pypi.python.org/pypi/firebirdsql>`_.There are still problems with
the driver.
diff --git a/docs/SQLObject.rst b/docs/SQLObject.rst
index 783060b..be704c2 100644
--- a/docs/SQLObject.rst
+++ b/docs/SQLObject.rst
@@ -48,8 +48,8 @@ Requirements
Currently SQLObject supports MySQL_ via MySQLdb_ aka MySQL-python (called
mysqlclient_ for Python 3), `MySQL Connector`_, oursql_ and PyMySQL_. For
-PostgreSQL_ psycopg2_ or psycopg1 are recommended; PyGreSQL_, py-postgresql_
-and pg8000_ are supported but have problems (not all tests passed). SQLite_ has
+PostgreSQL_ psycopg2_ or psycopg1 are recommended; PyGreSQL_ and py-postgresql_
+are supported but have problems (not all tests passed). SQLite_ has
a built-in driver or PySQLite_. Firebird_ is supported via fdb_ or
kinterbasdb_; pyfirebirdsql_ is supported but has problems. `MAX DB`_ (also
known as SAP DB) is supported via sapdb_. Sybase via Sybase_. `MSSQL Server`_
@@ -65,7 +65,6 @@ via pymssql_ (+ FreeTDS_) or adodbapi_ (Win32).
.. _psycopg2: http://initd.org/psycopg/
.. _PyGreSQL: http://www.pygresql.org/
.. _py-postgresql: https://pypi.python.org/pypi/py-postgresql
-.. _pg8000: https://pypi.python.org/pypi/pg8000
.. _SQLite: https://sqlite.org/
.. _PySQLite: https://github.com/ghaering/pysqlite
.. _Firebird: http://www.firebirdsql.org/en/python-driver/
@@ -1830,8 +1829,8 @@ PostgresConnection supports transactions and all other features.
The user can choose a DB API driver for PostgreSQL by using a ``driver``
parameter in DB URI or PostgresConnection that can be a comma-separated
list of driver names. Possible drivers are: ``psycopg2``, psycopg1,
-``psycopg`` (tries psycopg2 and psycopg1), ``pygresql``, ``pygresql``,
-``pg8000`` or ``pypostgresql``. Default is ``psycopg``.
+``psycopg`` (tries psycopg2 and psycopg1), ``pygresql``, ``pygresql``
+or ``pypostgresql``. Default is ``psycopg``.
Connection-specific parameters are: ``sslmode``, ``unicodeCols``,
``schema``, ``charset``.
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index 5fb9f99..5920cd5 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -1,6 +1,4 @@
-from getpass import getuser
import re
-import sys
from sqlobject import col
from sqlobject import dberrors
from sqlobject import sqlbuilder
@@ -55,14 +53,11 @@ class PostgresConnection(DBAPI):
elif driver in ('py-postgresql', 'pypostgresql'):
from postgresql.driver import dbapi20
self.module = dbapi20
- elif driver == 'pg8000':
- import pg8000
- self.module = pg8000
else:
raise ValueError(
'Unknown PostgreSQL driver "%s", '
'expected psycopg2, psycopg1, '
- 'pygresql, pg8000 or pypostgresql' % driver)
+ 'pygresql or pypostgresql' % driver)
except ImportError:
pass
else:
@@ -142,12 +137,6 @@ class PostgresConnection(DBAPI):
else:
if "unix" in dsn_dict:
del dsn_dict["unix"]
- if driver == 'pg8000':
- if host and host.startswith('/'):
- dsn_dict["host"] = None
- dsn_dict["unix_sock"] = host
- if user is None:
- dsn_dict["user"] = getuser()
self.driver = driver
self.dsn = dsn
self.unicodeCols = kw.pop('unicodeCols', False)
@@ -183,11 +172,6 @@ class PostgresConnection(DBAPI):
raise dberrors.OperationalError(
ErrorMessage(e, "used connection string %r" % self.dsn))
- if self.driver == 'pg8000' and \
- 'sqlobject.tests.dbtest' in sys.modules and \
- hasattr(conn, 'set_cache_size'):
- conn.set_cache_size(1000) # rows
-
# For printDebug in _executeRetry
self._connectionNumbers[id(conn)] = self._connectionCount
diff --git a/tox.ini b/tox.ini
index cf0066a..96f4fcd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 1.8
-envlist = py{26,27}-{mysqldb,mysql-oursql},py{34,35}-{mysqlclient,pypostgresql},py{26,27,34,35}-{mysql-connector,pymysql,postgres-psycopg,postgres-pygresql,postgres-pg8000,sqlite,sqlite-memory},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,pywin{27,34}-{mssql,postgres-psycopg,sqlite,sqlite-memory}
+envlist = py{26,27}-{mysqldb,mysql-oursql},py{34,35}-{mysqlclient,pypostgresql},py{26,27,34,35}-{mysql-connector,pymysql,postgres-psycopg,postgres-pygresql,sqlite,sqlite-memory},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,pywin{27,34}-{mssql,postgres-psycopg,sqlite,sqlite-memory}
# Base test environment settings
[testenv]
@@ -23,7 +23,6 @@ deps =
pypostgresql: py-postgresql
firebird-fdb: fdb
firebirdsql: firebirdsql
- postgres-pg8000: pg8000
mssql: pymssql
passenv = CI TRAVIS TRAVIS_* PGPASSWORD
# Don't fail or warn on uninstalled commands
@@ -166,25 +165,6 @@ commands = {[pypostgresql]commands}
[testenv:py35-pypostgresql]
commands = {[pypostgresql]commands}
-[pg8000]
-commands =
- -dropdb -U postgres sqlobject_test
- createdb -U postgres sqlobject_test
- pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=pg8000&charset=utf-8&debug=1 tests include/tests inheritance/tests versioning/test
- dropdb -U postgres sqlobject_test
-
-[testenv:py26-postgres-pg8000]
-commands = {[pg8000]commands}
-
-[testenv:py27-postgres-pg8000]
-commands = {[pg8000]commands}
-
-[testenv:py34-postgres-pg8000]
-commands = {[pg8000]commands}
-
-[testenv:py35-postgres-pg8000]
-commands = {[pg8000]commands}
-
# SQLite test environments
[sqlite]
commands =
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 29 +++++++++++++++--------------
docs/News.rst | 4 ----
docs/SQLObject.rst | 9 ++++-----
sqlobject/postgres/pgconnection.py | 18 +-----------------
tox.ini | 22 +---------------------
5 files changed, 21 insertions(+), 61 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
