Post 24.1 Cleanups

.github/workflows/build_wheels.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9"]
-        os: [ubuntu-22.04, macos-13, windows-2019]
+        os: [ubuntu-22.04]  # , macos-13, windows-2019]
 
     runs-on: ${{ matrix.os }}
 
@@ -45,3 +45,11 @@ jobs:
       with:
         name: energyplus-wheel-${{ matrix.os }}
         path: ./dist
+
+    - name: Deploy on Test PyPi
+      uses: pypa/gh-action-pypi-publish@v1.8.14
+      with:
+        repository-url: https://test.pypi.org/legacy/
+        user: __token__
+        password: ${{ secrets.TESTPYPIPW }}
+        verbose: true

.github/workflows/linux_release.yml

@@ -11,19 +11,16 @@ env:
   Python_REQUIRED_VERSION: 3.8
 
 jobs:
-  linux_release:
+  build_installer_artifact:
+    name: Build Installer and Upload  # keeping upload in this job so we could potentially download problematic builds
     runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.allow_failure }}
+    continue-on-error: false
     strategy:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        include:
-        - os: ubuntu-20.04
-          allow_failure: false
-        - os: ubuntu-22.04
-          allow_failure: false
+
     permissions:
       # Needed permission to upload the release asset
       contents: write
@@ -58,6 +55,8 @@ jobs:
     - name: Create Build Directory
       run: cmake -E make_directory ./build/
 
+    # should we pin to a specific version of CMake here like we did on Windows?
+
     - name: Configure CMake
       working-directory: ./build
       shell: bash
@@ -74,6 +73,15 @@ jobs:
       shell: bash
       run: cmake --build . --target package -j 4
 
+    - name: Upload Tarball as artifact for testing
+      uses: actions/upload-artifact@v4
+      with:
+        name: energyplus-${{ matrix.os }}
+        path: build/EnergyPlus-*-x86_64.tar.gz
+        if-no-files-found: error
+        retention-days: 7
+        overwrite: false
+
     - name: Upload Tarball to release
       uses: svenstaro/upload-release-action@v2
       with:
@@ -101,3 +109,51 @@ jobs:
         overwrite: true
         file_glob: true
         asset_name: ${{ matrix.os }}_LinuxShellInstaller
+
+
+  test_package:
+    name: Test Built Package
+    needs: build_installer_artifact
+    runs-on: ${{ matrix.os }}
+    strategy:
+      # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
+      fail-fast: false
+      matrix:
+        name: [20, 22]
+        include:
+          - name: 20
+            os: ubuntu-20.04
+            test_key: ubuntu2004
+          - name: 22
+            os: ubuntu-22.04
+            test_key: ubuntu2204
+
+    steps:
+      - uses: actions/checkout@v3  # Still need E+ checked out to get testing scripts
+        with:
+          path: checkout
+
+      - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
+        uses: actions/setup-python@v4
+        id: setup-python
+        with:
+          python-version: ${{ env.Python_REQUIRED_VERSION }}
+          architecture: ${{ matrix.arch }}
+
+      - name: Gather Test Package from Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: energyplus-${{ matrix.os }}
+          path: package
+
+      - name: Check Contents
+        shell: bash
+        run: ls
+
+      - name: Check Package contents
+        shell: bash
+        working-directory: package
+        run: ls
+
+      - name: Run Package Tests
+        run: python checkout/scripts/package_tests/runner.py --verbose ${{ matrix.test_key }} package/

.github/workflows/mac_release.yml

@@ -12,7 +12,7 @@ env:
   SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
 
 jobs:
-  mac_release:
+  build_installer_artifact:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.allow_failure }}
     strategy:
@@ -35,7 +35,7 @@ jobs:
 #          os: macos-14
 #          allow_failure: false
 #          arch: arm64
-#          python: 3.12.0
+#          python: 3.12.0  # Make sure to add the package testing below for ARM once we add this build to GHA
     permissions:
       # Needed permission to upload the release asset
       contents: write
@@ -77,6 +77,8 @@ jobs:
     - name: Create Build Directory
       run: cmake -E make_directory ./build/
 
+      # should we pin to a specific version of CMake here like we did on Windows?
+
     - name: Configure CMake
       working-directory: ./build
       shell: bash
@@ -109,6 +111,15 @@ jobs:
         otool -L PostProcess/ReadVarsESO || true
         otool -L PostProcess/HVAC-Diagram || true
 
+    - name: Upload Tarball as artifact for testing
+      uses: actions/upload-artifact@v4
+      with:
+        name: energyplus-${{ matrix.os }}
+        path: build/EnergyPlus-*-${{ matrix.arch }}.tar.gz
+        if-no-files-found: error
+        retention-days: 7
+        overwrite: false
+
     - name: Upload Tarball to release
       uses: svenstaro/upload-release-action@v2
       with:
@@ -126,3 +137,58 @@ jobs:
         tag: ${{ github.ref }}
         overwrite: true
         file_glob: true
