Updated circle ci, travis cfgs. Updated tunnel run method. (#224)

Author: pkittenis

.circleci/config.yml

@@ -70,7 +70,7 @@ jobs:
       - run:
           name: deps
           command: |
-            pip3 install twine
+            pip3 install -U twine
             which twine
       - run:
           name: Build Wheel
@@ -88,9 +88,6 @@ jobs:
       image: ubuntu-1604:201903-01
     steps:
       - checkout
-      - run:
-          name: sdist
-          command: python setup.py sdist
       - python/load-cache:
           key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
           dependency-file: requirements.txt
@@ -99,11 +96,14 @@ jobs:
           command: |
             sudo apt-get install python-pip
             pip install -U pip
-            pip install twine
+            pip install -U twine
             which twine
       - python/save-cache:
           key: manylinuxdepsv6-{{ .Branch }}.{{ arch }}
           dependency-file: requirements.txt
+      - run:
+          name: sdist
+          command: python setup.py sdist
       - run:
           name: Build Wheels
           command: |
@@ -114,6 +114,7 @@ jobs:
       - run:
           name: PyPi Upload
           command: |
+            ls -lh dist wheelhouse
             twine upload --skip-existing -u $PYPI_USER -p $PYPI_PASSWORD dist/* wheelhouse/*
 
 workflows:

.travis.yml

@@ -43,51 +43,51 @@ jobs:
 
     - stage: test
 
-    - &osx-wheels
-      stage: build packages
-      if: tag IS present
-      os: osx
-      osx_image: xcode11.6
-      before_install:
-        - sudo -H pip install twine
-        - which twine
-      install: skip
-      script:
-        - ./ci/osx-wheel.sh
-      after_success:
-        - if [[ ! -z "$TRAVIS_TAG" ]]; then
-              twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
-          fi
-      language: generic
-      python: skip
+    # - &osx-wheels
+    #   stage: build packages
+    #   if: tag IS present
+    #   os: osx
+    #   osx_image: xcode11.6
+    #   before_install:
+    #     - sudo -H pip install twine
+    #     - which twine
+    #   install: skip
+    #   script:
+    #     - ./ci/osx-wheel.sh
+    #   after_success:
+    #     - if [[ ! -z "$TRAVIS_TAG" ]]; then
+    #           twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheels/*.whl;
+    #       fi
+    #   language: generic
+    #   python: skip
 
-    - <<: *osx-wheels
-      osx_image: xcode11.3
+    # - <<: *osx-wheels
+    #   osx_image: xcode11.3
 
-    - stage: build packages
-      if: tag IS present
-      env:
-        - WHEELS=1
-      os: linux
-      python: 3.6
-      before_install: skip
-      install:
-        - pip install twine
-      script:
-        - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
-          ./ci/travis/build-manylinux.sh;
-      after_success:
-        - if [[ ! -z "$TRAVIS_TAG" ]]; then
-            twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheelhouse/*.whl;
-          fi
-      deploy:
-        - provider: pypi
-          user: pkittenis
-          password:
-            secure: ZQJ41Nguc7Y5XHvtN8lITIiW1S1jvy0p50rssMUJpa9wVZIh0HcW0K/Xv2v17fDNuOvQlVbsF0sY/BmcRfH7c7nzwt7fRXGOjXbZk5djqwusKXL6zlVN7OKjAY6j2EByOjD9UpDDkB5tDqb4lRBCX87wknii/t+7/8P0ddoBojM=
-          on:
-            repo: ParallelSSH/parallel-ssh
-            tags: true
-          distributions: sdist
-          upload_docs: false
-          cleanup: false
+    # - stage: build packages
+    #   if: tag IS present
+    #   env:
+    #     - WHEELS=1
+    #   os: linux
+    #   python: 3.6
+    #   before_install: skip
+    #   install:
+    #     - pip install twine
+    #   script:
+    #     - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" &&
+    #       ./ci/travis/build-manylinux.sh;
+    #   after_success:
+    #     - if [[ ! -z "$TRAVIS_TAG" ]]; then
+    #         twine upload --skip-existing -u $PYPI_U -p $PYPI_P wheelhouse/*.whl;
+    #       fi
+    #   deploy:
+    #     - provider: pypi
+    #       user: pkittenis
+    #       password:
+    #         secure: ZQJ41Nguc7Y5XHvtN8lITIiW1S1jvy0p50rssMUJpa9wVZIh0HcW0K/Xv2v17fDNuOvQlVbsF0sY/BmcRfH7c7nzwt7fRXGOjXbZk5djqwusKXL6zlVN7OKjAY6j2EByOjD9UpDDkB5tDqb4lRBCX87wknii/t+7/8P0ddoBojM=
+    #       on:
+    #         repo: ParallelSSH/parallel-ssh
+    #         tags: true
+    #       distributions: sdist
+    #       upload_docs: false
+    #       cleanup: false

pssh/clients/native/tunnel.py

@@ -292,9 +292,9 @@ def run(self):
             logger.error("Tunnel initilisation failed - %s", ex)
             self.exception = ex
             return
-        logger.debug("Hub ID in run function: %s", self._hub.thread_ident)
-        consume_let = spawn(self._consume_q)
         try:
+            logger.debug("Hub ID in run function: %s", self._hub.thread_ident)
+            consume_let = spawn(self._consume_q)
             consume_let.get()
         except Exception as ex:
             logger.error("Tunnel thread caught exception and will exit:",