[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-121-g105482c
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
Menu
▾
▴
[SQL-CVS] SQLObject development repository branch master updated. 3.1.0-121-g105482c
|
From: Oleg B. <no...@so...> - 2017-01-13 19:12:32
|
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 105482c683f49316620c7ff64396192c8abb3942 (commit)
via 0f4fb0fa1f774e6f2ec531c67ba4e97fb9ff6939 (commit)
via ee15cd6bd42ec42eaa0d00e1058d6ebc7dd0aafe (commit)
via ee704768917d455c0f90a763082494ad94634385 (commit)
via d0ec9104a802b6f8491b9ba3cc5813e7b81edda5 (commit)
via 966f671ec2d5f52ea98f36205476a039eafc56ea (commit)
via f1dea2688494b18b939641b4b3af2670cab88935 (commit)
via 7a8467679c84b4299b0f98961211756c8b09fc65 (commit)
via 4825b7585632b421d6b594a169387e29cff69b5a (commit)
via be944d0c2a185d49b0578bf5b86e1c2e4e5c1b0c (commit)
from 54828276f33faf5bfb476ab88435a5f797a0a870 (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/105482c683f49316620c7ff64396192c8abb3942
commit 105482c683f49316620c7ff64396192c8abb3942
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jan 13 21:53:11 2017 +0300
Update News: add appveyor for windows testing
[skip ci]
diff --git a/docs/News.rst b/docs/News.rst
index 0ec2c98..f83bee3 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -25,8 +25,7 @@ Minor features
order. pyfirebirdsql is supported but untested.
* Add ``driver`` keyword for MySQLConnection. Allowed value are 'mysqldb',
- 'connector', 'oursql' and 'pymysql'. Default is to test for mysqldb only;
- (connector, oursql and pymysql drivers still cause problems).
+ 'connector', 'oursql' and 'pymysql'. Default is to test for mysqldb only.
* Add support for `MySQL Connector
<https://pypi.python.org/pypi/mysql-connector>`_ (pure python; `binary
@@ -49,10 +48,10 @@ Drivers (work in progress)
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.
+ 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>`_ (untested).
+* Add support for `pyfirebirdsql <https://pypi.python.org/pypi/firebirdsql>`_.
Documentation
-------------
@@ -80,6 +79,9 @@ Tests
* Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
and firebirdsql). There are problems with tests.
+* Add appveyor for windows testing. Run tests with Postgres and MS SQL. There
+ are problems.
+
SQLObject 3.1.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/0f4fb0fa1f774e6f2ec531c67ba4e97fb9ff6939
commit 0f4fb0fa1f774e6f2ec531c67ba4e97fb9ff6939
Merge: 5482827 ee15cd6
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jan 13 22:49:57 2017 +0400
Merge pull request #132 from drnlm/feature/add_appveyor_for_windows_testing
Add appveyor for windows testing
http://sourceforge.net/p/sqlobject/sqlobject/ci/ee15cd6bd42ec42eaa0d00e1058d6ebc7dd0aafe
commit ee15cd6bd42ec42eaa0d00e1058d6ebc7dd0aafe
Author: Neil <drn...@gm...>
Date: Fri Jan 13 20:05:01 2017 +0200
Drop -v for pymssql. Use postgres test order so more tests are run before timeout issues kick in
diff --git a/tox.ini b/tox.ini
index 116c698..ed162c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -257,7 +257,8 @@ commands = flake8 .
commands =
-sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test"
- pytest -v --timeout=30 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql"
+ pytest --timeout=30 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql" tests include/tests inheritance/tests versioning/test
+
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[winpsycopg]
http://sourceforge.net/p/sqlobject/sqlobject/ci/ee704768917d455c0f90a763082494ad94634385
commit ee704768917d455c0f90a763082494ad94634385
Author: Neil <drn...@gm...>
Date: Fri Jan 13 19:34:56 2017 +0200
Longer timeout
diff --git a/tox.ini b/tox.ini
index f9d7460..116c698 100644
--- a/tox.ini
+++ b/tox.ini
@@ -257,7 +257,7 @@ commands = flake8 .
commands =
-sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test"
- pytest -v --timeout=10 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql"
+ pytest -v --timeout=30 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[winpsycopg]
http://sourceforge.net/p/sqlobject/sqlobject/ci/d0ec9104a802b6f8491b9ba3cc5813e7b81edda5
commit d0ec9104a802b6f8491b9ba3cc5813e7b81edda5
Author: Neil <drn...@gm...>
Date: Fri Jan 13 15:44:02 2017 +0200
Use pytest-timeout to avoid mssql tests hanging
diff --git a/tox.ini b/tox.ini
index dbd9db3..f9d7460 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,7 @@ deps =
firebirdsql: firebirdsql
postgres-pg8000: pg8000
mssql: pymssql
+ mssql: pytest-timeout
passenv = CI TRAVIS TRAVIS_* PGPASSWORD
# Don't fail or warn on uninstalled commands
whitelist_externals =
@@ -256,7 +257,7 @@ commands = flake8 .
commands =
-sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test"
- pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql" tests
+ pytest -v --timeout=10 --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[winpsycopg]
http://sourceforge.net/p/sqlobject/sqlobject/ci/966f671ec2d5f52ea98f36205476a039eafc56ea
commit 966f671ec2d5f52ea98f36205476a039eafc56ea
Author: Neil <drn...@gm...>
Date: Fri Jan 13 15:30:08 2017 +0200
reduce number of tests run for now.
Also make test failures verbose
diff --git a/tox.ini b/tox.ini
index 20bba1d..dbd9db3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -256,7 +256,7 @@ commands = flake8 .
commands =
-sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test"
- pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql"
+ pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql" tests
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[winpsycopg]
http://sourceforge.net/p/sqlobject/sqlobject/ci/f1dea2688494b18b939641b4b3af2670cab88935
commit f1dea2688494b18b939641b4b3af2670cab88935
Author: Neil <drn...@gm...>
Date: Fri Jan 13 13:18:11 2017 +0200
Trying to get ms sql tests running
diff --git a/appveyor.yml b/appveyor.yml
index cf238fc..4f017cf 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,6 @@ version: 3.2.{build}
clone_depth: 50
services:
- - mssql2014
- postgresql
environment:
@@ -60,6 +59,22 @@ install:
- "python --version"
- "pip install -r requirements.txt"
- "pip install tox"
+ # Enable TCP for mssql
+ # (from appveyor documentation)
+ - ps: |
+ [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.Smo") | Out-Null
+ [reflection.assembly]::LoadWithPartialName("Microsoft.SqlServer.SqlWmiManagement") | Out-Null
+ $serverName = $env:COMPUTERNAME
+ $instanceName = 'SQL2014'
+ $smo = 'Microsoft.SqlServer.Management.Smo.'
+ $wmi = new-object ($smo + 'Wmi.ManagedComputer')
+ $uri = "ManagedComputer[@Name='$serverName']/ServerInstance[@Name='$instanceName']/ServerProtocol[@Name='Tcp']"
+ $Tcp = $wmi.GetSmoObject($uri)
+ $Tcp.IsEnabled = $true
+ $TCP.alter()
+ Set-Service SQLBrowser -StartupType Manual
+ Start-Service SQLBrowser
+ Start-Service "MSSQL`$$instanceName"
# Not a C project, so no build step
build: false
diff --git a/tox.ini b/tox.ini
index aacbc70..20bba1d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,12 +19,12 @@ deps =
mysql-oursql: oursql
pymysql: pymysql
postgres-psycopg: psycopg2
- winpsycopg: psycopg2
postgres-pygresql: pygresql
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
whitelist_externals =
@@ -34,6 +34,7 @@ whitelist_externals =
rm
sudo
isql-fb
+ sqlcmd
# MySQL test environments
[mysqldb]
@@ -253,7 +254,10 @@ commands = flake8 .
# Windows testing
[winmssql]
commands =
- here
+ -sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
+ sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "CREATE DATABASE sqlobject_test"
+ pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql"
+ sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[winpsycopg]
commands =
http://sourceforge.net/p/sqlobject/sqlobject/ci/7a8467679c84b4299b0f98961211756c8b09fc65
commit 7a8467679c84b4299b0f98961211756c8b09fc65
Author: Neil <drn...@gm...>
Date: Fri Jan 13 12:37:10 2017 +0200
Whitelist PGPASSWORD for windows
diff --git a/appveyor.yml b/appveyor.yml
index 636a1e3..cf238fc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,7 +21,7 @@ environment:
TOX_ENV: "pywin27-mssql"
- PYTHON: "C:\\Python27"
db: postgresql
- TOX_ENV: "pywin27-postgres"
+ TOX_ENV: "pywin27-postgres-psycopg"
#- PYTHON: "C:\\Python27-x64"
# db: mssql2014
#- PYTHON: "C:\\Python27-x64"
@@ -31,7 +31,7 @@ environment:
TOX_ENV: "pywin34-mssql"
- PYTHON: "C:\\Python34"
db: postgresql
- TOX_ENV: "pywin34-postgres"
+ TOX_ENV: "pywin34-postgres-psycopg"
#- PYTHON: "C:\\Python34-x64"
# db: mssql2014
#- PYTHON: "C:\\Python34-x64"
@@ -60,8 +60,6 @@ install:
- "python --version"
- "pip install -r requirements.txt"
- "pip install tox"
- - "pip install psycopg2"
- - "echo %PGPASSWORD%"
# Not a C project, so no build step
build: false
diff --git a/tox.ini b/tox.ini
index 8d40d7b..aacbc70 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},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,pywin{27,34}-{postgres,mssql}
+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},py{27,34,35}-{firebird-fdb,firebirdsql},py{27,34}-flake8,pywin{27,34}-{postgres-psycopg,mssql}
# Base test environment settings
[testenv]
@@ -19,12 +19,13 @@ deps =
mysql-oursql: oursql
pymysql: pymysql
postgres-psycopg: psycopg2
+ winpsycopg: psycopg2
postgres-pygresql: pygresql
pypostgresql: py-postgresql
firebird-fdb: fdb
firebirdsql: firebirdsql
postgres-pg8000: pg8000
-passenv = CI TRAVIS TRAVIS_*
+passenv = CI TRAVIS TRAVIS_* PGPASSWORD
# Don't fail or warn on uninstalled commands
whitelist_externals =
mysql
@@ -33,7 +34,6 @@ whitelist_externals =
rm
sudo
isql-fb
- set
# MySQL test environments
[mysqldb]
@@ -257,20 +257,18 @@ commands =
[winpsycopg]
commands =
- set
- set PGPASSWORD="Password12!"
-dropdb -w -U postgres sqlobject_test
createdb -w -U postgres sqlobject_test
- pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=psycopg&charset=utf-8 tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=psycopg2&charset=utf-8" tests include/tests inheritance/tests versioning/test
dropdb -w -U postgres sqlobject_test
-[testenv:pywin27-postgres]
+[testenv:pywin27-postgres-psycopg]
commands = {[winpsycopg]commands}
[testenv:pywin27-mssql]
commands = {[winmssql]commands}
-[testenv:pywin34-postgres]
+[testenv:pywin34-postgres-psycopg]
commands = {[winpsycopg]commands}
[testenv:pywin34-mssql]
http://sourceforge.net/p/sqlobject/sqlobject/ci/4825b7585632b421d6b594a169387e29cff69b5a
commit 4825b7585632b421d6b594a169387e29cff69b5a
Author: Neil <drn...@gm...>
Date: Fri Jan 13 12:20:34 2017 +0200
Add -w flags so postgres password issues fail
diff --git a/appveyor.yml b/appveyor.yml
index fec1e5a..636a1e3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,8 +11,8 @@ services:
- postgresql
environment:
- PGUSER: postgres
- PGPASSWORD: Password12!
+ PGUSER: "postgres"
+ PGPASSWORD: "Password12!"
matrix:
# from https://www.appveyor.com/docs/installed-software/#python
@@ -61,6 +61,7 @@ install:
- "pip install -r requirements.txt"
- "pip install tox"
- "pip install psycopg2"
+ - "echo %PGPASSWORD%"
# Not a C project, so no build step
build: false
diff --git a/tox.ini b/tox.ini
index 1e5cb00..8d40d7b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ whitelist_externals =
rm
sudo
isql-fb
+ set
# MySQL test environments
[mysqldb]
@@ -254,14 +255,23 @@ commands = flake8 .
commands =
here
+[winpsycopg]
+commands =
+ set
+ set PGPASSWORD="Password12!"
+ -dropdb -w -U postgres sqlobject_test
+ createdb -w -U postgres sqlobject_test
+ pytest --cov=sqlobject -D postgres://postgres:@localhost/sqlobject_test?driver=psycopg&charset=utf-8 tests include/tests inheritance/tests versioning/test
+ dropdb -w -U postgres sqlobject_test
+
[testenv:pywin27-postgres]
-commands = {[psycopg]commands}
+commands = {[winpsycopg]commands}
[testenv:pywin27-mssql]
commands = {[winmssql]commands}
[testenv:pywin34-postgres]
-commands = {[psycopg]commands}
+commands = {[winpsycopg]commands}
[testenv:pywin34-mssql]
commands = {[winmssql]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/be944d0c2a185d49b0578bf5b86e1c2e4e5c1b0c
commit be944d0c2a185d49b0578bf5b86e1c2e4e5c1b0c
Author: Neil <drn...@gm...>
Date: Fri Jan 13 11:35:16 2017 +0200
Trying to make appveyor work
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..fec1e5a
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,69 @@
+# Install SQLObject on windows and test against MS SQL server and postgres
+# Heavily inspired by Oliver Grisel's appveyor-demo (https://github.com/ogrisel/python-appveyor-demo)
+# and Michael Sverdlik's appveyor-utils (https://github.com/cloudify-cosmo/appveyor-utils)
+version: 3.2.{build}
+
+# Match travis
+clone_depth: 50
+
+services:
+ - mssql2014
+ - postgresql
+
+environment:
+ PGUSER: postgres
+ PGPASSWORD: Password12!
+
+ matrix:
+ # from https://www.appveyor.com/docs/installed-software/#python
+ - PYTHON: "C:\\Python27"
+ db: mssql2014
+ TOX_ENV: "pywin27-mssql"
+ - PYTHON: "C:\\Python27"
+ db: postgresql
+ TOX_ENV: "pywin27-postgres"
+ #- PYTHON: "C:\\Python27-x64"
+ # db: mssql2014
+ #- PYTHON: "C:\\Python27-x64"
+ # db: postgresql
+ - PYTHON: "C:\\Python34"
+ db: mssql2014
+ TOX_ENV: "pywin34-mssql"
+ - PYTHON: "C:\\Python34"
+ db: postgresql
+ TOX_ENV: "pywin34-postgres"
+ #- PYTHON: "C:\\Python34-x64"
+ # db: mssql2014
+ #- PYTHON: "C:\\Python34-x64"
+ # db: postgresql
+ #- PYTHON: "C:\\Python35"
+ # db: mssql2014
+ #- PYTHON: "C:\\Python35"
+ # db: postgresql
+ #- PYTHON: "C:\\Python35-x64"
+ # db: mssql2014
+ #- PYTHON: "C:\\Python35-x64"
+ # db: postgresql
+ #- PYTHON: "C:\\Python36"
+ # db: mssql2014
+ #- PYTHON: "C:\\Python36"
+ # db: postgresql
+ #- PYTHON: "C:\\Python36-x64"
+ # db: mssql2014
+ #- PYTHON: "C:\\Python36-x64"
+ # db: postgresql
+
+
+install:
+ # Ensure we use the right python version
... 54 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|