|
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
|
