Move all *-requirements.txt files to subfolder

kdeldycke · Feb 25, 2024 · 4ef9c2e · 4ef9c2e
1 parent 960b0fb
commit 4ef9c2e
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 64 deletions.
diff --git a/.github/workflows/autofix.yaml b/.github/workflows/autofix.yaml
@@ -54,16 +54,16 @@ jobs:
         #       cache: pip
         #       cache-dependency-path: |
         #         **/pyproject.toml
-        #         **/*requirements.txt
+        #         requirements/*.txt
         #   Installed versions
         #     Successfully set up CPython (3.12.1)
         #   Error: No file in /home/runner/work/awesome-iam/awesome-iam matched to
-        #   [**/*requirements.txt or **/pyproject.toml], make sure you have checked out the target repository
+        #   [requirements/*.txt or **/pyproject.toml], make sure you have checked out the target repository
         #
         # This has been reported at: https://github.com/actions/setup-python/issues/807
         # In the future this might be addressed by: https://github.com/actions/setup-python/pull/762
         # or https://github.com/actions/setup-python/issues/751
-        if: hashFiles('**/*requirements.txt', '**/pyproject.toml') == ''
+        if: hashFiles('requirements/*.txt', '**/pyproject.toml') == ''
         run: |
           touch ./pyproject.toml
           echo "tmp_deps_file=true" >> "$GITHUB_OUTPUT"
@@ -73,7 +73,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Remove setup-python hack
         if: steps.setup_python_hack.outputs.tmp_deps_file
         run: |
@@ -90,7 +90,7 @@ jobs:
       - name: Download pinned requirements.txt
         run: >
           curl -fsSL --output ./pinned-requirements.txt
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/metadata-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/metadata.txt
       - name: Install Poetry from pinned requirements.txt
         # uv needs a venv. See:
         # https://github.com/astral-sh/uv/issues/1386
@@ -128,16 +128,16 @@ jobs:
         #       cache: pip
         #       cache-dependency-path: |
         #         **/pyproject.toml
-        #         **/*requirements.txt
+        #         requirements/*.txt
         #   Installed versions
         #     Successfully set up CPython (3.12.1)
         #   Error: No file in /home/runner/work/awesome-iam/awesome-iam matched to
-        #   [**/*requirements.txt or **/pyproject.toml], make sure you have checked out the target repository
+        #   [requirements/*.txt or **/pyproject.toml], make sure you have checked out the target repository
         #
         # This has been reported at: https://github.com/actions/setup-python/issues/807
         # In the future this might be addressed by: https://github.com/actions/setup-python/pull/762
         # or https://github.com/actions/setup-python/issues/751
-        if: hashFiles('**/*requirements.txt', '**/pyproject.toml') == ''
+        if: hashFiles('requirements/*.txt', '**/pyproject.toml') == ''
         run: |
           touch ./pyproject.toml
           echo "tmp_deps_file=true" >> "$GITHUB_OUTPUT"
@@ -147,14 +147,14 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install Ruff, blacken-docs and autopep8
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/format-python-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/format-python.txt
       - name: Run autopep8
         if: needs.project-metadata.outputs.python_files
         # Ruff is not wrapping comments: https://github.com/astral-sh/ruff/issues/7414
@@ -278,16 +278,16 @@ jobs:
         #       cache: pip
         #       cache-dependency-path: |
         #         **/pyproject.toml
-        #         **/*requirements.txt
+        #         requirements/*.txt
         #   Installed versions
         #     Successfully set up CPython (3.12.1)
         #   Error: No file in /home/runner/work/awesome-iam/awesome-iam matched to
-        #   [**/*requirements.txt or **/pyproject.toml], make sure you have checked out the target repository
+        #   [requirements/*.txt or **/pyproject.toml], make sure you have checked out the target repository
         #
         # This has been reported at: https://github.com/actions/setup-python/issues/807
         # In the future this might be addressed by: https://github.com/actions/setup-python/pull/762
         # or https://github.com/actions/setup-python/issues/751
-        if: hashFiles('**/*requirements.txt', '**/pyproject.toml') == ''
+        if: hashFiles('requirements/*.txt', '**/pyproject.toml') == ''
         run: |
           touch ./pyproject.toml
           echo "tmp_deps_file=true" >> "$GITHUB_OUTPUT"
