linted. attempting to bust the actions cache since I can't replicate …

…the 3.6 tests failing locally in a venv
fidelity · Mar 11, 2022 · 4b916fc · 4b916fc
1 parent d5879a6
commit 4b916fc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/python-pytest-s3.yaml b/.github/workflows/python-pytest-s3.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/cache@v2
       with:
         path: ${{ env.pythonLocation }}
-        key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/S3_REQUIREMENTS.txt') }}
+        key: cache-v1-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/S3_REQUIREMENTS.txt') }}
 
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/python-pytest-tune.yaml b/.github/workflows/python-pytest-tune.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10']
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/cache@v2
       with:
         path: ${{ env.pythonLocation }}
-        key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/S3_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/TUNE_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/TEST_EXTRAS_REQUIREMENTS_REQUIREMENTS.txt') }}
+        key: cache-v1-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/S3_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/TUNE_REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/TEST_EXTRAS_REQUIREMENTS_REQUIREMENTS.txt') }}
 
     - name: Install dependencies
       run: |

diff --git a/.github/workflows/python-pytest.yml b/.github/workflows/python-pytest.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/cache@v2
       with:
         path: ${{ env.pythonLocation }}
-        key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}
+        key: cache-v1-${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}
 
     - name: Install dependencies
       run: |

diff --git a/spock/backend/builder.py b/spock/backend/builder.py
@@ -18,9 +18,7 @@
 from spock.backend.spaces import BuilderSpace
 from spock.backend.wrappers import Spockspace
 from spock.graph import Graph
-from spock.utils import make_argument
-
-from spock.utils import _SpockVariadicGenericAlias
+from spock.utils import _SpockVariadicGenericAlias, make_argument
 
 
 class BaseBuilder(ABC):  # pylint: disable=too-few-public-methods

diff --git a/spock/backend/field_handlers.py b/spock/backend/field_handlers.py
@@ -19,7 +19,12 @@
     _SpockNotOptionalError,
     _SpockValueError,
 )
-from spock.utils import _check_iterable, _is_spock_instance, _is_spock_tune_instance, _SpockVariadicGenericAlias
+from spock.utils import (
+    _check_iterable,
+    _is_spock_instance,
+    _is_spock_tune_instance,
+    _SpockVariadicGenericAlias,
+)
 
 
 class RegisterFieldTemplate(ABC):

diff --git a/spock/backend/typed.py b/spock/backend/typed.py
@@ -9,10 +9,11 @@
 from enum import Enum, EnumMeta
 from functools import partial
 from typing import TypeVar, Union
-from spock.utils import _SpockGenericAlias, _SpockVariadicGenericAlias
 
 import attr
 
+from spock.utils import _SpockGenericAlias, _SpockVariadicGenericAlias
+
 
 class SavePath(str):
     """Spock special key for saving the Spock config to file

diff --git a/spock/utils.py b/spock/utils.py
@@ -41,7 +41,9 @@ def _get_callable_type():
     elif minor > 8:
         from typing import _CallableType as _VariadicGenericAlias
     else:
-        raise RuntimeError(f"Attempting to use spock with python version `3.{minor}` which is unsupported")
+        raise RuntimeError(
+            f"Attempting to use spock with python version `3.{minor}` which is unsupported"
+        )
     return _VariadicGenericAlias