From c6ffa94ae93131e3c39e31bf5dfc4288ccb8ef20 Mon Sep 17 00:00:00 2001 From: Ana Maria Martinez Gomez Date: Tue, 24 May 2022 17:47:42 +0200 Subject: [PATCH 1/6] TEST --- .github/workflows/tests.yml | 52 ++----------------------------------- ana.txt | 1 + rules | 2 +- tests/data | 2 +- 4 files changed, 5 insertions(+), 52 deletions(-) create mode 100644 ana.txt diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ac7494266..6cfec52f6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ env: CAPA_SAVE_WORKSPACE: "True" jobs: - changelog_format: + lint: runs-on: ubuntu-20.04 steps: - name: Checkout capa @@ -22,7 +22,7 @@ jobs: number=$(grep '\- *$' CHANGELOG.md | wc -l) if [ $number != 1 ]; then exit 1; fi - code_style: + tests: runs-on: ubuntu-20.04 steps: - name: Checkout capa @@ -40,51 +40,3 @@ jobs: - 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 - steps: - - name: Checkout capa with submodules - 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 - run: pip install -e .[dev] - - name: Run tests - run: pytest -v tests/ diff --git a/ana.txt b/ana.txt new file mode 100644 index 000000000..bc17c93b4 --- /dev/null +++ b/ana.txt @@ -0,0 +1 @@ +hola! diff --git a/rules b/rules index d187d41cd..18ea20dae 160000 --- a/rules +++ b/rules @@ -1 +1 @@ -Subproject commit d187d41cdbf10894bef80be35504f6cfe902205a +Subproject commit 18ea20dae1f8fb0c5f2aec069c3091cd4425080b diff --git a/tests/data b/tests/data index c34c9f1c0..970a89264 160000 --- a/tests/data +++ b/tests/data @@ -1 +1 @@ -Subproject commit c34c9f1c038b6b131eeb243eb153d7309f92aaac +Subproject commit 970a89264dfe6cee0e14c8ff127c64f6b457c002 From 653622001ab59360e617fb7047e97ba85043bd82 Mon Sep 17 00:00:00 2001 From: Ana Maria Martinez Gomez Date: Tue, 24 May 2022 17:50:40 +0200 Subject: [PATCH 2/6] TEST --- .github/workflows/changelog.yml | 41 --------------------------------- 1 file changed, 41 deletions(-) delete mode 100644 .github/workflows/changelog.yml diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml deleted file mode 100644 index c028ce82d..000000000 --- a/.github/workflows/changelog.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: changelog - -on: - # We need pull_request_target instead of pull_request because a write - # repository token is needed to add a review to a PR. DO NOT BUILD - # OR RUN UNTRUSTED CODE FROM PRs IN THIS ACTION - pull_request_target: - types: [opened, edited, synchronize] - -jobs: - check_changelog: - # no need to check for dependency updates via dependabot - if: github.actor != 'dependabot[bot]' && github.actor != 'dependabot-preview[bot]' - runs-on: ubuntu-20.04 - env: - NO_CHANGELOG: '[x] No CHANGELOG update needed' - steps: - - name: Get changed files - id: files - uses: Ana06/get-changed-files@v1.2 - - name: check changelog updated - id: changelog_updated - env: - PR_BODY: ${{ github.event.pull_request.body }} - FILES: ${{ steps.files.outputs.modified }} - run: | - echo $FILES | grep -qF 'CHANGELOG.md' || echo $PR_BODY | grep -qiF "$NO_CHANGELOG" - - name: Reject pull request if no CHANGELOG update - if: ${{ always() && steps.changelog_updated.outcome == 'failure' }} - uses: Ana06/automatic-pull-request-review@v0.1.0 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - event: REQUEST_CHANGES - body: "Please add bug fixes, new features, breaking changes and anything else you think is worthwhile mentioning to the `master (unreleased)` section of CHANGELOG.md. If no CHANGELOG update is needed add the following to the PR description: `${{ env.NO_CHANGELOG }}`" - allow_duplicate: false - - name: Dismiss previous review if CHANGELOG update - uses: Ana06/automatic-pull-request-review@v0.1.0 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - event: DISMISS - body: "CHANGELOG updated or no update needed, thanks! :smile:" From 19b37f8d08d6ab27901bc96611d45f8efc0b5666 Mon Sep 17 00:00:00 2001 From: Ana Maria Martinez Gomez Date: Tue, 24 May 2022 19:15:32 +0200 Subject: [PATCH 3/6] TEST --- .github/workflows/tests.yml | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6cfec52f6..63e1aced1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,21 +22,22 @@ jobs: number=$(grep '\- *$' CHANGELOG.md | wc -l) if [ $number != 1 ]; then exit 1; fi - tests: - 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/ - + tests: + name: Tests in ${{ matrix.python-version }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04, windows-2019, macos-10.15] + python-version: ["3.8", "3.10"] + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: pip install -e .[dev] + - name: Run tests + run: pytest -v tests/ From e7b3a70c27e1304574bf61d5021f2f30e74f5494 Mon Sep 17 00:00:00 2001 From: Ana Maria Martinez Gomez Date: Tue, 24 May 2022 19:23:48 +0200 Subject: [PATCH 4/6] TEST --- .github/workflows/tests.yml | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 63e1aced1..7e4027aaf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,22 +22,22 @@ jobs: number=$(grep '\- *$' CHANGELOG.md | wc -l) if [ $number != 1 ]; then exit 1; fi - tests: - name: Tests in ${{ matrix.python-version }} on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-20.04, windows-2019, macos-10.15] - python-version: ["3.8", "3.10"] - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: pip install -e .[dev] - - name: Run tests - run: pytest -v tests/ + tests: + name: Tests in ${{ matrix.python-version }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-20.04, windows-2019, macos-10.15] + python-version: ["3.8", "3.10"] + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: pip install -e .[dev] + - name: Run tests + run: pytest -v tests/ From 130d70fccfd9962913bfb2d1c3b09cd0d0e7a223 Mon Sep 17 00:00:00 2001 From: Ana Maria Martinez Gomez Date: Tue, 24 May 2022 22:18:32 +0200 Subject: [PATCH 5/6] TEST --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7e4027aaf..d8b8806a4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,4 @@ -name: CI +name: CI ${{ github.event.pull_request.number }} on: push: From 6d7a35cd146764ba26fc66f2decfb86ec1f71b15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 04:04:07 +0000 Subject: [PATCH 6/6] build(deps-dev): bump isort from 5.10.0 to 5.12.0 Bumps [isort](https://github.com/pycqa/isort) from 5.10.0 to 5.12.0. - [Release notes](https://github.com/pycqa/isort/releases) - [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md) - [Commits](https://github.com/pycqa/isort/compare/5.10.0...5.12.0) --- updated-dependencies: - dependency-name: isort dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e09ace4d7..37f023c86 100644 --- a/setup.py +++ b/setup.py @@ -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