|
From: Oleg B. <no...@so...> - 2014-12-25 16:18:10
|
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 ebffee39af18dfca7d24a8fd1bd0268d88f9dab2 (commit)
via 3c8b6d0daf664c921c3e8ec19fc0b38dcf6509ea (commit)
via c7f73aa33560f4c789c6a3bbf8643e77bcbd0239 (commit)
via 949c93965f1635e3065af0e1725f5611e45dbc4c (commit)
via 64d1287d98216ca730933e29c56b333ca9891d3e (commit)
via 8939f190a0ffd3db2bb7a8fa4fe100499fa0c9be (commit)
from 3cec735a8a887b6e276784e02ef30633dd3e5797 (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/ebffee39af18dfca7d24a8fd1bd0268d88f9dab2
commit ebffee39af18dfca7d24a8fd1bd0268d88f9dab2
Author: Oleg Broytman <ph...@ph...>
Date: Thu Dec 25 19:16:22 2014 +0300
Ian Cordasco started to work on porting SO to Python 3.4
diff --git a/setup.py b/setup.py
index 3164af8..fb7c03b 100755
--- a/setup.py
+++ b/setup.py
@@ -62,14 +62,15 @@ and `GitHub <https://github.com/sqlobject>`_.
:target: https://travis-ci.org/sqlobject/sqlobject
""",
classifiers=[
- "Development Status :: 1 - Planning",
+ "Development Status :: 2 - Pre-Alpha",
"Intended Audience :: Developers",
"License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 2 :: Only",
+ "Programming Language :: Python :: 3",
+ "Programming Language :: Python :: 3.4",
"Topic :: Database",
"Topic :: Database :: Front-Ends",
"Topic :: Software Development :: Libraries :: Python Modules",
@@ -79,7 +80,7 @@ and `GitHub <https://github.com/sqlobject>`_.
maintainer="Oleg Broytman",
maintainer_email="ph...@ph...",
url="http://sqlobject.org/devel/",
- download_url="https://pypi.python.org/pypi/SQLObject/%sdev-20141211" % version,
+ download_url="https://pypi.python.org/pypi/SQLObject/%sdev-2014" % version,
license="LGPL",
packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
http://sourceforge.net/p/sqlobject/sqlobject/ci/3c8b6d0daf664c921c3e8ec19fc0b38dcf6509ea
commit 3c8b6d0daf664c921c3e8ec19fc0b38dcf6509ea
Merge: 3cec735 c7f73aa
Author: Ian Cordasco <sig...@us...>
Date: Thu Dec 25 09:59:32 2014 -0600
Merge pull request #1 from sqlobject/feature/tox
Switch to tox
http://sourceforge.net/p/sqlobject/sqlobject/ci/c7f73aa33560f4c789c6a3bbf8643e77bcbd0239
commit c7f73aa33560f4c789c6a3bbf8643e77bcbd0239
Author: Ian Cordasco <gra...@gm...>
Date: Sun Dec 21 09:38:16 2014 -0600
Use flake8 instead of just pyflakes
diff --git a/.travis.yml b/.travis.yml
index c0da25a..6cf7e62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ env:
- TOXENV=py26-sqlite
- TOXENV=py27-sqlite
- TOXENV=py34-sqlite
- - TOXENV=py27-pyflakes
- - TOXENV=py34-pyflakes
+ - TOXENV=py27-flake8
+ - TOXENV=py34-flake8
install: pip install tox
@@ -17,7 +17,7 @@ matrix:
fast_finish: true
allow_failures:
- env: TOXENV=py34-sqlite
- - env: TOXENV=py27-pyflakes
- - env: TOXENV=py34-pyflakes
+ - env: TOXENV=py27-flake8
+ - env: TOXENV=py34-flake8
script: tox -e ${TOXENV}
diff --git a/tox.ini b/tox.ini
index ee4e0e7..48254f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 1.8
-envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-pyflakes
+envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-flake8
# Base test environment settings
[testenv]
@@ -60,12 +60,14 @@ commands =
commands =
py.test -D sqlite:///tmp/sqlobject_test.sqdb
-[testenv:py27-pyflakes]
+[testenv:py27-flake8]
deps =
- pyflakes
-commands = pyflakes .
+ flake8
+changedir =
+commands = flake8 sqlobject/
-[testenv:py34-pyflakes]
+[testenv:py34-flake8]
deps =
- pyflakes
-commands = pyflakes .
+ flake8
+changedir =
+commands = flake8 sqlobject/
http://sourceforge.net/p/sqlobject/sqlobject/ci/949c93965f1635e3065af0e1725f5611e45dbc4c
commit 949c93965f1635e3065af0e1725f5611e45dbc4c
Author: Ian Cordasco <gra...@gm...>
Date: Sat Dec 20 21:06:06 2014 -0600
Add pyflakes environments
diff --git a/.travis.yml b/.travis.yml
index f1c7e99..c0da25a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ env:
- TOXENV=py26-sqlite
- TOXENV=py27-sqlite
- TOXENV=py34-sqlite
+ - TOXENV=py27-pyflakes
+ - TOXENV=py34-pyflakes
install: pip install tox
@@ -15,5 +17,7 @@ matrix:
fast_finish: true
allow_failures:
- env: TOXENV=py34-sqlite
+ - env: TOXENV=py27-pyflakes
+ - env: TOXENV=py34-pyflakes
script: tox -e ${TOXENV}
diff --git a/tox.ini b/tox.ini
index 90db37d..ee4e0e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
[tox]
minversion = 1.8
-envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite
+envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite,{py27,py34}-pyflakes
# Base test environment settings
[testenv]
@@ -59,3 +59,13 @@ commands =
[testenv:py34-sqlite]
commands =
py.test -D sqlite:///tmp/sqlobject_test.sqdb
+
+[testenv:py27-pyflakes]
+deps =
+ pyflakes
+commands = pyflakes .
+
+[testenv:py34-pyflakes]
+deps =
+ pyflakes
+commands = pyflakes .
http://sourceforge.net/p/sqlobject/sqlobject/ci/64d1287d98216ca730933e29c56b333ca9891d3e
commit 64d1287d98216ca730933e29c56b333ca9891d3e
Author: Ian Cordasco <gra...@gm...>
Date: Sat Dec 20 20:46:20 2014 -0600
Simplify travis-ci configuration
diff --git a/.travis.yml b/.travis.yml
index 241234c..f1c7e99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,19 @@
language: python
-python:
- - "2.6"
- - "2.7"
env:
- - DB=mysql
- - DB=postgres
- - DB=sqlite
+ - TOXENV=py26-mysql
+ - TOXENV=py27-mysql
+ - TOXENV=py26-postgres
+ - TOXENV=py27-postgres
+ - TOXENV=py26-sqlite
+ - TOXENV=py27-sqlite
+ - TOXENV=py34-sqlite
-install:
- - if [[ $DB == mysql ]]; then pip install --use-mirrors mysql-python; fi;
- - if [[ $DB == postgres ]]; then pip install --use-mirrors psycopg2; fi;
- - pip install --use-mirrors pytest 'FormEncode>=1.1.1'
- - pip install .
+install: pip install tox
-before_script:
- - if [[ $DB == mysql ]]; then mysql -e 'create database sqlobject_test;'; fi;
- - if [[ $DB == postgres ]]; then psql -c 'create database sqlobject_test;' -U postgres; fi;
+matrix:
+ fast_finish: true
+ allow_failures:
+ - env: TOXENV=py34-sqlite
-script:
- - cd sqlobject
- - if [[ $DB == mysql ]]; then py.test -D mysql://root:@localhost/sqlobject_test; fi
- - if [[ $DB == postgres ]]; then py.test -D postgres://postgres:@localhost/sqlobject_test; fi
- - if [[ $DB == sqlite ]]; then py.test -D sqlite:///tmp/sqlobject_test.sqdb; fi
+script: tox -e ${TOXENV}
http://sourceforge.net/p/sqlobject/sqlobject/ci/8939f190a0ffd3db2bb7a8fa4fe100499fa0c9be
commit 8939f190a0ffd3db2bb7a8fa4fe100499fa0c9be
Author: Ian Cordasco <gra...@gm...>
Date: Sat Dec 20 16:26:33 2014 -0600
Add first pass at tox.ini config file
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..90db37d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,61 @@
+[tox]
+minversion = 1.8
+envlist = {py26,py27}-mysql,{py26,py27}-postgres,{py26,py27,py34}-sqlite
+
+# Base test environment settings
+[testenv]
+# Don't fail or warn on uninstalled commands
+whitelist_externals =
+ psql
+ mysql
+# Ensure we cd into sqlobject before running the tests
+changedir = ./sqlobject/
+basepython =
+ py26: python2.6
+ py27: python2.7
+ py34: python3.4
+deps =
+ pytest
+ FormEncode >= 1.1.1
+ mysql: mysql-python
+ postgres: psycopg2
+
+
+# MySQL test environments
+[testenv:py26-mysql]
+commands =
+ mysql -e 'create database sqlobject_test;'
+ py.test -D mysql://root:@localhost/sqlobject_test
+ mysql -e 'drop database sqlobject_test;'
+
+[testenv:py27-mysql]
+commands =
+ mysql -e 'create database sqlobject_test;'
+ py.test -D mysql://root:@localhost/sqlobject_test
+ mysql -e 'drop database sqlobject_test;'
+
+# PostgreSQL test environments
+[testenv:py26-postgres]
+commands =
+ psql -c 'create database sqlobject_test;' -U postgres
+ py.test -D postgres://postgres:@localhost/sqlobject_test
+ psql -c 'drop database sqlobject_test;' -U postgres
+
+[testenv:py27-postgres]
+commands =
+ psql -c 'create database sqlobject_test;' -U postgres
+ py.test -D postgres://postgres:@localhost/sqlobject_test
+ psql -c 'drop database sqlobject_test;' -U postgres
+
+# sqlite test environments
+[testenv:py26-sqlite]
+commands =
+ py.test -D sqlite:///tmp/sqlobject_test.sqdb
+
+[testenv:py27-sqlite]
+commands =
+ py.test -D sqlite:///tmp/sqlobject_test.sqdb
+
+[testenv:py34-sqlite]
+commands =
+ py.test -D sqlite:///tmp/sqlobject_test.sqdb
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 36 +++++++++++++---------------
setup.py | 7 +++--
tox.ini | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 94 insertions(+), 22 deletions(-)
create mode 100644 tox.ini
hooks/post-receive
--
SQLObject development repository
|