+
+  test_package:
+    name: Test Built Package
+    needs: build_installer_artifact
+    runs-on: ${{ matrix.os }}
+    strategy:
+      # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
+      fail-fast: false
+      matrix:
+        macos_dev_target: [ 11.6, 12.1 ]  #, 13.0]
+        include:
+          - macos_dev_target: 11.6
+            os: macos-11
+            arch: x86_64
+            python: 3.8
+            test_key: mac11
+          - macos_dev_target: 12.1
+            os: macos-12
+            arch: x86_64
+            python: 3.8
+            test_key: mac12
+    #        - macos_dev_target: 13.0
+    #          os: macos-14
+    #          arch: arm64
+    #          python: 3.12.0  # Make sure to add the package testing below for ARM once we add this build to GHA
+
+    steps:
+      - uses: actions/checkout@v3  # Still need E+ checked out to get testing scripts
+        with:
+          path: checkout
+
+      - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
+        uses: actions/setup-python@v4
+        id: setup-python
+        with:
+          python-version: ${{ env.Python_REQUIRED_VERSION }}
+          architecture: ${{ matrix.arch }}
+
+      - name: Gather Test Package from Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: energyplus-${{ matrix.os }}
+          path: package
+
+      - name: Check Contents
+        shell: bash
+        run: ls
+
+      - name: Check Package contents
+        shell: bash
+        working-directory: package
+        run: ls
+
+      - name: Run Package Tests
+        run: python checkout/scripts/package_tests/runner.py --verbose ${{ matrix.test_key }} package/

.github/workflows/windows_release.yml

@@ -12,13 +12,16 @@ env:
   Python_REQUIRED_VERSION: 3.8
 
 jobs:
-  windows_release:
+  build_installer_artifact:
+    name: Build Installer and Upload  # keeping upload in this job so we could potentially download problematic builds
     runs-on: windows-2019
     # to move to windows-2022, just make sure to set the Visual Studio generator build to "17 2022"
     continue-on-error: ${{ matrix.allow_failure }}
     strategy:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
+
+      # ** NOTE ** If build names/archs/platforms are changed, make sure to update the release job below
       matrix:
         name: [x64, x64_hardened]  # removed x86 because it won't build packages now
         include:
@@ -65,13 +68,12 @@ jobs:
         python -m pip install --upgrade pip
         pip install aqtinstall
 
-
     - name: Install System dependencies and LaTeX
       shell: bash
       run: |
         set -x
         echo "Downloading MiKTeX CLI installer"
-        # We download from a specific miror already # TODO: Should store this setup package somewhere ourselves
+        # We download from a specific mirror already # TODO: Should store this setup package somewhere ourselves
         curl -L -O https://ctan.math.illinois.edu/systems/win32/miktex/setup/windows-x64/miktexsetup-5.5.0%2B1763023-x64.zip
         unzip miktexsetup-5.5.0%2B1763023-x64.zip
 
@@ -142,6 +144,15 @@ jobs:
       shell: bash
       run: cmake --build . --target package -j 4 --config $BUILD_TYPE
 
+    - name: Upload Zip as artifact for testing
+      uses: actions/upload-artifact@v4
+      with:
+        name: energyplus-${{ matrix.package-arch }}
+        path: build/EnergyPlus-*-Windows-${{ matrix.package-arch }}.zip
+        if-no-files-found: error
+        retention-days: 7
+        overwrite: false
+
     - name: Upload Zip to release
       uses: svenstaro/upload-release-action@v2
       with:
@@ -159,3 +170,41 @@ jobs:
         tag: ${{ github.ref }}
         overwrite: true
         file_glob: true
+
+  test_package:
+    name: Test Built Package
+    needs: build_installer_artifact
+    runs-on: windows-2019
+
+    steps:
+      - uses: actions/checkout@v3  # Still need E+ checked out to get testing scripts
+        with:
+          path: checkout
+
+      - name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
+        uses: actions/setup-python@v4
+        id: setup-python
+        with:
+          python-version: ${{ env.Python_REQUIRED_VERSION }}
+          architecture: ${{ matrix.arch }}
+
+      - name: Gather Test Package from Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: energyplus-x86_64
+          path: package
+
+      - name: Check Contents
+        shell: bash
+        run: ls
+
+      - name: Check Package contents
+        shell: bash
+        working-directory: package
+        run: ls
+
+#      - name: Setup tmate session
+#        uses: mxschmitt/action-tmate@v3
+
+      - name: Run Package Tests
+        run: python checkout/scripts/package_tests/runner.py --verbose --msvc 2022 win64 package/

CMakeLists.txt

@@ -219,7 +219,7 @@ if(BUILD_TESTING)
         "${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}${ARCH_FLAG}"
         CACHE STRING "Identifier for this device configuration")
   endif()
-
+  set_property(GLOBAL PROPERTY CTEST_TARGETS_ADDED 1)  # This avoids all the CTest Nightly, Continuous, etc. tests.
   enable_testing()
 endif()
 

scripts/dev/api_debug_helper.py

@@ -77,13 +77,21 @@
 from sys import exit, path
 from tempfile import mkdtemp
 
+DO_BUILD = False
+
 repo_root = Path(__file__).resolve().parent.parent.parent
-build_dir = repo_root / 'builds' / 'r'
-products_dir = build_dir / 'Products'
 file_to_run = repo_root / 'testfiles' / 'PythonPluginCustomOutputVariable.idf'
 
-# this will automatically build E+ each run, so you can quickly make changes and re-execute inside the debugger
-check_call(['make', '-j', str(cpu_count() - 2), 'energyplus'], cwd=str(build_dir))
+if DO_BUILD:
+    build_dir = repo_root / 'cmake-build-debug'
+    products_dir = build_dir / 'Products'
+    make_tool = '/snap/clion/current/bin/ninja/linux/x64/ninja'  # 'make'
+
+    # this will automatically build E+ each run, so you can quickly make changes and re-execute inside the debugger
+    check_call([make_tool, '-j', str(cpu_count() - 2), 'energyplus'], cwd=str(build_dir))
+else:
+    products_dir = '/tmp/EnergyPlus-24.1.0-241fc81186-Linux-Ubuntu22.04-x86_64'
+
 
 path.insert(0, str(products_dir))
 from pyenergyplus.api import EnergyPlusAPI