fix wheels to correctly build and publish wheels to pypi and add pyproject toml to fix wheel metadata and remove the need of version.py and replace with txt. Update scripts along with the change from .py to .txt

Author: MOmarMiraj

.github/workflows/wheels.yml

@@ -20,7 +20,8 @@ jobs:
 
       # Need to grab the SDK version for the wheel name
       - name: Extract SDK Version
-        run: echo "SDK_VERSION=$(python -c 'import version; print(version.SDK_VERSION)')" >> $GITHUB_ENV
+        run: echo "SDK_VERSION=$(cat version.txt)" >> "$GITHUB_ENV"
+        shell: bash
 
       - name: Install cibuildwheel
         run: |
@@ -34,7 +35,6 @@ jobs:
           CIBW_ARCHS: "native"
           CIBW_TEST_REQUIRES: "pydantic pytest pytest-asyncio"
           CIBW_TEST_COMMAND: "python -m pytest {project}/src/onepassword/test_client.py"
-          MACOSX_DEPLOYMENT_TARGET: 11.0 # Required for building on macOS
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.TEST_SERVICE_ACCOUNT_TOKEN }}
           CIBW_ENVIRONMENT_PASS_LINUX: OP_SERVICE_ACCOUNT_TOKEN # to pass in the SA token, for some reason Linux doesn't read the env variables correctly
         run: |
@@ -50,23 +50,24 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && contains(github.event.pull_request.head.ref, 'sdk-core/')
     steps:
+      - uses: actions/checkout@v4
         # Need to grab the SDK version for the wheel name
       - name: Extract SDK Version
-        run: echo "SDK_VERSION=$(python -c 'import version; print(version.SDK_VERSION)')" >> $GITHUB_ENV
-      
-      - uses: actions/checkout@v4
+        run: echo "SDK_VERSION=$(cat version.txt)" >> "$GITHUB_ENV"
+        shell: bash
+        
       - name: Install dependencies
-        run: pip install build pydantic pytest pytest-asyncio
+        run: pip3 install build pydantic pytest pytest-asyncio
 
       - name: Build source distribution
-        run: python -m build --sdist
+        run: python3 -m build --sdist
 
       - name: Test Source Distribution
         env:
           OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.TEST_SERVICE_ACCOUNT_TOKEN }}
         run: |
