The branch, master has been updated via e06b0f597ec7ea78ad8dd98468ebb2fa8ef5c225 (commit) via 2a08a48dd2451e3139735c8b4f29d6d2516b8eb0 (commit) via d2c71ed9994baa167f7eaf26683f17a0be4b7c02 (commit) via 965d00dee951ffaee7458c7f8cb0a3c38ff46b25 (commit) via c8b75a489c569ea71b2166c6fbcc7f773397da3b (commit) via caf94786ca8c0bc9e3995da0a160c84921a3bfc6 (commit) via ba3ce80c14edac24c21c25aec2c0680df5927f00 (commit) via 993ecb31d2a0606cb1e95e85dd29ea2809866663 (commit) via 4ee577abc529603414836d9929f75fa8d67bbffb (commit) from d77a4d6421a726584da228c30587bfa265fee8ea (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 12 ++++++------ dev-requirements.txt | 2 ++ fabfile.py | 28 +++++++++++++++++++++++++++- paramiko/__init__.py | 4 +++- requirements.txt | 2 -- tox.ini | 2 +- 6 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 dev-requirements.txt delete mode 100644 requirements.txt The diff of changes is: diff --git a/NEWS b/NEWS index ef85eff..7365e4d 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,8 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.11.0 (DD MM YYYY) --------------------- +v1.11.0 (26th Jul 2013) +----------------------- * #98: On Windows, when interacting with the PuTTY PAgeant, Paramiko now creates the shared memory map with explicit Security Attributes of the user, @@ -29,11 +29,11 @@ v1.11.0 (DD MM YYYY) against duplicate entries during subsequent `known_hosts` loads.) Thanks to `@sunweaver` for the contribution. -v1.10.2 (DD MM 2013) --------------------- +v1.10.2 (26th Jul 2013) +----------------------- -* #153, #67: Warn on parse failure when reading known_hosts - file. Thanks to `@glasserc` for patch. +* #153, #67: Warn on parse failure when reading known_hosts file. Thanks to + `@glasserc` for patch. * #146: Indentation fixes for readability. Thanks to Abhinav Upadhyay for catch & patch. diff --git a/dev-requirements.txt b/dev-requirements.txt new file mode 100644 index 0000000..f706c46 --- /dev/null +++ b/dev-requirements.txt @@ -0,0 +1,2 @@ +tox>=1.4,<1.5 +epydoc>=3.0,<3.1 diff --git a/fabfile.py b/fabfile.py index 29394f9..7883dab 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,8 +1,10 @@ -from fabric.api import task, sudo, env +from fabric.api import task, sudo, env, local, hosts from fabric.contrib.project import rsync_project +from fabric.contrib.console import confirm @task +@hosts("paramiko.org") def upload_docs(): target = "/var/www/paramiko.org" staging = "/tmp/paramiko_docs" @@ -11,3 +13,27 @@ def upload_docs(): sudo("rm -rf %s/*" % target) rsync_project(local_dir='docs/', remote_dir=staging, delete=True) sudo("cp -R %s/* %s/" % (staging, target)) + +@task +def build_docs(): + local("epydoc --no-private -o docs/ paramiko") + +@task +def clean(): + local("rm -rf build dist docs") + local("rm -f MANIFEST *.log demos/*.log") + local("rm -f paramiko/*.pyc") + local("rm -f test.log") + local("rm -rf paramiko.egg-info") + +@task +def test(): + local("python ./test.py") + +@task +def release(): + confirm("Only hit Enter if you remembered to update the version!") + confirm("Also, did you remember to tag your release?") + build_docs() + local("python setup.py sdist register upload") + upload_docs() diff --git a/paramiko/__init__.py b/paramiko/__init__.py index 099314e..62cd51c 100644 --- a/paramiko/__init__.py +++ b/paramiko/__init__.py @@ -46,6 +46,8 @@ Paramiko is written entirely in python (no C or platform-dependent code) and is released under the GNU Lesser General Public License (LGPL). Website: U{https://github.com/paramiko/paramiko/} + +Mailing list: U{paramiko@librelist.com<mailto:paramiko@librelist.com>} """ import sys @@ -55,7 +57,7 @@ if sys.version_info < (2, 5): __author__ = "Jeff Forcier <jeff@bitprophet.org>" -__version__ = "1.10.1" +__version__ = "1.11.0" __license__ = "GNU Lesser General Public License (LGPL)" diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 75112a2..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -pycrypto -tox diff --git a/tox.ini b/tox.ini index 6cb8001..e2a8dcf 100644 --- a/tox.ini +++ b/tox.ini @@ -2,5 +2,5 @@ envlist = py25,py26,py27 [testenv] -commands = pip install --use-mirrors -q -r requirements.txt +commands = pip install --use-mirrors -q -r dev-requirements.txt python test.py hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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 "python-paramiko.git" (Debian package python-paramiko).