sqlobject-cvs Mailing List for SQLObject (Page 5)
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
Menu
▾
▴
sqlobject-cvs — CVS notification
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(9) |
Apr
(74) |
May
(29) |
Jun
(16) |
Jul
(28) |
Aug
(10) |
Sep
(57) |
Oct
(9) |
Nov
(29) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(7) |
Feb
(14) |
Mar
(6) |
Apr
(3) |
May
(12) |
Jun
(34) |
Jul
(9) |
Aug
(29) |
Sep
(22) |
Oct
(2) |
Nov
(15) |
Dec
(52) |
| 2005 |
Jan
(47) |
Feb
(78) |
Mar
(14) |
Apr
(35) |
May
(33) |
Jun
(16) |
Jul
(26) |
Aug
(63) |
Sep
(40) |
Oct
(96) |
Nov
(96) |
Dec
(123) |
| 2006 |
Jan
(159) |
Feb
(144) |
Mar
(64) |
Apr
(31) |
May
(88) |
Jun
(48) |
Jul
(16) |
Aug
(64) |
Sep
(87) |
Oct
(92) |
Nov
(56) |
Dec
(76) |
| 2007 |
Jan
(94) |
Feb
(103) |
Mar
(126) |
Apr
(123) |
May
(85) |
Jun
(11) |
Jul
(130) |
Aug
(47) |
Sep
(65) |
Oct
(70) |
Nov
(12) |
Dec
(11) |
| 2008 |
Jan
(30) |
Feb
(55) |
Mar
(88) |
Apr
(20) |
May
(50) |
Jun
|
Jul
(38) |
Aug
(1) |
Sep
(9) |
Oct
(5) |
Nov
(6) |
Dec
(39) |
| 2009 |
Jan
(8) |
Feb
(16) |
Mar
(3) |
Apr
(33) |
May
(44) |
Jun
(1) |
Jul
(10) |
Aug
(33) |
Sep
(74) |
Oct
(22) |
Nov
|
Dec
(15) |
| 2010 |
Jan
(28) |
Feb
(22) |
Mar
(46) |
Apr
(29) |
May
(1) |
Jun
(1) |
Jul
(27) |
Aug
(8) |
Sep
(5) |
Oct
(33) |
Nov
(24) |
Dec
(41) |
| 2011 |
Jan
(4) |
Feb
(12) |
Mar
(35) |
Apr
(29) |
May
(19) |
Jun
(16) |
Jul
(32) |
Aug
(25) |
Sep
(5) |
Oct
(11) |
Nov
(21) |
Dec
(12) |
| 2012 |
Jan
(3) |
Feb
(4) |
Mar
(20) |
Apr
(4) |
May
(25) |
Jun
(13) |
Jul
|
Aug
|
Sep
(2) |
Oct
(25) |
Nov
(9) |
Dec
(1) |
| 2013 |
Jan
(6) |
Feb
(8) |
Mar
|
Apr
(10) |
May
(31) |
Jun
(7) |
Jul
(18) |
Aug
(33) |
Sep
(4) |
Oct
(16) |
Nov
|
Dec
(27) |
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
(11) |
May
(39) |
Jun
(8) |
Jul
(11) |
Aug
(4) |
Sep
|
Oct
(27) |
Nov
|
Dec
(71) |
| 2015 |
Jan
(17) |
Feb
(47) |
Mar
(33) |
Apr
|
May
|
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(8) |
| 2016 |
Jan
(4) |
Feb
(4) |
Mar
|
Apr
|
May
(12) |
Jun
(7) |
Jul
(9) |
Aug
(31) |
Sep
(8) |
Oct
(3) |
Nov
(15) |
Dec
(1) |
| 2017 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(8) |
May
(10) |
Jun
(4) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
(8) |
Nov
(4) |
Dec
(5) |
| 2018 |
Jan
(2) |
Feb
(8) |
Mar
|
Apr
(4) |
May
|
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2019 |
Jan
(1) |
Feb
(16) |
Mar
(1) |
Apr
(3) |
May
(5) |
Jun
(1) |
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(2) |
Nov
|
Dec
(2) |
| 2021 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(1) |
Nov
(1) |
Dec
(4) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(3) |
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
|
| 2024 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(9) |
| 2025 |
Jan
|
Feb
(4) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Oleg B. <no...@so...> - 2018-02-24 16:09:08
|
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 annotated tag, 3.6.0 has been created
at 36ef158976a6feceaad5c1adb6703c4cccbfb055 (tag)
tagging 0fd1c2134fe29a0bb0f55798702083bb0d61ca05 (commit)
replaces 3.5.0
tagged by Oleg Broytman
on Sat Feb 24 19:01:22 2018 +0300
- Log -----------------------------------------------------------------
Release 3.6.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCgAGBQJakYxSAAoJEG4IC3C2KHsDHG4P/iLYgZJuKKfVCFtx6ihF32H0
bEGjrMy/aLUQaZmahsNwo2kj4xzKGSVGBwMWBDwTa5L+qcvSzzLHTgX4dF/wRmIR
Y7OrAJk2Wtlw3kNMEizZVyeFxvSnPolxzibUUNbu6xq6HpRqdksPWP+mrT3BnQSO
EllNEwvb4cPAuacKpAD0h1h9pNRrDUGKrunyFgJ/XYweimIhElMqjEhar6ttsSev
LT141R6SEadaC/sHsiepkNALbegQFUyu7ZULw+eMGk/PHV0HzYBQVK9mTLU+JIZQ
hewq9egXo9kHzRS/ag+hRSszV8Jd+dFFY3u9WHWGfsJ2zJxQmjc1ofKeKqDvVyDl
YTikolSqLu0jJfu/scHMZIgAf/fDioH9N7rAxWkJbJEzg+goTd9/37djDgSLNSVd
OE+idcJm+t6hFjb3B/DROnRKq4pq1aRPNK2yndCkFmdZyqO25nbAuqP0YpbeZJ7P
k9ATi16yH2ZmKloazFGLeFYcvu9BkML4+cHT6sxRCD8qvdR5NVgR2V0GV3fBKzRD
zmO5VEuwRFhXuTqYv7K4esTwx1lEPZ7Kr3k4lKdnCMNj6W0j6Svj+lSD8+Id4WHd
2VhQETdPblOhpwKmnJl/8BiLgqjejWlWw+hRxPg8Zl4LrnsWnnAvL3Vjc1V1CkaO
/q9H8GxRAjRQt0IT8eon
=YCb6
-----END PGP SIGNATURE-----
Michael S. Root (2):
Bugfix for TypeError using selectBy on a BLOBCol
Added test for 2a1839364d1a3b4ba260ede53886526ee8cd4860
Oleg Broytman (34):
Prepare for the next release
Docs(RELEASE-CHECKLIST): Reorder some items
Build(setup.py): Use python_version environment marker
Build(setup.py): Use python_requires keyword
CI: Upgrade pip and setuptools
CI: Rename TOX_ENV -> TOXENV; execute tox (no need to pass TOXENV)
Docs: odbc drivers are only implemented for MySQL, Pg and MSSQL
Docs: Document extras that are available for installation
Docs: Regenerate API docs
Docs: Add docs/api/sqlobject.tests.test_csvimport.rst
Docs: Remove unused start label
CI: Run tests at AppVeyor with Python 2.7 32bit and 3.6 64bit
Build: -O2
Build: Require tox >= 2.0 (for passenv)
Tests: rm -f sqlobject_test.sqdb
Tests(tox.ini): Set platform
Docs: Update TODO
Tests(tox): Shorten default list of environments
Tests(tox): Fix pypyodbc driver's name
Fix(oursql): Extend support for Python 3
Docs: Fix subsection header
Fix(mysql): Fix oursql
CI: Fix AppVeyor config: ODBC dirver for MySQL is 64 bit
CI: Run PyMySQL tests at AppVeyor
Build: Use module returned by imp.load_source() directly
Feat: Close cursors after using
Fix(mssqlconnection): Fix _setAutoCommit
Fix cursor.arraysize - pymssql doesn't have arraysize
Feat(mssql): Set timeout for ODBC with MSSQL
Tests(blob): Use byte string for test
Docs: Update News
Build: Document changing Python version at SF
Build: Edit build-all-docs during release process
Release 3.6.0
-----------------------------------------------------------------------
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-02-24 16:09:05
|
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, pyodbc-test has been created
at 3c9b40300d36388a83f1c66e88f752a729c65e32 (commit)
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/3c9b40300d36388a83f1c66e88f752a729c65e32
commit 3c9b40300d36388a83f1c66e88f752a729c65e32
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 17 23:53:32 2018 +0300
CI: Run only 1 MSSQL test at AppVeyor
diff --git a/appveyor.yml b/appveyor.yml
index 9045205..286e50f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ version: '{branch}-{build}'
# Other branches can allow themselves.
branches:
only:
- - master
+ - pyodbc-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
@@ -38,107 +30,6 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: mssql2014
- - TOXENV: "py34-mssql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-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:
# Ensure we use the right python version
diff --git a/tox.ini b/tox.ini
index c902edb..572a3e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -395,7 +395,7 @@ commands =
{envpython} -c "import pyodbc; print(pyodbc.drivers())"
-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=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1"
+ pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1" tests/test_transactions.py
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[testenv:py27-mssql-pyodbc-w32]
http://sourceforge.net/p/sqlobject/sqlobject/ci/93a46697f1f4d56e81622f0bbb9ec1fb75d63b99
commit 93a46697f1f4d56e81622f0bbb9ec1fb75d63b99
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 17 23:50:55 2018 +0300
CI: Run MSSQL tests again
This reverts commit 6b80a2d7bc86f07314fbe666abbed49b777056e2.
diff --git a/appveyor.yml b/appveyor.yml
index f5a23b2..9045205 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,6 +33,16 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
+ - TOXENV: "py27-mssql-pyodbc-w32"
+ PYTHON_ARCH: "32"
+ PYTHON_VERSION: "2.7"
+ PYTHON_HOME: "C:\\Python27"
+ db: mssql2014
+ - TOXENV: "py34-mssql-pyodbc-w32"
+ PYTHON_ARCH: "64"
+ PYTHON_VERSION: "3.4"
+ PYTHON_HOME: "C:\\Python34-x64"
+ db: mssql2014
- TOXENV: "py27-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
@@ -141,6 +151,21 @@ install:
# List ODBC drivers
- ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name
- ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name
+ # Enable TCP for mssql
+ - 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
-----------------------------------------------------------------------
hooks/post-receive
--
SQLObject development repository
|
|
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
|
|
From: Oleg B. <no...@so...> - 2018-02-24 16:09:01
|
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 0fd1c2134fe29a0bb0f55798702083bb0d61ca05 (commit)
via 91b21bf69f10e15bbdd0cb6c10aa988868c974bf (commit)
via d3495297930135d1aeb183144abd01e8aad1cd2a (commit)
from 0ff26ed5b30d7834e310d3c8adbf91f17c23323d (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/0fd1c2134fe29a0bb0f55798702083bb0d61ca05
commit 0fd1c2134fe29a0bb0f55798702083bb0d61ca05
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 24 18:50:36 2018 +0300
Release 3.6.0
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 2f45be4..3aca1fb 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,28 +1,49 @@
Hello!
-I'm pleased to announce version 3.6.1a1, the first alpha of the upcoming
-release of branch 3.6 of SQLObject.
+I'm pleased to announce version 3.6.0, the first stable release of branch
+3.6 of SQLObject.
-I'm pleased to announce version 3.6.1a2, the second alpha of the upcoming
-release of branch 3.6 of SQLObject.
-I'm pleased to announce version 3.6.1b1, the first beta of the upcoming
-release of branch 3.6 of SQLObject.
+What's new in SQLObject
+=======================
-I'm pleased to announce version 3.6.1rc1, the first release candidate
-of the upcoming release of branch 3.6 of SQLObject.
+Contributor for this release is Michael S. Root.
-I'm pleased to announce version 3.6.0, the first stable release of branch
-3.6 of SQLObject.
+Minor features
+--------------
-I'm pleased to announce version 3.6.1, the first bugfix release of branch
-3.6 of SQLObject.
+* Close cursors after using to free resources immediately
+ instead of waiting for gc.
+Bug fixes
+---------
-What's new in SQLObject
-=======================
+* Fix for TypeError using selectBy on a BLOBCol. PR by Michael S. Root.
+
+Drivers
+-------
+
+* Extend support for oursql and Python 3 (requires our fork of the driver).
+
+* Fix cursor.arraysize - pymssql doesn't have arraysize.
+
+* Set timeout for ODBC with MSSQL.
+
+* Fix _setAutoCommit for MSSQL.
+
+Documentation
+-------------
+
+* Document extras that are available for installation.
+
+Build
+-----
+
+* Use ``python_version`` environment marker in ``setup.py`` to make
+ ``install_requires`` and ``extras_require`` declarative. This makes
+ the universal wheel truly universal.
-Contributors for this release are
+* Use ``python_requires`` keyword in ``setup.py``.
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -54,7 +75,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.python.org/pypi/SQLObject/3.6.0a0.dev20171115
+https://pypi.python.org/pypi/SQLObject/3.6.0
News and changes:
http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index d32d412..66165d1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-SQLObject 3.5.0
+SQLObject 3.6.0
===============
Thanks for looking at SQLObject. SQLObject is an object-relational
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index 5fd0c94..3eb17ed 100755
--- a/devscripts/build-all-docs
+++ b/devscripts/build-all-docs
@@ -11,7 +11,7 @@ cd "$PROG_DIR" &&
PROG_DIR="`pwd`" &&
cd "$PROG_DIR"/SQLObject &&
-build_docs 3.5.0 &&
+build_docs 3.6.0 &&
build_docs master devel &&
rm -rf docs/html &&
diff --git a/docs/News.rst b/docs/News.rst
index 35c78f1..66ef00e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,8 +5,10 @@ News
.. contents:: Contents:
:backlinks: none
-SQLObject 3.6.0 (master)
-========================
+SQLObject 3.6.0
+===============
+
+Released 24 Feb 2018.
Minor features
--------------
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index 88c8ca0..5d92a17 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,7 +1,7 @@
-version = '3.5.0'
+version = '3.6.0'
major = 3
-minor = 5
+minor = 6
micro = 0
release_level = 'final'
serial = 0
http://sourceforge.net/p/sqlobject/sqlobject/ci/91b21bf69f10e15bbdd0cb6c10aa988868c974bf
commit 91b21bf69f10e15bbdd0cb6c10aa988868c974bf
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 24 18:59:03 2018 +0300
Build: Edit build-all-docs during release process
[skip ci]
diff --git a/devscripts/RELEASE-CHECKLIST b/devscripts/RELEASE-CHECKLIST
index c160777..205f973 100644
--- a/devscripts/RELEASE-CHECKLIST
+++ b/devscripts/RELEASE-CHECKLIST
@@ -4,51 +4,53 @@
1. Check out the release branch. If it is a stable release - edit
docs/News.rst to set release date. Commit.
-2. If it's the first stable release of the branch - edit build-all-docs,
+2. If release branch is not master - run ../prerelease $NEW_TAG; if it's
+ master - run ../prerelease $NEW_TAG master.
+
+ The script checks out the release branch and calls editor; update
+ version, the list of contributors, the list of changes and download
+ URL in ANNOUNCE.rst; edit __version__.py and README.rst in the release
+ branch - fix versions. Edit section [egg_info] in setup.cfg - set if
+ it is a stable or development release. In setup.py edit "Development
+ Status" in trove classifiers; edit download URL: if a non-stable
+ version - append 'dev' and date stamp, for a stable version remove
+ 'dev' and date stamp).
+
+ If it's the first stable release of the branch - edit build-all-docs,
advance stable branch. Commit. If it's not master - merge to all higher
branches and master.
-3. If release branch is not master - run ../prerelease $NEW_TAG; if it's
- master - run ../prerelease $NEW_TAG master.
-
-3a. The script checks out the release branch and calls editor; update
- version, the list of contributors, the list of changes and download
- URL in ANNOUNCE.rst; edit __version__.py and README.rst in the release
- branch - fix versions. Edit section [egg_info] in setup.cfg - set if
- it is a stable or development release. In setup.py edit "Development
- Status" in trove classifiers; edit download URL: if a non-stable
- version - append 'dev' and date stamp, for a stable version remove
- 'dev' and date stamp). Commit. Verify.
+ Commit. Verify.
-4. If it's not master - null-merge to the next higher branch.
+3. If it's not master - null-merge to the next higher branch.
-5. If release branch is not master - run ../prerelease-tag $NEW_TAG; if
+4. If release branch is not master - run ../prerelease-tag $NEW_TAG; if
it's master - run ../prerelease-tag $NEW_TAG master. This checks out
the release branch and creates the new tag at the head of the release
branch.
-6. Run ../release. This generates and uploads new archives to PyPI and
+5. Run ../release. This generates and uploads new archives to PyPI and
if it is a stable release - uploads archives and release announcement
(ANNOUNCE.rst) to SourceForge.
-7. Hide/show old releases at PyPI and SourceForge.
+6. Hide/show old releases at PyPI and SourceForge.
-8. Run ../push-all in the development repository to push all branches
+7. Run ../push-all in the development repository to push all branches
and tags to the public repositories.
-9. Run ../postrelease. The script restores ANNOUNCE.rst from the previous
+8. Run ../postrelease. The script restores ANNOUNCE.rst from the previous
commit (HEAD~). It calls editor; update next version, remove the list
of contributors and the list of changes, edit download URL in
ANNOUNCE.rst. Edit docs/News.rst - add new version.
-10. Generate new docs using ./build-all-docs. Upload docs using
- ./publish-docs.
+9. Generate new docs using ./build-all-docs. Upload docs using
+ ./publish-docs.
-11. Send announcement to the SQLObject mailing list. For a stable
+10. Send announcement to the SQLObject mailing list. For a stable
release send announcements to python, python-announce and python-db
mailing lists.
-11. Announce new release(s) at Twitter (https://twitter.com/SQLObject) and
+10. Announce new release(s) at Twitter (https://twitter.com/SQLObject) and
Wikipedia (https://en.wikipedia.org/wiki/SQLObject). If it is a stable
release - announce it at
https://en.wikipedia.org/wiki/Comparison_of_object-relational_mapping_software.
diff --git a/devscripts/prerelease b/devscripts/prerelease
index 17ed890..edd7358 100755
--- a/devscripts/prerelease
+++ b/devscripts/prerelease
@@ -22,5 +22,5 @@ micro = $micro
release_level = '$state'
serial = $serial
version_info = (major, minor, micro, release_level, serial)" > sqlobject/__version__.py &&
-`git var GIT_EDITOR` ANNOUNCE.rst docs/News.rst sqlobject/__version__.py README.rst setup.cfg setup.py &&
-exec git commit --message="Release $tag" ANNOUNCE.rst docs/News.rst sqlobject/__version__.py README.rst setup.cfg setup.py
+`git var GIT_EDITOR` devscripts/build-all-docs docs/News.rst ANNOUNCE.rst sqlobject/__version__.py README.rst setup.cfg setup.py &&
+exec git commit --message="Release $tag" devscripts/build-all-docs docs/News.rst ANNOUNCE.rst sqlobject/__version__.py README.rst setup.cfg setup.py
http://sourceforge.net/p/sqlobject/sqlobject/ci/d3495297930135d1aeb183144abd01e8aad1cd2a
commit d3495297930135d1aeb183144abd01e8aad1cd2a
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 24 18:41:06 2018 +0300
Build: Document changing Python version at SF
[skip ci]
diff --git a/devscripts/BRANCH-CHECKLIST b/devscripts/BRANCH-CHECKLIST
index 2b51cb0..280f494 100644
--- a/devscripts/BRANCH-CHECKLIST
+++ b/devscripts/BRANCH-CHECKLIST
@@ -21,7 +21,7 @@ a branch, a commit id or a tag.
2. To deprecate a version of Python edit files ANNOUNCE.rst, README.rst,
devscripts/release, devscripts/setup, docs/News.rst, docs/SQLObject.rst,
docs/TODO.rst, requirements.txt, setup.py, sqlobject/main.py,
- tox.ini in master.
+ tox.ini in master. Edit metadata at SourceForge.
3. Do a null-merge from the new branch to the higher branch or the
master.
-----------------------------------------------------------------------
Summary of changes:
ANNOUNCE.rst | 53 +++++++++++++++++++++++++++++++-------------
README.rst | 2 +-
devscripts/BRANCH-CHECKLIST | 2 +-
devscripts/RELEASE-CHECKLIST | 46 ++++++++++++++++++++------------------
devscripts/build-all-docs | 2 +-
devscripts/prerelease | 4 ++--
docs/News.rst | 6 +++--
sqlobject/__version__.py | 4 ++--
8 files changed, 72 insertions(+), 47 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-02-23 08:26:11
|
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 0ff26ed5b30d7834e310d3c8adbf91f17c23323d (commit)
via 2a7d28573d1e4f07250da1d30209304fdb6de90d (commit)
via 38a83488fc97663409afdceb51d0ccecf6f22ebd (commit)
via 4ec83426e3c13505026f411cfcccbf0d82cdb3c5 (commit)
via 2a1839364d1a3b4ba260ede53886526ee8cd4860 (commit)
via f08401c205e30d8c8eb70978f850577cff8598a9 (commit)
via 96a66ecdfa7cdc630de0ad057ce7d3a33e401c2a (commit)
via d86fbb9597160f3495566dd28a5dd291d445525f (commit)
from bc58c615babc7a170989e074a6af956e67fe0f1b (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/0ff26ed5b30d7834e310d3c8adbf91f17c23323d
commit 0ff26ed5b30d7834e310d3c8adbf91f17c23323d
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 23 09:56:23 2018 +0300
Docs: Update News
[skip ci]
diff --git a/docs/News.rst b/docs/News.rst
index cb50657..35c78f1 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -14,17 +14,22 @@ Minor features
* Close cursors after using to free resources immediately
instead of waiting for gc.
+Bug fixes
+---------
+
+* Fix for TypeError using selectBy on a BLOBCol. PR by Michael S. Root.
+
Drivers
-------
-* Extend support for oursql and Python 3 (require our fork of the driver).
+* Extend support for oursql and Python 3 (requires our fork of the driver).
* Fix cursor.arraysize - pymssql doesn't have arraysize.
-* Fix _setAutoCommit for MSSQL.
-
* Set timeout for ODBC with MSSQL.
+* Fix _setAutoCommit for MSSQL.
+
Documentation
-------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/2a7d28573d1e4f07250da1d30209304fdb6de90d
commit 2a7d28573d1e4f07250da1d30209304fdb6de90d
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 23 09:55:38 2018 +0300
Tests(blob): Use byte string for test
diff --git a/sqlobject/tests/test_blob.py b/sqlobject/tests/test_blob.py
index 9d135d1..2c9b20f 100644
--- a/sqlobject/tests/test_blob.py
+++ b/sqlobject/tests/test_blob.py
@@ -22,8 +22,7 @@ def test_BLOBCol():
else:
data = bytes(range(256))
- prof = ImageData()
- prof.image = data
+ prof = ImageData(image=data)
iid = prof.id
ImageData._connection.cache.clear()
@@ -31,5 +30,5 @@ def test_BLOBCol():
prof2 = ImageData.get(iid)
assert prof2.image == data
- ImageData(image='string')
- assert ImageData.selectBy(image='string').count() == 1
+ ImageData(image=b'string')
+ assert ImageData.selectBy(image=b'string').count() == 1
http://sourceforge.net/p/sqlobject/sqlobject/ci/38a83488fc97663409afdceb51d0ccecf6f22ebd
commit 38a83488fc97663409afdceb51d0ccecf6f22ebd
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 18 00:22:41 2018 +0300
Feat(mssql): Set timeout for ODBC with MSSQL
diff --git a/docs/News.rst b/docs/News.rst
index 4756455..cb50657 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -19,9 +19,11 @@ Drivers
* Extend support for oursql and Python 3 (require our fork of the driver).
+* Fix cursor.arraysize - pymssql doesn't have arraysize.
+
* Fix _setAutoCommit for MSSQL.
-* Fix cursor.arraysize - pymssql doesn't have arraysize.
+* Set timeout for ODBC with MSSQL.
Documentation
-------------
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 9079d31..b135fe4 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -51,6 +51,11 @@ class MSSQLConnection(DBAPI):
raise ImportError(
'Cannot find an MSSQL driver, tried %s' % drivers)
+ timeout = kw.pop('timeout', None)
+ if timeout:
+ timeout = int(timeout)
+ self.timeout = timeout
+
if driver in ('odbc', 'pyodbc', 'pypyodbc'):
self.make_odbc_conn_str(kw.pop('odbcdrv', 'SQL Server'),
db, host, port, user, password
@@ -91,11 +96,6 @@ class MSSQLConnection(DBAPI):
# don't know whether pymssql uses unicode
self.usingUnicodeStrings = False
- timeout = kw.pop('timeout', None)
- if timeout:
- timeout = int(timeout)
- self.timeout = timeout
-
def _make_conn_str(keys):
keys_dict = {}
for attr, value in (
@@ -145,7 +145,14 @@ class MSSQLConnection(DBAPI):
if self.driver in ('odbc', 'pyodbc', 'pypyodbc'):
self.debugWriter.write(
"ODBC connect string: " + self.odbc_conn_str)
- conn = self.module.connect(self.odbc_conn_str)
+ timeout = self.timeout
+ if timeout:
+ kw = dict(timeout=timeout)
+ else:
+ kw = dict()
+ conn = self.module.connect(self.odbc_conn_str, **kw)
+ if timeout:
+ conn.timeout = timeout
else:
conn_descr = self.make_conn_str(self)
if isinstance(conn_descr, dict):
diff --git a/tox.ini b/tox.ini
index 54498f6..c902edb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,6 @@ commands =
deps =
-rdevscripts/requirements/requirements_tests.txt
py27: egenix-mx-base
- mssql-pyodbc: pytest-timeout
mysqldb: mysql-python
mysqlclient: mysqlclient
mysql-connector: mysql-connector <= 2.2.2
@@ -396,7 +395,7 @@ commands =
{envpython} -c "import pyodbc; print(pyodbc.drivers())"
-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=pyodbc&odbcdrv=SQL%20Server&debug=1" --timeout=30
+ pytest --cov=sqlobject -D "mssql://sa:Password12!@localhost\SQL2014/sqlobject_test?driver=pyodbc&odbcdrv=SQL%20Server&timeout=30&debug=1"
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[testenv:py27-mssql-pyodbc-w32]
http://sourceforge.net/p/sqlobject/sqlobject/ci/4ec83426e3c13505026f411cfcccbf0d82cdb3c5
commit 4ec83426e3c13505026f411cfcccbf0d82cdb3c5
Author: Michael S. Root <mi...@ti...>
Date: Thu Feb 22 17:39:35 2018 -0800
Added test for 2a1839364d1a3b4ba260ede53886526ee8cd4860
diff --git a/sqlobject/tests/test_blob.py b/sqlobject/tests/test_blob.py
index 8c43d8a..9d135d1 100644
--- a/sqlobject/tests/test_blob.py
+++ b/sqlobject/tests/test_blob.py
@@ -30,3 +30,6 @@ def test_BLOBCol():
prof2 = ImageData.get(iid)
assert prof2.image == data
+
+ ImageData(image='string')
+ assert ImageData.selectBy(image='string').count() == 1
http://sourceforge.net/p/sqlobject/sqlobject/ci/2a1839364d1a3b4ba260ede53886526ee8cd4860
commit 2a1839364d1a3b4ba260ede53886526ee8cd4860
Author: Michael S. Root <mi...@ti...>
Date: Thu Feb 22 16:38:31 2018 -0800
Bugfix for TypeError using selectBy on a BLOBCol
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 3bde3cc..2dfa45e 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -666,7 +666,6 @@ class DBAPI(DBConnection):
def _SO_columnClause(self, soClass, kw):
from . import main
- ops = {None: "IS"}
data = []
if 'id' in kw:
data.append((soClass.sqlmeta.idName, kw.pop('id')))
@@ -694,7 +693,7 @@ class DBAPI(DBConnection):
return None
return ' AND '.join(
['%s %s %s' %
- (dbName, ops.get(value, "="), self.sqlrepr(value))
+ (dbName, "IS" if value is None else "=", self.sqlrepr(value))
for dbName, value
in data])
http://sourceforge.net/p/sqlobject/sqlobject/ci/f08401c205e30d8c8eb70978f850577cff8598a9
commit f08401c205e30d8c8eb70978f850577cff8598a9
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 11 22:46:15 2018 +0300
Fix cursor.arraysize - pymssql doesn't have arraysize
diff --git a/docs/News.rst b/docs/News.rst
index 82517ad..4756455 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -21,6 +21,8 @@ Drivers
* Fix _setAutoCommit for MSSQL.
+* Fix cursor.arraysize - pymssql doesn't have arraysize.
+
Documentation
-------------
diff --git a/sqlobject/inheritance/iteration.py b/sqlobject/inheritance/iteration.py
index fd7b78f..558700e 100644
--- a/sqlobject/inheritance/iteration.py
+++ b/sqlobject/inheritance/iteration.py
@@ -11,7 +11,11 @@ class InheritableIteration(Iteration):
super(InheritableIteration, self).__init__(dbconn, rawconn, select,
keepConnection)
self.lazyColumns = select.ops.get('lazyColumns', False)
- self.cursor.arraysize = self.defaultArraySize
+ try:
+ self.cursor.arraysize = self.defaultArraySize
+ self.use_arraysize = True
+ except AttributeError: # pymssql doesn't have arraysize
+ self.use_arraysize = False
self._results = []
# Find the index of the childName column
childNameIdx = None
@@ -24,7 +28,11 @@ class InheritableIteration(Iteration):
def next(self):
if not self._results:
- self._results = list(self.cursor.fetchmany())
+ if self.use_arraysize:
+ _results = self.cursor.fetchmany()
+ else:
+ _results = self.cursor.fetchmany(size=self.defaultArraySize)
+ self._results = list(_results)
if not self.lazyColumns:
self.fetchChildren()
if not self._results:
http://sourceforge.net/p/sqlobject/sqlobject/ci/96a66ecdfa7cdc630de0ad057ce7d3a33e401c2a
commit 96a66ecdfa7cdc630de0ad057ce7d3a33e401c2a
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 11 21:58:02 2018 +0300
Fix(mssqlconnection): Fix _setAutoCommit
diff --git a/docs/News.rst b/docs/News.rst
index 1bb32ce..82517ad 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -19,6 +19,8 @@ Drivers
* Extend support for oursql and Python 3 (require our fork of the driver).
+* Fix _setAutoCommit for MSSQL.
+
Documentation
-------------
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 0a53670..9079d31 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -159,6 +159,20 @@ class MSSQLConnection(DBAPI):
cur.close()
return conn
+ def _setAutoCommit(self, conn, auto):
+ auto = bool(auto)
+ if self.driver in ('adodb', 'adodbapi'):
+ if auto:
+ option = "ON"
+ else:
+ option = "OFF"
+ c = conn.cursor()
+ c.execute("SET AUTOCOMMIT " + option)
+ elif self.driver == 'pymssql':
+ conn.autocommit(auto)
+ elif self.driver in ('odbc', 'pyodbc', 'pypyodbc'):
+ conn.autocommit = auto
+
HAS_IDENTITY = """
select 1
from INFORMATION_SCHEMA.COLUMNS
@@ -324,17 +338,6 @@ class MSSQLConnection(DBAPI):
results.append(colClass(**kw))
return results
- def _setAutoCommit(self, conn, auto):
- # raise Exception(repr(auto))
- return
- # conn.auto_commit = auto
- option = "ON"
- if auto == 0:
- option = "OFF"
- c = conn.cursor()
- c.execute("SET AUTOCOMMIT " + option)
- c.close()
-
# precision and scale is needed for decimal columns
def guessClass(self, t, size, precision, scale):
"""
http://sourceforge.net/p/sqlobject/sqlobject/ci/d86fbb9597160f3495566dd28a5dd291d445525f
commit d86fbb9597160f3495566dd28a5dd291d445525f
Author: Oleg Broytman <ph...@ph...>
Date: Sat Feb 17 01:48:58 2018 +0300
Feat: Close cursors after using
Free resources immediately instead of waiting for gc.
diff --git a/docs/News.rst b/docs/News.rst
index 9ce26cf..1bb32ce 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,12 @@ News
SQLObject 3.6.0 (master)
========================
+Minor features
+--------------
+
+* Close cursors after using to free resources immediately
+ instead of waiting for gc.
+
Drivers
-------
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index 41e9b6a..3bde3cc 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -427,7 +427,9 @@ class DBAPI(DBConnection):
def _query(self, conn, s):
if self.debug:
self.printDebug(conn, s, 'Query')
- self._executeRetry(conn, conn.cursor(), s)
+ c = conn.cursor()
+ self._executeRetry(conn, c, s)
+ c.close()
def query(self, s):
return self._runWithConnection(self._query, s)
@@ -438,6 +440,7 @@ class DBAPI(DBConnection):
c = conn.cursor()
self._executeRetry(conn, c, s)
value = c.fetchall()
+ c.close()
if self.debugOutput:
self.printDebug(conn, value, 'QueryAll', 'result')
return value
@@ -455,6 +458,7 @@ class DBAPI(DBConnection):
c = conn.cursor()
self._executeRetry(conn, c, s)
value = c.fetchall()
+ c.close()
if self.debugOutput:
self.printDebug(conn, value, 'QueryAll', 'result')
return c.description, value
@@ -468,6 +472,7 @@ class DBAPI(DBConnection):
c = conn.cursor()
self._executeRetry(conn, c, s)
value = c.fetchone()
+ c.close()
if self.debugOutput:
self.printDebug(conn, value, 'QueryOne', 'result')
return value
@@ -778,10 +783,11 @@ class Iteration(object):
if getattr(self, 'query', None) is None:
# already cleaned up
return
- self.query = None
+ self.cursor.close()
if not self.keepConnection:
self.dbconn.releaseConnection(self.rawconn)
- self.dbconn = self.rawconn = self.select = self.cursor = None
+ self.query = self.dbconn = self.rawconn = \
+ self.select = self.cursor = None
def __del__(self):
self._cleanup()
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index 3bf3fb5..4624b48 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -135,6 +135,7 @@ class FirebirdConnection(DBAPI):
if self.debug:
self.printDebug(conn, q, 'QueryIns')
c.execute(q)
+ c.close()
if self.debugOutput:
self.printDebug(conn, id, 'QueryIns', 'result')
return id
diff --git a/sqlobject/maxdb/maxdbconnection.py b/sqlobject/maxdb/maxdbconnection.py
index c46c3ea..4fd53b1 100644
--- a/sqlobject/maxdb/maxdbconnection.py
+++ b/sqlobject/maxdb/maxdbconnection.py
@@ -138,6 +138,7 @@ class MaxdbConnection(DBAPI):
if self.debug:
self.printDebug(conn, q, 'QueryIns')
c.execute(q)
+ c.close()
if self.debugOutput:
self.printDebug(conn, id, 'QueryIns', 'result')
return id
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 0201031..0a53670 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -137,7 +137,9 @@ class MSSQLConnection(DBAPI):
# converting the identity to an int is ugly, but it gets returned
# as a decimal otherwise :S
c.execute('SELECT CONVERT(INT, @@IDENTITY)')
- return c.fetchone()[0]
+ result = c.fetchone()[0]
+ c.close()
+ return result
def makeConnection(self):
if self.driver in ('odbc', 'pyodbc', 'pypyodbc'):
@@ -169,6 +171,7 @@ class MSSQLConnection(DBAPI):
c = conn.cursor()
c.execute(query)
r = c.fetchone()
+ c.close()
return r is not None
def _queryInsertID(self, conn, soInstance, id, names, values):
@@ -206,6 +209,7 @@ class MSSQLConnection(DBAPI):
c.execute(q)
if has_identity:
c.execute('SET IDENTITY_INSERT %s OFF' % table)
+ c.close()
if id is None:
id = self.insert_id(conn)
@@ -329,6 +333,7 @@ class MSSQLConnection(DBAPI):
option = "OFF"
c = conn.cursor()
c.execute("SET AUTOCOMMIT " + option)
+ c.close()
# precision and scale is needed for decimal columns
def guessClass(self, t, size, precision, scale):
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index 96517dd..51cbde4 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -300,6 +300,7 @@ class MySQLConnection(DBAPI):
id = c.fetchone()[0]
else:
id = c.insert_id()
+ c.close()
if self.debugOutput:
self.printDebug(conn, id, 'QueryIns', 'result')
return id
... 80 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-02-04 06:26:13
|
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 bc58c615babc7a170989e074a6af956e67fe0f1b (commit)
from 9c8dec32f56a8c9115668f5f7f2d42a21753a5fd (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/bc58c615babc7a170989e074a6af956e67fe0f1b
commit bc58c615babc7a170989e074a6af956e67fe0f1b
Author: Oleg Broytman <ph...@ph...>
Date: Sun Feb 4 09:21:16 2018 +0300
Build: Use module returned by imp.load_source() directly
diff --git a/setup.py b/setup.py
index 20c3ff1..4018c69 100755
--- a/setup.py
+++ b/setup.py
@@ -11,8 +11,7 @@ except ImportError:
is_setuptools = False
versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py")
-load_source("sqlobject_version", versionpath)
-from sqlobject_version import version # noqa: ignore flake8 E402
+sqlobject_version = load_source("sqlobject_version", versionpath)
subpackages = ['firebird', 'include', 'include.tests',
'inheritance', 'inheritance.tests',
@@ -69,7 +68,7 @@ if is_setuptools:
kw['python_requires'] = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*'
setup(name="SQLObject",
- version=version,
+ version=sqlobject_version.version,
description="Object-Relational Manager, aka database wrapper",
long_description="""\
SQLObject is a popular *Object Relational Manager* for providing an
@@ -111,7 +110,8 @@ and `GitHub <https://github.com/sqlobject>`_.
maintainer="Oleg Broytman",
maintainer_email="ph...@ph...",
url="http://sqlobject.org/",
- download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
+ download_url="https://pypi.python.org/pypi/SQLObject/%s" %
+ sqlobject_version.version,
keywords=["sql", "orm", "object-relational mapper"],
license="LGPL",
platforms="Any",
-----------------------------------------------------------------------
Summary of changes:
setup.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-02-02 19:25:45
|
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 9c8dec32f56a8c9115668f5f7f2d42a21753a5fd (commit)
via 02191ead0900875a95aa02fb11a1b72935a09571 (commit)
from 9770622c4a1d5a2ea286e4ddf57bc40009889afa (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/9c8dec32f56a8c9115668f5f7f2d42a21753a5fd
commit 9c8dec32f56a8c9115668f5f7f2d42a21753a5fd
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 2 21:38:11 2018 +0300
CI: Run PyMySQL tests at AppVeyor
diff --git a/appveyor.yml b/appveyor.yml
index ef71aef..f5a23b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,6 +43,16 @@ environment:
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"
diff --git a/tox.ini b/tox.ini
index bf85a35..54498f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -440,6 +440,31 @@ commands = {[mysql-connector-w32]commands}
platform = win32
commands = {[mysql-connector-w32]commands}
+[pymysql-w32]
+platform = win32
+commands =
+ {[testenv]commands}
+ -mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
+ mysql -u root "-pPassword12!" -e 'create database sqlobject_test;'
+ pytest --cov=sqlobject -D "mysql://root:Password12!@localhost/sqlobject_test?driver=pymysql&charset=utf8&debug=1"
+ mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
+
+[testenv:py27-pymysql-w32]
+platform = win32
+commands = {[pymysql-w32]commands}
+
+[testenv:py34-pymysql-w32]
+platform = win32
+commands = {[pymysql-w32]commands}
+
+[testenv:py35-pymysql-w32]
+platform = win32
+commands = {[pymysql-w32]commands}
+
+[testenv:py36-pymysql-w32]
+platform = win32
+commands = {[pymysql-w32]commands}
+
[mysql-pyodbc-w32]
platform = win32
commands =
http://sourceforge.net/p/sqlobject/sqlobject/ci/02191ead0900875a95aa02fb11a1b72935a09571
commit 02191ead0900875a95aa02fb11a1b72935a09571
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 2 21:32:30 2018 +0300
CI: Fix AppVeyor config: ODBC dirver for MySQL is 64 bit
diff --git a/appveyor.yml b/appveyor.yml
index a15419a..ef71aef 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -44,9 +44,9 @@ environment:
PYTHON_HOME: "C:\\Python36-x64"
db: mysql
- TOXENV: "py27-mysql-pyodbc-w32"
- PYTHON_ARCH: "32"
+ PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
+ PYTHON_HOME: "C:\\Python27-x64"
db: mysql
- TOXENV: "py36-mysql-pyodbc-w32"
PYTHON_ARCH: "64"
-----------------------------------------------------------------------
Summary of changes:
appveyor.yml | 12 +++++++++++-
tox.ini | 25 +++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-02-01 23:39:01
|
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 9770622c4a1d5a2ea286e4ddf57bc40009889afa (commit)
via 30447df1495f7192a6bea7241cc13ef4942b059c (commit)
from e69b735685ee068ba7468adbdfe1d3051b5ecb1e (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/9770622c4a1d5a2ea286e4ddf57bc40009889afa
commit 9770622c4a1d5a2ea286e4ddf57bc40009889afa
Author: Oleg Broytman <ph...@ph...>
Date: Fri Feb 2 01:44:47 2018 +0300
Fix(mysql): Fix oursql
Encode queries to bytes to fix unicode problems in binary data.
Enable autoreconnect.
diff --git a/.travis.yml b/.travis.yml
index 4525649..5a6b8e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -126,9 +126,6 @@ matrix:
env: TOXENV=py36-firebirdsql
allow_failures:
- - env: TOXENV=py34-mysql-oursql3
- - env: TOXENV=py35-mysql-oursql3
- - env: TOXENV=py36-mysql-oursql3
- 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 9e5d127..9ce26cf 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -11,8 +11,7 @@ SQLObject 3.6.0 (master)
Drivers
-------
-* Extend support for oursql and Python 3 (require our fork). There are
- some unicode-related problems.
+* Extend support for oursql and Python 3 (require our fork of the driver).
Documentation
-------------
diff --git a/docs/TODO.rst b/docs/TODO.rst
index b226405..1ce1467 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -3,8 +3,6 @@ TODO
* Fix test ordering problem with Postgres.
-* Fix unicode problems with oursql.
-
* Fix unicode problems with pyodbc at AppVeyor.
* Resolve timeout problems with MSSQL.
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index ba7e726..96517dd 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -131,6 +131,12 @@ class MySQLConnection(DBAPI):
self.CR_SERVER_LOST = 2013
self.ER_DUP_ENTRY = '23000'
+ elif self.driver == 'oursql':
+ if "use_unicode" not in self.kw:
+ self.kw["use_unicode"] = not PY2
+ # oursql doesn't implement ping(True) yet
+ self.kw["autoreconnect"] = True
+
global mysql_Bin
if not PY2 and mysql_Bin is None:
mysql_Bin = self.module.Binary
@@ -218,7 +224,7 @@ class MySQLConnection(DBAPI):
self.printDebug(conn, query, 'QueryR')
dbEncoding = self.dbEncoding
if dbEncoding and not isinstance(query, bytes) and (
- self.driver == 'connector'):
+ self.driver in ('connector', 'oursql')):
query = query.encode(dbEncoding, 'surrogateescape')
# When a server connection is lost and a query is attempted, most of
# the time the query will raise a SERVER_LOST exception, then at the
http://sourceforge.net/p/sqlobject/sqlobject/ci/30447df1495f7192a6bea7241cc13ef4942b059c
commit 30447df1495f7192a6bea7241cc13ef4942b059c
Author: Oleg Broytman <ph...@ph...>
Date: Sun Jan 14 07:12:40 2018 +0300
Docs: Fix subsection header
[skip ci]
diff --git a/docs/News.rst b/docs/News.rst
index 9dc8125..9e5d127 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -11,7 +11,7 @@ SQLObject 3.6.0 (master)
Drivers
-------
-* Extend support for oursql and Python 3 (require our fork); there are
+* Extend support for oursql and Python 3 (require our fork). There are
some unicode-related problems.
Documentation
@@ -20,7 +20,7 @@ Documentation
* Document extras that are available for installation.
Build
-=====
+-----
* Use ``python_version`` environment marker in ``setup.py`` to make
``install_requires`` and ``extras_require`` declarative. This makes
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 3 ---
docs/News.rst | 5 ++---
docs/TODO.rst | 2 --
sqlobject/mysql/mysqlconnection.py | 8 +++++++-
4 files changed, 9 insertions(+), 9 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-01-13 21:12:45
|
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 e69b735685ee068ba7468adbdfe1d3051b5ecb1e (commit)
via a6cc22eb346a42a67142fb7a1b59b5fce51387fa (commit)
via f3fc349e34bfc6def689d94ed6e9c6327c93c845 (commit)
from 7ca3a7ed760aded7d5a159dfaaf74fd82c2e7e9f (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/e69b735685ee068ba7468adbdfe1d3051b5ecb1e
commit e69b735685ee068ba7468adbdfe1d3051b5ecb1e
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 13 22:43:43 2018 +0300
Fix(oursql): Extend support for Python 3
Use our fork.
diff --git a/.travis.yml b/.travis.yml
index 72148bb..4525649 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,12 @@ matrix:
env: TOXENV=py36-mysql-connector
- python: "2.7"
env: TOXENV=py27-mysql-oursql
+ - python: "3.4"
+ env: TOXENV=py34-mysql-oursql3
+ - python: "3.5"
+ env: TOXENV=py35-mysql-oursql3
+ - python: "3.6"
+ env: TOXENV=py36-mysql-oursql3
- python: "2.7"
env: TOXENV=py27-pymysql
- python: "3.4"
@@ -120,6 +126,9 @@ matrix:
env: TOXENV=py36-firebirdsql
allow_failures:
+ - env: TOXENV=py34-mysql-oursql3
+ - env: TOXENV=py35-mysql-oursql3
+ - env: TOXENV=py36-mysql-oursql3
- 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 5590434..9dc8125 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -8,6 +8,12 @@ News
SQLObject 3.6.0 (master)
========================
+Drivers
+-------
+
+* Extend support for oursql and Python 3 (require our fork); there are
+ some unicode-related problems.
+
Documentation
-------------
diff --git a/docs/TODO.rst b/docs/TODO.rst
index 8e5b307..b226405 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -1,10 +1,10 @@
TODO
----
-* Restore oursql driver; use our fork.
-
* Fix test ordering problem with Postgres.
+* Fix unicode problems with oursql.
+
* Fix unicode problems with pyodbc at AppVeyor.
* Resolve timeout problems with MSSQL.
diff --git a/docs/download.rst b/docs/download.rst
index 6877d6a..a028998 100644
--- a/docs/download.rst
+++ b/docs/download.rst
@@ -63,7 +63,7 @@ MySQL
^^^^^
mysql (installs MySQL-python for Python 2.7 and mysqlclient for Python 3.4+)
-mysql-connector oursql (only for Python 2.7) pymysql
+mysql-connector oursql pymysql
ODBC
^^^^
diff --git a/setup.py b/setup.py
index 2adc4ab..20c3ff1 100755
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ if is_setuptools:
'mysql:python_version=="2.7"': ['MySQL-python'],
'mysql:python_version>="3.4"': ['mysqlclient'],
'mysql-connector': ['mysql-connector'],
- 'oursql:python_version=="2.7"': ['oursql'],
+ 'oursql': ['oursql'],
'pymysql': ['pymysql'],
# ODBC
'odbc': ['pyodbc'],
diff --git a/tox.ini b/tox.ini
index 7044bc2..bf85a35 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,8 @@ deps =
mysqldb: mysql-python
mysqlclient: mysqlclient
mysql-connector: mysql-connector <= 2.2.2
- mysql-oursql: oursql
+ mysql-oursql: git+https://github.com/sqlobject/oursql.git@master#egg=oursql
+ mysql-oursql3: git+https://github.com/sqlobject/oursql.git@py3k#egg=oursql
pymysql: pymysql
postgres-psycopg: psycopg2
postgres-pygresql: pygresql
@@ -103,6 +104,15 @@ commands =
[testenv:py27-mysql-oursql]
commands = {[oursql]commands}
+[testenv:py34-mysql-oursql3]
+commands = {[oursql]commands}
+
+[testenv:py35-mysql-oursql3]
+commands = {[oursql]commands}
+
+[testenv:py36-mysql-oursql3]
+commands = {[oursql]commands}
+
[pymysql]
commands =
{[testenv]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/a6cc22eb346a42a67142fb7a1b59b5fce51387fa
commit a6cc22eb346a42a67142fb7a1b59b5fce51387fa
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 13 22:22:48 2018 +0300
Tests(tox): Fix pypyodbc driver's name
diff --git a/tox.ini b/tox.ini
index 8fef624..7044bc2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -611,7 +611,7 @@ commands =
{envpython} -c "import pypyodbc; print(pypyodbc.drivers())"
-dropdb -U postgres -w sqlobject_test
createdb -U postgres -w sqlobject_test
- pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=odbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
+ pytest --cov=sqlobject -D "postgres://postgres:Password12!@localhost/sqlobject_test?driver=pypyodbc&odbcdrv=PostgreSQL%20ANSI%28x64%29&charset=utf-8&debug=1" tests include/tests inheritance/tests versioning/test
dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-pypyodbc-w32]
http://sourceforge.net/p/sqlobject/sqlobject/ci/f3fc349e34bfc6def689d94ed6e9c6327c93c845
commit f3fc349e34bfc6def689d94ed6e9c6327c93c845
Author: Oleg Broytman <ph...@ph...>
Date: Sat Jan 13 21:01:19 2018 +0300
Tests(tox): Shorten default list of environments
By default only run SQLite3 and flake8 tests.
diff --git a/devscripts/tox-select-envs b/devscripts/tox-select-envs
index 49cf3ab..34ff4b2 100755
--- a/devscripts/tox-select-envs
+++ b/devscripts/tox-select-envs
@@ -2,7 +2,7 @@
pattern="$1"
shift
-envs="`tox --listenvs | grep -F $pattern | sed 's/$/,/'`"
+envs="`tox --listenvs-all | grep -F $pattern | sed 's/$/,/'`"
if [ -n "$envs" ]; then
exec tox -e "$envs" "$@"
diff --git a/tox.ini b/tox.ini
index f25ba41..8fef624 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
-envlist = py27-{mysqldb,mysql-oursql},py{34,35,36}-{mysqlclient,pypostgresql},py{27,34,35,36}-{mysql-connector,pymysql,mysql-pyodbc,mysql-pypyodbc,postgres-psycopg,postgres-pygresql,postgres-pg8000,postgres-pyodbc,postgres-pypyodbc,sqlite,sqlite-memory},py{27,34,35,36}-{firebird-fdb,firebirdsql},py{27,34}-flake8,py{27,34,35,36}-{mssql-pyodbc,mysql-connector,mysql-pyodbc,mysql-pypyodbc,postgres-psycopg,postgres-pygresql,postgres-pg800,postgres-pyodbc,postgres-pypyodbc,sqlite,sqlite-memory}-w32,py{34,35,36}-pypostgresql-w32
+envlist = py{27,34,35,36}-sqlite{,-memory},py{27,34}-flake8
# Base test environment settings
[testenv]
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 9 +++++++++
devscripts/tox-select-envs | 2 +-
docs/News.rst | 6 ++++++
docs/TODO.rst | 4 ++--
docs/download.rst | 2 +-
setup.py | 2 +-
tox.ini | 16 +++++++++++++---
7 files changed, 33 insertions(+), 8 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2018-01-05 17:38:18
|
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 7ca3a7ed760aded7d5a159dfaaf74fd82c2e7e9f (commit)
from 1228c7cd9884b38ab16185ec15e2637d745b6841 (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/7ca3a7ed760aded7d5a159dfaaf74fd82c2e7e9f
commit 7ca3a7ed760aded7d5a159dfaaf74fd82c2e7e9f
Author: Oleg Broytman <ph...@ph...>
Date: Fri Jan 5 20:37:17 2018 +0300
Docs: Update TODO
[skip ci]
diff --git a/docs/TODO.rst b/docs/TODO.rst
index 2ae19ac..8e5b307 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -1,8 +1,32 @@
TODO
----
+* Restore oursql driver; use our fork.
+
+* Fix test ordering problem with Postgres.
+
+* Fix unicode problems with pyodbc at AppVeyor.
+
+* Resolve timeout problems with MSSQL.
+
+* https://github.com/d33tah/bpgsql,
+ https://github.com/olopez32/py-bpgsql,
+ https://pypi.python.org/pypi/ocpgdb/2.0.2,
+ https://magicstack.github.io/asyncpg/current/.
+
* PyPy.
+* Use https://pypi.python.org/pypi/psycopg2cffi to run SQLObject
+ under PyPy.
+
+* https://pypi.python.org/pypi/turbodbc
+
+* PyODBC and PyPyODBC for linux and w32: SQLite (libsqliteodbc).
+
+* https://pypi.python.org/pypi/JayDeBeApi
+
+* Jython.
+
* Quote table/column names that are reserved keywords (order => "order",
values => `values` for MySQL).
-----------------------------------------------------------------------
Summary of changes:
docs/TODO.rst | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-12-17 11:47:07
|
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 1228c7cd9884b38ab16185ec15e2637d745b6841 (commit)
from f56f2dba768c6c7e52652dde8e88183b1045862c (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/1228c7cd9884b38ab16185ec15e2637d745b6841
commit 1228c7cd9884b38ab16185ec15e2637d745b6841
Author: Oleg Broytman <ph...@ph...>
Date: Sun Dec 17 14:14:48 2017 +0300
Tests(tox.ini): Set platform
Default platform is linux, but for *-w32 environments it's win32.
diff --git a/tox.ini b/tox.ini
index 8a7d8b2..f25ba41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,6 +33,7 @@ deps =
firebirdsql: firebirdsql
passenv = CI TRAVIS TRAVIS_* APPVEYOR DISTUTILS_USE_SDK MSSdk INCLUDE LIB PGPASSWORD WINDIR
# Don't fail or warn on uninstalled commands
+platform = linux
whitelist_externals =
mysql
createdb
@@ -380,6 +381,7 @@ commands =
# Windows testing
[mssql-pyodbc-w32]
+platform = win32
commands =
{envpython} -c "import pyodbc; print(pyodbc.drivers())"
-sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
@@ -388,18 +390,23 @@ commands =
sqlcmd -U sa -P "Password12!" -S .\SQL2014 -Q "DROP DATABASE sqlobject_test"
[testenv:py27-mssql-pyodbc-w32]
+platform = win32
commands = {[mssql-pyodbc-w32]commands}
[testenv:py34-mssql-pyodbc-w32]
+platform = win32
commands = {[mssql-pyodbc-w32]commands}
[testenv:py35-mssql-pyodbc-w32]
+platform = win32
commands = {[mssql-pyodbc-w32]commands}
[testenv:py36-mssql-pyodbc-w32]
+platform = win32
commands = {[mssql-pyodbc-w32]commands}
[mysql-connector-w32]
+platform = win32
commands =
{[testenv]commands}
-mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
@@ -408,18 +415,23 @@ commands =
mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
[testenv:py27-mysql-connector-w32]
+platform = win32
commands = {[mysql-connector-w32]commands}
[testenv:py34-mysql-connector-w32]
+platform = win32
commands = {[mysql-connector-w32]commands}
[testenv:py35-mysql-connector-w32]
+platform = win32
commands = {[mysql-connector-w32]commands}
[testenv:py36-mysql-connector-w32]
+platform = win32
commands = {[mysql-connector-w32]commands}
[mysql-pyodbc-w32]
+platform = win32
commands =
{[testenv]commands}
{envpython} -c "import pyodbc; print(pyodbc.drivers())"
@@ -429,18 +441,23 @@ commands =
mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
[testenv:py27-mysql-pyodbc-w32]
+platform = win32
commands = {[mysql-pyodbc-w32]commands}
[testenv:py34-mysql-pyodbc-w32]
+platform = win32
commands = {[mysql-pyodbc-w32]commands}
[testenv:py35-mysql-pyodbc-w32]
+platform = win32
commands = {[mysql-pyodbc-w32]commands}
[testenv:py36-mysql-pyodbc-w32]
+platform = win32
commands = {[mysql-pyodbc-w32]commands}
[mysql-pypyodbc-w32]
+platform = win32
commands =
{[testenv]commands}
{envpython} -c "import pypyodbc; print(pypyodbc.drivers())"
@@ -450,18 +467,23 @@ commands =
mysql -u root "-pPassword12!" -e 'drop database sqlobject_test;'
[testenv:py27-mysql-pypyodbc-w32]
+platform = win32
commands = {[mysql-pypyodbc-w32]commands}
[testenv:py34-mysql-pypyodbc-w32]
+platform = win32
commands = {[mysql-pypyodbc-w32]commands}
[testenv:py35-mysql-pypyodbc-w32]
+platform = win32
commands = {[mysql-pypyodbc-w32]commands}
[testenv:py36-mysql-pypyodbc-w32]
+platform = win32
commands = {[mysql-pypyodbc-w32]commands}
[psycopg-w32]
+platform = win32
commands =
{[testenv]commands}
-dropdb -U postgres -w sqlobject_test
@@ -470,18 +492,23 @@ commands =
dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-psycopg-w32]
+platform = win32
commands = {[psycopg-w32]commands}
[testenv:py34-postgres-psycopg-w32]
+platform = win32
commands = {[psycopg-w32]commands}
[testenv:py35-postgres-psycopg-w32]
+platform = win32
commands = {[psycopg-w32]commands}
[testenv:py36-postgres-psycopg-w32]
+platform = win32
commands = {[psycopg-w32]commands}
[pygresql-w32]
+platform = win32
commands =
{[testenv]commands}
-dropdb -U postgres -w sqlobject_test
@@ -490,18 +517,23 @@ commands =
dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-pygresql-w32]
+platform = win32
commands = {[pygresql-w32]commands}
[testenv:py34-postgres-pygresql-w32]
+platform = win32
commands = {[pygresql-w32]commands}
[testenv:py35-postgres-pygresql-w32]
+platform = win32
commands = {[pygresql-w32]commands}
[testenv:py36-postgres-pygresql-w32]
+platform = win32
commands = {[pygresql-w32]commands}
[pypostgresql-w32]
+platform = win32
commands =
{[testenv]commands}
-dropdb -U postgres -w sqlobject_test
@@ -510,15 +542,19 @@ commands =
dropdb -U postgres -w sqlobject_test
[testenv:py34-pypostgresql-w32]
+platform = win32
commands = {[pypostgresql-w32]commands}
[testenv:py35-pypostgresql-w32]
+platform = win32
commands = {[pypostgresql-w32]commands}
[testenv:py36-pypostgresql-w32]
+platform = win32
commands = {[pypostgresql-w32]commands}
[pg8000-w32]
+platform = win32
commands =
{[testenv]commands}
-dropdb -U postgres -w sqlobject_test
@@ -527,18 +563,23 @@ commands =
dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-pg8000-w32]
+platform = win32
commands = {[pg8000-w32]commands}
[testenv:py34-postgres-pg8000-w32]
+platform = win32
commands = {[pg8000-w32]commands}
[testenv:py35-postgres-pg8000-w32]
+platform = win32
commands = {[pg8000-w32]commands}
[testenv:py36-postgres-pg8000-w32]
+platform = win32
commands = {[pg8000-w32]commands}
[postgres-pyodbc-w32]
+platform = win32
commands =
{[testenv]commands}
{envpython} -c "import pyodbc; print(pyodbc.drivers())"
@@ -548,18 +589,23 @@ commands =
dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-pyodbc-w32]
+platform = win32
commands = {[postgres-pyodbc-w32]commands}
[testenv:py34-postgres-pyodbc-w32]
+platform = win32
commands = {[postgres-pyodbc-w32]commands}
[testenv:py35-postgres-pyodbc-w32]
+platform = win32
commands = {[postgres-pyodbc-w32]commands}
[testenv:py36-postgres-pyodbc-w32]
+platform = win32
commands = {[postgres-pyodbc-w32]commands}
[postgres-pypyodbc-w32]
+platform = win32
commands =
{[testenv]commands}
{envpython} -c "import pypyodbc; print(pypyodbc.drivers())"
@@ -569,47 +615,61 @@ commands =
dropdb -U postgres -w sqlobject_test
[testenv:py27-postgres-pypyodbc-w32]
+platform = win32
commands = {[postgres-pypyodbc-w32]commands}
[testenv:py34-postgres-pypyodbc-w32]
+platform = win32
commands = {[postgres-pypyodbc-w32]commands}
[testenv:py35-postgres-pypyodbc-w32]
+platform = win32
commands = {[postgres-pypyodbc-w32]commands}
[testenv:py36-postgres-pypyodbc-w32]
+platform = win32
commands = {[postgres-pypyodbc-w32]commands}
[sqlite-w32]
+platform = win32
commands =
{[testenv]commands}
pytest --cov=sqlobject -D sqlite:/C:/projects/sqlobject/sqlobject_test.sqdb?debug=1
[testenv:py27-sqlite-w32]
+platform = win32
commands = {[sqlite-w32]commands}
[testenv:py34-sqlite-w32]
+platform = win32
commands = {[sqlite-w32]commands}
[testenv:py35-sqlite-w32]
+platform = win32
commands = {[sqlite-w32]commands}
[testenv:py36-sqlite-w32]
+platform = win32
commands = {[sqlite-w32]commands}
[sqlite-memory-w32]
+platform = win32
commands =
{[testenv]commands}
pytest --cov=sqlobject -D sqlite:/:memory:?debug=1
[testenv:py27-sqlite-memory-w32]
+platform = win32
commands = {[sqlite-memory-w32]commands}
[testenv:py34-sqlite-memory-w32]
+platform = win32
commands = {[sqlite-memory-w32]commands}
[testenv:py35-sqlite-memory-w32]
+platform = win32
commands = {[sqlite-memory-w32]commands}
[testenv:py36-sqlite-memory-w32]
+platform = win32
commands = {[sqlite-memory-w32]commands}
-----------------------------------------------------------------------
Summary of changes:
tox.ini | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-12-15 19:58:45
|
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 f56f2dba768c6c7e52652dde8e88183b1045862c (commit)
via ed6cdc748a16b86598834fd647c5b78f33843dd8 (commit)
via aa24465d6128d68a208e25a96040f1d69a0455da (commit)
via a862d4c66da8a85847c400f82d770fb71fcf6a02 (commit)
via 2a4b2a74fdeaa3366fe07c81ad2ddc4dfb385243 (commit)
via f275254bfb51e2d3faff5a5bca1116ecee542e1c (commit)
via a9b98c8b18916c6701f8d1ef6899b26e272a8cd4 (commit)
via ac9cf3ac1641537f5d77e82b8f69ba57798224c4 (commit)
via 7d665e6381edcee40c2cddc8a117d37057b66a1e (commit)
from fdc40081eb3e12591e5d6603204854512e1a4ca8 (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/f56f2dba768c6c7e52652dde8e88183b1045862c
commit f56f2dba768c6c7e52652dde8e88183b1045862c
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 21:10:51 2017 +0300
Tests: rm -f sqlobject_test.sqdb
diff --git a/tox.ini b/tox.ini
index d924d4d..8a7d8b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -287,9 +287,9 @@ commands = {[postgres-pypyodbc]commands}
[sqlite]
commands =
{[testenv]commands}
- -rm /tmp/sqlobject_test.sqdb
+ -rm -f /tmp/sqlobject_test.sqdb
pytest --cov=sqlobject -D sqlite:///tmp/sqlobject_test.sqdb?debug=1
- rm /tmp/sqlobject_test.sqdb
+ rm -f /tmp/sqlobject_test.sqdb
[testenv:py27-sqlite]
commands = {[sqlite]commands}
@@ -327,7 +327,7 @@ commands =
sudo rm -f /tmp/test.fdb
isql-fb -u test -p test -i /var/lib/firebird/create_test_db
pytest --cov=sqlobject -D 'firebird://test:test@localhost/tmp/test.fdb?debug=1'
- sudo rm /tmp/test.fdb
+ sudo rm -f /tmp/test.fdb
[testenv:py27-firebird-fdb]
commands = {[fdb]commands}
@@ -347,7 +347,7 @@ commands =
sudo rm -f /tmp/test.fdb
isql-fb -u test -p test -i /var/lib/firebird/create_test_db
pytest --cov=sqlobject -D 'firebird://test:test@localhost:3050/tmp/test.fdb?driver=firebirdsql&charset=utf8&debug=1'
- sudo rm /tmp/test.fdb
+ sudo rm -f /tmp/test.fdb
[testenv:py27-firebirdsql]
commands = {[firebirdsql]commands}
http://sourceforge.net/p/sqlobject/sqlobject/ci/ed6cdc748a16b86598834fd647c5b78f33843dd8
commit ed6cdc748a16b86598834fd647c5b78f33843dd8
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 18:30:11 2017 +0300
Build: Require tox >= 2.0 (for passenv)
[skip ci]
diff --git a/devscripts/requirements/requirements_tox.txt b/devscripts/requirements/requirements_tox.txt
index 9927ea4..ff4ecb6 100644
--- a/devscripts/requirements/requirements_tox.txt
+++ b/devscripts/requirements/requirements_tox.txt
@@ -1 +1 @@
-tox >= 1.8
+tox >= 2.0
diff --git a/tox.ini b/tox.ini
index 828dff1..d924d4d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-minversion = 1.8
+minversion = 2.0
envlist = py27-{mysqldb,mysql-oursql},py{34,35,36}-{mysqlclient,pypostgresql},py{27,34,35,36}-{mysql-connector,pymysql,mysql-pyodbc,mysql-pypyodbc,postgres-psycopg,postgres-pygresql,postgres-pg8000,postgres-pyodbc,postgres-pypyodbc,sqlite,sqlite-memory},py{27,34,35,36}-{firebird-fdb,firebirdsql},py{27,34}-flake8,py{27,34,35,36}-{mssql-pyodbc,mysql-connector,mysql-pyodbc,mysql-pypyodbc,postgres-psycopg,postgres-pygresql,postgres-pg800,postgres-pyodbc,postgres-pypyodbc,sqlite,sqlite-memory}-w32,py{34,35,36}-pypostgresql-w32
# Base test environment settings
http://sourceforge.net/p/sqlobject/sqlobject/ci/aa24465d6128d68a208e25a96040f1d69a0455da
commit aa24465d6128d68a208e25a96040f1d69a0455da
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 16:25:35 2017 +0300
Build: -O2
[skip ci]
diff --git a/setup.cfg b/setup.cfg
index a472979..40ee4ca 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,9 @@
+[bdist_wheel]
+universal = 1
+
+[easy_install]
+optimize = 2
+
[egg_info]
tag_build =
tag_date = 0
@@ -8,6 +14,3 @@ exclude = .git,.tox,docs/europython/*.py
# E305: expected 2 blank lines after class or function definition, found 1
ignore = E305
-[bdist_wheel]
-universal = 1
-
http://sourceforge.net/p/sqlobject/sqlobject/ci/a862d4c66da8a85847c400f82d770fb71fcf6a02
commit a862d4c66da8a85847c400f82d770fb71fcf6a02
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 16:06:06 2017 +0300
CI: Run tests at AppVeyor with Python 2.7 32bit and 3.6 64bit
AppVeyor runs 1 virtual machine so tests are executing very slowly.
The commit removes most of the tests.
diff --git a/appveyor.yml b/appveyor.yml
index c6641fc..a15419a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,66 +38,26 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: mysql
- - TOXENV: "py34-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: mysql
- - TOXENV: "py35-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: mysql
- TOXENV: "py36-mysql-connector-w32"
- PYTHON_ARCH: "32"
+ PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
+ PYTHON_HOME: "C:\\Python36-x64"
db: mysql
- TOXENV: "py27-mysql-pyodbc-w32"
- PYTHON_ARCH: "64"
+ PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
+ PYTHON_HOME: "C:\\Python27"
db: mysql
- - TOXENV: "py34-mysql-pyodbc-w32"
+ - TOXENV: "py36-mysql-pyodbc-w32"
PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
+ 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: "py27-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOXENV: "py34-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: postgresql
- - TOXENV: "py34-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOXENV: "py35-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOXENV: "py35-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- - TOXENV: "py36-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- TOXENV: "py36-postgres-psycopg-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
@@ -108,41 +68,11 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- - TOXENV: "py34-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOXENV: "py35-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- TOXENV: "py36-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
db: postgresql
- - TOXENV: "py34-pypostgresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: postgresql
- - TOXENV: "py34-pypostgresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOXENV: "py35-pypostgresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOXENV: "py35-pypostgresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- TOXENV: "py36-pypostgresql-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6"
@@ -158,36 +88,6 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: postgresql
- - TOXENV: "py27-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOXENV: "py34-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: postgresql
- - TOXENV: "py34-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOXENV: "py35-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOXENV: "py35-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- - TOXENV: "py36-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- TOXENV: "py36-postgres-pg8000-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
@@ -198,39 +98,15 @@ environment:
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- - TOXENV: "py34-postgres-pyodbc-w32"
+ - TOXENV: "py36-postgres-pyodbc-w32"
PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
+ 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: "py27-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- - TOXENV: "py34-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- - TOXENV: "py34-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- - TOXENV: "py35-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- - TOXENV: "py35-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- - TOXENV: "py36-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- TOXENV: "py36-sqlite-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
@@ -239,14 +115,6 @@ environment:
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
- - TOXENV: "py34-sqlite-memory-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- - TOXENV: "py35-sqlite-memory-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- TOXENV: "py36-sqlite-memory-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
http://sourceforge.net/p/sqlobject/sqlobject/ci/2a4b2a74fdeaa3366fe07c81ad2ddc4dfb385243
commit 2a4b2a74fdeaa3366fe07c81ad2ddc4dfb385243
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 14:57:33 2017 +0300
Docs: Remove unused start label
[skip ci]
diff --git a/docs/News.rst b/docs/News.rst
index adcca1c..5590434 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -5,8 +5,6 @@ News
.. contents:: Contents:
:backlinks: none
-.. _start:
-
SQLObject 3.6.0 (master)
========================
diff --git a/docs/News1.rst b/docs/News1.rst
index 77296c2..e3838c2 100644
--- a/docs/News1.rst
+++ b/docs/News1.rst
@@ -5,8 +5,6 @@ News
.. contents:: Contents:
:backlinks: none
-.. _start:
-
SQLObject 0.6.1
===============
diff --git a/docs/News2.rst b/docs/News2.rst
index 9a37d77..2e23ed4 100644
--- a/docs/News2.rst
+++ b/docs/News2.rst
@@ -5,8 +5,6 @@ News
.. contents:: Contents:
:backlinks: none
-.. _start:
-
SQLObject 0.8.7
===============
diff --git a/docs/News3.rst b/docs/News3.rst
index a680527..2b6f067 100644
--- a/docs/News3.rst
+++ b/docs/News3.rst
@@ -5,8 +5,6 @@ News
.. contents:: Contents:
:backlinks: none
-.. _start:
-
SQLObject 0.10.9
================
diff --git a/docs/News4.rst b/docs/News4.rst
index 11f76d4..546a7fd 100644
--- a/docs/News4.rst
+++ b/docs/News4.rst
@@ -5,8 +5,6 @@ News
.. contents:: Contents:
:backlinks: none
-.. _start:
-
SQLObject 0.15.1
================
diff --git a/docs/News5.rst b/docs/News5.rst
index 6f1118c..32f6659 100644
--- a/docs/News5.rst
+++ b/docs/News5.rst
@@ -5,8 +5,6 @@ News
.. contents:: Contents:
:backlinks: none
-.. _start:
-
SQLObject 2.2.1
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/f275254bfb51e2d3faff5a5bca1116ecee542e1c
commit f275254bfb51e2d3faff5a5bca1116ecee542e1c
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 13:43:09 2017 +0300
Docs: Add docs/api/sqlobject.tests.test_csvimport.rst
[skip ci]
diff --git a/docs/api/sqlobject.tests.test_csvimport.rst b/docs/api/sqlobject.tests.test_csvimport.rst
new file mode 100644
index 0000000..56981a8
--- /dev/null
+++ b/docs/api/sqlobject.tests.test_csvimport.rst
@@ -0,0 +1,7 @@
+sqlobject\.tests\.test\_csvimport module
+========================================
+
+.. automodule:: sqlobject.tests.test_csvimport
+ :members:
+ :undoc-members:
+ :show-inheritance:
http://sourceforge.net/p/sqlobject/sqlobject/ci/a9b98c8b18916c6701f8d1ef6899b26e272a8cd4
commit a9b98c8b18916c6701f8d1ef6899b26e272a8cd4
Author: Oleg Broytman <ph...@ph...>
Date: Fri Dec 15 14:55:47 2017 +0300
Docs: Regenerate API docs
[skip ci]
diff --git a/docs/api/sqlobject.boundattributes.rst b/docs/api/sqlobject.boundattributes.rst
index 1518f8d..ebc0ab5 100644
--- a/docs/api/sqlobject.boundattributes.rst
+++ b/docs/api/sqlobject.boundattributes.rst
@@ -1,5 +1,5 @@
-sqlobject.boundattributes module
-================================
+sqlobject\.boundattributes module
+=================================
.. automodule:: sqlobject.boundattributes
:members:
diff --git a/docs/api/sqlobject.cache.rst b/docs/api/sqlobject.cache.rst
index 6c74d5b..657e1e8 100644
--- a/docs/api/sqlobject.cache.rst
+++ b/docs/api/sqlobject.cache.rst
@@ -1,5 +1,5 @@
-sqlobject.cache module
-======================
+sqlobject\.cache module
+=======================
.. automodule:: sqlobject.cache
:members:
diff --git a/docs/api/sqlobject.classregistry.rst b/docs/api/sqlobject.classregistry.rst
index 0882491..80ed01a 100644
--- a/docs/api/sqlobject.classregistry.rst
+++ b/docs/api/sqlobject.classregistry.rst
@@ -1,5 +1,5 @@
-sqlobject.classregistry module
... 1884 lines suppressed ...
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-12-11 18:18:01
|
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 fdc40081eb3e12591e5d6603204854512e1a4ca8 (commit)
from 520518ce50c7f0df6e4212b55e5a12009c6e2844 (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/fdc40081eb3e12591e5d6603204854512e1a4ca8
commit fdc40081eb3e12591e5d6603204854512e1a4ca8
Author: Oleg Broytman <ph...@ph...>
Date: Mon Dec 11 20:54:27 2017 +0300
CI: Rename TOX_ENV -> TOXENV; execute tox (no need to pass TOXENV)
diff --git a/.travis.yml b/.travis.yml
index 1719163..72148bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -151,7 +151,7 @@ before_install:
install: travis_retry pip install --upgrade pip setuptools tox coveralls codecov ppu
-script: tox -e ${TOXENV}
+script: tox
after_success:
- cd sqlobject
diff --git a/appveyor.yml b/appveyor.yml
index 6e6512f..c6641fc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,221 +33,221 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
- - TOX_ENV: "py27-mysql-connector-w32"
+ - TOXENV: "py27-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: mysql
- - TOX_ENV: "py34-mysql-connector-w32"
+ - TOXENV: "py34-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34"
db: mysql
- - TOX_ENV: "py35-mysql-connector-w32"
+ - TOXENV: "py35-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35"
db: mysql
- - TOX_ENV: "py36-mysql-connector-w32"
+ - TOXENV: "py36-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36"
db: mysql
- - TOX_ENV: "py27-mysql-pyodbc-w32"
+ - TOXENV: "py27-mysql-pyodbc-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: mysql
- - TOX_ENV: "py34-mysql-pyodbc-w32"
+ - TOXENV: "py34-mysql-pyodbc-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: mysql
- - TOX_ENV: "py27-postgres-psycopg-w32"
+ - TOXENV: "py27-postgres-psycopg-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: postgresql
- - TOX_ENV: "py27-postgres-psycopg-w32"
+ - TOXENV: "py27-postgres-psycopg-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- - TOX_ENV: "py34-postgres-psycopg-w32"
+ - TOXENV: "py34-postgres-psycopg-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34"
db: postgresql
- - TOX_ENV: "py34-postgres-psycopg-w32"
+ - TOXENV: "py34-postgres-psycopg-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- - TOX_ENV: "py35-postgres-psycopg-w32"
+ - TOXENV: "py35-postgres-psycopg-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35"
db: postgresql
- - TOX_ENV: "py35-postgres-psycopg-w32"
+ - TOXENV: "py35-postgres-psycopg-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35-x64"
db: postgresql
- - TOX_ENV: "py36-postgres-psycopg-w32"
+ - TOXENV: "py36-postgres-psycopg-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36"
db: postgresql
- - TOX_ENV: "py36-postgres-psycopg-w32"
+ - TOXENV: "py36-postgres-psycopg-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
db: postgresql
- - TOX_ENV: "py27-postgres-pygresql-w32"
+ - TOXENV: "py27-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- - TOX_ENV: "py34-postgres-pygresql-w32"
+ - TOXENV: "py34-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- - TOX_ENV: "py35-postgres-pygresql-w32"
+ - TOXENV: "py35-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35-x64"
db: postgresql
- - TOX_ENV: "py36-postgres-pygresql-w32"
+ - TOXENV: "py36-postgres-pygresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
db: postgresql
- - TOX_ENV: "py34-pypostgresql-w32"
+ - TOXENV: "py34-pypostgresql-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34"
db: postgresql
- - TOX_ENV: "py34-pypostgresql-w32"
+ - TOXENV: "py34-pypostgresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- - TOX_ENV: "py35-pypostgresql-w32"
+ - TOXENV: "py35-pypostgresql-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35"
db: postgresql
- - TOX_ENV: "py35-pypostgresql-w32"
+ - TOXENV: "py35-pypostgresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35-x64"
db: postgresql
- - TOX_ENV: "py36-pypostgresql-w32"
+ - TOXENV: "py36-pypostgresql-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36"
db: postgresql
- - TOX_ENV: "py36-pypostgresql-w32"
+ - TOXENV: "py36-pypostgresql-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
db: postgresql
- - TOX_ENV: "py27-postgres-pg8000-w32"
+ - TOXENV: "py27-postgres-pg8000-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
db: postgresql
- - TOX_ENV: "py27-postgres-pg8000-w32"
+ - TOXENV: "py27-postgres-pg8000-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- - TOX_ENV: "py34-postgres-pg8000-w32"
+ - TOXENV: "py34-postgres-pg8000-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34"
db: postgresql
- - TOX_ENV: "py34-postgres-pg8000-w32"
+ - TOXENV: "py34-postgres-pg8000-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- - TOX_ENV: "py35-postgres-pg8000-w32"
+ - TOXENV: "py35-postgres-pg8000-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35"
db: postgresql
- - TOX_ENV: "py35-postgres-pg8000-w32"
+ - TOXENV: "py35-postgres-pg8000-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35-x64"
db: postgresql
- - TOX_ENV: "py36-postgres-pg8000-w32"
+ - TOXENV: "py36-postgres-pg8000-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36"
db: postgresql
- - TOX_ENV: "py36-postgres-pg8000-w32"
+ - TOXENV: "py36-postgres-pg8000-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
db: postgresql
- - TOX_ENV: "py27-postgres-pyodbc-w32"
+ - TOXENV: "py27-postgres-pyodbc-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
db: postgresql
- - TOX_ENV: "py34-postgres-pyodbc-w32"
+ - TOXENV: "py34-postgres-pyodbc-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- - TOX_ENV: "py27-sqlite-w32"
+ - TOXENV: "py27-sqlite-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
- - TOX_ENV: "py27-sqlite-w32"
+ - TOXENV: "py27-sqlite-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27-x64"
- - TOX_ENV: "py34-sqlite-w32"
+ - TOXENV: "py34-sqlite-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34"
- - TOX_ENV: "py34-sqlite-w32"
+ - TOXENV: "py34-sqlite-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
- - TOX_ENV: "py35-sqlite-w32"
+ - TOXENV: "py35-sqlite-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35"
- - TOX_ENV: "py35-sqlite-w32"
+ - TOXENV: "py35-sqlite-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35-x64"
- - TOX_ENV: "py36-sqlite-w32"
+ - TOXENV: "py36-sqlite-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36"
- - TOX_ENV: "py36-sqlite-w32"
+ - TOXENV: "py36-sqlite-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
- - TOX_ENV: "py27-sqlite-memory-w32"
+ - TOXENV: "py27-sqlite-memory-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
PYTHON_HOME: "C:\\Python27"
- - TOX_ENV: "py34-sqlite-memory-w32"
+ - TOXENV: "py34-sqlite-memory-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
- - TOX_ENV: "py35-sqlite-memory-w32"
+ - TOXENV: "py35-sqlite-memory-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.5"
PYTHON_HOME: "C:\\Python35"
- - TOX_ENV: "py36-sqlite-memory-w32"
+ - TOXENV: "py36-sqlite-memory-w32"
PYTHON_ARCH: "64"
PYTHON_VERSION: "3.6"
PYTHON_HOME: "C:\\Python36-x64"
@@ -268,7 +268,7 @@ install:
build: false
test_script:
- - "%CMD_IN_ENV% tox -e %TOX_ENV%"
+ - "%CMD_IN_ENV% tox"
after_test:
- "remove-old-files.py -o 180 %LOCALAPPDATA%\\pip\\Cache"
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 2 +-
appveyor.yml | 94 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 48 insertions(+), 48 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-12-10 13:54:49
|
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 520518ce50c7f0df6e4212b55e5a12009c6e2844 (commit)
from 7453dbc816d194e7ed3336ef5123aa4b05d39126 (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/520518ce50c7f0df6e4212b55e5a12009c6e2844
commit 520518ce50c7f0df6e4212b55e5a12009c6e2844
Author: Oleg Broytman <ph...@ph...>
Date: Sun Dec 10 15:53:25 2017 +0300
CI: Upgrade pip and setuptools
diff --git a/.travis.yml b/.travis.yml
index be4d42e..1719163 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -149,7 +149,7 @@ before_install:
sudo chmod 644 /var/lib/firebird/create_test_db;
fi
-install: travis_retry pip install tox coveralls codecov ppu
+install: travis_retry pip install --upgrade pip setuptools tox coveralls codecov ppu
script: tox -e ${TOXENV}
diff --git a/appveyor.yml b/appveyor.yml
index a18c941..6e6512f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -259,7 +259,7 @@ install:
- "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
- "pip --version"
- - "pip install tox ppu"
+ - "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
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 2 +-
appveyor.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-12-10 11:57:37
|
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 7453dbc816d194e7ed3336ef5123aa4b05d39126 (commit)
via 3db1182c8c02635ad5b6e4c950f63ceb21120e2d (commit)
from 76b658299f6eb4b1abc63fac228bd9b5d28cd594 (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/7453dbc816d194e7ed3336ef5123aa4b05d39126
commit 7453dbc816d194e7ed3336ef5123aa4b05d39126
Author: Oleg Broytman <ph...@ph...>
Date: Sun Dec 10 14:02:07 2017 +0300
Build(setup.py): Use python_requires keyword
diff --git a/docs/News.rst b/docs/News.rst
index 3a80743..312aba0 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -17,6 +17,8 @@ Build
``install_requires`` and ``extras_require`` declarative. This makes
the universal wheel truly universal.
+* Use ``python_requires`` keyword in ``setup.py``.
+
SQLObject 3.5.0
===============
diff --git a/setup.py b/setup.py
index 66fdb23..2adc4ab 100755
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,8 @@ if is_setuptools:
'sybase': ['Sybase'],
}
+ kw['python_requires'] = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*'
+
setup(name="SQLObject",
version=version,
description="Object-Relational Manager, aka database wrapper",
http://sourceforge.net/p/sqlobject/sqlobject/ci/3db1182c8c02635ad5b6e4c950f63ceb21120e2d
commit 3db1182c8c02635ad5b6e4c950f63ceb21120e2d
Author: Oleg Broytman <ph...@ph...>
Date: Sun Dec 10 13:55:44 2017 +0300
Build(setup.py): Use python_version environment marker
Use ``python_version`` environment marker in ``setup.py`` to make
``install_requires`` and ``extras_require`` declarative. This makes
the universal wheel truly universal.
diff --git a/docs/News.rst b/docs/News.rst
index bb0d044..3a80743 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -10,6 +10,13 @@ News
SQLObject 3.6.0 (master)
========================
+Build
+=====
+
+* Use ``python_version`` environment marker in ``setup.py`` to make
+ ``install_requires`` and ``extras_require`` declarative. This makes
+ the universal wheel truly universal.
+
SQLObject 3.5.0
===============
diff --git a/setup.py b/setup.py
index 8c2d6e3..66fdb23 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,5 @@
#!/usr/bin/env python
-import sys
from imp import load_source
from os.path import abspath, dirname, join
@@ -27,21 +26,13 @@ if is_setuptools:
[paste.filter_app_factory]
main = sqlobject.wsgi_middleware:make_middleware
"""
- if (sys.version_info[:2] == (2, 7)):
- PY2 = True
- elif (sys.version_info[0] == 3) and (sys.version_info[:2] >= (3, 4)):
- PY2 = False
- else:
- raise ImportError("SQLObject requires Python 2.7 or 3.4+")
-
- kw['install_requires'] = install_requires = []
- if PY2:
- install_requires.append("FormEncode>=1.1.1,!=1.3.0")
- else:
- install_requires.append("FormEncode>=1.3.1")
- install_requires.append("PyDispatcher>=2.0.4")
-
- kw['extras_require'] = extras_require = {
+ kw['install_requires'] = [
+ "FormEncode>=1.1.1,!=1.3.0; python_version=='2.7'",
+ "FormEncode>=1.3.1; python_version>='3.4'",
+ "PyDispatcher>=2.0.4",
+ ]
+
+ kw['extras_require'] = {
# Firebird/Interbase
'fdb': ['fdb'],
'firebirdsql': ['firebirdsql'],
@@ -50,7 +41,10 @@ if is_setuptools:
'adodbapi': ['adodbapi'],
'pymssql': ['pymssql'],
# MySQL
+ 'mysql:python_version=="2.7"': ['MySQL-python'],
+ 'mysql:python_version>="3.4"': ['mysqlclient'],
'mysql-connector': ['mysql-connector'],
+ 'oursql:python_version=="2.7"': ['oursql'],
'pymysql': ['pymysql'],
# ODBC
'odbc': ['pyodbc'],
@@ -71,11 +65,6 @@ if is_setuptools:
'sqlite': ['pysqlite'],
'sybase': ['Sybase'],
}
- if PY2:
- extras_require['mysql'] = ['MySQLdb']
- extras_require['oursql'] = ['oursql']
- else:
- extras_require['mysql'] = ['mysqlclient']
setup(name="SQLObject",
version=version,
-----------------------------------------------------------------------
Summary of changes:
docs/News.rst | 9 +++++++++
setup.py | 33 ++++++++++++---------------------
2 files changed, 21 insertions(+), 21 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-11-15 14:38:53
|
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 76b658299f6eb4b1abc63fac228bd9b5d28cd594 (commit)
from 2ce592300bdd0cfcb444b24cdfd4b2e412fd7bda (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/76b658299f6eb4b1abc63fac228bd9b5d28cd594
commit 76b658299f6eb4b1abc63fac228bd9b5d28cd594
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 15 17:37:31 2017 +0300
Docs(RELEASE-CHECKLIST): Reorder some items
[skip ci]
diff --git a/devscripts/RELEASE-CHECKLIST b/devscripts/RELEASE-CHECKLIST
index efc9d50..c160777 100644
--- a/devscripts/RELEASE-CHECKLIST
+++ b/devscripts/RELEASE-CHECKLIST
@@ -33,16 +33,16 @@
7. Hide/show old releases at PyPI and SourceForge.
-8. Generate new docs using ./build-all-docs. Upload docs using
- ./publish-docs.
+8. Run ../push-all in the development repository to push all branches
+ and tags to the public repositories.
9. Run ../postrelease. The script restores ANNOUNCE.rst from the previous
commit (HEAD~). It calls editor; update next version, remove the list
of contributors and the list of changes, edit download URL in
ANNOUNCE.rst. Edit docs/News.rst - add new version.
-10. Run ../push-all in the development repository to push all branches
- and tags to the public repositories.
+10. Generate new docs using ./build-all-docs. Upload docs using
+ ./publish-docs.
11. Send announcement to the SQLObject mailing list. For a stable
release send announcements to python, python-announce and python-db
-----------------------------------------------------------------------
Summary of changes:
devscripts/RELEASE-CHECKLIST | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-11-15 14:07:36
|
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 annotated tag, 3.5.0 has been created
at 4a8e7d1777ce8058aa720ff13d31a1f3461a1ad3 (tag)
tagging 0684a9b3e4250690cf5ff9ce6753c6735dbd27d0 (commit)
replaces 3.4.0
tagged by Oleg Broytman
on Wed Nov 15 16:56:56 2017 +0300
- Log -----------------------------------------------------------------
Release 3.5.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCgAGBQJaDEeoAAoJEG4IC3C2KHsDwHAP/1Fewj4yGGmF3C9faxXRt5yo
JjULfg8ph/wGuiQ+hASEJKpdWMlTxm23CGURdc9kD5H/GgxKWnOFPqLswvsRoBJI
lx6foJ9xaQe8jxvjxhFnsV/YPNbuyn+WALiDcWjdoNSa19w24IcAJo5sVdInnbFD
q+gCRCF66VWIrvu14EdJTK88FrMHxRY2HMH9bNdV8IQSFled1gCiMJeCdwF9mkjL
u3zuLWWui9b5WVtGtIAiyxbRQ1gvxW+8hJkSKUTw394SQgkxg5nmYHKS5LKyc+vA
QrwROivlZiHWf804KvjpA+U8DYwCvtea5RprvqQz1HRYOqF9G8O0pDt2MIoCN2HD
ZsoChYITB2lsWL3SE26Lwv7L9GO9qmNLPUFt1LpEu2jPVgG+UT7xz+X0cLf0XoBa
8y+6rv5vNgCJ0JbL+s92LwCp57M8/+ntDY4TVcUkh+BWuP5rt/oSeNDwtBvbrXH5
vqLlVvhyG/LHWDAxPWyc99j8QaulcXdBs9DiK7eKOlWV+DQW4iZQRYG8/2/tJXnc
Dw8gm7bbOjHNSZB7leO7noOGdYDRyLclAMWaYKhWWRneBrTYt3vaESh4HJBFP7zK
zNcFgd4mRVhqJUXYo/+ElKMlVZfG0zOCLoB9ubPNlC0qqv9NqhTOuIGmDuQWQ4d+
xFWGK+ZVIDJxtBMT70yb
=1rJ8
-----END PGP SIGNATURE-----
Michael S. Root (2):
Add Python3 special methods for division to SQLExpression
Added minimal unit tests for __truediv__ and __floordiv__
Oleg Broytman (28):
Prepare for the next release
Feat(devscripts): build_docs for 3.4.0
Feat(devscripts): remove html directory after building all docs
Feat(devscripts): Hide old releases at SF
Feat(devscripts): Remove `twine register` from release process
Feat(CI): Remove some less interesting tests
Feat(pg): Restore pg8000 driver
Feat(CI): Add tests for PyGreSQL, py-postgresql and pg8000 at AppVeyor
Tests(CI): Reorder env vars in appveyor.yml
Tests(CI): Remove PyGreSQL tests with 32-bit Python
Feat(setup): Add keywords and platforms
Tests(CI): Fix bugs in py-postgresql at AppVeyor
Tests(CI): Explicitly list python versions
Drivers(SapDB): Update download URLs
Drivers(SapDB): Convert readme.txt to Unix EOL format (LF)
Tests(tox): Use our fork of pg8000
Fix(devscripts): Remove circle.yml from MANIFEST.in
Cleanup: Fix flake8 E722 do not use bare except
Cleanup: Fix flake8 E741 ambiguous variable name 'l'
Docs: Remove generated HTML from eggs/wheels
Fix(pg800): Fix encoding problem under Python 2.7
Fix(pg800): Recognize ('ERROR', 'ERROR', '23505') as DuplicateEntryError
Tests(AppVeyor): Stop all MS SQL tests: too many timeouts
Docs: Update news
Merge pull request #141 from mike1158/master
Docs: Merged a pull request by Michael S. Root
Tests: Add a test for truediv on SQLite
SQLObject 3.5.0 released 15 Nov 2017
Shailesh Mungikar (1):
Fix for #139: autoreconnect does not work with pymysql driver
-----------------------------------------------------------------------
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-11-15 14:07:33
|
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 2ce592300bdd0cfcb444b24cdfd4b2e412fd7bda (commit)
via 0684a9b3e4250690cf5ff9ce6753c6735dbd27d0 (commit)
from ae482753099d74cdb16f83d1124a77acaa3856d7 (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/2ce592300bdd0cfcb444b24cdfd4b2e412fd7bda
commit 2ce592300bdd0cfcb444b24cdfd4b2e412fd7bda
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 15 17:04:21 2017 +0300
Prepare for the next release
[skip ci]
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 15fd72c..2f45be4 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,41 +1,28 @@
Hello!
-I'm pleased to announce version 3.5.0, the first stable release of branch
-3.5 of SQLObject.
+I'm pleased to announce version 3.6.1a1, the first alpha of the upcoming
+release of branch 3.6 of SQLObject.
+I'm pleased to announce version 3.6.1a2, the second alpha of the upcoming
+release of branch 3.6 of SQLObject.
-What's new in SQLObject
-=======================
-
-Contributors for this release are Shailesh Mungikar and Michael S. Root.
-
-Minor features
---------------
-
-* Add Python3 special methods for division to SQLExpression.
- Pull request by Michael S. Root.
+I'm pleased to announce version 3.6.1b1, the first beta of the upcoming
+release of branch 3.6 of SQLObject.
-Drivers
--------
+I'm pleased to announce version 3.6.1rc1, the first release candidate
+of the upcoming release of branch 3.6 of SQLObject.
-* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver.
+I'm pleased to announce version 3.6.0, the first stable release of branch
+3.6 of SQLObject.
-* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
+I'm pleased to announce version 3.6.1, the first bugfix release of branch
+3.6 of SQLObject.
-Documentation
--------------
-* Remove generated HTML from eggs/wheels (docs are installed into wrong
- place). Generated docs are still included in the source distribution.
-
-Tests
------
-
-* Add tests for PyGreSQL, py-postgresql and pg8000 at AppVeyor.
+What's new in SQLObject
+=======================
-* Fixed bugs in py-postgresql at AppVeyor. SQLObject requires
- the latest version of the driver from our fork.
+Contributors for this release are
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -67,7 +54,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.python.org/pypi/SQLObject/3.5.0
+https://pypi.python.org/pypi/SQLObject/3.6.0a0.dev20171115
News and changes:
http://sqlobject.org/News.html
diff --git a/docs/News.rst b/docs/News.rst
index afc6164..bb0d044 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -7,6 +7,9 @@ News
.. _start:
+SQLObject 3.6.0 (master)
+========================
+
SQLObject 3.5.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/0684a9b3e4250690cf5ff9ce6753c6735dbd27d0
commit 0684a9b3e4250690cf5ff9ce6753c6735dbd27d0
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 15 16:47:04 2017 +0300
SQLObject 3.5.0 released 15 Nov 2017
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index bf5903c..15fd72c 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,28 +1,41 @@
Hello!
-I'm pleased to announce version 3.4.1a1, the first alpha of the upcoming
-release of branch 3.4 of SQLObject.
+I'm pleased to announce version 3.5.0, the first stable release of branch
+3.5 of SQLObject.
-I'm pleased to announce version 3.4.1a2, the second alpha of the upcoming
-release of branch 3.4 of SQLObject.
-I'm pleased to announce version 3.4.1b1, the first beta of the upcoming
-release of branch 3.4 of SQLObject.
+What's new in SQLObject
+=======================
-I'm pleased to announce version 3.4.1rc1, the first release candidate
-of the upcoming release of branch 3.4 of SQLObject.
+Contributors for this release are Shailesh Mungikar and Michael S. Root.
-I'm pleased to announce version 3.4.0, the first stable release of branch
-3.4 of SQLObject.
+Minor features
+--------------
-I'm pleased to announce version 3.4.1, the first bugfix release of branch
-3.4 of SQLObject.
+* Add Python3 special methods for division to SQLExpression.
+ Pull request by Michael S. Root.
+Drivers
+-------
-What's new in SQLObject
-=======================
+* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
+ PostgreSQL driver.
+
+* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
+
+Documentation
+-------------
+
+* Remove generated HTML from eggs/wheels (docs are installed into wrong
+ place). Generated docs are still included in the source distribution.
+
+Tests
+-----
+
+* Add tests for PyGreSQL, py-postgresql and pg8000 at AppVeyor.
-Contributors for this release are Shailesh Mungikar, Michael S. Root.
+* Fixed bugs in py-postgresql at AppVeyor. SQLObject requires
+ the latest version of the driver from our fork.
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -54,7 +67,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.python.org/pypi/SQLObject/3.4.1a0.dev20170805
+https://pypi.python.org/pypi/SQLObject/3.5.0
News and changes:
http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 8f49176..d32d412 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-SQLObject 3.4.0
+SQLObject 3.5.0
===============
Thanks for looking at SQLObject. SQLObject is an object-relational
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index 885a017..5fd0c94 100755
--- a/devscripts/build-all-docs
+++ b/devscripts/build-all-docs
@@ -11,7 +11,7 @@ cd "$PROG_DIR" &&
PROG_DIR="`pwd`" &&
cd "$PROG_DIR"/SQLObject &&
-build_docs 3.4.0 &&
+build_docs 3.5.0 &&
build_docs master devel &&
rm -rf docs/html &&
diff --git a/docs/News.rst b/docs/News.rst
index ae62e53..afc6164 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -7,11 +7,13 @@ News
.. _start:
-SQLObject 3.5.0 (master)
-========================
+SQLObject 3.5.0
+===============
-Features
---------
+Released 15 Nov 2017.
+
+Minor features
+--------------
* Add Python3 special methods for division to SQLExpression.
Pull request by Michael S. Root.
@@ -20,7 +22,7 @@ Drivers
-------
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver (from our fork).
+ PostgreSQL driver.
* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index b86d42e..88c8ca0 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -1,7 +1,7 @@
-version = '3.4.0'
+version = '3.5.0'
major = 3
-minor = 4
+minor = 5
micro = 0
release_level = 'final'
serial = 0
-----------------------------------------------------------------------
Summary of changes:
ANNOUNCE.rst | 28 ++++++++++++++--------------
README.rst | 2 +-
devscripts/build-all-docs | 2 +-
docs/News.rst | 13 +++++++++----
sqlobject/__version__.py | 4 ++--
5 files changed, 27 insertions(+), 22 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-11-08 07:03:06
|
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 ae482753099d74cdb16f83d1124a77acaa3856d7 (commit)
via 5d316860a1259d7acbccc4d11166c27329336fb0 (commit)
via 9986fc15b70e281f85d6645f43d4ac1954078d51 (commit)
via ebcecd543fe7a98f2dd66c7af4c10ee877960527 (commit)
via 898ea2a2482a7cab8ab1d835eaf797d33ea6fdd9 (commit)
from 0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe (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/ae482753099d74cdb16f83d1124a77acaa3856d7
commit ae482753099d74cdb16f83d1124a77acaa3856d7
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 8 08:52:00 2017 +0300
Tests: Add a test for truediv on SQLite
diff --git a/sqlobject/tests/test_sqlite.py b/sqlobject/tests/test_sqlite.py
index 442ecf3..4e9611a 100644
--- a/sqlobject/tests/test_sqlite.py
+++ b/sqlobject/tests/test_sqlite.py
@@ -1,7 +1,9 @@
+import math
import threading
import pytest
-from sqlobject import SQLObject, StringCol
+from sqlobject import SQLObject, StringCol, FloatCol
from sqlobject.compat import string_type
+from sqlobject.sqlbuilder import Select
from sqlobject.tests.dbtest import getConnection, setupClass, supports
from sqlobject.tests.dbtest import setSQLiteConnectionFactory
from .test_basic import SOTestSO1
@@ -144,3 +146,29 @@ def test_list_databases():
def test_list_tables():
setupClass(SOTestSO1)
assert SOTestSO1.sqlmeta.table in connection.listTables()
+
+
+class SQLiteTruedivTest(SQLObject):
+ value = FloatCol()
+
+
+def test_truediv():
+ setupClass(SQLiteTruedivTest)
+
+ if SQLiteTruedivTest._connection.dbName == "sqlite":
+ if not SQLiteTruedivTest._connection.using_sqlite2:
+ pytest.skip("These tests require SQLite v2+")
+
+ def SQLiteConnectionFactory(sqlite):
+ class MyConnection(sqlite.Connection):
+ def __init__(self, *args, **kwargs):
+ super(MyConnection, self).__init__(*args, **kwargs)
+ self.create_function("floor", 1, math.floor)
+ return MyConnection
+
+ setSQLiteConnectionFactory(SQLiteTruedivTest, SQLiteConnectionFactory)
+
+ SQLiteTruedivTest(value=-5.0)
+ assert SQLiteTruedivTest._connection.queryAll(
+ SQLiteTruedivTest._connection.sqlrepr(
+ Select(SQLiteTruedivTest.q.value // 4)))[0][0] == -2
http://sourceforge.net/p/sqlobject/sqlobject/ci/5d316860a1259d7acbccc4d11166c27329336fb0
commit 5d316860a1259d7acbccc4d11166c27329336fb0
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 8 08:25:34 2017 +0300
Docs: Merged a pull request by Michael S. Root
[skip ci]
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index 31ffed8..bf5903c 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -22,7 +22,7 @@ I'm pleased to announce version 3.4.1, the first bugfix release of branch
What's new in SQLObject
=======================
-Contributor for this release is Shailesh Mungikar.
+Contributors for this release are Shailesh Mungikar, Michael S. Root.
For a more complete list, please see the news:
http://sqlobject.org/News.html
diff --git a/docs/Authors.rst b/docs/Authors.rst
index 1d0a063..3f3d55b 100644
--- a/docs/Authors.rst
+++ b/docs/Authors.rst
@@ -35,6 +35,7 @@ Contributions have been made by:
* Nathan Edwards <nje5 at georgetown.edu>
* Lutz Steinborn <l.steinborn at 4c-gmbh.de>
* Shailesh Mungikar <shailesh.mungikar at druva.com>
+* Michael S. Root <miker at tippett.com>
* Oleg Broytman <ph...@ph...>
.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
diff --git a/docs/News.rst b/docs/News.rst
index 8bc7582..ae62e53 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -10,6 +10,12 @@ News
SQLObject 3.5.0 (master)
========================
+Features
+--------
+
+* Add Python3 special methods for division to SQLExpression.
+ Pull request by Michael S. Root.
+
Drivers
-------
http://sourceforge.net/p/sqlobject/sqlobject/ci/9986fc15b70e281f85d6645f43d4ac1954078d51
commit 9986fc15b70e281f85d6645f43d4ac1954078d51
Merge: 0a6f19d ebcecd5
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 8 08:18:53 2017 +0300
Merge pull request #141 from mike1158/master
Add Python3 special methods for division to SQLExpression
http://sourceforge.net/p/sqlobject/sqlobject/ci/ebcecd543fe7a98f2dd66c7af4c10ee877960527
commit ebcecd543fe7a98f2dd66c7af4c10ee877960527
Author: Michael S. Root <mi...@ti...>
Date: Tue Nov 7 17:32:36 2017 -0800
Added minimal unit tests for __truediv__ and __floordiv__
diff --git a/sqlobject/tests/test_sqlbuilder.py b/sqlobject/tests/test_sqlbuilder.py
index 9a3b6e3..1d2c850 100644
--- a/sqlobject/tests/test_sqlbuilder.py
+++ b/sqlobject/tests/test_sqlbuilder.py
@@ -57,6 +57,14 @@ def test_modulo():
"(((so_test_sql_builder.so_value) % (2)) = (0))"
+def test_division():
+ SOTestSQLBuilder(name='test', so_value=-11)
+ assert sqlrepr(SOTestSQLBuilder.q.so_value / 4 == -2.75, 'mysql') == \
+ "(((so_test_sql_builder.so_value) / (4)) = (-2.75))"
+ assert sqlrepr(SOTestSQLBuilder.q.so_value // 4 == -3, 'mysql') == \
+ "((FLOOR(((so_test_sql_builder.so_value) / (4)))) = (-3))"
+
+
def test_str_or_sqlrepr():
select = Select(['id', 'name'], staticTables=['employees'],
where='value>0', orderBy='id')
http://sourceforge.net/p/sqlobject/sqlobject/ci/898ea2a2482a7cab8ab1d835eaf797d33ea6fdd9
commit 898ea2a2482a7cab8ab1d835eaf797d33ea6fdd9
Author: Michael S. Root <mi...@ti...>
Date: Mon Oct 30 12:00:11 2017 -0700
Add Python3 special methods for division to SQLExpression
Adds __truediv__ and __floordiv__ (and reciprocals) to better support using
SQLExpression objects in Pythonn3.
Note that __floordiv__ is NOT equivalent to SQL's 'DIV' operator, so the
SQL FLOOR function is used in combination with the / operator.
Should be backwards-compatible with Python2.
diff --git a/sqlobject/sqlbuilder.py b/sqlobject/sqlbuilder.py
index e87ba70..5178c73 100644
--- a/sqlobject/sqlbuilder.py
+++ b/sqlobject/sqlbuilder.py
@@ -137,6 +137,18 @@ class SQLExpression:
def __rdiv__(self, other):
return SQLOp("/", other, self)
+ def __truediv__(self, other):
+ return SQLOp("/", self, other)
+
+ def __rtruediv__(self, other):
+ return SQLOp("/", other, self)
+
+ def __floordiv__(self, other):
+ return SQLConstant("FLOOR")(SQLOp("/", self, other))
+
+ def __rfloordiv__(self, other):
+ return SQLConstant("FLOOR")(SQLOp("/", other, self))
+
def __pos__(self):
return SQLPrefix("+", self)
-----------------------------------------------------------------------
Summary of changes:
ANNOUNCE.rst | 2 +-
docs/Authors.rst | 1 +
docs/News.rst | 6 ++++++
sqlobject/sqlbuilder.py | 12 ++++++++++++
sqlobject/tests/test_sqlbuilder.py | 8 ++++++++
sqlobject/tests/test_sqlite.py | 30 +++++++++++++++++++++++++++++-
6 files changed, 57 insertions(+), 2 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-10-31 19:15:20
|
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 0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe (commit)
via 6b80a2d7bc86f07314fbe666abbed49b777056e2 (commit)
via e624f5bea851154b7c76ff004dd961506e0d3efd (commit)
via e4c5c2867187f6ab729b3f4fb503424e578a7f89 (commit)
from c230e9e8959da4447a578b6cfdb427eb17d43b5f (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/0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe
commit 0a6f19d2d975fc5ac7a5d25259add57bee7f6cfe
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:48:40 2017 +0300
Docs: Update news
diff --git a/docs/News.rst b/docs/News.rst
index 51ad44e..8bc7582 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -22,7 +22,7 @@ Documentation
-------------
* Remove generated HTML from eggs/wheels (docs are installed into wrong
- place). Generated docs are still included in source distribution.
+ place). Generated docs are still included in the source distribution.
Tests
-----
@@ -30,7 +30,7 @@ Tests
* Add tests for PyGreSQL, py-postgresql and pg8000 at AppVeyor.
* Fixed bugs in py-postgresql at AppVeyor. SQLObject requires
- the latest version of the driver from git.
+ the latest version of the driver from our fork.
SQLObject 3.4.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/6b80a2d7bc86f07314fbe666abbed49b777056e2
commit 6b80a2d7bc86f07314fbe666abbed49b777056e2
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:32:50 2017 +0300
Tests(AppVeyor): Stop all MS SQL tests: too many timeouts
diff --git a/appveyor.yml b/appveyor.yml
index 12ae77d..a18c941 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,16 +33,6 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
- - TOX_ENV: "py27-mssql-pyodbc-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: mssql2014
- - TOX_ENV: "py34-mssql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: mssql2014
- TOX_ENV: "py27-mysql-connector-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "2.7"
@@ -273,21 +263,6 @@ install:
# List ODBC drivers
- ps: Get-OdbcDriver -Platform 32-bit | Select-Object -ExpandProperty Name
- ps: Get-OdbcDriver -Platform 64-bit | Select-Object -ExpandProperty Name
- # Enable TCP for mssql
- - 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
http://sourceforge.net/p/sqlobject/sqlobject/ci/e624f5bea851154b7c76ff004dd961506e0d3efd
commit e624f5bea851154b7c76ff004dd961506e0d3efd
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:30:42 2017 +0300
Fix(pg800): Recognize ('ERROR', 'ERROR', '23505') as DuplicateEntryError
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index c48e43f..a306866 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -256,7 +256,10 @@ class PostgresConnection(DBAPI):
raise dberrors.InternalError(ErrorMessage(e))
except self.module.ProgrammingError as e:
msg = ErrorMessage(e)
- if (len(e.args) >= 2) and e.args[1] == '23505':
+ if (
+ (len(e.args) > 2) and (e.args[1] == 'ERROR') and
+ (e.args[2] == '23505')) \
+ or ((len(e.args) >= 2) and (e.args[1] == '23505')):
raise dberrors.DuplicateEntryError(msg)
else:
raise dberrors.ProgrammingError(msg)
http://sourceforge.net/p/sqlobject/sqlobject/ci/e4c5c2867187f6ab729b3f4fb503424e578a7f89
commit e4c5c2867187f6ab729b3f4fb503424e578a7f89
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 31 20:23:19 2017 +0300
Fix(pg800): Fix encoding problem under Python 2.7
diff --git a/.travis.yml b/.travis.yml
index 60548f8..be4d42e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,7 +120,6 @@ matrix:
env: TOXENV=py36-firebirdsql
allow_failures:
- - env: TOXENV=py27-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 b925c44..51ad44e 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -14,8 +14,7 @@ Drivers
-------
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver (from our fork). There is a minor problem
- with Python 2.7.
+ PostgreSQL driver (from our fork).
* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
diff --git a/sqlobject/postgres/pgconnection.py b/sqlobject/postgres/pgconnection.py
index f17b7e0..c48e43f 100644
--- a/sqlobject/postgres/pgconnection.py
+++ b/sqlobject/postgres/pgconnection.py
@@ -235,6 +235,10 @@ class PostgresConnection(DBAPI):
def _executeRetry(self, conn, cursor, query):
if self.debug:
self.printDebug(conn, query, 'QueryR')
+ dbEncoding = self.dbEncoding
+ if dbEncoding and isinstance(query, bytes) and (
+ self.driver == 'pg8000'):
+ query = query.decode(dbEncoding)
try:
return cursor.execute(query)
except self.module.OperationalError as e:
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 1 -
appveyor.yml | 25 -------------------------
docs/News.rst | 7 +++----
sqlobject/postgres/pgconnection.py | 9 ++++++++-
4 files changed, 11 insertions(+), 31 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-10-24 22:04: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 c230e9e8959da4447a578b6cfdb427eb17d43b5f (commit)
from 1ded887f420a85eb243f6e9db76e3c70f8934e8d (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/c230e9e8959da4447a578b6cfdb427eb17d43b5f
commit c230e9e8959da4447a578b6cfdb427eb17d43b5f
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 24 23:56:19 2017 +0300
Docs: Remove generated HTML from eggs/wheels
Generated docs are still included in source distribution.
diff --git a/docs/News.rst b/docs/News.rst
index 978572b..b925c44 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -19,6 +19,12 @@ Drivers
* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
+Documentation
+-------------
+
+* Remove generated HTML from eggs/wheels (docs are installed into wrong
+ place). Generated docs are still included in source distribution.
+
Tests
-----
diff --git a/setup.py b/setup.py
index cba0bf3..8c2d6e3 100755
--- a/setup.py
+++ b/setup.py
@@ -127,39 +127,9 @@ and `GitHub <https://github.com/sqlobject>`_.
packages=["sqlobject"] +
['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
- package_data={"sqlobject":
- [
- "../LICENSE",
- "../docs/*.rst",
- "../docs/html/*",
- "../docs/html/_sources/*",
- "../docs/html/_sources/api/*",
- "../docs/html/_modules/*",
- "../docs/html/_modules/sqlobject/*",
- "../docs/html/_modules/sqlobject/mysql/*",
- "../docs/html/_modules/sqlobject/postgres/*",
- "../docs/html/_modules/sqlobject/manager/*",
- "../docs/html/_modules/sqlobject/inheritance/*",
- "../docs/html/_modules/sqlobject/inheritance/tests/*",
- "../docs/html/_modules/sqlobject/mssql/*",
- "../docs/html/_modules/sqlobject/tests/*",
- "../docs/html/_modules/sqlobject/rdbhost/*",
- "../docs/html/_modules/sqlobject/versioning/*",
- "../docs/html/_modules/sqlobject/versioning/test/*",
- "../docs/html/_modules/sqlobject/util/*",
- "../docs/html/_modules/sqlobject/maxdb/*",
- "../docs/html/_modules/sqlobject/firebird/*",
- "../docs/html/_modules/sqlobject/sybase/*",
- "../docs/html/_modules/sqlobject/sqlite/*",
- "../docs/html/_modules/sqlobject/include/*",
- "../docs/html/_modules/sqlobject/include/tests/*",
- "../docs/html/_modules/pydispatch/*",
- "../docs/html/_modules/_pytest/*",
- "../docs/html/api/*",
- "../docs/html/_static/*",
- ],
- "sqlobject.maxdb": ["readme.txt"],
- },
+ package_data={
+ "sqlobject.maxdb": ["readme.txt"],
+ },
requires=['FormEncode', 'PyDispatcher'],
**kw
)
-----------------------------------------------------------------------
Summary of changes:
docs/News.rst | 6 ++++++
setup.py | 36 +++---------------------------------
2 files changed, 9 insertions(+), 33 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-10-23 23:15:39
|
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, pypostgresql has been deleted
was c99867920e19b5a7134c29ad17076f9c1287b972
- Log -----------------------------------------------------------------
c99867920e19b5a7134c29ad17076f9c1287b972 Tests(CI): Test fix_getuser branch for py-postgresql
-----------------------------------------------------------------------
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-10-23 23:06:53
|
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, pypostgresql has been created
at c99867920e19b5a7134c29ad17076f9c1287b972 (commit)
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/c99867920e19b5a7134c29ad17076f9c1287b972
commit c99867920e19b5a7134c29ad17076f9c1287b972
Author: Oleg Broytman <ph...@ph...>
Date: Wed Aug 23 09:05:38 2017 +0300
Tests(CI): Test fix_getuser branch for py-postgresql
diff --git a/.travis.yml b/.travis.yml
index 60548f8..6e7f9c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
# Other branches can allow themselves.
branches:
only:
- - master
+ - pypostgresql
# Prefer docker container with setuid/sudo
sudo: required
@@ -15,149 +15,18 @@ python:
cache: pip
addons:
- apt:
- packages:
- - python-egenix-mxdatetime
- - python-mysqldb
- - python-psycopg2
- - python3-psycopg2
- - firebird2.5-super
postgresql: "9.4"
matrix:
include:
- - python: "2.7"
- env: TOXENV=py27-mysqldb
- - python: "3.4"
- env: TOXENV=py34-mysqlclient
- - python: "3.5"
- env: TOXENV=py35-mysqlclient
- - python: "3.6"
- env: TOXENV=py36-mysqlclient
- - python: "2.7"
- env: TOXENV=py27-mysql-connector
- - python: "3.4"
- env: TOXENV=py34-mysql-connector
- - python: "3.5"
- env: TOXENV=py35-mysql-connector
- - python: "3.6"
- env: TOXENV=py36-mysql-connector
- - python: "2.7"
- env: TOXENV=py27-mysql-oursql
- - python: "2.7"
- env: TOXENV=py27-pymysql
- - python: "3.4"
- env: TOXENV=py34-pymysql
- - python: "3.5"
- env: TOXENV=py35-pymysql
- - python: "3.6"
- env: TOXENV=py36-pymysql
- - python: "2.7"
- env: TOXENV=py27-postgres-psycopg
- - python: "3.4"
- env: TOXENV=py34-postgres-psycopg
- - python: "3.5"
- env: TOXENV=py35-postgres-psycopg
- - python: "3.6"
- env: TOXENV=py36-postgres-psycopg
- - python: "2.7"
- env: TOXENV=py27-postgres-pygresql
- - python: "3.4"
- env: TOXENV=py34-postgres-pygresql
- - python: "3.5"
- env: TOXENV=py35-postgres-pygresql
- - python: "3.6"
- env: TOXENV=py36-postgres-pygresql
- python: "3.4"
env: TOXENV=py34-pypostgresql
- - python: "3.5"
- env: TOXENV=py35-pypostgresql
- - python: "3.6"
- env: TOXENV=py36-pypostgresql
- - python: "2.7"
- env: TOXENV=py27-postgres-pg8000
- - python: "3.4"
- env: TOXENV=py34-postgres-pg8000
- - python: "3.5"
- env: TOXENV=py35-postgres-pg8000
- - python: "3.6"
- env: TOXENV=py36-postgres-pg8000
- - python: "2.7"
- env: TOXENV=py27-sqlite
- - python: "3.4"
- env: TOXENV=py34-sqlite
- - python: "3.5"
- env: TOXENV=py35-sqlite
- - python: "3.6"
- env: TOXENV=py36-sqlite
- - python: "2.7"
- env: TOXENV=py27-sqlite-memory
- - python: "3.4"
- env: TOXENV=py34-sqlite-memory
- - python: "3.5"
- env: TOXENV=py35-sqlite-memory
- - python: "3.6"
- env: TOXENV=py36-sqlite-memory
- - python: "2.7"
- env: TOXENV=py27-flake8
- - python: "3.4"
- env: TOXENV=py34-flake8
- - python: "2.7"
- env: TOXENV=py27-firebird-fdb
- - python: "3.4"
- env: TOXENV=py34-firebird-fdb
- - python: "3.5"
- env: TOXENV=py35-firebird-fdb
- - python: "3.6"
- env: TOXENV=py36-firebird-fdb
- - python: "2.7"
- env: TOXENV=py27-firebirdsql
- - python: "3.4"
- env: TOXENV=py34-firebirdsql
- - python: "3.5"
- env: TOXENV=py35-firebirdsql
- - python: "3.6"
- env: TOXENV=py36-firebirdsql
-
- allow_failures:
- - env: TOXENV=py27-postgres-pg8000
- - env: TOXENV=py27-firebird-fdb
- - env: TOXENV=py34-firebird-fdb
- - env: TOXENV=py35-firebird-fdb
- - env: TOXENV=py36-firebird-fdb
- - env: TOXENV=py27-firebirdsql
- - env: TOXENV=py34-firebirdsql
- - env: TOXENV=py35-firebirdsql
- - env: TOXENV=py36-firebirdsql
fast_finish: true
-before_install:
- # 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.
- # Copied password initializtion from
- # https://github.com/xdenser/node-firebird-libfbclient/blob/master/.travis.yml
- - if [[ $TOXENV = *firebird* ]]; then
- sudo sed -i /etc/default/firebird2.5 -e 's/=no/=yes/' &&
- sudo /etc/init.d/firebird2.5-super start && sleep 5 &&
- sudo /bin/bash -c '(export FB_VER="2.5"; export FB_FLAVOUR="super";source /usr/share/firebird2.5-common/functions.sh; writeNewPassword masterkey)' &&
- sudo gsec -user sysdba -pass masterkey -add test -pw test &&
- sudo /bin/bash -c "echo \"CREATE DATABASE 'localhost:/tmp/test.fdb';\" > /var/lib/firebird/create_test_db" &&
- sudo chmod 644 /var/lib/firebird/create_test_db;
- fi
-
-install: travis_retry pip install tox coveralls codecov ppu
+install: travis_retry pip install tox ppu
script: tox -e ${TOXENV}
-after_success:
- - cd sqlobject
- - coveralls
- - codecov
-
before_cache:
- remove-old-files.py -o 180 ~/.cache/pip
diff --git a/appveyor.yml b/appveyor.yml
index 12ae77d..12982dd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ version: '{branch}-{build}'
# Other branches can allow themselves.
branches:
only:
- - master
+ - pypostgresql
skip_branch_with_pr: false
skip_tags: true
@@ -18,11 +18,9 @@ cache:
clone_depth: 50
services:
- - mysql
- postgresql
environment:
- MYSQL_PWD: "Password12!"
PGUSER: "postgres"
PGPASSWORD: "Password12!"
@@ -33,106 +31,6 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\run_with_env.cmd"
matrix:
- - TOX_ENV: "py27-mssql-pyodbc-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: mssql2014
- - TOX_ENV: "py34-mssql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: mssql2014
- - TOX_ENV: "py27-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: mysql
- - TOX_ENV: "py34-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: mysql
- - TOX_ENV: "py35-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: mysql
- - TOX_ENV: "py36-mysql-connector-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: mysql
- - TOX_ENV: "py27-mysql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: mysql
- - TOX_ENV: "py34-mysql-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: mysql
- - TOX_ENV: "py27-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: postgresql
- - TOX_ENV: "py27-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOX_ENV: "py34-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: postgresql
- - TOX_ENV: "py34-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOX_ENV: "py35-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOX_ENV: "py35-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- - TOX_ENV: "py36-postgres-psycopg-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- - TOX_ENV: "py36-postgres-psycopg-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOX_ENV: "py27-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOX_ENV: "py34-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOX_ENV: "py35-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- - TOX_ENV: "py36-postgres-pygresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- TOX_ENV: "py34-pypostgresql-w32"
PYTHON_ARCH: "32"
PYTHON_VERSION: "3.4"
@@ -143,124 +41,6 @@ environment:
PYTHON_VERSION: "3.4"
PYTHON_HOME: "C:\\Python34-x64"
db: postgresql
- - TOX_ENV: "py35-pypostgresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOX_ENV: "py35-pypostgresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- - TOX_ENV: "py36-pypostgresql-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- - TOX_ENV: "py36-pypostgresql-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOX_ENV: "py27-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- db: postgresql
- - TOX_ENV: "py27-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOX_ENV: "py34-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- db: postgresql
- - TOX_ENV: "py34-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOX_ENV: "py35-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- db: postgresql
- - TOX_ENV: "py35-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- db: postgresql
- - TOX_ENV: "py36-postgres-pg8000-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- db: postgresql
- - TOX_ENV: "py36-postgres-pg8000-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- db: postgresql
- - TOX_ENV: "py27-postgres-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- db: postgresql
- - TOX_ENV: "py34-postgres-pyodbc-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- db: postgresql
- - TOX_ENV: "py27-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- - TOX_ENV: "py27-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27-x64"
- - TOX_ENV: "py34-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34"
- - TOX_ENV: "py34-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- - TOX_ENV: "py35-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- - TOX_ENV: "py35-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35-x64"
- - TOX_ENV: "py36-sqlite-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36"
- - TOX_ENV: "py36-sqlite-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
- - TOX_ENV: "py27-sqlite-memory-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "2.7"
- PYTHON_HOME: "C:\\Python27"
- - TOX_ENV: "py34-sqlite-memory-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.4"
- PYTHON_HOME: "C:\\Python34-x64"
- - TOX_ENV: "py35-sqlite-memory-w32"
- PYTHON_ARCH: "32"
- PYTHON_VERSION: "3.5"
- PYTHON_HOME: "C:\\Python35"
- - TOX_ENV: "py36-sqlite-memory-w32"
- PYTHON_ARCH: "64"
- PYTHON_VERSION: "3.6"
- PYTHON_HOME: "C:\\Python36-x64"
install:
# Ensure we use the right python version
@@ -270,24 +50,6 @@ install:
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
- "pip --version"
- "pip install 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
- # Enable TCP for mssql
- - 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
-----------------------------------------------------------------------
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-10-23 23:06:51
|
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 1ded887f420a85eb243f6e9db76e3c70f8934e8d (commit)
via a270c35db17fc66f414a526b0fba549b0e83706c (commit)
from df609592bd34c6c7a496ee636ca4d0fe398d3782 (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/1ded887f420a85eb243f6e9db76e3c70f8934e8d
commit 1ded887f420a85eb243f6e9db76e3c70f8934e8d
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 24 00:24:21 2017 +0300
Cleanup: Fix flake8 E741 ambiguous variable name 'l'
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index 8a57694..a97e1a8 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -62,9 +62,9 @@ class TestPeople:
phone.person = Person.selectBy(name='tim')[0]
else:
phone.person = Person.selectBy(name='bob')[0]
- l = [p.phone for p in Person.selectBy(name='tim')[0].phones]
- l.sort()
- assert l == ['555-394-2930', '555-555-5555']
+ _l = [p.phone for p in Person.selectBy(name='tim')[0].phones]
+ _l.sort()
+ assert _l == ['555-394-2930', '555-555-5555']
Phone.sqlmeta.delColumn(col, changeSchema=True)
Person.sqlmeta.delJoin(join)
diff --git a/sqlobject/tests/test_enum.py b/sqlobject/tests/test_enum.py
index d5cba13..bf2078e 100644
--- a/sqlobject/tests/test_enum.py
+++ b/sqlobject/tests/test_enum.py
@@ -10,66 +10,66 @@ from sqlobject.tests.dbtest import raises, setupClass
class Enum1(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e'])
+ cl = EnumCol(enumValues=['a', 'bcd', 'e'])
def testBad():
setupClass(Enum1)
- for l in ['a', 'bcd', 'a', 'e']:
- Enum1(l=l)
+ for _l in ['a', 'bcd', 'a', 'e']:
+ Enum1(cl=_l)
raises(
(Enum1._connection.module.IntegrityError,
Enum1._connection.module.ProgrammingError,
validators.Invalid),
- Enum1, l='b')
+ Enum1, cl='b')
class EnumWithNone(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e', None])
+ cl = EnumCol(enumValues=['a', 'bcd', 'e', None])
def testNone():
setupClass(EnumWithNone)
- for l in [None, 'a', 'bcd', 'a', 'e', None]:
- e = EnumWithNone(l=l)
- assert e.l == l
+ for _l in [None, 'a', 'bcd', 'a', 'e', None]:
+ e = EnumWithNone(cl=_l)
+ assert e.cl == _l
class EnumWithDefaultNone(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
+ cl = EnumCol(enumValues=['a', 'bcd', 'e', None], default=None)
def testDefaultNone():
setupClass(EnumWithDefaultNone)
e = EnumWithDefaultNone()
- assert e.l is None
+ assert e.cl is None
class EnumWithDefaultOther(SQLObject):
- l = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')
+ cl = EnumCol(enumValues=['a', 'bcd', 'e', None], default='a')
def testDefaultOther():
setupClass(EnumWithDefaultOther)
e = EnumWithDefaultOther()
- assert e.l == 'a'
+ assert e.cl == 'a'
class EnumUnicode(SQLObject):
n = UnicodeCol()
- l = EnumCol(enumValues=['a', 'b'])
+ cl = EnumCol(enumValues=['a', 'b'])
def testUnicode():
setupClass(EnumUnicode)
- EnumUnicode(n=u'a', l='a')
- EnumUnicode(n=u'b', l=u'b')
- EnumUnicode(n=u'\u201c', l='a')
- EnumUnicode(n=u'\u201c', l=u'b')
+ EnumUnicode(n=u'a', cl='a')
+ EnumUnicode(n=u'b', cl=u'b')
+ EnumUnicode(n=u'\u201c', cl='a')
+ EnumUnicode(n=u'\u201c', cl=u'b')
http://sourceforge.net/p/sqlobject/sqlobject/ci/a270c35db17fc66f414a526b0fba549b0e83706c
commit a270c35db17fc66f414a526b0fba549b0e83706c
Author: Oleg Broytman <ph...@ph...>
Date: Tue Oct 24 00:14:06 2017 +0300
Cleanup: Fix flake8 E722 do not use bare except
diff --git a/sqlobject/col.py b/sqlobject/col.py
index 0f35862..6771946 100644
--- a/sqlobject/col.py
+++ b/sqlobject/col.py
@@ -701,7 +701,7 @@ class IntValidator(SOValidator):
if hasattr(value, attr_name):
try:
return converter(value)
- except:
+ except Exception:
break
raise validators.Invalid(
"expected an int in the IntCol '%s', got %s %r instead" % (
@@ -855,7 +855,7 @@ class FloatValidator(SOValidator):
if hasattr(value, attr_name):
try:
return converter(value)
- except:
+ except Exception:
break
raise validators.Invalid(
"expected a float in the FloatCol '%s', got %s %r instead" % (
@@ -1213,7 +1213,7 @@ class SetValidator(SOValidator):
value = (value,)
try:
return ",".join(value)
- except:
+ except Exception:
raise validators.Invalid(
"expected a string or a sequence of strings "
"in the SetCol '%s', got %s %r instead" % (
@@ -1284,7 +1284,7 @@ class DateTimeValidator(validators.DateValidator):
else:
value += '.0'
return datetime.datetime.strptime(value, self.format)
- except:
+ except Exception:
raise validators.Invalid(
"expected a date/time string of the '%s' format "
"in the DateTimeCol '%s', got %s %r instead" % (
@@ -1345,7 +1345,7 @@ if mxdatetime_available:
return DateTime.DateTime(value.year, value.month, value.day,
value.hour, value.minute,
value.second)
- except:
+ except Exception:
raise validators.Invalid(
"expected a date/time string of the '%s' format "
"in the DateTimeCol '%s', got %s %r instead" % (
@@ -1625,7 +1625,7 @@ class DecimalValidator(SOValidator):
value = value.replace(connection.decimalSeparator, ".")
try:
return Decimal(value)
- except:
+ except Exception:
raise validators.Invalid(
"expected a Decimal in the DecimalCol '%s', "
"got %s %r instead" % (
@@ -1646,7 +1646,7 @@ class DecimalValidator(SOValidator):
value = value.replace(connection.decimalSeparator, ".")
try:
return Decimal(value)
- except:
+ except Exception:
raise validators.Invalid(
"can not parse Decimal value '%s' "
"in the DecimalCol from '%s'" % (
diff --git a/sqlobject/dbconnection.py b/sqlobject/dbconnection.py
index ff905f6..41e9b6a 100644
--- a/sqlobject/dbconnection.py
+++ b/sqlobject/dbconnection.py
@@ -1006,7 +1006,7 @@ class ConnectionHub(object):
try:
try:
value = func(*args, **kw)
- except:
+ except Exception:
conn.rollback()
raise
else:
diff --git a/sqlobject/inheritance/__init__.py b/sqlobject/inheritance/__init__.py
index a1340d4..f340e79 100644
--- a/sqlobject/inheritance/__init__.py
+++ b/sqlobject/inheritance/__init__.py
@@ -411,7 +411,7 @@ class InheritableSQLObject(SQLObject):
# TC: the parent if the child can not be created.
try:
super(InheritableSQLObject, self)._create(id, **kw)
- except:
+ except Exception:
# If we are outside a transaction and this is a child,
# destroy the parent
connection = self._connection
diff --git a/sqlobject/inheritance/tests/test_inheritance.py b/sqlobject/inheritance/tests/test_inheritance.py
index e1d51fa..2f5930e 100644
--- a/sqlobject/inheritance/tests/test_inheritance.py
+++ b/sqlobject/inheritance/tests/test_inheritance.py
@@ -79,7 +79,7 @@ def test_inheritance_select():
try:
person = InheritablePerson.byLastName("Oneof")
- except:
+ except Exception:
pass
else:
raise RuntimeError("unknown person %s" % person)
diff --git a/sqlobject/manager/command.py b/sqlobject/manager/command.py
index 2b7bc21..e79053f 100755
--- a/sqlobject/manager/command.py
+++ b/sqlobject/manager/command.py
@@ -1227,7 +1227,7 @@ class CommandUpgrade(CommandRecord):
if not sim:
try:
conn.query(sql)
- except:
+ except Exception:
print("Error in script: %s" % upgrader)
raise
self.update_db(next_version, conn)
diff --git a/sqlobject/mssql/mssqlconnection.py b/sqlobject/mssql/mssqlconnection.py
index 811dcd8..0201031 100644
--- a/sqlobject/mssql/mssqlconnection.py
+++ b/sqlobject/mssql/mssqlconnection.py
@@ -376,7 +376,7 @@ class MSSQLConnection(DBAPI):
server_version = server_version.decode('ascii')
server_version = server_version.split('.')[0]
server_version = int(server_version)
- except:
+ except Exception:
server_version = None # unknown
self._server_version = server_version
return server_version
diff --git a/sqlobject/mysql/mysqlconnection.py b/sqlobject/mysql/mysqlconnection.py
index bcda054..ba7e726 100644
--- a/sqlobject/mysql/mysqlconnection.py
+++ b/sqlobject/mysql/mysqlconnection.py
@@ -462,7 +462,7 @@ class MySQLConnection(DBAPI):
server_version = server_version[0]
server_version = tuple(int(v) for v in server_version.split('.'))
server_version = (server_version, db_tag)
- except:
+ except Exception:
server_version = None # unknown
self._server_version = server_version
return server_version
diff --git a/sqlobject/tests/test_auto.py b/sqlobject/tests/test_auto.py
index e58ab1a..8a57694 100644
--- a/sqlobject/tests/test_auto.py
+++ b/sqlobject/tests/test_auto.py
@@ -193,7 +193,7 @@ class TestAuto:
if dropper:
try:
conn.query(dropper)
- except: # Perhaps we don't have DROP permission
+ except Exception: # Perhaps we don't have DROP permission
pass
def test_classCreate(self):
-----------------------------------------------------------------------
Summary of changes:
sqlobject/col.py | 14 +++++-----
sqlobject/dbconnection.py | 2 +-
sqlobject/inheritance/__init__.py | 2 +-
sqlobject/inheritance/tests/test_inheritance.py | 2 +-
sqlobject/manager/command.py | 2 +-
sqlobject/mssql/mssqlconnection.py | 2 +-
sqlobject/mysql/mysqlconnection.py | 2 +-
sqlobject/tests/test_auto.py | 8 +++---
sqlobject/tests/test_enum.py | 34 ++++++++++++-------------
9 files changed, 34 insertions(+), 34 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
|
From: Oleg B. <no...@so...> - 2017-10-21 22:15:48
|
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 df609592bd34c6c7a496ee636ca4d0fe398d3782 (commit)
via 28c2a5de93940dd7ea540a372d35dd7fa8153267 (commit)
from be6d94db711c29c09a945a1d3294dba7d5fdbb25 (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/df609592bd34c6c7a496ee636ca4d0fe398d3782
commit df609592bd34c6c7a496ee636ca4d0fe398d3782
Author: Oleg Broytman <ph...@ph...>
Date: Sun Oct 22 01:14:09 2017 +0300
Fix(devscripts): Remove circle.yml from MANIFEST.in
We've stopped using Circle CI.
[skip ci]
diff --git a/MANIFEST.in b/MANIFEST.in
index 32ac686..cb6c6a7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,6 @@
global-include *.py *.rst *.txt
recursive-include docs *.css *.html *.js *.gif *.png
-include LICENSE MANIFEST.in .travis.yml circle.yml tox.ini
+include LICENSE MANIFEST.in .travis.yml tox.ini
include debian/* sqlobject/.coveragerc
include docs/Makefile docs/genapidocs docs/rebuild
recursive-exclude devscripts *
http://sourceforge.net/p/sqlobject/sqlobject/ci/28c2a5de93940dd7ea540a372d35dd7fa8153267
commit 28c2a5de93940dd7ea540a372d35dd7fa8153267
Author: Oleg Broytman <ph...@ph...>
Date: Fri Oct 20 22:36:26 2017 +0300
Tests(tox): Use our fork of pg8000
diff --git a/docs/News.rst b/docs/News.rst
index a2e2b25..978572b 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -14,7 +14,8 @@ Drivers
-------
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
- PostgreSQL driver (from git). There is a minor problem with Python 2.7.
+ PostgreSQL driver (from our fork). There is a minor problem
+ with Python 2.7.
* Fix autoreconnect with pymysql driver. Contributed by Shailesh Mungikar.
diff --git a/tox.ini b/tox.ini
index 51231c3..828dff1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,7 +26,7 @@ deps =
postgres-psycopg: psycopg2
postgres-pygresql: pygresql
pypostgresql: git+https://github.com/sqlobject/py-postgresql.git@fix_w32#egg=pypostgresql
- postgres-pg8000: git+https://github.com/mfenniak/pg8000.git#egg=pg8000
+ postgres-pg8000: git+https://github.com/sqlobject/pg8000.git@getuser#egg=pg8000
pyodbc: pyodbc
pypyodbc: pypyodbc
firebird-fdb: fdb
-----------------------------------------------------------------------
Summary of changes:
MANIFEST.in | 2 +-
docs/News.rst | 3 ++-
tox.ini | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
89 messages has been excluded from this view by a project administrator.
