|
From: Oleg B. <no...@so...> - 2016-08-09 03:41:54
|
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 12790bba0f012954f3811d54a5aeb546e629c7ff (commit)
via 372fa6303abde2fa1afa32b44b3692614fc72c23 (commit)
via 84097cfaf0a72e2a2390f4990168c319c6d619bc (commit)
via 10059c1eff5e0031d188042bfecf92a1881a34e2 (commit)
via 48e06c2db7d67b06a84015c19a9c909629568d69 (commit)
from e37b03a019184e9258e67da1716c4898c9d2b429 (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/12790bba0f012954f3811d54a5aeb546e629c7ff
commit 12790bba0f012954f3811d54a5aeb546e629c7ff
Author: Oleg Broytman <ph...@ph...>
Date: Tue Aug 9 06:26:24 2016 +0300
For Python >= 3.4 minimal FormEncode version is now 1.3.1
With FormEncode 1.3.1 we no longer need `rm FormEncode-1.3.0.whl` hack.
diff --git a/docs/News.txt b/docs/News.txt
index f5d3a99..40139d6 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -22,6 +22,8 @@ Features
* Add JSONCol, a universal json column.
+* For Python >= 3.4 minimal FormEncode version is now 1.3.1.
+
Documentation
-------------
diff --git a/pip-install b/pip-install
deleted file mode 100755
index 144d76f..0000000
--- a/pip-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-# Remove broken FormEncode wheel
-rm -f "$HOME"/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
-
-exec pip install "$@"
diff --git a/requirements.txt b/requirements.txt
index b670458..8921406 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
--install-option="--compile --optimize"
-FormEncode >= 1.1.1; python_version >= '2.6' and python_version < '3.0'
-FormEncode >= 1.3.0; python_version >= '3.4'
+FormEncode >= 1.1.1, != 1.3.0; python_version >= '2.6' and python_version < '3.0'
+FormEncode >= 1.3.1; python_version >= '3.4'
PyDispatcher >= 2.0.4
diff --git a/setup.py b/setup.py
index a5c4b88..86bbc32 100755
--- a/setup.py
+++ b/setup.py
@@ -31,9 +31,9 @@ if is_setuptools:
"""
install_requires = []
if (sys.version_info[0] == 2) and (sys.version_info[:2] >= (2, 6)):
- install_requires.append("FormEncode>=1.1.1")
+ install_requires.append("FormEncode>=1.1.1,!=1.3.0")
elif (sys.version_info[0] == 3) and (sys.version_info[:2] >= (3, 4)):
- install_requires.append("FormEncode>=1.3.0")
+ install_requires.append("FormEncode>=1.3.1")
else:
raise ImportError("SQLObject requires Python 2.6, 2.7 or 3.4+")
install_requires.append("PyDispatcher>=2.0.4")
diff --git a/tox.ini b/tox.ini
index 42a8e8e..b31b733 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,13 +17,12 @@ basepython =
deps =
pytest
pytest-cov
- py26,py27: FormEncode >= 1.1.1
- py34: FormEncode >= 1.3.0
+ py26,py27: FormEncode >= 1.1.1, != 1.3.0
+ py34: FormEncode >= 1.3.1
PyDispatcher>=2.0.4
mysql: mysql-python
mysqlclient: mysqlclient
postgres: psycopg2
-install_command=./pip-install {opts} {packages}
passenv = CI TRAVIS TRAVIS_*
# MySQL test environments
http://sourceforge.net/p/sqlobject/sqlobject/ci/372fa6303abde2fa1afa32b44b3692614fc72c23
commit 372fa6303abde2fa1afa32b44b3692614fc72c23
Author: Oleg Broytman <ph...@ph...>
Date: Tue Aug 9 06:11:17 2016 +0300
Simplify tox.ini fake8 env even further
Use global changedir (sqlobject) and run with the current directory.
diff --git a/tox.ini b/tox.ini
index cd3e609..42a8e8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -80,12 +80,10 @@ commands =
basepython = python2.7
deps =
flake8
-changedir =
-commands = flake8 sqlobject
+commands = flake8 .
[testenv:py34-flake8]
basepython = python3.4
deps =
flake8
-changedir =
-commands = flake8 sqlobject
+commands = flake8 .
http://sourceforge.net/p/sqlobject/sqlobject/ci/84097cfaf0a72e2a2390f4990168c319c6d619bc
commit 84097cfaf0a72e2a2390f4990168c319c6d619bc
Author: Oleg Broytman <ph...@ph...>
Date: Tue Aug 9 05:26:54 2016 +0300
Fix bashism: ~ => $HOME
diff --git a/pip-install b/pip-install
index 096e3b7..144d76f 100755
--- a/pip-install
+++ b/pip-install
@@ -1,6 +1,6 @@
#! /bin/sh
# Remove broken FormEncode wheel
-rm -f ~/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
+rm -f "$HOME"/.cache/pip/wheels/89/df/07/2bb5e9f2c89f5dfa839a366f4148cfd1ee9bc9c661b7160cc6/FormEncode-1.3.0-py2.py3-none-any.whl
exec pip install "$@"
http://sourceforge.net/p/sqlobject/sqlobject/ci/10059c1eff5e0031d188042bfecf92a1881a34e2
commit 10059c1eff5e0031d188042bfecf92a1881a34e2
Author: Oleg Broytman <ph...@ph...>
Date: Tue Aug 9 05:22:38 2016 +0300
Rename pip-wrapper -> pip-install
diff --git a/pip-wrapper b/pip-install
similarity index 100%
rename from pip-wrapper
rename to pip-install
diff --git a/tox.ini b/tox.ini
index e46c895..cd3e609 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ deps =
mysql: mysql-python
mysqlclient: mysqlclient
postgres: psycopg2
-install_command=./pip-wrapper {opts} {packages}
+install_command=./pip-install {opts} {packages}
passenv = CI TRAVIS TRAVIS_*
# MySQL test environments
http://sourceforge.net/p/sqlobject/sqlobject/ci/48e06c2db7d67b06a84015c19a9c909629568d69
commit 48e06c2db7d67b06a84015c19a9c909629568d69
Author: Oleg Broytman <ph...@ph...>
Date: Mon Aug 8 10:46:12 2016 +0300
Enable pip cache on Travis
diff --git a/.travis.yml b/.travis.yml
index 42c10af..8ff1585 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
language: python
+cache: pip
+
addons:
postgresql: "9.4"
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 2 ++
docs/News.txt | 2 ++
pip-wrapper | 6 ------
requirements.txt | 4 ++--
setup.py | 4 ++--
tox.ini | 11 ++++-------
6 files changed, 12 insertions(+), 17 deletions(-)
delete mode 100755 pip-wrapper
hooks/post-receive
--
SQLObject development repository
|
