|
From: Oleg B. <no...@so...> - 2017-05-07 14:18:46
|
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 1ba596182f377939a9b907d262d6ea9a40c1ea76 (commit)
via 2085abe0a7b63ab9f4e7bbc802b4239ccdbb3d7d (commit)
via 83dc573193f5f18e5229a1290e3d9a14ed27654b (commit)
via 38ba2a690d6114cd9df5808272117d6fe7dcb546 (commit)
from f7db6df022e81621afc1182f2e5e6ef3bfbe50cc (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/1ba596182f377939a9b907d262d6ea9a40c1ea76
commit 1ba596182f377939a9b907d262d6ea9a40c1ea76
Author: Oleg Broytman <ph...@ph...>
Date: Sun May 7 17:14:24 2017 +0300
Prepare for the next release
[skip ci]
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index fb7e39e..46dc308 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,50 +1,28 @@
Hello!
-I'm pleased to announce version 3.3.0, the first stable release of branch
-3.3 of SQLObject.
+I'm pleased to announce version 3.4.0a1, the first alpha of the upcoming
+release of branch 3.4 of SQLObject.
+I'm pleased to announce version 3.4.0a2, the second alpha of the upcoming
+release of branch 3.4 of SQLObject.
-What's new in SQLObject
-=======================
-
-Features
---------
-
-* Support for Python 2.6 is declared obsolete and will be removed
- in the next release.
-
-Minor features
---------------
-
-* Convert scripts repository to devscripts subdirectory.
- Some of thses scripts are version-dependent so it's better to have them
- in the main repo.
+I'm pleased to announce version 3.4.0b1, the first beta of the upcoming
+release of branch 3.4 of SQLObject.
-* Test for __nonzero__ under Python 2, __bool__ under Python 3 in BoolCol.
+I'm pleased to announce version 3.4.0rc1, the first release candidate
+of the upcoming release of branch 3.4 of SQLObject.
-Drivers (work in progress)
---------------------------
+I'm pleased to announce version 3.4.0, the first stable release of branch
+3.4 of SQLObject.
-* Add support for PyODBC and PyPyODBC (pure-python ODBC DB API driver) for
- MySQL, PostgreSQL and MS SQL. Driver names are ``pyodbc``, ``pypyodbc``
- or ``odbc`` (try ``pyodbc`` and ``pypyodbc``). There are some problems
- with pyodbc and many problems with pypyodbc.
+I'm pleased to announce version 3.4.1, the first bugfix release of branch
+3.4 of SQLObject.
-Documentation
--------------
-* Stop updating http://sqlobject.readthedocs.org/ - it's enough to have
- http://sqlobject.org/
-
-Tests
------
-
-* Run tests at Travis CI and AppVeyor with Python 3.6, x86 and x64.
-
-* Stop running tests at Travis with Python 2.6.
+What's new in SQLObject
+=======================
-* Stop running tests at AppVeyor with pymssql - too many timeouts and
- problems.
+Contributor for this release is
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -76,7 +54,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.python.org/pypi/SQLObject/3.3.0
+https://pypi.python.org/pypi/SQLObject/3.4.0a0.dev20170507
News and changes:
http://sqlobject.org/News.html
diff --git a/docs/News.rst b/docs/News.rst
index d6bafeb..b307bee 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -7,6 +7,9 @@ News
.. _start:
+SQLObject 3.4.0 (master)
+========================
+
SQLObject 3.3.0
===============
http://sourceforge.net/p/sqlobject/sqlobject/ci/2085abe0a7b63ab9f4e7bbc802b4239ccdbb3d7d
commit 2085abe0a7b63ab9f4e7bbc802b4239ccdbb3d7d
Author: Oleg Broytman <ph...@ph...>
Date: Sun May 7 16:07:16 2017 +0300
Release 3.3.0
diff --git a/ANNOUNCE.rst b/ANNOUNCE.rst
index e4759b6..fb7e39e 100644
--- a/ANNOUNCE.rst
+++ b/ANNOUNCE.rst
@@ -1,29 +1,50 @@
Hello!
-I'm pleased to announce version 3.3.0a1, the first alpha of the upcoming
-release of branch 3.2 of SQLObject.
+I'm pleased to announce version 3.3.0, the first stable release of branch
+3.3 of SQLObject.
-I'm pleased to announce version 3.3.0a2, the second alpha of the upcoming
-release of branch 3.2 of SQLObject.
-I'm pleased to announce version 3.3.0b1, the first beta of the upcoming
-release of branch 3.2 of SQLObject.
+What's new in SQLObject
+=======================
-I'm pleased to announce version 3.3.0rc1, the first release candidate
-of the upcoming release of branch 3.2 of SQLObject.
+Features
+--------
-I'm pleased to announce version 3.3.0, the first stable release of branch
-3.2 of SQLObject.
+* Support for Python 2.6 is declared obsolete and will be removed
+ in the next release.
-I'm pleased to announce version 3.3.1, the first bugfix release of branch
-3.2 of SQLObject.
+Minor features
+--------------
+* Convert scripts repository to devscripts subdirectory.
+ Some of thses scripts are version-dependent so it's better to have them
+ in the main repo.
-What's new in SQLObject
-=======================
+* Test for __nonzero__ under Python 2, __bool__ under Python 3 in BoolCol.
+
+Drivers (work in progress)
+--------------------------
+
+* Add support for PyODBC and PyPyODBC (pure-python ODBC DB API driver) for
+ MySQL, PostgreSQL and MS SQL. Driver names are ``pyodbc``, ``pypyodbc``
+ or ``odbc`` (try ``pyodbc`` and ``pypyodbc``). There are some problems
+ with pyodbc and many problems with pypyodbc.
+
+Documentation
+-------------
+
+* Stop updating http://sqlobject.readthedocs.org/ - it's enough to have
+ http://sqlobject.org/
+
+Tests
+-----
+
+* Run tests at Travis CI and AppVeyor with Python 3.6, x86 and x64.
+* Stop running tests at Travis with Python 2.6.
-Contributor for this release is
+* Stop running tests at AppVeyor with pymssql - too many timeouts and
+ problems.
For a more complete list, please see the news:
http://sqlobject.org/News.html
@@ -55,7 +76,7 @@ Mailing list:
https://lists.sourceforge.net/mailman/listinfo/sqlobject-discuss
Download:
-https://pypi.python.org/pypi/SQLObject/3.3.0a0.dev20170110
+https://pypi.python.org/pypi/SQLObject/3.3.0
News and changes:
http://sqlobject.org/News.html
diff --git a/README.rst b/README.rst
index 173a5de..0ba1341 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-SQLObject 3.3.0a0
-=================
+SQLObject 3.3.0
+===============
Thanks for looking at SQLObject. SQLObject is an object-relational
mapper, i.e., a library that will wrap your database tables in Python
diff --git a/devscripts/build-all-docs b/devscripts/build-all-docs
index e659782..47071df 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.2.0 &&
+build_docs 3.3.0 &&
build_docs master devel &&
cd ../SQLObject-docs &&
diff --git a/docs/News.rst b/docs/News.rst
index 1b57475..d6bafeb 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -7,8 +7,10 @@ News
.. _start:
-SQLObject 3.3.0 (master)
-========================
+SQLObject 3.3.0
+===============
+
+Released 7 May 2017.
Features
--------
diff --git a/setup.cfg b/setup.cfg
index d0e62d0..a472979 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
[egg_info]
-tag_build = dev
-tag_date = 1
+tag_build =
+tag_date = 0
tag_svn_revision = 0
[flake8]
diff --git a/setup.py b/setup.py
index ed917f2..640ab22 100755
--- a/setup.py
+++ b/setup.py
@@ -69,7 +69,7 @@ and `GitHub <https://github.com/sqlobject>`_.
:target: https://travis-ci.org/sqlobject/sqlobject
""",
classifiers=[
- "Development Status :: 3 - Alpha",
+ "Development Status :: 5 - Production/Stable",
"Intended Audience :: Developers",
"License :: OSI Approved :: "
"GNU Library or Lesser General Public License (LGPL)",
@@ -89,7 +89,7 @@ and `GitHub <https://github.com/sqlobject>`_.
author_email="ia...@co...",
maintainer="Oleg Broytman",
maintainer_email="ph...@ph...",
- url="http://sqlobject.org/devel/",
+ url="http://sqlobject.org/",
download_url="https://pypi.python.org/pypi/SQLObject/%s" % version,
license="LGPL",
packages=["sqlobject"] +
diff --git a/sqlobject/__version__.py b/sqlobject/__version__.py
index cc4f6fb..cc88e83 100644
--- a/sqlobject/__version__.py
+++ b/sqlobject/__version__.py
@@ -3,6 +3,6 @@ version = '3.3.0'
major = 3
minor = 3
micro = 0
-release_level = 'alpha'
+release_level = 'final'
serial = 0
version_info = (major, minor, micro, release_level, serial)
http://sourceforge.net/p/sqlobject/sqlobject/ci/83dc573193f5f18e5229a1290e3d9a14ed27654b
commit 83dc573193f5f18e5229a1290e3d9a14ed27654b
Author: Oleg Broytman <ph...@ph...>
Date: Sun May 7 15:46:24 2017 +0300
Support for Python 2.6 is declared obsolete
[skip ci]
diff --git a/devscripts/BRANCH-CHECKLIST b/devscripts/BRANCH-CHECKLIST
index 5036e83..2b51cb0 100644
--- a/devscripts/BRANCH-CHECKLIST
+++ b/devscripts/BRANCH-CHECKLIST
@@ -18,9 +18,10 @@ a branch, a commit id or a tag.
1c. The script updates versions in ANNOUNCE.rst.
-2. To deprecate a version of Python edit files docs/News.rst,
- docs/SQLObject.rst, docs/TODO.rst, sqlobject/main.py, README.rst and
- setup.py in master.
+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.
3. Do a null-merge from the new branch to the higher branch or the
master.
diff --git a/docs/News.rst b/docs/News.rst
index cb22978..1b57475 100644
--- a/docs/News.rst
+++ b/docs/News.rst
@@ -10,6 +10,12 @@ News
SQLObject 3.3.0 (master)
========================
+Features
+--------
+
+* Support for Python 2.6 is declared obsolete and will be removed
+ in the next release.
+
Minor features
--------------
diff --git a/docs/TODO.rst b/docs/TODO.rst
index 2ae19ac..3bf6a66 100644
--- a/docs/TODO.rst
+++ b/docs/TODO.rst
@@ -1,6 +1,8 @@
TODO
----
+* Stop supporting Python 2.6. Fix dbconnection.py and joins.py.
+
* PyPy.
* Quote table/column names that are reserved keywords (order => "order",
diff --git a/sqlobject/main.py b/sqlobject/main.py
index 0ac510c..cb262ad 100644
--- a/sqlobject/main.py
+++ b/sqlobject/main.py
@@ -693,9 +693,9 @@ def deprecated(message, level=1, stacklevel=2):
if warnings_level is not None and warnings_level <= level:
warnings.warn(message, DeprecationWarning, stacklevel=stacklevel)
-# if sys.version_info[:2] < (2, 6):
-# deprecated("Support for Python 2.5 has been declared obsolete "
-# "and will be removed in the next release of SQLObject")
+if sys.version_info[:2] < (2, 7):
+ deprecated("Support for Python 2.6 has been declared obsolete "
+ "and will be removed in the next release of SQLObject")
def setDeprecationLevel(warning=1, exception=None):
http://sourceforge.net/p/sqlobject/sqlobject/ci/38ba2a690d6114cd9df5808272117d6fe7dcb546
commit 38ba2a690d6114cd9df5808272117d6fe7dcb546
Author: Oleg Broytman <ph...@ph...>
Date: Sun May 7 13:00:08 2017 +0300
Fix tox.ini: Add py26 basepython
[skip ci]
diff --git a/tox.ini b/tox.ini
index 6f27b6a..36a5422 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ envlist = py{26,27}-{mysqldb,mysql-oursql},py{34,35,36}-{mysqlclient,pypostgresq
# Ensure we cd into sqlobject before running the tests
changedir = ./sqlobject/
basepython =
+ py26: {env:TOXPYTHON:python2.6}
py27: {env:TOXPYTHON:python2.7}
py34: {env:TOXPYTHON:python3.4}
py35: {env:TOXPYTHON:python3.5}
-----------------------------------------------------------------------
Summary of changes:
ANNOUNCE.rst | 27 +++++++++++++--------------
README.rst | 4 ++--
devscripts/BRANCH-CHECKLIST | 7 ++++---
devscripts/build-all-docs | 2 +-
docs/News.rst | 13 ++++++++++++-
docs/TODO.rst | 2 ++
setup.cfg | 4 ++--
setup.py | 4 ++--
sqlobject/__version__.py | 2 +-
sqlobject/main.py | 6 +++---
tox.ini | 1 +
11 files changed, 43 insertions(+), 29 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
