Try a different approach

dependabot · Mar 24, 2023 · af7d9fa · af7d9fa
1 parent 182d829
commit af7d9fa
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -210,4 +210,9 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+      - uses: actions/setup-python@v1
+        with:
+          python-version-file: .python-version
+          cache: pip
+      - run: pip install -r requirements.txt
       - run: ./bin/lint
diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.7
diff --git a/bin/lint b/bin/lint
@@ -15,3 +15,5 @@ shellcheck \
   "$@"
 
 bundle exec rubocop
+
+flake8 python/helpers/. --count --exclude=./.*,./python/spec/fixtures --show-source --statistics
diff --git a/python/script/ci-test b/python/script/ci-test
@@ -2,16 +2,5 @@
 
 set -e
 
-# Not yet true but sets the example to follow after Python 3.6 support is dropped
-OLDEST_SUPPORTED_PYTHON=3.7
-
-if [ -s /usr/local/.pyenv/$OLDEST_SUPPORTED_PYTHON.tar.gz ]
-then
-  tar xzf /usr/local/.pyenv/$OLDEST_SUPPORTED_PYTHON.tar.gz -C /usr/local/.pyenv/
-fi
-
-PYENV_VERSION=$OLDEST_SUPPORTED_PYTHON pyenv exec pip --disable-pip-version-check install --use-pep517 -r "helpers/dev-requirements.txt"
 bundle install
-
-PYENV_VERSION=$OLDEST_SUPPORTED_PYTHON pyenv exec flake8 helpers/. --count --exclude=./.*,./python/spec/fixtures --show-source --statistics
 bundle exec parallel_test spec/ -n "$CI_NODE_TOTAL" --only-group "$CI_NODE_INDEX" --group-by filesize --type rspec
diff --git a/python/helpers/dev-requirements.txt → requirements.txt b/python/helpers/dev-requirements.txt → requirements.txt