[SQL-CVS] SQLObject development repository branch master updated. 3.6.0-15-gb32db3b

[Oleg B. <no...@so...>]

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  b32db3beb07d6f054be9fa85022a629389652e34 (commit)
       via  6e17054a2ee004bcaeee7e915d31dd9270f7694c (commit)
       via  ce59826cdea8aa02d8695290c92d309ce96e2d34 (commit)
       via  372793d4cc90edf616037409c775cad6ea5db151 (commit)
       via  e7ac97c5a0ce2f6c4d1627ddb103af9956cc5bb2 (commit)
       via  65741c221ba31675e8046c196a3990d15922dba3 (commit)
       via  5de3056d6276941f041adb2ec8f6f62b29c37dc6 (commit)
       via  64177145ad9186a31576451dda9c20ee01c034a2 (commit)
       via  79a9466b4bbaab9b6ac228fbdda6498ad6f62786 (commit)
       via  81e8d6e839b2518f2f13ccf736c58d46fbfe3f6e (commit)
       via  a6dd93557d300a5f6c5f5f15332272ba68182402 (commit)
       via  7b40a34f669819596c00be0e952dd70b24dc90e1 (commit)
       via  a2579ba30985e8019422ab0563a502ddfda42fb6 (commit)
      from  6eaa00e3173bac72d1e32e2be98b44f8ce682983 (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/b32db3beb07d6f054be9fa85022a629389652e34

commit b32db3beb07d6f054be9fa85022a629389652e34
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Apr 1 03:46:11 2018 +0300

    CI(appveyor.yml): Upgrade `pip` using `python -m pip`
    
    Avoid `WindowsError: [Error 5] Access is denied`.

diff --git a/appveyor.yml b/appveyor.yml
index 8c70af6..c42d738 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -145,8 +145,9 @@ install:
   - "SET TOXPYTHON=%PYTHON_HOME%\\python.exe"
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+  - "python -m pip install --upgrade pip setuptools"
+  - "pip install --upgrade tox ppu"
   - "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

http://sourceforge.net/p/sqlobject/sqlobject/ci/6e17054a2ee004bcaeee7e915d31dd9270f7694c

commit 6e17054a2ee004bcaeee7e915d31dd9270f7694c
Author: Oleg Broytman <ph...@ph...>
Date:   Sun Apr 1 03:06:44 2018 +0300

    Build(.gitignore): Ignore `.pytest_cache`
    
    [skip ci]

diff --git a/.gitignore b/.gitignore
index 8647366..9825d01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /.cache/
+/.pytest_cache/
 /.tox/
 /SQLObject.egg-info/
 /build/

http://sourceforge.net/p/sqlobject/sqlobject/ci/ce59826cdea8aa02d8695290c92d309ce96e2d34

commit ce59826cdea8aa02d8695290c92d309ce96e2d34
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 31 20:56:18 2018 +0300

    Build(release): Do not GPG-sign release files
    
    New pypi.io deprecated GPG signatures.
    
    [skip ci]

diff --git a/devscripts/release b/devscripts/release
index 1de1285..3e890b7 100755
--- a/devscripts/release
+++ b/devscripts/release
@@ -34,5 +34,5 @@ if [ "$state" = final ]; then
    ../sftp-frs
 fi &&
 
-twine upload --sign dist/* &&
+twine upload dist/* &&
 exec rm -rf build dist docs/html SQLObject.egg-info

http://sourceforge.net/p/sqlobject/sqlobject/ci/372793d4cc90edf616037409c775cad6ea5db151

commit 372793d4cc90edf616037409c775cad6ea5db151
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Mar 30 23:57:26 2018 +0300

    Build(setup.py): Add long_description_content_type

diff --git a/setup.py b/setup.py
index 752a5a4..c2a18ac 100755
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@ and `GitHub <https://github.com/sqlobject>`_.
 .. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
   :target: https://travis-ci.org/sqlobject/sqlobject
 """,
+      long_description_content_type="text/x-rst",
       classifiers=[
           "Development Status :: 5 - Production/Stable",
           "Intended Audience :: Developers",

http://sourceforge.net/p/sqlobject/sqlobject/ci/e7ac97c5a0ce2f6c4d1627ddb103af9956cc5bb2

commit e7ac97c5a0ce2f6c4d1627ddb103af9956cc5bb2
Author: Oleg Broytman <ph...@ph...>
Date:   Fri Mar 30 00:35:22 2018 +0300

    Build(setup.py): Add `project_urls`

diff --git a/devscripts/BRANCH-CHECKLIST b/devscripts/BRANCH-CHECKLIST
index 280f494..0357e27 100644
--- a/devscripts/BRANCH-CHECKLIST
+++ b/devscripts/BRANCH-CHECKLIST
@@ -8,7 +8,7 @@ a branch, a commit id or a tag.
     __version__.py and News.rst in the branch - set version. In
     setup.cfg in the branch edit section [publish] - uncomment doc-dest
     for stable branch. In setup.py in the branch edit URL (remove
-    '/devel') and download URL. In setup.py and DeveloperGuide.rst edit
+    '/devel') and download URLs. In setup.py and DeveloperGuide.rst edit
     Travis CI build status image URL (change branch). Commit.
 
 1b. If the branching point was master the script checks out master and
diff --git a/devscripts/RELEASE-CHECKLIST b/devscripts/RELEASE-CHECKLIST
index 205f973..29fa8a9 100644
--- a/devscripts/RELEASE-CHECKLIST
+++ b/devscripts/RELEASE-CHECKLIST
@@ -12,7 +12,7 @@
    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
+   Status" in trove classifiers; edit download URLs: if a non-stable
    version - append 'dev' and date stamp, for a stable version remove
    'dev' and date stamp).
 
diff --git a/setup.py b/setup.py
index 7563540..752a5a4 100755
--- a/setup.py
+++ b/setup.py
@@ -58,11 +58,22 @@ and `GitHub <https://github.com/sqlobject>`_.
       url="http://sqlobject.org/",
       download_url="https://pypi.python.org/pypi/SQLObject/%s" %
       sqlobject_version.version,
+      project_urls={
+          'Homepage': 'http://sqlobject.org/',
+          'Development docs': 'http://sqlobject.org/devel/',
+          'Download': 'https://pypi.python.org/pypi/SQLObject/%s' %
+          sqlobject_version.version,
+          'Github repo': 'https://github.com/sqlobject',
+          'Issue tracker': 'https://github.com/sqlobject/sqlobject/issues',
+          'SourceForge project': 'https://sourceforge.net/projects/sqlobject/',
+          'Twitter': 'https://twitter.com/SQLObject',
+          'Wikipedia': 'https://en.wikipedia.org/wiki/SQLObject',
+      },
       keywords=["sql", "orm", "object-relational mapper"],
       license="LGPL",
       platforms="Any",
       packages=["sqlobject"] +
-          ['sqlobject.%s' % package for package in subpackages],
+      ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
       package_data={
           "sqlobject.maxdb": ["readme.txt"],

http://sourceforge.net/p/sqlobject/sqlobject/ci/65741c221ba31675e8046c196a3990d15922dba3

commit 65741c221ba31675e8046c196a3990d15922dba3
Author: Oleg Broytman <ph...@ph...>
Date:   Wed Mar 28 22:57:01 2018 +0300

    Build(setup.py): Use setuptools instead of distutils

diff --git a/setup.py b/setup.py
index 4018c69..7563540 100755
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,7 @@
 
 from imp import load_source
 from os.path import abspath, dirname, join
-
-try:
-    from setuptools import setup
-    is_setuptools = True
-except ImportError:
-    from distutils.core import setup
-    is_setuptools = False
+from setuptools import setup
 
 versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py")
 sqlobject_version = load_source("sqlobject_version", versionpath)
@@ -19,54 +13,6 @@ subpackages = ['firebird', 'include', 'include.tests',
                'sqlite', 'sybase', 'tests', 'util',
                'versioning', 'versioning.test']
 
-kw = {}
-if is_setuptools:
-    kw['entry_points'] = """
-    [paste.filter_app_factory]
-    main = sqlobject.wsgi_middleware:make_middleware
-    """
-    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'],
-        'kinterbasdb': ['kinterbasdb'],
-        # MS SQL
-        'adodbapi': ['adodbapi'],
-        'pymssql': ['pymssql'],
-        # MySQL
-        'mysql:python_version=="2.7"': ['MySQL-python'],
-        'mysql:python_version>="3.4"': ['mysqlclient'],
-        'mysql-connector': ['mysql-connector'],
-        'oursql': ['oursql'],
-        'pymysql': ['pymysql'],
-        # ODBC
-        'odbc': ['pyodbc'],
-        'pyodbc': ['pyodbc'],
-        'pypyodbc': ['pypyodbc'],
-        # PostgreSQL
-        'psycopg1': ['psycopg1'],
-        'psycopg2': ['psycopg2'],
-        'psycopg': ['psycopg2'],
-        'postgres': ['psycopg2'],
-        'postgresql': ['psycopg2'],
-        'pygresql': ['pygresql'],
-        'pypostgresql': ['py-postgresql'],
-        'py-postgresql': ['py-postgresql'],
-        'pg8000': ['pg8000'],
-        #
-        'sapdb': ['sapdb'],
-        'sqlite': ['pysqlite'],
-        'sybase': ['Sybase'],
-    }
-
-    kw['python_requires'] = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*'
-
 setup(name="SQLObject",
       version=sqlobject_version.version,
       description="Object-Relational Manager, aka database wrapper",
@@ -121,8 +67,50 @@ and `GitHub <https://github.com/sqlobject>`_.
       package_data={
           "sqlobject.maxdb": ["readme.txt"],
       },
+      entry_points="""
+      [paste.filter_app_factory]
+      main = sqlobject.wsgi_middleware:make_middleware
+      """,
+      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
       requires=['FormEncode', 'PyDispatcher'],
-      **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",
+      ],
+      extras_require={
+          # Firebird/Interbase
+          'fdb': ['fdb'],
+          'firebirdsql': ['firebirdsql'],
+          'kinterbasdb': ['kinterbasdb'],
+          # MS SQL
+          'adodbapi': ['adodbapi'],
+          'pymssql': ['pymssql'],
+          # MySQL
+          'mysql:python_version=="2.7"': ['MySQL-python'],
+          'mysql:python_version>="3.4"': ['mysqlclient'],
+          'mysql-connector': ['mysql-connector'],
+          'oursql': ['oursql'],
+          'pymysql': ['pymysql'],
+          # ODBC
+          'odbc': ['pyodbc'],
+          'pyodbc': ['pyodbc'],
+          'pypyodbc': ['pypyodbc'],
+          # PostgreSQL
+          'psycopg1': ['psycopg1'],
+          'psycopg2': ['psycopg2'],
+          'psycopg': ['psycopg2'],
+          'postgres': ['psycopg2'],
+          'postgresql': ['psycopg2'],
+          'pygresql': ['pygresql'],
+          'pypostgresql': ['py-postgresql'],
+          'py-postgresql': ['py-postgresql'],
+          'pg8000': ['pg8000'],
+          #
+          'sapdb': ['sapdb'],
+          'sqlite': ['pysqlite'],
+          'sybase': ['Sybase'],
+      },
       )
 
 # Send announce to:

http://sourceforge.net/p/sqlobject/sqlobject/ci/5de3056d6276941f041adb2ec8f6f62b29c37dc6

commit 5de3056d6276941f041adb2ec8f6f62b29c37dc6
Author: Oleg Broytman <ph...@ph...>
Date:   Sat Mar 10 21:06:43 2018 +0300

    CI: Fix .travis.yml
    
    Indent matrix.include.

diff --git a/.travis.yml b/.travis.yml
index 5a6b8e9..32ab10d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,104 +26,104 @@ addons:
 
 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: "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"
-    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
+    - 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: "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"
+      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
... 351 lines suppressed ...


hooks/post-receive
-- 
SQLObject development repository