diff options
| -rw-r--r-- | .github/workflows/primer_run_main.yaml | 6 | ||||
| -rw-r--r-- | .github/workflows/primer_run_pr.yaml | 6 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | pylint/testutils/primer.py | 2 | ||||
| -rw-r--r-- | tests/.pylint_primer_tests/.gitkeep (renamed from .pylint_primer_tests/.gitkeep) | 0 | ||||
| -rw-r--r-- | tests/primer/primer_tool.py | 4 | ||||
| -rw-r--r-- | tests/primer/test_primer_external.py | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml index b587bce0f..0169fb145 100644 --- a/.github/workflows/primer_run_main.yaml +++ b/.github/workflows/primer_run_main.yaml @@ -69,7 +69,7 @@ jobs: id: cache-projects uses: actions/cache@v3 with: - path: .pylint_primer_tests/ + path: tests/.pylint_primer_tests/ key: >- ${{ runner.os }}-${{ matrix.python-version }}-${{ steps.commitstring.outputs.commitstring }}-primer @@ -81,7 +81,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: primer_commitstring - path: .pylint_primer_tests/commit_string.txt + path: tests/.pylint_primer_tests/commit_string.txt # Run primer - name: Run pylint primer @@ -93,4 +93,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: primer_output - path: .pylint_primer_tests/output_main.txt + path: tests/.pylint_primer_tests/output_main.txt diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml index 642b34f34..cc753d947 100644 --- a/.github/workflows/primer_run_pr.yaml +++ b/.github/workflows/primer_run_pr.yaml @@ -115,7 +115,7 @@ jobs: - name: Copy and unzip the commit string run: | unzip primer_commitstring.zip - cp commit_string.txt .pylint_primer_tests/commit_string.txt + cp commit_string.txt tests/.pylint_primer_tests/commit_string.txt - name: Unzip the output of 'main' run: unzip primer_output_main.zip - name: Get commit string @@ -128,7 +128,7 @@ jobs: id: cache-projects uses: actions/cache@v3 with: - path: .pylint_primer_tests/ + path: tests/.pylint_primer_tests/ key: >- ${{ runner.os }}-${{ matrix.python-version }}-${{ steps.commitstring.outputs.commitstring }}-primer @@ -155,7 +155,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: primer_output_pr - path: .pylint_primer_tests/output_pr.txt + path: tests/.pylint_primer_tests/output_pr.txt - name: Upload output of 'main' uses: actions/upload-artifact@v3 with: diff --git a/.gitignore b/.gitignore index ec5d55dd8..d80760956 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ doc/user_guide/messages/fatal/ doc/user_guide/messages/information/ doc/user_guide/messages/refactor/ doc/user_guide/messages/warning/ +tests/.pylint_primer_tests/ pyve build-stamp .coverage @@ -26,4 +27,3 @@ build-stamp .pytest_cache/ .mypy_cache/ .benchmarks/ -.pylint_primer_tests/ diff --git a/pylint/testutils/primer.py b/pylint/testutils/primer.py index 6f3c9c955..0492c3a8b 100644 --- a/pylint/testutils/primer.py +++ b/pylint/testutils/primer.py @@ -9,7 +9,7 @@ from pathlib import Path import git -PRIMER_DIRECTORY_PATH = Path(".pylint_primer_tests") +PRIMER_DIRECTORY_PATH = Path("tests") / ".pylint_primer_tests" class PackageToLint: diff --git a/.pylint_primer_tests/.gitkeep b/tests/.pylint_primer_tests/.gitkeep index e69de29bb..e69de29bb 100644 --- a/.pylint_primer_tests/.gitkeep +++ b/tests/.pylint_primer_tests/.gitkeep diff --git a/tests/primer/primer_tool.py b/tests/primer/primer_tool.py index efd5542fc..157db1496 100644 --- a/tests/primer/primer_tool.py +++ b/tests/primer/primer_tool.py @@ -15,8 +15,8 @@ from pylint.lint import Run from pylint.reporters import JSONReporter from pylint.testutils.primer import PackageToLint -MAIN_DIR = Path(__file__).parent.parent.parent -PRIMER_DIRECTORY = MAIN_DIR / ".pylint_primer_tests/" +TESTS_DIR = Path(__file__).parent.parent +PRIMER_DIRECTORY = TESTS_DIR / ".pylint_primer_tests/" PACKAGES_TO_PRIME_PATH = Path(__file__).parent / "packages_to_prime.json" diff --git a/tests/primer/test_primer_external.py b/tests/primer/test_primer_external.py index 76f1ee8cb..21e2f8c26 100644 --- a/tests/primer/test_primer_external.py +++ b/tests/primer/test_primer_external.py @@ -14,7 +14,7 @@ from pytest import LogCaptureFixture from pylint.testutils.primer import PackageToLint -PRIMER_DIRECTORY = Path(".pylint_primer_tests/").resolve() +PRIMER_DIRECTORY = (Path("tests") / ".pylint_primer_tests/").resolve() def get_packages_to_lint_from_json(json_path: Path | str) -> dict[str, PackageToLint]: |