Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps-dev): bump isort from 5.10.0 to 5.12.0 #102

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions .github/workflows/changelog.yml

This file was deleted.

57 changes: 5 additions & 52 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: CI ${{ github.event.pull_request.number }}

on:
push:
Expand All @@ -11,7 +11,7 @@ env:
CAPA_SAVE_WORKSPACE: "True"

jobs:
changelog_format:
lint:
runs-on: ubuntu-20.04
steps:
- name: Checkout capa
Expand All @@ -22,69 +22,22 @@ jobs:
number=$(grep '\- *$' CHANGELOG.md | wc -l)
if [ $number != 1 ]; then exit 1; fi

code_style:
runs-on: ubuntu-20.04
steps:
- name: Checkout capa
uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install dependencies
run: pip install -e .[dev]
- name: Lint with isort
run: isort --profile black --length-sort --line-width 120 -c .
- name: Lint with black
run: black -l 120 --check .
- name: Check types with mypy
run: mypy --config-file .github/mypy/mypy.ini capa/ scripts/ tests/

rule_linter:
runs-on: ubuntu-20.04
steps:
- name: Checkout capa with submodules
uses: actions/checkout@v2
with:
submodules: true
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Install capa
run: pip install -e .
- name: Run rule linter
run: python scripts/lint.py rules/

tests:
name: Tests in ${{ matrix.python-version }} on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
needs: [code_style, rule_linter]
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2019, macos-10.15]
# across all operating systems
python-version: [3.6, 3.9]
include:
# on Ubuntu run these as well
- os: ubuntu-20.04
python-version: 3.7
- os: ubuntu-20.04
python-version: 3.8
python-version: ["3.8", "3.10"]
steps:
- name: Checkout capa with submodules
- name: Checkout code
uses: actions/checkout@v2
with:
submodules: true
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install pyyaml
if: matrix.os == 'ubuntu-20.04'
run: sudo apt-get install -y libyaml-dev
- name: Install capa
- name: Install dependencies
run: pip install -e .[dev]
- name: Run tests
run: pytest -v tests/
1 change: 1 addition & 0 deletions ana.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hola!
2 changes: 1 addition & 1 deletion rules
Submodule rules updated 561 files
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"pytest-cov==3.0.0",
"pycodestyle==2.8.0",
"black==21.10b0",
"isort==5.10.0",
"isort==5.12.0",
"mypy==0.910",
"psutil==5.8.0",
# type stubs for mypy
Expand Down