|
From: Oleg B. <no...@so...> - 2018-02-24 16:09:03
|
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, pymssql-test has been created
at 6c1426152de1a59c335bbabb7bb5dc581ee73eca (commit)
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/6c1426152de1a59c335bbabb7bb5dc581ee73eca
commit 6c1426152de1a59c335bbabb7bb5dc581ee73eca
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 11 21:25:30 2018 +0300
CI: Run only pymssql tests
diff --git a/appveyor.yml b/appveyor.yml
index 10d67d7..9701602 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ version: '{branch}-{build}'
# Other branches can allow themselves.
branches:
only:
- - master
+ - pymssql-test
skip_branch_with_pr: false
skip_tags: true
@@ -17,15 +17,7 @@ cache:
# Match travis
clone_depth: 50
-services:
- - mysql
- - postgresql
-
environment:
- MYSQL_PWD: "Password12!"
- PGUSER: "postgres"
- PGPASSWORD: "Password12!"
-
global:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
# /E:ON and /V:ON options are not enabled in the batch script intepreter
@@ -39,107 +31,6 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: mssql2014
- - TOX_ENV: "py36-pymssql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: mssql2014
- - TOXENV: "py27-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: mysql
- - TOXENV: "py36-mysql-connector-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: mysql
- - TOXENV: "py27-pymysql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: mysql
- - TOXENV: "py36-pymysql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: mysql
- - TOXENV: "py27-mysql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: mysql
- - TOXENV: "py36-mysql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: mysql
- - TOXENV: "py27-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: postgresql
- - TOXENV: "py36-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOXENV: "py27-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOXENV: "py36-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOXENV: "py36-pypostgresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- - TOXENV: "py36-pypostgresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOXENV: "py27-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: postgresql
- - TOXENV: "py36-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOXENV: "py27-postgres-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOXENV: "py36-postgres-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOXENV: "py27-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- - TOXENV: "py36-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- - TOXENV: "py27-sqlite-memory-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- - TOXENV: "py36-sqlite-memory-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
install:
# Enable TCP for mssql
@@ -158,9 +49,6 @@ install:
Set-Service SQLBrowser -StartupType Manual
Start-Service SQLBrowser
Start-Service "MSSQL`$$instanceName"
- # List ODBC drivers
- - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name
- - ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name
# Ensure we use the right python version
- "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin;C:\\Program Files\\PostgreSQL\\9.5\\bin;%PATH%"
- "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
diff --git a/tox.ini b/tox.ini
index b3abfbd..97a5a76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -396,7 +396,8 @@ commands =
{[testenv]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&timeout=30&debug=1"
+ pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pymssql&timeout=30&debug=1" tests/test_transactions.py
+ # tests include/tests inheritance/tests versioning/test
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[testenv:py27-pymssql-w32]
http://sourceforge.net/p/sqlobject/sqlobject/ci/2a8d1f7c4686caf59fa37ef2dcb84a52ab0c9975
commit 2a8d1f7c4686caf59fa37ef2dcb84a52ab0c9975
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 11 21:23:57 2018 +0300
CI: Run pymssql tests at AppVeyor again
diff --git a/appveyor.yml b/appveyor.yml
index f5a23b2..10d67d7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,6 +33,17 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
+ # from https://www.appveyor.com/docs/installed-software/#python
+ - TOXENV: "py27-pymssql-w32"
+ PYTHON_ARCH: "32"
+ PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27"
+ db: mssql2014
+ - TOX_ENV: "py36-pymssql-w32"
+ PYTHON_ARCH: "64"
+ PYTHON_VERSION: "3.6"
+ PYTHON_HOME: "C:\\Python36-x64"
+ db: mssql2014
- TOXENV: "py27-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
@@ -131,6 +142,25 @@ environment:
PYTHON_HOME: "C:\\Python36-x64"
install:
+ # 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"
+ # List ODBC drivers
+ - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name
+ - ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name
# Ensure we use the right python version
- "SET PATH=%PYTHON_HOME%;%PYTHON_HOME%\\Scripts;C:\\Program Files\\MySQL\\MySQL Server 5.7\\bin;C:\\Program Files\\PostgreSQL\\9.5\\bin;%PATH%"
- "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
@@ -138,9 +168,6 @@ install:
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
- "pip --version"
- "pip install --upgrade pip setuptools tox ppu"
- # List ODBC drivers
- - ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name
- - ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name
# Not a C project, so no build step
build: false
diff --git a/docs/News.rst b/docs/News.rst
index 35c78f1..bfe9cd1 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -44,6 +44,11 @@ Build
* Use ``python_requires`` keyword in ``setup.py``.
+CI
+--
+
+* Run pymssql tests at AppVeyor again.
+
SQLObject 3.5.0
===============
diff --git a/tox.ini b/tox.ini
index c902edb..b3abfbd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,6 +31,7 @@ deps =
pypyodbc: pypyodbc
firebird-fdb: fdb
firebirdsql: firebirdsql
+ pymssql: pymssql
passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB PGPASSWORD WINDIR
# Don't fail or warn on uninstalled commands
platform = linux
@@ -389,6 +390,31 @@ commands =
flake8 .
# Windows testing
+[pymssql-w32]
+platform = win32
+commands =
+ {[testenv]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&timeout=30&debug=1"
+ sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
+
+[testenv:py27-pymssql-w32]
+platform = win32
+commands = {[pymssql-w32]commands}
+
+[testenv:py34-pymssql-w32]
+platform = win32
+commands = {[pymssql-w32]commands}
+
+[testenv:py35-pymssql-w32]
+platform = win32
+commands = {[pymssql-w32]commands}
+
+[testenv:py36-pymssql-w32]
+platform = win32
+commands = {[pymssql-w32]commands}
+
[mssql-pyodbc-w32]
platform = win32
commands =
-----------------------------------------------------------------------
hooks/post-receive
--
SQLObject development repository
|
