dioptic.profileparser 0.3.1__tar.gz → 0.3.3__tar.gz

{dioptic_profileparser-0.3.1 → dioptic_profileparser-0.3.3}/.github/workflows/pypi-packages.yml

@@ -11,12 +11,15 @@ jobs:
   build-sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
+        with:
+          python-version: "3.12"
       - name: Build sdist package
         run: |
-          python -m pip install pip build --upgrade
+          python -m pip install --upgrade pip build
           python -m build --sdist
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: packages-src
           path: "dist/*.tar.gz"
@@ -25,31 +28,44 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.12"]
     steps:
-      - uses: actions/checkout@v4
-      - uses: ilammy/msvc-dev-cmd@v1
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: step-security/msvc-dev-cmd@v1
+      - uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Build wheel for py${{ matrix.python-version }}
+      - name: Build wheel for python ${{ matrix.python-version }}
         run: |
-          python -m pip install pip build --upgrade
+          python -m pip install --upgrade pip build ninja
           python -m build --wheel
-      - uses: actions/upload-artifact@v4
+        env:
+          CMAKE_GENERATOR: Ninja
+      - uses: actions/upload-artifact@v7
         with:
           name: packages-win-py${{ matrix.python-version }}
           path: "dist/*.whl"
 
+  build-linux-wheels:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - name: Build Linux wheels
+        uses: pypa/cibuildwheel@v4.1.1
+      - uses: actions/upload-artifact@v7
+        with:
+          name: packages-linux-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+
   pypi-publish:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    needs: [build-sdist, build-win64-wheels]
+    needs: [build-sdist, build-win64-wheels, build-linux-wheels]
     runs-on: ubuntu-latest
     permissions:
       # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v6
       with:
         path: dist
         pattern: packages-*
@@ -58,6 +74,10 @@ jobs:
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
         repository-url: https://test.pypi.org/legacy/
+        packages-dir: dist
+        attestations: false
         skip-existing: true
     - name: PyPI publish
       uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        packages-dir: dist

dioptic_profileparser-0.3.3/.github/workflows/quality.yml

@@ -0,0 +1,27 @@
+name: Quality checks
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
+        with:
+          python-version: "3.12"
+      - name: Install Ninja
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes ninja-build
+      - uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      - name: Sync dependencies
+        run: uv sync
+      - name: Lint
+        run: uv run ruff check .
+      - name: Test
+        run: uv run pytest

{dioptic_profileparser-0.3.1 → dioptic_profileparser-0.3.3}/.github/workflows/web-package.yml

@@ -11,10 +11,10 @@ jobs:
   build-web:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: mymindstorm/setup-emsdk@v14
+      - uses: actions/checkout@v7
+      - uses: emscripten-core/setup-emsdk@v16
         with:
-          version: 3.1.57
+          version: 6.0.3
           actions-cache-folder: 'emsdk-cache'
       - name: Build WASM port
         run: |
@@ -22,7 +22,7 @@ jobs:
           mkdir build && cd build
           emcmake cmake -DCMAKE_BUILD_TYPE="Release" ..
           cmake --build .
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: web
           path: "web/build/ProfileParserJs.*"

dioptic_profileparser-0.3.3/.gitignore

@@ -0,0 +1,6 @@
+__pycache__
+.venv
+.vscode
+*.user
+build
+dist

dioptic_profileparser-0.3.3/.python-version

@@ -0,0 +1 @@
+3.12

dioptic_profileparser-0.3.3/PKG-INFO

@@ -0,0 +1,54 @@
+Metadata-Version: 2.2
+Name: dioptic.profileparser
+Version: 0.3.3
+Summary: Parser library for ARGOS declarative profiles
+Author-Email: Peter Würtz <pwuertz@gmail.com>
+Classifier: License :: OSI Approved :: MIT License
+Project-URL: Homepage, https://github.com/dioptic/profileparser
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+
+# Dioptic declarative profile parser
+
+Python parser library for ARGOS declarative profiles.
+
+## Build prerequisites
+
+- Python `3.12+`
+- CMake `>=3.24`
+- Ninja
+- C++20 compiler
+
+## Build with dependencies from lockfile
+
+```shell
+uv sync --no-install-project
+uv build --wheel --no-build-isolation
+```
+
+## Develop with auto rebuild
+
+```shell
+uv sync
+uv run ruff check .
+uv run pytest
+```
+
+## Usage
+
+```python
+import dioptic.profileparser as profileparser
+
+profile = profileparser.parse("""
+Profile {
+    description: "Example profile"
+    application: MyApp {
+        hello: "world"
+    }
+}
+"""
+)
+
+profileparser.validate(profile)
+print(profile.to_json_ast())
+```

dioptic_profileparser-0.3.3/README.md