@@ -297,7 +297,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Remove setup-python hack
         if: steps.setup_python_hack.outputs.tmp_deps_file
         run: |
@@ -308,7 +308,7 @@ jobs:
       - name: Install mdformat
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/mdformat-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/mdformat.txt
       - name: Install shfmt
         run: |
           sudo apt install --yes shfmt

diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
@@ -39,7 +39,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
@@ -110,7 +110,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -115,7 +115,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Generate .mailmap
         run: >
           python -c "$(curl -fsSL
@@ -164,16 +164,16 @@ jobs:
         #       cache: pip
         #       cache-dependency-path: |
         #         **/pyproject.toml
-        #         **/*requirements.txt
+        #         requirements/*.txt
         #   Installed versions
         #     Successfully set up CPython (3.12.1)
         #   Error: No file in /home/runner/work/awesome-iam/awesome-iam matched to
-        #   [**/*requirements.txt or **/pyproject.toml], make sure you have checked out the target repository
+        #   [requirements/*.txt or **/pyproject.toml], make sure you have checked out the target repository
         #
         # This has been reported at: https://github.com/actions/setup-python/issues/807
         # In the future this might be addressed by: https://github.com/actions/setup-python/pull/762
         # or https://github.com/actions/setup-python/issues/751
-        if: hashFiles('**/*requirements.txt', '**/pyproject.toml') == ''
+        if: hashFiles('requirements/*.txt', '**/pyproject.toml') == ''
         run: |
           touch ./pyproject.toml
           echo "tmp_deps_file=true" >> "$GITHUB_OUTPUT"
@@ -183,7 +183,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Remove setup-python hack
         if: steps.setup_python_hack.outputs.tmp_deps_file
         run: |
@@ -200,7 +200,7 @@ jobs:
       - name: Download pinned requirements.txt
         run: >
           curl -fsSL --output ./pinned-requirements.txt
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/metadata-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/metadata.txt
       - name: Install Poetry from pinned requirements.txt
         # uv needs a venv. See:
         # https://github.com/astral-sh/uv/issues/1386
@@ -233,16 +233,16 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install pipdeptree and Poetry on system
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/pipdeptree-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/pipdeptree.txt
           --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/build-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/build.txt
       - name: Install project with Poetry
         run: |
           poetry install --only main --no-interaction
@@ -295,14 +295,14 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install Poetry
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/build-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/build.txt
       - name: Install project dependencies
         run: |
           poetry install --no-interaction
@@ -341,14 +341,14 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install Poetry
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/build-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/build.txt
       - name: Install project dependencies
         # Let sphinx-click access project's code to generate CLI help.
         run: |

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -41,16 +41,16 @@ jobs:
         #       cache: pip
         #       cache-dependency-path: |
         #         **/pyproject.toml
-        #         **/*requirements.txt
+        #         requirements/*.txt
         #   Installed versions
         #     Successfully set up CPython (3.12.1)
         #   Error: No file in /home/runner/work/awesome-iam/awesome-iam matched to
-        #   [**/*requirements.txt or **/pyproject.toml], make sure you have checked out the target repository
+        #   [requirements/*.txt or **/pyproject.toml], make sure you have checked out the target repository
         #
         # This has been reported at: https://github.com/actions/setup-python/issues/807
         # In the future this might be addressed by: https://github.com/actions/setup-python/pull/762
         # or https://github.com/actions/setup-python/issues/751
-        if: hashFiles('**/*requirements.txt', '**/pyproject.toml') == ''
+        if: hashFiles('requirements/*.txt', '**/pyproject.toml') == ''
         run: |
           touch ./pyproject.toml
           echo "tmp_deps_file=true" >> "$GITHUB_OUTPUT"
@@ -60,7 +60,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Remove setup-python hack
         if: steps.setup_python_hack.outputs.tmp_deps_file
         run: |
@@ -77,7 +77,7 @@ jobs:
       - name: Download pinned requirements.txt
         run: >
           curl -fsSL --output ./pinned-requirements.txt
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/metadata-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/metadata.txt
       - name: Install Poetry from pinned requirements.txt
         # uv needs a venv. See:
         # https://github.com/astral-sh/uv/issues/1386
