From bce7ad40fb1f1b7545f28613beb289394b18765a Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 11:54:38 +0100 Subject: [PATCH 1/8] remove duplicated test --- tests/test_utils.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tests/test_utils.py b/tests/test_utils.py index 4f12071..b488549 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -45,27 +45,6 @@ def test_join_arrays_join_types(join_type, expected_data, expected_row): assert np.allclose(row, expected_row) -@pytest.mark.parametrize("join_type, expected_data, expected_row", [ - ["left", np.array([[0, 0], [1, 0], [2, 2], [4, 0], [5, 5]]), np.array([0, 1, 2, 4, 5])], - ["right", np.array([[2, 2],[0, 3], [5, 5], [0, 6], [0, 7],]), np.array([2, 3, 5, 6, 7])], - ["inner", np.array([[2, 2], [5, 5]]), np.array([2, 5])], - ["outer", np.array([[0, 0], [1, 0], [2, 2], [0, 3], [4, 0], [5, 5], [0, 6], [0, 7]]), - np.array([0, 1, 2, 3, 4, 5, 6, 7])], -]) -def test_join_arrays_join_types(join_type, expected_data, expected_row): - row1 = np.array([0, 1, 2, 4, 5]) - col1 = np.array([0, 1, 2, 4, 5]) - row2 = np.array([7, 5, 3, 6, 2]) - col2 = np.array([7, 5, 3, 6, 2]) - data1 = np.array(col1, dtype=[("layer1", col1.dtype)]) - data2 = np.array(col2, dtype=[("layer2", col2.dtype)]) - - row, col, data = join_arrays(row1, col1, data1, row2, col2, data2, "test1", - join_type=join_type) - assert np.allclose(np.array([[x[0], x[1]] for x in data]), expected_data) - assert np.allclose(row, expected_row) - - @pytest.mark.parametrize("join_type", [ "left", "right", "inner", "outer" ]) From 5962b4524a44aeaaa65792a2df0d0939f508bc7a Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 11:57:48 +0100 Subject: [PATCH 2/8] replace prospector by ruff --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 88886ea..a8d4d0d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,8 +19,8 @@ pytest = "^8.3.3" pytest-cov = "^6.0.0" yapf = "^0.40.2" testfixtures = "^8.3.0" -prospector = "^1.12.1" poetry-bumpversion = "^0.3.2" +ruff = ">0.7" [build-system] requires = ["poetry-core"] From c016ef1070e170372526beb131198f726e74320d Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 11:58:07 +0100 Subject: [PATCH 3/8] prospector --> ruff --- .github/workflows/CI_build.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index c0682f9..deaadb1 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -14,14 +14,14 @@ on: jobs: first_check: - name: first code check / python-3.10 / ubuntu-latest + name: first code check / python-3.12 / ubuntu-latest runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Python info run: | which python @@ -39,9 +39,8 @@ jobs: poetry run pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml - name: Correct coverage paths run: sed -i "s+$PWD/++g" coverage.xml - - name: Check style against standards using prospector - shell: bash -l {0} - run: poetry run prospector -o grouped -o pylint:pylint-report.txt + - name: Check style against standards using Ruff + run: ruff check . - name: Check whether import statements are used consistently run: poetry run isort . --check-only --diff @@ -51,10 +50,10 @@ jobs: needs: first_check steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' - name: Python info run: | which python From 59b6a392abc613d881bab046a7822bdaacf4c887 Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 12:11:06 +0100 Subject: [PATCH 4/8] add poetry command --- .github/workflows/CI_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index deaadb1..ded126b 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -33,14 +33,14 @@ jobs: poetry install --with dev - name: Show pip list run: | - pip list + poetry pip list - name: Test with coverage run: | poetry run pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml - name: Correct coverage paths run: sed -i "s+$PWD/++g" coverage.xml - name: Check style against standards using Ruff - run: ruff check . + run: poetry ruff check . - name: Check whether import statements are used consistently run: poetry run isort . --check-only --diff From 808e8080cac3afe4ac47e9a3f085c709c9bb8116 Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 12:12:10 +0100 Subject: [PATCH 5/8] revert parts --- .github/workflows/CI_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index ded126b..7f3b101 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -33,7 +33,7 @@ jobs: poetry install --with dev - name: Show pip list run: | - poetry pip list + pip list - name: Test with coverage run: | poetry run pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml From f108d5d9d06c4f2a18b325c4d44e599bd35393b2 Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 12:14:03 +0100 Subject: [PATCH 6/8] add ugly hack for now --- .github/workflows/CI_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index 7f3b101..85e7fcb 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -40,7 +40,9 @@ jobs: - name: Correct coverage paths run: sed -i "s+$PWD/++g" coverage.xml - name: Check style against standards using Ruff - run: poetry ruff check . + run: | + pip install ruff + ruff check . - name: Check whether import statements are used consistently run: poetry run isort . --check-only --diff From 839a383666bbf4e29f7062ee744ebed99664bcaf Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 12:16:02 +0100 Subject: [PATCH 7/8] try poetry run --- .github/workflows/CI_build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index 85e7fcb..3a35eb2 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -32,17 +32,14 @@ jobs: poetry lock poetry install --with dev - name: Show pip list - run: | - pip list + run: poetry run pip list - name: Test with coverage run: | poetry run pytest --cov --cov-report term --cov-report xml --junitxml=xunit-result.xml - name: Correct coverage paths run: sed -i "s+$PWD/++g" coverage.xml - name: Check style against standards using Ruff - run: | - pip install ruff - ruff check . + run: poetry run ruff check . - name: Check whether import statements are used consistently run: poetry run isort . --check-only --diff From 2401d9aa125b775af8880e6f1027fb77e57c05ab Mon Sep 17 00:00:00 2001 From: Florian Huber Date: Thu, 21 Nov 2024 12:18:06 +0100 Subject: [PATCH 8/8] adapt all workflows to poetry run --- .github/workflows/CI_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index 3a35eb2..06a6329 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -77,7 +77,7 @@ jobs: poetry install - name: Show pip list again run: | - pip list + poetry run pip list - name: Run tests run: | poetry run pytest @@ -112,7 +112,7 @@ jobs: poetry install - name: Show pip list run: | - pip list + poetry run pip list - name: Run tests run: | poetry run pytest