Merge pull request #11 from ababak/dev

Building wheels

Author: ababak

.github/workflows/build-wheels-test.yml

@@ -1,13 +1,16 @@
-name: Build and Publish Wheels Test
+name: Build and Publish Test Wheels
 
 on:
+  # push:
+  #   tags:
+  #     - "v*.*.*"
   workflow_dispatch:
     inputs:
       tag:
         description: 'Version tag to use (e.g. v1.2.3)'
         required: true
         default: ''
-
+        
 jobs:
   build_wheels:
     name: Build Universal Wheel
@@ -22,31 +25,35 @@ jobs:
         with:
           python-version: '3.9'
 
-      - name: Install dependencies
+      - name: Update pip
         run: |
           python -m pip install --upgrade pip
-          pip install wheel setuptools toml
-          
-      - name: Build extensions using Docker
-        run: |
-          python setup.py build_ext
-          
+          pip install wheel setuptools build toml
+
       - name: Build universal wheel
         run: |
-          python setup.py bdist_wheel
+          python -m build --wheel
           
       - name: Upload wheel as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheel
           path: dist/*.whl
+
+  publish:
+    name: Publish to TestPyPI
+    needs: build_wheels
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Download wheel artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: wheel
+          path: dist
 
-      # - name: Publish to PyPI
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     password: ${{ secrets.PYPI_API_TOKEN }}
       - name: Publish to TestPyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.PYPI_TEST_API_TOKEN }}
+          password: ${{ secrets.PYPI_TEST_API_TOKEN }}          

.github/workflows/build-wheels.yml

@@ -25,31 +25,35 @@ jobs:
         with:
           python-version: '3.9'
 
-      - name: Install dependencies
+      - name: Update pip
         run: |
           python -m pip install --upgrade pip
-          pip install wheel setuptools toml
-          
-      - name: Build extensions using Docker
-        run: |
-          python setup.py build_ext
+          pip install wheel setuptools build toml
           
       - name: Build universal wheel
         run: |
-          python setup.py bdist_wheel
+          python -m build
           
       - name: Upload wheel as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheel
           path: dist/*.whl
 
-      # - name: Publish to PyPI
-      #   uses: pypa/gh-action-pypi-publish@release/v1
-      #   with:
-      #     password: ${{ secrets.PYPI_API_TOKEN }}
-      - name: Publish to TestPyPI
+  publish:
+    name: Publish to PyPI
+    needs: build_wheels
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Download wheel artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: wheel
+          path: dist
+          
+      - name: Publish to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          password: ${{ secrets.PYPI_API_TOKEN }}          
+        

README.md

@@ -1,39 +1,51 @@
-[![Docker Image CI](https://github.com/ababak/cgcpp/actions/workflows/docker-image.yml/badge.svg?branch=v1.7.0)](https://github.com/ababak/cgcpp/actions/workflows/docker-image.yml)
+[![Docker Image CI](https://github.com/ababak/cgcpp/actions/workflows/docker-image.yml/badge.svg)](https://github.com/ababak/cgcpp/actions/workflows/docker-image.yml)
+
+# Computer Graphics C++ (cgcpp)  
+A universal C++ solution for common needs in computer graphics software.
+
+### Supported Environments  
+- **Python & Boost Versions** (Windows):  
+  - Python 3.9, Boost 1.76.0  
+  - Python 3.10, Boost 1.80.0  
+  - Python 3.11, Boost 1.82.0  
+  - Python 3.12, Boost 1.85.0  
+- **Autodesk Maya** (Windows):  
+  - Maya 2023: Python 3.9, Boost 1.76.0  
+  - Maya 2024: Python 3.10, Boost 1.80.0  
+  - Maya 2025: Python 3.11, Boost 1.82.0  
+  - Maya 2026: Python 3.11, Boost 1.85.0  
+- **SideFX Houdini** (Windows):  
+  - Houdini 19.5: Python 3.9, Boost 1.76.0  
+  - Houdini 20.0: Python 3.10, Boost 1.80.0  
+  - Houdini 20.5: Python 3.11, Boost 1.82.0  
+
+Support for additional platforms and DCC applications may be added in the future.
+
+### Features  
+- **Isolated builds** inside a Docker container for a predictable environment  
+- **Python-C++ integration** to call C++ functions from Python  
+- **Dynamic library reloading** (updates libraries on each new call)  
+- **Python exception handling** from C++  
+
+## Installation  
+Install in your Windows Python virtual environment: 
 
-# Computer Graphics C++ (cgcpp)
-A universal solution for common needs in C++ in computer graphics software.
-
-### Supports
-- Python 3.9, Boost 1.76.0 on Windows
-- Python 3.10, Boost 1.80.0 on Windows
-- Python 3.11, Boost 1.82.0 on Windows
-- Python 3.12, Boost 1.85.0 on Windows
-- Autodesk Maya 2023-2026 on Windows *(Python 3.9 and Boost 1.76.0 in Maya 2023, Python 3.10 and Boost 1.80.0 in Maya 2024, Python 3.11 and Boost 1.82.0 in Maya 2025, Python 3.11 and Boost 1.85.0 in Maya 2026)*
-- SideFX Houdini 19.5-20.5 on Windows *(Python 3.9 and Boost 1.76.0 in Houdini 19.5, Python 3.10 and Boost 1.80.0 in Houdini 20.0, Python 3.11 and Boost 1.82.0 in Houdini 20.5)*
-
-Support for other platforms and other DCC applications may come later.
-
-### Features
-- Build inside a docker container (isolated predictable environment)
-- Call library C++ functions from Python
-- Dynamically reload modified libraries (each new call reloads the library and alows it to be updated)
-- Throw Python exceptions from C++
+    python -m pip install git+https://github.com/ababak/cgcpp.git
 
-## Installation
-Install in your Windows Python virtual environment:
+or
 
-    python -m pip install git+https://github.com/ababak/cgcpp.git
+    pip install cgcpp
 
-## Build the examples
+## Building Examples
 
     mkdir out
     python -m cgcpp examples/source_exception --out ./out
     python -m cgcpp examples/source_maya --out ./out --maya
     python -m cgcpp examples/source_houdini --out ./out --houdini
 
-Make sure you have Maya and Houdini versions installed in default locations that correspond to versions listed in `CMakeLists.txt`
+Ensure you have Maya and Houdini installed in their default locations as specified in `CMakeLists.txt`
 
-## Test built examples
+## Testing Built Examples
 Should throw `AttributeError: Some error` exception:
 
     python -c 'import cgcpp;cgcpp.call(lib="out/lib_exception", func="call")'

pyproject.toml

@@ -12,8 +12,11 @@ Homepage = "https://github.com/ababak/cgcpp"
 Repository = "https://github.com/ababak/cgcpp.git"
 
 [build-system]
-requires = ["setuptools>=61.0", "wheel", "toml"]
+requires = ["setuptools>=61.0", "wheel", "build", "toml"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools.packages.find]
-where = ["source/"]
+where = ["source"]
+
+# [tool.setuptools.package-data]
+# "*" = ["*.*"] # <-- this changed

setup.py

@@ -2,7 +2,7 @@
 (c) Andriy Babak 2021
 
 date: 28/05/2021
-modified: 04/04/2025 11:01:38
+modified: 04/04/2025 15:32:12
 
 Author: Andriy Babak
 e-mail: ababak@gmail.com
@@ -12,6 +12,7 @@
 """
 
 import os
+import shutil
 import subprocess
 from pathlib import Path
 
@@ -29,6 +30,9 @@ def get_version() -> str:
 
 
 VERSION = get_version()
+ROOT_PATH = Path(__file__).parent.absolute()
+SOURCE_PATH = ROOT_PATH / "source"
+BUILD_PATH = ROOT_PATH / "build"
 
 
 class BdistWheelCommand(bdist_wheel):
@@ -46,12 +50,6 @@ def get_tag(self):
         return impl, abi, plat
 
 
-class CMakeExtension(setuptools.Extension):
-    def __init__(self, name, sourcedir=""):
-        setuptools.Extension.__init__(self, name, sources=[])
-        self.sourcedir = Path(sourcedir).absolute()
-
-
 class CMakeBuild(build_ext):
     """
     Build CMake using docker image
@@ -61,56 +59,84 @@ class CMakeBuild(build_ext):
     DOCKER_IMAGE = f"ababak/cgcpp:{'.'.join(VERSION.split('.')[:2])}"
 
     def run(self):
+        """Prepare the Docker image and run the build."""
+        # Check if Docker is installed
         try:
             out = subprocess.check_output([self.DOCKER_APP, "--version"])
         except OSError:
             extensions = ", ".join(e.name for e in self.extensions)
             raise RuntimeError(
                 f"Docker must be installed to build the following extensions: {extensions}"
             )
+        # Check if the image is available
         out = subprocess.check_output(
             [self.DOCKER_APP, "images", "-q", self.DOCKER_IMAGE]
         )
         if not out:
-            print(f'Building docker image "{self.DOCKER_IMAGE}"...')
-            docker_args = [
-                self.DOCKER_APP,
-                "build",
-                # "--rm",
-                "-t",
-                self.DOCKER_IMAGE,
-                ".",
-            ]
-            subprocess.check_call(docker_args)
-        for ext in self.extensions:
-            self.build_extension(ext)
+            # Try to pull the image from Docker Hub
+            try:
+                print(f'Trying to pull the docker image "{self.DOCKER_IMAGE}"...')
+                out = subprocess.check_output(
+                    [self.DOCKER_APP, "pull", self.DOCKER_IMAGE]
+                )
+                print(f'Pulled the docker image "{self.DOCKER_IMAGE}"...')
+            except subprocess.CalledProcessError:
+                # If the image is not available, build it from the Dockerfile
+                print(f'Building docker image "{self.DOCKER_IMAGE}"...')
+                docker_args = [
+                    self.DOCKER_APP,
+                    "build",
+                    # "--rm",
+                    "-t",
+                    self.DOCKER_IMAGE,
+                    ".",
+                ]
+                subprocess.check_call(docker_args)
+        super().run()
 
     def build_extension(self, ext):
-        extdir = Path(self.get_ext_fullpath(ext.name)).parent.absolute()
-        if not extdir.exists():
-            os.makedirs(extdir)
-        sourcedir = ext.sourcedir
+        staging_path = Path(self.get_ext_fullpath(ext.name)).parent.absolute()
+        if not staging_path.exists():
+            os.makedirs(staging_path)
+        # relative_file_path = Path(dirpath).relative_to(SOURCE_PATH)
+        # source_path = dirpath
+        # destination_path = (staging_path / relative_file_path).parent
+        # for i, j in ext.__dict__.items():
+        #     print(f"{i} = {j}")
+        print("staging_path", staging_path)
+        sdir = Path(__file__).parent
+        sources_path = os.path.commonpath(ext.sources)
+        source_dir = sdir / sources_path
+        print("sdir", sdir)
+        print("source_dir", source_dir)
         print(f'Building extension "{ext.name}" using "{self.DOCKER_IMAGE}"...')
         docker_args = [
             self.DOCKER_APP,
             "run",
             "--rm",
             "-v",
-            f"{sourcedir}:c:/source:ro",
+            f"{source_dir}:c:/source:ro",
             "-v",
-            f"{extdir}:c:/out",
+            f"{staging_path}:c:/out",
             self.DOCKER_IMAGE,
         ]
         subprocess.check_call(docker_args)
 
 
 # Configuration.
 setuptools.setup(
-    ext_modules=[CMakeExtension("cgcpp/lib_loader", "source_lib_loader")],
+    ext_modules=[
+        setuptools.Extension(
+            "cgcpp.lib_loader",
+            sources=[
+                "source_lib_loader/lib_loader.cpp",
+                "source_lib_loader/CMakeLists.txt",
+            ],
+        )
+    ],
     cmdclass={
         "build_ext": CMakeBuild,
         "bdist_wheel": BdistWheelCommand,
     },
-    include_package_data=True,
     zip_safe=False,
 )