From aec5eb4990021da693c53daa1d06fefbeb4f6e7b Mon Sep 17 00:00:00 2001 From: Janosh Riebesell Date: Sun, 7 Jan 2024 22:40:22 +0100 Subject: [PATCH] remove debug print statements in tests + bump GH action versions --- .github/workflows/deploy.yml | 6 +++--- .github/workflows/joss-pdf.yml | 4 ++-- .github/workflows/testing.yml | 12 ++++++------ .github/workflows/update-precommit.yml | 2 +- .pre-commit-config.yaml | 2 +- pyproject.toml | 7 ++++++- tests/core/test_job.py | 1 - tests/managers/test_fireworks.py | 1 - 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7c7708a1..1d50c1cb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,11 +11,11 @@ jobs: if: github.repository_owner == 'materialsproject' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'push' && startsWith(github.event.workflow_run.head_branch, 'v0.') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.workflow_run.head_branch }} - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' @@ -35,7 +35,7 @@ jobs: needs: - deploy-pypi steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.workflow_run.head_branch }} diff --git a/.github/workflows/joss-pdf.yml b/.github/workflows/joss-pdf.yml index 30250aec..837e29c7 100644 --- a/.github/workflows/joss-pdf.yml +++ b/.github/workflows/joss-pdf.yml @@ -1,7 +1,7 @@ on: push: paths: - - paper + - paper workflow_dispatch: jobs: @@ -10,7 +10,7 @@ jobs: name: Paper Draft steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build draft PDF uses: openjournals/openjournals-draft-action@master with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 67db1d61..b4bfcbd5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -12,9 +12,9 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.9' cache: pip @@ -38,9 +38,9 @@ jobs: python-version: ['3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: pip @@ -67,12 +67,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install pandoc run: sudo apt-get install pandoc - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.11' cache: pip diff --git a/.github/workflows/update-precommit.yml b/.github/workflows/update-precommit.yml index 93619ceb..bf227116 100644 --- a/.github/workflows/update-precommit.yml +++ b/.github/workflows/update-precommit.yml @@ -8,7 +8,7 @@ jobs: auto-update: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e0e9aa8e..bb52dad0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: exclude: "^src/atomate2/vasp/schemas/calc_types/" repos: - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.1.9 + rev: v0.1.11 hooks: - id: ruff args: [--fix] diff --git a/pyproject.toml b/pyproject.toml index fe0af616..eda7ef68 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -153,11 +153,16 @@ select = [ ] ignore = [ "B028", + "COM812", + "DTZ005", + "FBT001", + "FBT002", "PLR0911", # too-many-return-statements "PLR0912", # too-many-branches "PLR0913", # too-many-arguments "PLR0915", # too-many-statements "PLW0603", + "PTH", "RUF013", ] pydocstyle.convention = "numpy" @@ -169,4 +174,4 @@ isort.known-first-party = ["jobflow"] # D: pydocstyle # PLR2004: magic-value-comparison # PT004: pytest-missing-fixture-name-underscore -"**/tests/*" = ["D", "PLR2004", "PT004"] +"**/tests/*" = ["ANN", "ARG001", "D", "PLR2004", "PT004", "S101"] diff --git a/tests/core/test_job.py b/tests/core/test_job.py index 9fd93a7d..90eadea8 100644 --- a/tests/core/test_job.py +++ b/tests/core/test_job.py @@ -372,7 +372,6 @@ def detour_job(): test_job = Job(addition_job, config=pass_config) response = test_job.run(memory_jobstore) assert len(response.addition) == 1 - print(response.addition) assert response.addition[0].config.manager_config == manager_config assert response.addition[0].hosts == [response.addition.uuid] diff --git a/tests/managers/test_fireworks.py b/tests/managers/test_fireworks.py index 33bdd6be..5e83c8de 100644 --- a/tests/managers/test_fireworks.py +++ b/tests/managers/test_fireworks.py @@ -658,5 +658,4 @@ def test_external_reference(lpad, mongo_jobstore, fw_dir, simple_job, capsys): # check response result2 = mongo_jobstore.query_one({"uuid": uuid2}) - print(result2) assert result2["output"] == "12345_end_end"