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

Release v0.2.10

Author: moreati

.ci/README.md

@@ -1,8 +1,8 @@
 
 # `.ci`
 
-This directory contains scripts for Travis CI and (more or less) Azure
-Pipelines, but they will also happily run on any Debian-like machine.
+This directory contains scripts for Continuous Integration platforms. Currently
+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 @@
             '-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(
-    ['docker pull %s' % (ci_lib.image_for_distro(distro),), 'sleep 1']
+batches[-1].extend([
+    '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 @@ def destroy(self, rmtree=shutil.rmtree):
 
 
 class Fold(object):
-    """
-    Bracket a section of stdout with travis_fold markers.
-
-    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))
+    def __init__(self, name): pass
+    def __enter__(self): pass
+    def __exit__(self, _1, _2, _3): pass
 
 
 os.environ.setdefault('ANSIBLE_STRATEGY',

.ci/debops_common_install.py

@@ -13,6 +13,7 @@
         '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 @@
 
 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 @@
 
 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,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)
-
-[![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)
+[![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)