virtualshell 1.1.5__tar.gz → 1.1.6__tar.gz

virtualshell-1.1.6/.github/workflows/test_build-only.yml

@@ -0,0 +1,256 @@
+name: Test Build-Only
+
+on:
+  workflow_dispatch:
+    inputs:
+      target:
+        description: "Test build"
+        required: true
+        default: "*"
+        type: choice
+        options: ["*","linux-x86_64", "linux-aarch64", "macos", "windows"]
+
+concurrency:
+  group: test-build-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  wheels-linux-x86_64:
+    if: inputs.target == '*' || inputs.target == 'linux-x86_64'
+    name: Wheels (Linux x86_64)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python: "cp312-*"
+            label: "cp312"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python (host)
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install cibuildwheel
+        run: |
+          python -m pip install -U pip
+          python -m pip install cibuildwheel
+
+      - name: Build wheels with cibuildwheel (manylinux x86_64)
+        env:
+          CIBW_BUILD: ${{ matrix.python }}
+          CIBW_ARCHS_LINUX: "x86_64"
+          CIBW_SKIP: "*-musllinux_* *-manylinux_i686"
+          CIBW_TEST_COMMAND: python -c "import virtualshell; print('ok')"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
+
+          CMAKE_GENERATOR: Ninja
+          PYBIND11_FINDPYTHON: "ON"
+          CIBW_BEFORE_BUILD_LINUX: "python -m pip install ninja"
+        run: |
+          python -m cibuildwheel --platform linux --output-dir wheelhouse .
+
+      - name: Upload wheels (Linux x86_64)
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-x86_64-${{ matrix.label }}-attempt${{ github.run_attempt }}
+          path: wheelhouse/*.whl
+          overwrite: true
+
+  wheels-linux-aarch64:
+    if: inputs.target == '*' || inputs.target == 'linux-aarch64'
+    name: Wheels (Linux aarch64)
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python: "cp312-*"
+            label: "cp312"
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up QEMU for cross-arch Docker
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
+      - name: Set up Python (host)
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install cibuildwheel
+        run: |
+          python -m pip install -U pip
+          python -m pip install cibuildwheel
+
+      - name: Build wheels with cibuildwheel (manylinux aarch64 via QEMU)
+        env:
+          CIBW_BUILD: ${{ matrix.python }}
+          CIBW_ARCHS_LINUX: "aarch64"
+          CIBW_SKIP: "*-musllinux_*"
+          CIBW_TEST_COMMAND: python -c "import virtualshell; print('ok')"
+          CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
+          CMAKE_GENERATOR: Ninja
+          PYBIND11_FINDPYTHON: "ON"
+          CIBW_BEFORE_BUILD_LINUX: "python -m pip install ninja"
+        run: |
+          python -m cibuildwheel --platform linux --output-dir wheelhouse .
+
+      - name: Upload wheels (Linux aarch64)
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-aarch64-${{ matrix.label }}-attempt${{ github.run_attempt }}
+          path: wheelhouse/*.whl
+          overwrite: true
+
+  wheels-macos:
+    if: inputs.target == '*' || inputs.target == 'macos'
+    name: Wheels (universal2 macOS)
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python: "cp312-*"
+            label: "cp312"
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python (host)
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install cibuildwheel
+        run: |
+          python -m pip install -U pip
+          python -m pip install cibuildwheel
+
+      - name: Build wheels with cibuildwheel (universal2)
+        env:
+          CIBW_BUILD: ${{ matrix.python }}
+          CIBW_ARCHS_MACOS: "universal2"
+          CIBW_MACOSX_DEPLOYMENT_TARGET: "11.0"               
+          CIBW_TEST_COMMAND: python -c "import virtualshell; print('ok')"
+          CIBW_BUILD_VERBOSITY: "1"
+          CIBW_BEFORE_BUILD_MACOS: "python -m pip install ninja"
+
+          CMAKE_ARGS: >-
+            -G Ninja
+            -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
+
+          PYBIND11_FINDPYTHON: "ON"
+          CMAKE_GENERATOR: "Ninja"
+          CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"
+          CMAKE_OSX_DEPLOYMENT_TARGET: "11.0"
+          MACOSX_DEPLOYMENT_TARGET: "11.0"
+
+        run: |
+          python -m cibuildwheel --platform macos --output-dir wheelhouse .
+
+      - name: Upload wheels (macOS)
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-macos-${{ matrix.label }}-attempt${{ github.run_attempt }}
+          path: wheelhouse/*.whl
+          overwrite: true
+
+  wheels-windows:
+    if: inputs.target == '*' || inputs.target == 'windows'
+    name: Wheels (Windows x64)
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["cp312-win_amd64"]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python (host)
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install cibuildwheel
+        shell: pwsh
+        run: |
+          py -3 -m pip install -U pip
+          py -3 -m pip install -U cibuildwheel
+
+      - name: Build wheels with cibuildwheel (MSVC)
+        shell: cmd
+        env:
+          CIBW_BUILD: ${{ matrix.python }}
+          CIBW_SKIP: "*-win32"
+          CIBW_TEST_COMMAND: python -c "import virtualshell; print('ok')"
+          CIBW_BUILD_VERBOSITY: "1"
+          CIBW_ENVIRONMENT_WINDOWS: >
+            CMAKE_GENERATOR="Visual Studio 17 2022"
+            CMAKE_GENERATOR_PLATFORM=x64
+            SKBUILD_CMAKE_GENERATOR="Visual Studio 17 2022"
+            PYBIND11_FINDPYTHON=ON
+            CMAKE_BUILD_TYPE=Release
+        run: |
+          @echo on
+
+          REM Find latest VS and load MSVC environment
+          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSINSTALL=%%i
+          if not defined VSINSTALL (
+            echo ERROR: Visual Studio with C++ tools not found.
+            exit /b 1
+          )
+
+          call "%VSINSTALL%\Common7\Tools\VsDevCmd.bat" -arch=x64
+
+          REM Make sure stale vars don't force wrong compiler
+          set CC=
+          set CXX=
+          set CMAKE_C_COMPILER=
+          set CMAKE_CXX_COMPILER=
+
+          REM Debug: verify we are on MSVC
+          where cl
+          cl /Bv
+          where cmake
+          where ninja
+
+          py -3 -m cibuildwheel --output-dir wheelhouse .
+
+      - name: Upload wheels (Windows)
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-windows-${{ matrix.python }}-attempt${{ github.run_attempt }}
+          path: wheelhouse\*.whl
+          overwrite: true
+
+  sdist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with: { fetch-depth: 0 }
+      - uses: actions/setup-python@v5
+        with: { python-version: "3.12" }
+      - run: |
+          python -m pip install -U pip build twine
+          python -m build --sdist --outdir dist .
+          python -m twine check dist/*
+      - uses: actions/upload-artifact@v4
+        with:
+          name: sdist
+          path: dist/*.tar.gz
+          

{virtualshell-1.1.5 → virtualshell-1.1.6}/.github/workflows/workflow.yml

@@ -171,24 +171,21 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS_MACOS: "universal2"
-          CIBW_MACOSX_DEPLOYMENT_TARGET: "11.0"                # <- styrer wheel-tag + env
+          CIBW_MACOSX_DEPLOYMENT_TARGET: "11.0"               
           CIBW_TEST_COMMAND: python -c "import virtualshell; print('ok')"
           CIBW_BUILD_VERBOSITY: "1"
           CIBW_BEFORE_BUILD_MACOS: "python -m pip install ninja"
 
-          # ---- Tving CMake til universal2 via både CMAKE_ARGS og env ----
-          # skbuild-core leser CMAKE_ARGS direkte og sender videre til CMake.
           CMAKE_ARGS: >-
             -G Ninja
             -DCMAKE_OSX_ARCHITECTURES=arm64;x86_64
             -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
 
-          # Disse brukes i tillegg (belt and suspenders)
           PYBIND11_FINDPYTHON: "ON"
           CMAKE_GENERATOR: "Ninja"
           CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"
           CMAKE_OSX_DEPLOYMENT_TARGET: "11.0"
-          MACOSX_DEPLOYMENT_TARGET: "11.0"                     # påvirker clangs -mmacosx-version-min
+          MACOSX_DEPLOYMENT_TARGET: "11.0"
 
         run: |
           python -m cibuildwheel --platform macos --output-dir wheelhouse .
@@ -207,6 +204,7 @@ jobs:
       fail-fast: false
       matrix:
         python: ["cp38-win_amd64", "cp39-win_amd64", "cp310-win_amd64", "cp311-win_amd64", "cp312-win_amd64", "cp313-win_amd64"]
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -218,20 +216,47 @@ jobs:
           python-version: "3.12"
 
       - name: Install cibuildwheel
+        shell: pwsh
         run: |
           py -3 -m pip install -U pip
-          py -3 -m pip install cibuildwheel
+          py -3 -m pip install -U cibuildwheel
 
       - name: Build wheels with cibuildwheel (MSVC)
+        shell: cmd
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_SKIP: "*-win32"
           CIBW_TEST_COMMAND: python -c "import virtualshell; print('ok')"
+          CIBW_BUILD_VERBOSITY: "1"
           CIBW_ENVIRONMENT_WINDOWS: >
             CMAKE_GENERATOR="Visual Studio 17 2022"
-            CMAKE_GENERATOR_PLATFORM="x64"
+            CMAKE_GENERATOR_PLATFORM=x64
+            SKBUILD_CMAKE_GENERATOR="Visual Studio 17 2022"
             PYBIND11_FINDPYTHON=ON
+            CMAKE_BUILD_TYPE=Release
         run: |
+          @echo on
+
+          REM Find latest VS and load MSVC environment
+          for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do set VSINSTALL=%%i
+          if not defined VSINSTALL (
+            echo ERROR: Visual Studio with C++ tools not found.
+            exit /b 1
+          )
+
+          call "%VSINSTALL%\Common7\Tools\VsDevCmd.bat" -arch=x64
+
+          set CC=
+          set CXX=
+          set CMAKE_C_COMPILER=
+          set CMAKE_CXX_COMPILER=
+
+          REM Debug: verify we are on MSVC
+          where cl
+          cl /Bv
+          where cmake
+          where ninja
+
           py -3 -m cibuildwheel --output-dir wheelhouse .
 
       - name: Upload wheels (Windows)
@@ -270,8 +295,14 @@ jobs:
     needs: [wheels-linux-x86_64, wheels-linux-aarch64, wheels-macos, wheels-windows, sdist]
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/v')
+
     permissions:
       contents: read
+      id-token: write
+
+    environment:
+      name: release
+      url: https://pypi.org/p/virtualshell
 
     steps:
       - name: Download wheel artifacts
@@ -293,15 +324,6 @@ jobs:
           find dist_in -type f \( -name "*.whl" -o -name "*.tar.gz" \) -exec cp {} dist/ \;
           ls -l dist
 
-      - name: Ensure dists exist
-        run: |
-          shopt -s nullglob
-          files=(dist/*.whl dist/*.tar.gz)
-          if [ ${#files[@]} -eq 0 ]; then
-            echo "No distributions found to publish."
-            exit 1
-          fi
-
       - name: Twine check
         run: |
           python -m pip install -U twine
@@ -316,7 +338,7 @@ jobs:
             echo "repo=pypi" >> $GITHUB_OUTPUT
           fi
 
-      - name: Publish to TestPyPI (token)
+      - name: Publish to TestPyPI (trusted)
         if: steps.target.outputs.repo == 'testpypi'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
@@ -324,15 +346,11 @@ jobs:
           packages-dir: dist
           skip-existing: true
           verbose: true
-          user: __token__
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
 
-      - name: Publish to PyPI (token)
+      - name: Publish to PyPI (trusted)
         if: steps.target.outputs.repo == 'pypi'
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist
           skip-existing: false
           verbose: true
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}

{virtualshell-1.1.5 → virtualshell-1.1.6}/.gitignore

@@ -2,6 +2,7 @@
 __pycache__/
 *.pyc
 build/
+out/
 *.egg-info/
 test/
 .pypirc
@@ -9,4 +10,5 @@ dist/
 .venv*
 test_run*
 test_performance_bridge.py
-ZEROCOPY_BRIDGE.md
+ZEROCOPY_BRIDGE.md
+.vs/

virtualshell-1.1.6/CMakeLists.txt

@@ -0,0 +1,128 @@
+cmake_minimum_required(VERSION 3.20)
+project(virtualshell LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Enforce 64-bit build on Windows
+if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+  message(FATAL_ERROR
+    "32-bit build detected (x86). virtualshell requires 64-bit (x64).\n"
+    "Open 'x64 Native Tools Command Prompt for VS' and retry."
+  )
+endif()
+
+# Find Python and pybind11
+find_package(Python3 REQUIRED COMPONENTS Interpreter Development.Module)
+find_package(pybind11 CONFIG QUIET)
+if(NOT pybind11_FOUND)
+    execute_process(
+      COMMAND ${Python3_EXECUTABLE} -c "import pybind11; print(pybind11.get_cmake_dir())"
+      OUTPUT_VARIABLE pybind11_DIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      RESULT_VARIABLE pybind11_RESULT
+    )
+    file(TO_CMAKE_PATH "${pybind11_DIR}" pybind11_DIR)
+  if(pybind11_RESULT EQUAL 0)
+    find_package(pybind11 CONFIG REQUIRED PATHS ${pybind11_DIR} NO_DEFAULT_PATH)
+  else()
+    message(FATAL_ERROR "pybind11 not found. Install with: pip install pybind11")
+  endif()
+endif()
+
+
+
+# Source files
+set(SRC
+  cpp/src/binder.cpp
+  cpp/src/io_pump.cpp
+  cpp/src/powershell_process.cpp
+  cpp/src/virtual_shell.cpp
+  cpp/src/py_proxy.cpp
+)
+
+file(GLOB_RECURSE VS_HEADERS CONFIGURE_DEPENDS
+  "${CMAKE_CURRENT_SOURCE_DIR}/cpp/include/*.h"
+  "${CMAKE_CURRENT_SOURCE_DIR}/cpp/include/*.hpp"
+)
+
+pybind11_add_module(_core MODULE ${SRC} ${VS_HEADERS})
+target_include_directories(_core PRIVATE cpp/include)
+
+# Link platform-specific libraries
+if(WIN32)
+  target_link_libraries(_core PRIVATE Python3::Module)
+elseif(UNIX)
+  find_package(Threads REQUIRED)
+  target_link_libraries(_core PRIVATE Threads::Threads dl)
+endif()
+
+# Set output directory for the built module
+if(DEFINED ENV{SKBUILD_STATE} AND "$ENV{SKBUILD_STATE}" STREQUAL "editable")
+  set(_VS_OUTDIR "${PROJECT_SOURCE_DIR}/src/virtualshell")
+elseif(DEFINED SKBUILD_PLATLIB_DIR)
+  set(_VS_OUTDIR "${SKBUILD_PLATLIB_DIR}/virtualshell")
+else()
+  set(_VS_OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/virtualshell")
+endif()
+
+# Configure target properties
+set_target_properties(_core PROPERTIES
+  OUTPUT_NAME "_core"
+  LIBRARY_OUTPUT_DIRECTORY                "${_VS_OUTDIR}"
+  RUNTIME_OUTPUT_DIRECTORY                "${_VS_OUTDIR}"
+  LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${_VS_OUTDIR}"
+  RUNTIME_OUTPUT_DIRECTORY_RELEASE        "${_VS_OUTDIR}"
+  LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${_VS_OUTDIR}"
+  RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${_VS_OUTDIR}"
+  CXX_VISIBILITY_PRESET hidden
+  VISIBILITY_INLINES_HIDDEN ON
+)
+
+# Compiler-specific options
+if(MSVC)
+  target_compile_options(_core PRIVATE /permissive- /Zc:__cplusplus /EHsc /utf-8 /bigobj)
+else()
+  target_compile_options(_core PRIVATE -O3 -fvisibility=hidden)
+endif()
+
+install(TARGETS _core
+  LIBRARY DESTINATION virtualshell
+  RUNTIME DESTINATION virtualshell
+  ARCHIVE DESTINATION virtualshell
+)
+
+# Build and link the vs_shm library on Windows
+if(WIN32 AND MSVC)
+  add_subdirectory(cpp/lib/vs_shm)
+
+  set_target_properties(_vs_shm PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY                "${_VS_OUTDIR}"
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE        "${_VS_OUTDIR}"
+    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${_VS_OUTDIR}"
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG          "${_VS_OUTDIR}"
+    LIBRARY_OUTPUT_DIRECTORY                "${_VS_OUTDIR}"
+    LIBRARY_OUTPUT_DIRECTORY_RELEASE        "${_VS_OUTDIR}"
+    LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${_VS_OUTDIR}"
+    LIBRARY_OUTPUT_DIRECTORY_DEBUG          "${_VS_OUTDIR}"
+  )
+
+  add_dependencies(_core _vs_shm)
+
+  add_custom_command(TARGET _core POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory "${_VS_OUTDIR}"
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<TARGET_FILE:_vs_shm>"
+            "${_VS_OUTDIR}/$<TARGET_FILE_NAME:_vs_shm>"
+    VERBATIM
+  )
+
+  install(TARGETS _vs_shm
+    RUNTIME DESTINATION virtualshell
+    LIBRARY DESTINATION virtualshell
+    ARCHIVE DESTINATION virtualshell
+  )
+endif()
+
+

virtualshell-1.1.6/CMakeSettings.json

@@ -0,0 +1,15 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    }
+  ]
+}