Adjustments to github actions

Author: elifarley

.github/workflows/publish.yml

@@ -21,14 +21,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependencies
+      - name: Install dependencies and run CI
         run: |
           python -m pip install --upgrade pip
-          pip install pytest
-          pip install -e .
-
-      - name: Run tests
-        run: pytest
+          pip install build pytest pytest-cov setuptools_scm
+          make ci
 
   publish:
     needs: test
@@ -41,23 +38,16 @@ jobs:
         with:
           python-version: '3.x'
 
-      - name: Install build tools
-        run: |
-          python -m pip install --upgrade pip
-          pip install build twine
-
       - name: Verify tag version matches package version
         run: |
-          PACKAGE_VERSION=$(python setup.py --version)
-          TAG_VERSION=${GITHUB_REF#refs/tags/v}
+          pip install twine
+          PACKAGE_VERSION=$(python -m setuptools_scm)
+          TAG_VERSION=${GITHUB_REF#refs/tags/}  # Remove 'refs/tags/' prefix
           if [ "$PACKAGE_VERSION" != "$TAG_VERSION" ]; then
             echo "Package version ($PACKAGE_VERSION) does not match tag version ($TAG_VERSION)"
             exit 1
           fi
 
-      - name: Build package
-        run: python -m build
-
       - name: Publish to TestPyPI
         if: contains(github.ref, 'test')
         env:
@@ -70,7 +60,7 @@ jobs:
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-        run: twine upload dist/*
+        run: make ci.dist
 
       - name: Create Release
         uses: softprops/action-gh-release@v1

.github/workflows/windows-test.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ['3.11', '3.12']
+        python-version: ['3.12']
         architecture: ['x64']
 
     steps:
@@ -31,17 +31,11 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pytest pytest-cov
-          pip install -e .
+          pip install build pytest pytest-cov
 
       - name: Run tests
         run: |
-          pytest --cov=cedarscript_ast_parser tests/
-      - name: Test PyPI installation
-        run: |
-          pip uninstall cedarscript-ast-parser -y
-          pip install cedarscript-ast-parser
-          python -c "from cedarscript_ast_parser import CEDARScriptASTParser; CEDARScriptASTParser()"
+          make ci
 
       # Optional: Upload artifacts if your package generates any
       - name: Upload artifacts

Makefile

@@ -1,8 +1,11 @@
 .PHONY: all dist d clean c version v install i test t build b
 
-all: clean install test build version
+ci: clean install test
+all: ci build version
 
-dist d: all
+dist d: all ci.dist
+
+ci.dist:
 	scripts/check-version.sh
 	twine upload dist/*