diff --git a/.github/actions/setup-poetry-env/action.yml b/.github/actions/setup-poetry-env/action.yml index ad665590..e7e8e97a 100644 --- a/.github/actions/setup-poetry-env/action.yml +++ b/.github/actions/setup-poetry-env/action.yml @@ -28,7 +28,7 @@ runs: id: cached-poetry-dependencies uses: actions/cache@v4 with: - path: .venv + path: arcade/.venv key: venv-${{ runner.os }}-${{ inputs.python-version }}-${{ hashFiles('arcade/poetry.lock') }} - name: Install dependencies diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7cbf2eec..5b111200 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,12 @@ jobs: path: ~/.cache/pre-commit key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} - - name: Set up the environment + - name: Set up the Poetry environment uses: ./.github/actions/setup-poetry-env + - name: Install pre-commit + run: make install + - name: Run checks run: make check @@ -35,20 +38,11 @@ jobs: - name: Check out uses: actions/checkout@v4 - - name: Set up python - uses: actions/setup-python@v5 + - name: Set up the Poetry environment + uses: ./.github/actions/setup-poetry-env with: python-version: ${{ matrix.python-version }} - - name: Install Poetry - uses: snok/install-poetry@v1 - - - name: Load cached venv - uses: actions/cache@v4 - with: - path: .tox - key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('arcade/poetry.lock') }} - - name: Install tox run: | python -m pip install --upgrade pip diff --git a/arcade/tox.ini b/arcade/tox.ini index fc0917c3..dc80b75a 100644 --- a/arcade/tox.ini +++ b/arcade/tox.ini @@ -12,6 +12,5 @@ python = passenv = PYTHON_VERSION allowlist_externals = poetry commands = - poetry install -v --all-extras pytest --doctest-modules tests --cov --cov-config=pyproject.toml --cov-report=xml # mypy