fix packaging

Author: jmelahman

.github/workflows/release.yml

@@ -8,20 +8,20 @@ on:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
+    environment:
+      name: release
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
           fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v5
+      - uses: actions/setup-go@v5
         with:
           go-version: stable
           cache: false
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v6
+      - uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
           version: "~> v2"
@@ -30,6 +30,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   pypi:
     runs-on: ubuntu-latest
+    environment:
+      name: release
     steps:
       - uses: actions/checkout@v4
         with:
@@ -39,9 +41,9 @@ jobs:
         with:
           go-version: stable
           cache: false
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@v5
-      - name: Build
-        run: uv build --wheel
-      - name: Upload
-        run: uv publish
+      - uses: astral-sh/setup-uv@v5
+      - run: uv build --wheel
+      - run: uvx twine upload dist/*
+        env:
+          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}

pyproject.toml

@@ -2,4 +2,18 @@
 requires = ["setuptools>=64", "setuptools_scm>=8"]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "work-bin"
+description = "A stupid simple time tracker"
+license = {file = "LICENSE"}
+readme = "README.md"
+requires-python = ">=3.6"
+classifiers = [
+    "Programming Language :: Go",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+dynamic = ["version"]
+
 [tool.setuptools_scm]
+

setup.py

@@ -7,43 +7,33 @@
 from setuptools.command.build import build
 from setuptools.command.install import install
 
+PACKAGE_NAME = "work"
+
 class BuildGoBinary(build):
     def run(self):
-        if not os.path.exists("work"):
+        if not os.path.exists(PACKAGE_NAME):
             print("Building Go binary...")
-            tag = os.environ["GITHUB_REF_NAME"]
-            commit = os.environ["GITHUB_SHA"]
+            tag = os.getenv("GITHUB_REF_NAME", "dev")
+            commit = os.getenv("GITHUB_SHA", "none")
             subprocess.check_call(
-                ["go", "build",  f"-ldflags=-X main.version={tag} -X main.commit={commit} -s -w", "-o", "work", "main.go"],
+                ["go", "build",  f"-ldflags=-X main.version={tag} -X main.commit={commit} -s -w", "-o", PACKAGE_NAME, "main.go"],
                 env={"GOOS": "linux", "GOARCH": "amd64", **os.environ},
             )
         build.run(self)
 
 class PostInstallCommand(install):
     def run(self):
-        binary_source = os.path.join(os.path.dirname(__file__), "work")
-        binary_dest = os.path.join(self.install_scripts, "work")
+        binary_source = os.path.join(os.path.dirname(__file__), PACKAGE_NAME)
+        binary_dest = os.path.join(self.install_scripts, PACKAGE_NAME)
 
         os.makedirs(self.install_scripts, exist_ok=True)
         shutil.move(binary_source, binary_dest)
 
         install.run(self)
 
 setup(
-    name="work-bin",
-    packages=[],
-    include_package_data=True,
     cmdclass={
         "build": BuildGoBinary,
         "install": PostInstallCommand,
     },
-    description="A stupid simple time tracker",
-    long_description=open("README.md").read(),
-    long_description_content_type="text/markdown",
-    classifiers=[
-        "Programming Language :: Go",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.6",
 )