From 397851dea346407d4aad5907b4484337298f2c76 Mon Sep 17 00:00:00 2001 From: Panos Date: Sun, 21 Nov 2021 23:23:01 +0000 Subject: [PATCH 1/2] Updated CI cfg --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 58508e64..4c5d5d9c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,7 +122,9 @@ jobs: ./ci/build-manylinux.sh - run: name: sdist - command: python setup.py sdist + command: | + sudo chown circleci -R * + python setup.py sdist - run: name: Upload Wheels command: | From 513f99b01b516ab92433d8af2af80bfb7a2f48a6 Mon Sep 17 00:00:00 2001 From: Panos Date: Sat, 27 Nov 2021 11:52:51 +0000 Subject: [PATCH 2/2] Updated sftp example --- examples/sftp_write.py | 24 +++++++++++++----------- setup.cfg | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/examples/sftp_write.py b/examples/sftp_write.py index 97d072dd..3f5617a3 100755 --- a/examples/sftp_write.py +++ b/examples/sftp_write.py @@ -2,13 +2,9 @@ """Example script for SFTP write""" -from __future__ import print_function - import argparse import socket import os -import pwd -import sys from datetime import datetime from ssh2.session import Session @@ -17,7 +13,7 @@ LIBSSH2_SFTP_S_IROTH -USERNAME = pwd.getpwuid(os.geteuid()).pw_name +USERNAME = os.getlogin() parser = argparse.ArgumentParser() @@ -32,6 +28,7 @@ def main(): + buf_size = 1024 * 1024 args = parser.parse_args() sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((args.host, args.port)) @@ -40,18 +37,23 @@ def main(): s.agent_auth(args.user) sftp = s.sftp_init() mode = LIBSSH2_SFTP_S_IRUSR | \ - LIBSSH2_SFTP_S_IWUSR | \ - LIBSSH2_SFTP_S_IRGRP | \ - LIBSSH2_SFTP_S_IROTH + LIBSSH2_SFTP_S_IWUSR | \ + LIBSSH2_SFTP_S_IRGRP | \ + LIBSSH2_SFTP_S_IROTH f_flags = LIBSSH2_FXF_CREAT | LIBSSH2_FXF_WRITE + fileinfo = os.stat(args.source) print("Starting copy of local file %s to remote %s:%s" % ( args.source, args.host, args.destination)) now = datetime.now() - with open(args.source, 'rb') as local_fh, \ + with open(args.source, 'rb', buf_size) as local_fh, \ sftp.open(args.destination, f_flags, mode) as remote_fh: - for data in local_fh: + data = local_fh.read(buf_size) + while data: remote_fh.write(data) - print("Finished writing remote file in %s" % (datetime.now() - now,)) + data = local_fh.read(buf_size) + taken = datetime.now() - now + rate = (fileinfo.st_size / 1024000.0) / taken.total_seconds() + print(f"Finished writing remote file in {taken}, transfer rate {rate} MB/s") if __name__ == "__main__": diff --git a/setup.cfg b/setup.cfg index 742d8857..83a80f52 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ tag_prefix = '' universal = 0 [flake8] -max-line-length = 80 +max-line-length = 100 filename = *.pyx,*.px* exclude = .eggs,*.egg,build ignore = E901,E225,E226,E227,E999