Fix Caching Issues

The python userbase in the setup python action was not being cached due
to the path used being incorrect. I seem to recall finding the path in
the setup-python or caching action docs, however I can no longer find
it. It's been removed as it's not very relevant either way.

The pip cache has been added to the set of cached paths.
The tests' python patch version has been specified to avoid
other cache misses.

Signed-off-by: Hassan Abouelela <[email protected]>

.github/workflows/test_setup_python.yaml

@@ -65,11 +65,14 @@ jobs:
   cache_hit_pre:
     name: Setup Cache
     runs-on: ubuntu-latest
+    outputs:
+      python_version: ${{ steps.python.outputs.python-version }}
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup Python
+        id: python
         uses: ./setup-python
         with:
           install_args: "--without dev"
@@ -90,7 +93,11 @@ jobs:
         uses: ./setup-python
         with:
           install_args: "--without dev"
-          python_version: '3.10'
+          # The python version must explicitly be specified using the setup's version,
+          # since the underlying setup action can sometimes use different patch versions randomly.
+          # I.e: the setup-python action can use 3.10.9 on one run, and 3.10.8 on the next,
+          # even if both are specified as 3.10.
+          python_version: ${{ needs.cache_hit_pre.outputs.python_version }}
           working_dir: setup-python/tests/
 
       - name: Check For Cache hit

setup-python/action.yaml

@@ -66,7 +66,7 @@ runs:
       with:
         path: |
           ~/.cache/pypoetry
-          ~/.cache/py-user-base
+          ~/.cache/pip
         key: "python-${{ runner.os }}-v1.3.4b1-\
         ${{ steps.python_setup.outputs.python-version }}-${{ inputs.dev }}-${{ inputs.working_dir }}-${{ inputs.poetry_version }}-${{ inputs.install_args }}-\
         ${{ hashFiles(format('{0}/pyproject.toml', inputs.working_dir), format('{0}/poetry.lock', inputs.working_dir)) }}"
@@ -94,8 +94,9 @@ runs:
         if [ "${{ steps.python_cache.outputs.cache-hit }}" = "true" ]; then
           if [ "${{ inputs.use_cache }}" = "false" ]; then
             echo "Caching not enbaled, deleting cache."
-            rm -rf  ~/.cache/py-user-base
-            rm -rf  ~/.cache/pre-commit
+            rm -rf ~/.cache/pypoetry
+            rm -rf ~/.cache/pip
+            rm -rf ~/.cache/pre-commit
           else
             echo "Cache hit, skipping install."
             exit