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 30fae4d4bdf41e056d8bb871450ebbe0206c64e0 (commit)
via 00f835ee7ca115ca17065fee5eb14786069ebc1c (commit)
from 859dbffe446aaef2a408066d28ad959f9c20e17a (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/30fae4d4bdf41e056d8bb871450ebbe0206c64e0
commit 30fae4d4bdf41e056d8bb871450ebbe0206c64e0
Author: Oleg Broytman <ph...@ph...>
Date: Thu Nov 24 19:27:58 2016 +0300
Fix DevGuide: we use Sphinx instead of pudge
[skip ci]
diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
index 9d62805..e4dd096 100644
--- a/docs/DeveloperGuide.rst
+++ b/docs/DeveloperGuide.rst
@@ -285,9 +285,8 @@ Documentation
=============
Please write documentation. Documentation should live in the docs/
-directory. Pudge converts documentation from Restructured Text to
-HTML. It presently requires kid 0.9.6, which must be obtained
-separately (for instance, from https://pypi.python.org/pypi/kid/0.9.6).
+directory in reStructuredText format. We use Sphinx to convert docs to
+HTML.
.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
:target: https://sourceforge.net/projects/sqlobject
http://sourceforge.net/p/sqlobject/sqlobject/ci/00f835ee7ca115ca17065fee5eb14786069ebc1c
commit 00f835ee7ca115ca17065fee5eb14786069ebc1c
Author: Oleg Broytman <ph...@ph...>
Date: Wed Nov 23 19:59:11 2016 +0300
Upgrade ez_setup.py
diff --git a/ez_setup.py b/ez_setup.py
index 4ef3ee0..950e120 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -40,6 +40,8 @@ DEFAULT_VERSION = LATEST
DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
DEFAULT_SAVE_DIR = os.curdir
+MEANINGFUL_INVALID_ZIP_ERR_MSG = 'Maybe {0} is corrupted, delete it and try again.'
+
def _python_cmd(*args):
"""
@@ -104,8 +106,16 @@ def archive_context(filename):
old_wd = os.getcwd()
try:
os.chdir(tmpdir)
- with ContextualZipFile(filename) as archive:
- archive.extractall()
+ try:
+ with ContextualZipFile(filename) as archive:
+ archive.extractall()
+ except zipfile.BadZipfile as err:
+ if not err.args:
+ err.args = ('', )
+ err.args = err.args + (
+ MEANINGFUL_INVALID_ZIP_ERR_MSG.format(filename),
+ )
+ raise
# going in the directory
subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
-----------------------------------------------------------------------
Summary of changes:
docs/DeveloperGuide.rst | 5 ++---
ez_setup.py | 14 ++++++++++++--
2 files changed, 14 insertions(+), 5 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
