From 900fc18db76a4e20c77f748bcffff2055231a3b5 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@pinterest.com>
Date: Tue, 15 Feb 2022 15:22:43 -0800
Subject: Revise tox configuration (#375)

This repositions tox as the "source of truth" for all development and CI
actions.

To support this, lint and test requirements have been split into
separate sets of requirements, and a consolidated 'lint' environment now
runs all of our lint checks. This is also used by CI.
---
 .github/workflows/ci.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1d3ff4..6ee0977 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,24 +24,23 @@ jobs:
     - uses: actions/cache@v2
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('setup.py') }}-${{ hashFiles('*-requirements.txt') }}
+        key: ${{ runner.os }}-python-${{ matrix.python-version }}-pip-${{ hashFiles('.github/workflows/ci.yml') }}
         restore-keys: ${{ runner.os }}-python-${{ matrix.python-version }}-pip
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        python -m pip install tox tox-gh-actions
         sudo apt-get install libmemcached-dev
     - name: Lint
       if: matrix.python-version == '3.10'
       run: |
-        pip install tox tox-gh-actions
-        tox -e flake8,black
+        tox -e lint
     - name: Disable IPv6 localhost
       run: |
         sudo sed -i '/::1/d' /etc/hosts
     - name: Tests
       run: |
-        pip install -r test-requirements.txt
-        py.test pymemcache/test/ \
+        tox -- pymemcache/test/ \
             -m 'unit or integration' \
             --port ${{ job.services.memcached.ports[11211] }} \
             --tls-port ${{ job.services.tls_memcached.ports[11211] }}
-- 
cgit v1.2.1