Revert "ci: refactor jobs and improve platform coverage (danielgtaylor#128)"

This reverts commit 43c134d

Author: Gobot1234

.github/workflows/ci.yml

@@ -1,69 +1,74 @@
 name: CI
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - '**'
+on: [push, pull_request]
 
 jobs:
-  tests:
-    name: ${{ matrix.os }} / ${{ matrix.python-version }}
-    runs-on: ${{ matrix.os }}-latest
-    strategy:
-      matrix:
-        os: [Ubuntu, MacOS, Windows]
-        python-version: [3.6, 3.7, 3.8]
-        exclude:
-          - os: Windows
-            python-version: 3.6
+
+  check-formatting:
+    runs-on: ubuntu-latest
+
+    name: Consult black on python formatting
+
     steps:
       - uses: actions/checkout@v2
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: 3.7
+      - uses: Gr1N/setup-poetry@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pypoetry/virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+      - name: Install dependencies
+        run: poetry install
+      - name: Run black
+        run: poetry run poe check-style
 
-      - name: Get full Python version
-        id: full-python-version
-        shell: bash
-        run: echo ::set-output name=version::$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))")
+  run-tests:
+    runs-on: ubuntu-latest
 
-      - name: Install poetry
-        shell: bash
-        run: |
-          python -m pip install poetry
-          echo "::set-env name=PATH::$HOME/.poetry/bin:$PATH"
+    name: Run tests with tox
 
-      - name: Configure poetry
-        shell: bash
-        run: poetry config virtualenvs.in-project true
+    strategy:
+      matrix:
+        python-version: [ '3.6', '3.7', '3.8']
 
-      - name: Set up cache
-        uses: actions/cache@v2
-        id: cache
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
         with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('**/poetry.lock') }}
-
-      - name: Ensure cache is healthy
-        if: steps.cache.outputs.cache-hit == 'true'
-        shell: bash
-        run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
-
+          python-version: ${{ matrix.python-version }}
+      - uses: Gr1N/setup-poetry@v2
+      - uses: actions/cache@v2
+        with:
+          path: ~/.cache/pypoetry/virtualenvs
+          key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
       - name: Install dependencies
-        shell: bash
         run: |
-          poetry run python -m pip install pip -U
+          poetry run pip install --upgrade pip
           poetry install
+      - name: Run tests
+        run: |
+          poetry run poe generate
+          poetry run poe test
 
-      - name: Generate code from proto files
-        shell: bash
-        run: poetry run python -m tests.generate -v
+  build-release:
+    runs-on: ubuntu-latest
 
-      - name: Execute test suite
-        shell: bash
-        run: poetry run pytest tests/
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+      - uses: Gr1N/setup-poetry@v2
+      - name: Build package
+        run: poetry build
+      - name: Publish package to PyPI
+        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+        run: poetry publish -n
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.pypi }}

.github/workflows/code-quality.yml

@@ -2,7 +2,6 @@
 import asyncio
 import os
 from pathlib import Path
-import platform
 import shutil
 import sys
 from typing import Set
@@ -135,10 +134,6 @@ def main():
     else:
         verbose = False
         whitelist = set(sys.argv[1:])
-
-    if platform.system() == "Windows":
-        asyncio.set_event_loop(asyncio.ProactorEventLoop())
-
     asyncio.get_event_loop().run_until_complete(generate(whitelist, verbose))