Merge branch 'development' into main

Author: jacalata

.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

.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

.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}}

.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

.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: | 

.github/workflows/run-tests.yml

@@ -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

README.md

@@ -2,7 +2,7 @@
 
 [![Tableau Supported](https://img.shields.io/badge/Support%20Level-Tableau%20Supported-53bd92.svg)](https://www.tableau.com/support-levels-it-and-developer-tools)
 
-[![Code coverage]([https://coveralls.io/repos/tableau/tabcmd/badge.png])(https://github.com/tableau/tabcmd/actions)
+[![Coverage Status](https://coveralls.io/repos/github/tableau/tabcmd/badge.svg)](https://coveralls.io/github/tableau/tabcmd)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Python tests](https://github.com/tableau/tabcmd/actions/workflows/run-tests.yml/badge.svg)](https://github.com/tableau/tabcmd/actions/workflows/run-tests.yml)
 [![Pypi smoke tests](https://github.com/tableau/tabcmd/actions/workflows/python-app.yml/badge.svg)](https://github.com/tableau/tabcmd/actions/workflows/python-app.yml)

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]