-          python -m pip install dist/*.tar.gz
-          python -m pytest src/onepassword/test_client.py
+          python3 -m pip install dist/*.tar.gz
+          python3 -m pytest src/onepassword/test_client.py
 
       - uses: actions/upload-artifact@v4
         with:
@@ -78,18 +79,16 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && contains(github.event.pull_request.head.ref, 'sdk-core/')
     environment:
-      name: testpypi
-      url: https://pypi.org/p/<your-pypi-project-name>
+      name: pypi
+      url: https://pypi.org/project/onepassword-sdk/
     permissions:
-      id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
+      id-token: write  # Required for PyPi trusted publishing
     needs: [build_wheels, build-sdist]
     steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: python-sdk-release
-          path: dist
-
-      - name: Publish package distributions to TestPyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+      - uses: actions/download-artifact@v4
         with:
-          repository-url: https://test.pypi.org/legacy/
+            pattern: onepassword-sdk-*
+            path: ./dist
+            merge-multiple: true
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1.12

pyproject.toml

@@ -0,0 +1,33 @@
+[build-system]
+requires = ["setuptools>=66", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "onepassword-sdk"
+dynamic = ["version"]
+description = "The 1Password Python SDK offers programmatic read access to your secrets in 1Password in an interface native to Python."
+authors = [{ name = "1Password" }]
+license = { file = "LICENSE" }
+readme = "README.md"
+requires-python = ">=3.9"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: Microsoft :: Windows",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "License :: OSI Approved :: MIT License",
+]
+dependencies = [
+    "pydantic>=2.5",
+]
+
+[project.urls]
+Homepage = "https://github.com/1Password/onepassword-sdk-python"
+
+[tool.setuptools.dynamic]
+version = {file = "./version.txt"}

setup.py

@@ -1,7 +1,5 @@
-from pathlib import Path
 from setuptools import setup, find_packages, Distribution
 from sysconfig import get_platform
-from version import SDK_VERSION
 import platform
 import os
 
@@ -49,36 +47,11 @@ def get_shared_library_data_to_include():
 
 
 setup(
-    name="onepassword-sdk",
-    version=SDK_VERSION,
-    author="1Password",
-    long_description=(Path(__file__).parent / "README.md").read_text(),
-    long_description_content_type="text/markdown",
-    description="The 1Password Python SDK offers programmatic read access to your secrets in 1Password in an interface native to Python.",
-    url="https://github.com/1Password/onepassword-sdk-python",
     packages=find_packages(
         where="src",
     ),
     distclass=BinaryDistribution,
-    license="MIT",
-    license_files="LICENSE",
     package_dir={"": "src"},
-    python_requires=">=3.9",
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Operating System :: MacOS",
-        "Operating System :: POSIX :: Linux",
-        "Operating System :: Microsoft :: Windows",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "Programming Language :: Python :: 3.13",
-        "License :: OSI Approved :: MIT License",
-    ],
     cmdclass={"bdist_wheel": bdist_wheel},
     package_data={"": get_shared_library_data_to_include()},
-    install_requires=[
-        "pydantic>=2.5",  # Minimum Pydantic version to run the Python SDK
-    ],
 )

src/release/scripts/build-wheels.sh

@@ -2,8 +2,6 @@
 
 # Helper script to build the required wheels for the Python SDK
 
-output_version_file="version.py"
-
 # The list of python verisons the SDKs release for
 python_versions=("$@")
 
@@ -15,7 +13,7 @@ macOS_version_x86_64=10.9
 macOS_version_arm64=11.0
 
 # Extracts the current verison number for cleanup function
-current_version=$(awk -F "['\"]" '/SDK_VERSION =/{print $2}' "$output_version_file")
+current_version=$(cat version.txt)
 
 # Function to execute upon exit
 cleanup() {

src/release/scripts/prep-release.sh

@@ -2,21 +2,20 @@
 
 # Helper script to prepare a release for the Python SDK.
 
-output_version_file="version.py"
+output_version_file="version.txt"
 output_build_file="src/onepassword/build_number.py"
-version_template_file="src/release/templates/version.tpl.py"
 build_number_template_file="src/release/templates/build_number.tpl.py"
 
 
 # Extracts the current build/version number for comparison and backup 
-current_version=$(awk -F "['\"]" '/SDK_VERSION =/{print $2}' "$output_version_file")
+current_version=$(cat "$output_version_file")
 current_build=$(awk -F "['\"]" '/SDK_BUILD_NUMBER =/{print $2}' "$output_build_file")
 
 # Function to execute upon exit
 cleanup() {
     echo "Performing cleanup tasks..."
     # Revert changes to file if any
-    sed -e "s/{{ version }}/$current_version/" "$version_template_file" > "$output_version_file"
+    echo -n "$current_version" > "$output_version_file"
     sed -e "s/{{ build }}/$current_build/" "$build_number_template_file" > "$output_build_file"
     exit 1   
 }
@@ -86,8 +85,8 @@ update_and_validate_version
 # Update and validate the build number
 update_and_validate_build 
 
-# Update version & build number in version.py and build_number.py respectively
-sed  -e "s/{{ version }}/$version/" "$version_template_file" > "$output_version_file"
+# Update version & build number in version.txt and build_number.py respectively
+echo -n "$version" > "$output_version_file"
 sed  -e "s/{{ build }}/$build/" "$build_number_template_file" > "$output_build_file"
 
 

src/release/scripts/release.sh

@@ -5,7 +5,7 @@
 set -e
 
 # Read the contents of the files into variables
-version=$(awk -F "['\"]" '/SDK_VERSION =/{print $2}' "version.py")
+version=$(cat "version.txt")
 build=$(awk -F "['\"]" '/SDK_BUILD_NUMBER =/{print $2}' "src/onepassword/build_number.py")
 release_notes=$(< src/release/RELEASE-NOTES)
 
@@ -27,10 +27,3 @@ git tag -a -s  "v${version}" -m "${version}"
 git push origin tag "v${version}"
 
 gh release create "v${version}" --title "Release ${version}" --notes "${release_notes}" --repo github.com/1Password/onepassword-sdk-python
-
-# Release on PyPi
-python3 -m twine upload dist/*
-
-# Delete the dist folder after published
-rm -r dist src/*.egg-info
-

src/release/templates/version.tpl.py

@@ -0,0 +1 @@
+0.2.0