fix: build process

Author: mikewolfd

.github/workflows/python-publish.yml

@@ -46,7 +46,6 @@ jobs:
   build-and-publish:
     needs: test
     runs-on: ubuntu-latest
-    # Only run this job on release creation or tag push
     if: github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v')
 
     steps:
@@ -60,53 +59,54 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install build twine
-        pip install -e .
+        pip install -e .[dev]
     
     - name: Generate models
       run: |
         python scripts/generate_models.py
+        echo "Generated $(find msgspec_schemaorg/models -type f -name "*.py" | wc -l) model files"
     
     - name: Build package
       run: |
+        # Build the package
         python -m build
+        
+        # Verify package contents
+        echo "Verifying package contents..."
+        
+        # Check source distribution
+        mkdir -p /tmp/check-sdist
+        tar -xf dist/*.tar.gz -C /tmp/check-sdist
+        MODEL_COUNT=$(find /tmp/check-sdist -name "*.py" | grep models | wc -l)
+        echo "Source distribution contains $MODEL_COUNT model files"
+        if [ "$MODEL_COUNT" -lt 900 ]; then
+          echo "ERROR: Not enough model files in source distribution"
+          exit 1
+        fi
+        
+        # Install and verify the wheel
+        pip install dist/*.whl
+        python -c "import msgspec_schemaorg.models; count = len(msgspec_schemaorg.models.__all__); print(f'Wheel contains {count} importable models'); assert count > 900, 'Not enough models'"
     
-    - name: Upload package distributions
+    - name: Upload distributions
       uses: actions/upload-artifact@v4
       with:
         name: python-package-distributions
         path: dist/
 
     - name: Publish to PyPI
-      if: github.event_name == 'release' || startsWith(github.ref, 'refs/tags/v')
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
         skip-existing: true
 
-    - name: Sign the dists with Sigstore
+    - name: Sign with Sigstore
       uses: sigstore/gh-action-sigstore-python@v3.0.0
       with:
-        inputs: >-
-          ./dist/*.tar.gz
-          ./dist/*.whl
+        inputs: ./dist/*.tar.gz ./dist/*.whl
 
-    - name: Create GitHub Release
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: >-
-        gh release create
-        "$GITHUB_REF_NAME"
-        --repo "$GITHUB_REPOSITORY"
-        --notes "This release was automatically created by the GitHub Actions workflow."
-    - name: Upload artifact signatures to GitHub Release
+    - name: Upload to GitHub Release
       env:
         GITHUB_TOKEN: ${{ github.token }}
-      # Upload to GitHub Release using the `gh` CLI.
-      # `dist/` contains the built packages, and the
-      # sigstore-produced signatures and certificates.
-      run: >-
-        gh release upload
-        "$GITHUB_REF_NAME" dist/**
-        --repo "$GITHUB_REPOSITORY"
+      run: |
+        gh release upload "$GITHUB_REF_NAME" dist/** --repo "$GITHUB_REPOSITORY"

MANIFEST.in

@@ -1,3 +1,4 @@
-recursive-include msgspec_schemaorg/models *.py
+recursive-include msgspec_schemaorg *.py
+recursive-include scripts *.py
 include README.md
 include LICENSE

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["setuptools>=61.0", "wheel"]
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "msgspec-schemaorg"
@@ -22,9 +22,20 @@ dependencies = [
     "requests>=2.28.0",
 ]
 
+[project.scripts]
+msgspec-schemaorg-generate = "msgspec_schemaorg.cli:generate_models_command"
+
 [project.urls]
 "Homepage" = "https://github.com/mikewolfd/msgspec-schemaorg"
 "Bug Tracker" = "https://github.com/mikewolfd/msgspec-schemaorg/issues"
 
-[tool.hatch.build.targets.wheel]
-packages = ["msgspec_schemaorg"] 
+[project.optional-dependencies]
+dev = [
+    "build",
+    "twine",
+    "pytest"
+]
+
+[tool.setuptools]
+packages = ["msgspec_schemaorg"]
+include-package-data = true