Merge branch 'master' into testtools.compat

3 files changed, 36 insertions, 36 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..bb8cbae
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,32 @@
+name: Tests
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+jobs:
+  tests:
+    name: tests-python${{ matrix.python-version }}-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 'pypy3']
+        os: ["ubuntu-latest"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Deps
+        run:  sudo apt-get install check libcppunit-dev
+      - name: Install package
+        run: python -m pip install -U '.[test,docs]'
+      - name: Build
+        run: autoreconf -fi && ./configure && make
+      - name: Run make check
+        run: make check
+      - name: Run make distcheck
+        run: make distcheck
+      - name: Docs build
+        run: rst2html.py README.rst README.html
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 27593b3..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-sudo: false
-dist: focal
-addons:
-  apt:
-    packages:
-      - check
-      - libcppunit-dev
-language: python
-python:
-  - "2.7"
-  - "3.5"
-  - "3.6"
-  - "3.7"
-  - "3.8"
-  - "3.9"
-  - "pypy2.7-7.3.1"
-  - "pypy3.6-7.3.1"
-matrix:
-  include:
-    - dist: xenial
-      python: pypy3.5-7.0.0
-install:
- - pip install -U pip
- - pip install -U wheel setuptools
- - pip install -U .[test,docs]
- - pip list
- - python --version
- - autoreconf -fi && ./configure && make
-script:
- - make check
- - make distcheck
- - rst2html.py README.rst README.html
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index 6ced322..cf4692a 100644
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -1037,7 +1037,7 @@ def TAP2SubUnit(tap, output_stream):
             file_name=file_name, runnable=False)
     for line in tap:
         if state == BEFORE_PLAN:
-            match = re.match("(\d+)\.\.(\d+)\s*(?:\#\s+(.*))?\n", line)
+            match = re.match(r"(\d+)\.\.(\d+)\s*(?:\#\s+(.*))?\n", line)
             if match:
                 state = AFTER_PLAN
                 _, plan_stop, comment = match.groups()
@@ -1050,7 +1050,7 @@ def TAP2SubUnit(tap, output_stream):
                         file_name='tap comment')
                 continue
         # not a plan line, or have seen one before
-        match = re.match("(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP|skip|todo)(?:\s+(.*))?)?\n", line)
+        match = re.match(r"(ok|not ok)(?:\s+(\d+)?)?(?:\s+([^#]*[^#\s]+)\s*)?(?:\s+#\s+(TODO|SKIP|skip|todo)(?:\s+(.*))?)?\n", line)
         if match:
             # new test, emit current one.
             _emit_test()
@@ -1078,7 +1078,7 @@ def TAP2SubUnit(tap, output_stream):
             test_name = "test %d%s" % (plan_start, description)
             plan_start += 1
             continue
-        match = re.match("Bail out\!(?:\s*(.*))?\n", line)
+        match = re.match(r"Bail out\!(?:\s*(.*))?\n", line)
         if match:
             reason, = match.groups()
             if reason is None:
@@ -1090,7 +1090,7 @@ def TAP2SubUnit(tap, output_stream):
             result = "fail"
             state = SKIP_STREAM
             continue
-        match = re.match("\#.*\n", line)
+        match = re.match(r"\#.*\n", line)
         if match:
             log.append(line[:-1])
             continue