just let python 3.6 fail for tune

fidelity · Aug 17, 2021 · 3821c41 · 3821c41
1 parent fc930ce
commit 3821c41
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.github/workflows/python-docs.yaml b/.github/workflows/python-docs.yaml
@@ -22,7 +22,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: ${{ 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 and dev dependencies
       run: |

diff --git a/.github/workflows/python-lint.yaml b/.github/workflows/python-lint.yaml
@@ -24,14 +24,16 @@ 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: ${{ 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 and dev dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -e .
         pip install -r ./requirements/DEV_REQUIREMENTS.txt
         pip install -r ./requirements/S3_REQUIREMENTS.txt
+        pip install -r ./requirements/TUNE_REQUIREMENTS.txt
+        pip install -r ./requirements/TEST_EXTRAS_REQUIREMENTS.txt
 
     - name: Run isort linter
       run: |

diff --git a/.github/workflows/python-pytest.yml b/.github/workflows/python-pytest.yml
@@ -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: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('REQUIREMENTS.txt') }}-${{ hashFiles('./requirements/DEV_REQUIREMENTS.txt') }}
 
     - name: Install dependencies
       run: |

diff --git a/setup.py b/setup.py
@@ -6,8 +6,6 @@
 """Spock Setup"""
 
 import setuptools
-import sys
-from platform import python_version
 from pkg_resources import parse_requirements
 
 import versioneer
@@ -25,14 +23,6 @@
     tune_reqs = [str(req) for req in parse_requirements(fid)]
 
 
-def _get_tune_reqs():
-    if sys.version_info.minor >= 7:
-        with open("./requirements/TUNE_REQUIREMENTS.txt", "r") as fid:
-            return [str(req) for req in parse_requirements(fid)]
-    else:
-        raise RuntimeError(f'Installation of the [tune] add-on requires Python 3.7+ -- current Python version is {python_version()}')
-
-
 setuptools.setup(
     name="spock-config",
     description="Spock is a framework designed to help manage complex parameter configurations for Python applications",
@@ -76,5 +66,5 @@ def _get_tune_reqs():
     ),
     python_requires=">=3.6",
     install_requires=install_reqs,
-    extras_require={"s3": s3_reqs, "tune": _get_tune_reqs()},
+    extras_require={"s3": s3_reqs, "tune": tune_reqs},
 )