diff options
author | Daniel van Noord <13665637+DanielNoord@users.noreply.github.com> | 2023-04-26 09:42:21 +0200 |
---|---|---|
committer | Daniƫl van Noord <13665637+DanielNoord@users.noreply.github.com> | 2023-04-26 12:37:54 +0200 |
commit | db6d29da5b91d05acd032adae800538b35dff0ad (patch) | |
tree | 8cde3e1b043faf71f4769d4c3bbfa87fced2f070 | |
parent | 42f261dbed9b3bc56118ae2496fcf48ef287d54f (diff) | |
download | astroid-git-db6d29da5b91d05acd032adae800538b35dff0ad.tar.gz |
Simplify structure of requirement files
-rw-r--r-- | .github/workflows/ci.yaml | 26 | ||||
-rw-r--r-- | doc/release.md | 4 | ||||
-rw-r--r-- | requirements_dev.txt | 8 | ||||
-rw-r--r-- | requirements_full.txt (renamed from requirements_test_brain.txt) | 4 | ||||
-rw-r--r-- | requirements_minimal.txt | 8 | ||||
-rw-r--r-- | requirements_test.txt | 4 | ||||
-rw-r--r-- | requirements_test_min.txt | 3 | ||||
-rw-r--r-- | requirements_test_pre_commit.txt | 6 | ||||
-rw-r--r-- | tox.ini | 5 |
9 files changed, 36 insertions, 32 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3b352dd3..cc31b3dd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,9 +35,8 @@ jobs: id: generate-python-key run: >- echo "key=base-venv-${{ env.CACHE_VERSION }}-${{ - hashFiles('pyproject.toml', 'requirements_test.txt', - 'requirements_test_min.txt', 'requirements_test_brain.txt', - 'requirements_test_pre_commit.txt') }}" >> $GITHUB_OUTPUT + hashFiles('pyproject.toml', 'requirements_dev.txt', + 'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v3.3.1 @@ -52,7 +51,7 @@ jobs: python -m venv venv . venv/bin/activate python -m pip install -U pip setuptools wheel - pip install -U -r requirements_test.txt -r requirements_test_brain.txt + pip install -U -r requirements_full.txt - name: Generate pre-commit restore key id: generate-pre-commit-key run: >- @@ -103,9 +102,8 @@ jobs: id: generate-python-key run: >- echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ - hashFiles('pyproject.toml', 'requirements_test.txt', - 'requirements_test_min.txt', 'requirements_test_brain.txt', - 'requirements_test_pre_commit.txt') }}" >> $GITHUB_OUTPUT + hashFiles('pyproject.toml', 'requirements_dev.txt', + 'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v3.3.1 @@ -120,7 +118,7 @@ jobs: python -m venv venv . venv/bin/activate python -m pip install -U pip setuptools wheel - pip install -U -r requirements_test.txt -r requirements_test_brain.txt + pip install -U -r requirements_full.txt pip install -e . - name: Run pytest run: | @@ -158,8 +156,8 @@ jobs: id: generate-python-key run: >- echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ - hashFiles('pyproject.toml', 'requirements_test_min.txt', - 'requirements_test_brain.txt') }}" >> $env:GITHUB_OUTPUT + hashFiles('pyproject.toml', 'requirements_dev.txt', + 'requirements_full.txt', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT - name: Restore Python virtual environment id: cache-venv uses: actions/cache@v3.3.1 @@ -174,7 +172,7 @@ jobs: python -m venv venv . venv\\Scripts\\activate python -m pip install -U pip setuptools wheel - pip install -U -r requirements_test_min.txt -r requirements_test_brain.txt + pip install -U -r requirements_full.txt pip install -e . - name: Run pytest run: | @@ -207,7 +205,7 @@ jobs: id: generate-python-key run: >- echo "key=${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ - hashFiles('pyproject.toml', 'requirements_test_min.txt') + hashFiles('pyproject.toml', 'requirements_minimal.txt') }}" >> $GITHUB_OUTPUT - name: Restore Python virtual environment id: cache-venv @@ -223,7 +221,7 @@ jobs: python -m venv venv . venv/bin/activate python -m pip install -U pip setuptools wheel - pip install -U -r requirements_test_min.txt + pip install -U -r requirements_minimal.txt pip install -e . - name: Run pytest run: | @@ -250,7 +248,7 @@ jobs: python-version: "3.11" check-latest: true - name: Install dependencies - run: pip install -U -r requirements_test_min.txt + run: pip install -U -r requirements_minimal.txt - name: Download all coverage artifacts uses: actions/download-artifact@v3.0.2 - name: Combine Linux coverage results diff --git a/doc/release.md b/doc/release.md index 83cc55d2..73eaaef6 100644 --- a/doc/release.md +++ b/doc/release.md @@ -12,7 +12,7 @@ the maintenance branch. If so, release a last patch release first. See example: `v2.3.5`) - Check the result of `git diff vX.Y-1.Z' ChangeLog`. (For example: `git diff v2.3.4 ChangeLog`) -- Install the release dependencies: `pip3 install -r requirements_test.txt` +- Install the release dependencies: `pip3 install -r requirements_minimal.txt` - Bump the version and release by using `tbump X.Y.0 --no-push --no-tag`. (For example: `tbump 2.4.0 --no-push --no-tag`) - Check the commit created with `git show` amend the commit if required. @@ -67,7 +67,7 @@ cherry-picked on the maintenance branch. - Check the result of `git diff vX.Y-1.Z-1 ChangeLog`. (For example: `git diff v2.3.4 ChangeLog`) -- Install the release dependencies: `pip3 install -r requirements_test.txt` +- Install the release dependencies: `pip3 install -r requirements_minimal.txt` - Bump the version and release by using `tbump X.Y-1.Z --no-push`. (For example: `tbump 2.3.5 --no-push`) - Check the result visually with `git show`. diff --git a/requirements_dev.txt b/requirements_dev.txt new file mode 100644 index 00000000..1a3d0ed4 --- /dev/null +++ b/requirements_dev.txt @@ -0,0 +1,8 @@ +-r requirements_minimal.txt + +# Tools used during development, prefer installing these with pre-commit +black +pre-commit +pylint +mypy +ruff diff --git a/requirements_test_brain.txt b/requirements_full.txt index 5287772e..3e332a2b 100644 --- a/requirements_test_brain.txt +++ b/requirements_full.txt @@ -1,3 +1,7 @@ +-r requirements_minimal.txt +-r requirements_dev.txt + +# Packages used to run additional tests attrs nose numpy>=1.17.0; python_version<"3.11" diff --git a/requirements_minimal.txt b/requirements_minimal.txt new file mode 100644 index 00000000..b1ffb608 --- /dev/null +++ b/requirements_minimal.txt @@ -0,0 +1,8 @@ +# Tools used when releasing +contributors-txt>=0.7.4 +tbump~=6.9 + +# Tools used to run tests +coverage~=7.2 +pytest +pytest-cov~=4.0 diff --git a/requirements_test.txt b/requirements_test.txt deleted file mode 100644 index a1274240..00000000 --- a/requirements_test.txt +++ /dev/null @@ -1,4 +0,0 @@ --r requirements_test_min.txt --r requirements_test_pre_commit.txt -contributors-txt>=0.7.4 -tbump~=6.9.0 diff --git a/requirements_test_min.txt b/requirements_test_min.txt deleted file mode 100644 index 6f4db817..00000000 --- a/requirements_test_min.txt +++ /dev/null @@ -1,3 +0,0 @@ -coverage~=7.2 -pytest -pytest-cov~=4.0 diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt deleted file mode 100644 index 0484daec..00000000 --- a/requirements_test_pre_commit.txt +++ /dev/null @@ -1,6 +0,0 @@ --r requirements_test_min.txt -black -pylint -mypy -ruff -pre-commit @@ -5,14 +5,13 @@ isolated_build = true [testenv] deps = - -r requirements_test.txt - -r requirements_test_brain.txt + -r requirements_full.txt commands = pytest --cov {posargs} [testenv:formatting] deps = - -r requirements_test_pre_commit.txt + -r requirements_dev.txt commands = pre-commit run --all-files |