@@ -0,0 +1,44 @@
+# Dioptic declarative profile parser
+
+Python parser library for ARGOS declarative profiles.
+
+## Build prerequisites
+
+- Python `3.12+`
+- CMake `>=3.24`
+- Ninja
+- C++20 compiler
+
+## Build with dependencies from lockfile
+
+```shell
+uv sync --no-install-project
+uv build --wheel --no-build-isolation
+```
+
+## Develop with auto rebuild
+
+```shell
+uv sync
+uv run ruff check .
+uv run pytest
+```
+
+## Usage
+
+```python
+import dioptic.profileparser as profileparser
+
+profile = profileparser.parse("""
+Profile {
+    description: "Example profile"
+    application: MyApp {
+        hello: "world"
+    }
+}
+"""
+)
+
+profileparser.validate(profile)
+print(profile.to_json_ast())
+```

{dioptic_profileparser-0.3.1 → dioptic_profileparser-0.3.3}/cpp/CMakeLists.txt

@@ -1,12 +1,27 @@
 cmake_minimum_required(VERSION 3.16)
 project(libProfileParser CXX)
 
+include(FetchContent)
+FetchContent_Declare(
+    peglib
+    GIT_REPOSITORY https://github.com/yhirose/cpp-peglib
+    GIT_TAG 4b3bd64
+    GIT_SHALLOW TRUE
+)
+FetchContent_GetProperties(peglib)
+if(NOT peglib_POPULATED)
+    FetchContent_Populate(peglib)
+endif()
+
 add_library(libProfileParser STATIC)
 add_library(libProfileParser::libProfileParser ALIAS libProfileParser)
 
 target_include_directories(libProfileParser PUBLIC
     "${CMAKE_CURRENT_LIST_DIR}/include"
     )
+target_include_directories(libProfileParser PRIVATE
+    "${peglib_SOURCE_DIR}"
+    )
 
 set_target_properties(libProfileParser PROPERTIES
     CXX_STANDARD 20
@@ -29,5 +44,4 @@ target_sources(libProfileParser PRIVATE
     "parser.hpp"
     "printers.cpp"
     "validation.cpp"
-    "peglib.h"  # Use FetchContent?
     )

{dioptic_profileparser-0.3.1 → dioptic_profileparser-0.3.3}/cpp/printers.cpp

@@ -77,10 +77,18 @@ struct Printer
         return self();
     }
 
+    PrinterImpl& operator<<(const String& v)
+    {
+        o << '"' << v << '"';
+        return self();
+    }
+
     PrinterImpl& operator<<(const DocString& v)
     {
-        for(auto& line : v.lines)
-            self() << "# " << line << '\n' << indent;
+        for (auto& line : v.lines) {
+            o << "# " << line;
+            self() << '\n' << indent;
+        }
         return self();
     }
 
@@ -143,7 +151,8 @@ struct Printer
         const std::string start = v.classname + ((v.id.empty()) ? "" : ' ' + v.id) + " {";
         Collection obj(&self(), start, ""sv, "}"sv);
         
