From 238fd44410ece0b53f5f2eb059ae85406a3aba45 Mon Sep 17 00:00:00 2001 From: Justin Flannery Date: Wed, 6 Dec 2023 10:34:39 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20project=20self=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lint.yaml | 7 +++---- .github/workflows/publish.yaml | 4 ++-- .github/workflows/release.yaml | 9 ++++----- .github/workflows/tests.yaml | 8 +++++++- pyproject.toml | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index e356ade..d76dc01 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -16,12 +16,11 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.11" - - name: Install Python Dependencies + - name: Install Hatch run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel python -m pip install -q hatch pre-commit - python -m pip install -q -e . - hatch env create + python -m pip install -q "${{ github.workspace }}" hatch --version - name: Lint id: lint diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 932bbde..380bc00 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -21,9 +21,9 @@ jobs: python-version: "3.11" - name: Install Hatch run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel python -m pip install -q hatch pre-commit - python -m pip install -q -e . + python -m pip install -q "${{ github.workspace }}" hatch --version - name: Build package run: | diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7125f5b..015394f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -28,10 +28,9 @@ jobs: python-version: "3.11" - name: Install Hatch run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel python -m pip install -q hatch pre-commit - python -m pip install -q -e . - hatch -v env create + python -m pip install -q "${{ github.workspace }}" hatch --version - name: Release run: hatch run gen:release @@ -60,9 +59,9 @@ jobs: python-version: "3.11" - name: Install Hatch run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel python -m pip install -q hatch pre-commit - python -m pip install -q -e . + python -m pip install -q "${{ github.workspace }}" hatch --version - name: Set Up GitHub Actions User run: | diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index c0b9742..909e5d3 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -42,10 +42,16 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python }} + - name: Install Default Python + if: matrix.python != '3.11' + uses: actions/setup-python@v4 + with: + python-version: "3.11" - name: Install Hatch run: | - python -m pip install --upgrade pip + python -m pip install --upgrade pip wheel python -m pip install -q hatch pre-commit + python -m pip install -q "${{ github.workspace }}" hatch --version - name: Test Suite run: | diff --git a/pyproject.toml b/pyproject.toml index 1709296..292f51f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ parallel = true source_pkgs = ["hatch_pip_compile", "tests"] [tool.hatch.env] -requires = ["hatch-pip-compile", "hatch-mkdocs"] +requires = ["hatch-mkdocs"] [tool.hatch.env.collectors.mkdocs.docs] path = "mkdocs.yaml"