Merge branch 'master' into test-no-deps

Author: Gallaecio

.github/workflows/main.yml

@@ -1,17 +1,21 @@
 name: Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   checks:
-    name: Lint, typing, coverage
-    runs-on: ubuntu-latest
+    name: Lint, typing, security
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: 3.8
 
@@ -27,10 +31,12 @@ jobs:
     - name: Black
       run: tox -e black
 
+    - name: Bandit
+      run: tox -e bandit
 
   tests-ubuntu:
     name: "Test: py${{ matrix.python-version }}, Ubuntu"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
@@ -55,7 +61,7 @@ jobs:
 
   tests-no-extra-deps:
     name: "Test: py${{ matrix.python-version }}, Ubuntu, no extra deps"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8]
@@ -64,7 +70,7 @@ jobs:
     - 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 }}
 
@@ -78,6 +84,9 @@ jobs:
       run: bash <(curl -s https://codecov.io/bash) -cF tests
 
 
+    - name: Upload coverage report
+      run: bash <(curl -s https://codecov.io/bash)
+
   tests-other-os:
     name: "Test: py3.8, ${{ matrix.os }}"
     runs-on: "${{ matrix.os }}"
@@ -89,7 +98,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: 3.8
 
@@ -99,18 +108,17 @@ jobs:
     - name: Run tests
       run: tox -e py
 
-
   publish:
     name: "Publish package to PyPI"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     needs: [checks, tests-ubuntu, tests-other-os]
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
 
     steps:
     - uses: actions/checkout@v2
 
     - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: 3.8
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,typing,black,py,no-extra-deps
+envlist = black,bandit,flake8,typing,py,no-extra-deps
 
 [base]
 deps =
@@ -15,26 +15,32 @@ deps =
 commands =
     pytest --verbose --cov=itemadapter --cov-report=term-missing --cov-report=html --cov-report=xml --cov-append --doctest-glob=README.md {posargs:itemadapter README.md tests}
 
-[testenv:no-extra-deps]
+[testenv:bandit]
 deps =
-    {[testenv]deps}
-setenv =
-    ITEMADAPTER_NO_EXTRA_DEPS=True
+    bandit
+commands =
+    bandit -r {posargs:itemadapter}
+
+[testenv:black]
+deps =
+    black>=19.10b0
+commands =
+    black --check {posargs:itemadapter tests}
 
 [testenv:flake8]
 deps =
     flake8>=3.7.9
 commands =
-    flake8 --exclude=.git,.tox,venv* itemadapter tests
+    flake8 --exclude=.git,.tox,venv* {posargs:itemadapter tests}
 
-[testenv:typing]
+[testenv:no-extra-deps]
 deps =
-    mypy==0.770
-commands =
-    mypy --ignore-missing-imports --follow-imports=skip itemadapter
+    {[testenv]deps}
+setenv =
+    ITEMADAPTER_NO_EXTRA_DEPS=True
 
-[testenv:black]
+[testenv:typing]
 deps =
-    black>=19.10b0
+    mypy==0.770
 commands =
-    black --check itemadapter tests
+    mypy --ignore-missing-imports --follow-imports=skip {posargs:itemadapter}