-        obj << v.docstring;
+        if(v.docstring.lines.size())
+            obj << v.docstring;
 
         for (const auto& item: v.children) {
             obj << item;

dioptic_profileparser-0.3.3/pyproject.toml

@@ -0,0 +1,56 @@
+[build-system]
+requires = ["scikit-build-core>=0.11", "nanobind"]
+build-backend = "scikit_build_core.build"
+
+[project]
+name = "dioptic.profileparser"
+version = "0.3.3"
+description = "Parser library for ARGOS declarative profiles"
+readme = "README.md"
+requires-python = ">=3.12"
+authors = [
+    { name = "Peter Würtz", email = "pwuertz@gmail.com" },
+]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+]
+
+[project.urls]
+Homepage = "https://github.com/dioptic/profileparser"
+
+[tool.scikit-build]
+cmake.source-dir = "./python"
+cmake.version = "CMakeLists.txt"
+cmake.args = ["--preset", "default"]
+build-dir = "build/{wheel_tag}"
+wheel.py-api = "cp312"
+editable.rebuild = true
+
+[tool.uv]
+no-build-isolation-package = ["dioptic.profileparser"]
+
+[dependency-groups]
+dev = [
+    "nanobind",
+    "pytest",
+    "ruff",
+    "scikit-build-core>=0.11",
+    "ty",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
+[tool.ruff]
+line-length = 120
+
+[tool.cibuildwheel]
+build = "cp312-manylinux_x86_64"
+archs = ["x86_64"]
+build-frontend = "build"
+test-requires = ["pytest"]
+test-command = "pytest {project}/tests"
+
+[tool.cibuildwheel.linux]
+manylinux-x86_64-image = "manylinux_2_34"
+environment = { CMAKE_GENERATOR = "Ninja" }

dioptic_profileparser-0.3.3/python/CMakeLists.txt

@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.24)
+
+if(NOT SKBUILD)
+  message(FATAL_ERROR "Build should be driven by scikit-build-core")
+endif()
+set(MODULE_NAME "_profileparser")
+set(MODULE_VERSION ${SKBUILD_PROJECT_VERSION})
+project(${MODULE_NAME} VERSION ${MODULE_VERSION} LANGUAGES CXX)
+
+find_package(
+  Python 3.12 REQUIRED
+  COMPONENTS Interpreter Development.Module
+  OPTIONAL_COMPONENTS Development.SABIModule
+)
+find_package(nanobind CONFIG REQUIRED)
+
+# Create python extension module with nanobind
+nanobind_add_module(${MODULE_NAME}
+  STABLE_ABI
+  NB_STATIC
+  "pyprofileparser.cpp"
+)
+
+set_target_properties(${MODULE_NAME} PROPERTIES
+  CXX_STANDARD 20
+  CXX_STANDARD_REQUIRED ON
+)
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_NAME=${MODULE_NAME})
+target_compile_definitions(${MODULE_NAME} PRIVATE MODULE_VERSION=${MODULE_VERSION})
+
+add_subdirectory("../cpp" "${CMAKE_CURRENT_BINARY_DIR}/cpp")
+target_link_libraries(${MODULE_NAME} PUBLIC
+  libProfileParser::libProfileParser
+)
+
+nanobind_add_stub(
+  ${MODULE_NAME}_stub
+  MODULE ${MODULE_NAME}
+  OUTPUT ${MODULE_NAME}.pyi
+  PYTHON_PATH $<TARGET_FILE_DIR:${MODULE_NAME}>
+  DEPENDS ${MODULE_NAME}
+  MARKER_FILE py.typed
+)
+
+install(TARGETS ${MODULE_NAME}
+  DESTINATION "dioptic/profileparser"
+)
+install(FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py
+  ${${PROJECT_NAME}_BINARY_DIR}/py.typed
+  ${${PROJECT_NAME}_BINARY_DIR}/${MODULE_NAME}.pyi
+  DESTINATION "dioptic/profileparser"
+)
+
+# Compiler options
+if(MSVC)
+  target_compile_options(${MODULE_NAME} PUBLIC /W3 /permissive- /Zc:__cplusplus)
+else()
+  target_compile_options(${MODULE_NAME} PRIVATE -Wall -Wextra)
+endif()

dioptic_profileparser-0.3.3/python/CMakePresets.json

@@ -0,0 +1,27 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 24,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "default",
+      "displayName": "Default",
+      "description": "Configure with Release build type and LTO enabled",
+      "generator": "Ninja",
+      "binaryDir": "../build",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_INTERPROCEDURAL_OPTIMIZATION": "ON"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "configurePreset": "default"
+    }
+  ]
+}

dioptic_profileparser-0.3.3/python/__init__.py

@@ -0,0 +1,2 @@
+from ._profileparser import *
+from ._profileparser import __version__ as __version__

{dioptic_profileparser-0.3.1 → dioptic_profileparser-0.3.3}/python/pyprofileparser.cpp

@@ -15,9 +15,6 @@
 
 namespace py = nanobind;
 using namespace nanobind::literals;
-using namespace std::string_view_literals;
-
-constexpr auto VERSION = "0.3.1"sv;
 
 struct PyProfile {
     PyProfile(std::string source)
@@ -86,8 +83,14 @@ private:
 };
 
 
-NB_MODULE(profileparser, m) {
-    m.attr("__version__") = py::str(VERSION.data(), VERSION.size());
+NB_MODULE(MODULE_NAME, m) {
+#define STRINGIFY(x) #x
+#define MACRO_STRINGIFY(x) STRINGIFY(x)
+#ifdef MODULE_VERSION
+    m.attr("__version__") = MACRO_STRINGIFY(MODULE_VERSION);
+#else
+    m.attr("__version__") = "dev";
+#endif
     
     py::class_<Profile::SourceInfo> PySourceInfo(m, "SourceInfo");
     PySourceInfo.def_ro("offset", &Profile::SourceInfo::offset);

dioptic_profileparser-0.3.3/tests/test_profileparser.py

@@ -0,0 +1,39 @@
+
+from dioptic import profileparser
+
+PROFILE_SOURCE = """
+Profile {
+    description: "Example profile for testing"
+
+    Value x {
+        value: 42
+    }
+
+    application: SomeApplication {
+        a: 2 * x
+        b: "hello world"
+    }
+}
+"""
+
+
+def test_parse_and_validate_roundtrip():
+    profile = profileparser.parse(PROFILE_SOURCE)
+    profileparser.validate(profile)
+
+    source = profile.to_source()
+    assert isinstance(source, str)
+    assert "Profile" in source
+    assert "SomeApplication" in source
+
+
+def test_json_and_line_info():
+    profile = profileparser.parse(PROFILE_SOURCE)
+
+    json_ast = profile.to_json_ast()
+    assert isinstance(json_ast, str)
+    assert "Profile" in json_ast
+
+    line_range = profile.line_info(profile.root())
+    assert line_range.begin.line >= 1
+    assert line_range.end.line >= line_range.begin.line