Merge pull request #178 from borglab/upgrade

Author: varunagrawal

.github/workflows/linux-ci.yml

@@ -5,35 +5,33 @@ on: [pull_request]
 jobs:
   build:
     name: Tests for 🐍 ${{ matrix.python-version }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Install Dependencies
         run: |
           sudo apt-get -y update
-          sudo apt install cmake build-essential pkg-config libpython3-dev python3-numpy libboost-all-dev
+          sudo apt install cmake
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - name: Install uv and set the ${{ matrix.python-version }}
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Python Dependencies
-        run: |
-          sudo pip3 install -U pip setuptools
-          sudo pip3 install -r requirements.txt
+        run: uv sync --locked --all-extras --dev
 
       - name: Build and Test
         run: |
+          # Build
           cmake .
-          cd tests
           # Use Pytest to run all the tests.
-          pytest
+          uv run pytest tests

.github/workflows/macos-ci.yml

@@ -5,36 +5,32 @@ on: [pull_request]
 jobs:
   build:
     name: Tests for 🐍 ${{ matrix.python-version }}
-    runs-on: macos-14
+    runs-on: macos-latest
 
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Install Dependencies
         run: |
-          brew install cmake ninja boost
+          brew install cmake ninja
 
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+      - name: Install uv and set the ${{ matrix.python-version }}
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Python Dependencies
-        run: |
-          pip3 install -U pip setuptools
-          pip3 install -r requirements.txt
+        run: uv sync --locked --all-extras --dev
 
       - name: Build and Test
         run: |
           # Build
           cmake .
-          cd tests
           # Use Pytest to run all the tests.
-          pytest
-
+          uv run pytest tests

.gitignore

@@ -11,3 +11,5 @@ __pycache__/
 **/.coverage
 
 gtwrap/matlab_wrapper/matlab_wrapper.tpl
+
+.python-version

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.22)
 
 # Set the project name and version
 project(gtwrap VERSION 1.0)
@@ -34,14 +34,13 @@ configure_package_config_file(
   ${CMAKE_CURRENT_BINARY_DIR}/cmake/gtwrapConfig.cmake
   INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
   PATH_VARS INSTALL_CMAKE_DIR INSTALL_LIB_DIR INSTALL_BIN_DIR
-            INSTALL_INCLUDE_DIR
-  INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+            INSTALL_INCLUDE_DIR)
 
 # Set all the install paths
-set(GTWRAP_CMAKE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR})
-set(GTWRAP_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR})
-set(GTWRAP_BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR})
-set(GTWRAP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR})
+set(GTWRAP_CMAKE_INSTALL_DIR $${INSTALL_CMAKE_DIR})
+set(GTWRAP_LIB_INSTALL_DIR ${INSTALL_LIB_DIR})
+set(GTWRAP_BIN_INSTALL_DIR ${INSTALL_BIN_DIR})
+set(GTWRAP_INCLUDE_INSTALL_DIR ${INSTALL_INCLUDE_DIR})
 
 # ##############################################################################
 # Install the package

pyproject.toml

@@ -0,0 +1,52 @@
+[project]
+name = "gtwrap"
+version = "2.0.0"
+description = "Library to wrap C++ with Python and Matlab"
+authors = [
+    { name="Frank Dellaert", email="dellaert@gatech.edu" },
+    { name = "Varun Agrawal", email = "varunagrawal@gatech.edu" },
+    { name = "Duy Nguyen Ta", email = "duynguyen@gatech.edu" },
+    { name = "Fan Jiang", email = "i@fanjiang.me" },
+    { name = "Matthew Sklar", email = "matthewsklar227@gmail.com" }
+]
+readme = "README.md"
+license = "BSD-3-Clause"
+keywords=["wrap", "bindings", "cpp", "python", "matlab"]
+
+classifiers = [
+    "Intended Audience :: Education",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.11",
+]
+
+requires-python = ">=3.10"
+dependencies = [
+    "pyparsing>=3.2.5",
+]
+
+[dependency-groups]
+dev = [
+    "pytest>=9.0.1",
+    "pytest-cov>=7.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/borglab/wrap"
+Documentation = "https://github.com/borglab/wrap"
+Repository = "https://github.com/borglab/wrap"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.pytest.ini_options]
+addopts = "--cov=gtwrap --cov-report html --cov-report term"
+norecursedirs = []
+
+[tool.uv.build-backend]
+module-name = "gtwrap"