@@ -110,19 +110,19 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install Mypy
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/mypy-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/mypy.txt
       - name: Install Poetry
         if: fromJSON(needs.project-metadata.outputs.is_poetry_project)
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/build-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/build.txt
       - name: Install dependencies with Poetry
         # Install project with Poetry if supported, so we can benefits from dependencies on typing stubs.
         if: fromJSON(needs.project-metadata.outputs.is_poetry_project)
@@ -161,16 +161,16 @@ jobs:
         #       cache: pip
         #       cache-dependency-path: |
         #         **/pyproject.toml
-        #         **/*requirements.txt
+        #         requirements/*.txt
         #   Installed versions
         #     Successfully set up CPython (3.12.1)
         #   Error: No file in /home/runner/work/awesome-iam/awesome-iam matched to
-        #   [**/*requirements.txt or **/pyproject.toml], make sure you have checked out the target repository
+        #   [requirements/*.txt or **/pyproject.toml], make sure you have checked out the target repository
         #
         # This has been reported at: https://github.com/actions/setup-python/issues/807
         # In the future this might be addressed by: https://github.com/actions/setup-python/pull/762
         # or https://github.com/actions/setup-python/issues/751
-        if: hashFiles('**/*requirements.txt', '**/pyproject.toml') == ''
+        if: hashFiles('requirements/*.txt', '**/pyproject.toml') == ''
         run: |
           touch ./pyproject.toml
           echo "tmp_deps_file=true" >> "$GITHUB_OUTPUT"
@@ -180,7 +180,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Remove setup-python hack
         if: steps.setup_python_hack.outputs.tmp_deps_file
         run: |
@@ -191,7 +191,7 @@ jobs:
       - name: Install yamllint
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/yamllint-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/yamllint.txt
       - name: Run yamllint
         run: |
           yamllint --strict --config-data "{rules: {line-length: {max: 120}}}" --format github .

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -54,7 +54,7 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Hack uv to use system Python as default venv
         # See: https://github.com/astral-sh/uv/issues/1386#issuecomment-1947801083
         run: |
@@ -67,7 +67,7 @@ jobs:
       - name: Download pinned requirements.txt
         run: >
           curl -fsSL --output ./pinned-requirements.txt
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/metadata-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/metadata.txt
       - name: Install Poetry from pinned requirements.txt
         # uv needs a venv. See:
         # https://github.com/astral-sh/uv/issues/1386
@@ -104,14 +104,14 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install poetry, twine and check-wheel-contents
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/build-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/build.txt
       - name: Build package
         run: |
           poetry install --no-interaction
@@ -150,22 +150,22 @@ jobs:
           cache: "pip"
           cache-dependency-path: |
             **/pyproject.toml
-            **/*requirements.txt
+            requirements/*.txt
       - name: Install pip
         run: |
           python -m pip install --upgrade pip
       - name: Install poetry
         run: >
           python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/build-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/build.txt
       - name: Re-install Nuitka in Poetry venv
         # Nuitka needs to be installed within Poetry's venv to allow for lots of workarounds.
         # Additional dependencies:
         #   - ordered-set: used by Nuitka for compilation performance
         #   - zstandard: for nuitka's onefile compression
         run: >
           poetry run python -m pip install --requirement
-          https://raw.githubusercontent.com/kdeldycke/workflows/main/nuitka-requirements.txt
+          https://raw.githubusercontent.com/kdeldycke/workflows/main/requirements/nuitka.txt
       - name: Nuitka + compilers versions
         run: |
           poetry run python -m nuitka --version

diff --git a/changelog.md b/changelog.md
@@ -7,6 +7,7 @@ This version is not released yet and is under active development.
 ```
 
 - Start collecting `bump-my-version` rules from different projects.
+- Move all `*-requirements.txt` files to `requirements` subfolder.
 
 ## [3.2.4 (2024-02-24)](https://github.com/kdeldycke/workflows/compare/v3.2.3...v3.2.4)
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     - Start collecting `bump-my-version` rules from different projects.
+    - Move all `*-requirements.txt` files to `requirements` subfolder.
     ## [3.2.4 (2024-02-24)](https://github.com/kdeldycke/workflows/compare/v3.2.3...v3.2.4)
@@ Expand Down @@