Merge pull request #240 from snok/sondrelg/ci

Update linting workflow

Author: sondrelg

.github/workflows/codecov.yml

@@ -1,12 +1,38 @@
 name: test
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
-      - uses: snok/.github/workflows/linting@main
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.10"
+      - uses: actions/cache@v2
+        id: cache-venv
+        with:
+          path: .venv
+          key: venv-0  # increment to reset
+      - run: |
+          pip install virtualenv
+          virtualenv .venv
+          source .venv/bin/activate
+          pip install pre-commit
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+      - uses: actions/cache@v2
+        id: pre-commit-cache
+        with:
+          path: ~/.cache/pre-commit
+          key: key-0
+      - run: |
+          source .venv/bin/activate
+          pre-commit run --all-files
 
   get-python-versions:
     runs-on: ubuntu-latest
@@ -17,48 +43,59 @@ jobs:
       id: get-python-versions-action
       with:
         min-version: 3.6
-        include-prereleases: true
+        include-prereleases: false
 
   test:
-    needs: [linting, get-python-versions]
+    needs: [get-python-versions]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version: ${{ fromJson(needs.get-python-versions.outputs.python-matrix) }}
         django-version: [ "2.2", "3.0", "3.1", "3.2" ]
     steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
-      - name: Set up python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "${{ matrix.python-version }}"
+      - uses: actions/cache@v2
+        id: poetry-cache
         with:
-          python-version: ${{ matrix.python-version }}
+          path: ~/.local
+          key: key-0
       - name: Install poetry
         uses: snok/install-poetry@v1
         with:
           version: 1.2.0a2
-          virtualenvs-in-project: true
-      - name: Load cached venv
-        uses: actions/cache@v2
+          virtualenvs-create: false
+      - uses: actions/cache@v2
         id: cache-venv
         with:
           path: .venv
-          key: ${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}-4
-      - name: Install dependencies
-        run: poetry install --no-interaction --no-root
+          key: ${{ hashFiles('**/poetry.lock') }}-0
+      - run: |
+          pip install virtualenv
+          virtualenv .venv
+          source .venv/bin/activate
+          pip install pip setuptools wheel -U
+          poetry install --no-interaction --no-root
         if: steps.cache-venv.outputs.cache-hit != 'true'
-      - name: Install package
-        run: poetry install --no-interaction
-      - name: Install django ${{ matrix.django-version }}
-        run: |
+      - run: |
           source .venv/bin/activate
-          poetry add "Django==${{ matrix.django-version }}"
+          pip install "Django==${{ matrix.django-version }}"
       - name: Install DRF 3.11 on Django 2.2
         if: matrix.django-version == '2.2'
-        run: poetry add "djangorestframework==3.11.1"
+        run: pip install "djangorestframework==3.11.1"
+      - run: pip install coverage
+        if: matrix.python-version == '3.10'
       - name: Run tests
         run: |
           source .venv/bin/activate
-          poetry run pytest --cov=openapi_tester --verbose --assert=plain
+          poetry run pytest --cov=openapi_tester --verbose --assert=plain --cov-report=xml
           poetry run coverage report
+      - uses: codecov/codecov-action@v2
+        with:
+          file: ./coverage.xml
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+        if: matrix.python-version == '3.10'

.github/workflows/testing.yml

@@ -137,7 +137,7 @@ def get_response_schema_section(self, response: td.Response) -> Dict[str, Any]:
             f"\n\nUndocumented status code: {response.status_code}.\n\nDocumented status codes: {list(responses_object.keys())}. ",
         )
 
-        if "openapi" not in schema:
+        if "openapi" not in schema:  # pylint: disable=E1135
             # openapi 2.0, i.e. "swagger" has a different structure than openapi 3.0 status sub-schemas
             return self.get_key_value(status_code_object, "schema")
         content_object = self.get_key_value(