diff --git a/.github/workflows/check-coverage.yml b/.github/workflows/check-coverage.yml index f02be570..e55838ed 100644 --- a/.github/workflows/check-coverage.yml +++ b/.github/workflows/check-coverage.yml @@ -30,10 +30,11 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade build - pip install . - pip install .[test] + pip install .[versioning] doit version + pip install . python -m build + pip install .[test] # https://github.com/marketplace/actions/pytest-coverage-comment - name: Generate coverage report diff --git a/.github/workflows/generate-metadata.yml b/.github/workflows/generate-metadata.yml index 85a9a698..8b47b312 100644 --- a/.github/workflows/generate-metadata.yml +++ b/.github/workflows/generate-metadata.yml @@ -23,10 +23,11 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade build - pip install . - pip install .[test] + pip install .[versioning] doit version + pip install . python -m build + pip install .[test] - name: Run license check run: python bin/license-checker.py diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 7c00bee5..1473b7c9 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -71,10 +71,11 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade build - pip install . - pip install .[package] + pip install .[versioning] doit version + pip install . python -m build + pip install .[package] - name: Package with pyinstaller for ${{matrix.TARGET}} run: ${{matrix.CMD_BUILD}} diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml index bf912399..5f5d84bd 100644 --- a/.github/workflows/publish-pypi.yml +++ b/.github/workflows/publish-pypi.yml @@ -26,10 +26,11 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade build - pip install . - pip install .[package] + pip install .[versioning] doit version + pip install . python -m build + - name: Publish distribution 📦 to Test PyPI if: ${{ inputs.is_draft }} uses: pypa/gh-action-pypi-publish@release/v1 # license BSD-2 diff --git a/.github/workflows/run-e2-tests.yml b/.github/workflows/run-e2-tests.yml index 1d7c3e17..c620e9bc 100644 --- a/.github/workflows/run-e2-tests.yml +++ b/.github/workflows/run-e2-tests.yml @@ -35,10 +35,11 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade build - pip install . - pip install .[test] + pip install .[versioning] doit version + pip install . python -m build + pip install .[test] - name: Run e2e tests run: | diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b21f2da4..c849592d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,7 +15,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: ['3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} @@ -32,10 +32,11 @@ jobs: python --version python -m pip install --upgrade pip python -m pip install --upgrade build - pip install . - pip install .[test] + pip install .[versioning] doit version + pip install . python -m build + pip install .[test] - name: Test with pytest run: pytest diff --git a/pyproject.toml b/pyproject.toml index fcab3277..9bd0295b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,14 +62,15 @@ test = [ "types-appdirs", "types-mock", "types-requests", - "types-setuptools", - # these last three are required for the versioning step + "types-setuptools" +] +localize = ["doit", "ftfy"] +package = ["doit", "pyinstaller==5.13"] +versioning = [ "doit", "pyinstaller_versionfile", "setuptools_scm" ] -localize = ["doit", "ftfy"] -package = ["doit", "pyinstaller==5.13"] [project.urls] repository = "https://github.com/tableau/tabcmd" [project.scripts]